diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
deleted file mode 100644
index e0e94a5..0000000
--- a/.github/CONTRIBUTING.md
+++ /dev/null
@@ -1,70 +0,0 @@
-# Getting Started with Github
-
-## Setting up your environment
-
-Setting up your environment is essential to becoming a contributor using Github. Once your environment is set, you can monitor your activity through the [website](https://github.com/) or [mobile app](https://github.com/mobile). To contribute to this website, you need to set up your own  GitHub account.
-
-## Create a GitHub account and set up your profile
-
-Need a GitHub account? [Create one](https://github.com/join). Here's an opportunity to get creative with a username that describes your best qualities.  You can use an existing GitHub account to contribute to the website repo or any other repo you are currently using. Don't forget to complete the profile associated with your account. The profile is a way of communicating your interest and what you like to do technically.
-
->[!NOTE]
-> Profiles are public. Please do not put any personal information in your profile. The entire GitHub community can view what you have written.
-
-## Setting up the GitHub Stack
-
-The recommendations provided are based on the setup used by professionals contributors. 
-
-### Install Git 
-
-[Git](https://git-scm.com/downloads) (also known as Git Bash) A command-line-based tool that allows you to submit pull requests, manipulate the branches you created and update your local(forked) copy of the repo. The documentation for [how to use Git](https://git-scm.com/doc) is available online. This tool is available on Linux.
-
-Free CodeCamp recommends this [list](https://www.freecodecamp.org/news/10-important-git-commands-that-every-developer-should-know/) of Git commands developers should know.
-
-### Visual Code
-
-[Visual code](https://code.visualstudio.com/) is available in Windows, Mac, and Linux. It is a lean editing tool that has multiple uses for development. The installation is simple and documented on the site. There is an extensive marketplace for extensions to enhance your experience using this tool built right into the application! Extensions allow you to work more closely with Github and publish branches without leaving the Visual code.
-
-[Walkthrough using Visual Code for your first Pull Request](https://code.visualstudio.com/docs/editor/github).
-It is crucial to **get a local copy of the repo before you start working on the site's content.**
-
->[!NOTE]
->New branches and pull requests should only be created in  your copy of the repo. You will not be making commits directly to **main**. However, you should pull **main** into your local repo to ensure you are working with the latest published content. It will reduce the risk of conflicts and unintentionally overwriting published content once your pull request merges.
- 
-In the documentation, user groups, and support channels, you'll see the terms like **master** and **origin**. Our content will reference the actual names within the repo whenever possible.
-
-### Refresh your local repo often
-
-It is essential to regularly update your local copy of the repo to ensure you have the latest changes. All of the updates approved by the reviewer and merged into the repo will be part of this update. A good routine is to update your local repo before you create or update any open pull requests.
-
-For example, use Git Bash to update your local repo. Change the current working directory to your local project.
-
-```bash
-/c/github/bc/website (main)
-
-$ git checkout main
-$ git pull upstream main
-```
-
-Completing this step before you edit or create content will reduce the possibility of a [merge conflict](https://docs.github.com/en/github/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts#resolving-merge-conflicts).
-
-### Github Desktop
-
-If you are new to Github or would like a quick visual of what's going on in the repo, this is the tool for you. At a glance, you can see the history of changes in the repo you are working in, your latest changes as well as branches you've created. You can use the Github desktop application to get a copy of any repo you are working in. The GitHub website can connect directly to your desktop. The tool also can publish your branch instantly to the repo.
-
-Want to leverage Github Desktop? See [Contributing and collaborating using GitHub Desktop](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop)
-
-### Gitpod
-
-Interesting in trying the online experience? Try https://www.gitpod.io/docs/quickstart
-
-### Tips
-
- The information will be helpful as you being a journey with Github or to refresh your skills. This list is subject to change based on availability. If one of the links no longer works, please advise us, or share a link you've found useful.
-
-- [GitHub Docs](https://docs.github.com/en)
-- [Markdown Cheatsheet](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet)
-- [Basic syntax of markdown](https://www.markdownguide.org/basic-syntax/)
-- [GitHub markdown syntax PDF](https://guides.github.com/pdfs/markdown-cheatsheet-online.pdf)
-- [Create an issue or Pull Request](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/creating-an-issue-or-pull-request)
-
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index bbcbbe7..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/workflow/github-actions-demo.yml b/.github/workflow/github-actions-demo.yml
deleted file mode 100644
index 711d62e..0000000
--- a/.github/workflow/github-actions-demo.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: GitHub Actions Demo
-on: [push]
-jobs:
-  Explore-GitHub-Actions:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
-      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
-      - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
-      - name: Check out repository code
-        uses: actions/checkout@v2
-      - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
-      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
-      - name: List files in the repository
-        run: |
-          ls ${{ github.workspace }}
-      - run: echo "🍏 This job's status is ${{ job.status }}."
diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
deleted file mode 100644
index ee1cb11..0000000
--- a/.github/workflows/greetings.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Greetings
-
-on: [pull_request, issues]
-
-jobs:
-  greeting:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-    steps:
-    - uses: actions/first-interaction@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        issue-message: 'Message that will be displayed on users first issue'
-        pr-message: 'Message that will be displayed on users first pull request'
diff --git a/README.md b/README.md
index ef29e7a..f314ff2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ## **Speak Code**
-SpeakCode - Let's create something useful.
+SpeakCode - A collection of code samples created and shared by the community
 
 ## **Do you speak code?**
 
@@ -7,55 +7,15 @@ Developers reuse code as part of maintenance, new development, or upgrades. Auto
 
 Using an existing library of code, developers can develop new functions or features within the application. These changes are made for accessibility or a change in standards or needs of the business.
 
-### **Examples of code that can be recycled or reused**
-
-**Microservices** (A distinctive method of developing software systems that focus on building single-function modules with well-defined interfaces and operations.). 
-```java
-/* HelloWorld.java
- */
-
-public class HelloWorld
-{
-	public static void main(String[] args) {
-		System.out.println("Hello World!");
-	}
-}
-```
-**Web APIs** (an application programming interface for either a web server or a web browser) and other web-related components often reuse code.
-```json
-var xhr = new XMLHttpRequest();
-xhr.open("GET", "https://reqres.in/api/products/3", true);
-xhr.onload = function(){
-    console.log(xhr.responseText);
-};
-xhr.send();
-```
-				
-
-**Object-oriented programming (OOP)** organizes software design around data, or objects, rather than functions and logic
+### **Usecases for recycling or reusing Code**
+
+**Microservices** (A distinctive method of developing software systems that focus on building single-function modules with well-defined interfaces and operations.). **Web APIs** (an application programming interface for either a web server or a web browser) and other web-related components often reuse code.
+
+ **Object-oriented programming (OOP)** organizes software design around data, or objects, rather than functions and logic
 
 **Modular programming**  is a design technique that emphasizes separating the functionality of a program into independent, interchangeable modules, such that each contains everything necessary to execute only one aspect of the desired functionality.
 
-```python
-def greet(name):
-    """
-    This function greets to
-    the person passed in as
-    a parameter
-    """
-    print("Hello, " + name + ". Good morning!")
-```
-
-```python
-def my_func():
-	x = 12
-	print("Value inside function:",x)
-
-x = 24
-my_func()
-print("Value outside function:",x)
-```
-### **Tips for building your code library**
+### **Tips for building a code library**
 
 * Choose a consistent method for storing and editing modified code. Github is an excellent example of retaining code ownership, history, and change.
 
@@ -73,6 +33,8 @@ print("Value outside function:",x)
 
 Developers can literally spend hours look through blogs, forums, and support for useable code.
 
-**Speak Code** We are working on a special project that has been in the works for years. Decided to take a leap from notebook to screen. So we are working with people that speak the language of code. Our features and project list should be available soon.
+### **We need your help**
 
+**Speak Code** is a way to share your learnings with the community. We are collecting code from the global developer community to share with the world. We are community driven and just getting started so we appreciate your support. 
 
+Check out our shopping list to see what we are looking for. 
\ No newline at end of file
diff --git a/hacktoberfest.md b/hacktoberfest.md
deleted file mode 100644
index 6c8b053..0000000
--- a/hacktoberfest.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Hacktoberfest 2021
-
-Over 100k people from all over the world participate in Hacktoberfest every October by going to GitHub, choosing a repository, and contributing to it.
-
-Contributions are made by submitting a pull request (PR) to any Hacktoberfest-affiliated repository. Your participation in Hacktoberfest will be counted once your pull request is judged acceptable (we'll go over how that works in the upcoming sections).
-
-To be eligible to participate in Hacktoberfest, you must submit at least four accepted pull requests to any of the participating repositories.
-
-
-
diff --git a/images/hacktoberfest.png b/images/hacktoberfest.png
deleted file mode 100644
index 020b102..0000000
Binary files a/images/hacktoberfest.png and /dev/null differ
diff --git a/images/many-roads.jpg b/images/many-roads.jpg
deleted file mode 100644
index 08289d8..0000000
Binary files a/images/many-roads.jpg and /dev/null differ
diff --git a/images/placeholder.txt b/images/placeholder.txt
deleted file mode 100644
index 8b13789..0000000
--- a/images/placeholder.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/learning-path.md b/learning-path.md
deleted file mode 100644
index 0408e43..0000000
--- a/learning-path.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# Learning Path
-
-## The road you choose
-
-![image info](./images/many-roads.jpg)
-
-Many pathways have led or are leading you to your technical career. Some are traditional or non-traditional, others a mix of both. Some of us learn by doing, others by attending boot camps or another type of training or certification. 
-Whatever your learning path is, it must be continuous because technology is not constant. It is constantly changing.
-Because there are so many factors involved in learning about the technology, we wanted to take the opportunity
-to explore technical roles and how you got there. College, Bootcamp, self-taught, certifications.
-
-For this contribution **(Pull Request)**, we need the following information.
-
-
-You can paste this into a blank `markdown` file and being editing. Want a Quick Start? Try [gitpod](https://www.gitpod.io/docs/quickstart).
-
-```txt
-### Your current role
-
-### How many year in that role
-
-### List your path to Learning
-* How did you discover your current role?
-* What skills did you need?
-* What did you have to learn?
-* What are you still learning?
-
-### Recommendations: books, camps, online courses
-Provide links whenever possible.
-
-### One or more key things you have discovered while you are learning.
-
-### A Positive message for those that are starting out.
-```
-
-## Last words
-
-Please name your PR based on your technical role (i.e. system-admin, data-scientist, engineer,e tc)
-
-Our goal is to share this wealth of knowledge on our site when it goes LIVE. Our bigger goal is to show that many paths lead to technology. Hopefully, it will inspire others to continue or pursue it. For us means a job WELL DONE.
-
-**NOTE:** during "[Hacktoberfest](https://hacktoberfest.digitalocean.com/) these **Pull Requests** will be counted as *approved*.
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/install-openqrm.sh b/openQRM-5.3.50-CE/install-openqrm.sh
deleted file mode 100644
index bf25331..0000000
--- a/openQRM-5.3.50-CE/install-openqrm.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-#
-# installs openQRM Community
-#
-
-clear
-WHOAMI=`whoami`
-if [ "$WHOAMI" != "root" ]; then
-	echo "ERROR: Please run this install script as root!"
-	exit 1
-fi
-export OPENQRM_SERVER_INSTALL_DIR=`pushd \`dirname $0\` 1>/dev/null && pwd && popd 1>/dev/null`
-cd $OPENQRM_SERVER_INSTALL_DIR
-clear
-more openQRM-releasenotes.txt
-echo
-echo
-echo
-echo "==========================================================="
-echo "Welcome to the openQRM Community installation"
-echo "==========================================================="
-echo "This script will install openQRM and additional required"
-echo "third-party software on this system. By using this software"
-echo "you accept the GPL License version 2 available at"
-echo "http://www.gnu.org/licenses/gpl-2.0.html"
-echo
-
-read -p "Do you accept the above license terms? [y/n] " -n 1 -r CONFIRM
-if [[ $CONFIRM =~ ^[Yy]$ ]]; then
-	if [ -f /etc/debian_version ]; then
-		apt-get update && apt-get install -y make
-	elif [ -f /etc/redhat-release ]; then
-		yum -y install make
-	elif [ -f /etc/SuSE-release ]; then
-		zypper --non-interactive install make
-	else
-		echo "ERROR: You are trying to install openQRM on an unsupported Linux Distribution!"
-		exit 1
-	fi
-	cd src/
-	make && make install && make start
-fi
-
-echo
-cd -
-exit 0
-
diff --git a/openQRM-5.3.50-CE/openQRM-changelog.txt b/openQRM-5.3.50-CE/openQRM-changelog.txt
deleted file mode 100644
index 92ccb61..0000000
--- a/openQRM-5.3.50-CE/openQRM-changelog.txt
+++ /dev/null
@@ -1,155 +0,0 @@
-openQRM 5.3.40 - 5.3.41 Changelog
------------------------------------
-* updates and refactoring
-* deprecated nagios3, added nagios4
-
-openQRM 5.3.8 - 5.3.40 Changelog
------------------------------------
-* package dependency updates
-* major updates for Debian Buster compatability
-
-openQRM 5.3.3 - 5.3.8 Changelog
------------------------------------
-* New Community release 5.3.8
-* Added bandwidth monitoring plugin in Enterprise version
-
-openQRM 5.3.2 Changelog
------------------------------------
-* New Community release 5.3.2
-* Enhanced package dependencies for latest Ubuntu, Debian and CentOS
-* removed rpmforge repository dependencies
-
-openQRM 5.3.1 Changelog
------------------------------------
-* New Community release 5.3
-* Important security update
-* Many bugfixes and lots of enhancements especially for KVM and Cloud plugin
-
-openQRM 5.2.15 Changelog
------------------------------------
-* Amazon EC2 plugin one-VPC-per User
-* Amazon EC2 plugin Windows automated Application deployment
-
-openQRM 5.2.11 - 5.2.14 Changelog
------------------------------------
-* New Amazon EC2 plugin
-* Improved VMware vSphere integration
-* Improved CentOS Support
-* Improved KVM + VMware-vSphere VNC handling
-
-
-openQRM 5.2.1 - 5.2.11 Changelog
------------------------------------
-* New VMware ESX bulk-install plugin
-* New (beta) VMware vSphere integration
-* New Azure hybrid-cloud support
-* Added Cloud Image-to-Host and Image-Billing to reduce Windows VM license costs
-* Improved usability
-
-
-openQRM 5.2.1 Changelog
------------------------------------
-* Increased robustness and efficiency for the complete Cloud work-flow
-* Enhanced deprovision management intelligence
-* Improved usability of the VMware and KVM VM Wizard
-* Refined error management for the OpenStack and Hybrid Cloud integration
-
-
-openQRM 5.1.0 - 5.1.4 Changelog
------------------------------------
-Featured changes/highlights:
-* new user interface design: Enhanced usability, better user guidance/texts, easier workflows, new wizards
-* new openQRM dashboard: important operational information (datacenter load, events, statistics) and plugin-provided QuickLink buttons at a glance
-* greatly enhanced KVM support (GlusterFS storage for KVM volumes, virtio disk settings can be configured in the UI)
-* greatly enhanced VMWare support (manage existing VMWare ESX systems, install and manage local and network-booted ESX VMs)
-* Ansible Support as additional Configuration Management System next to Puppet
-   The Ansible integration eases up Playbook administration.
-   Ansible is now also integrated in the openQRM Enterprise Cloud in the same way as Puppet
-*  windows, cloud integration, puppet, admin pass, hostname, ip-addresses
-* new libvirt plugin to manage VMs using libvirt
-* new hybrid cloud plugin with enhanced funtionality
-- Amazon Web Services and Eucalyptus API compatibility
-- manage EC2/Eucalyptus instances in the same way as local resources
-- import/export	AMIs/VMs from/to AWS or Eucalyptus
-- WebSSHTerm for web-based instance logins
-- automated application deployment via puppet in EC2/Eucalyptus VMs
-- automated monitoring of EC2/Eucalyptus VMs via nagios
-- Self-Service via the openQRM cloud - easy option to "re-sell" EC2 as private cloud resource
-* all virtualization plugins were merged, old *-storage plugins were removed
-* the term "Appliance" was renamed to "Server" (easier to understand)
-* new spanish translation - big thanks to Larry Rider/Pablo Gonzalez (Activa IT) and Julio Mino
-* cloud: cloudstability plus db consistency check
-* user-friendly single sign-on for the nagios/icinga integration
-* cloud: application deployment abstrations cloud (ansible and puppet, integration option for other Configuration Management Tools like e.g. check, fog ?
-* Cloud: optional direct and secured VNC access to the Cloud VMs Console
-* base: tab-in-tab breadcrumps
-* plugins: configure UI action
-*  windows, cloud integration, puppet, admin pass, hostname, ip-addresses
-
-
-Changes in openQRM Base:
-* enhanced server wizard, possibility to skip unneeded steps
-* improved boot-service configuration, the boot-services now can also be configured through the openqrm commandline utility
-* initrds for network-deployment and configuration files in plugin boot-services are automatically updated during regular openQRM updates
-* enhanced packaging (deb/rpm), implemented robust package update
-* enhanced virtual-resource-command hook allowing to shutdown hosts via API calls
-* easily make existing physical/logical storage volumes available for use with any virtualization type
-
-
-Plugin changes:
-* lcmc: updated the cluster management console lcmc to version 1.5.4
-* local-storage: plugin renamed from local-storage to clonezilla
-* cloud: 
-- added option to specify the load balancing algorithm for finding the next available cloud virtualization host (by host load, memory utilization, random, resource limits per host)
-- added option to specify a VM provisioning delay in the cloud to reduce load spikes
-- added option in the openQRM cloud portal to change resource parameters (cpu/memory) in own cloud requests
-* dhcpd: enhanced dhcpd plugin
-- support for all classes of networks (A/B/C) for use as openQRM management network
-- support for multi-homed setups with several managed networks
-* sshterm: patched bug in webshell (sshterm plugin) to work with python 2.7
-* kvm: 
-- implemented option to set the VNC keyboard mapping for KVM VMs
-- enhanced monitoring for local-deployment VMs
-- configuration changes now possible for running VMs (changes applied at next VM reboot)
-- using qemu-img now to create kvm volumes providing different qemu disk formats (raw, cow, qcow, qcow2)
-- now supports native qemu-img snapshots for blockfiles (kvm-bf-deployment and kvm-gluster-deployment)
-- now supports native Gluster integration (new deployment type kvm-gluster-deployment)
-- added option to automatically shutdown the openQRM management network link after deployment and startup of VMs (for enhanced security)
-* hybrid-cloud: now talking transparently to AWS EC2 and Eucalyptus APIs to manage instances, EBS volumes/snapshots, etc.
-* all plugins: added and enhanced included online documentation
-
-
-New plugins (Enterprise Edition only):
-* new event-mailer plugin to send event notifications to openQRM administrators by email
-* new role-administration plugin:
-- allows to setup fine-grained administrator permissions on every aspect of the openQRM system
-- allows to map the business topology to openQRM roles (e.g. only allow storage departments to allocate/manage storage)
-
-
-New plugins (in Enterprise and Community Edition):
-* Ansible Support as additional Configuration Management System next to Puppet
-   The Ansible integration eases up Playbook administration.
-   Ansible is now also integrated in the openQRM Enterprise Cloud in the same way as Puppet
-* new device-manager plugin provides easy LVM pre-configuration for storage setup (create/manage LVM physical volumes and volume groups)
-* new network-manager plugin provides easy network and bridging pre-configuration for virtualization hosts
-* new development plugin to automatically generate documentation of the REST API, templates, translation status, css and js in openQRM
-* new template plugin implementing all available plugin-hooks in openQRM (as a base to easily create your own custom plugins)
-* new libvirt plugin integrates libvirt as additional resource provider
-
-
-Bugfixes:
-* security: only allow openQRM's update-stats to trigger the plugin hooks
-* security: fixed bug in iframe to not allow any remote URLs to be loaded
-* security: fixed bug in [plugin]-action.php to not allow remote access to the stat directories
-* minor fixes in nfs-storage for manually configured/unmanaged NAS/NFS systems
-* fixed many typos and wording issues
-* base: avoid remove initial base objects (resource 0, default kernel, openqrm and idle image)
-* cloud-zones: fixed register user url
-
-
-Deprecated functionality:
-- deprecated coraid-storage, equallogic-storage, netapp-storage, vbox and zfs-storage plugins
-
-
-
-
diff --git a/openQRM-5.3.50-CE/openQRM-releasenotes.txt b/openQRM-5.3.50-CE/openQRM-releasenotes.txt
deleted file mode 100644
index 2054c53..0000000
--- a/openQRM-5.3.50-CE/openQRM-releasenotes.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-openQRM Community 5.3.50 Release Notes
----------------------------------------------
-OPENQRM AUSTRALIA PTY LTD
-
->> Welcome to the openQRM Community Edition 5.3.50
-
->> openQRM Installation - How to get started
-Install a minimal latest 64bit Ubuntu or Debian system on a physical machine. 
-Login to the system, get root access and download a copy of openQRM-5.3.50-Community-Edition.tar.gz to the system.
-
-Extract it using these commands:
-
-  tar xvzfp openQRM-5.3.50-Community-Edition.tar.gz
-  cd openQRM-5.3.50-Community-Edition
-  ./install-openqrm.sh
-
-The installation script will guide you through the process. You will be prompted for some password or setup choices. Please answer these questions according to your requirements.
-
-
-After the installation has completed, go to the web-based openQRM setup.
-
-Open this URL in a browser: http://<IP of your machine>/openqrm
-Username: openqrm
-Password: openqrm
-
-Follow the instructions and enter the desired network settings and database credentials. 
-
->> Hardware recommendations for evaluation
-* 1 physical system (for openQRM server and required network, virtualization and storage services)
-* Intel or AMD 64bit dual/quad core CPU
-* VT CPU extension (full virtualization support) activated
-* at least 1 GB RAM (the more the better)
-* at least 20 GB of free harddisk/partition space to store server images on
-* 1 network interface card (1 Gbit/s)
-* Internet access to download required software
-
-Please visit our website https://openqrm-enterprise.com
-Community Support is available at http://sourceforge.net/p/openqrm/discussion
diff --git a/openQRM-5.3.50-CE/src/Makefile b/openQRM-5.3.50-CE/src/Makefile
deleted file mode 100644
index 2d3c6ac..0000000
--- a/openQRM-5.3.50-CE/src/Makefile
+++ /dev/null
@@ -1,138 +0,0 @@
-# this is the main openQRM Makefile
-#.SILENT:
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/etc/openqrm-server.conf
-export OPENQRM_SOURCE_DIR=$(shell pwd)
-
-all: buildrequirements configure compile
-	@for SRC_DIR in `find -mindepth 1 -maxdepth 1 -type d -not -name ".svn" -not -name "debian" -not -name "rpm" -not -name "thirdparty"`; do cd $$SRC_DIR && make all -s && cd ..; done
-
-configure:
-	@for SRC_DIR in `find -mindepth 1 -maxdepth 1 -type d -not -name ".svn" -not -name "debian" -not -name "rpm" -not -name "thirdparty"`; do cd $$SRC_DIR && make configure -s && cd ..; done
-
-compile:
-	@for SRC_DIR in `find -mindepth 1 -maxdepth 1 -type d -not -name ".svn" -not -name "debian" -not -name "rpm" -not -name "thirdparty"`; do cd $$SRC_DIR && make -s && cd ..; done
-
-initrd:
-	@chmod +x make-assistant
-	@. $(OPENQRM_SERVER_CONF) && ./make-assistant openqrm_create_default_initrd_template
-	@. $(OPENQRM_SERVER_CONF) && ./make-assistant openqrm_pack_default_initrd_template
-
-install:
-	@chmod +x make-assistant
-	@. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm
-	@for SRC_DIR in `find -mindepth 1 -maxdepth 1 -type d -not -name ".svn" -not -name "debian" -not -name "rpm" -not -name "thirdparty"`; do cd $$SRC_DIR && make install -s && cd ..; done
-	@. $(OPENQRM_SERVER_CONF) && find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm -name *.php | xargs -r chmod -x
-	@. $(OPENQRM_SERVER_CONF) && find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm -name *.css | xargs -r chmod -x
-	@. $(OPENQRM_SERVER_CONF) && find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm -name *.conf | xargs -r chmod -x
-	@. $(OPENQRM_SERVER_CONF) && find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm -name *.png | xargs -r chmod -x
-	@. $(OPENQRM_SERVER_CONF) && find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm -name *.gif | xargs -r chmod -x
-	@. $(OPENQRM_SERVER_CONF) && find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm -name *.jpg | xargs -r chmod -x
-	@. $(OPENQRM_SERVER_CONF) && find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm -name *.spec | xargs -r chmod -x
-	@. $(OPENQRM_SERVER_CONF) && find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm -name *configuration.template | xargs -r chmod -x
-	@. $(OPENQRM_SERVER_CONF) && find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm -name *deb.control | xargs -r chmod -x
-	@. $(OPENQRM_SERVER_CONF) && find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm -name openqrm-pxelinux | xargs -r chmod -x
-	@. $(OPENQRM_SERVER_CONF) && find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm -name *-functions | xargs -r chmod +x
-	@. $(OPENQRM_SERVER_CONF) && find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm -name *-hook | xargs -r chmod +x
-	@. $(OPENQRM_SERVER_CONF) && find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm -name *-deployment | xargs -r chmod +x
-	@. $(OPENQRM_SERVER_CONF) && find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm -name root-mount* | xargs -r chmod +x
-	@. $(OPENQRM_SERVER_CONF) && find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm -name *-maintenance | xargs -r chmod +x
-	@. $(OPENQRM_SERVER_CONF) && find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm -name *-ifup | xargs -r chmod +x
-	@. $(OPENQRM_SERVER_CONF) && find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm -name *commit.tmpl | xargs -r chmod +x
-	@. $(OPENQRM_SERVER_CONF) && if [ -d $(DESTINATION_DIR)/etc/openqrm ]; then find $(DESTINATION_DIR)/etc/openqrm -name *.conf | xargs -r chmod -x; fi
-	@. $(OPENQRM_SERVER_CONF) && if [ -d $(DESTINATION_DIR)/etc/openqrm ]; then find $(DESTINATION_DIR)/etc/openqrm -name *deb.control | xargs -r chmod -x; fi
-	@. $(OPENQRM_SERVER_CONF) && if [ -d $(DESTINATION_DIR)/etc/openqrm ]; then find $(DESTINATION_DIR)/etc/openqrm -name openqrm-pxelinux | xargs -r chmod -x; fi
-	@. $(OPENQRM_SERVER_CONF) && if [ -d $(DESTINATION_DIR)/etc/openqrm ]; then find $(DESTINATION_DIR)/etc/openqrm -name *.spec | xargs -r chmod -x; fi
-	@. $(OPENQRM_SERVER_CONF) && if [ -d $(DESTINATION_DIR)/etc/openqrm ]; then find $(DESTINATION_DIR)/etc/openqrm -name *-functions | xargs -r chmod +x; fi
-	@. $(OPENQRM_SERVER_CONF) && if [ -d $(DESTINATION_DIR)/etc/openqrm ]; then find $(DESTINATION_DIR)/etc/openqrm -name *-maintenance | xargs -r chmod +x; fi
-
-
-start: check
-	@whoami | grep root 1>/dev/null 2>&1 || (echo "Please run 'make start' as root" && exit 1)
-	@. $(OPENQRM_SERVER_CONF) && chmod +x $$OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d/openqrm
-	@. $(OPENQRM_SERVER_CONF) && ln -sf $$OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d/openqrm /etc/init.d/openqrm
-	@/etc/init.d/openqrm start
-
-stop:
-	@whoami | grep root 1>/dev/null 2>&1 || (echo "Please run 'make stop' as root" && exit 1)
-	@if [ -x /etc/init.d/openqrm ]; then /etc/init.d/openqrm stop; fi
-
-uninstall: stop
-	@whoami | grep root 1>/dev/null 2>&1 || (echo "Please run 'make uninstall' as root" && exit 1)
-	@. $(OPENQRM_SERVER_CONF) && if [ ! -d $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm ]; then echo "openQRM not installed"; exit 1; fi
-	@if [ -x /etc/init.d/openqrm ]; then /etc/init.d/openqrm uninstall; fi
-	@for SRC_DIR in `find -mindepth 1 -maxdepth 1 -type d -not -name ".svn" -not -name "debian" -not -name "rpm"`; do cd $$SRC_DIR && make uninstall -s && cd ..; done
-	@. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm
-
-clean:
-	@for SRC_DIR in `find -mindepth 1 -maxdepth 1 -type d -not -name ".svn" -not -name "debian" -not -name "rpm" -not -name "thirdparty"`; do cd $$SRC_DIR && make clean -s && cd ..; done
-
-realclean:	clean
-	@for SRC_DIR in `find -mindepth 1 -maxdepth 1 -type d -not -name ".svn" -not -name "debian" -not -name "rpm" -not -name "thirdparty"`; do cd $$SRC_DIR && make realclean -s && cd ..; done
-
-rpm: all
-	@whoami | grep root 1>/dev/null 2>&1 || (echo "Please run 'make rpm' as root" && exit 1)
-	@chmod +x make-assistant
-	@. $(OPENQRM_SERVER_CONF) && ./make-assistant openqrm_rpm_package
-
-reinstall: 
-	make uninstall -s
-	make clean -s
-	make all -s
-	make install -s
-	make start -s
-
-debsource: all
-	@chmod +x make-assistant
-	@. $(OPENQRM_SERVER_CONF) && ./make-assistant openqrm_create_deb_source
-
-deb:
-	@whoami | grep root 1>/dev/null 2>&1 || (echo "Please run 'make deb' as root" && exit 1)
-	@chmod +x make-assistant
-	@. $(OPENQRM_SERVER_CONF) && ./make-assistant openqrm_pbuilder
-
-packages:
-	@whoami | grep root 1>/dev/null 2>&1 || (echo "Please run 'make deb' as root" && exit 1)
-	@chmod +x make-assistant
-	@. $(OPENQRM_SERVER_CONF) && ./make-assistant openqrm_packages
-
-check:
-	@chmod +x make-assistant
-	@. $(OPENQRM_SERVER_CONF) && ./make-assistant openqrm_check_requirements
-
-buildrequirements:
-	@chmod +x make-assistant
-	@. $(OPENQRM_SERVER_CONF) && ./make-assistant openqrm_check_build_requirements
-	if [ -d ./thirdparty ]; then mkdir -p ../buildtmp; cp -aR ./thirdparty/* ../buildtmp/; fi
-
-updatesrc:
-	@if [ -d .svn ]; then svn update;fi
-
-update: all
-	@. $(OPENQRM_SERVER_CONF) && if [ ! -d $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/bin ]; then echo "openQRM is not installed - $(DESTINATION_DIR) $$OPENQRM_SERVER_BASE_DIR $(OPENQRM_SERVER_CONF)" && exit 1; fi
-	@chmod +x make-assistant
-	@. $(OPENQRM_SERVER_CONF) && cp -f bin/openqrm-update $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/bin/openqrm-update && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/bin/openqrm-update
-	@. $(OPENQRM_SERVER_CONF) && cp -f include/openqrm-build-functions $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/include/
-	@. $(OPENQRM_SERVER_CONF) && ./make-assistant openqrm_pre_update
-	@. $(OPENQRM_SERVER_CONF) && ./make-assistant make install
-	@. $(OPENQRM_SERVER_CONF) && ./make-assistant openqrm_base_update
-	@. $(OPENQRM_SERVER_CONF) && ./make-assistant openqrm_post_update
-	@. $(OPENQRM_SERVER_CONF) && ./make-assistant openqrm_initrd_update
-
-
-.PHONY: all configure compile install start uninstall clean realclean reinstall rpm deb debsource packages check initrd buildrequirements updatesrc update
-
diff --git a/openQRM-5.3.50-CE/src/bin/Makefile b/openQRM-5.3.50-CE/src/bin/Makefile
deleted file mode 100644
index 2139006..0000000
--- a/openQRM-5.3.50-CE/src/bin/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# this is the openQRM bin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/bin
-	. $(OPENQRM_SERVER_CONF) && cp openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/bin/ && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/bin/*
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/bin/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/bin
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/bin/openqrm b/openQRM-5.3.50-CE/src/bin/openqrm
deleted file mode 100644
index ccc89bc..0000000
--- a/openQRM-5.3.50-CE/src/bin/openqrm
+++ /dev/null
@@ -1,581 +0,0 @@
-#!/bin/bash
-# this is the openQRM commandline client
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../..
-	OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-fi
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-# unblock starting command queue early for non-blocking + ui commands
-OPENQRM_COMMAND=$1
-if [ "$OPENQRM_COMMAND" == "license" ] || [ "$OPENQRM_COMMAND" == "boot-service" ]; then
-	openqrm_unblock_starting_queue $@
-	NON_BLOCKING=true
-fi
-
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-export OPENQRM_SERVER_BASE_DIR
-
-# let only root run this script
-WHOAMI=`whoami`
-if [ "$WHOAMI" != "root" ]; then
-	echo "ERROR: Please run this script as root!"
-	exit 6
-fi
-
-
-function openqrm_usage() {
-	echo
-	echo "Usage:"
-	echo "`basename $0` help			- This help screen"
-	echo
-	echo "- openQRM Console -"
-	echo "`basename $0` console"
-	echo
-	echo "- Managing boot-images -"
-	echo "`basename $0` kernel add -n <name> -v <version> -u <username> -p <password> [-l <location> -i <initramfs/ext2> -t <path-to-initrd-template-file> -m <list of unwantd modules comma separated>]"
-	echo "`basename $0` kernel remove -n <name> -u <username> -p <password>"
-	echo
-	echo "- Managing server-states -"
-	echo "`basename $0` state backup -n <name>"
-	echo "`basename $0` state restore -n <name>"
-	echo "`basename $0` state remove -n <name>"
-	echo "`basename $0` state list"
-	echo
-	echo "- Managing server-configuration -"
-	echo "`basename $0` init_config [restore]"
-	echo
-	echo "- Managing Plugin Boot-Services -"
-	echo "`basename $0` boot-service configure -n <plugin-name> -a default -k <key> -v <value>"
-	echo "`basename $0` boot-service configure -n <plugin-name> -a <appliance-name> -k <key> -v <value>"
-	echo
-	echo "`basename $0` boot-service view -n <plugin-name> -a default"
-	echo "`basename $0` boot-service view -n <plugin-name> -a <appliance-name>"
-	echo
-	echo "- Login to resources -"
-	echo "`basename $0` login -i <resource-ip>"
-	echo
-	echo "- Managing Licenses -"
-	echo "`basename $0` license -l <path-to-license-file>"
-
-
-}
-
-# logs for init_config
-function init_config_log() {
-	local MESSAGE=$@
-	logger -i -t "openQRM init-config" "$MESSAGE"
-}
-
-
-
-# main
-case "$1" in
-	kernel)
-		shift
-		if [ $# == 0 ]; then
-			openqrm_usage
-			exit 0
-		fi
-
-		case "$1" in
-			add)
-				shift
-				if [ $# == 0 ]; then
-					openqrm_usage
-					exit 0
-				fi
-				while [ $# -ne 0 ]; do
-					case "$1" in
-						-n)
-							BOOT_IMAGE_NAME=$2
-							shift
-							;;
-						-v)
-							BOOT_IMAGE_VERSION=$2
-							shift
-							;;			
-						-l)
-							BOOT_IMAGE_LOCATION=$2
-							shift
-							;;
-						-i)
-							BOOT_IMAGE_INITRD_TYPE=$2
-							shift
-							;;
-						-t)
-							BOOT_IMAGE_INITRD_TEMPLATE=$2
-							shift
-							;;
-						-u)
-							OPENQRM_USERNAME=$2
-							shift
-							;;
-						-p)
-							OPENQRM_PASSWORD=$2
-							shift
-							;;
-						-m)
-							OPENQRM_UNWANTED_MODULES_PARAM=$2
-							shift
-							;;
-					esac
-					shift
-				done
-				if [ "$BOOT_IMAGE_NAME" == "" ] || [ "$BOOT_IMAGE_VERSION" == "" ] || [ "$OPENQRM_USERNAME" == "" ] || [ "$OPENQRM_PASSWORD" == "" ]; then
-					openqrm_usage
-					exit 1
-				fi
-				if [ "$BOOT_IMAGE_LOCATION" == "" ]; then
-					BOOT_IMAGE_LOCATION=/
-				fi
-				if [ "$BOOT_IMAGE_INITRD_TYPE" == "" ]; then
-					BOOT_IMAGE_INITRD_TYPE="initramfs"
-				fi
-				if [ "$BOOT_IMAGE_INITRD_TEMPLATE" == "" ]; then
-					BOOT_IMAGE_INITRD_TEMPLATE=$OPENQRM_DEFAULT_INITRD_TEMPLATE
-				fi
-				openqrm_server_create_kernel $BOOT_IMAGE_NAME $BOOT_IMAGE_VERSION $BOOT_IMAGE_LOCATION $BOOT_IMAGE_INITRD_TYPE $BOOT_IMAGE_INITRD_TEMPLATE $OPENQRM_UNWANTED_MODULES_PARAM
-				if ! openqrm_server_manage_kernel add $OPENQRM_USERNAME $OPENQRM_PASSWORD $BOOT_IMAGE_NAME $BOOT_IMAGE_VERSION; then
-					echo "WARNING: Could not add the kernel to the openQRM-server!"
-					exit -1
-				fi
-				;;
-
-			remove)
-				shift
-				if [ $# == 0 ]; then
-					openqrm_usage
-					exit 0
-				fi
-				while [ $# -ne 0 ]; do
-					case "$1" in
-						-n)
-							BOOT_IMAGE_NAME=$2
-							shift
-							;;
-						-u)
-							OPENQRM_USERNAME=$2
-							shift
-							;;
-						-p)
-							OPENQRM_PASSWORD=$2
-							shift
-							;;
-					esac
-					shift
-				done
-				if [ "$BOOT_IMAGE_NAME" == "" ] || [ "$OPENQRM_USERNAME" == "" ] || [ "$OPENQRM_PASSWORD" == "" ]; then
-					openqrm_usage
-					exit 1
-				fi
-				rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/vmlinuz-$BOOT_IMAGE_NAME
-				rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/System.map-$BOOT_IMAGE_NAME
-				rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/modules-$BOOT_IMAGE_NAME.tgz
-				rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/initrd-$BOOT_IMAGE_NAME.img
-				if ! openqrm_server_manage_kernel remove $OPENQRM_USERNAME $OPENQRM_PASSWORD $BOOT_IMAGE_NAME $BOOT_IMAGE_VERSION; then
-					echo "WARNING: Could not remove the kernel to the openQRM-server!"
-					exit -1
-				fi
-				;;
-
-		esac
-		;;
-
-
-	state)
-		shift
-		if [ $# == 0 ]; then
-			openqrm_usage
-			exit 0
-		fi
-		export OPENQRM_SERVER_BASE_DIR
-
-		case "$1" in
-			backup)
-				shift
-				if [ $# == 0 ]; then
-					openqrm_usage
-					exit 0
-				fi
-				while [ $# -ne 0 ]; do
-					case "$1" in
-						-n)
-							BACKUP_STATE_NAME=$2
-							shift
-							;;
-					esac
-					shift
-				done
-				if [ "$BACKUP_STATE_NAME" == "" ]; then
-					openqrm_usage
-					exit 1
-				fi
-				openqrm_server_state backup $BACKUP_STATE_NAME
-				;;
-
-			restore)
-				shift
-				if [ $# == 0 ]; then
-					openqrm_usage
-					exit 0
-				fi
-				while [ $# -ne 0 ]; do
-					case "$1" in
-						-n)
-							BACKUP_STATE_NAME=$2
-							shift
-							;;
-					esac
-					shift
-				done
-				if [ "$BACKUP_STATE_NAME" == "" ]; then
-					openqrm_usage
-					exit 1
-				fi
-				openqrm_server_state restore $BACKUP_STATE_NAME
-				;;
-
-			remove)
-				shift
-				if [ $# == 0 ]; then
-					openqrm_usage
-					exit 0
-				fi
-				while [ $# -ne 0 ]; do
-					case "$1" in
-						-n)
-							BACKUP_STATE_NAME=$2
-							shift
-							;;
-					esac
-					shift
-				done
-				if [ "$BACKUP_STATE_NAME" == "" ]; then
-					openqrm_usage
-					exit 1
-				fi
-				openqrm_server_state remove $BACKUP_STATE_NAME
-				;;
-
-			list)
-				openqrm_server_state list
-				;;
-		esac
-		;;
-
-
-	login)
-		shift
-		if [ $# == 0 ]; then
-			openqrm_usage
-			exit 0
-		fi
-		while [ $# -ne 0 ]; do
-			case "$1" in
-				-i)
-					RESOURCE_IP_ADDRESS=$2
-					shift
-					;;
-			esac
-			shift
-		done
-		if [ "$RESOURCE_IP_ADDRESS" == "" ]; then
-			openqrm_usage
-			exit 1
-		fi
-		echo "Login to resource $RESOURCE_IP_ADDRESS ..."
-		dbclient -K 10 -y -i $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear/dropbear_rsa_host_key -p $OPENQRM_EXEC_PORT root@$RESOURCE_IP_ADDRESS
-		;;
-
-
-	license)
-		shift
-		if [ $# == 0 ]; then
-			openqrm_usage
-			exit 0
-		fi
-		while [ $# -ne 0 ]; do
-			case "$1" in
-				-l)
-					LICENSE_FILE=$2
-					shift
-					;;
-			esac
-			shift
-		done
-		if [ "$LICENSE_FILE" == "" ]; then
-			openqrm_usage
-			exit 1
-		fi
-		if [ ! -f "$LICENSE_FILE" ]; then
-			echo "ERROR: License file $LICENSE_FILE does not exist!"
-			exit 1
-		fi
-		if [ ! -d $OPENQRM_SERVER_BASE_DIR/openqrm/etc/license ]; then
-			mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/etc/license
-		fi
-		if /bin/cp -f $LICENSE_FILE $OPENQRM_SERVER_BASE_DIR/openqrm/etc/license/; then
-			echo "Activating License file $LICENSE_FILE"
-			rm -f $LICENSE_FILE
-		else
-			echo "ERROR: Could not activate License file $LICENSE_FILE"
-			rm -f $LICENSE_FILE
-			exit 1
-		fi
-
-		;;
-
-
-	console)
-		echo "starting the openQRM Console"
-		export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-		. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-		export FORCE_INSTALL=true
-		openqrm_install_os_dependency lynx
-		lynx http://localhost/openqrm
-		;;
-
-
-	init_config)
-		shift
-		RESTORE_LAST_STATE=$1
-		INIT_CONFIG_LOCK="$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/running_init_config"
-		if [ -f $INIT_CONFIG_LOCK ]; then
-			init_config_log "init_config already running. Skipping re-init"
-			exit 0
-		fi
-		if [ -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/unconfigured ]; then
-
-			# setup traps, make sure we do not get stopped by timeout
-			trap "" HUP
-			trap "" INT
-			trap "" QUIT
-			trap "" KILL
-			trap "" TSTP
-			
-			# create lock
-			touch $INIT_CONFIG_LOCK
-			init_config_log "Initializing the openQRM Database"
-
-			# initialize the database
-			chmod +x $OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/$OPENQRM_DATABASE_TYPE/openqrm-$OPENQRM_DATABASE_TYPE-functions
-			if ! $OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/$OPENQRM_DATABASE_TYPE/openqrm-$OPENQRM_DATABASE_TYPE-functions init; then
-				init_config_log "ERROR: Initializing the openQRM Database failed !"
-				rm -f $INIT_CONFIG_LOCK
-				exit -1
-			fi
-
-			# check if we should restore the last state
-			if [ "$RESTORE_LAST_STATE" == "restore" ]; then
-				init_config_log "Restoring last openQRM state backup"
-				# check if backups are not locked
-				if [ ! -f $OPENQRM_SERVER_STATE_DIR/locked ]; then
-					if [ "$OPENQRM_RESTORE_STATE" != "false" ]; then
-						# check if there is a server state to restore
-						LAST_SERVER_STATE_BACKUP=`ls -tr $OPENQRM_SERVER_STATE_DIR/uninstall-* 2>/dev/null | tail -n1 | sed -s "s/\.tgz//g"`
-						if [ "$LAST_SERVER_STATE_BACKUP" != "" ]; then
-							LAST_SERVER_STATE_BACKUP=`basename $LAST_SERVER_STATE_BACKUP`
-							init_config_log "Found backup of last openQRM Server state $LAST_SERVER_STATE_BACKUP, restoring it"
-							openqrm_server_state restore $LAST_SERVER_STATE_BACKUP
-						fi
-					fi
-				else
-					init_config_log "Found openQRM Server state backups locked by $OPENQRM_SERVER_STATE_DIR/locked"
-				fi
-			fi
-
-			# create $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/default
-			init_config_log "Creating default PXE-configuration"
-			mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/
-			openqrm_server_create_pxe_config -1 default default
-
-			# add automatic startup to init
-			if [ -e /etc/init.d/openqrm-enterprise ]; then
-				openqrm_chkconfig add openqrm-enterprise
-			elif [ -e /etc/init.d/openqrm ]; then
-				openqrm_chkconfig add openqrm
-			fi
-
-			# here we create + add the default kernel+kernel-version to the openQRM Server
-			# via the kernel-action.form. If this returns bad something is wrong
-			DEFAULT_KERNEL_VERSION=`uname -r`
-			
-			IS_WSL=`uname -r | grep WSL`
-			#not a WSL environment
-			if [ -z "$IS_WSL" ]; then
-				init_config_log "Creating the default kernel version $DEFAULT_KERNEL_VERSION"
-				INITRD_TYPE="initramfs"
-				openqrm_server_create_kernel default $DEFAULT_KERNEL_VERSION / $INITRD_TYPE
-				if ! openqrm_server_manage_kernel add openqrm openqrm default $DEFAULT_KERNEL_VERSION; then
-					init_config_log "Could not create/add the default kernel ! Initialization failed !"
-					exit -1
-					rm -f $INIT_CONFIG_LOCK
-				fi
-
-			fi
-
-			# remove configure lock
-			rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/unconfigured
-
-			# start monitoring subsystem and plugins
-			if [ -x /usr/bin/screen.real ]; then
-				RUNSCREEN="/usr/bin/screen.real"
-			else
-				RUNSCREEN=`which screen`
-			fi
-			SCREEN_NAME=`date +%T%x | sed -e "s/://g" | sed -e "s#/##g"`
-			$RUNSCREEN -dmS $SCREEN_NAME $OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-monitord
-			if [ -d $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/ ]; then
-				for OPENQRM_PLUGIN in `ls $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/`; do
-					if [ -x $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN ]; then
-						$RUNSCREEN -dmS $OPENQRM_PLUGIN $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN start
-					fi
-				done
-			fi
-			init_config_log "Successfully initialized and started the openQRM Server"
-			rm -f $INIT_CONFIG_LOCK
-			exit 0
-
-		else
-			init_config_log "This openQRM Server is already configured. Skipping re-init"
-			exit 0
-		fi
-		;;
-
-
-
-	boot-service)
-		shift
-		if [ $# == 0 ]; then
-			openqrm_usage
-			exit 0
-		fi
-		BOOT_SERVICE_COMMAND=$1
-		shift
-		while [ $# -ne 0 ]; do
-			case "$1" in
-				-a)
-					APPLIANCE_NAME=$2
-					shift
-					;;
-				-n)
-					PLUGIN_NAME=$2
-					shift
-					;;
-				-v)
-					BOOT_SERVICE_VALUE=$2
-					shift
-					;;
-				-k)
-					BOOT_SERVICE_KEY=$2
-					shift
-					;;
-			esac
-			shift
-		done
-
-		case "$BOOT_SERVICE_COMMAND" in
-			configure)
-				if [ "$APPLIANCE_NAME" == "" ] || [ "$PLUGIN_NAME" == "" ] || [ "$BOOT_SERVICE_VALUE" == "" ] || [ "$BOOT_SERVICE_KEY" == "" ]; then
-					openqrm_usage
-					exit 1
-				fi
-				# create empty value
-				if [ $BOOT_SERVICE_VALUE == "NoValue" ]; then
-					BOOT_SERVICE_VALUE=""
-				fi
-				if [ ! -f "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/etc/openqrm-plugin-$PLUGIN_NAME.conf" ]; then
-					echo "ERROR: Cannot find Boot-Service configuration of Plugin $PLUGIN_NAME!"
-					exit -1
-				fi
-				if ! grep -w ^$BOOT_SERVICE_KEY $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/etc/openqrm-plugin-$PLUGIN_NAME.conf 2>&1 1>/dev/null; then
-					echo "ERROR: Cannot find key in Boot-Service configuration of Plugin $PLUGIN_NAME!"
-					exit -1
-				fi
-
-				if [ "$APPLIANCE_NAME" == "default" ]; then
-					echo "Setting up default Boot-Service Konfiguration of plugin $PLUGIN_NAME"
-					BOOT_SERVICE_CONFIG_FILE="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/etc/openqrm-plugin-$PLUGIN_NAME.conf"
-					if [ -f "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/web/boot-service-$PLUGIN_NAME.tgz" ]; then
-						# adjust the config in the boot-service.tgz file
-						echo "- adjusting boot-service of plugin $PLUGIN_NAME at $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/web/boot-service-$PLUGIN_NAME.tgz"
-						rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/web/boot-service.tmp
-						mkdir $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/web/boot-service.tmp
-						if ! tar -C $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/web/boot-service.tmp -xzf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/web/boot-service-$PLUGIN_NAME.tgz; then
-							echo "ERROR: Could not unpack boot-service of of Plugin $PLUGIN_NAME at $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/web/boot-service-$PLUGIN_NAME.tgz!"
-							exit -1
-						fi
-						if [ -f "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/web/boot-service.tmp/etc/openqrm-plugin-$PLUGIN_NAME.conf" ]; then
-							sed -i -e "s#$BOOT_SERVICE_KEY.*#$BOOT_SERVICE_KEY=\"$BOOT_SERVICE_VALUE\"#g" $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/web/boot-service.tmp/etc/openqrm-plugin-$PLUGIN_NAME.conf
-							TIMESTAMP=`date +%s`
-							mv -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/web/boot-service-$PLUGIN_NAME.tgz $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/web/boot-service-$PLUGIN_NAME.tgz.$TIMESTAMP
-							cd $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/web/boot-service.tmp/ && tar -czf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/web/boot-service-$PLUGIN_NAME.tgz * && cd -
-							rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/web/boot-service.tmp
-						fi
-					fi
-				else
-					echo "Setting up custom Boot-Service Konfiguration of plugin $PLUGIN_NAME for Appliance $APPLIANCE_NAME"
-					if [ ! -f "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/etc/appliances/openqrm-plugin-$PLUGIN_NAME.$APPLIANCE_NAME.conf" ]; then
-						mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/etc/appliances
-						/bin/cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/etc/openqrm-plugin-$PLUGIN_NAME.conf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/etc/appliances/openqrm-plugin-$PLUGIN_NAME.$APPLIANCE_NAME.conf
-					fi
-					mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/plugins
-					if [ ! -h $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/plugins/$PLUGIN_NAME ]; then
-						rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/plugins/$PLUGIN_NAME
-						ln -s $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/etc/appliances $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/plugins/$PLUGIN_NAME
-					fi
-					BOOT_SERVICE_CONFIG_FILE="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/etc/appliances/openqrm-plugin-$PLUGIN_NAME.$APPLIANCE_NAME.conf"
-				fi
-				sed -i -e "s#$BOOT_SERVICE_KEY.*#$BOOT_SERVICE_KEY=\"$BOOT_SERVICE_VALUE\"#g" $BOOT_SERVICE_CONFIG_FILE
-				;;
-
-
-			view)
-				if [ "$APPLIANCE_NAME" == "" ] || [ "$PLUGIN_NAME" == "" ]; then
-					openqrm_usage
-					exit 1
-				fi
-
-				if [ "$APPLIANCE_NAME" == "default" ]; then
-					if [ ! -f "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/etc/openqrm-plugin-$PLUGIN_NAME.conf" ]; then
-						echo "ERROR: Cannot find Boot-Service configuration of Plugin $PLUGIN_NAME!"
-						exit -1
-					fi
-					BOOT_SERVICE_CONFIG_FILE="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/etc/openqrm-plugin-$PLUGIN_NAME.conf"
-				else
-					if [ ! -f "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/etc/appliances/openqrm-plugin-$PLUGIN_NAME.$APPLIANCE_NAME.conf" ]; then
-						echo "NOTCIE: Boot-Service configuration of Plugin $PLUGIN_NAME for Appliance $APPLIANCE_NAME not configured yet"
-						exit 0
-					fi
-					BOOT_SERVICE_CONFIG_FILE="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/etc/appliances/openqrm-plugin-$PLUGIN_NAME.$APPLIANCE_NAME.conf"
-				fi
-				cat $BOOT_SERVICE_CONFIG_FILE
-				;;
-		esac
-		;;
-
-
-
-	*)
-		openqrm_usage
-		;;
-
-esac
-
-
diff --git a/openQRM-5.3.50-CE/src/bin/openqrm-cmd b/openQRM-5.3.50-CE/src/bin/openqrm-cmd
deleted file mode 100644
index 4eda647..0000000
--- a/openQRM-5.3.50-CE/src/bin/openqrm-cmd
+++ /dev/null
@@ -1,219 +0,0 @@
-#!/bin/bash
-# this is the openQRM commandline client
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../..
-	OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-fi
-export OPENQRM_SERVER_BASE_DIR
-# check if running on the server or on a managed resource
-if [ -f "$OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions" ]; then
-	# we are running on the server
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-	openqrm_server_get_config
-	OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-	resource_id=0
-	resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-else
-	# we are running on a managed resource
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-fi
-WHOAMI=`whoami`
-FULL_COMMAND=`echo $@ | sed -e 's/-u [^ ]* /-u xxxxxxxx /g' -e 's/-p [^ ]*/-p xxxxxxxx /g'`
-export LANGUAGE=C
-export LANG=C
-export LC_ALL=C
-
-function stop_openqrm_monitord() {
-	killall openqrm-monitord 1>/dev/null 2>&1
-	# in case we do not have killall (e.g. on debian-minimal install) be sure to stop the openqrm-agents anyway
-	for OPENQRM_PID in `ps ax 2>/dev/null | grep openqrm-monitord | grep -v grep | awk {' print $1 '}`; do
-		kill $OPENQRM_PID
-	done
-}
-
-
-
-# check which command queue to use
-# ui-queue : all commands running on behalf of a ui user
-# bg-queue : all commands initiated from the plugins or the base engine
-
-UI_CMD_QUEUE="ui-cmd-queue"
-BG_CMD_QUEUE="bg-cmd-queue"
-CMD_QUEUE=$BG_CMD_QUEUE
-if echo $@ | grep "\-\-openqrm\-ui\-user" 1>/dev/null; then
-	CMD_QUEUE=$UI_CMD_QUEUE
-fi
-
-# check the command mode to use
-# raw
-#    - shell command executed by the receiver in foreground
-#    - receiver queue waits until command finished
-#    - output is set to stdout
-#    - good for commands with a short execution time
-#
-# regular (or not set)
-#    - shell command executed by the receiver in foreground
-#    - receiver queue waits until command finished
-#    - good for commands with a short execution time
-#
-# background
-#    - shell command executed by the receiver in background (with &)
-#    - receiver queue does not wait until command finished
-#    - good for commands with a medium to long to execution time (and using screen themselves)
-#
-# fork
-#    - shell command executed by the receiver in background (with a detached screen)
-#    - receiver queue does not wait until command finished
-#    - good for commands with a medium to long to execution time (and not using screen themselves)
-
-CMD_EXEC_MODE_DEFAULT="regular"
-if echo $@ | grep "\-\-openqrm\-cmd\-mode" 1>/dev/null; then
-	CMD_MODE=`echo $@ | sed -e "s#.*--openqrm-cmd-mode##g" | awk '{ print $1 }' 2>/dev/null`
-	if [ "$CMD_MODE" == "" ]; then
-		CMD_MODE=$CMD_EXEC_MODE_DEFAULT
-	fi
-else
-	CMD_MODE=$CMD_EXEC_MODE_DEFAULT
-fi
-
-# aquire lock for the global receiver command bg queue
-LOCK_TIME=`openqrm_lock_queue aquire $CMD_QUEUE`
-trap "openqrm_lock_queue release $CMD_QUEUE $LOCK_TIME" EXIT
-# aquire global command-starting-lock, scripts have 10 sec. to
-# eventually fork and aquire a lock on their subsection
-lockfile -s 1 -r 1 -l 10 $OPENQRM_CMD_QUEUE_STARTING_LOCK.$CMD_QUEUE
-echo "$FULL_COMMAND" > $OPENQRM_CMD_QUEUE_STARTING_LOCK.$CMD_QUEUE
-echo "openQRM engine: Running exec mode $CMD_MODE: $FULL_COMMAND" | logger
-
-################################################################################
-# special handling for reboot + halt
-################################################################################
-case "$@" in
-	reboot)
-		rm -f $OPENQRM_CMD_QUEUE_STARTING_LOCK.$CMD_QUEUE
-		openqrm_lock_queue release $CMD_QUEUE $LOCK_TIME
-		trap '' EXIT
-		stop_openqrm_monitord
-		sleep 2 && /sbin/reboot &
-		exit 0
-		;;
-	halt)
-		rm -f $OPENQRM_CMD_QUEUE_STARTING_LOCK.$CMD_QUEUE
-		openqrm_lock_queue release $CMD_QUEUE $LOCK_TIME
-		trap '' EXIT
-		stop_openqrm_monitord
-		sleep 2 && /sbin/poweroff &
-		exit 0
-		;;
-esac
-
-
-################################################################################
-# run openqrm functions in foreground
-################################################################################
-if [ ! -x "$1" ]; then
-	CMD_OUTPUT=$($@ 2>&1)
-	CMD_RESULT=$?
-	sleep 0.5
-	# if we ran a function remove the starting lock now
-	rm -f $OPENQRM_CMD_QUEUE_STARTING_LOCK.$CMD_QUEUE
-
-else
-
-	################################################################################
-	# run commands according their exec-mode
-	################################################################################
-
-	case "$CMD_MODE" in
-		# regular mode
-		raw)
-			$@
-			CMD_RESULT=$?
-			sleep 0.5
-			;;
-
-		# regular mode
-		regular)
-			CMD_OUTPUT=$($@ 2>&1)
-			CMD_RESULT=$?
-			sleep 0.5
-			;;
-
-		# background mode
-		background)
-			$@ 1>/dev/null 2>/dev/null  &
-			CMD_OUTPUT=""
-			CMD_RESULT=0
-			sleep 0.5
-			;;
-
-		# fork mode
-		fork)
-			if [ -x /usr/bin/screen.real ]; then
-				RUNSCREEN="/usr/bin/screen.real"
-			else
-				RUNSCREEN=`which screen`
-			fi
-			SCREEN_NAME=`date +%s%N`
-			$RUNSCREEN -dmS $SCREEN_NAME "$@"
-			CMD_OUTPUT=""
-			CMD_RESULT=0
-			sleep 0.5
-			;;
-	esac
-
-fi
-
-################################################################################
-# releaselock for the global receiver command bg queue
-openqrm_lock_queue release $CMD_QUEUE $LOCK_TIME
-trap '' EXIT
-
-
-# error reporting
-if [ "$CMD_RESULT" != "0" ]; then
-	if [ ! -d /var/log/openqrm ]; then
-		mkdir -p /var/log/openqrm
-	fi
-	FORMAT_COMMAND=`echo $FULL_COMMAND | cut -b1-100`".."
-	FORMAT_COMMAND_OUTPUT=`openqrm_format_error_msg $CMD_OUTPUT`
-	rm -f /var/log/openqrm/$$.log
-	echo "ERROR: openqrm-cmd failed with $CMD_OUTPUT while running: $FULL_COMMAND" | logger
-	openqrm_post_event 0 "base-engine" 2 "openqrm-cmd" "ERROR $FORMAT_COMMAND_OUTPUT on resource $resource_id running: $FORMAT_COMMAND"
-	exit 1
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/bin/openqrm-command-queue-ctl b/openQRM-5.3.50-CE/src/bin/openqrm-command-queue-ctl
deleted file mode 100644
index c959043..0000000
--- a/openQRM-5.3.50-CE/src/bin/openqrm-command-queue-ctl
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/bin/bash
-# this is the openQRM command queue control utility
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../..
-	OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-fi
-export OPENQRM_SERVER_BASE_DIR
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-NEWLINE='
-'
-
-# let only root run this script
-WHOAMI=`whoami`
-if [ "$WHOAMI" != "root" ]; then
-	echo "ERROR: Please run this script as root!"
-	exit 6
-fi
-
-
-function openqrm_cq_ctl_usage() {
-	echo
-	echo "Usage:"
-	echo "`basename $0` help			- This help screen"
-	echo
-	echo "- openQRM switch command queuing mechanism to Dropbear (default) -"
-	echo "`basename $0` command-queue dropbear"
-	echo
-	echo "- openQRM switch command queuing mechanism to RabbitMQ (enterprise) -"
-	echo "`basename $0` command-queue rabbitmq"
-	echo
-}
-
-
-
-
-# main
-case "$1" in
-	command-queue)
-		case "$2" in
-			dropbear)
-				echo "Switching openQRM command queue to dropbear"
-				sed -i -e 's/OPENQRM_EXECUTION_LAYER.*/OPENQRM_EXECUTION_LAYER="dropbear"/'g $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-				. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-				/etc/init.d/openqrm restart
-				;;
-
-
-			rabbitmq)
-
-				BASE_DIR=$(dirname $0)
-				BASE_DIR=$(pushd $BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-
-
-				echo "Switching openQRM command queue to rabbitmq"
-				echo "- installing RabbitMQ server"
-				if ! openqrm_full_fill_os_dependency rabbitmq-server rabbitmq-server; then
-					echo "ERROR: Failed to install RabbitMQ Server!"
-					exit 1
-				fi
-				echo "- installing python pip installer"
-				if ! openqrm_full_fill_os_dependency pip python3-pip; then
-					echo "ERROR: Failed to install python3-pip!"
-					exit 1
-				fi
-				echo "- installing python pika"
-				if ! pip install pika==0.9.8; then
-					echo "ERROR: Failed to install python pika!"
-					exit 1
-				fi
-				echo "-installing php-amqplib"
-				# install php-amqplib
-				# rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/php-amqplib
-				mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/php-amqplib
-				cd $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/php-amqplib
-				# install composer
-				if [ ! -x ./composer.phar ]; then
-					curl -sS https://getcomposer.org/installer | php
-				fi
-				echo "{$NEWLINE\"require\": {$NEWLINE\"videlalvaro/php-amqplib\": \"2.2.*\"$NEWLINE}$NEWLINE}" > $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/php-amqplib/composer.json
-				# install php-amqplib
-				./composer.phar install
-
-				. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/$OPENQRM_DATABASE_TYPE/openqrm-$OPENQRM_DATABASE_TYPE-functions
-				OPENQRM_PASSWORD=`run_sql "select user_password from user_info where user_name='openqrm'"`
-				if [ "$OPENQRM_PASSWORD" == "" ]; then
-					echo "ERROR: Could not gather openqrm user password to configure the rabbitmq-server"
-					exit 1
-				fi
-				rabbitmqctl delete_user openqrm 2>/dev/null
-				if ! rabbitmqctl add_user openqrm "$OPENQRM_PASSWORD"; then
-					echo "ERROR: Failed to add user openqrm!"
-					exit 1
-				fi
-				if ! rabbitmqctl set_user_tags openqrm administrator; then
-					echo "ERROR: Failed to set user openqrm as administrator!"
-					exit 1
-				fi
-				if ! rabbitmqctl set_permissions -p / openqrm ".*" ".*" ".*"; then
-					echo "ERROR: Failed to set permission for user openqrm!"
-					exit 1
-				fi
-				if ! rabbitmqctl list_user_permissions openqrm; then
-					echo "ERROR: Failed to list permissions!"
-					exit 1
-				fi
-				echo "enabling SSL"
-				mkdir -p /etc/rabbitmq/ssl
-
-				echo "generating SSL certificates"
-				rm -rf /tmp/rabbitmqssl/
-				mkdir -p /tmp/rabbitmqssl/
-				cd /tmp/rabbitmqssl/
-				cp $OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-openssl-configuration openqrm-openssl.cnf
-				mkdir -p openqrmca/private
-				mkdir -p openqrmca/certs
-				touch openqrmca/index.txt
-				echo 01 > openqrmca/serial
-				cd openqrmca
-				openssl req -x509 -config ../openqrm-openssl.cnf -newkey rsa:2048 -days 40000 -out cacert.pem -outform PEM -subj /CN=openqrmca/ -nodes
-				openssl x509 -in cacert.pem -out cacert.cer -outform DER
-				cd ..
-				openssl genrsa -out server_key.pem 2048
-				openssl req -new -key server_key.pem -out server_req.pem -outform PEM -subj /CN=$(hostname)/O=server/ -nodes
-				cd openqrmca
-				openssl ca -config ../openqrm-openssl.cnf -in ../server_req.pem -out ../server_cert.pem -notext -batch -extensions server_ca_extensions
-				cd ..
-				openssl pkcs12 -export -out server_keycert.p12 -in server_cert.pem -inkey server_key.pem -passout pass:OpenQRMPass
-				openssl genrsa -out client_key.pem 2048
-				openssl req -new -key client_key.pem -out client_req.pem -outform PEM -subj /CN=$(hostname)/O=client/ -nodes
-				cd openqrmca
-				openssl ca -config ../openqrm-openssl.cnf -in ../client_req.pem -out ../client_cert.pem -notext -batch -extensions client_ca_extensions
-				cd ..
-				openssl pkcs12 -export -out client_keycert.p12 -in client_cert.pem -inkey client_key.pem -passout pass:OpenQRMPass
-
-				cp server_key.pem /etc/rabbitmq/ssl/
-				cp server_cert.pem /etc/rabbitmq/ssl/
-				cp openqrmca/cacert.pem /etc/rabbitmq/ssl/
-				cd $BASE_DIR
-				rm -rf /tmp/rabbitmqssl/
-
-				echo "adding SSL listener"
-				cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-rabbitmq-ssl-configuration /etc/rabbitmq/rabbitmq.config
-
-				if ! /etc/init.d/rabbitmq-server restart; then
-					echo "ERROR: Failed to enable SSL in the RabbitMQ server!"
-					exit 1
-				fi
-
-				echo "enabling rabbitmq management plugin"
-				/usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_management
-
-				echo "reconfiguring $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf"
-				sed -i -e 's/OPENQRM_EXECUTION_LAYER.*/OPENQRM_EXECUTION_LAYER="rabbitmq"/'g $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-				. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-
-				/etc/init.d/openqrm restart
-				;;
-
-			*)
-				openqrm_cq_ctl_usage
-				;;
-
-		esac
-		;;
-
-
-
-	*)
-		openqrm_cq_ctl_usage
-		;;
-
-esac
-
-
diff --git a/openQRM-5.3.50-CE/src/bin/openqrm-create-plugin b/openQRM-5.3.50-CE/src/bin/openqrm-create-plugin
deleted file mode 100644
index 299cbb1..0000000
--- a/openQRM-5.3.50-CE/src/bin/openqrm-create-plugin
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/bash
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-SOURCE_PLUGIN=$1
-DESTINATION_PLUGIN=$2
-WORKSPACE=`dirname $0`/../plugins
-
-export LANGUAGE=C
-export LANG=C
-export LC_ALL=C
-
-if [ "$#" != "2" ]; then
-	echo "Usage : $0 <SOURCE_PLUGIN> <DESTINATION_PLUGIN>"
-	exit 1
-fi
-if [ ! -d $WORKSPACE/$SOURCE_PLUGIN ]; then
-	echo "Error : Source plugin $SOURCE_PLUGIN does not exit at $WORKSPACE"
-	exit 1
-fi
-if [ -d $WORKSPACE/$DESTINATION_PLUGIN ]; then
-	echo "Error : Destination plugin $WORKSPACE/$DESTINATION_PLUGIN already exist !"
-	echo -n "Continue ? (y/n) "
-	read CONFIRM
-	if [ "$CONFIRM" != "y" ]; then
-		exit 1
-	else
-		echo "...Continuing"
-		sleep 2
-	fi
-fi
-
-
-echo "creating plugin $DESTINATION_PLUGIN from the $SOURCE_PLUGIN plugin"
-
-# genearating the strings to change
-SOURCE_NAME_UPPER_CASE=`echo $SOURCE_PLUGIN | tr '[:lower:]:' '[:upper:]-'`
-SOURCE_NAME_LOWER_CASE=`echo $SOURCE_PLUGIN | tr '[:upper:]:' '[:lower:]-'`
-SOURCE_NAME_STRLEN=${#SOURCE_PLUGIN}
-SOURCE_NAME_FIRST_CHAR=`echo ${SOURCE_PLUGIN:0:1} | tr a-z A-Z`
-SOURCE_NAME_END=`echo ${SOURCE_PLUGIN:1:$(( SOURCE_NAME_STRLEN - 1 )) } | tr A-Z a-z`
-SOURCE_NAME_START_UPPER_CASE="$SOURCE_NAME_FIRST_CHAR$SOURCE_NAME_END"
-
-DESTINATION_NAME_UPPER_CASE=`echo $DESTINATION_PLUGIN | tr '[:lower:]:' '[:upper:]-'`
-DESTINATION_NAME_LOWER_CASE=`echo $DESTINATION_PLUGIN | tr '[:upper:]:' '[:lower:]-'`
-DESTINATION_NAME_STRLEN=${#DESTINATION_PLUGIN}
-DESTINATION_NAME_FIRST_CHAR=`echo ${DESTINATION_PLUGIN:0:1} | tr a-z A-Z`
-DESTINATION_NAME_END=`echo ${DESTINATION_PLUGIN:1:$(( DESTINATION_NAME_STRLEN - 1 )) } | tr A-Z a-z`
-DESTINATION_NAME_START_UPPER_CASE="$DESTINATION_NAME_FIRST_CHAR$DESTINATION_NAME_END"
-
-echo "transforming : $SOURCE_NAME_UPPER_CASE to $DESTINATION_NAME_UPPER_CASE"
-echo "               $SOURCE_NAME_LOWER_CASE to $DESTINATION_NAME_LOWER_CASE"
-echo "               $SOURCE_NAME_START_UPPER_CASE to $DESTINATION_NAME_START_UPPER_CASE"
-
-# copy sources
-/bin/cp -aR $WORKSPACE/$SOURCE_PLUGIN $WORKSPACE/$DESTINATION_PLUGIN
-
-
-# re-name files and content
-cd $WORKSPACE
-for OLD_FILE in `find $DESTINATION_PLUGIN/ -type f`; do
-
-	# content
-	if `grep -i $SOURCE_PLUGIN $OLD_FILE 1>/dev/null`; then
-		if [ ! -z "$DEBUG" ]; then
-			echo "adjusting content in $OLD_FILE"
-		fi
-		cat $OLD_FILE | \
-			sed -i -e "s/$SOURCE_NAME_UPPER_CASE/$DESTINATION_NAME_UPPER_CASE/g" $OLD_FILE
-			sed -i -e "s/$SOURCE_NAME_LOWER_CASE/$DESTINATION_NAME_LOWER_CASE/g" $OLD_FILE
-			sed -i -e "s/$SOURCE_NAME_START_UPPER_CASE/$DESTINATION_NAME_START_UPPER_CASE/g" $OLD_FILE
-	else
-		if [ ! -z "$DEBUG" ]; then
-			echo "skipping to adjust the content of $OLD_FILE"
-		fi
-	fi
-
-	# name
-	if `echo $OLD_FILE | grep -i $SOURCE_PLUGIN 1>/dev/null`; then
-		NEW_FILE=`echo $OLD_FILE | \
-			sed -e "s/$SOURCE_NAME_UPPER_CASE/$DESTINATION_NAME_UPPER_CASE/g" | \
-			sed -e "s/$SOURCE_NAME_LOWER_CASE/$DESTINATION_NAME_LOWER_CASE/g" | \
-			sed -e "s/$SOURCE_NAME_START_UPPER_CASE/$DESTINATION_NAME_START_UPPER_CASE/g"`
-		if [ ! -z "$DEBUG" ]; then
-			echo "renaming $OLD_FILE to $NEW_FILE"
-		fi
-		mkdir -p `dirname $NEW_FILE`
-		/bin/mv $OLD_FILE $NEW_FILE
-	else
-		if [ ! -z "$DEBUG" ]; then
-			echo "skipping file $OLD_FILE"
-		fi
-	fi
-
-done
-
-# remove .svn dir
-for svn in `find $WORKSPACE/$DESTINATION_PLUGIN/* -name .svn`; do
-	if [ ! -z "$DEBUG" ]; then
-		echo "removing $svn"
-	fi
-	rm -rf $svn
-done
-if [ ! -z "$DEBUG" ]; then
-	echo "removing $WORKSPACE/$DESTINATION_PLUGIN/.svn"
-fi
-rm -rf $WORKSPACE/$DESTINATION_PLUGIN/.svn
-
-echo "Finished creating new plugin template $DESTINATION_PLUGIN"
-
-
-
diff --git a/openQRM-5.3.50-CE/src/bin/openqrm-package~ b/openQRM-5.3.50-CE/src/bin/openqrm-package~
deleted file mode 100644
index f095dc1..0000000
--- a/openQRM-5.3.50-CE/src/bin/openqrm-package~
+++ /dev/null
@@ -1,283 +0,0 @@
-#!/bin/bash
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-PACKAGE_TYPE=$1
-VIRT_1=$2
-VIRT_2=$3
-WORKSPACE=`dirname $0`/../
-NOW=`date +%Y%m%d%H%M%S`
-
-#ALL_VIRT_TECHNOLOGIES="citrix libvirt lxc openvz kvm vmware-esx vmware-vsphere xen"
-ALL_VIRT_TECHNOLOGIES="citrix libvirt lxc kvm vmware-esx vmware-vsphere xen"
-COMMUNITY_VIRT_TECHNOLOGIES="kvm"
-
-CURRENTDIR=`pwd`
-
-export LANGUAGE=C
-export LANG=C
-export LC_ALL=C
-
-if [ "$#" == "0" ]; then
-	echo "Usage : $0 <community/smb/large/amazon/enterprise> [virt-technology1] [virt-technology2]"
-	exit 1
-fi
-
-case "$PACKAGE_TYPE" in
-	smb)
-		if [ "$#" != "2" ]; then
-			echo "Usage : $0 <smb> [virt-technology1]"
-			exit 1
-		fi
-		PACKAGE_FILENAME="Enterprise-Edition-Eval-$PACKAGE_TYPE"
-		;;
-	large)
-		if [ "$#" != "3" ]; then
-			echo "Usage : $0 <large> [virt-technology1] [virt-technology2]"
-			exit 1
-		fi
-		PACKAGE_FILENAME="Enterprise-Edition-Eval-$PACKAGE_TYPE"
-		;;
-	amazon)
-		if [ "$#" != "1" ]; then
-			echo "Usage : $0 <amazon>"
-			exit 1
-		fi
-		PACKAGE_FILENAME="Enterprise-Edition-Eval-$PACKAGE_TYPE"
-		;;
-	enterprise)
-		if [ "$#" != "1" ]; then
-			echo "Usage : $0 <enterprise>"
-			exit 1
-		fi
-		PACKAGE_FILENAME="Enterprise-Edition-Eval-$PACKAGE_TYPE"
-		;;
-	community)
-		if [ "$#" != "1" ]; then
-			echo "Usage : $0 <community>"
-			exit 1
-		fi
-		PACKAGE_FILENAME="Community-Edition"
-		;;
-	*)
-			echo "Usage : $0 <community/smb/large/enterprise>"
-			exit 1
-esac
-
-if [ "$VIRT_1" == "" ]; then
-	VIRT_TECH_1="kvm"
-else
-	VIRT_TECH_1="$VIRT_1"
-fi
-if [ "$VIRT_2" == "" ]; then
-	VIRT_TECH_2="vmware"
-else
-	VIRT_TECH_2="$VIRT_2"
-fi
-
-
-if [ ! -e $WORKSPACE/etc/enterprise/$PACKAGE_TYPE.conf ]; then
-	echo "Error : Config file $WORKSPACE/etc/enterprise/$PACKAGE_TYPE.conf does not exit"
-	exit 1
-fi
-
-# source openqrm-server.conf to get the version
-. $WORKSPACE/etc/openqrm-server.conf
-
-VERSION_STRING="openQRM-$OPENQRM_SERVER_VERSION.$OPENQRM_MINOR_RELEASE_VERSION-$PACKAGE_FILENAME"
-echo "Packaging $VERSION_STRING"
-
-TMPBUILD_DIR=`mktemp -d /tmp/openqrm-enterprise.XXXXXXXXXX` || exit 1
-mkdir -p $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING
-
-cp -aR $WORKSPACE/../src $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/
-
-# copy docs
-cp -aR $WORKSPACE/../src/etc/enterprise/txt/openQRM-changelog.txt $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/
-
-# license file for enterprise editions
-# community edition with diffrent scripts
-if [ "$PACKAGE_TYPE" == "community" ]; then
-	cat $WORKSPACE/../src/etc/enterprise/txt/openQRM-releasenotes-community.txt |
-		sed -e "s/@@OPENQRM_VERSION@@/$OPENQRM_SERVER_VERSION.$OPENQRM_MINOR_RELEASE_VERSION/g" |
-		sed -e "s/@@PACKAGE_TYPE@@/$PACKAGE_TYPE/g" > $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/openQRM-releasenotes.txt
-	cp -aR $WORKSPACE/../src/etc/enterprise/txt/install-openqrm-community.sh $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/install-openqrm.sh
-	rm -f $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/doc/openQRM-Enterprise-Server-and-Client-License.txt
-	echo "Downloading GPL 2 license file"
-	if ! wget -O $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/doc/LICENSE.txt http://support.openqrm-enterprise.com/openqrm-build/LICENSE.txt; then
-		echo "!!! ERROR: Failed downloading !!! exiting now"
-		rm -rf $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING
-	fi
-	# community logo
-	rm -f $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/img/logo.png
-	if ! wget -O $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/img/logo.png http://support.openqrm-enterprise.com/openqrm-build/logo-community.png; then
-		echo "!!! ERROR: Failed downloading Community Logo!!! exiting now"
-		rm -rf $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING
-	fi
-else
-	mkdir -p $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/licensekeys
-	cp -aR $WORKSPACE/../src/etc/enterprise/txt/openQRM-Enterprise-License.txt $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/
-	cat $WORKSPACE/../src/etc/enterprise/txt/openQRM-releasenotes.txt |
-		sed -e "s/@@OPENQRM_VERSION@@/$OPENQRM_SERVER_VERSION.$OPENQRM_MINOR_RELEASE_VERSION/g" |
-		sed -e "s/@@PACKAGE_TYPE@@/$PACKAGE_TYPE/g" > $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/openQRM-releasenotes.txt
-	cp -aR $WORKSPACE/../src/etc/enterprise/txt/install-openqrm.sh $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/
-fi
-chmod +x $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/install-openqrm.sh
-
-
-# adjust plugins
-rm -rf $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/*
-cp -aR $WORKSPACE/../src/plugins/Makefile $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/
-
-for PLUGY in `cat $WORKSPACE/etc/enterprise/$PACKAGE_TYPE.conf`; do
-	if [ -d $WORKSPACE/../src/plugins/$PLUGY ]; then
-		cp -aR $WORKSPACE/../src/plugins/$PLUGY $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/
-	fi
-done
-
-# add virt
-case "$PACKAGE_TYPE" in
-	smb)
-		echo "- adding virtualization $VIRT_TECH_1"
-		cp -aR $WORKSPACE/../src/plugins/$VIRT_TECH_1 $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/
-		;;
-	large)
-		echo "- adding virtualization $VIRT_TECH_1"
-		cp -aR $WORKSPACE/../src/plugins/$VIRT_TECH_1 $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/
-		echo "- adding virtualization $VIRT_TECH_2"
-		cp -aR $WORKSPACE/../src/plugins/$VIRT_TECH_2 $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/
-		;;
-	enterprise)
-		for VIRT_TECH_N in `echo $ALL_VIRT_TECHNOLOGIES`; do
-			if [ -d $WORKSPACE/../src/plugins/$VIRT_TECH_N ]; then
-				echo "- adding virtualization $VIRT_TECH_N"
-				cp -aR $WORKSPACE/../src/plugins/$VIRT_TECH_N $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/
-			fi
-		done
-		;;
-	community)
-		for VIRT_TECH_N in `echo $COMMUNITY_VIRT_TECHNOLOGIES`; do
-			if [ -d $WORKSPACE/../src/plugins/$VIRT_TECH_N ]; then
-				echo "- adding virtualization $VIRT_TECH_N"
-				cp -aR $WORKSPACE/../src/plugins/$VIRT_TECH_N $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/
-			fi
-		done
-
-                # enterprise plugins
-                echo "Filling in empty enterprise plugins"
-                for P in `ls $WORKSPACE/../src/plugins/ | grep -v Makefile`; do
-                    if [ ! -d "$TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/$P" ]; then
-                        echo "Adding empty enterprise plugin $P"
-                        . $WORKSPACE/../src/plugins/$P/etc/openqrm-plugin-$P.conf
-                        mkdir -p $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/$P/etc
-                        > $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/$P/etc/openqrm-plugin-$P.conf
-                        echo "OPENQRM_PLUGIN_DESCRIPTION=\"$OPENQRM_PLUGIN_DESCRIPTION <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='http://www.openqrm-enterprise.com' target='_BLANK'>http://www.openqrm-enterprise.com</a>\"" >> $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/$P/etc/openqrm-plugin-$P.conf
-                        echo "OPENQRM_PLUGIN_TYPE=\"$OPENQRM_PLUGIN_TYPE\"" >> $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/$P/etc/openqrm-plugin-$P.conf
-                        # empty makefille
-                        > $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/$P/Makefile
-                        echo "configure:" >> $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/$P/Makefile
-                        echo "compile:" >> $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/$P/Makefile
-                        echo "install:" >> $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/$P/Makefile
-                        echo -e "\tmkdir -p /usr/share/openqrm/plugins/$P/etc" >> $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/$P/Makefile
-                        echo -e "\tcp etc/openqrm-plugin-$P.conf /usr/share/openqrm/plugins/$P/etc/" >> $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/$P/Makefile
-                        echo "uninstall:" >> $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/$P/Makefile
-                        echo "clean:" >> $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/$P/Makefile
-                        echo "all:" >> $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/$P/Makefile
-                    fi
-                done
-
-                # adapting base template footer
-                sed -i -e "s/openQRM Enterprise Edition/openQRM Community Edition/g" $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/tpl/index.tpl.php
-                sed -i -e "s/openQRM Enterprise Cloud/openQRM Community Cloud/g" $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/cloud/cloud-portal/web/user/tpl/index.default.tpl.php
-
-		# adapt to GPL 2 License
-		cd $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/
-		for FILE in `find -type f | grep -v .svn`; do
-			echo ".. adapting $FILE"
-			sed -i -e "s/GNU General Public License version 2/GNU General Public License version 2/g" $FILE
-			sed -i -e "s#src/doc/LICENSE.txt#src/doc/LICENSE.txt#g" $FILE
-		done
-		echo "- finished GPL License adaption"
-
-		# remove local-server integration script
-		echo "- adapting local-server integration"
-		mkdir -p "$TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/local-server/bin"
-		LOCAL_SERVER="$TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/plugins/local-server/bin/openqrm-local-server"
-
-		echo "clear" > $LOCAL_SERVER
-		echo "echo '#################### Please notice !! #################'" >> $LOCAL_SERVER
-		echo "echo '# The distributed system management openQRM feature   #'" >> $LOCAL_SERVER
-		echo "echo '# local-server is available in the Enterprise Edtion! #'" >> $LOCAL_SERVER
-		echo "echo '#                                                     #'" >> $LOCAL_SERVER
-		echo "echo '# Please check http://www.openqrm-enterprise.com/     #'" >> $LOCAL_SERVER
-		echo "echo '#######################################################'" >> $LOCAL_SERVER
-		echo "echo ''" >> $LOCAL_SERVER
-		echo "- finished adapting local-server integration"
-		chmod +x $LOCAL_SERVER
-		cat $LOCAL_SERVER
-
-		# adapt the info box
-		sed -i -e "s/openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD/openQRM Community developed by OPENQRM AUSTRALIA PTY LTD/g" $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/class/openqrm.api.class.php
-		grep -B 10000 "<b>openQRM Enterprise Server License</b>" $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/class/openqrm.api.class.php | grep -v "<b>openQRM Enterprise Server License</b>" > /tmp/openqrm.api.class.php.1
-		grep -A 10000 "Buy additional licenses</a>" $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/class/openqrm.api.class.php | grep -v "Buy additional licenses</a>" > /tmp/openqrm.api.class.php.2
-		cat  /tmp/openqrm.api.class.php.1 > $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/class/openqrm.api.class.php
-		cat  /tmp/openqrm.api.class.php.2 >> $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/class/openqrm.api.class.php
-		rm -f /tmp/openqrm.api.class.php.1 /tmp/openqrm.api.class.php.2
-
-		# disable license check in openqrm.class.php
-		sed -i -e "s/\$this->lc()\;//g" $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/class/openqrm.class.php
-		grep -B 10000 "function lc" $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/class/openqrm.class.php | grep -v "function lc" > /tmp/openqrm.class.php.1
-		cat /tmp/openqrm.class.php.1 > $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/class/openqrm.class.php
-		echo "}" >> $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/class/openqrm.class.php
-		echo "?>" >> $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/class/openqrm.class.php
-		rm -f /tmp/openqrm.class.php.1
-
-		# disable license check in openqrm.content.class.php
-		sed -i -e "s/\$lc = \$this->lcc()\;//g" $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/class/openqrm.content.class.php
-		grep -B 10000 "function lcc" $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/class/openqrm.content.class.php | grep -v "function lcc" > /tmp/openqrm.content.class.php.1
-		cat /tmp/openqrm.content.class.php.1 > $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/class/openqrm.content.class.php
-		echo "}" >> $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/class/openqrm.content.class.php
-		echo "?>" >> $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/class/openqrm.content.class.php
-		rm -f /tmp/openqrm.content.class.php.1
-
-		# buy us a coffee in index_top
-		cp -af $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/etc/enterprise/tpl/index_top.tpl.php $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/web/base/tpl/index_top.tpl.php
-		;;
-esac
-
-
-cd $CURRENTDIR
-
-# remove .svn dir
-for svn in `find $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/* -name .svn`; do
-	rm -rf $svn
-done
-# remove package config dir
-rm -rf $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/etc/enterprise
-rm -f $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW/$VERSION_STRING/src/bin/openqrm-package
-
-
-# package
-cd $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW
-tar -C $TMPBUILD_DIR/buildtmp/openqrm-enterprise-$PACKAGE_TYPE-edition-$NOW -czf /tmp/$VERSION_STRING.tgz $VERSION_STRING
-
-
-# clean up
-rm -rf $TMPBUILD_DIR/buildtmp
-rmdir $TMPBUILD_DIR
-
-cd $CURRENTDIR
-echo "Finished creating openQRM Enteprise package $VERSION_STRING at /tmp/$VERSION_STRING.tgz"
-
diff --git a/openQRM-5.3.50-CE/src/bin/openqrm-rabbitmq-cmd-queue-ctl b/openQRM-5.3.50-CE/src/bin/openqrm-rabbitmq-cmd-queue-ctl
deleted file mode 100644
index a087652..0000000
--- a/openQRM-5.3.50-CE/src/bin/openqrm-rabbitmq-cmd-queue-ctl
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/bash
-# this script automatically manages the lvm volumes for the kvm virtual machines
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-	eval appliance_capabilities
-	export RABBITMQ_SERVER="$resource_openqrmserver"
-	export RABBITMQ_PASSWORD="$RABBITMQ_PASSWORD"
-	export RABBITMQ_QUEUE_NAME="$resource_ip"
-	export OPENQRM_EXECUTION_LAYER=$openqrm_execution_layer
-elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-	openqrm_server_get_config
-	export RABBITMQ_SERVER="$OPENQRM_SERVER_IP_ADDRESS"
-	export RABBITMQ_PASSWORD="$OPENQRM_RABBITMQ_PASSWORD"
-	export RABBITMQ_QUEUE_NAME="$OPENQRM_SERVER_IP_ADDRESS"
-fi
-export LANG=C
-
-if [ -x /usr/bin/screen.real ]; then
-	RUNSCREEN="/usr/bin/screen.real"
-else
-	RUNSCREEN=`which screen`
-fi
-if [ "$RUNSCREEN" == "" ]; then
-	echo "ERROR: screen utility not installed! Please install screen"
-	exit 1
-fi
-if [ "$OPENQRM_EXECUTION_LAYER" != "rabbitmq" ]; then
-	echo "ERROR: Only useful for RabbitMQ command layer!"
-	exit 1
-fi
-if [ "$RABBITMQ_PASSWORD" == "" ]; then
-	echo "ERROR: RABBITMQ_PASSWORD not set!"
-	exit 1
-fi
-if [ "$RABBITMQ_SERVER" == "" ]; then
-	echo "ERROR: RABBITMQ_SERVER not set!"
-	exit 1
-fi
-if [ "$RABBITMQ_QUEUE_NAME" == "" ]; then
-	echo "ERROR: RABBITMQ_QUEUE_NAME not set!"
-	exit 1
-fi
-
-function openqrm_rabbitmq_client_start() {
-	$RUNSCREEN -dmS cmdqueue $OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-rabbitmq-cmd-queue
-	echo "Started openqrm-rabbitmq-cmd-queue client"
-}
-
-
-function openqrm_rabbitmq_client_stop() {
-	kill `ps ax | grep openqrm-rabbitmq-cmd-queue | grep python | awk '{ print $1 }'`
-	echo "Stopped openqrm-rabbitmq-cmd-queue client"
-}
-
-
-function openqrm_rabbitmq_client_status() {
-	if ps ax | grep -w openqrm-rabbitmq-cmd-queue | grep python 1>/dev/null; then
-		echo "openqrm-rabbitmq-cmd-queue client running"
-	else
-		echo "openqrm-rabbitmq-cmd-queue client stopped"
-	fi
-}
-
-
-
-case "$1" in
-	start)
-		openqrm_rabbitmq_client_start
-		;;
-	stop)
-		openqrm_rabbitmq_client_stop
-		;;
-	status)
-		openqrm_rabbitmq_client_status
-		;;
-	restart)
-		openqrm_rabbitmq_client_stop
-		sleep 1
-		openqrm_rabbitmq_client_start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|status|restart}"
-		exit 1
-
-esac
diff --git a/openQRM-5.3.50-CE/src/bin/openqrm-update b/openQRM-5.3.50-CE/src/bin/openqrm-update
deleted file mode 100644
index fb5eb39..0000000
--- a/openQRM-5.3.50-CE/src/bin/openqrm-update
+++ /dev/null
@@ -1,560 +0,0 @@
-#!/bin/bash
-# this is the openQRM commandline client
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../..
-	OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-fi
-export OPENQRM_SERVER_BASE_DIR
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-
-
-# let only root run this script
-WHOAMI=`whoami`
-if [ "$WHOAMI" != "root" ]; then
-	echo "ERROR: Please run this script as root!"
-	exit 6
-fi
-
-
-function update_usage() {
-	echo
-	echo "Usage:"
-	echo "`basename $0` help			- This help screen"
-	echo
-	echo "`basename $0` pre <-f>"
-	echo "`basename $0` base <-f>"
-	echo "`basename $0` post <-f>"
-	echo "`basename $0` initrds <-f>"
-	echo
-}
-
-
-
-function openqrm_apply_old_config() {
-	local NEW_CONF=$1
-	local OLD_CONF=$2
-	local ALL_CONFIG_FILES=""
-	if [ -f "$NEW_CONF" ]; then
-		ALL_CONFIG_FILES="$NEW_CONF"
-	fi
-	if [ -f "$OLD_CONF" ]; then
-		ALL_CONFIG_FILES="$ALL_CONFIG_FILES $OLD_CONF"
-	fi
-
-	# checking new config against old
-	for OPENQRM_CONFIG_PARAM in `cat $ALL_CONFIG_FILES | grep -v ^"#" | grep "[A-Z][A-Z][A-Z][A-Z].*=.*" | cut -d'=' -f1 | uniq`; do
-		#echo "   - checking parameter $OPENQRM_CONFIG_PARAM"
-		# do net adapt version values
-		if [ "$OPENQRM_CONFIG_PARAM" == "OPENQRM_SERVER_VERSION" ]  || [ "$OPENQRM_CONFIG_PARAM" == "OPENQRM_MINOR_RELEASE_VERSION" ] || [ "$OPENQRM_CONFIG_PARAM" == "OPENQRM_PLUGIN_VERSION" ] || [ "$OPENQRM_CONFIG_PARAM" == "#" ]; then
-			continue
-		fi
-		# do not adapt deps + requires + descriptions
-		if echo $OPENQRM_CONFIG_PARAM | grep DEPENDENCIES 1>/dev/null; then
-			continue
-		fi
-		if echo $OPENQRM_CONFIG_PARAM | grep REQUIREMENTS 1>/dev/null; then
-			continue
-		fi
-		if echo $OPENQRM_CONFIG_PARAM | grep DESCRIPTION 1>/dev/null; then
-			continue
-		fi
-
-		unset OLD_CONFIG_VALUE
-		unset NEW_CONFIG_VALUE
-		unset $OPENQRM_CONFIG_PARAM
-		if [ -f "$OLD_CONF" ]; then
-			. $OLD_CONF
-		else
-			echo "NOTICE: $OLD_CONF does not exist!"
-		fi
-		eval OLD_CONFIG_VALUE=\$$OPENQRM_CONFIG_PARAM
-		unset $OPENQRM_CONFIG_PARAM
-		if [ -f "$NEW_CONF" ]; then
-			. $NEW_CONF
-		else
-			echo "NOTICE: $NEW_CONF does not exist!"
-		fi
-		eval NEW_CONFIG_VALUE=\$$OPENQRM_CONFIG_PARAM
-
-		# existing in old config but not in new !
-		if [ "$OLD_CONFIG_VALUE" != "" ] && [ "$NEW_CONFIG_VALUE" == "" ]; then
-		   if [ -f "$NEW_CONF" ]; then
-					if ! grep -w $OPENQRM_CONFIG_PARAM $NEW_CONF 1>/dev/null; then
-							echo "    - Config parameter $OPENQRM_CONFIG_PARAM does not exist any more!"
-					else
-							echo "    - Config parameter $OPENQRM_CONFIG_PARAM was set in old configuration."
-							if [ "$FORCE_UPDATE" == "false" ]; then
-									echo "    - e - Edit configuration"
-									echo "    - k - Keep new configuration"
-									echo
-									read -n1 APPLY_CONFIG_PARAM
-									case "$APPLY_CONFIG_PARAM" in
-											e)
-													echo
-													echo "   - Editing configuration parameter $OPENQRM_CONFIG_PARAM"
-													echo
-													echo -n "  $OPENQRM_CONFIG_PARAM="
-													read USER_INPUT_OPENQRM_CONFIG_PARAM
-													if [ -f "$NEW_CONF" ]; then
-															sed -i -e "s#$OPENQRM_CONFIG_PARAM.*=.*#$OPENQRM_CONFIG_PARAM=\"$USER_INPUT_OPENQRM_CONFIG_PARAM\"#g" $NEW_CONF
-													else
-															echo "NOTICE: $NEW_CONF does not exist!"
-													fi
-													break
-													;;
-											k)
-													echo
-													echo "   - Keeping new configuration for parameter $OPENQRM_CONFIG_PARAM"
-													break
-													;;
-									esac
-							else
-									echo "    - Applying old configuration for config parameter $OPENQRM_CONFIG_PARAM"
-									sed -i -e "s#$OPENQRM_CONFIG_PARAM=.*#$OPENQRM_CONFIG_PARAM=\"$OLD_CONFIG_VALUE\"#g" $NEW_CONF
-							fi
-					fi
-			fi
-			continue
-		fi
-		# existing in new config but not in old !
-		if [ "$OLD_CONFIG_VALUE" == "" ] && [ "$NEW_CONFIG_VALUE" != "" ]; then
-			while (true); do
-				echo "    - Config parameter $OPENQRM_CONFIG_PARAM is new!"
-				echo "      $OPENQRM_CONFIG_PARAM=$NEW_CONFIG_VALUE"
-
-				if [ "$FORCE_UPDATE" == "false" ]; then
-					echo "    - e - Edit configuration"
-					echo "    - k - Keep new configuration"
-					echo
-					read -n1 APPLY_CONFIG_PARAM
-
-					case "$APPLY_CONFIG_PARAM" in
-						e)
-							echo
-							echo "   - Editing configuration parameter $OPENQRM_CONFIG_PARAM"
-							echo
-							echo -n "  $OPENQRM_CONFIG_PARAM="
-							read USER_INPUT_OPENQRM_CONFIG_PARAM
-							if [ -f "$NEW_CONF" ]; then
-								sed -i -e "s#$OPENQRM_CONFIG_PARAM.*=.*#$OPENQRM_CONFIG_PARAM=\"$USER_INPUT_OPENQRM_CONFIG_PARAM\"#g" $NEW_CONF
-							else
-								echo "NOTICE: $NEW_CONF does not exist!"
-							fi
-							break
-							;;
-						k)
-							echo
-							echo "   - Keeping new configuration for parameter $OPENQRM_CONFIG_PARAM"
-							break
-							;;
-					esac
-				else
-					echo "   - Force enabled. Keeping new configuration for parameter $OPENQRM_CONFIG_PARAM"
-					break
-				fi
-			done
-
-		elif [ "$OLD_CONFIG_VALUE" != "$NEW_CONFIG_VALUE" ]; then
-		# existing in both configs but with different value
-        
-			while (true); do
-				echo "    - Change detected for parameter $OPENQRM_CONFIG_PARAM"
-				echo
-				echo "      old = $OLD_CONFIG_VALUE"
-				echo "      new = $NEW_CONFIG_VALUE"
-				echo
-
-				if [ "$FORCE_UPDATE" == "false" ]; then
-					echo "    - o - Apply old configuration"
-					echo "    - k - Keep new configuration"
-					echo
-					read -n1 APPLY_CONFIG_PARAM
-
-					case "$APPLY_CONFIG_PARAM" in
-						o)
-							echo "   - Applying old configuration"
-							if [ -f "$NEW_CONF" ]; then
-								sed -i -e "s#$OPENQRM_CONFIG_PARAM.*=.*#$OPENQRM_CONFIG_PARAM=\"$OLD_CONFIG_VALUE\"#g" $NEW_CONF
-							else
-								echo "NOTICE: $NEW_CONF does not exist!"
-							fi
-							break
-							;;
-						k)
-							echo "   - Keeping new configuration"
-							break
-							;;
-					esac
-				else
-					echo "   - Force enabled. Applying old configuration"
-					if [ -f "$NEW_CONF" ]; then
-						sed -i -e "s#$OPENQRM_CONFIG_PARAM.*=.*#$OPENQRM_CONFIG_PARAM=\"$OLD_CONFIG_VALUE\"#g" $NEW_CONF
-					else
-						echo "NOTICE: $NEW_CONF does not exist!"
-					fi
-					break
-				fi
-			done
-		fi
-	done
-}
-
-
-
-function pre_update() {
-	echo "- Running pre update phase"
-	# full backup of basedir
-	echo "  - Taking full backup of $OPENQRM_SERVER_BASE_DIR/openqrm"
-	rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm_pre_update
-	cp -aR $OPENQRM_SERVER_BASE_DIR/openqrm $OPENQRM_SERVER_BASE_DIR/openqrm_pre_update
-	# db + state backup
-	echo "  - Taking state + db backup"
-	rm -rf $OPENQRM_SERVER_STATE_DIR/openqrm_pre_update*
-	$OPENQRM_SERVER_BASE_DIR/openqrm/bin/openqrm state backup -n openqrm_pre_update
-	# now we are save to update files and db
-	# remove all old plugin php classes + tpl
-	echo "  - Removing old plugins php classes"
-	find $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ -type f -wholename "*/plugins/*/web/class/*.class.php" -delete
-	find $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ -type f -wholename "*/plugins/*/web/tpl/*.tpl.php" -delete
-	# clean web base + plugins
-	find $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/aa_plugins/ -type f -wholename "*/web/base/plugins/aa_plugins/class/*.class.php" -delete
-	find $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/aa_plugins/ -type f -wholename "*/web/base/plugins/aa_plugins/tpl/*.tpl.php" -delete
-	find $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/ -type f -wholename "*/web/base/server/*/class/*.class.php" -delete
-	find $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/ -type f -wholename "*/web/base/server/*/tpl/*.tpl.php" -delete
-	# custom updates from openQRM 4.9 to 5.0
-	# clean up old/removed files
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/local-storage-state.php
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/root-mount.local-storage
-
-	# custom updates from openQRM 4.9 to 5.0
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/aa_server/js/jqplot.donutRenderer.min.js
-	return 0
-}
-
-
-
-function post_update() {
-	echo "- Running post update phase"
-	# keeping origin in state dir
-	mv $OPENQRM_SERVER_BASE_DIR/openqrm_pre_update $OPENQRM_SERVER_STATE_DIR/
-	# restart openQRM
-	OPENQRM_INIT=""
-	if [ -x /etc/init.d/openqrm ]; then
-		OPENQRM_INIT="/etc/init.d/openqrm"
-	elif [ -x /etc/init.d/openqrm-enterprise ]; then
-		OPENQRM_INIT="/etc/init.d/openqrm-enterprise"
-	fi
-	if [ "$OPENQRM_INIT" != "" ]; then
-		$OPENQRM_INIT stop
-	fi
-	if [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/unconfigured ]; then
-		rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/unconfigured
-	fi
-	$OPENQRM_INIT start
-	echo "- post update finished successfully"
-}
-
-
-
-function base_update() {
-	echo "- Running base update phase"
-	# re-source main config
-	if [ ! -f "$OPENQRM_SERVER_BASE_DIR/openqrm_pre_update/etc/openqrm-server.conf" ]; then
-		echo "ERROR: Applying base-update before pre-update phase ! Trying to continue ..."
-		sleep 5
-		. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	else
-		. $OPENQRM_SERVER_BASE_DIR/openqrm_pre_update/etc/openqrm-server.conf
-	fi
-	# source db-functions according db-type
-	echo "- Database shema sanity check (databasetype $OPENQRM_DATABASE_TYPE)"
-	$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/$OPENQRM_DATABASE_TYPE/openqrm-$OPENQRM_DATABASE_TYPE-functions update
-	# wait to check by the user if not in force mode
-	if [ "$FORCE_UPDATE" == "false" ]; then
-		echo "=> Please press <ENTER> to go on"
-		read
-	fi
-
-	# unpack all new boot-services
-	for OPENQRM_BOOTSERVICE in `find $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ -name boot-service-*.tgz`; do
-		OPENQRM_BOOTSERVICE_FILENAME=`basename $OPENQRM_BOOTSERVICE`
-		OPENQRM_BOOTSERVICE_DIRNAME=`dirname $OPENQRM_BOOTSERVICE`
-		rm -rf $OPENQRM_BOOTSERVICE_DIRNAME/boot-service.tmp
-		mkdir $OPENQRM_BOOTSERVICE_DIRNAME/boot-service.tmp
-		if ! tar -C $OPENQRM_BOOTSERVICE_DIRNAME/boot-service.tmp -xzf $OPENQRM_BOOTSERVICE; then
-			echo "ERROR: Could not unpack boot-service $OPENQRM_BOOTSERVICE !"
-			sleep 5
-			rm -rf $OPENQRM_BOOTSERVICE_DIRNAME/boot-service.tmp
-		fi
-	done
-
-	# unpack all old boot-services
-	for OPENQRM_OLD_BOOTSERVICE in `find $OPENQRM_SERVER_BASE_DIR/openqrm_pre_update/plugins/ -name boot-service-*.tgz`; do
-		OPENQRM_OLD_BOOTSERVICE_FILENAME=`basename $OPENQRM_OLD_BOOTSERVICE`
-		OPENQRM_OLD_BOOTSERVICE_DIRNAME=`dirname $OPENQRM_OLD_BOOTSERVICE`
-		rm -rf $OPENQRM_OLD_BOOTSERVICE_DIRNAME/boot-service.tmp
-		mkdir $OPENQRM_OLD_BOOTSERVICE_DIRNAME/boot-service.tmp
-		if ! tar -C $OPENQRM_OLD_BOOTSERVICE_DIRNAME/boot-service.tmp -xzf $OPENQRM_OLD_BOOTSERVICE; then
-			echo "ERROR: Could not unpack boot-service $OPENQRM_OLD_BOOTSERVICE !"
-			sleep 5
-			rm -rf $OPENQRM_OLD_BOOTSERVICE_DIRNAME/boot-service.tmp
-		fi
-	done
-
-	# config file sanity check
-	for OPENQRM_CONF_FILE in `find $OPENQRM_SERVER_BASE_DIR/openqrm/ -name *.conf | cut -d'/' -f5-`; do
-		if [ -f "$OPENQRM_SERVER_BASE_DIR/openqrm_pre_update/$OPENQRM_CONF_FILE" ]; then
-			echo "  - Checking config file $OPENQRM_SERVER_BASE_DIR/openqrm/$OPENQRM_CONF_FILE"
-			if ! diff $OPENQRM_SERVER_BASE_DIR/openqrm_pre_update/$OPENQRM_CONF_FILE $OPENQRM_SERVER_BASE_DIR/openqrm/$OPENQRM_CONF_FILE 1>/dev/null 2>/dev/null; then
-				while (true); do
-					echo "  - Changes detected for config file $OPENQRM_SERVER_BASE_DIR/openqrm/$OPENQRM_CONF_FILE"
-					if [ "$FORCE_UPDATE" == "false" ]; then
-						echo "  - v - View changes"
-						echo "  - a - Try to apply old configuration"
-						echo "  - k - Apply new config file"
-						echo
-
-						read -n1 APPLY_OLD_CONFIG
-						case "$APPLY_OLD_CONFIG" in
-							v)
-								echo "  - Displaying changes"
-								echo
-								if [ ! -f "$OPENQRM_SERVER_BASE_DIR/openqrm_pre_update/$OPENQRM_CONF_FILE" ]; then
-									echo "NOTICE: $OPENQRM_SERVER_BASE_DIR/openqrm_pre_update/$OPENQRM_CONF_FILE does not exist"
-								elif [ !-f "$OPENQRM_SERVER_BASE_DIR/openqrm/$OPENQRM_CONF_FILE" ]; then
-									echo "NOTICE: $OPENQRM_SERVER_BASE_DIR/openqrm/$OPENQRM_CONF_FILE does not exist"
-								else
-									diff $OPENQRM_SERVER_BASE_DIR/openqrm_pre_update/$OPENQRM_CONF_FILE $OPENQRM_SERVER_BASE_DIR/openqrm/$OPENQRM_CONF_FILE
-								fi
-								;;
-							a)
-								echo "  - Trying to apply old configuration"
-								openqrm_apply_old_config  $OPENQRM_SERVER_BASE_DIR/openqrm/$OPENQRM_CONF_FILE $OPENQRM_SERVER_BASE_DIR/openqrm_pre_update/$OPENQRM_CONF_FILE
-								echo
-								break
-								;;
-							k)
-								echo "   - Keeping new configuration"
-								break
-								;;
-						esac
-					else
-						echo
-						echo "  - Force enabled. Trying to apply old configuration"
-						openqrm_apply_old_config  $OPENQRM_SERVER_BASE_DIR/openqrm/$OPENQRM_CONF_FILE $OPENQRM_SERVER_BASE_DIR/openqrm_pre_update/$OPENQRM_CONF_FILE
-						echo
-						break
-					fi
-				done
-			fi
-		fi
-	done
-
-	# pack all new boot-services
-	for OPENQRM_BOOTSERVICE in `find $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ -name boot-service-*.tgz`; do
-		OPENQRM_BOOTSERVICE_FILENAME=`basename $OPENQRM_BOOTSERVICE`
-		OPENQRM_BOOTSERVICE_DIRNAME=`dirname $OPENQRM_BOOTSERVICE`
-		TIMESTAMP=`date +%s`
-		mv -f $OPENQRM_BOOTSERVICE $OPENQRM_BOOTSERVICE.$TIMESTAMP
-		cd $OPENQRM_BOOTSERVICE_DIRNAME/boot-service.tmp/
-		if ! tar -czf $OPENQRM_BOOTSERVICE *; then
-			echo "ERROR: Could not re-pack boot-service $OPENQRM_BOOTSERVICE !"
-			sleep 5
-		fi
-		cd - 1>/dev/null
-		rm -rf $OPENQRM_BOOTSERVICE_DIRNAME/boot-service.tmp
-	done
-
-	# clean up old boot-services
-	for OPENQRM_OLD_BOOTSERVICE in `find $OPENQRM_SERVER_BASE_DIR/openqrm_pre_update/plugins/ -name boot-service-*.tgz`; do
-		OPENQRM_OLD_BOOTSERVICE_FILENAME=`basename $OPENQRM_OLD_BOOTSERVICE`
-		OPENQRM_OLD_BOOTSERVICE_DIRNAME=`dirname $OPENQRM_OLD_BOOTSERVICE`
-		rm -rf $OPENQRM_OLD_BOOTSERVICE_DIRNAME/boot-service.tmp
-	done
-
-	# custom updates from openQRM 4.6 to 4.7
-	# link the tftpboot/boot dir to the boot-services
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/boot
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/ $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/boot
-	
-	# custom update actions for various plugins
-	$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/bin/openqrm-cloud-manager update-soap
-	# update from 4.9 to 5.0 - lock for the command-queueu
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/var/lock/
-	chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/var/lock/
-	# update from 4.9 to 5.0 - upload dir
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/tmp
-	chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/tmp
-	# remove deprecated boot-services
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/boot-service-cloud.tgz
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/boot-service-linuxcoe.tgz
-	# create htaccess files for storage and virt-stat dirs if not existing already
-	for PLUGIN in `ls $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/`; do
-		if [ -d $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN/web/storage ]; then
-			if [ ! -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN/web/storage/.htaccess ]; then
-				echo "Order deny,allow" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN/web/storage/.htaccess
-				echo "Deny from all" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN/web/storage/.htaccess
-			fi
-		fi
-		if [ -d $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN/web/$PLUGIN-stat ]; then
-			if [ ! -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN/web/$PLUGIN-stat/.htaccess ]; then
-				echo "Order deny,allow" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN/web/$PLUGIN-stat/.htaccess
-				echo "Deny from all" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN/web/$PLUGIN-stat/.htaccess
-			fi
-		fi
-	done
-	# libvirt hosts need remote access to the storage and stat dir
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/libvirt/web/libvirt-stat/.htaccess
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/libvirt/web/storage/.htaccess
-	# cleanup css
-	find $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/ -name calendar.css -delete
-
-}
-
-function do_initrd_update() {
-
-			INITRD_FILENAME=`basename $INITRD_FILE`
-			rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/openqrm-initrd-update
-			mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/openqrm-initrd-update
-			rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/openqrm-initrd-update/$INITRD_FILENAME
-			cp -f $INITRD_FILE $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/openqrm-initrd-update/$INITRD_FILENAME.gz
-			cd $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/openqrm-initrd-update/
-			# unpack
-			if ! gunzip < $INITRD_FILENAME.gz | cpio --extract --preserve; then
-				rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/openqrm-initrd-update
-				echo "ERROR: Could not gunzip $INITRD_FILE. Continuing ..."
-				continue
-			fi
-			rm -f $INITRD_FILENAME.gz
-			# update linuxrc
-			cp -af $OPENQRM_SERVER_BASE_DIR/openqrm//etc/templates/openqrm-linuxrc init
-			chmod +x init
-			# pack again
-			if ! find . | cpio -o -H newc | gzip -9 > $INITRD_FILE.new; then
-				rm -f $INITRD_FILE.new
-				rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/openqrm-initrd-update
-				echo "ERROR: Could not re-pack $INITRD_FILE. Continuing ..."
-				continue
-			fi
-			cp -f $INITRD_FILE.new $INITRD_FILE
-			rm -f $INITRD_FILE.new
-			# cleanup
-			cd $CURRENT_UPDATE_DIR
-			rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/openqrm-initrd-update
-
-
-}
-
-
-function initrd_update() {
-	echo "- Updating initrds"
-	CURRENT_UPDATE_DIR=`pwd`
-
-	if [ "$INITRD_FILE" != "" ]; then
-		
-		do_initrd_update
-		
-	else
-
-	for INITRD_FILE in `ls $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/initrd-*.img`; do
-		UPDATE_OPENQRM_INITRD=false
-
-		if [ "$FORCE_UPDATE" == "false" ]; then
-			echo "    - y - Update $INITRD_FILE"
-			echo "    - n - Skip update of $INITRD_FILE"
-#			echo
-			read -n1 APPLY_INITRD_UPDATE
-
-			case "$APPLY_INITRD_UPDATE" in
-				y)
-					echo "   - Updating $INITRD_FILE"
-					UPDATE_OPENQRM_INITRD=true
-					;;
-				*)
-					echo "   - Keeping old initrd $INITRD_FILE"
-					UPDATE_OPENQRM_INITRD=false
-					;;
-			esac
-		else
-			echo "   - Force enabled. Updating $INITRD_FILE"
-			UPDATE_OPENQRM_INITRD=true
-		fi
-
-		if [ "$UPDATE_OPENQRM_INITRD" == "true" ]; then
-		
-			do_initrd_update
-		
-		fi
-		
-		echo 
-
-	done
-	fi
-}
-
-
-
-
-
-# debug
-# openqrm_apply_old_config /usr/share/openqrm/plugins/kvm/etc/openqrm-plugin-kvm.conf /usr/share/openqrm_pre_update/plugins/kvm/etc/openqrm-plugin-kvm.conf
-
-if [ "$2" == "-f" ]; then
-	export FORCE_UPDATE=true
-else
-	export FORCE_UPDATE=false
-	
-	if [ "$2" != "" ]; then
-		export INITRD_FILE=$OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/$2
-	fi
-fi
-
-
-# main
-case "$1" in
-	pre)
-		pre_update
-		;;
-	post)
-		post_update
-		;;
-	base)
-		base_update
-		;;
-	initrds)
-		initrd_update
-		;;
-	*)
-		update_usage
-		;;
-esac
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/debian/changelog b/openQRM-5.3.50-CE/src/debian/changelog
deleted file mode 100644
index d4dba54..0000000
--- a/openQRM-5.3.50-CE/src/debian/changelog
+++ /dev/null
@@ -1,215 +0,0 @@
-openqrm (5.3.2-ubuntu1) xenial; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New Community release 5.3.2
-  * Enhanced package dependencies for latest Ubuntu, Debian and CentOS
-  * removed rpmforge repository dependencies
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 18 Jan 2017 15:00:00 +0200
-
-openqrm (5.3.1-ubuntu1) xenial; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New Community release 5.3
-  * Important security update
-  * Many bugfixes and lots of enhancements especially for KVM and Cloud plugin
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 18 Oct 2016 15:00:00 +0200
-
-openqrm (5.2.15-ubuntu1) xenial; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New Amazon features in 5.2.15
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 9 Jun 2016 15:00:00 +0200
-
-openqrm (5.2.14-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New Amazon plugin in 5.2.14
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Mon, 18 Apr 2016 15:00:00 +0200
-
-openqrm (5.2.13-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * VMware vSphere integration 5.2.13
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Mon, 25 Jan 2016 15:00:00 +0200
-
-openqrm (5.2.12-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New VMware vSphere integration 5.2.12 beta1
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 05 Jan 2016 15:00:00 +0200
-
-openqrm (5.2.11-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New VMware vSphere integration 5.2.11
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 29 Dec 2015 15:00:00 +0200
-
-openqrm (5.2.10-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.10
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Thu, 30 Aug 2015 15:00:00 +0200
-
-openqrm (5.2.9-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.9
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Thu, 16 Jul 2015 15:00:00 +0200
-
-openqrm (5.2.8-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.8
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 6 Jul 2015 15:00:00 +0200
-
-openqrm (5.2.7-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.7
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 25 Jun 2015 15:00:00 +0200
-
-openqrm (5.2.6-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.6
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 22 Jun 2015 15:00:00 +0200
-
-openqrm (5.2.5-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.5
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 19 Jun 2015 15:00:00 +0200
-
-openqrm (5.2.4-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.4
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 12 Jun 2015 15:00:00 +0200
-
-openqrm (5.2.3-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.3-beta
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 18 May 2015 15:00:00 +0200
-
-openqrm (5.2.1-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.1
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 31 Jan 2015 15:00:00 +0200
-
-openqrm (5.1.4-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.1.4
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 22 Jul 2014 15:00:00 +0200
-
-openqrm (5.1.3-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.1.3
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 30 Apr 2014 15:00:00 +0200
-
-openqrm (5.1.2-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.1.2
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 12 Mar 2014 15:00:00 +0200
-
-openqrm (5.1.1-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.1.1
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Fr, 6 Dec 2013 15:00:00 +0200
-
-openqrm (5.1.0-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 5.1.0
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Sat, 31 Aug 2013 15:00:00 +0200
-
-openqrm (5.1-beta.0-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New beta release 5.1-beta.0
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 31 Jul 2013 15:00:00 +0200
-
-openqrm (5.0.3-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New minor release 5.0.3
-  * fixed nasty bug preventing dhcpd/dns to start on Ubuntu
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Thur, 7 Mar 2013 15:00:00 +0200
-
-openqrm (5.0.2-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New minor release 5.0.2
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Thur, 24 Jan 2013 15:00:00 +0200
-
-openqrm (5.0.1-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New minor release 5.0.1
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Sat, 31 May 2012 15:00:00 +0200
-
-openqrm (5.0-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 5.0
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Sat, 31 May 2012 15:00:00 +0200
-
-openqrm (4.9-ubuntu1) lucid; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 4.9
-
- -- Matthias Rechenburg <matt@openqrm.com>  Sat, 31 Oct 2011 15:00:00 +0200
-
-openqrm (4.8-ubuntu1) maverick; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 4.8
-
- -- Matthias Rechenburg <matt@openqrm.com>  Sat, 31 Mar 2011 15:00:00 +0200
-
-openqrm (4.7-ubuntu1) maverick; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 4.7
-
- -- Matthias Rechenburg <matt@openqrm.com>  Sat, 30 Oct 2010 16:43:35 +0200
-
-openqrm (4.6-ubuntu1) karmic; urgency=low
-
-  [ Matthias Rechenburg ]
-  * Initial release
-
- -- Matthias Rechenburg <matt@openqrm.com>  Sat, 05 Sep 2009 21:14:45 +0200
-
diff --git a/openQRM-5.3.50-CE/src/debian/changelog.debian b/openQRM-5.3.50-CE/src/debian/changelog.debian
deleted file mode 100644
index da08599..0000000
--- a/openQRM-5.3.50-CE/src/debian/changelog.debian
+++ /dev/null
@@ -1,242 +0,0 @@
-openqrm (5.3.50-debian1) buster; urgency=low
-
-  [ Roger Mangraviti ]
-  * Debian 11 Bullseye
-  * ATU plugin revision
-  * linuxrc ixgbe module dependency pre-loading
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 28 Aug 2021 12:41:12 +1000
-
-openqrm (5.3.42-debian1) buster; urgency=low
-
-  [ Roger Mangraviti ]
-  * Deprecated x86 32bit support
-  * integrated systemd
-  * Adjustments & Refactoring
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 17 Aug 2021 11:30:29 +1000
-
-openqrm (5.3.41-debian1) buster; urgency=low
-
-  [ Roger Mangraviti ]
-  * Deprecated Nagios3
-  * New Nagios4
-  * Adjustments & Refactoring
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 4 Jul 2021 17:56:14 +1000
-
-openqrm (5.3.40-debian1) buster; urgency=low
-
-  [ Roger Mangraviti ]
-  * Repackaged for Debian Buster
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 3 Feb 2021 20:12:02 +1000
-
-openqrm (5.3.2-debian1) jessie; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New Community release 5.3.2
-  * Enhanced package dependencies for latest Ubuntu, Debian and CentOS
-  * removed rpmforge repository dependencies
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 18 January 2017 15:00:00 +0200
-
-openqrm (5.3.1-debian1) jessie; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New Community release 5.3
-  * Important security update
-  * Many bugfixes and lots of enhancements especially for KVM and Cloud plugin
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 18 October 2016 15:00:00 +0200
-
-openqrm (5.2.15-debian1) jessie; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New Amazon plugin in 5.2.15
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 9 June 2016 15:00:00 +0200
-
-openqrm (5.2.14-debian1) jessie; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New Amazon plugin in 5.2.14
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Mon, 18 April 2016 15:00:00 +0200
-
-openqrm (5.2.13-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * VMware vSphere integration 5.2.13
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Mon, 25 January 2016 15:00:00 +0200
-
-openqrm (5.2.11-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New VMware vSphere integration 5.2.11
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 29 December 2015 15:00:00 +0200
-
-openqrm (5.2.10-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.10
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Thu, 30 August 2015 15:00:00 +0200
-
-openqrm (5.2.9-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.9
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Thu, 16 July 2015 15:00:00 +0200
-
-openqrm (5.2.8-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.8
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 6 July 2015 15:00:00 +0200
-
-openqrm (5.2.7-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.7
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 25 June 2015 15:00:00 +0200
-
-openqrm (5.2.6-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.6
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 22 June 2015 15:00:00 +0200
-
-openqrm (5.2.5-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.5
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 19 June 2015 15:00:00 +0200
-
-openqrm (5.2.4-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.4
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 12 June 2015 15:00:00 +0200
-
-openqrm (5.2.3-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.3-beta
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 18 May 2015 15:00:00 +0200
-
-openqrm (5.2.1-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.1
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 31 January 2015 15:00:00 +0200
-
-openqrm (5.1.4-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.1.4
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 22 July 2014 15:00:00 +0200
-
-openqrm (5.1.3-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.1.3
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 30 April 2014 15:00:00 +0200
-
-openqrm (5.1.2-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.1.2
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 12 March 2014 15:00:00 +0200
-
-openqrm (5.1.1-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.1.1
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Fr, 6 December 2013 15:00:00 +0200
-
-openqrm (5.1.0-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 5.1.0
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Sat, 31 August 2013 15:00:00 +0200
-
-openqrm (5.1-beta.0-debian1) squeeze; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New beta release 5.1-beta.0
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 31 July 2013 15:00:00 +0200
-
-openqrm (5.0.3-debian1) squeeze; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New minor release 5.0.3
-  * fixed nasty bug preventing dhcpd/dns to start on Ubuntu
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Thur, 7 March 2013 15:00:00 +0200
-
-openqrm (5.0.2-debian1) squeeze; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New minor release 5.0.2
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Thur, 24 January 2013 15:00:00 +0200
-
-openqrm (5.0.1-debian1) squeeze; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New minor release 5.0.1
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Sat, 31 May 2012 15:00:00 +0200
-
-openqrm (5.0-debian1) squeeze; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 5.0
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Sat, 31 May 2012 15:00:00 +0200
-
-openqrm (4.9-debian1) lenny; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 4.9
-
- -- Matthias Rechenburg <matt@openqrm.com>  Sat, 31 Oct 2011 15:00:00 +0200
-
-openqrm (4.8-debian1) lenny; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 4.8
-
- -- Matthias Rechenburg <matt@openqrm.com>  Sat, 31 Mar 2011 15:00:00 +0200
-
-openqrm (4.7-debian1) lenny; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 4.7
-
- -- Matthias Rechenburg <matt@openqrm.com>  Sat, 30 Oct 2010 16:43:35 +0200
-
-openqrm (4.6-debian1) lenny; urgency=low
-
-  [ Matthias Rechenburg ]
-  * Initial release
-
- -- Matthias Rechenburg <matt@openqrm.com>  Sat, 05 Sep 2009 21:14:45 +0200
-
diff --git a/openQRM-5.3.50-CE/src/debian/changelog.debian~ b/openQRM-5.3.50-CE/src/debian/changelog.debian~
deleted file mode 100644
index 26a2bd1..0000000
--- a/openQRM-5.3.50-CE/src/debian/changelog.debian~
+++ /dev/null
@@ -1,233 +0,0 @@
-openqrm (5.3.42-debian1) buster; urgency=low
-
-  [ Roger Mangraviti ]
-  * Deprecated x86 32bit support
-  * integrated systemd
-  * Adjustments & Refactoring
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 17 Aug 2021 11:30:29 +1000
-
-openqrm (5.3.41-debian1) buster; urgency=low
-
-  [ Roger Mangraviti ]
-  * Deprecated Nagios3
-  * New Nagios4
-  * Adjustments & Refactoring
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 4 Jul 2021 17:56:14 +1000
-
-openqrm (5.3.40-debian1) buster; urgency=low
-
-  [ Roger Mangraviti ]
-  * Repackaged for Debian Buster
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 3 Feb 2021 20:12:02 +1000
-
-openqrm (5.3.2-debian1) jessie; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New Community release 5.3.2
-  * Enhanced package dependencies for latest Ubuntu, Debian and CentOS
-  * removed rpmforge repository dependencies
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 18 January 2017 15:00:00 +0200
-
-openqrm (5.3.1-debian1) jessie; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New Community release 5.3
-  * Important security update
-  * Many bugfixes and lots of enhancements especially for KVM and Cloud plugin
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 18 October 2016 15:00:00 +0200
-
-openqrm (5.2.15-debian1) jessie; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New Amazon plugin in 5.2.15
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 9 June 2016 15:00:00 +0200
-
-openqrm (5.2.14-debian1) jessie; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New Amazon plugin in 5.2.14
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Mon, 18 April 2016 15:00:00 +0200
-
-openqrm (5.2.13-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * VMware vSphere integration 5.2.13
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Mon, 25 January 2016 15:00:00 +0200
-
-openqrm (5.2.11-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New VMware vSphere integration 5.2.11
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 29 December 2015 15:00:00 +0200
-
-openqrm (5.2.10-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.10
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Thu, 30 August 2015 15:00:00 +0200
-
-openqrm (5.2.9-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.9
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Thu, 16 July 2015 15:00:00 +0200
-
-openqrm (5.2.8-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.8
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 6 July 2015 15:00:00 +0200
-
-openqrm (5.2.7-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.7
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 25 June 2015 15:00:00 +0200
-
-openqrm (5.2.6-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.6
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 22 June 2015 15:00:00 +0200
-
-openqrm (5.2.5-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.5
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 19 June 2015 15:00:00 +0200
-
-openqrm (5.2.4-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.4
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 12 June 2015 15:00:00 +0200
-
-openqrm (5.2.3-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.3-beta
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 18 May 2015 15:00:00 +0200
-
-openqrm (5.2.1-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.1
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 31 January 2015 15:00:00 +0200
-
-openqrm (5.1.4-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.1.4
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 22 July 2014 15:00:00 +0200
-
-openqrm (5.1.3-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.1.3
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 30 April 2014 15:00:00 +0200
-
-openqrm (5.1.2-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.1.2
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 12 March 2014 15:00:00 +0200
-
-openqrm (5.1.1-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.1.1
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Fr, 6 December 2013 15:00:00 +0200
-
-openqrm (5.1.0-debian1) wheezy; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 5.1.0
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Sat, 31 August 2013 15:00:00 +0200
-
-openqrm (5.1-beta.0-debian1) squeeze; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New beta release 5.1-beta.0
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 31 July 2013 15:00:00 +0200
-
-openqrm (5.0.3-debian1) squeeze; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New minor release 5.0.3
-  * fixed nasty bug preventing dhcpd/dns to start on Ubuntu
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Thur, 7 March 2013 15:00:00 +0200
-
-openqrm (5.0.2-debian1) squeeze; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New minor release 5.0.2
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Thur, 24 January 2013 15:00:00 +0200
-
-openqrm (5.0.1-debian1) squeeze; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New minor release 5.0.1
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Sat, 31 May 2012 15:00:00 +0200
-
-openqrm (5.0-debian1) squeeze; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 5.0
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Sat, 31 May 2012 15:00:00 +0200
-
-openqrm (4.9-debian1) lenny; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 4.9
-
- -- Matthias Rechenburg <matt@openqrm.com>  Sat, 31 Oct 2011 15:00:00 +0200
-
-openqrm (4.8-debian1) lenny; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 4.8
-
- -- Matthias Rechenburg <matt@openqrm.com>  Sat, 31 Mar 2011 15:00:00 +0200
-
-openqrm (4.7-debian1) lenny; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 4.7
-
- -- Matthias Rechenburg <matt@openqrm.com>  Sat, 30 Oct 2010 16:43:35 +0200
-
-openqrm (4.6-debian1) lenny; urgency=low
-
-  [ Matthias Rechenburg ]
-  * Initial release
-
- -- Matthias Rechenburg <matt@openqrm.com>  Sat, 05 Sep 2009 21:14:45 +0200
-
diff --git a/openQRM-5.3.50-CE/src/debian/changelog.ubuntu b/openQRM-5.3.50-CE/src/debian/changelog.ubuntu
deleted file mode 100644
index 9ea38a4..0000000
--- a/openQRM-5.3.50-CE/src/debian/changelog.ubuntu
+++ /dev/null
@@ -1,215 +0,0 @@
-openqrm (5.3.2-ubuntu1) xenial; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New Community release 5.3.2
-  * Enhanced package dependencies for latest Ubuntu, Debian and CentOS
-  * removed rpmforge repository dependencies
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 18 January 2017 15:00:00 +0200
-
-openqrm (5.3.1-ubuntu1) xenial; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New Community release 5.3
-  * Important security update
-  * Many bugfixes and lots of enhancements especially for KVM and Cloud plugin
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 18 October 2016 15:00:00 +0200
-
-openqrm (5.2.15-ubuntu1) xenial; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New Amazon features in 5.2.15
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 9 June 2016 15:00:00 +0200
-
-openqrm (5.2.14-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New Amazon plugin in 5.2.14
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Mon, 18 April 2016 15:00:00 +0200
-
-openqrm (5.2.13-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * VMware vSphere integration 5.2.13
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Mon, 25 January 2016 15:00:00 +0200
-
-openqrm (5.2.12-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New VMware vSphere integration 5.2.12 beta1
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 05 January 2016 15:00:00 +0200
-
-openqrm (5.2.11-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New VMware vSphere integration 5.2.11
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 29 December 2015 15:00:00 +0200
-
-openqrm (5.2.10-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.10
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Thu, 30 August 2015 15:00:00 +0200
-
-openqrm (5.2.9-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.9
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Thu, 16 July 2015 15:00:00 +0200
-
-openqrm (5.2.8-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.8
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 6 July 2015 15:00:00 +0200
-
-openqrm (5.2.7-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.7
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 25 June 2015 15:00:00 +0200
-
-openqrm (5.2.6-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.6
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 22 June 2015 15:00:00 +0200
-
-openqrm (5.2.5-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.5
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 19 June 2015 15:00:00 +0200
-
-openqrm (5.2.4-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.4
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 12 June 2015 15:00:00 +0200
-
-openqrm (5.2.3-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.3
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 18 May 2015 15:00:00 +0200
-
-openqrm (5.2.1-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.2.1
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 31 January 2015 15:00:00 +0200
-
-openqrm (5.1.4-ubuntu1) trusty; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.1.4
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Tue, 22 July 2014 15:00:00 +0200
-
-openqrm (5.1.3-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.1.3
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 30 April 2014 15:00:00 +0200
-
-openqrm (5.1.2-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.1.2
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 12 March 2014 15:00:00 +0200
-
-openqrm (5.1.1-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New hardened release 5.1.1
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Fr, 6 December 2013 15:00:00 +0200
-
-openqrm (5.1.0-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 5.1.0
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Sat, 31 August 2013 15:00:00 +0200
-
-openqrm (5.1-beta.0-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New beta release 5.1-beta.0
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Wed, 31 July 2013 15:00:00 +0200
-
-openqrm (5.0.3-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New minor release 5.0.3
-  * fixed nasty bug preventing dhcpd/dns to start on Ubuntu
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Thur, 7 March 2013 15:00:00 +0200
-
-openqrm (5.0.2-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New minor release 5.0.2
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Thur, 24 January 2013 15:00:00 +0200
-
-openqrm (5.0.1-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New minor release 5.0.1
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Sat, 31 May 2012 15:00:00 +0200
-
-openqrm (5.0-ubuntu1) precise; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 5.0
-
- -- OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>  Sat, 31 May 2012 15:00:00 +0200
-
-openqrm (4.9-ubuntu1) lucid; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 4.9
-
- -- Matthias Rechenburg <matt@openqrm.com>  Sat, 31 Oct 2011 15:00:00 +0200
-
-openqrm (4.8-ubuntu1) maverick; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 4.8
-
- -- Matthias Rechenburg <matt@openqrm.com>  Sat, 31 Mar 2011 15:00:00 +0200
-
-openqrm (4.7-ubuntu1) maverick; urgency=low
-
-  [ Matthias Rechenburg ]
-  * New stable release 4.7
-
- -- Matthias Rechenburg <matt@openqrm.com>  Sat, 30 Oct 2010 16:43:35 +0200
-
-openqrm (4.6-ubuntu1) karmic; urgency=low
-
-  [ Matthias Rechenburg ]
-  * Initial release
-
- -- Matthias Rechenburg <matt@openqrm.com>  Sat, 05 Sep 2009 21:14:45 +0200
-
diff --git a/openQRM-5.3.50-CE/src/debian/compat b/openQRM-5.3.50-CE/src/debian/compat
deleted file mode 100644
index 1e8b314..0000000
--- a/openQRM-5.3.50-CE/src/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/openQRM-5.3.50-CE/src/debian/control b/openQRM-5.3.50-CE/src/debian/control
deleted file mode 100644
index d2fb751..0000000
--- a/openQRM-5.3.50-CE/src/debian/control
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: OPENQRM_PACKAGE_NAME
-Section: admin
-Priority: extra
-Maintainer: OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-Build-Depends: debhelper, bzip2, sudo, rpcbind, rsync, zlib1g-dev, wget, tar, bzip2, unzip, wget, netbase, patch, udev, lvm2, ethtool
-Standards-Version: 3.8.2
-Homepage: http://www.openqrm.org
-
-Package: OPENQRM_PACKAGE_NAME
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, OPENQRM_PACKAGE_DEPENDENCIES
-Conflicts: OPENQRM_PACKAGE_CONFLICTS
-Description: Cloud Computing Platform
- openQRM is a fully automated, rapid deployment system including
- VM-Management, Monitoring, High-Availability and Storage-Management.
- It provides a plug-able open-source Cloud Computing platform.
diff --git a/openQRM-5.3.50-CE/src/debian/copyright b/openQRM-5.3.50-CE/src/debian/copyright
deleted file mode 100644
index 452d8bd..0000000
--- a/openQRM-5.3.50-CE/src/debian/copyright
+++ /dev/null
@@ -1,509 +0,0 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=143
-Upstream-Name: openQRM
-Upstream-Source: http://www.openqrm.org
-Upstream Authors: OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-
-This package was debianized by OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-
-Files: *
-Copyright: Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-License: GPL-2
-X-Comment: On Debian GNU/Linux systems, the complete text of the
- GNU General Public License can be found in /usr/share/common-licenses/GPL-2
-
-Files: debian/*
-Copyright: Copyright 2011, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-License: GPL-2
-X-Comment: On Debian GNU/Linux systems, the complete text of the
- GNU General Public License can be found in /usr/share/common-licenses/GPL-2
-
-Files: thirdparty/openqrm-build/busybox/source/busybox-1.14.2.tar.gz
-License: GPL-2
-Copyright: 1999-2005 Erik Andersen
-X-Comment: On Debian GNU/Linux systems, the complete text of the
- GNU General Public License can be found in /usr/share/common-licenses/GPL-2
-
-Files: thirdparty/openqrm-build/pciutils//source/pciutils-3.1.4.tar.gz
-License: GPL-2
-Copyright (c) 1997--2009 Martin Mares <mj@ucw.cz>
-X-Comment: On Debian GNU/Linux systems, the complete text of the
- GNU General Public License can be found in /usr/share/common-licenses/GPL-2
-
-Files: thirdparty/openqrm-build/jquery/source/jquery-1.3.2.tgz
-License: GPL-2 / MIT
-Copyright: Copyright (c) 2009 John Resig
-X-Comment: On Debian GNU/Linux systems, the complete text of the
- GNU General Public License can be found in /usr/share/common-licenses/GPL-2
-X-Comment: The MIT license text is included below
-
-Files: thirdparty/openqrm-build/js-interface/source/interface_1.2.zip
-License: GPL2 / MIT
-Copyright: Copyright (c) 2006 Stefan Petre
-X-Comment: On Debian GNU/Linux systems, the complete text of the
- GNU General Public License can be found in /usr/share/common-licenses/GPL-2
-X-Comment: The MIT license text is included below
-
-Files: thirdparty/openqrm-build/adodb/
-License: GPL2 / MIT
-Copyright (c) 2000, 2001, 2002, 2003, 2004 John Lim
-X-Comment: On Debian GNU/Linux systems, the complete text of the
- GNU General Public License can be found in /usr/share/common-licenses/GPL-2
-X-Comment: The MIT license text is included below
-
-Files: plugins/cloud/cloud-portal/web/js/datetimepicker.js
-Copyright: Copyright (c) 2003 TengYong Ng <contact@rainforestnet.com>
-X-Comment: License text from the file header:
- "Permission given to use and modify this script in ANY kind of
- applications if header lines are left unchanged."
-
-Files: plugins/nagios3/bin/nmap2nagios-ng.pl
-License: Perl/Artistic
-Copyright: Copyright (c) 2001-2002 Todd A. Green
-           Copyright (c) 2008 Michel Sigloch
-X-Comment: On Debian GNU/Linux systems, the complete text of the
- Artistic License can be found in /usr/share/common-licenses/Artistic
-
-
-
-Additional license texts :
-
-
-XFree86 License (version 1.1)
-
-The text of the XFree86 1.1 license is included below. A FAQ for this licence
-can be found at the XFree86 web site
-
-Copyright (C) 1994-2006 The XFree86 Project, Inc. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in the
-Software without restriction, including without limitation the rights to use, copy,
-modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so, subject to the
-following conditions:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions, and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this
-   list of conditions and the following disclaimer in the documentation and/or other
-   materials provided with the distribution, and in the same place and form as other
-   copyright, license and disclaimer information.
-
-3. The end-user documentation included with the redistribution, if any, must include
-   the following acknowledgment: "This product includes software developed by The
-   XFree86 Project, Inc (http://www.xfree86.org/) and its contributors", in the same
-   place and form as other third-party acknowledgments. Alternately, this acknowledgment
-   may appear in the software itself, in the same form and location as other such
-   third-party acknowledgments.
-
-4. Except as contained in this notice, the name of The XFree86 Project, Inc shall
-   not be used in advertising or otherwise to promote the sale, use or other dealings
-   in this Software without prior written authorization from The XFree86 Project, Inc.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-The MIT License
-
-Copyright (c) <year> <copyright holders>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
-The Perl License
-
-For those of you that choose to use the GNU General Public License, my
-interpretation of the GNU General Public License is that no Perl script
-falls under the terms of the GPL unless you explicitly put said script
-under the terms of the GPL yourself.
-
-Furthermore, any object code linked with perl does not automatically fall
-under the terms of the GPL, provided such object code only adds definitions
-of subroutines and variables, and does not otherwise impair the resulting
-interpreter from executing any standard Perl script. I consider linking in
-C subroutines in this manner to be the moral equivalent of defining subroutines
-in the Perl language itself. You may sell such an object file as proprietary
-provided that you provide or offer to provide the Perl source, as specified by
-the GNU General Public License. (This is merely an alternate way of specifying
-input to the program.) You may also sell a binary produced by the dumping of a
-running Perl script that belongs to you, provided that you provide or offer to
-provide the Perl source as specified by the GPL. (The fact that a Perl
-interpreter and your code are in the same binary file is, in this case, a form
-of mere aggregation.)
-
-This is my interpretation of the GPL. If you still have concerns or difficulties
-understanding my intent, feel free to contact me. Of course, the Artistic License
-spells all this out for your protection, so you may prefer to use that.
--- Larry Wall
-
-
-
-GPL2
-
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
diff --git a/openQRM-5.3.50-CE/src/debian/copyright.enterprise b/openQRM-5.3.50-CE/src/debian/copyright.enterprise
deleted file mode 100644
index d46d57f..0000000
--- a/openQRM-5.3.50-CE/src/debian/copyright.enterprise
+++ /dev/null
@@ -1,508 +0,0 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=143
-Upstream-Name: openQRM
-Upstream-Source: http://www.openqrm.org
-Upstream Authors: OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-
-This package was debianized by OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-
-Files: *
-Copyright: Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-License: GNU General Public License version 2
-X-Comment: The latest version of this license can be found at: src/doc/LICENSE.txt
-
-Files: debian/*
-Copyright: Copyright 2011, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-License: GPL-2
-X-Comment: On Debian GNU/Linux systems, the complete text of the
- GNU General Public License can be found in /usr/share/common-licenses/GPL-2
-
-Files: thirdparty/openqrm-build/busybox/source/busybox-1.14.2.tar.gz
-License: GPL-2
-Copyright: 1999-2005 Erik Andersen
-X-Comment: On Debian GNU/Linux systems, the complete text of the
- GNU General Public License can be found in /usr/share/common-licenses/GPL-2
-
-Files: thirdparty/openqrm-build/pciutils//source/pciutils-3.1.4.tar.gz
-License: GPL-2
-Copyright (c) 1997--2009 Martin Mares <mj@ucw.cz>
-X-Comment: On Debian GNU/Linux systems, the complete text of the
- GNU General Public License can be found in /usr/share/common-licenses/GPL-2
-
-Files: thirdparty/openqrm-build/jquery/source/jquery-1.3.2.tgz
-License: GPL-2 / MIT
-Copyright: Copyright (c) 2009 John Resig
-X-Comment: On Debian GNU/Linux systems, the complete text of the
- GNU General Public License can be found in /usr/share/common-licenses/GPL-2
-X-Comment: The MIT license text is included below
-
-Files: thirdparty/openqrm-build/js-interface/source/interface_1.2.zip
-License: GPL2 / MIT
-Copyright: Copyright (c) 2006 Stefan Petre
-X-Comment: On Debian GNU/Linux systems, the complete text of the
- GNU General Public License can be found in /usr/share/common-licenses/GPL-2
-X-Comment: The MIT license text is included below
-
-Files: thirdparty/openqrm-build/adodb/
-License: GPL2 / MIT
-Copyright (c) 2000, 2001, 2002, 2003, 2004 John Lim
-X-Comment: On Debian GNU/Linux systems, the complete text of the
- GNU General Public License can be found in /usr/share/common-licenses/GPL-2
-X-Comment: The MIT license text is included below
-
-Files: plugins/cloud/cloud-portal/web/js/datetimepicker.js
-Copyright: Copyright (c) 2003 TengYong Ng <contact@rainforestnet.com>
-X-Comment: License text from the file header:
- "Permission given to use and modify this script in ANY kind of
- applications if header lines are left unchanged."
-
-Files: plugins/nagios3/bin/nmap2nagios-ng.pl
-License: Perl/Artistic
-Copyright: Copyright (c) 2001-2002 Todd A. Green
-           Copyright (c) 2008 Michel Sigloch
-X-Comment: On Debian GNU/Linux systems, the complete text of the
- Artistic License can be found in /usr/share/common-licenses/Artistic
-
-
-
-Additional license texts :
-
-
-XFree86 License (version 1.1)
-
-The text of the XFree86 1.1 license is included below. A FAQ for this licence
-can be found at the XFree86 web site
-
-Copyright (C) 1994-2006 The XFree86 Project, Inc. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in the
-Software without restriction, including without limitation the rights to use, copy,
-modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so, subject to the
-following conditions:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions, and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this
-   list of conditions and the following disclaimer in the documentation and/or other
-   materials provided with the distribution, and in the same place and form as other
-   copyright, license and disclaimer information.
-
-3. The end-user documentation included with the redistribution, if any, must include
-   the following acknowledgment: "This product includes software developed by The
-   XFree86 Project, Inc (http://www.xfree86.org/) and its contributors", in the same
-   place and form as other third-party acknowledgments. Alternately, this acknowledgment
-   may appear in the software itself, in the same form and location as other such
-   third-party acknowledgments.
-
-4. Except as contained in this notice, the name of The XFree86 Project, Inc shall
-   not be used in advertising or otherwise to promote the sale, use or other dealings
-   in this Software without prior written authorization from The XFree86 Project, Inc.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-The MIT License
-
-Copyright (c) <year> <copyright holders>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
-The Perl License
-
-For those of you that choose to use the GNU General Public License, my
-interpretation of the GNU General Public License is that no Perl script
-falls under the terms of the GPL unless you explicitly put said script
-under the terms of the GPL yourself.
-
-Furthermore, any object code linked with perl does not automatically fall
-under the terms of the GPL, provided such object code only adds definitions
-of subroutines and variables, and does not otherwise impair the resulting
-interpreter from executing any standard Perl script. I consider linking in
-C subroutines in this manner to be the moral equivalent of defining subroutines
-in the Perl language itself. You may sell such an object file as proprietary
-provided that you provide or offer to provide the Perl source, as specified by
-the GNU General Public License. (This is merely an alternate way of specifying
-input to the program.) You may also sell a binary produced by the dumping of a
-running Perl script that belongs to you, provided that you provide or offer to
-provide the Perl source as specified by the GPL. (The fact that a Perl
-interpreter and your code are in the same binary file is, in this case, a form
-of mere aggregation.)
-
-This is my interpretation of the GPL. If you still have concerns or difficulties
-understanding my intent, feel free to contact me. Of course, the Artistic License
-spells all this out for your protection, so you may prefer to use that.
--- Larry Wall
-
-
-
-GPL2
-
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
diff --git a/openQRM-5.3.50-CE/src/debian/man/openqrm-cmd-queue.1 b/openQRM-5.3.50-CE/src/debian/man/openqrm-cmd-queue.1
deleted file mode 100644
index 89e8891..0000000
--- a/openQRM-5.3.50-CE/src/debian/man/openqrm-cmd-queue.1
+++ /dev/null
@@ -1,20 +0,0 @@
-.TH OPENQRM-CMD-QUEUE 1
-
-.SH NAME openqrm-cmd-queue \- The openQRM command queue
-
-.SH SYNOPSIS openqrm-cmd-queue
-
-.SH DESCRIPTION \fIopenqrm-cmd-queue\fP provides a queue for executing commands
-
-.PP It was written for http://www.openqrm.org
-
-.SH COPYRIGHT Copyright 2021, OPENQRM AUSTRALIA PTY LTD
-
-openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-The latest version of this license can be found here: src/doc/LICENSE.txt
-By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-.SH AUTHORS OPENQRM AUSTRALIA PTY LTD
-E-mail :  <info@openqrm-enterprise.com>
diff --git a/openQRM-5.3.50-CE/src/debian/man/openqrm-cmd.1 b/openQRM-5.3.50-CE/src/debian/man/openqrm-cmd.1
deleted file mode 100644
index 19f9ce7..0000000
--- a/openQRM-5.3.50-CE/src/debian/man/openqrm-cmd.1
+++ /dev/null
@@ -1,20 +0,0 @@
-.TH OPENQRM-CMD 1
-
-.SH NAME openqrm-cmd \- The openQRM command util
-
-.SH SYNOPSIS openqrm-cmd <command>
-
-.SH DESCRIPTION \fIopenqrm-cmd\fP runs commands from the openQRM command queue.
-
-.PP It was written for http://www.openqrm.org
-
-.SH COPYRIGHT Copyright 2021, OPENQRM AUSTRALIA PTY LTD
-
-openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-The latest version of this license can be found here: src/doc/LICENSE.txt
-By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-.SH AUTHORS OPENQRM AUSTRALIA PTY LTD
-E-mail :  <info@openqrm-enterprise.com>
diff --git a/openQRM-5.3.50-CE/src/debian/man/openqrm-create-plugin.1 b/openQRM-5.3.50-CE/src/debian/man/openqrm-create-plugin.1
deleted file mode 100644
index 997c7f6..0000000
--- a/openQRM-5.3.50-CE/src/debian/man/openqrm-create-plugin.1
+++ /dev/null
@@ -1,21 +0,0 @@
-.TH OPENQRM-CREATE-PLUGIN 1
-
-.SH NAME openqrm-create-plugin \- The openQRM plugin utility
-
-.SH SYNOPSIS openqrm-create-plugin
-
-.SH DESCRIPTION \fIopenqrm-create-plugin\fP provides a initial skeleton for
-based on an existing plugin..
-
-.PP It was written for http://www.openqrm.org
-
-.SH COPYRIGHT Copyright 2021, OPENQRM AUSTRALIA PTY LTD
-
-openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-The latest version of this license can be found here: src/doc/LICENSE.txt
-By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-.SH AUTHORS OPENQRM AUSTRALIA PTY LTD
-E-mail :  <info@openqrm-enterprise.com>
diff --git a/openQRM-5.3.50-CE/src/debian/man/openqrm-crypt.1 b/openQRM-5.3.50-CE/src/debian/man/openqrm-crypt.1
deleted file mode 100644
index 6ad3949..0000000
--- a/openQRM-5.3.50-CE/src/debian/man/openqrm-crypt.1
+++ /dev/null
@@ -1,21 +0,0 @@
-.TH OPENQRM-CRYPT 1
-
-.SH NAME openqrm-crypt \- The openQRM password utility
-
-.SH SYNOPSIS openqrm-crypt <string>
-
-.SH DESCRIPTION \fIopenqrm-crypt\fP generates passwords for systems managed
-by openQRM.
-
-.PP It was written for http://www.openqrm.org
-
-.SH COPYRIGHT Copyright 2021, OPENQRM AUSTRALIA PTY LTD
-
-openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-The latest version of this license can be found here: src/doc/LICENSE.txt
-By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-.SH AUTHORS OPENQRM AUSTRALIA PTY LTD
-E-mail :  <info@openqrm-enterprise.com>
diff --git a/openQRM-5.3.50-CE/src/debian/man/openqrm-exec.1 b/openQRM-5.3.50-CE/src/debian/man/openqrm-exec.1
deleted file mode 100644
index c7df9db..0000000
--- a/openQRM-5.3.50-CE/src/debian/man/openqrm-exec.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.TH OPENQRM-EXEC 1
-
-.SH NAME openqrm-exec \- The openQRM exec utility
-
-.SH SYNOPSIS openqrm-exec  [\-option ...]
-
-	openqrm-exec -i <resoure-ip> -t <token> -c <command>
-
-.SH DESCRIPTION \fIopenqrm-exec\fP puts commands into the openQRM command queue.
-
-.PP It was written for http://www.openqrm.org
-
-.SH COPYRIGHT Copyright 2021, OPENQRM AUSTRALIA PTY LTD
-
-openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-The latest version of this license can be found here: src/doc/LICENSE.txt
-By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-.SH AUTHORS OPENQRM AUSTRALIA PTY LTD
-E-mail :  <info@openqrm-enterprise.com>
diff --git a/openQRM-5.3.50-CE/src/debian/man/openqrm-execd.1 b/openQRM-5.3.50-CE/src/debian/man/openqrm-execd.1
deleted file mode 100644
index 13efedc..0000000
--- a/openQRM-5.3.50-CE/src/debian/man/openqrm-execd.1
+++ /dev/null
@@ -1,20 +0,0 @@
-.TH OPENQRM-EXECD 1
-
-.SH NAME openqrm-execd \- The openQRM execution daemon
-
-.SH SYNOPSIS openqrm-execd
-
-.SH DESCRIPTION \fIopenqrm-execd\fP is the openQRM remove execution daemon.
-
-.PP It was written for http://www.openqrm.org
-
-.SH COPYRIGHT Copyright 2021, OPENQRM AUSTRALIA PTY LTD
-
-openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-The latest version of this license can be found here: src/doc/LICENSE.txt
-By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-.SH AUTHORS OPENQRM AUSTRALIA PTY LTD
-E-mail :  <info@openqrm-enterprise.com>
diff --git a/openQRM-5.3.50-CE/src/debian/man/openqrm-monitord.1 b/openQRM-5.3.50-CE/src/debian/man/openqrm-monitord.1
deleted file mode 100644
index 5e5d6eb..0000000
--- a/openQRM-5.3.50-CE/src/debian/man/openqrm-monitord.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.TH OPENQRM-MONITORD 1
-
-.SH NAME openqrm-monitord \- The openQRM monitoring daemon
-
-.SH SYNOPSIS openqrm-monitord
-
-.SH DESCRIPTION \fIopenqrm-monitord\fP monitors all systems managed
-by openQRM.
-
-.PP It was written for http://www.openqrm.org
-
-.SH COPYRIGHT Copyright 2021, OPENQRM AUSTRALIA PTY LTD
-
-openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-The latest version of this license can be found here: src/doc/LICENSE.txt
-By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-.SH AUTHORS OPENQRM AUSTRALIA PTY LTD
-E-mail :  <info@openqrm-enterprise.com>
-
diff --git a/openQRM-5.3.50-CE/src/debian/man/openqrm-postencode.1 b/openQRM-5.3.50-CE/src/debian/man/openqrm-postencode.1
deleted file mode 100644
index 6613e8e..0000000
--- a/openQRM-5.3.50-CE/src/debian/man/openqrm-postencode.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.TH OPENQRM-POSTENCODE 1
-
-.SH NAME openqrm-postencode \- The openQRM postencode utility
-
-.SH SYNOPSIS openqrm-postencode <file>
-
-.SH DESCRIPTION \fIopenqrm-postencode\fP postencodes files for transmiting
-them to the openQRM server via http post.
-
-.PP It was written for http://www.openqrm.org
-
-.SH COPYRIGHT Copyright 2021, OPENQRM AUSTRALIA PTY LTD
-
-openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-The latest version of this license can be found here: src/doc/LICENSE.txt
-By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-.SH AUTHORS OPENQRM AUSTRALIA PTY LTD
-E-mail :  <info@openqrm-enterprise.com>
-
diff --git a/openQRM-5.3.50-CE/src/debian/man/openqrm.1 b/openQRM-5.3.50-CE/src/debian/man/openqrm.1
deleted file mode 100644
index ba3f900..0000000
--- a/openQRM-5.3.50-CE/src/debian/man/openqrm.1
+++ /dev/null
@@ -1,33 +0,0 @@
-.TH OPENQRM 1
-
-.SH NAME openqrm \- The openQRM commandline utility
-
-.SH SYNOPSIS openqrm [\-option ...]
-
-	openqrm kernel add -n <name> -v <version> -u <username> -p <password> [-l <location> -i <initramfs/ext2> -t <path-to-initrd-template-file>]
-
-	openqrm kernel remove -n <name> -u <username> -p <password>
-
-	openqrm state backup -n <name>
-
-	openqrm state restore -n <name>
-
-	openqrm state remove -n <name>
-
-	openqrm state list
-
-.SH DESCRIPTION \fIopenqrm\fP is the openQRM commandline util.
-It manages kernels and the openQRM state.
-
-.PP It was written for http://www.openqrm.org
-
-.SH COPYRIGHT Copyright 2021, OPENQRM AUSTRALIA PTY LTD
-
-openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-The latest version of this license can be found here: src/doc/LICENSE.txt
-By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-.SH AUTHORS OPENQRM AUSTRALIA PTY LTD
-E-mail :  <info@openqrm-enterprise.com>
diff --git a/openQRM-5.3.50-CE/src/debian/openqrm.default b/openQRM-5.3.50-CE/src/debian/openqrm.default
deleted file mode 100644
index 4d25f52..0000000
--- a/openQRM-5.3.50-CE/src/debian/openqrm.default
+++ /dev/null
@@ -1,20 +0,0 @@
-# defaults file for openQRM
-#
-# This file is part of openQRM.
-#
-# openQRM is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2
-# as published by the Free Software Foundation.
-#
-# openQRM 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with openQRM.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Copyright 2011, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR="/usr/share"
-
diff --git a/openQRM-5.3.50-CE/src/debian/openqrm.dirs b/openQRM-5.3.50-CE/src/debian/openqrm.dirs
deleted file mode 100644
index bff22c0..0000000
--- a/openQRM-5.3.50-CE/src/debian/openqrm.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/openqrm
diff --git a/openQRM-5.3.50-CE/src/debian/openqrm.docs b/openQRM-5.3.50-CE/src/debian/openqrm.docs
deleted file mode 100644
index afe6da2..0000000
--- a/openQRM-5.3.50-CE/src/debian/openqrm.docs
+++ /dev/null
@@ -1 +0,0 @@
-doc/README
diff --git a/openQRM-5.3.50-CE/src/debian/openqrm.files b/openQRM-5.3.50-CE/src/debian/openqrm.files
deleted file mode 100644
index e69de29..0000000
diff --git a/openQRM-5.3.50-CE/src/debian/openqrm.init b/openQRM-5.3.50-CE/src/debian/openqrm.init
deleted file mode 100644
index 4b9ae71..0000000
--- a/openQRM-5.3.50-CE/src/debian/openqrm.init
+++ /dev/null
@@ -1,277 +0,0 @@
-#!/bin/sh
-#
-# openQRM init.d script
-#
-# This file is part of openQRM.
-#
-# openQRM is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2
-# as published by the Free Software Foundation.
-#
-# openQRM 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with openQRM.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Copyright 2011, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-### BEGIN INIT INFO
-# Provides:          openqrm
-# Required-Start:    $local_fs $network $remote_fs
-# Required-Stop:     $local_fs $network $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Cloud Computing Platform
-# Description:      openQRM is a fully automated, rapid deployment system
-#                   including VM-Management, Monitoring, High-Availability
-#                   and Storage-Management. It provides a plug-able open-source
-#                   Cloud Computing platform.
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-
-NAME="openqrm"
-DESC="openQRM Cloud Computing Platform"
-LOGDIR=/var/log/$NAME
-
-. /lib/lsb/init-functions
-DAEMON_OPTS=""
-DIETIME=20
-LOGFILE=$LOGDIR/$NAME.log
-LOCKDIR=/var/lock/subsys/
-LOCKFILE=$LOCKDIR/$NAME
-LANG=C
-
-# unset http_proxy environment
-unset http_proxy
-unset https_proxy
-
-if [ ! -d "$LOCKDIR" ]; then
-	mkdir -p $LOCKDIR
-fi
-if [ -f /etc/default/$NAME ] ; then
-	. /etc/default/$NAME
-else
-	OPENQRM_SERVER_BASE_DIR="/usr/share"
-fi
-export OPENQRM_SERVER_BASE_DIR
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-export OPENQRM_WEBSERVER_DOCUMENT_ROOT
-
-set -e
-
-stop_exec_subsystem() {
-	if ps ax | grep dropbear | grep -v grep | grep openqrm 1>/dev/null; then
-		if ! kill `ps ax | grep dropbear | grep -v grep | grep openqrm | awk {' print $1 '}` 2>/dev/null; then
-			return 1
-		fi
-	fi
-	if ps ax | grep openqrm-cmd-queue | grep -v grep 1>/dev/null; then
-		if ! kill `ps ax | grep openqrm-cmd-queue | grep -v grep | awk {' print $1 '}` 2>/dev/null; then
-			return 1
-		fi
-	fi
-	if ps ax | grep openqrm-monitord | grep -v grep 1>/dev/null; then
-		if ! kill `ps ax | grep openqrm-monitord | grep -v grep | awk {' print $1 '}` 2>/dev/null; then
-			return 1
-		fi
-	fi
-	return 0
-}
-
-stop_exec_subsystem_force() {
-	kill `ps ax | grep dropbear | grep -v grep | grep openqrm | awk {' print $1 '}` 2>/dev/null || true
-	kill `ps ax | grep openqrm-cmd-queue | grep -v grep | awk {' print $1 '}` 2>/dev/null || true
-	kill `ps ax | grep openqrm-monitord | grep -v grep | awk {' print $1 '}` 2>/dev/null || true
-	return 0
-}
-
-running() {
-	[ ! -f "$LOCKFILE" ] && return 1
-	return 0
-}
-
-start_server() {
-	if [ -x /usr/bin/screen.real ]; then
-		RUNSCREEN="/usr/bin/screen.real"
-	else
-		RUNSCREEN=`which screen`
-	fi
-	stop_exec_subsystem_force
-	if ! dropbear -p $OPENQRM_EXEC_PORT -r $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear/dropbear_rsa_host_key; then
-		log_failure_msg "Could not start openQRM exec-subsystem!"
-		stop_exec_subsystem_force
-		return 1
-	fi
-    $RUNSCREEN -dmS cmdqueue $OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-cmd-queue
-	touch ${LOCKFILE}
-
-	if [ -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/unconfigured ]; then
-		log_success_msg "Please configure your openQRM Server at : $OPENQRM_WEB_PROTOCOL://[server-ip-address]/openqrm/"
-		log_success_msg "-> User : openqrm"
-		log_success_msg "-> Password : openqrm"
-		sleep 2
-		return 0
-	else
-		if ! ifconfig "$OPENQRM_SERVER_INTERFACE" | grep inet 1>/dev/null 2>&1; then
-			log_failure_msg "Interface $OPENQRM_SERVER_INTERFACE is down. Please configure and activate it. Then try again."
-			stop_exec_subsystem_force
-			rm -f ${LOCKFILE}
-			return 1
-		fi
-		CONFIGURED_IP=`cat $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/default | grep "openqrm=" | sed -e "s/.*openqrm=//" | awk {' print $1 '}`
-		OPENQRM_SERVER_IP_ADDRESS=`ip a s $OPENQRM_SERVER_INTERFACE | grep -w $OPENQRM_SERVER_INTERFACE$ | grep -w inet | awk '{ print $2 }' | cut -d'/' -f1`
-		if [ "$OPENQRM_SERVER_IP_ADDRESS" != "$CONFIGURED_IP" ]; then
-			ip a s | grep ^[0-9] | cut -d':' -f2 | awk '{ print $1 }' | grep -v lo > $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/unconfigured
-			log_failure_msg "Interface $OPENQRM_SERVER_INTERFACE has the wrong ip-configuration"
-			stop_exec_subsystem_force
-			rm -f ${LOCKFILE}
-			return 1
-		fi
-		$RUNSCREEN -dmS monitord $OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-monitord
-		for OPENQRM_PLUGIN in `ls $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/`; do
-			if [ -e $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/$OPENQRM_PLUGIN/.running ]; then
-				if [ -x $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN ]; then
-					$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN stop 1>/dev/null 2>/dev/null
-					touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/$OPENQRM_PLUGIN/.openqrm_stopped
-				fi
-			fi
-			if [ -e $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/$OPENQRM_PLUGIN/.openqrm_stopped ]; then
-				if [ -x $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN ]; then
-					$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN start
-					rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/$OPENQRM_PLUGIN/.openqrm_stopped
-				fi
-			fi
-		done
-		return 0
-	fi
-}
-
-
-stop_server() {
-	if [ -d $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/ ]; then
-		for OPENQRM_PLUGIN in `ls $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/`; do
-			if [ -e $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/$OPENQRM_PLUGIN/.running ]; then
-				if [ -x $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN ]; then
-					$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN stop
-					touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/$OPENQRM_PLUGIN/.openqrm_stopped
-				fi
-			fi
-		done
-	fi
-	stop_exec_subsystem
-	errcode=$?
-	/bin/rm -f ${LOCKFILE}
-	return $errcode
-}
-
-
-
-force_stop() {
-	if [ -d $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/ ]; then
-		for OPENQRM_PLUGIN in `ls $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/`; do
-			if [ -e $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/$OPENQRM_PLUGIN/.running ]; then
-				if [ -x $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN ]; then
-					$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN stop
-					touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/$OPENQRM_PLUGIN/.openqrm_stopped
-				fi
-			fi
-		done
-	fi
-	stop_exec_subsystem_force
-	errcode=$?
-	/bin/rm -f ${LOCKFILE}
-	return $errcode
-}
-
-
-case "$1" in
-  start)
-		log_daemon_msg "Starting $DESC " "$NAME"
-		# Check if it's running first
-		if running ;  then
-			log_progress_msg "apparently already running"
-			log_end_msg 0
-			exit 0
-		fi
-		if start_server ; then
-			# NOTE: Some servers might die some time after they start,
-			# this code will detect this issue if STARTTIME is set
-			# to a reasonable value
-			[ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time
-			if  running ;  then
-				# It's ok, the server started and is running
-				log_end_msg 0
-			else
-				# It is not running after we did start
-				log_end_msg 1
-			fi
-		else
-			# Either we could not start it
-			log_end_msg 1
-		fi
-		;;
-  stop)
-		log_daemon_msg "Stopping $DESC" "$NAME"
-		if running ; then
-			# Only stop the server if we see it running
-			errcode=0
-			stop_server || errcode=$?
-			log_end_msg $errcode
-		else
-			# If it's not running don't do anything
-			log_progress_msg "apparently not running"
-			log_end_msg 0
-			exit 0
-		fi
-		;;
-  force-stop)
-		# First try to stop gracefully the program
-		$0 stop
-		if running; then
-			# If it's still running try to kill it more forcefully
-			log_daemon_msg "Stopping (force) $DESC" "$NAME"
-			errcode=0
-			force_stop || errcode=$?
-			log_end_msg $errcode
-		fi
-		;;
-  restart|force-reload)
-		log_daemon_msg "Restarting $DESC" "$NAME"
-		errcode=0
-		stop_server || errcode=$?
-		# Wait some sensible amount, some server need this
-		[ -n "$DIETIME" ] && sleep $DIETIME
-		start_server || errcode=$?
-		[ -n "$STARTTIME" ] && sleep $STARTTIME
-		running || errcode=$?
-		log_end_msg $errcode
-		;;
-  status)
-
-		log_daemon_msg "Checking status of $DESC" "$NAME"
-		if running ;  then
-			log_progress_msg "running"
-			log_end_msg 0
-		else
-			log_progress_msg "apparently not running"
-			log_end_msg 1
-			exit 1
-		fi
-		;;
-  reload)
-		log_warning_msg "Reloading $NAME daemon: not implemented, as openQRM"
-		log_warning_msg "immediately re-reads changes in its configuration files."
-		;;
-
-  *)
-		N=/etc/init.d/$NAME
-		echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
-		exit 1
-		;;
-esac
-
-exit 0
diff --git a/openQRM-5.3.50-CE/src/debian/openqrm.install b/openQRM-5.3.50-CE/src/debian/openqrm.install
deleted file mode 100644
index bff22c0..0000000
--- a/openQRM-5.3.50-CE/src/debian/openqrm.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/openqrm
diff --git a/openQRM-5.3.50-CE/src/debian/openqrm.links b/openQRM-5.3.50-CE/src/debian/openqrm.links
deleted file mode 100644
index e69de29..0000000
diff --git a/openQRM-5.3.50-CE/src/debian/openqrm.lintian-overrides b/openQRM-5.3.50-CE/src/debian/openqrm.lintian-overrides
deleted file mode 100644
index e69de29..0000000
diff --git a/openQRM-5.3.50-CE/src/debian/openqrm.manpages b/openQRM-5.3.50-CE/src/debian/openqrm.manpages
deleted file mode 100644
index f0ca1a7..0000000
--- a/openQRM-5.3.50-CE/src/debian/openqrm.manpages
+++ /dev/null
@@ -1,9 +0,0 @@
-debian/man/openqrm-cmd-queue.1
-debian/man/openqrm-cmd.1
-debian/man/openqrm-create-plugin.1
-debian/man/openqrm-crypt.1
-debian/man/openqrm-exec.1
-debian/man/openqrm-execd.1
-debian/man/openqrm-monitord.1
-debian/man/openqrm-postencode.1
-debian/man/openqrm.1
diff --git a/openQRM-5.3.50-CE/src/debian/openqrm.postinst b/openQRM-5.3.50-CE/src/debian/openqrm.postinst
deleted file mode 100644
index 69c3119..0000000
--- a/openQRM-5.3.50-CE/src/debian/openqrm.postinst
+++ /dev/null
@@ -1,254 +0,0 @@
-#!/bin/bash
-# openQRM postinstall script - needs bash to source openqrm-functions
-#
-# This file is part of openQRM.
-#
-# openQRM is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2
-# as published by the Free Software Foundation.
-#
-# openQRM 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with openQRM.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Copyright 2011, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-
-NAME="openqrm"
-DESC="openQRM Cloud Computing Platform"
-LOGDIR=/var/log/$NAME
-LANG=C
-. /lib/lsb/init-functions
-
-if [ -f /etc/default/$NAME ] ; then
-    . /etc/default/$NAME
-else
-    OPENQRM_SERVER_BASE_DIR="/usr/share"
-fi
-export OPENQRM_SERVER_BASE_DIR
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-
-set -e
-
-
-# a function to validate an ip address
-openqrm_validate_ip() {
-	IP_A=$1
-	OLDIFS=$IFS
-	IFS=.
-	set -- $IP_A
-	if [ "$#" -ne "4" ]; then
-		return 1
-	fi
-
-	for oct in $1 $2 $3 $4; do
-		echo $oct | egrep "^[0-9]+$" >/dev/null 2>&1
-		if [ "$?" -ne "0" ]; then
-			return 1
-		else
-			if [ "$oct" -lt "0" -o "$oct" -gt "255" ]; then
-				return 1
-			fi
-		fi
-	done
-	echo "$IP_A" | grep "\.$" >/dev/null 2>&1
-	if [ "$?" -eq "0" ]; then
-		return 1
-	fi
-	IFS=$OLDIFS
-	return 0
-}
-
-
-case "$1" in
-    configure)
-
-		# is this an update ?
-		if [ -f "$OPENQRM_SERVER_BASE_DIR/openqrm_pre_update/etc/openqrm-server.conf" ]; then
-			if [ -x "$OPENQRM_SERVER_BASE_DIR/openqrm/bin/openqrm-update" ]; then
-				$OPENQRM_SERVER_BASE_DIR/openqrm/bin/openqrm-update base -f
-				$OPENQRM_SERVER_BASE_DIR/openqrm/bin/openqrm-update post -f
-				$OPENQRM_SERVER_BASE_DIR/openqrm/bin/openqrm-update initrds -f
-			fi
-		else
-			# it is a fresh install
-			# make sure apache is up + running
-			if ! ps ax | grep apache2 | grep -v grep 1>/dev/null; then
-				openqrm_webserver start
-			fi
-
-			# link the web application directory to the documentroot
-			ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/web/ $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm
-
-			# the default apache config normally does not allow to override the authconfig (needed for basic auth)
-			# so we allow it for the openqrm directory
-			APACHE_CUSTOM_CONFIG_DIR="/etc/apache2/conf.d"
-			# support for Ubuntu 14.04 - new apache enabled-conf dir
-			if [ -d /etc/apache2/conf-enabled ]; then
-				APACHE_CUSTOM_CONFIG_DIR="/etc/apache2/conf-enabled"
-				# preserve backwards compatibility for other projects e.g. linuxcoe
-				ln -sf /etc/apache2/conf-enabled /etc/apache2/conf.d
-				cat $OPENQRM_SERVER_BASE_DIR/openqrm/etc/httpd/openqrm-httpd-vhost.conf | \
-					sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | \
-					sed -e "s#@@OPENQRM_WEBSERVER_DOCUMENT_ROOT@@#$OPENQRM_WEBSERVER_DOCUMENT_ROOT#g" \
-					> $APACHE_CUSTOM_CONFIG_DIR/openqrm-httpd.conf
-			else
-				cat $OPENQRM_SERVER_BASE_DIR/openqrm/etc/httpd/openqrm-httpd.conf | sed -e "s#OPENQRM_WEBSERVER_DOCUMENT_ROOT#$OPENQRM_WEBSERVER_DOCUMENT_ROOT#g" >> $APACHE_CUSTOM_CONFIG_DIR/openqrm-httpd.conf
-			fi
-			echo ".$APACHE_CUSTOM_CONFIG_DIR/openqrm-httpd.conf"
-			# care about php disable_functions in php.ini
-			if [ -f /etc/php5/apache2/php.ini ]; then
-				sed -i -e "s/^disable_functions/;disable_functions/g" /etc/php5/apache2/php.ini
-			fi
-
-			# ssl ?
-			if [ "$OPENQRM_WEB_PROTOCOL" = "https" ]; then
-				echo "Setting up SSL secured openQRM Website"
-				# apache ssl setup
-				if ! a2enmod ssl; then
-					echo "ERROR: Could not enable SSL in the Apache webserver ! Exiting."
-					exit 1
-				fi
-				# check for hostname settings
-				ETCHOSTS=/etc/hosts
-				MYHOSTNAME=`hostname`
-				if grep $MYHOSTNAME $ETCHOSTS | grep 127.0. 1>/dev/null || ! grep $MYHOSTNAME $ETCHOSTS 1>/dev/null; then
-					echo "Found system hostname $MYHOSTNAME connected to loopback interface"
-					echo "! This causes troubles while enabling SSL for the apache webserver !"
-
-#					AVAIL_IPS=`ifconfig -a | grep -v inet6  | grep -B1 inet | grep -i -A1 link | grep -v lo | grep inet | grep -v 127.0.0.1 | cut -d':' -f2 | awk {' print $1 '}`
-					AVAIL_IPS=`ip -4 addr | grep -oP '(?<=inet\s)\d+(\.\d+){3}' | grep -v 127.0.0.1`
-
-					while (true); do
-						echo "Please select one of the following ip-addresses"
-						echo "to be connected to the systems hostname $MYHOSTNAME :"
-						echo "$AVAIL_IPS"
-						echo -n " : "
-						read HOSTIP
-						if openqrm_validate_ip "$HOSTIP"; then
-							if echo $AVAIL_IPS | grep "$HOSTIP" 1>/dev/null; then
-								break;
-							else
-								echo "$HOSTIP is not available on this system!"
-							fi
-						else
-							echo "$HOSTIP is invalid!"
-						fi
-						done
-					echo "Connecting $HOSTIP to $MYHOSTNAME in $ETCHOSTS"
-					# remove first
-					sed -i -e "s/.*$MYHOSTNAME.*//g" $ETCHOSTS
-					sed -i -e "s/.*openQRM.*//g" $ETCHOSTS
-					# make sure we did not remove the loopback entry copmletely
-					if ! grep "127.0.*.localhost" $ETCHOSTS 1>/dev/null; then
-						echo "127.0.0.1	localhost" >> $ETCHOSTS.new
-						cat $ETCHOSTS >> $ETCHOSTS.new
-						mv -f $ETCHOSTS.new $ETCHOSTS
-					fi
-					echo "# added by openQRM" >> $ETCHOSTS
-					echo "$HOSTIP	$MYHOSTNAME" >> $ETCHOSTS
-
-				fi
-
-				# creating the cert + key
-				PRIVATE_KEY=$OPENQRM_SERVER_BASE_DIR/openqrm/etc/ssl/private/openqrm-private.key
-				CERTIFICATE_FILE=$OPENQRM_SERVER_BASE_DIR/openqrm/etc/ssl/cert/openqrm.crt
-				VALID_DAYS=3650
-				mkdir -p `dirname $PRIVATE_KEY`
-				mkdir -p `dirname $CERTIFICATE_FILE`
-				echo "-> Creating new private/public-keys without passphrase for server"
-				rm -f $PRIVATE_KEY
-				openssl genrsa -out $PRIVATE_KEY 1024
-				echo "-> Creating selfsigned certificate"
-				rm -f $CERTIFICATE_FILE
-				openssl req -new -days $VALID_DAYS -key $PRIVATE_KEY -x509 -out $CERTIFICATE_FILE
-				# openQRM apache ssl config
-				cat $OPENQRM_SERVER_BASE_DIR/openqrm/etc/httpd/openqrm-https.conf | \
-					sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | \
-					sed -e "s#@@OPENQRM_WEBSERVER_DOCUMENT_ROOT@@#$OPENQRM_WEBSERVER_DOCUMENT_ROOT#g" \
-					> /etc/apache2/conf.d/openqrm-https.conf
-			fi
-
-			openqrm_webserver reload
-
-			# create the .htaccess file
-			cat $OPENQRM_SERVER_BASE_DIR/openqrm/etc/httpd/openqrm-htaccess.conf | sed -e "s#OPENQRM_WEBSERVER_DOCUMENT_ROOT#$OPENQRM_WEBSERVER_DOCUMENT_ROOT#g" > $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/.htaccess
-
-			# create the default admin user
-			htpasswd -bc $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/.htpasswd openqrm openqrm
-			chmod 666 $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/.htpasswd
-
-			# create the image-auth dir
-			mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/web/action/image-auth
-			chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/web/action/image-auth
-			mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/tmp
-			chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/tmp
-
-			# link the tftpboot/boot dir to the boot-services
-			rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/boot
-			ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/ $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/boot
-
-			# init the remote execution layer
-			mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/var/spool/
-			chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/var/spool
-			rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear
-			mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear/
-			dropbearkey -t rsa -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear/dropbear_rsa_host_key
-
-			# allow the webserver user to read it
-			chmod 600 $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear/dropbear_rsa_host_key
-
-			# create authorized_keys
-			PUBLIC_KEY=`dropbearkey -y -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear/dropbear_rsa_host_key | grep ssh`
-			if [ ! -d /root/.ssh ]; then
-				mkdir -p /root/.ssh
-				chmod 700 /root/.ssh
-			fi
-			if [ ! -f /root/.ssh/authorized_keys ]; then
-				echo "$PUBLIC_KEY" > /root/.ssh/authorized_keys
-				chmod 600 /root/.ssh/authorized_keys
-			else
-				OPENQRM_HOST=`echo $PUBLIC_KEY | awk {' print $3 '}`
-				if grep $OPENQRM_HOST /root/.ssh/authorized_keys 1>/dev/null; then
-					sed -i -e "s#.*$OPENQRM_HOST.*##g" /root/.ssh/authorized_keys
-				fi
-				echo "$PUBLIC_KEY" >> /root/.ssh/authorized_keys
-				chmod 600 /root/.ssh/authorized_keys
-			fi
-			# and put it in the boot-service dir for the resources to download
-			echo "$PUBLIC_KEY" > $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear/openqrm-server-public-rsa-key
-			ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear/openqrm-server-public-rsa-key $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/openqrm-server-public-rsa-key
-			# create the command-queue dir
-			mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/var/spool/ $OPENQRM_SERVER_BASE_DIR/openqrm/var/lock/
-			chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/var/spool $OPENQRM_SERVER_BASE_DIR/openqrm/var/lock/
-
-			# create unconfigured file containing a list of available network cards to setup openQRM on
-			ip a s | grep ^[0-9] | cut -d':' -f2 | awk '{ print $1 }' | grep -v lo > $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/unconfigured
-
-			# use the first nic to preconfigure the openqrm-server.conf
-			FIRST_NIC=`ip a s | grep ^[0-9] | cut -d':' -f2 | awk '{ print $1 }' | grep -v lo | head -n 1`
-			if [ "$FIRST_NIC" != "" ]; then
-				sed -i -e "s/OPENQRM_SERVER_INTERFACE=.*/OPENQRM_SERVER_INTERFACE=$FIRST_NIC/g" $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-			fi
-
-		fi
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure|upgrade)
-    ;;
-
-    *)
-        echo "postinst called with argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-
-#DEBHELPER#
-
-exit 0
diff --git a/openQRM-5.3.50-CE/src/debian/openqrm.postrm b/openQRM-5.3.50-CE/src/debian/openqrm.postrm
deleted file mode 100644
index fef3ee2..0000000
--- a/openQRM-5.3.50-CE/src/debian/openqrm.postrm
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-# postrm script for openqrm
-#
-# This file is part of openQRM.
-#
-# openQRM is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2
-# as published by the Free Software Foundation.
-#
-# openQRM 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with openQRM.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Copyright 2011, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-NAME="openqrm"
-DESC="openQRM Cloud Computing Platform"
-LOGDIR=/var/log/$NAME
-LANG=C
-. /lib/lsb/init-functions
-
-if [ -f /etc/default/$NAME ] ; then
-    . /etc/default/$NAME
-else
-    OPENQRM_SERVER_BASE_DIR="/usr/share"
-fi
-
-set -e
-
-case "$1" in
-    remove)
-		rm -f /etc/init.d/openqrm*
-		rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm
-		;;
-
-    purge)
-		rm -f /etc/init.d/openqrm*
-		rm -f /etc/default/openqrm
-		rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm
-		;;
-
-
-	abort-upgrade|failed-upgrade|abort-install|upgrade)
-	;;
-
-    *)
-        echo "postrm called with argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-
-#DEBHELPER#
-
-exit 0
diff --git a/openQRM-5.3.50-CE/src/debian/openqrm.preinst b/openQRM-5.3.50-CE/src/debian/openqrm.preinst
deleted file mode 100644
index 12d096f..0000000
--- a/openQRM-5.3.50-CE/src/debian/openqrm.preinst
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-# openQRM prerm script
-#
-# This file is part of openQRM.
-#
-# openQRM is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2
-# as published by the Free Software Foundation.
-#
-# openQRM 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with openQRM.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Copyright 2011, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-
-NAME="openqrm"
-DESC="openQRM Cloud Computing Platform"
-LOGDIR=/var/log/$NAME
-LANG=C
-. /lib/lsb/init-functions
-
-if [ -f /etc/default/$NAME ] ; then
-    . /etc/default/$NAME
-else
-    OPENQRM_SERVER_BASE_DIR="/usr/share"
-fi
-
-set -e
-
-case "$1" in
-    install|upgrade)
-		if [ -f "$OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf" ]; then
-			# this is an update
-			if [ -x "$OPENQRM_SERVER_BASE_DIR/openqrm/bin/openqrm-update" ]; then
-				$OPENQRM_SERVER_BASE_DIR/openqrm/bin/openqrm-update pre -f
-			fi
-		fi
-		;;
-
-    *)
-        echo "preinst called with argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-
-#DEBHELPER#
-
-exit 0
diff --git a/openQRM-5.3.50-CE/src/debian/openqrm.prerm b/openQRM-5.3.50-CE/src/debian/openqrm.prerm
deleted file mode 100644
index f25ee17..0000000
--- a/openQRM-5.3.50-CE/src/debian/openqrm.prerm
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-# openQRM prerm script - needs bash to source openqrm-functions
-#
-# This file is part of openQRM.
-#
-# openQRM is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2
-# as published by the Free Software Foundation.
-#
-# openQRM 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with openQRM.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Copyright 2011, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-
-NAME="openqrm"
-DESC="openQRM Cloud Computing Platform"
-LOGDIR=/var/log/$NAME
-LANG=C
-. /lib/lsb/init-functions
-
-if [ -f /etc/default/$NAME ] ; then
-    . /etc/default/$NAME
-else
-    OPENQRM_SERVER_BASE_DIR="/usr/share"
-fi
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-
-set -e
-
-case "$1" in
-    remove|deconfigure)
-		/etc/init.d/openqrm stop 2>/dev/null || true
-		/etc/init.d/openqrm-enterprise stop 2>/dev/null || true
-        rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm
-        rm -f /etc/apache2/conf.d/openqrm-httpd.conf
-        rm -f /etc/apache2/conf.d/openqrm-https.conf
-        openqrm_webserver reload
-        rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/default
-        rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear
-    ;;
-
-    abort-upgrade|failed-upgrade|abort-install|upgrade)
-    ;;
-
-    *)
-        echo "prerm called with argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-
-#DEBHELPER#
-
-exit 0
diff --git a/openQRM-5.3.50-CE/src/debian/rules b/openQRM-5.3.50-CE/src/debian/rules
deleted file mode 100644
index 5fb8674..0000000
--- a/openQRM-5.3.50-CE/src/debian/rules
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/make -f
-export DH_VERBOSE=1
-
-export DH_ALWAYS_EXCLUDE=CVS:.svn:.git
-
-configure:: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-	make
-clean::
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	rm -fr $(CURDIR)/debian/openqrm-ng
-
-	[ ! -f Makefile ] || $(MAKE) clean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	[ ! -f Makefile ] || $(MAKE) install DESTINATION_DIR=$(CURDIR)/debian/openqrm-ng
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs doc/Changelog
-	dh_installdocs
-	dh_installexamples
-	dh_install --sourcedir=debian/openqrm-ng
-	dh_installmenu
-	dh_installdebconf	
-	dh_installinit
-	dh_installman
-	dh_lintian
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/openQRM-5.3.50-CE/src/debian/rules.plugin b/openQRM-5.3.50-CE/src/debian/rules.plugin
deleted file mode 100644
index 1c414dd..0000000
--- a/openQRM-5.3.50-CE/src/debian/rules.plugin
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/make -f
-export DH_VERBOSE=1
-
-configure:: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-	make
-clean::
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	rm -fr $(CURDIR)/debian/openqrm-ng
-
-	[ ! -f Makefile ] || $(MAKE) clean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	[ ! -f Makefile ] || $(MAKE) install DESTINATION_DIR=$(CURDIR)/debian/openqrm-ng
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installexamples
-	dh_install --sourcedir=debian/openqrm-ng
-	dh_installmenu
-	dh_installdebconf	
-	dh_lintian
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/openQRM-5.3.50-CE/src/debian/source.lintian-overrides b/openQRM-5.3.50-CE/src/debian/source.lintian-overrides
deleted file mode 100644
index e69de29..0000000
diff --git a/openQRM-5.3.50-CE/src/debian/watch b/openQRM-5.3.50-CE/src/debian/watch
deleted file mode 100644
index 4ac4edf..0000000
--- a/openQRM-5.3.50-CE/src/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://sf.net/openqrm/openqrm-(.+)\.tgz
-
diff --git a/openQRM-5.3.50-CE/src/doc/COPYING b/openQRM-5.3.50-CE/src/doc/COPYING
deleted file mode 100644
index cecc12d..0000000
--- a/openQRM-5.3.50-CE/src/doc/COPYING
+++ /dev/null
@@ -1,10 +0,0 @@
-openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-The latest version of this license can be found here: src/doc/LICENSE.txt
-
-By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-            http://openqrm-enterprise.com
diff --git a/openQRM-5.3.50-CE/src/doc/Changelog b/openQRM-5.3.50-CE/src/doc/Changelog
deleted file mode 100644
index 2e8933c..0000000
--- a/openQRM-5.3.50-CE/src/doc/Changelog
+++ /dev/null
@@ -1,762 +0,0 @@
-# this is the changelog for the openQRM-server project
-
-31.01.2015 - openQRM 5.2.0
------------------------------------
-			- Increased robustness and efficiency for the complete Cloud work-flow
-			- Enhanced deprovision management intelligence
-			- Improved usability of the VMware and KVM VM Wizard
-			- Refined error management for the OpenStack and Hybrid Cloud integration
-
-
-01.09.2013 - openQRM 5.1
-
-			Community/Base:
-
-			- Appliance ==> Server rename
-			- virtualization plugin merge
-			- new design, much enhanced usability, easier workflows
-			- much enhanced kvm support
-			- much enhanced vmware support
-			- new libvirt plugin
-			- native Gluster/GlusterFS integration for KVM - http://raobharata.wordpress.com/2012/10/29/qemu-glusterfs-native-integration/
-			- new much enhanced Hybrid-Cloud funtionalities
-				- WebSSHTerm for instances login via webrowser
-				- Automated Application deployment via puppet
-				- Automated Monitoring via Nagios
-				- Self-Service via the openQRM Cloud - easy option to "re-sell" EC2 as private Cloud resource
-
-			base:
-			- base: enhanced Server wizard / skip steps if possible (openqrm image+kernel, local-vm kernel)
-			- base: improved boot-service configuration, the boot-services now can also be configured through the openqrm commandline utility
-			- base: implemented to also update the configuration files in plugin boot-services during make update
-			- base: enhanced update to automatically update the openQRM initrds for network-deployment
-			- base: enhanced packaging (deb/rpm), implemented robust package update
-			- base: enhanced virtual-resource-command hook allowing to shutdown Hosts via their custom API
-
-			plugins:
-			- lcmc: updated lcmc to 1.5.4
-			- local-storage: rename local-storage -> clonezilla
-			- cloud: added option to specify the Loadbalancing Algorithm for finding the next available Cloud Virtualization Host
-			- cloud: added option to specify a VM Provisioning delay in the Cloud
-			- cloud: added option in the openQRM Cloud to dynamically change resource parameter (cpu/memory) in the Cloudrequest
-			- dhcpd: enhanced dhcpd plugin
-			   - supporting any type of network classes for the openQRM Management Network now
-			   - added support for a multi-homed setup with several managed networks
-			- sshterm: patched bug in webshell (sshterm plugin) to work with python 2.7
-			- kvm: implemented option to set the VNC keymapping for KVM and KVM-Storage VMs
-			- kvm: enhanced VM monitoring for local-deployment VMs
-			- kvm: enhanced VM update
-			- kvm: using qemu-img now to create kvm volume providing different qemu disk formats (raw, cow, qcow, qcow2)
-			- kvm: supports now snapshot action for blockfiles (kvm-bf-deployment and kvm-gluster-deployment)
-			- kvm: now supports native Gluster integration -> new deployment type kvm-gluster-deployment
-				-> http://raobharata.wordpress.com/2012/10/29/qemu-glusterfs-native-integration/
-			- kvm - added option to automatic shutdown the openQRM management interface after deployment and startup of VMs
-			- hybrid-cloud: now talking transparently to AWS EC2 and Eucalyptus
-			- all-plugins: added and enhanced documentation
-
-			new plugins Community Edition:
-			- new device-manager plugin provides easy LVM pre-configuration for Storages
-			- new network-manager plugin provides easy Network + Bridging pre-configuration for Virtualization Host
-			- new development plugin automatically self-documenting the REST API, templates, translations, css and js of openQRM
-			- new template plugin implementing all available plugin-hooks in openQRM with noop -> template for creating own custom plugin
-			- new libvirt plugin - integrating libvirt as additional resource provider
-
-
-			Bugfixes:
-			- fixed critical: only allow openQRM's update-stats trigger the plugin hooks
-			- fixed critical bug in iframe, not allowing any remote urls
-			- fixed cirtical bug in [plugin]-action.php - not allowing remote access to the stat directories
-			- fixed several typos
-			- fixed nfs-storage with manual NAS/NFS configuration
-
-
-			Enterprise Edition:
-			- new Event-Mailer Plugin sending events to openQRM Adminstrators
-			- new Role-Administration plugin for detailed adjustment of openQRM Adminstrator permissions
-				- allows to map the business topology against openQRM Roles
-
-
-			deprecated:
-			- deprecated coraid-storage equallogic-storage, netapp-storage, vbox and zfs-storage
-			  -> those plugin will stay available and working in their current state, we just not yet plan to further enhance them.
-
-
-31.05.2012 - openQRM 5.0
-
-
-
-31.10.2011	- for the 4.9 release - released 31. October 2011
-
-			###############################################################################################################
-			Base:
-
-			- enhanced openQRM's "appliance model" with an "install from template" work-flow
-			  This new, additional work-flow in openQRM is again fully modular and can be implemented by a plugin.
-			  It now supports to "plug in" different automatic-installation tools (like e.g. the install server Cobbler)
-			  to provide the deployment actions for physical and virtual systems.
-			  Currently the following plugins are already available to be used with this new "install from template" work-flow :
-
-				* Clonezilla	Automated local provision by disk-imaging (cloning of the disk-content) for Windows and Linux
-						http://clonezilla.org/
-
-				* Cobbler		Unattended local Linux installation (focus on RedHat/CentOS)
-						https://fedorahosted.org/cobbler/
-
-				* FAI		Unattended local Linux installation (focus on Debian/Ubuntu)
-						http://fai-project.org/
-
-				* LinuxCOE		Unattended local Linux installation (supports a variety of different Linux distributions)
-						http://linuxcoe.sourceforge.net/
-
-				* Opsi		Unattended local installation for Windows Systems (including Hardware/Software-Inventory, Package- and License-Management)
-						http://www.opsi.org/
-
-			  All above mentioned functionalities and features are also automatically available in the openQRM Cloud!
-			  That means that openQRM can be used as the Middleware to attach an existing Cobbler, FAI, LinuxCOE and/or Opsi environments to Cloud Computing.
-
-			  More infos at http://www.openqrm-enterprise.com/news/details/article/openqrm-brings-clonezilla-cobbler-fai-linuxcoe-and-opsi-into-the-cloud.html
-
-
-			###############################################################################################################
-			Cloud:
-
-			- added option allowing the Cloud User to set the hostname for a requested Cloud system
-
-			- minor changes in the SOAP API "provision" method
-
-			- fixed provision error : failed adding authblocker!
-
-			- added to update the SOAP API wsdl configuration during base update
-
-			- deprecated multiple appliance per single request
-
-
-			###############################################################################################################
-			New Plugins:
-
-			- completely rewritten VMware ESX integration using the native VMware vSphere API
-			  - ESX Auto-discovery, automatically discover ESX hosts with one mouse click
-			  - new VM Management
-			  - new DataStore Management, easily connect NAS or iSCSI DataStores
-			  - new vSwitch/Network Management to manage vSwitches, Portgroups, Uplinks and VLANs
-			  - fully integrated with the "novnc" plugin for VM console access via VNC
-			  - a better Cloud integration now allows to easily use ESX in the openQRM Cloud
-			  - supports ESX 4.1 and 5.0
-
-			- rewritten the linuxcoe plugin, adapted it to the "install from template" work-flow
-
-			- rewritten the local-storage plugin, adapted it to the "install from template" work-flow
-
-			- new "cobbler" integration using the "install from template" work-flow
-
-			- new "fai" integration using the "install from template" work-flow
-
-			- new "opsi" integration using the "install from template" work-flow
-
-			- new nfs-storage plugin -> now using the new htmlobjects, enhanced work-flows and usability
-
-			- new lvm-storage plugin -> now using the new htmlobjects, enhanced work-flows and usability
-
-			- new citrix-storage plugin supporting the local-deployment for Citrix XenServer VMs
-
-			- new "i-doit" CMDB integration (http://www.i-doit.org/) to automatically generate and update the System-Documentation
-
-			- addtional support for Icinga in the Nagios plugin
-
-			- with focus on the the new ESX integration we have deprecated the old vmware-server and vmware-server2 plugins
-
-
-			###############################################################################################################
-			New Features:
-
-			- added support for Glusterfs for kvm-storage, xen-storage and citrix-storage.
-			  Those virtualization plugin now include an additional deployment-type using generic blockfile backends.
-
-			- added "bridged-vlan" option (addtional to "bridge" and "Open vSwitch")
-			  Additional to the regular bridged network topology and the support for Open vSwitch (http://openvswitch.org/)
-			  we have added the "bridged-vlan" option which is using the standard linux tools (brctl, vlan) to automatically
-			  and dynamically manage the virtual network interfaces VLAN configuration.
-
-			- added "openQRM-client-for-local-VMs" to local-server plugin
-
-
-			###############################################################################################################
-			New Commercial features:
-
-			- Cloud Zone
-			  openQRM Enterprise Cloud Zones is the layer on top of an openQRM Cloud infrastructure.
-			  It has the capability to partition multiple datacenter locations into logical zones and map access
-			  and permissions for each zone regarding your companies business topology.
-			  openQRM Enterprise Cloud Zones comes with a central, multilingual and intuitive Cloud portal with a plug-able Google-maps integration
-			  providing a detailed overview of where your data is located and your systems are running.
-
-			  More details plus video available at http://www.openqrm-enterprise.com/news/details/article/openqrm-enterprise-cloud-zones-the-next-level-of-cloud-computing.html
-
-			- added hook in the ip-mgmt plugin to support external DNS server
-			  This now provides the capability to automatically manage hostnames and their public ip-addresses on external DNS server.
-
-
-			###############################################################################################################
-			Sponsored plugins and features:
-
-			For the openQRM 4.9 release the following new plugins are sponsored by openQRM Enterprise:
-
-			- citrix-storage (new)
-			- cobbler (new)
-			- fai (new)
-			- i-doit (new)
-			- linuxcoe (rewritten)
-			- local-storage (rewritten)
-			- lvm-storage (rewritten)
-			- nfs-storage (rewritten)
-			- opsi (new)
-			- vmware-esx (rewritten)
-
-
-
-			###############################################################################################################
-			Bug fixes:
-
-			[ openqrm-Bugs-3288258 ] make deb fails							-	TODO
-			[ openqrm-Bugs-3296928 ] V4.8, make deb: aws plugin can't be packaged, build stops	-	TODO
-			[ openqrm-Bugs-3297274 ] make rpm problems						-	TODO
-
-			[ openqrm-Bugs-3288982 ] dropbear not downloadable
-			[ openqrm-Bugs-3282328 ] Puppet has .svn folders after make install
-			[ openqrm-Bugs-3301594 ] Cloud - VM creation, always adds extra NIC
-			[ openqrm-Bugs-3295326 ] V4.8: DMC-applet not downloadable
-
-
-
-			###############################################################################################################
-			openQRM plugins included in the 4.9 release:
-
-			- Aoe-Storage - Integrates Aoe/Coraid storage server and features the capability to boot resources directly from the Aoe-storage.
-			- Citrix - Manages Citrix-Xen server (network-deployment)
-			- Citrix-storage - Manages Citrix-Xen server (local-deployment)
-			- Cloud - Datacenter Self-service portal providing a fully automated request and provisioning deployment-cycle.
-			- Cobbler - integrates Cobbler server for automatic Linux installations.
-			- Collectd - Automated monitoring and statistics for appliances.
-			- Dhcpd - Automatically manages ip-address assignment and network-boot deployment.
-			- Dns - Automatically manages ip-address to hostname resolving.
-			- Drbdmc - Provides a user-friendly UI for setting up HA-Services on appliances with pacemaker/corosync/heartbeat.
-			- Equallogic-Storage - Native support for Dell Equallogic Storage.
-			- FAI - integrates Fai server for automatic Linux installations.
-			- Highavailability - Automated highavailability with N-to-1 and even N-to-0 Fail-over.
-			- Hybrid-Cloud - Integration with the Amazon Public Cloud, the Ubuntu Enterprise Cloud and Eucalyptus.
-			- I-Doit - The idoit plugin automatically documents systems and services managed by the openQRM-server.
-			- Image-Shelf - Provides an easy way to add pre-made server-images to openQRM.
-			- Iscsi-Storage - Integrates the Enterprise iSCSI Target and features the capability to boot resources directly from iSCSI Luns.
-			- Kvm - Support for rapid network-deployment of KVM Virtual Machines.
-			- Kvm-Storage - Support for rapid local-deployment of KVM Virtual Machines.
-			- Linuxcoe - Fully automated OS installation.
-			- Local-Server - Integration with existing, local-installed Systems.
-			- Local-Storage - Support for image-based Local-deployment .
-			- Lvm-Storage - Transforms a standard Linux-box into a rapid-fast-cloning storage-server (AOE, iSCSI and NFS).
-			- Lxc-Storage - Support for the container based Virtualization technology LCX -> http://lxc.sourceforge.net/
-			- Nagios3 - Fully automated system and service monitoring with Nagios3 and Icinga.
-			- Netapp-Storage - Native support for NetApp-Filer Storage systems.
-			- Nfs-storage - Integrates NFS server and features the capability to boot resources directly from NFS.
-			- NoVNC - Provides a remote web-console for Virtual Machines and physical systems.
-			- OpenVZ-Storage - Support for the OpenVZ Virtualization technology
-			- Opsi - This openQRM plugin automatically installs Windows System.
-			- Puppet - Fully automated configuration management for appliances.
-			- Sanboot-Storage - Booting Windows (and other OS'es) directly from an iSCSI or AOE SAN.
-			- Solx86 - Integration for openSolaris/Solaris X86 systems.
-			- Sshterm - Provides a secure login to the managed resources through the Web-interface.
-			- Tftpd - Provides a tftp-server for network-deployment.
-			- Tmpfs-Storage - Features the capability to boot resources in memory (tmpfs).
-			- Vbox - Integrates the Virtualbox Virtualization Technology.
-			- Vmware-esx - Integrates the VMware-ESX virtualization technology.
-			- Wakeuponlan - Automatically starts (power on) physical systems via the Wake-up-on-LAN technology.
-			- Windows - Support for the Windows Operating System.
-			- Xen - Support for rapid network-deployment of Xen Virtual Machines.
-			- Xen-Storage - Support for rapid local-deployment of Xen Virtual Machines.
-			- Zabbix - Automated monitoring for systems and services
-			- Zfs-Storage - Integrates ZFS storage server and features the capability to boot from ZFS.
-
-
-			###############################################################################################################
-			Installation of openQRM
-
-			For a way easy installation (and/or udpate) of openQRM please install directly from the openQRM projects subversion repository!
-			The installation from the sources will guarantee simple, seamless and mature updates based on the principle of "Continuous integration" -> http://en.wikipedia.org/wiki/Continuous_integration
-
-			Installation on Debian/Ubuntu:
-			1) run "apt-get install subversion make"
-			2) run "svn co https://openqrm.svn.sourceforge.net/svnroot/openqrm openqrm"
-			3) run "cd openqrm/trunk/src"
-			4) run "make && make install && make start"
-
-			Update to openQRM 4.9 on Debian/Ubuntu:
-			1) Follow steps 1-3) of "Installation openQRM 4.9 on Debian/Ubuntu"
-			2) Instead of step 4) run "make && make update"
-
-
-			Installation openQRM 4.9 on CentOS/RHEL:
-			1) Add the RPMforge repository -> http://wiki.centos.org/AdditionalResources/Repositories/RPMForge
-			2) run "yum install subversion make"
-			3) run "svn co https://openqrm.svn.sourceforge.net/svnroot/openqrm openqrm"
-			4) run "cd openqrm/trunk/src"
-			5) run "make && make install && make start"
-
-			Update to openQRM 4.9 on CentOS/RHEL:
-			1) Follow steps 1-4) of "Installation openQRM 4.9 on CentOS/RHEL"
-			2) Instead of step 5) run "make && make update"
-
-
-
-			###############################################################################################################
-			QA Report - Supported Distribution for the openQRM Server
-
-			For the openQRM Server itself we recommend a Debian or Ubuntu (LTS) Linux distribution!
-			-> Especially for the openQRM 4.9 release we have included a set of improvements and QA to enhance the "user experience" of openQRM also on CentOS.
-
-			For the managed physical systems and the deployment of Virtual Machines openQRM supports all mainstream Linux and Windows Distributions (and versions)
-			-> independent from the Linux Distribution the openQRM Server is running on.
-
-
-							   Supported Distribution Matrix
-
-			------------------------------------ build -- install -- init -- works -- packaging --
-			Debian 5 (Lenny) i386                 OK        OK        OK       OK        OK
-			Debian 5 (Lenny) amd64                OK        OK        OK       OK        OK
-
-			Debian 6 (Squeeze) i386               OK        OK        OK       OK        OK
-			Debian 6 (Squeeze) amd64              OK        OK        OK       OK        OK
-
-			Ubuntu 10.04 LTS (Lucid) i386         OK        OK        OK       OK        OK
-			Ubuntu 10.04 LTS (Lucid) amd64        OK        OK        OK       OK        OK
-
-			Ubuntu 10.10 (Maverick) i386          OK        OK        OK       OK        OK
-			Ubuntu 10.10 (Maverick) amd64         OK        OK        OK       OK        OK
-
-			Centos 5.5 i386                       OK        OK        OK       OK        X
-			Centos 5.5 amd64                      OK        OK        OK       OK        X
-
-			Centos 6 i386                         OK        OK        OK       OK        OK
-			Centos 6 amd64                        OK        OK        OK       OK        OK
-			-------------------------------------------------------------------------
-
-			Not supported (for now) :
-			Ubuntu 11.04 i386/amd64 - busybox and dropbear compile errors caused by 3.x kernel version
-			Ubuntu 11.10 i386/amd64 - busybox and dropbear compile errors caused by 3.x kernel version
-
-			Known Bugs:
-			Debian 6 (Squeeze) i386/amd64 - deb packaging does not work for Squeeze because of portmap/rpcbind conflict
-			Centos 5.5 i386/amd64 - rpm packaging does not work, glibc-static + zlib-static build dep error -> packages not existing for CentOS 5.5 (not even rpmforge)
-
-
-			###############################################################################################################
-			Enjoy openQRM 4.9!
-
-			your openQRM Team
-
-
-
-
-31.03.2011	- for the 4.8 release :
-			- Fixed code indention (complete source code)
-			- Fixed php warnings/errors (complete source code)
-			- Updated openqrm-initrd-templates and openqrm-clients
-			- Updated pciutils + pcimodules patch to version 3.1.7
-			- Added option to overwrite resource-parameter (useful for storage cluster resources with a global cluster ip)
-			- New OpenVZ-Storage Plugin (Support for OpenVZ as an additional Virtualization technology in openQRM)
-			  - Added support for live-migration for OpenVZ VMs
-			  - Integration with Open vSwitch for automated VLAN Management -> http://openvswitch.org/
-			- Improved kvm and kvm-storage Plugins
-			  - Added support for live-migration of KVM/KVM-Storage VMs
-			  - Integration with Open vSwitch for automated VLAN Management
-			- Improved xen and xen-storage Plugins
-			  - Added support for live-migration of Xen/Xen-Storage VMs
-			  - Integration with Open vSwitch for automated VLAN Management
-			- Enhanced Nagios integration (Nagios3 Plugin)
-			  - Added custom service-check configuration for appliances
-			- Initial integration of Icinga (via the Nagios3 Plugin)
-			- New DRBD MC Plugin incorporating Linbit's DRBD Management Console
-			- Improved autostarting VMs after Host reboot
-			- Added "appliance-link-section" hook allowing plugins to add actions to the appliance overview
-			- Improved plugin notification and error event handling
-			- Enhanced usability and user-friendliness
-			- Better "appliance-create" workflow displaying only relevant configuration items
-			- Improved "resource-new" form
-			- Added support to Auto-scale the openQRM Cloud via "Out-of-Band-Management" Plugins (IPMI/WakeUpOnLan)
-			- Progressed with ongoing migration to MVC (removing the frames)
-			- Ported the first plugins (ip-mgmt, ipmi and wakeuponlan) to the
-			  new version of the PHP framework from A. Kuballa -> http://htmlobjects.kuballa.net/
-			  - Fully Object oriented
-			  - Fully translatable (multiple language support)
-			  - Fully templatable (css and javascript integration)
-			  - Automated user-friendly input checking
-			- openQRM 4.8 Bug fixes:
-			3061951 - openqrm-client service on ubuntu
-			2947742 - Create variable for /etc/exports
-			2819000 - snapshot of a LV
-			3153469 - Ubuntu, LXC, Reboot the physical machine
-			2926602 - OpenQRM 4.6 linuxcoe plugin on Centos5.4 64 bit
-			2958647 - OpenSuSE packaging
-			2958640 - OpenSuSE NFS storage
-			2956532 - openqrm-plugin-local-storage-functions not working in sles
-			2803760 - lvm aoe vblade creation
-			3106507 - issue when enabling plugin
-			3111519 - .ssh/authorized_keys wird überschrieben
-			3153471 - LXC_VM_NETWORK param
-			3153463 - Ubuntu, LXC, Reverse DNS
-			3164681 - Templates from shelf, pivot_root error message
-			3170533 - DNS Plugin bug(s), corrupted reverse-zonefile
-			2808601 - xen vm creation with same name
-			3028333 - Renaming kernel in GUI doesn't rename on FS
-			3165328 - WOL Manager is not accessible
-			3195300 - Xen VM cannot be started in Xen 4 with debian 6
-			3195313 - xen plugin Error File descriptor leaked on lvscan invocation
-			3195318 - xen-storage plugin error Volume group "noop" not found
-			3192452 - typo in xen-storage startup script
-			3165331 - Plenty of "Undefined index" messages in Apache/PHP log
-			3157399 - HA plug-in - If more then 1 NIC assigned not creating new VM
-			3156441 - in Nagios werden nicht alle Systeme mit Namen angezeigt
-			3132483 - NAT ist falsch geschrieben
-			3122276 - Build path wrong
-			3118427 - mehere gleichnamige Images möglich
-			2953421 - apt-get problem on Ubuntu at demo
-			2925545 - Different error mess. with integration plugins
-			2897181 - Double IP-Assignment (new ressource)
-			2897175 - New Linux Kernel
-			2840285 - NFS mounting from novell netware server fails
-			2781087 - cloud: turn of avahi service on the ubuntu server-templates
-
-30.09.2010	- for the 4.7 release :
-			- changed halt to poweroff
-			- implemented seamless update
-			- link the tftpboot/boot dir to the boot-services
-			- updated openqrm-client and openqrm-initrd-templates
-			- increased column event_description in event_info table
-			- added database-update functions for mysql
-			- remove the tftpboot link on uninstall
-			- refresh resource-parameters during openqrm-client restart
-			- enhanced openqrm-client start phase for HA
-			- avoid starting bootservices on idle resource for faster startup
-			- clean udev rules on startup to have persistant interface names
-			- heavily increased performance for import_kernel phase
-			- added to detect lvm volumes within the initrd-stage
-			- increased version number, added configuable timeout and retry values for the cmd-queue
-			- added lvm to the initrd
-			- enhanced package-manager update
-			- better handling of setting the default kernel
-			- cmd-queue now using configurable timeout, increased default timeout to 120s
-			- fixed incorrect sequence in the cmd-queue actions
-			- removed sequentially processing-statistics event for better performance
-			- added updated htmlobjects in preparation for the ongoing move to MVC
-			- added authblocker to the appliance.class to enforce the correct start sequence
-			- better handling of adding events avoiding the time of the maintenance cron job
-			- added get_ids_by_storage method to image.class
-			- added additional virtualization and storage infos to resource-parameters
-			- added methods to get and set resource-capabilities
-			- implemented configurable HA timeout per resource
-			- added get_ids_by_storage_type method to storage.class
-			- added constraint-checks for object removal, increasing the useability
-			- updated links to the current documentation
-			- disabled postgres, oracle and db2 support for now, scheduled to be re-worked for version 5.0
-			- added menu section for enterprise plugins
-			- using official htmlobjects release from sf.net
-			- added update target to main Makefile
-			aoe-storage :
-			- added to remove the authblocker when the device is existing auth succeeded
-			- made auto-starting the storage configurable for better HA handling
-			- improved remount_fs for Ubuntu Lucid and Maverick
-			- added cloud-deployment hook, making the Cloud Storage types completely plug-able
-			citrix:
-			- added fencing function, improve HA handling
-			- added constraint-checks for object removal
-			- added cloud-hook, making the Virtualization types completely plug-able
-			- added ha-hook to auto-create and fence VMs
-			cloud:
-			- improved html for the Cloud-portal
-			- added UI-compatible wdsl
-			- implemented Cloud-Profiles including custom-icon-upload for user-friendly deployment
-			- added Visual-Infrastructure-Designer for profile deployment
-			- restructured menu of the Cloud-portal
-			- improved account details
-			- implemented CloudUserGroups
-			- implemented configurable host-limits per resource
-			- implemented CloudPowerSaver for automatic power-off of not-utilized resources
-			- implemented ResourcePools to allow assignment of dedicated Cloud-resources to CloudUserGroups
-			- restructured cloud-actions in the cloud-monitor-hook for much better performance and scalability
-			- added configurable performance parameter
-			- implemented HostStartFromOff, allow the Cloud to automatically power-on Host systems via a plugin-hook for the new out-of-band management plug-ins
-			- improved AutoCreateVMs, monitoring the start-up phase of the VMs
-			- made Cloud-Ip management plug-able
-			- implemented Cloud auto-scaling
-			dhcpd:
-			- improved new-resource action
-			equallogic-storage:
-			- added to remove the authblocker when the device is existing auth succeeded
-			- improved remount_fs for Ubuntu Lucid and Maverick
-			- added cloud-deployment hook, making the Cloud Storage types completely plug-able
-			- fixed gathering the correct 32 or 64bit lib-depenencies for the resize-components
-			highavailability:
-			- added configurable HA time-out per resource
-			- improved to automatically create VMs and to automatically power-on Hosts
-			- added fencing-hook
-			iscsi-storage:
-			- added to remove the authblocker when the device is existing auth succeeded
-			- made auto-starting the storage configurable for better HA handling
-			- improved remount_fs for Ubuntu Lucid and Maverick
-			- added cloud-deployment hook, making the Cloud Storage types completely plug-able
-			kvm:
-			- added fencing function, improve HA handling
-			- added constraint-checks for object removal
-			- added cloud-hook, making the Virtualization types completely plug-able
-			- added ha-hook to auto-create and fence VMs
-			kvm-storage:
-			- added to remove the authblocker when the device is existing auth succeeded
-			- added cloud-deployment hook, making the Cloud Storage types completely plug-able
-			- added support for shared SAN storage
-			- added fencing function, improve HA handling
-			- added constraint-checks for object removal
-			- added cloud-hook, making the Virtualization types completely plug-able
-			- added ha-hook to auto-create and fence VMs
-			local-storage:
-			- added to remove the authblocker when the device is existing auth succeeded
-			- added cloud-deployment hook, making the Cloud Storage types completely plug-able
-			lvm-storage:
-			- added to remove the authblocker when the device is existing auth succeeded
-			- made auto-starting the storage configurable for better HA handling
-			- improved remount_fs for Ubuntu Lucid and Maverick
-			- added cloud-deployment hook, making the Cloud Storage types completely plug-able
-			lxc-storage:
-			- This is the new lxc-storage plugin integrating lxc-containers into openQRM and the openQRM Cloud
-			netapp-storage:
-			- added to remove the authblocker when the device is existing auth succeeded
-			- improved remount_fs for Ubuntu Lucid and Maverick
-			- added cloud-deployment hook, making the Cloud Storage types completely plug-able
-			nfs-storage:
-			- added to remove the authblocker when the device is existing auth succeeded
-			- improved remount_fs for Ubuntu Lucid and Maverick
-			- added cloud-deployment hook, making the Cloud Storage types completely plug-able
-			sanboot-storage:
-			- added to remove the authblocker when the device is existing auth succeeded
-			- added cloud-deployment hook, making the Cloud Storage types completely plug-able
-			sshterm:
-			- a brand-new sshterm plugin using WebShell, improved usability
-			tmpfs-storage:
-			- This new plugin allows to deploy systems directly into memory (RAM)
-			- added to remove the authblocker when the device is existing auth succeeded
-			vbox:
-			- added Virtualbox as additional Virtualization type into openQRM, initial version
-			vmware-esx:
-			- improved VM actions
-			- added fencing function, improve HA handling
-			- added constraint-checks for object removal
-			- added cloud-hook, making the Virtualization types completely plug-able
-			- added ha-hook to auto-create and fence VMs
-			vmware-server:
-			- added fencing function, improve HA handling
-			- added constraint-checks for object removal
-			- added cloud-hook, making the Virtualization types completely plug-able
-			- added ha-hook to auto-create and fence VMs
-			vmware-server2:
-			- added fencing function, improve HA handling
-			- added constraint-checks for object removal
-			- added cloud-hook, making the Virtualization types completely plug-able
-			- added ha-hook to auto-create and fence VMs
-			wakeuponlan:
-			- intgrating WOL (wake-up-on-Lan) as out-of-band management option
-			- providing the capability to automatically power-on Hosts (-> auto-scaling)
-			windows:
-			- updated Windows openQRM-Client.exe
-			- fixing sf.net bug 3028337 - Windows openQRM Client setup fails
-			xen:
-			- added fencing function, improve HA handling
-			- added constraint-checks for object removal
-			- added cloud-hook, making the Virtualization types completely plug-able
-			- added ha-hook to auto-create and fence VMs
-			xen-storage:
-			- added to remove the authblocker when the device is existing auth succeeded
-			- added cloud-deployment hook, making the Cloud Storage types completely plug-able
-			- added support for shared SAN storage
-			- added fencing function, improve HA handling
-			- added constraint-checks for object removal
-			- added cloud-hook, making the Virtualization types completely plug-able
-			- added ha-hook to auto-create and fence VMs
-			zfs-storage:
-			- added to remove the authblocker when the device is existing auth succeeded
-			- improved remount_fs for Ubuntu Lucid and Maverick
-			- added cloud-deployment hook, making the Cloud Storage types completely plug-able
-
-05.01.2010	- for the 4.6 release :
-			- fixed [ openqrm-Bugs-2544993 ] nagios2/nagios3 dependencies are broken for Ubuntu Intrepid
-			- fixed [ openqrm-Bugs-2612552 ] generated debian package breaks dpkg
-			- fixed [ openqrm-Bugs-2781083 ] cloud: requesting 2 appliances ip-config gets confused
-			- fixed [ openqrm-Bugs-2697298 ] restarting appliance in the cloud sets CR to done
-			- fixed [ openqrm-Bugs-2741804 ] openQRM and multiple locations
-			- fixed [ openqrm-Bugs-2897168 ] Rebooting ressources
-			- fixed [ openqrm-Bugs-2806794 ] aoe-lvm not restart after rebooting appliance on remote
-			- fixed [ openqrm-Bugs-2879884 ] Bug in citrix-auth.php
-			- fixed [ openqrm-Bugs-2923976 ] RPM Build: mod_ssl is missing so https doesn't work
-			- fixed [ openqrm-Bugs-2925571 ] Missed File Appliance Manager
-			- implemented [ openqrm-Feature Requests-2053329 ] ng: do we need the run-time dependency mysql-server ?
-			- implemented [ openqrm-Feature Requests-2818510 + 2818521 ] integrate already existing NFS server
-			- implemented [ openqrm-Feature Requests-2874621 ] moving openQRM to https
-			- implemented [ openqrm-Feature Requests-2874620 ] creating complex vms on the fly
-			- implemented [ openqrm-Feature Requests-2871220 ] Autostart feature for all virtualization technolgoies
-			  implemented [ openqrm-Feature Requests-2778127 ] Amazon EC2 API Adapter
-			- new web-based installer
-			- added virtio support to the kvm-plugin
-			- Integration with Amazone EC2
-			- lvm + equallogic storage disk resize
-			- Cloud appliance resize
-			- heavy packaging updates and improvements
-			- new basedir /usr/share   !!
-			- focus and QA for Debian, Ubuntu and CentOS (latest versions)
-			- deprecated old non-maintained plugins (windows)
-			- new build system for debian/ubuntu (debian packaging conform, using pbuilder)
-			- new build system for Centos (much better rpms, much QA)
-			- pimped local-server to allow booting a remote kernel and running a local root-fs (on local-disk)
-			- image resize for cloud appliances
-			- private image feature for the cloud
-			- table sorting + paging fixes all over base + plugins
-			- applied [ openqrm-Patches-2879745 ] solx86 plugin update for derivatives without CSWtop
-			- fixed linuxCOE bugs, updated LinuxCOE to latest 4.2, retested with new LinuxCOE version
-			- added a Cloud Selector to define Cloud Products
-			- implemented automatic billing according to the user-defined Cloud Product prices
-			- implemented seamless support different server architectures (i386 + x86_64)
-			- added initrd-templates for Debian, CentOS and Ubuntu (i386 + x86_64 architecture)
-			- added openqrm-client packages for Debian, CentOS and Ubuntu (i386 + x86_64 architecture)
-			- restructured base and plugin menu, added menu icons
-			- a brand new much better automated hardware detection
-			- .... plus lots of cosmetics
-			- a new local deployment mode for KVM and Xen vms via the kvm-storage and xen-storage plugin
-			  -> this plugin supports easy deployment "as you are used" on local logical volumes on the KVM/Xen host.
-			  -> ... this one adds support for Windows operating system to openQRM
-
-28.06.2009  - for the 4.5 release :
-            - implemented "the Cloud billing should be plug-able"
-            - implemented Cloud NAT feature
-            - improved iSCSI boot for the iscsi-storage and lvm-storage plugin
-            - added Cloud-Mailer
-            - added Cloud VCD - Visual Cloud Designer
-            - added Zabbix monitoring plugin
-            - added Equallogic suppport, plugin development sponsored by XXLWebHosting
-            - re-organized the left tree menu -> plus subsections
-            - re-worked lvm-storage plugin
-            - re-worked ALL storage plugins
-            - completely re-worked the netapp-storage plugin
-              -> added netapp authentication hooks to fit into the storage security framework
-              -> tested with ontap 7.0
-            - added support not "un-managed" nfs-storage server via an option to manually set the export-list
-            - reworked VMware ESX plugin
-              -> tested with VMware ESX 3.5 - ESXi 4.0
-            - reworked VMware Server 2 plugin
-              -> tested with VMware-server-2.0.1-156745.i386
-            - reworked VMware Server plugin
-              -> tested with VMware-server 1
-            - reworked Xen plugin
-              -> tested with Xen 3.2 - 3.4
-            - reworked and finalyzed Citrix XenServer plugin
-              -> tested with Citrix XenServer 5.5.0
-            - reworked KVM plugin
-              -> tested with kvm-62
-            - New landing page with Data-Center summary
-            - Fixed bugs : 2527643, 2636465, 2806793, 2709553, 2806816, 2781100, 2812712
-            - Implemented/Closed Feature requests : 2208009, 2785130, 2208012, 2153370, 2697291
-
-14.03.2009  - for the 4.4 release :
-            - debian build system updated
-            - added nagios3 plugin
-            - enhanced nagios2 integration, provding new automap option
-            - implemented [ 2474672 ] persistant appliances for the cloud
-            - fixed [ 2509597 ] requesting multiple resource does not free up cloud-ips
-            - fixed [ 2520734 ] in openqrm 4.3 xen plugin there's a typo
-            - fixed [ 2529860 ] umounting of /lib/modules before init
-            - fixed [ 2524342 ] xen plugin does not find xen.gz in redhat based installs
-            - fixed [ 2524370 ] xen plugin: xm/new.py requires xen 3.1+
-            - implemented [ 2513579 ] integration of the Puppet groups into the Cloud
-            - fixed [ openqrm-Bugs-2544987 ] xen plugin xm list avoiding dom0 entry
-            - fixed [ openqrm-Bugs-2509728 ] growing event_info table slows down base engine
-            - implemented [ openqrm-Feature Requests-2542613 ] xen-plugin make the location of the cfg files configurable
-            - implemented [ openqrm-Feature Requests-1875784 ] enhancing the LinuxCOE integration
-            - made the command-execution layer plug-able
-            - added new command-execution layer based on dropbear (ssl + shared keys)
-            - implemented [ openqrm-Feature Requests-2468844 ] cloud: on/off switch for the cloud -> being able to take it offline
-            - puppet + webmin
-            - added per-User Cloud-resource limits (quantity, memory, disk, network, cpus)
-            - enhanced sshterm plugin, implemented secure remote access via ajaxterm and pound reverse-ssl-proxy
-            - integrated sshterm-plugin into the Cloud
-            - implemented [ openqrm-Feature Requests-1881578 ] ng: automatic loadbalancing for Xen vms
-            - implemented [ openqrm-Feature Requests-1921180 ] ng: need a way to execute commands on the managed resources
-            - implemented [ openqrm-Feature Requests-2502207 ] Web service plugin.
-
-30.12.2008  - for the 4.3 release :
-            - improved usability for the storage management
-            - implemented storage security features
-            - new debian build system
-            - fixed [ openqrm-Bugs-2298162 ] Selecting the resource-type in the overview is tricky
-            - implemented [ openqrm-Feature Requests-2342603 ] Cloud Plugin Enhancement
-            - implemented "auto-create-virtual-machines" for the Cloud Plugin
-            - implemented [ 2147701 ] Support for VMware-server 2.x
-            - fixed [ 2153376 ] Image-Shelf not extendable
-            - xen plugin enhancements [ openqrm-Feature Requests-1949902 ] ng: booting xen domains via pypxeboot
-            - fixed [ openqrm-Bugs-2413524 ] Nagios on Centos uses wrong dir
-            - implemented [ 2250673 ] assigning default-image
-            - implemented [ 2468842 ] state backups of the openQRM-server
-29.08.2008	- fixed [ 1934416 ] ng: template-based Image-Installer
-24.08.2008	- security fixes, GUI- and Usablility improvements
-08.08.2008	- fixed [ 1992378 ] ng: iscsi- + aoe-storage deployment should auto-partititon
-09.07.2008	- fixed [ 1992381 ] ng: add option for resources to add events
-06.07.2008	- fixed [ openqrm-Bugs-1999014 ] ng: recheck permissions of the boot-service files on Centos
-			  [ openqrm-Feature Requests-1940898 ] ng: update path / backup/restore for plugins
-05.07.2008	- fixed
-			  [ openqrm-Bugs-1999026 ] ng: increase field-length of hostname in resource_info
-			  [ openqrm-Bugs-1992353 ] ng: iscsi-storage plugin needs unique disk-identifier
-			  [ openqrm-Feature Requests-1992366 ] ng: udev on the initrd
-			  [ openqrm-Feature Requests-1992371 ] ng: clean up install-from-local + install-from-local-device
-
-18.06.2008	- initial release version 4.0
-11.04.2008	- moved cvs repository to svn	and added svn-commit mails
-up to the
-18.06.2008	- full steam ahead on preparing the initial release version
-16.03.2008	- major updates on the basic framework
-			  introduced user management and plugg-ability
-			  added local, nfs and iscsi deployment types (also plugg-able)
-			  added appliance based deployment mechanism
-21.01.2008	- added basic monitoring framework
-20.01.2008	- cleaned-up init process on the initrd
-			  made reboot/halt working
-19.01.2008	- added root-execution environemnt for the server
-			  added to add new detected resources automatically
-			  added starting the openrm-client on the booted resources
-17.01.2008	- added to init network on the intird
-			  added build-requirements check
-16.01.2008	- added creating default initrd template
-			  added creating default boot-image
-14.01.2008	- made tftpd plugin working
-			  made dhcpd plugin working
-13.01.2008	- added support for rpm-packaging
-12.01.2008	- created initial framework
-			  designed dependencies setup
-			  implemented deb-packaging
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/doc/DESIGN-NOTES b/openQRM-5.3.50-CE/src/doc/DESIGN-NOTES
deleted file mode 100644
index 254ad9b..0000000
--- a/openQRM-5.3.50-CE/src/doc/DESIGN-NOTES
+++ /dev/null
@@ -1,83 +0,0 @@
-openQRM
-
- Being pluggable in nature openQRM has a design that allows and enables developers to add features or plugins.  The enviroment is full of technologies and software that is discussed here.
-
-PHP
- PHP5 enables the majority of openQRM in its web interface and in normal programing.  Additionally PHP runs along with Apache2, ADODB (MySQL, DB2, Oracle, or PostgreSQL) and a host of other technologies like XML, AJAX and more.
-
-Base
- The base of openQRM describes the components that are required to run and offer the API to the plugins. The base is the infrastructure that allows the plugins to interact with the resources in openQRM. Local administration and the plugin management system are parts of the base.
-
-Plugins
- Many plugins offer features and access to resources.  Some plugins offer monitoring, storage management, deployment or other service to the openQRM system. The list of plugins will change and grow faster than this document.  Please check the website for up to date information.
-
- To write a plugin you will need certian required and optional structures. 
-
- Required:
-
-  base-directory
-    base-dir/openqrm/plugins/[plugin-name]
-    All plugins specific source code should go here.
-
-  plugin etc directory
-    base-dir/openqrm/plugins/[plugin-name]/etc
-    All plugins specific configuration files should go here.
-
-  plugin etc/init.d directory
-    base-dir/openqrm/plugins/[plugin-name]/etc/init.d
-    All plugins specific init scripts should go here.
-    The plugins init script should be named "openqrm-plugin-[plugin-name]" and accept at least the start/stop parameters.
-  
-  plugins postinstall stage
-    base-dir/openqrm/plugins/[plugin-name]/etc/init.d/openqrm-plugin-[plugin-name].postinstall
-    This postinstall script must exist for packaging. It should run the commands needed for initialyzing the plugin after installation.
-    (it does not enable the plugin but just prepare it so it could get enabled)
-
-  plugins preremove stage
-    base-dir/openqrm/plugins/[plugin-name]/etc/init.d/openqrm-plugin-[plugin-name].preremove
-    This preremove script must exist for packaging. It should run the commands needed to stop and uninitialyze the plugin after installation.
-    (it does not disable the plugin but just prepare it so it could get disabled)
-
-  plugins configuration file
-    base-dir/openqrm/plugins/[plugin-name]/etc/openqrm-plugin-[plugin-name].conf
-    This main plugins configuration file must exists.
-    It should set the following variables
-     # plugin version
-     OPENQRM_PLUGIN_VERSION="[openqrm-server-version]-[plugin-version]"
-     # plugin dependencies for redhat-, suse- and debian-based systems
-     OPENQRM_PLUGIN_DEPENDENCIES_REDHAT
-     OPENQRM_PLUGIN_DEPENDENCIES_SUSE
-     OPENQRM_PLUGIN_DEPENDENCIES_DEBIAN
-     This OPENQRM_PLUGIN_DEPENDENCIES variables should be set to a comma-separated
-     list of required components (dependencies) for redhat-, suse- and debian-based systems.
-
-  plugins Makefile
-    base-dir/openqrm/plugins/[plugin-name]/Makefile
-    This Makefile compiles and packages the plugin. 
-    It should implement the following targets
-     configure, compile, install, uninstall, clean, realclean and all
-
- Optional:
-
-  bin directory
-   base-dir/openqrm/plugins/[plugin-name]/bin
-   All plugins specific binaries should go here.
-
-  plugin sbin directory
-   base-dir/openqrm/plugins/[plugin-name]/sbin
-   All plugins specific daemons/server-binaries should go here.
-
-  plugin include directory
-   base-dir/openqrm/plugins/[plugin-name]/include
-   All plugins specific functions files should go here.
-   The plugin specific functions files should be named "openqrm-plugin-[plugin-name]-functions" 
-
-  plugin etc/templates directory
-   base-dir/openqrm/plugins/[plugin-name]/etc/templates
-   All plugins specific template files should go here.
-   The plugins templates should be named "openqrm-plugin-[plugin-name]..."
-
-   plugin web directory
-    base-dir/openqrm/plugins/[plugin-name]/web
-    All plugins specific web-pages should go here.
-
diff --git a/openQRM-5.3.50-CE/src/doc/Developers b/openQRM-5.3.50-CE/src/doc/Developers
deleted file mode 100644
index f459e3b..0000000
--- a/openQRM-5.3.50-CE/src/doc/Developers
+++ /dev/null
@@ -1,29 +0,0 @@
-
-For developers or persons interested in submitting a patch for
-consideration please note the following guide.
-
-1. Setup the enviroment
-    cd /usr/src
-    svn co https://openqrm.svn.sourceforge.net/svnroot/openqrm/trunk/src openqrm
-
-2. Work inside the openqrm folder
-    cd openqrm
-
-3. Sync with branch just in case
-    cd /usr/src/openqrm
-    make update
-
-4. Create SVN Diff
-    svn diff > /usr/src/all_openqrm_changes.patch
-    or
-    svn diff folder/folder/file.php > /usr/src/file.php_openqrm.patch
-    or
-    svn diff folder/folder/file.php Makefile doc/README \
-    doc/INSTALL > /usr/src/misc_openqrm_changes.patch
-
-5. Politely forward this file with a description of what it is doing and why to
-openqrm-developer@lists.sourceforge.net and don't forget the attachment.
-For large patches you may want to link to the file on the Internet or ask for
-further instructions on the list.
-
-Thanks !
diff --git a/openQRM-5.3.50-CE/src/doc/INSTALL b/openQRM-5.3.50-CE/src/doc/INSTALL
deleted file mode 100644
index 45f3f84..0000000
--- a/openQRM-5.3.50-CE/src/doc/INSTALL
+++ /dev/null
@@ -1,62 +0,0 @@
-How to build and install openQRM
-
-To build please run :
-
-	make
-
--> this automatically checks the requirements for the compilation
--> it builds the base server and plugins
--> it will download and compile some third-party components
--> it will cache downloads and compile results
--> build-location can be configured in ../src/etc/openqrm-server.conf
-
-To install run :
-
-	make && make install
-
--> this installs openQRM-ng
--> install-location can be configured in ../src/etc/openqrm-server.conf
-	
-To start run :
-
-	make start
-
--> this basically just runs "/etc/init.d/openqrm start"
--> installation phase is not needed any more and got eliminated
--> initialization happens automatically on first-start
--> initialization automatically checks for runtime-requirements
-
-To check the install requirements run :
-
-	make check
-
--> this checks the requirements for the compilation
--> if this checks fails it will display the exact missing package requirement
-   Then just install the listed package via apt-get/yum/.. and try again.
-
-To package (rpm/deb) run :
-
-	make package
-
--> this automatically build .deb or .rpm packages
--> package location can be configured in ../src/etc/openqrm-server.conf
-
-To reinstall e.g. after making changes to the sources run :
-
-	make reinstall
-
--> this runs stop, uninstall, clean, all, install, start
-
-Please notice that all make-targets (especially "install") should be executed as root.
-
-After compiling and installing openQRM-ng it automatically
-initialises itself during first-start according the configuration
-parameters set in the main (and single) configuration file BASEDIR/openqrm/etc/openqrm-server.conf
-
-The openQRM-server is now ready for login at : http://[ip-of-the-openQRM-server]/openqrm
-
-Default username and password after installation are :
-User : openqrm
-Password : openqrm
-
--> please change the default password immediately to prevent unauthorized access.
diff --git a/openQRM-5.3.50-CE/src/doc/LICENSE.txt b/openQRM-5.3.50-CE/src/doc/LICENSE.txt
deleted file mode 100644
index 60549be..0000000
--- a/openQRM-5.3.50-CE/src/doc/LICENSE.txt
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/openQRM-5.3.50-CE/src/doc/Makefile b/openQRM-5.3.50-CE/src/doc/Makefile
deleted file mode 100644
index 22aef53..0000000
--- a/openQRM-5.3.50-CE/src/doc/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# this is the openQRM bin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/doc
-	. $(OPENQRM_SERVER_CONF) && cp COPYING Changelog DESIGN-NOTES Developers INSTALL README $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/doc/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/doc/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/doc
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/doc/README b/openQRM-5.3.50-CE/src/doc/README
deleted file mode 100644
index 3d99615..0000000
--- a/openQRM-5.3.50-CE/src/doc/README
+++ /dev/null
@@ -1,38 +0,0 @@
-openQRM is the next generation, open-source Data-center management platform.
-Its fully pluggable architecture focuses on automatic, rapid- and appliance-based
-deployment, monitoring, high-availability and especially on supporting and
-conforming multiple virtualization technologies. 
-openQRM is a single-management console for the complete IT-infra structure and
-provides a well defined API which can be used to integrate third-party tools as
-additional plugins.
-
-Its goal is it to achieve the following specifications :
-
-- KIS (keep it simple)
-- run everywhere (support for every linux distribution, especially Debian+Ubuntu)
-- clean up (remove all not needed code)
-- reduce code base (less code = less bugs)
-- using existing components (instead of providing own binaries/libs)
-- better packaging and dependencies
-- enabling/disabling plugins via the GUI
-- support for multiple databases (db2, mysql, oracle, postgres)
-- porting from java to php
-- focusing on virtualization
-- removing the installer-stage, do the inititialization during firststart
-- ... and some more
-
-openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-The latest version of this license can be found here: src/doc/LICENSE.txt
-By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-            http://openqrm-enterprise.com
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/etc/Makefile b/openQRM-5.3.50-CE/src/etc/Makefile
deleted file mode 100644
index f8e632d..0000000
--- a/openQRM-5.3.50-CE/src/etc/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# this is the openQRM etc Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../etc/openqrm-server.conf
-
-configure:
-
-compile:
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_get_initrd_templates
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc
-	. $(OPENQRM_SERVER_CONF) && cp openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d/*   
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/httpd
-	. $(OPENQRM_SERVER_CONF) && cp httpd/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/httpd/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates
-	. $(OPENQRM_SERVER_CONF) && cp templates/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/*   
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/db2 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/mysql $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/oracle $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/postgres
-	. $(OPENQRM_SERVER_CONF) && cp db/db2/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/db2/
-	. $(OPENQRM_SERVER_CONF) && cp db/db2/README $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/db2/
-	. $(OPENQRM_SERVER_CONF) && cp db/mysql/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/mysql/
-	. $(OPENQRM_SERVER_CONF) && cp db/mysql/README $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/mysql/
-	. $(OPENQRM_SERVER_CONF) && cp db/oracle/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/oracle/
-	. $(OPENQRM_SERVER_CONF) && cp db/oracle/README $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/oracle/
-	. $(OPENQRM_SERVER_CONF) && cp db/postgres/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/postgres/
-	. $(OPENQRM_SERVER_CONF) && cp db/postgres/README $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/postgres/
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_install_initrd_templates
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/etc
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-
-.PHONY: all configure compile install uninstall clean realclean
-
-
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/README b/openQRM-5.3.50-CE/src/etc/build.conf/README
deleted file mode 100644
index eaacfe8..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/README
+++ /dev/null
@@ -1,21 +0,0 @@
-In this directory stores configuration items for third-party components
-
-Third-party components used by openQRM :
-
-busybox
--> we will compile our own, busybox binary since 
-   we need special features of busybox which are not
-   enabled/available on (most) standard linux-distributions
-
-hwsetup
--> for hardware detection during the initrd stage
-
-kudzu-knoppix
--> requried by hwsetup
-
-hwdata-knoppix
--> required by hwsetup
-
-defaultkernel
--> this is the kernel for creating the default boot-image from
-
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/adodb.conf b/openQRM-5.3.50-CE/src/etc/build.conf/adodb.conf
deleted file mode 100644
index dfb2c37..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/adodb.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# Below the download locations for third-party components are defined
-# adodb
-# -> for debian/ubuntu + redhat systems adodb packages are available
-#    sadly not for suse so we bring our own adodb on suse systems only
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="498"
-OPENQRM_SOURCE_DOWNLOAD="http://downloads.sourceforge.net/adodb/adodb$OPENQRM_SOURCE_VERSION.tgz"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/busybox.conf b/openQRM-5.3.50-CE/src/etc/build.conf/busybox.conf
deleted file mode 100644
index 2e9308b..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/busybox.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Below the download locations for third-party components are defined
-# busybox
-# -> we will compile our own, busybox binary since we need special
-#   features of busybox which are not enabled/available on (most) standard
-#   linux-distributions
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="1.19.4"
-#OPENQRM_SOURCE_DOWNLOAD="http://busybox.net/downloads/busybox-$OPENQRM_SOURCE_VERSION.tar.bz2"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/base/busybox-$OPENQRM_SOURCE_VERSION.tar.bz2"
-OPENQRM_SOURCE_BINARY_RESULT="busybox-$OPENQRM_SOURCE_VERSION/_install/bin/busybox"
-
-
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/busybox.configuration b/openQRM-5.3.50-CE/src/etc/build.conf/busybox.configuration
deleted file mode 100644
index 44b4d2b..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/busybox.configuration
+++ /dev/null
@@ -1,1013 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Busybox version: 1.19.4
-# Tue Mar  6 19:31:06 2012
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-# CONFIG_DESKTOP is not set
-# CONFIG_EXTRA_COMPAT is not set
-CONFIG_INCLUDE_SUSv2=y
-# CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_PLATFORM_LINUX=y
-CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_SHOW_USAGE=y
-CONFIG_FEATURE_VERBOSE_USAGE=y
-CONFIG_FEATURE_COMPRESS_USAGE=y
-CONFIG_FEATURE_INSTALLER=y
-# CONFIG_INSTALL_NO_USR is not set
-CONFIG_LOCALE_SUPPORT=y
-CONFIG_UNICODE_SUPPORT=y
-# CONFIG_UNICODE_USING_LOCALE is not set
-# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
-CONFIG_SUBST_WCHAR=63
-CONFIG_LAST_SUPPORTED_WCHAR=767
-# CONFIG_UNICODE_COMBINING_WCHARS is not set
-# CONFIG_UNICODE_WIDE_WCHARS is not set
-# CONFIG_UNICODE_BIDI_SUPPORT is not set
-# CONFIG_UNICODE_NEUTRAL_TABLE is not set
-# CONFIG_UNICODE_PRESERVE_BROKEN is not set
-CONFIG_LONG_OPTS=y
-CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_CLEAN_UP is not set
-CONFIG_FEATURE_UTMP=y
-CONFIG_FEATURE_WTMP=y
-CONFIG_FEATURE_PIDFILE=y
-CONFIG_FEATURE_SUID=y
-CONFIG_FEATURE_SUID_CONFIG=y
-CONFIG_FEATURE_SUID_CONFIG_QUIET=y
-# CONFIG_SELINUX is not set
-# CONFIG_FEATURE_PREFER_APPLETS is not set
-CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
-CONFIG_FEATURE_SYSLOG=y
-CONFIG_FEATURE_HAVE_RPC=y
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_PIE is not set
-# CONFIG_NOMMU is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_INDIVIDUAL is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-CONFIG_LFS=y
-CONFIG_CROSS_COMPILER_PREFIX=""
-CONFIG_EXTRA_CFLAGS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_WERROR is not set
-CONFIG_NO_DEBUG_LIB=y
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-
-#
-# Installation Options ("make install" behavior)
-#
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
-# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
-# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="./_install"
-
-#
-# Busybox Library Tuning
-#
-CONFIG_FEATURE_SYSTEMD=y
-CONFIG_FEATURE_RTMINMAX=y
-CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=2
-CONFIG_FEATURE_FAST_TOP=y
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_FEATURE_EDITING=y
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
-# CONFIG_FEATURE_EDITING_VI is not set
-CONFIG_FEATURE_EDITING_HISTORY=15
-# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
-# CONFIG_FEATURE_REVERSE_SEARCH is not set
-CONFIG_FEATURE_TAB_COMPLETION=y
-# CONFIG_FEATURE_USERNAME_COMPLETION is not set
-# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
-# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
-CONFIG_FEATURE_NON_POSIX_CP=y
-# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
-CONFIG_FEATURE_COPYBUF_KB=4
-CONFIG_FEATURE_SKIP_ROOTFS=y
-# CONFIG_MONOTONIC_SYSCALL is not set
-CONFIG_IOCTL_HEX2STR_ERROR=y
-CONFIG_FEATURE_HWIB=y
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-CONFIG_FEATURE_SEAMLESS_XZ=y
-CONFIG_FEATURE_SEAMLESS_LZMA=y
-CONFIG_FEATURE_SEAMLESS_BZ2=y
-CONFIG_FEATURE_SEAMLESS_GZ=y
-CONFIG_FEATURE_SEAMLESS_Z=y
-CONFIG_AR=y
-CONFIG_FEATURE_AR_LONG_FILENAMES=y
-CONFIG_FEATURE_AR_CREATE=y
-CONFIG_BUNZIP2=y
-CONFIG_BZIP2=y
-CONFIG_CPIO=y
-CONFIG_FEATURE_CPIO_O=y
-# CONFIG_FEATURE_CPIO_P is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
-CONFIG_GZIP=y
-CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
-CONFIG_LZOP=y
-# CONFIG_LZOP_COMPR_HIGH is not set
-CONFIG_RPM2CPIO=y
-CONFIG_RPM=y
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_AUTODETECT=y
-CONFIG_FEATURE_TAR_FROM=y
-CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
-CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-CONFIG_FEATURE_TAR_LONG_OPTIONS=y
-CONFIG_FEATURE_TAR_TO_COMMAND=y
-# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
-CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
-# CONFIG_FEATURE_TAR_SELINUX is not set
-CONFIG_UNCOMPRESS=y
-CONFIG_UNLZMA=y
-CONFIG_FEATURE_LZMA_FAST=y
-CONFIG_LZMA=y
-CONFIG_UNXZ=y
-CONFIG_XZ=y
-CONFIG_UNZIP=y
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-CONFIG_CAT=y
-CONFIG_DATE=y
-CONFIG_FEATURE_DATE_ISOFMT=y
-# CONFIG_FEATURE_DATE_NANO is not set
-CONFIG_FEATURE_DATE_COMPAT=y
-CONFIG_ID=y
-CONFIG_GROUPS=y
-CONFIG_TEST=y
-CONFIG_FEATURE_TEST_64=y
-CONFIG_TOUCH=y
-CONFIG_TR=y
-CONFIG_FEATURE_TR_CLASSES=y
-CONFIG_FEATURE_TR_EQUIV=y
-CONFIG_BASE64=y
-CONFIG_WHO=y
-CONFIG_USERS=y
-CONFIG_CAL=y
-CONFIG_CATV=y
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
-CONFIG_CHROOT=y
-CONFIG_CKSUM=y
-CONFIG_COMM=y
-CONFIG_CP=y
-CONFIG_FEATURE_CP_LONG_OPTIONS=y
-CONFIG_CUT=y
-CONFIG_DD=y
-CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
-CONFIG_FEATURE_DD_IBS_OBS=y
-CONFIG_DF=y
-CONFIG_FEATURE_DF_FANCY=y
-CONFIG_DIRNAME=y
-CONFIG_DOS2UNIX=y
-CONFIG_UNIX2DOS=y
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-CONFIG_FEATURE_ENV_LONG_OPTIONS=y
-CONFIG_EXPAND=y
-CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y
-CONFIG_EXPR=y
-CONFIG_EXPR_MATH_SUPPORT_64=y
-CONFIG_FALSE=y
-CONFIG_FOLD=y
-CONFIG_FSYNC=y
-CONFIG_HEAD=y
-CONFIG_FEATURE_FANCY_HEAD=y
-CONFIG_HOSTID=y
-CONFIG_INSTALL=y
-CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
-CONFIG_LN=y
-CONFIG_LOGNAME=y
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-CONFIG_FEATURE_LS_COLOR=y
-CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_FEATURE_MV_LONG_OPTIONS=y
-CONFIG_NICE=y
-CONFIG_NOHUP=y
-CONFIG_OD=y
-CONFIG_PRINTENV=y
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-CONFIG_REALPATH=y
-CONFIG_RM=y
-CONFIG_RMDIR=y
-# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
-CONFIG_SEQ=y
-CONFIG_SHA1SUM=y
-# CONFIG_SHA256SUM is not set
-# CONFIG_SHA512SUM is not set
-CONFIG_SLEEP=y
-CONFIG_FEATURE_FANCY_SLEEP=y
-# CONFIG_FEATURE_FLOAT_SLEEP is not set
-CONFIG_SORT=y
-CONFIG_FEATURE_SORT_BIG=y
-CONFIG_SPLIT=y
-CONFIG_FEATURE_SPLIT_FANCY=y
-CONFIG_STAT=y
-CONFIG_FEATURE_STAT_FORMAT=y
-CONFIG_STTY=y
-CONFIG_SUM=y
-CONFIG_SYNC=y
-CONFIG_TAC=y
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TEE=y
-CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
-CONFIG_TRUE=y
-CONFIG_TTY=y
-CONFIG_UNAME=y
-CONFIG_UNEXPAND=y
-CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y
-CONFIG_UNIQ=y
-CONFIG_USLEEP=y
-CONFIG_UUDECODE=y
-CONFIG_UUENCODE=y
-CONFIG_WC=y
-CONFIG_FEATURE_WC_LARGE=y
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-CONFIG_FEATURE_PRESERVE_HARDLINKS=y
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum, sha256sum, sha512sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-CONFIG_CHVT=y
-CONFIG_FGCONSOLE=y
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-CONFIG_DUMPKMAP=y
-CONFIG_KBD_MODE=y
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-CONFIG_RESIZE=y
-CONFIG_FEATURE_RESIZE_PRINT=y
-CONFIG_SETCONSOLE=y
-CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
-# CONFIG_SETFONT is not set
-# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
-CONFIG_DEFAULT_SETFONT_DIR=""
-CONFIG_SETKEYCODES=y
-CONFIG_SETLOGCONS=y
-# CONFIG_SHOWKEY is not set
-
-#
-# Common options for loadfont and setfont
-#
-CONFIG_FEATURE_LOADFONT_PSF2=y
-CONFIG_FEATURE_LOADFONT_RAW=y
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-CONFIG_PIPE_PROGRESS=y
-CONFIG_RUN_PARTS=y
-CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
-CONFIG_FEATURE_RUN_PARTS_FANCY=y
-CONFIG_START_STOP_DAEMON=y
-CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
-CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
-CONFIG_WHICH=y
-
-#
-# Editors
-#
-CONFIG_PATCH=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_MAX_LEN=4096
-# CONFIG_FEATURE_VI_8BIT is not set
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-CONFIG_AWK=y
-# CONFIG_FEATURE_AWK_LIBM is not set
-CONFIG_CMP=y
-CONFIG_DIFF=y
-CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
-CONFIG_FEATURE_DIFF_DIR=y
-CONFIG_ED=y
-CONFIG_SED=y
-CONFIG_FEATURE_ALLOW_EXEC=y
-
-#
-# Finding Utilities
-#
-CONFIG_FIND=y
-CONFIG_FEATURE_FIND_PRINT0=y
-CONFIG_FEATURE_FIND_MTIME=y
-CONFIG_FEATURE_FIND_MMIN=y
-CONFIG_FEATURE_FIND_PERM=y
-CONFIG_FEATURE_FIND_TYPE=y
-CONFIG_FEATURE_FIND_XDEV=y
-CONFIG_FEATURE_FIND_MAXDEPTH=y
-CONFIG_FEATURE_FIND_NEWER=y
-CONFIG_FEATURE_FIND_INUM=y
-CONFIG_FEATURE_FIND_EXEC=y
-CONFIG_FEATURE_FIND_USER=y
-CONFIG_FEATURE_FIND_GROUP=y
-CONFIG_FEATURE_FIND_NOT=y
-CONFIG_FEATURE_FIND_DEPTH=y
-CONFIG_FEATURE_FIND_PAREN=y
-CONFIG_FEATURE_FIND_SIZE=y
-CONFIG_FEATURE_FIND_PRUNE=y
-CONFIG_FEATURE_FIND_DELETE=y
-CONFIG_FEATURE_FIND_PATH=y
-CONFIG_FEATURE_FIND_REGEX=y
-# CONFIG_FEATURE_FIND_CONTEXT is not set
-CONFIG_FEATURE_FIND_LINKS=y
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-CONFIG_FEATURE_GREP_CONTEXT=y
-CONFIG_XARGS=y
-CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
-CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
-CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
-CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
-
-#
-# Init Utilities
-#
-CONFIG_BOOTCHARTD=y
-CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER=y
-CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y
-CONFIG_HALT=y
-# CONFIG_FEATURE_CALL_TELINIT is not set
-CONFIG_TELINIT_PATH=""
-CONFIG_INIT=y
-CONFIG_FEATURE_USE_INITTAB=y
-CONFIG_FEATURE_KILL_REMOVED=y
-CONFIG_FEATURE_KILL_DELAY=0
-CONFIG_FEATURE_INIT_SCTTY=y
-# CONFIG_FEATURE_INIT_SYSLOG is not set
-CONFIG_FEATURE_EXTRA_QUIET=y
-CONFIG_FEATURE_INIT_COREDUMPS=y
-CONFIG_FEATURE_INITRD=y
-CONFIG_INIT_TERMINAL_TYPE="linux"
-CONFIG_MESG=y
-CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
-
-#
-# Login/Password Management Utilities
-#
-# CONFIG_ADD_SHELL is not set
-# CONFIG_REMOVE_SHELL is not set
-CONFIG_FEATURE_SHADOWPASSWDS=y
-CONFIG_USE_BB_PWD_GRP=y
-CONFIG_USE_BB_SHADOW=y
-CONFIG_USE_BB_CRYPT=y
-# CONFIG_USE_BB_CRYPT_SHA is not set
-CONFIG_ADDUSER=y
-# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
-# CONFIG_FEATURE_CHECK_NAMES is not set
-CONFIG_FIRST_SYSTEM_ID=100
-CONFIG_LAST_SYSTEM_ID=999
-CONFIG_ADDGROUP=y
-CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y
-CONFIG_FEATURE_ADDUSER_TO_GROUP=y
-CONFIG_DELUSER=y
-CONFIG_DELGROUP=y
-CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
-CONFIG_GETTY=y
-CONFIG_LOGIN=y
-# CONFIG_PAM is not set
-CONFIG_LOGIN_SCRIPTS=y
-CONFIG_FEATURE_NOLOGIN=y
-CONFIG_FEATURE_SECURETTY=y
-CONFIG_PASSWD=y
-CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
-CONFIG_CRYPTPW=y
-CONFIG_CHPASSWD=y
-CONFIG_SU=y
-CONFIG_FEATURE_SU_SYSLOG=y
-CONFIG_FEATURE_SU_CHECKS_SHELLS=y
-CONFIG_SULOGIN=y
-CONFIG_VLOCK=y
-
-#
-# Linux Ext2 FS Progs
-#
-CONFIG_CHATTR=y
-CONFIG_FSCK=y
-CONFIG_LSATTR=y
-# CONFIG_TUNE2FS is not set
-
-#
-# Linux Module Utilities
-#
-CONFIG_MODINFO=y
-# CONFIG_MODPROBE_SMALL is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
-CONFIG_INSMOD=y
-CONFIG_RMMOD=y
-CONFIG_LSMOD=y
-CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
-CONFIG_MODPROBE=y
-# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-# CONFIG_DEPMOD is not set
-
-#
-# Options common to multiple modutils
-#
-CONFIG_FEATURE_2_4_MODULES=y
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
-CONFIG_FEATURE_INSMOD_VERSION_CHECKING=y
-CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y
-CONFIG_FEATURE_INSMOD_LOADINKMEM=y
-CONFIG_FEATURE_INSMOD_LOAD_MAP=y
-CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-CONFIG_FEATURE_MODUTILS_ALIAS=y
-CONFIG_FEATURE_MODUTILS_SYMBOLS=y
-CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
-CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
-
-#
-# Linux System Utilities
-#
-CONFIG_BLOCKDEV=y
-CONFIG_REV=y
-# CONFIG_ACPID is not set
-# CONFIG_FEATURE_ACPID_COMPAT is not set
-# CONFIG_BLKID is not set
-# CONFIG_FEATURE_BLKID_TYPE is not set
-CONFIG_DMESG=y
-CONFIG_FEATURE_DMESG_PRETTY=y
-CONFIG_FBSET=y
-CONFIG_FEATURE_FBSET_FANCY=y
-CONFIG_FEATURE_FBSET_READMODE=y
-CONFIG_FDFLUSH=y
-CONFIG_FDFORMAT=y
-CONFIG_FDISK=y
-# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
-CONFIG_FEATURE_FDISK_WRITABLE=y
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_GPT_LABEL is not set
-CONFIG_FEATURE_FDISK_ADVANCED=y
-# CONFIG_FINDFS is not set
-CONFIG_FLOCK=y
-CONFIG_FREERAMDISK=y
-CONFIG_FSCK_MINIX=y
-CONFIG_MKFS_EXT2=y
-CONFIG_MKFS_MINIX=y
-CONFIG_FEATURE_MINIX2=y
-# CONFIG_MKFS_REISER is not set
-# CONFIG_MKFS_VFAT is not set
-CONFIG_GETOPT=y
-CONFIG_FEATURE_GETOPT_LONG=y
-CONFIG_HEXDUMP=y
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
-# CONFIG_HD is not set
-CONFIG_HWCLOCK=y
-CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
-CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
-CONFIG_IPCRM=y
-CONFIG_IPCS=y
-CONFIG_LOSETUP=y
-CONFIG_LSPCI=y
-CONFIG_LSUSB=y
-CONFIG_MDEV=y
-CONFIG_FEATURE_MDEV_CONF=y
-# CONFIG_FEATURE_MDEV_RENAME is not set
-# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
-CONFIG_FEATURE_MDEV_EXEC=y
-CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
-CONFIG_MKSWAP=y
-CONFIG_FEATURE_MKSWAP_UUID=y
-CONFIG_MORE=y
-CONFIG_MOUNT=y
-# CONFIG_FEATURE_MOUNT_FAKE is not set
-# CONFIG_FEATURE_MOUNT_VERBOSE is not set
-# CONFIG_FEATURE_MOUNT_HELPERS is not set
-CONFIG_FEATURE_MOUNT_LABEL=y
-CONFIG_FEATURE_MOUNT_NFS=y
-CONFIG_FEATURE_MOUNT_CIFS=y
-CONFIG_FEATURE_MOUNT_FLAGS=y
-CONFIG_FEATURE_MOUNT_FSTAB=y
-CONFIG_PIVOT_ROOT=y
-CONFIG_RDATE=y
-# CONFIG_RDEV is not set
-CONFIG_READPROFILE=y
-# CONFIG_RTCWAKE is not set
-# CONFIG_SCRIPT is not set
-CONFIG_SCRIPTREPLAY=y
-CONFIG_SETARCH=y
-CONFIG_SWAPONOFF=y
-# CONFIG_FEATURE_SWAPON_PRI is not set
-CONFIG_SWITCH_ROOT=y
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_UMOUNT_ALL=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-CONFIG_VOLUMEID=y
-
-#
-# Filesystem/Volume identification
-#
-CONFIG_FEATURE_VOLUMEID_EXT=y
-CONFIG_FEATURE_VOLUMEID_BTRFS=y
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_CONSPY is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-CONFIG_FEATURE_LESS_MARKS=y
-CONFIG_FEATURE_LESS_REGEXP=y
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
-# CONFIG_NANDWRITE is not set
-# CONFIG_NANDDUMP is not set
-CONFIG_SETSERIAL=y
-CONFIG_UBIATTACH=y
-CONFIG_UBIDETACH=y
-CONFIG_UBIMKVOL=y
-CONFIG_UBIRMVOL=y
-CONFIG_UBIRSVOL=y
-CONFIG_UBIUPDATEVOL=y
-CONFIG_ADJTIMEX=y
-# CONFIG_BBCONFIG is not set
-# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
-CONFIG_BEEP=y
-CONFIG_FEATURE_BEEP_FREQ=4000
-CONFIG_FEATURE_BEEP_LENGTH_MS=30
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
-# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
-# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
-# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
-# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
-CONFIG_CHRT=y
-CONFIG_CROND=y
-# CONFIG_FEATURE_CROND_D is not set
-CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
-CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
-CONFIG_CRONTAB=y
-CONFIG_DC=y
-# CONFIG_FEATURE_DC_LIBM is not set
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_FEATURE_DEVFS is not set
-# CONFIG_DEVMEM is not set
-CONFIG_EJECT=y
-# CONFIG_FEATURE_EJECT_SCSI is not set
-# CONFIG_FBSPLASH is not set
-# CONFIG_FLASHCP is not set
-# CONFIG_FLASH_LOCK is not set
-# CONFIG_FLASH_UNLOCK is not set
-# CONFIG_FLASH_ERASEALL is not set
-# CONFIG_IONICE is not set
-# CONFIG_INOTIFYD is not set
-CONFIG_LAST=y
-CONFIG_FEATURE_LAST_SMALL=y
-# CONFIG_FEATURE_LAST_FANCY is not set
-CONFIG_HDPARM=y
-CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
-CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
-CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y
-CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y
-CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y
-CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
-CONFIG_MAKEDEVS=y
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-CONFIG_FEATURE_MAKEDEVS_TABLE=y
-# CONFIG_MAN is not set
-CONFIG_MICROCOM=y
-CONFIG_MOUNTPOINT=y
-CONFIG_MT=y
-CONFIG_RAIDAUTORUN=y
-CONFIG_READAHEAD=y
-# CONFIG_RFKILL is not set
-CONFIG_RUNLEVEL=y
-CONFIG_RX=y
-CONFIG_SETSID=y
-CONFIG_STRINGS=y
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
-CONFIG_TIME=y
-# CONFIG_TIMEOUT is not set
-CONFIG_TTYSIZE=y
-CONFIG_VOLNAME=y
-CONFIG_WALL=y
-CONFIG_WATCHDOG=y
-
-#
-# Networking Utilities
-#
-CONFIG_NAMEIF=y
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
-CONFIG_NBDCLIENT=y
-CONFIG_NC=y
-CONFIG_NC_SERVER=y
-CONFIG_NC_EXTRA=y
-# CONFIG_NC_110_COMPAT is not set
-CONFIG_PING=y
-CONFIG_PING6=y
-CONFIG_FEATURE_FANCY_PING=y
-CONFIG_WHOIS=y
-CONFIG_FEATURE_IPV6=y
-# CONFIG_FEATURE_UNIX_LOCAL is not set
-CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
-# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
-CONFIG_ARP=y
-CONFIG_ARPING=y
-CONFIG_BRCTL=y
-# CONFIG_FEATURE_BRCTL_FANCY is not set
-# CONFIG_FEATURE_BRCTL_SHOW is not set
-CONFIG_DNSD=y
-# CONFIG_ETHER_WAKE is not set
-CONFIG_FAKEIDENTD=y
-# CONFIG_FTPD is not set
-# CONFIG_FEATURE_FTP_WRITE is not set
-# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
-CONFIG_FTPGET=y
-CONFIG_FTPPUT=y
-CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
-CONFIG_HOSTNAME=y
-CONFIG_HTTPD=y
-CONFIG_FEATURE_HTTPD_RANGES=y
-CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
-CONFIG_FEATURE_HTTPD_SETUID=y
-CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
-CONFIG_FEATURE_HTTPD_AUTH_MD5=y
-CONFIG_FEATURE_HTTPD_CGI=y
-CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
-CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
-CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
-CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
-CONFIG_FEATURE_HTTPD_PROXY=y
-CONFIG_FEATURE_HTTPD_GZIP=y
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-CONFIG_FEATURE_IFCONFIG_SLIP=y
-CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
-CONFIG_FEATURE_IFCONFIG_HW=y
-CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
-CONFIG_IFENSLAVE=y
-CONFIG_IFPLUGD=y
-CONFIG_IFUPDOWN=y
-CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
-CONFIG_FEATURE_IFUPDOWN_IP=y
-CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
-# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
-CONFIG_FEATURE_IFUPDOWN_IPV4=y
-CONFIG_FEATURE_IFUPDOWN_IPV6=y
-CONFIG_FEATURE_IFUPDOWN_MAPPING=y
-# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
-CONFIG_INETD=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
-# CONFIG_FEATURE_INETD_RPC is not set
-CONFIG_IP=y
-CONFIG_FEATURE_IP_ADDRESS=y
-CONFIG_FEATURE_IP_LINK=y
-CONFIG_FEATURE_IP_ROUTE=y
-CONFIG_FEATURE_IP_TUNNEL=y
-CONFIG_FEATURE_IP_RULE=y
-CONFIG_FEATURE_IP_SHORT_FORMS=y
-# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
-CONFIG_IPADDR=y
-CONFIG_IPLINK=y
-CONFIG_IPROUTE=y
-CONFIG_IPTUNNEL=y
-CONFIG_IPRULE=y
-CONFIG_IPCALC=y
-CONFIG_FEATURE_IPCALC_FANCY=y
-CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
-CONFIG_NETSTAT=y
-CONFIG_FEATURE_NETSTAT_WIDE=y
-# CONFIG_FEATURE_NETSTAT_PRG is not set
-CONFIG_NSLOOKUP=y
-CONFIG_NTPD=y
-CONFIG_FEATURE_NTPD_SERVER=y
-CONFIG_PSCAN=y
-CONFIG_ROUTE=y
-CONFIG_SLATTACH=y
-CONFIG_TCPSVD=y
-CONFIG_TELNET=y
-CONFIG_FEATURE_TELNET_TTYPE=y
-CONFIG_FEATURE_TELNET_AUTOLOGIN=y
-CONFIG_TELNETD=y
-CONFIG_FEATURE_TELNETD_STANDALONE=y
-CONFIG_FEATURE_TELNETD_INETD_WAIT=y
-CONFIG_TFTP=y
-# CONFIG_TFTPD is not set
-
-#
-# Common options for tftp/tftpd
-#
-CONFIG_FEATURE_TFTP_GET=y
-CONFIG_FEATURE_TFTP_PUT=y
-CONFIG_FEATURE_TFTP_BLOCKSIZE=y
-CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
-# CONFIG_TFTP_DEBUG is not set
-CONFIG_TRACEROUTE=y
-CONFIG_TRACEROUTE6=y
-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-# CONFIG_TUNCTL is not set
-# CONFIG_FEATURE_TUNCTL_UG is not set
-CONFIG_UDHCPD=y
-CONFIG_DHCPRELAY=y
-CONFIG_DUMPLEASES=y
-CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
-# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
-CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
-CONFIG_UDHCPC=y
-CONFIG_FEATURE_UDHCPC_ARPING=y
-# CONFIG_FEATURE_UDHCP_PORT is not set
-CONFIG_UDHCP_DEBUG=9
-# CONFIG_FEATURE_UDHCP_RFC3397 is not set
-CONFIG_FEATURE_UDHCP_8021Q=y
-CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
-CONFIG_UDPSVD=y
-CONFIG_VCONFIG=y
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-CONFIG_FEATURE_WGET_TIMEOUT=y
-CONFIG_ZCIP=y
-
-#
-# Print Utilities
-#
-# CONFIG_LPD is not set
-# CONFIG_LPR is not set
-# CONFIG_LPQ is not set
-
-#
-# Mail Utilities
-#
-# CONFIG_MAKEMIME is not set
-CONFIG_FEATURE_MIME_CHARSET=""
-# CONFIG_POPMAILDIR is not set
-# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
-# CONFIG_REFORMIME is not set
-# CONFIG_FEATURE_REFORMIME_COMPAT is not set
-# CONFIG_SENDMAIL is not set
-
-#
-# Process Utilities
-#
-CONFIG_IOSTAT=y
-CONFIG_MPSTAT=y
-CONFIG_NMETER=y
-CONFIG_PMAP=y
-CONFIG_POWERTOP=y
-CONFIG_PSTREE=y
-CONFIG_PWDX=y
-CONFIG_SMEMCAP=y
-CONFIG_UPTIME=y
-CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y
-CONFIG_FREE=y
-CONFIG_FUSER=y
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-CONFIG_KILLALL5=y
-CONFIG_PGREP=y
-CONFIG_PIDOF=y
-CONFIG_FEATURE_PIDOF_SINGLE=y
-CONFIG_FEATURE_PIDOF_OMIT=y
-CONFIG_PKILL=y
-CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
-# CONFIG_FEATURE_PS_TIME is not set
-# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
-# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
-CONFIG_RENICE=y
-CONFIG_BB_SYSCTL=y
-CONFIG_TOP=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
-# CONFIG_FEATURE_TOP_SMP_CPU is not set
-# CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-CONFIG_FEATURE_TOPMEM=y
-CONFIG_FEATURE_SHOW_THREADS=y
-CONFIG_WATCH=y
-
-#
-# Runit Utilities
-#
-CONFIG_RUNSV=y
-CONFIG_RUNSVDIR=y
-# CONFIG_FEATURE_RUNSVDIR_LOG is not set
-CONFIG_SV=y
-CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service"
-CONFIG_SVLOGD=y
-CONFIG_CHPST=y
-CONFIG_SETUIDGID=y
-CONFIG_ENVUIDGID=y
-CONFIG_ENVDIR=y
-CONFIG_SOFTLIMIT=y
-# CONFIG_CHCON is not set
-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
-# CONFIG_GETENFORCE is not set
-# CONFIG_GETSEBOOL is not set
-# CONFIG_LOAD_POLICY is not set
-# CONFIG_MATCHPATHCON is not set
-# CONFIG_RESTORECON is not set
-# CONFIG_RUNCON is not set
-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
-# CONFIG_SELINUXENABLED is not set
-# CONFIG_SETENFORCE is not set
-# CONFIG_SETFILES is not set
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
-# CONFIG_SETSEBOOL is not set
-# CONFIG_SESTATUS is not set
-
-#
-# Shells
-#
-CONFIG_ASH=y
-CONFIG_ASH_BASH_COMPAT=y
-# CONFIG_ASH_IDLE_TIMEOUT is not set
-CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_ALIAS is not set
-# CONFIG_ASH_GETOPTS is not set
-CONFIG_ASH_BUILTIN_ECHO=y
-CONFIG_ASH_BUILTIN_PRINTF=y
-CONFIG_ASH_BUILTIN_TEST=y
-CONFIG_ASH_CMDCMD=y
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-CONFIG_ASH_RANDOM_SUPPORT=y
-# CONFIG_ASH_EXPAND_PRMT is not set
-# CONFIG_CTTYHACK is not set
-# CONFIG_HUSH is not set
-# CONFIG_HUSH_BASH_COMPAT is not set
-# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_HELP is not set
-# CONFIG_HUSH_INTERACTIVE is not set
-# CONFIG_HUSH_SAVEHISTORY is not set
-# CONFIG_HUSH_JOB is not set
-# CONFIG_HUSH_TICK is not set
-# CONFIG_HUSH_IF is not set
-# CONFIG_HUSH_LOOPS is not set
-# CONFIG_HUSH_CASE is not set
-# CONFIG_HUSH_FUNCTIONS is not set
-# CONFIG_HUSH_LOCAL is not set
-# CONFIG_HUSH_RANDOM_SUPPORT is not set
-# CONFIG_HUSH_EXPORT_N is not set
-# CONFIG_HUSH_MODE_X is not set
-# CONFIG_MSH is not set
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-# CONFIG_FEATURE_BASH_IS_ASH is not set
-# CONFIG_FEATURE_BASH_IS_HUSH is not set
-CONFIG_FEATURE_BASH_IS_NONE=y
-CONFIG_SH_MATH_SUPPORT=y
-# CONFIG_SH_MATH_SUPPORT_64 is not set
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE is not set
-# CONFIG_FEATURE_SH_NOFORK is not set
-CONFIG_FEATURE_SH_HISTFILESIZE=y
-
-#
-# System Logging Utilities
-#
-CONFIG_SYSLOGD=y
-CONFIG_FEATURE_ROTATE_LOGFILE=y
-CONFIG_FEATURE_REMOTE_LOG=y
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
-CONFIG_FEATURE_SYSLOGD_CFG=y
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
-CONFIG_FEATURE_IPC_SYSLOG=y
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
-CONFIG_LOGREAD=y
-CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
-CONFIG_KLOGD=y
-CONFIG_FEATURE_KLOGD_KLOGCTL=y
-CONFIG_LOGGER=y
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/dropbear.conf b/openQRM-5.3.50-CE/src/etc/build.conf/dropbear.conf
deleted file mode 100644
index 7866604..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/dropbear.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# Below the download locations for third-party components are defined
-# dropbear
-# -> we compile our own dropbear static binary 
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="2012.55"
-#OPENQRM_SOURCE_DOWNLOAD="http://matt.ucc.asn.au/dropbear/releases/dropbear-$OPENQRM_SOURCE_VERSION.tar.gz"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/base/dropbear-$OPENQRM_SOURCE_VERSION.tar.gz"
-OPENQRM_SOURCE_BINARY_RESULT="dropbear-$OPENQRM_SOURCE_VERSION/dropbear"
-
-
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/htmlobjects.conf b/openQRM-5.3.50-CE/src/etc/build.conf/htmlobjects.conf
deleted file mode 100644
index e8eaa81..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/htmlobjects.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# this is the config file for the htmlobjects
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_BASE_VERSION="1.1"
-OPENQRM_SOURCE_VERSION="v1.1_r193"
-#OPENQRM_SOURCE_DOWNLOAD="http://downloads.sourceforge.net/project/htmlobjects/htmlobjects/v.$OPENQRM_BASE_VERSION/htmlobjects_$OPENQRM_SOURCE_VERSION.tar.gz"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/base/htmlobjects_$OPENQRM_SOURCE_VERSION.tar.gz"
-#OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/base/htmlobjects_v1.1_r193.tar.gz"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/initrd-devices.conf b/openQRM-5.3.50-CE/src/etc/build.conf/initrd-devices.conf
deleted file mode 100644
index cfceeda..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/initrd-devices.conf
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#<name>				<type>		<mode>		<uid>		<gid>		<major>		<minor>		<start>		<inc>		<count>
-# common devices
-/dev				d		755		0		0		-		-		-		-		-
-#/dev/console			c		666		0		0		5		1		-		-		-
-/dev/null			c		666		0		0		1		3		0		0		-
-/dev/zero			c		666		0		0		1		5		0		0		-
-/dev/mem			c		666 		0		0		1		1		-		-		-
-/dev/ram			b		660		0		0		1		1		1		1		4
-/dev/tty			c		660 		0		0		4		0		0		1		10
-/dev/root 			b 		660		0		0		0		255		0		0		-
-/dev/nfs 			b 		660		0		0		0		255		0		0		-
-/dev/psaux			c		666		0		0		10		1		0		0		-
-/dev/loop 			b 		660		0		0		7		0		0		1		6
-# special devices (cciss)
-/dev/cciss			d		755		0		0		-		-		-		-		-
-/dev/cciss/c0d0			b		644		0		0		104		0		0		0		-
-/dev/cciss/c0d0p		b		644		0		0		104		1		1		1		15
-/dev/cciss/c0d1			b		644		0		0		104		16		0		0		-
-/dev/cciss/c0d1p		b		644		0		0		104		17		1		1		15
-/dev/cciss/c0d2			b		644		0		0		104		32		0		0		-
-/dev/cciss/c0d2p		b		644		0		0		104		33		1		1		15
-/dev/cciss/c0d3			b		644		0		0		104		48		0		0		-
-/dev/cciss/c0d3p		b		644		0		0		104		49		1		1		15
-/dev/cciss/c1d0			b		644		0		0		105		0		0		0		-
-/dev/cciss/c1d0p		b		644		0		0		105		1		1		1		15
-/dev/cciss/c1d1			b		644		0		0		105		16		0		0		-
-/dev/cciss/c1d1p		b		644		0		0		105		17		1		1		15
-/dev/cciss/c1d2			b		644		0		0		105		32		0		0		-
-/dev/cciss/c1d2p		b		644		0		0		105		33		1		1		15
-/dev/cciss/c1d3			b		644		0		0		105		48		0		0		-
-/dev/cciss/c1d3p		b		644		0		0		105		49		1		1		15
-# ide disks
-/dev/hda			b		640		0		0		3		0		0		0		-
-/dev/hda			b		640		0		0		3		1		1		1		24
-/dev/hdb			b		640		0		0		3		64		0		0		-
-/dev/hdb			b		640		0		0		3		65		1		1		24
-/dev/hdc			b		640		0		0		22		0		0		0		-
-/dev/hdc			b		640		0		0		22		1		1		1		24
-/dev/hdd			b		640		0		0		22		64		0		0		-
-/dev/hdd			b		640		0		0		22		65		1		1		24
-/dev/hde			b		640		0		0		33		0		0		0		-
-/dev/hde			b		640		0		0		33		1		1		1		24
-/dev/hdf			b		640		0		0		33		64		0		0		-
-/dev/hdf			b		640		0		0		33		65		1		1		24
-/dev/hdg			b		640		0		0		34		0		0		0		-
-/dev/hdg			b		640		0		0		34		1		1		1		24
-/dev/hdh			b		640		0		0		34		64		0		0		-
-/dev/hdh			b		640		0		0		34		65		1		1		24
-# scsi disks
-/dev/sda			b		660		0		0		8		0		0		1		-
-/dev/sda			b		660		0		0		8		1		1		1		15
-/dev/sdb			b		660		0		0		8		16		0		1		-
-/dev/sdb			b		660		0		0		8		17		1		1		15
-/dev/sdc			b		660		0		0		8		32		0		1		-
-/dev/sdc			b		660		0		0		8		33		1		1		15
-/dev/sdd			b		660		0		0		8		48		0		1		-
-/dev/sdd			b		660		0		0		8		49		1		1		15
-/dev/sde			b		660		0		0		8		64		0		1		-
-/dev/sde			b		660		0		0		8		65		1		1		15
-/dev/sdf			b		660		0		0		8		80		0		1		-
-/dev/sdf			b		660		0		0		8		81		1		1		15
-/dev/sdg			b		660		0		0		8		96		0		1		-
-/dev/sdg			b		660		0		0		8		97		1		1		15
-/dev/sdh			b		660		0		0		8		112		0		1		-
-/dev/sdh			b		660		0		0		8		113		1		1		15
-/dev/sdi			b		660		0		0		8		128		0		1		-
-/dev/sdi			b		660		0		0		8		129		1		1		15
-/dev/sdj			b		660		0		0		8		144		0		1		-
-/dev/sdj			b		660		0		0		8		145		1		1		15
-/dev/sdk			b		660		0		0		8		160		0		1		-
-/dev/sdk			b		660		0		0		8		161		1		1		15
-/dev/sdl			b		660		0		0		8		176		0		1		-
-/dev/sdl			b		660		0		0		8		177		1		1		15
-/dev/sdm			b		660		0		0		8		192		0		1		-
-/dev/sdm			b		660		0		0		8		193		1		1		15
-/dev/sdn			b		660		0		0		8		208		0		1		-
-/dev/sdn			b		660		0		0		8		209		1		1		15
-/dev/sdo			b		660		0		0		8		224		0		1		-
-/dev/sdo			b		660		0		0		8		225		1		1		15
-/dev/sdp			b		660		0		0		8		240		0		1		-
-/dev/sdp			b		660		0		0		8		241		1		1		15
-/dev/sdq			b		660		0		0		65		0		0		1		-
-/dev/sdq			b		660		0		0		65		1		1		1		15
-/dev/sdr			b		660		0		0		65		16		0		1		-
-/dev/sdr			b		660		0		0		65		17		1		1		15
-/dev/sds			b		660		0		0		65		32		0		1		-
-/dev/sds			b		660		0		0		65		33		1		1		15
-/dev/sdt			b		660		0		0		65		48		0		1		-
-/dev/sdt			b		660		0		0		65		49		1		1		15
-/dev/sdu			b		660		0		0		65		64		0		1		-
-/dev/sdu			b		660		0		0		65		65		1		1		15
-/dev/sdv			b		660		0		0		65		80		0		1		-
-/dev/sdv			b		660		0		0		65		81		1		1		15
-/dev/sdw			b		660		0		0		65		96		0		1		-
-/dev/sdw			b		660		0		0		65		97		1		1		15
-/dev/sdx			b		660		0		0		65		112		0		1		-
-/dev/sdx			b		660		0		0		65		113		1		1		15
-/dev/sdy			b		660		0		0		65		128		0		1		-
-/dev/sdy			b		660		0		0		65		129		1		1		15
-/dev/sdz			b		660		0		0		65		144		0		1		-
-/dev/sdz			b		660		0		0		65		145		1		1		15
-/dev/sdaa			b		660		0		0		65		160		0		1		-
-/dev/sdaa			b		660		0		0		65		161		1		1		15
-/dev/sdab			b		660		0		0		65		176		0		1		-
-/dev/sdab			b		660		0		0		65		177		1		1		15
-/dev/sdac			b		660		0		0		65		192		0		1		-
-/dev/sdac			b		660		0		0		65		193		1		1		15
-/dev/sdad			b		660		0		0		65		208		0		1		-
-/dev/sdad			b		660		0		0		65		209		1		1		15
-/dev/sdae			b		660		0		0		65		224		0		1		-
-/dev/sdae			b		660		0		0		65		225		1		1		15
-/dev/sdaf			b		660		0		0		65		240		0		1		-
-/dev/sdaf			b		660		0		0		65		241		1		1		15
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/jqclock.conf b/openQRM-5.3.50-CE/src/etc/build.conf/jqclock.conf
deleted file mode 100644
index fa5f2e2..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/jqclock.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# this is the config file for the jqClock plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="2.0.1"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/base/jqclock-$OPENQRM_SOURCE_VERSION.tgz"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/jquery.conf b/openQRM-5.3.50-CE/src/etc/build.conf/jquery.conf
deleted file mode 100644
index 526fe26..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/jquery.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# this is the config file for the jquery bundle
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="1.3.2"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/base/jquery-$OPENQRM_SOURCE_VERSION.tgz"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/js-interface.conf b/openQRM-5.3.50-CE/src/etc/build.conf/js-interface.conf
deleted file mode 100644
index 095bc6d..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/js-interface.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# this is the config file for the js interface
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="1.2"
-#OPENQRM_SOURCE_DOWNLOAD="http://interface.eyecon.ro/interface/interface_$OPENQRM_SOURCE_VERSION.zip"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/base/interface_$OPENQRM_SOURCE_VERSION.zip"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-client.centos.x86_64.conf b/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-client.centos.x86_64.conf
deleted file mode 100644
index 3cfd842..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-client.centos.x86_64.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# this is the config file for the centos x86_64 openqrm-client
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="5.3"
-OPENQRM_SOURCE_SUB_VERSION="5.3.0"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/$OPENQRM_SOURCE_VERSION/base/openqrm-client/openqrm-client.$OPENQRM_SOURCE_SUB_VERSION.centos.x86_64.tgz"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-client.debian.x86_64.conf b/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-client.debian.x86_64.conf
deleted file mode 100644
index 51769c8..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-client.debian.x86_64.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# this is the config file for the debian x86_64 openqrm-client
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="5.3"
-OPENQRM_SOURCE_SUB_VERSION="5.3.0"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/$OPENQRM_SOURCE_VERSION/base/openqrm-client/openqrm-client.$OPENQRM_SOURCE_SUB_VERSION.debian.x86_64.tgz"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-client.ubuntu.x86_64.conf b/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-client.ubuntu.x86_64.conf
deleted file mode 100644
index 1a12f0e..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-client.ubuntu.x86_64.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# this is the config file for the ubuntu x86_64 openqrm-client
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="5.3"
-OPENQRM_SOURCE_SUB_VERSION="5.3.0"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/$OPENQRM_SOURCE_VERSION/base/openqrm-client/openqrm-client.$OPENQRM_SOURCE_SUB_VERSION.ubuntu.x86_64.tgz"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-initrd-template.centos.x86_64.conf b/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-initrd-template.centos.x86_64.conf
deleted file mode 100644
index 09d610e..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-initrd-template.centos.x86_64.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# this is the config file for the centos x86_64 initrd template
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="5.3"
-OPENQRM_SOURCE_SUB_VERSION="5.3.1"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/$OPENQRM_SOURCE_VERSION/base/openqrm-initrd-templates/openqrm-initrd-template.$OPENQRM_SOURCE_SUB_VERSION.centos.x86_64.tgz"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-initrd-template.debian.x86_64.conf b/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-initrd-template.debian.x86_64.conf
deleted file mode 100644
index ae1cec6..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-initrd-template.debian.x86_64.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# this is the config file for the debian x86_64 initrd template
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="5.3"
-OPENQRM_SOURCE_SUB_VERSION="5.3.1"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/$OPENQRM_SOURCE_VERSION/base/openqrm-initrd-templates/openqrm-initrd-template.$OPENQRM_SOURCE_SUB_VERSION.debian.x86_64.tgz"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-initrd-template.ubuntu.x86_64.conf b/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-initrd-template.ubuntu.x86_64.conf
deleted file mode 100644
index 3b180c5..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/openqrm-initrd-template.ubuntu.x86_64.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# this is the config file for the ubuntu x86_64 initrd template
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="5.3"
-OPENQRM_SOURCE_SUB_VERSION="5.3.1"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/$OPENQRM_SOURCE_VERSION/base/openqrm-initrd-templates/openqrm-initrd-template.$OPENQRM_SOURCE_SUB_VERSION.ubuntu.x86_64.tgz"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/pciutils-pcimodules.patch b/openQRM-5.3.50-CE/src/etc/build.conf/pciutils-pcimodules.patch
deleted file mode 100644
index 79176dd..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/pciutils-pcimodules.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-diff -rupN pciutils-3.1.7/Makefile pciutils-3.1.7-pcimodules-patch/Makefile
---- pciutils-3.1.7/Makefile	2010-01-31 18:42:12.000000000 +0100
-+++ pciutils-3.1.7-pcimodules-patch/Makefile	2011-01-24 16:36:21.276060766 +0100
-@@ -52,7 +52,7 @@ PCIINC_INS=lib/config.h lib/header.h lib
- 
- export
- 
--all: lib/$(PCILIB) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS)
-+all: lib/$(PCILIB) lspci setpci pcimodules example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS)
- 
- lib/$(PCILIB): $(PCIINC) force
- 	$(MAKE) -C lib all
-@@ -62,6 +62,7 @@ force:
- lib/config.h lib/config.mk:
- 	cd lib && ./configure
- 
-+pcimodules: pcimodules.o common.o lib/$(PCILIB)
- lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB)
- setpci: setpci.o common.o lib/$(PCILIB)
- 
-@@ -74,6 +75,7 @@ ls-kernel.o: ls-kernel.c $(LSPCIINC)
- ls-tree.o: ls-tree.c $(LSPCIINC)
- ls-map.o: ls-map.c $(LSPCIINC)
- 
-+pcimodules.o: pcimodules.c pciutils.h $(PCIINC)
- setpci.o: setpci.c pciutils.h $(PCIINC)
- common.o: common.c pciutils.h $(PCIINC)
- 
-diff -rupN pciutils-3.1.7/pcimodules.c pciutils-3.1.7-pcimodules-patch/pcimodules.c
---- pciutils-3.1.7/pcimodules.c	1970-01-01 01:00:00.000000000 +0100
-+++ pciutils-3.1.7-pcimodules-patch/pcimodules.c	2011-01-24 16:34:02.607310722 +0100
-@@ -0,0 +1,185 @@
-+/*
-+ *	pcimodules:  Load all kernel modules for PCI device currently
-+ *      plugged into any PCI slot.
-+ *
-+ *	Copyright 2000 Yggdrasil Computing, Incorporated
-+ *	This file may be copied under the terms and conditions of version 
-+ *      two of the GNU General Public License, as published by the Free
-+ *      Software Foundation (Cambridge, Massachusetts, USA).
-+ *
-+ *      This file is based on pciutils/lib/example.c, which has the following
-+ *      authorship and copyright statement:
-+ *
-+ *		Written by Martin Mares and put to public domain. You can do
-+ *		with it anything you want, but I don't give you any warranty.
-+ */
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <malloc.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <sys/utsname.h>
-+#include <sys/param.h>
-+#include <sys/types.h>
-+
-+#define _GNU_SOURCE
-+#include <getopt.h>
-+
-+#include "pciutils.h"
-+
-+#define MODDIR	"/lib/modules"
-+#define PCIMAP	"modules.pcimap"
-+
-+#define LINELENGTH	8000 
-+
-+#define DEVICE_ANY	0xffffffff
-+#define VENDOR_ANY	0xffffffff
-+
-+#include "lib/pci.h"
-+
-+const char program_name[] = "pcimodules";
-+
-+struct pcimap_entry {
-+	unsigned int vendor, subsys_vendor, dev, subsys_dev, class, class_mask;
-+	char *module;
-+	struct pcimap_entry *next;
-+};
-+
-+static struct pcimap_entry *pcimap_list = NULL;
-+
-+#define OPT_STRING "h"
-+static struct option long_options[] = {
-+	{"class",	required_argument,	NULL, 'c'},
-+	{"classmask",	required_argument,	NULL, 'm'},
-+	{"help",	no_argument,		NULL, 'h'},
-+	{ 0,		0,			0, 	0}
-+};
-+
-+static unsigned long desired_class;
-+static unsigned long desired_classmask; /* Default is 0: accept all classes.*/
-+
-+void
-+read_pcimap(void)
-+{
-+	struct utsname utsname;
-+	char filename[MAXPATHLEN];
-+	FILE *pcimap_file;
-+	char line[LINELENGTH];
-+	struct pcimap_entry *entry;
-+	unsigned int driver_data;
-+	char *prevmodule = "";
-+	char module[LINELENGTH];
-+
-+	if (uname(&utsname) < 0) {
-+		perror("uname");
-+		exit(1);
-+	}
-+	sprintf(filename, "%s/%s/%s", MODDIR, utsname.release, PCIMAP);
-+	if ((pcimap_file = fopen(filename, "r")) == NULL) {
-+		perror(filename);
-+		exit(1);
-+	}
-+
-+	while(fgets(line, LINELENGTH, pcimap_file) != NULL) {
-+		if (line[0] == '#')
-+			continue;
-+
-+		entry = xmalloc(sizeof(struct pcimap_entry));
-+
-+		if (sscanf(line, "%s 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x",
-+			   module,
-+			   &entry->vendor, &entry->dev,
-+			   &entry->subsys_vendor, &entry->subsys_dev,
-+			   &entry->class, &entry->class_mask,
-+			   &driver_data) != 8) {
-+			fprintf (stderr,
-+				"modules.pcimap unparsable line: %s.\n", line);
-+			free(entry);
-+			continue;
-+		}
-+
-+		/* Optimize memory allocation a bit, in case someday we
-+		   have Linux systems with ~100,000 modules.  It also
-+		   allows us to just compare pointers to avoid trying
-+		   to load a module twice. */
-+		if (strcmp(module, prevmodule) != 0) {
-+			prevmodule = xmalloc(strlen(module)+1);
-+			strcpy(prevmodule, module);
-+		}
-+		entry->module = prevmodule;
-+		entry->next = pcimap_list;
-+		pcimap_list = entry;
-+	}
-+	fclose(pcimap_file);
-+}
-+
-+/* Return a filled in pci_access->dev tree, with the device classes
-+   stored in dev->aux.
-+*/
-+static void
-+match_pci_modules(void)
-+{
-+	struct pci_access *pacc;
-+	struct pci_dev *dev;
-+	unsigned int class, subsys_dev, subsys_vendor;
-+	struct pcimap_entry *map;
-+	const char *prevmodule = "";
-+
-+	pacc = pci_alloc();		/* Get the pci_access structure */
-+	/* Set all options you want -- here we stick with the defaults */
-+	pci_init(pacc);		/* Initialize the PCI library */
-+	pci_scan_bus(pacc);	/* We want to get the list of devices */
-+  	for(dev=pacc->devices; dev; dev=dev->next) {
-+		pci_fill_info(dev, PCI_FILL_IDENT | PCI_FILL_BASES);
-+		class = (pci_read_word(dev, PCI_CLASS_DEVICE) << 8)
-+			| pci_read_byte(dev, PCI_CLASS_PROG);
-+		subsys_dev = pci_read_word(dev, PCI_SUBSYSTEM_ID);
-+		subsys_vendor = pci_read_word(dev,PCI_SUBSYSTEM_VENDOR_ID);
-+		for(map = pcimap_list; map != NULL; map = map->next) {
-+			if (((map->class ^ class) & map->class_mask) == 0 &&
-+			    ((desired_class ^ class) & desired_classmask)==0 &&
-+			    (map->dev == DEVICE_ANY ||
-+			     map->dev == dev->device_id) &&
-+			    (map->vendor == VENDOR_ANY ||
-+			     map->vendor == dev->vendor_id) &&
-+			    (map->subsys_dev == DEVICE_ANY ||
-+			     map->subsys_dev == subsys_dev) &&
-+			    (map->subsys_vendor == VENDOR_ANY ||
-+			     map->subsys_vendor == subsys_vendor) &&
-+			    prevmodule != map->module) {
-+				printf("%s\n", map->module);
-+				prevmodule = map->module;
-+			}
-+		}
-+
-+	}
-+	pci_cleanup(pacc);
-+}
-+
-+int
-+main (int argc, char **argv)
-+{
-+	int opt_index = 0;
-+	int opt;
-+
-+	while ((opt = getopt_long(argc, argv, OPT_STRING, long_options,
-+		           &opt_index)) != -1) {
-+		switch(opt) {
-+			case 'c':
-+				desired_class = strtol(optarg, NULL, 0);
-+				break;
-+			case 'm':
-+				desired_classmask = strtol(optarg, NULL, 0);
-+				break;
-+			case 'h':
-+				printf ("Usage: pcimodules [--help]\n"
-+					"  Lists kernel modules corresponding to PCI devices currently plugged"
-+					"  into the computer.\n");
-+		}
-+	}	
-+
-+	read_pcimap();
-+	match_pci_modules();
-+	return 0;
-+}
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/pciutils.conf b/openQRM-5.3.50-CE/src/etc/build.conf/pciutils.conf
deleted file mode 100644
index 44a1995..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/pciutils.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# Below the download locations for third-party components are defined
-# pciutils
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="3.1.7"
-#OPENQRM_SOURCE_DOWNLOAD="http://www.kernel.org/pub/software/utils/pciutils/pciutils-$OPENQRM_SOURCE_VERSION.tar.gz"
-#OPENQRM_SOURCE_DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/pciutils/pciutils-3.1.7.tar.gz/f3e349d22a3714b4272b171649ad5235/pciutils-$OPENQRM_SOURCE_VERSION.tar.gz"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/base/pciutils-$OPENQRM_SOURCE_VERSION.tar.gz"
-OPENQRM_SOURCE_BINARY_RESULT="pciutils-$OPENQRM_SOURCE_VERSION/pcimodules"
-
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/phplib.conf b/openQRM-5.3.50-CE/src/etc/build.conf/phplib.conf
deleted file mode 100644
index 3d0efe5..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/phplib.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# this is the config file for the phplib class
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION=""
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/base/phplib.tgz"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/treemenuicons.conf b/openQRM-5.3.50-CE/src/etc/build.conf/treemenuicons.conf
deleted file mode 100644
index 08e373f..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/treemenuicons.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# this is the config file for the treemenu icons
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="0.1"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/base/treemenu-icons.$OPENQRM_SOURCE_VERSION.tgz"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/etc/build.conf/treemenujs.conf b/openQRM-5.3.50-CE/src/etc/build.conf/treemenujs.conf
deleted file mode 100644
index 67d1ddf..0000000
--- a/openQRM-5.3.50-CE/src/etc/build.conf/treemenujs.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# this is the config file for the treemenu js
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="0.1"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/base/treemenu-js.$OPENQRM_SOURCE_VERSION.tgz"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/etc/db/db2/README b/openQRM-5.3.50-CE/src/etc/db/db2/README
deleted file mode 100644
index 6fe971a..0000000
--- a/openQRM-5.3.50-CE/src/etc/db/db2/README
+++ /dev/null
@@ -1,19 +0,0 @@
-openqrm-server.conf setup for db2 database :
-
-OPENQRM_DATABASE_TYPE="db2"                       # supported are : mysql, oracle, db2, postgres
-OPENQRM_DATABASE_SERVER="localhost"               # ip-address of the database server
-OPENQRM_DATABASE_NAME="openqrm"                   # database name
-OPENQRM_DATABASE_USER="db2inst1"                  # database user
-OPENQRM_DATABASE_PASSWORD=""                      # database password
-
-
-Hints to compile php + db2 support :
-
-# configure and compile php 
-./configure  i386-redhat-linux --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --sysconfdir=/etc --datadir=/usr/share --includedir=/usr/include --libdir=/usr/lib --libexecdir=/usr/libexec --localstatedir=/var --sharedstatedir=/usr/com --mandir=/usr/share/man --infodir=/usr/share/info --with-config-file-path=/etc --enable-track-vars --with-apxs=/usr/sbin/apxs --with-ibm-db2=/home/db2inst1/sqllib/ --no-create --no-recursion
-make
-make install
-
-in db2cc create database e.g. "openqrm"
-add user apache to openqrm-database users, add shema db2inst1 to user apachhe, grant all, allow usage of all tablespaces.
-
diff --git a/openQRM-5.3.50-CE/src/etc/db/db2/openqrm-db2-functions b/openQRM-5.3.50-CE/src/etc/db/db2/openqrm-db2-functions
deleted file mode 100644
index 67a883a..0000000
--- a/openQRM-5.3.50-CE/src/etc/db/db2/openqrm-db2-functions
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-# openQRM db2-specfic functions
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	echo "ERROR: Please export OPENQRM_SERVER_BASE_DIR before sourcing $0"
-	exit 1
-fi
-
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-OPENQRM_DATABASE_INIT="$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/db2/openqrm-db2-init.sql"
-
-
-function initialize_database() {
-
-	if ! which db2 1>/dev/null 2>&1; then
-		echo "ERROR: DB2 client 'db2' not installed/found on this system"
-		return 1
-	else
-		DB2_CLIENT=`which db2`
-	fi
-
-	echo "Initializing the openQRM-database"
-	cat $OPENQRM_DATABASE_INIT |	\
-		sed -e "s/connect to OPENQRM_DB/connect to $OPENQRM_DATABASE_NAME/g" |	\
-		sed -e "s/OPENQRM_SERVER_IP_ADDRESS/$OPENQRM_SERVER_IP_ADDRESS/g"	\
-		> /tmp/openqrm-db2-init.sql
-	chmod 777 /tmp/openqrm-db2-init.sql
-	su - $OPENQRM_DATABASE_USER -c "$DB2_CLIENT -vf /tmp/openqrm-db2-init.sql"
-	rm -f /tmp/openqrm-db2-init.sql
-	# db2 client does not return good
-	return 0
-
-}
-
-
-function backup_database() {
-	local SQL=$1
-	echo "Creating backup of the openQRM-database at $SQL"
-	echo "NOTICE: Backup for DB2 databases not yet implemented"
-	return $RET
-
-}
-
-function restore_database() {
-	local SQL=$1
-	echo "Restoring the openQRM-database from $SQL"
-	echo "NOTICE: Restore for DB2 databases not yet implemented"
-	return $RET
-
-}
-
-function drop_database() {
-	echo "Dropping the openQRM-database"
-	echo "NOTICE: Drop for DB2 databases not yet implemented"
-	return $RET
-}
-
-case "$1" in
-	init)
-		initialize_database
-		;;
-	backup)
-		backup_database $2
-		;;
-	restore)
-		restore_database $2
-		;;
-	drop)
-		drop_database
-		;;
-esac
diff --git a/openQRM-5.3.50-CE/src/etc/db/db2/openqrm-db2-init.sql b/openQRM-5.3.50-CE/src/etc/db/db2/openqrm-db2-init.sql
deleted file mode 100644
index 6d072e2..0000000
--- a/openQRM-5.3.50-CE/src/etc/db/db2/openqrm-db2-init.sql
+++ /dev/null
@@ -1,240 +0,0 @@
-connect to OPENQRM_DB
-
-drop table resource_info
-create table resource_info(				\
-	resource_id bigint not null,			\
-	resource_localboot bigint,			\
-	resource_kernel varchar(50),			\
-	resource_kernelid bigint,			\
-	resource_image varchar(50),			\
-	resource_imageid bigint,			\
-	resource_openqrmserver varchar(20),		\
-	resource_basedir varchar(100),			\
-	resource_applianceid bigint,			\
-	resource_ip varchar(20),			\
-	resource_subnet varchar(20),			\
-	resource_broadcast varchar(20),			\
-	resource_network varchar(20),			\
-	resource_mac varchar(20),			\
-	resource_nics bigint,				\
-	resource_uptime bigint,				\
-	resource_cpunumber bigint,			\
-	resource_cpuspeed bigint,			\
-	resource_cpumodel varchar(255),			\
-	resource_memtotal bigint,			\
-	resource_memused bigint,			\
-	resource_swaptotal bigint,			\
-	resource_swapused bigint,			\
-	resource_hostname varchar(60),			\
-	resource_vtype bigint,			\
-	resource_vhostid bigint,			\
-	resource_vname varchar(255),			\
-	resource_vnc varchar(30),			\
-	resource_load decimal(4,2),			\
-	resource_execdport bigint,			\
-	resource_senddelay bigint,			\
-	resource_capabilities varchar(255),		\
-	resource_lastgood varchar(10),			\
-	resource_state varchar(20),			\
-	resource_event varchar(20),			\
-	primary key(resource_id)			\
-)
-
-
-drop table kernel_info
-create table kernel_info(				\
-	kernel_id bigint not null,			\
-	kernel_name varchar(255),			\
-	kernel_version varchar(50),			\
-	kernel_capabilities varchar(255),		\
-	kernel_comment varchar(255),		\
-	primary key(kernel_id)				\
-)
-
-
-
-drop table image_info
-create table image_info(			\
-	image_id bigint not null,		\
-	image_name varchar(255),			\
-	image_version varchar(30),		\
-	image_type varchar(255),			\
-	image_rootdevice varchar(255),		\
-	image_rootfstype varchar(255),		\
-	image_size bigint,			\
-	image_storageid bigint,			\
-	image_deployment_parameter varchar(1000),	\
-	image_isshared bigint,			\
-	image_isactive bigint,			\
-	image_comment varchar(255),		\
-	image_capabilities varchar(255),	\
-	primary key(image_id)			\
-)
-
-
-drop table appliance_info
-create table appliance_info(				\
-	appliance_id bigint not null,			\
-	appliance_name varchar(50),			\
-	appliance_kernelid bigint,			\
-	appliance_imageid bigint,			\
-	appliance_starttime bigint,			\
-	appliance_stoptime bigint,			\
-	appliance_cpunumber bigint,			\
-	appliance_cpuspeed bigint,			\
-	appliance_cpumodel varchar(255),			\
-	appliance_memtotal bigint,			\
-	appliance_swaptotal bigint,			\
-	appliance_nics bigint,			\
-	appliance_capabilities varchar(1000),		\
-	appliance_cluster bigint,			\
-	appliance_ssi bigint,				\
-	appliance_resources bigint,			\
-	appliance_highavailable bigint,			\
-	appliance_virtual bigint,			\
-	appliance_virtualization varchar(20),		\
-	appliance_virtualization_host bigint,		\
-	appliance_state varchar(20),			\
-	appliance_comment varchar(255),			\
-	appliance_wizard varchar(255),			\
-	appliance_event varchar(20),			\
-	primary key(appliance_id)			\
-)
-
-
-drop table event_info
-create table event_info(			\
-	event_id bigint not null,		\
-	event_name varchar(50),			\
-	event_time varchar(50),			\
-	event_priority bigint,			\
-	event_source varchar(50),		\
-	event_description varchar(255),		\
-	event_comment varchar(100),		\
-	event_capabilities varchar(255),	\
-	event_status bigint,			\
-	event_image_id bigint,			\
-	event_resource_id bigint,		\
-	primary key(event_id)			\
-)
-
-
-
-drop table user_info
-create table user_info(					\
-	user_id bigint not null,			\
-	user_name varchar(20),				\
-	user_password varchar(20),			\
-	user_gender varchar(1),				\
-	user_first_name varchar(50),			\
-	user_last_name varchar(50),			\
-	user_department varchar(50),			\
-	user_office varchar(50),			\
-	user_role bigint,				\
-	user_last_update_time varchar(50),		\
-	user_description varchar(255),			\
-	user_capabilities varchar(255),			\
-	user_wizard_name varchar(255),			\
-	user_wizard_step bigint,			\
-	user_wizard_id bigint,			\
-	user_state varchar(20),				\
-	user_lang varchar(5),				\
-	primary key(user_id)				\
-)
-
-drop table role_info
-create table role_info(					\
-	role_id bigint not null,			\
-	role_name varchar(20)				\
-)
-
-drop table storage_info
-create table storage_info(				\
-	storage_id bigint not null,			\
-	storage_name varchar(255),			\
-	storage_resource_id bigint,			\
-	storage_type bigint,			\
-	storage_comment varchar(100),			\
-	storage_capabilities varchar(255),		\
-	storage_state varchar(20),			\
-	primary key(storage_id)				\
-)
-
-
-drop table resource_service
-create table resource_service (				\
-	resource_id bigint not null,			\
-	service varchar(50),				\
-	primary key(resource_id)			\
-)
-
-drop table image_service
-create table image_service (				\
-	image_id bigint not null,			\
-	service varchar(50),				\
-	primary key(image_id)				\
-)
-
-drop table image_authentication_info
-create table image_authentication_info (				\
-	ia_id bigint not null,			\
-	ia_image_id bigint,		\
-	ia_resource_id bigint,		\
-	ia_auth_type bigint		\
-)
-
-drop table auth_blocker_info
-create table auth_blocker_info (				\
-	ab_id bigint not null,			\
-	ab_image_id bigint,		\
-	ab_image_name varchar(255),		\
-	ab_start_time varchar(20)		\
-)
-
-drop table deployment_info
-create table deployment_info(				\
-	deployment_id bigint not null,			\
-	deployment_storagetype_id bigint		\
-	deployment_name varchar(50),			\
-	deployment_type varchar(50)			\
-	deployment_description varchar(50)			\
-	deployment_storagetype varchar(50)			\
-	deployment_storagedescription varchar(50)			\
-	deployment_mapping varchar(255)			\
-)
-
-drop table virtualization_info
-create table virtualization_info(			\
-	virtualization_id bigint not null,		\
-	virtualization_name varchar(50),		\
-	virtualization_type varchar(50),		\
-	virtualization_mapping varchar(255)		\
-)
-
-
-drop table datacenter_info
-create table datacenter_info(			\
-	datacenter_id bigint not null,		\
-	datacenter_load_overall varchar(50),		\
-	datacenter_load_server varchar(50),		\
-	datacenter_load_storage varchar(50),		\
-	datacenter_cpu_total varchar(50),		\
-	datacenter_mem_total varchar(50),		\
-	datacenter_mem_used varchar(50)		\
-)
-
-
-insert into kernel_info (kernel_id, kernel_name, kernel_version) values (0, 'openqrm', 'openqrm');
-insert into image_info (image_id, image_name, image_version, image_type, image_rootdevice, image_isshared) values (0, 'openqrm', 'openqrm', 'ram', 'ram', 0);
-
-insert into image_info (image_id, image_name, image_version, image_type, image_rootdevice, image_rootfstype, image_isshared) values (1, 'idle', 'openqrm', 'ram', 'ram', 'ext2', 1)
-insert into resource_info (resource_id, resource_localboot, resource_kernel, resource_image, resource_openqrmserver, resource_ip) values (0, 1, 'local', 'local', 'OPENQRM_SERVER_IP_ADDRESS', 'OPENQRM_SERVER_IP_ADDRESS')
-insert into deployment_info (deployment_id, deployment_name, deployment_type, deployment_description, deployment_storagetype, deployment_storagedescription ) values (1, 'ramdisk', 'ram', 'Ramdisk Deployment', 'none', 'none');
-insert into virtualization_info (virtualization_id, virtualization_name, virtualization_type) values (1, 'Physical System', 'physical')
-insert into user_info (user_id, user_name, user_password, user_gender, user_first_name, user_last_name, user_department, user_office, user_role, user_last_update_time, user_description, user_capabilities, user_state, user_lang) values (0, 'openqrm', 'openqrm', '-', '-', '-', '-', '-', 0, '-', 'default admin user', '', 'activated', 'en')
-insert into user_info (user_id, user_name, user_password, user_gender, user_first_name, user_last_name, user_department, user_office, user_role, user_last_update_time, user_description, user_capabilities, user_state, user_lang) values (1, 'anonymous', 'openqrm', '-', '-', '-', '-', '-', 1, '-', 'default readonly user', '', 'activated', 'en')
-insert into role_info (role_id, role_name) values (0, 'administrator')
-insert into role_info (role_id, role_name) values (1, 'readonly')
-
-
-
diff --git a/openQRM-5.3.50-CE/src/etc/db/mysql/README b/openQRM-5.3.50-CE/src/etc/db/mysql/README
deleted file mode 100644
index 6462472..0000000
--- a/openQRM-5.3.50-CE/src/etc/db/mysql/README
+++ /dev/null
@@ -1,7 +0,0 @@
-LAMP setup for openqrm-server.conf :
-
-OPENQRM_DATABASE_TYPE="mysql"                     # supported are : mysql, oracle, db2 and postgres
-OPENQRM_DATABASE_SERVER="localhost"               # ip-address of the database server
-OPENQRM_DATABASE_NAME="openqrm"                   # database name
-OPENQRM_DATABASE_USER="root"                      # database user
-OPENQRM_DATABASE_PASSWORD=""                      # database password
diff --git a/openQRM-5.3.50-CE/src/etc/db/mysql/openqrm-mysql-functions b/openQRM-5.3.50-CE/src/etc/db/mysql/openqrm-mysql-functions
deleted file mode 100644
index b8c51b6..0000000
--- a/openQRM-5.3.50-CE/src/etc/db/mysql/openqrm-mysql-functions
+++ /dev/null
@@ -1,772 +0,0 @@
-#!/bin/bash
-# openQRM mysql-specfic functions
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	echo "ERROR: Please export OPENQRM_SERVER_BASE_DIR before sourcing $0"
-	exit 1
-fi
-
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-
-# get full server config
-openqrm_server_get_config
-OPENQRM_DATABASE_INIT="$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/mysql/openqrm-mysql-init.sql"
-
-OPENQRM_DATABASE_MAINTENANCE="$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/mysql/openqrm-mysql-maintenance"
-OPENQRM_DATABASE_MAINTENANCE_FNAME=`basename $OPENQRM_DATABASE_MAINTENANCE`
-
-if ! which mysql 1>/dev/null 2>&1; then
-	echo "ERROR: Mysql client 'mysql' not installed/found on this system"
-	exit 1
-else
-	export MYSQL_CLIENT=`which mysql`
-fi
-if ! which mysqldump 1>/dev/null 2>&1; then
-	echo "ERROR: Mysql 'mysqldump' not installed/found on this system"
-	exit 1
-else
-	export MYSQL_DUMP=`which mysqldump`
-fi
-if ! which mysqladmin 1>/dev/null 2>&1; then
-	echo "ERROR: Mysql 'mysqladmin' not installed/found on this system"
-	exit 1
-else
-	export MYSQL_ADMIN=`which mysqladmin`
-fi
-
-
-
-function initialize_database() {
-	# set the dbname in the sql init-script
-	OPENQRM_DATABASE_INIT_TMP=/tmp/openqrm-mysql-init.sql
-	cat $OPENQRM_DATABASE_INIT |	\
-		sed -e "s/OPENQRM_DB/$OPENQRM_DATABASE_NAME/g" |	\
-		sed -e "s/OPENQRM_SERVER_IP_ADDRESS/$OPENQRM_SERVER_IP_ADDRESS/g"	\
-		> $OPENQRM_DATABASE_INIT_TMP
-
-	echo "Initializing the openQRM-database"
-	
-	if [ -z "$OPENQRM_DATABASE_PASSWORD" ]; then
-		$MYSQL_CLIENT -u $OPENQRM_DATABASE_USER --host $OPENQRM_DATABASE_SERVER -e "drop database $OPENQRM_DATABASE_NAME" 1>/dev/null 2>&1
-		$MYSQL_CLIENT -u $OPENQRM_DATABASE_USER --host $OPENQRM_DATABASE_SERVER < $OPENQRM_DATABASE_INIT_TMP 2>&1
-		RET="${PIPESTATUS[0]}"
-	else
-		$MYSQL_CLIENT -u $OPENQRM_DATABASE_USER -p$OPENQRM_DATABASE_PASSWORD --host $OPENQRM_DATABASE_SERVER -e "drop database $OPENQRM_DATABASE_NAME" 1>/dev/null 2>&1
-		$MYSQL_CLIENT -u $OPENQRM_DATABASE_USER -p$OPENQRM_DATABASE_PASSWORD --host $OPENQRM_DATABASE_SERVER < $OPENQRM_DATABASE_INIT_TMP 2>&1
-                RET="${PIPESTATUS[0]}"
-	fi
-	
-	rm -f $OPENQRM_DATABASE_INIT_TMP
-
-	# check for mariadb authentication
-	if [ -z "$OPENQRM_DATABASE_PASSWORD" ]; then
-	    OPENQRM_DATABASE_PASSWORD_PARAM=""
-	    PASSWORD_SET="0"
-	else
-	    OPENQRM_DATABASE_PASSWORD_PARAM="-p$OPENQRM_DATABASE_PASSWORD"
-	    PASSWORD_SET="1"
-	fi
-
-	# this is only needed for Debian
-#	if [ -f /etc/debian_version ]; then
-#	    if $MYSQL_CLIENT -u $OPENQRM_DATABASE_USER $OPENQRM_DATABASE_PASSWORD_PARAM --host $OPENQRM_DATABASE_SERVER -e "status" | grep -i maria 1>/dev/null; then
-#		echo "openQRM init database: Mariadb detected, applying mysql_native_password authentication" | logger
-#		if [ "$PASSWORD_SET" == "1" ]; then
-#		    $MYSQL_CLIENT -u $OPENQRM_DATABASE_USER $OPENQRM_DATABASE_PASSWORD_PARAM --host $OPENQRM_DATABASE_SERVER -e "update mysql.user set Password=PASSWORD(\"$OPENQRM_DATABASE_PASSWORD\") where User=\"$OPENQRM_DATABASE_USER\";flush privileges;"
-#		fi
-#		$MYSQL_CLIENT -u $OPENQRM_DATABASE_USER $OPENQRM_DATABASE_PASSWORD_PARAM --host $OPENQRM_DATABASE_SERVER -e "update mysql.user set plugin='mysql_native_password';flush privileges;"
-#	    fi
-#	fi
-
-	# add the db maintenance to cron
-	cat $OPENQRM_DATABASE_MAINTENANCE | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" > /etc/cron.daily/$OPENQRM_DATABASE_MAINTENANCE_FNAME
-	chmod +x /etc/cron.daily/$OPENQRM_DATABASE_MAINTENANCE_FNAME
-	if [ -x "/etc/init.d/cron" ]; then
-	    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d cron reload
-	    else
-		/etc/init.d/cron reload
-	    fi
-	    elif [ -x "/etc/init.d/crond" ]; then
-	    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d crond reload
-	    else
-		/etc/init.d/crond reload
-	    fi
-	else
-	    echo "Could not find cron init script in /etc/init.d/. Please reload cron manually!"
-	fi
-	
-	return $RET
-}
-
-function backup_database() {
-	local SQL=$1
-	echo "Creating backup of the openQRM-database at $SQL"
-	if [ -z "$OPENQRM_DATABASE_PASSWORD" ]; then
-		$MYSQL_DUMP -u $OPENQRM_DATABASE_USER --host $OPENQRM_DATABASE_SERVER $OPENQRM_DATABASE_NAME > $SQL
-		RET=$?
-	else
-		$MYSQL_DUMP -u $OPENQRM_DATABASE_USER -p$OPENQRM_DATABASE_PASSWORD --host $OPENQRM_DATABASE_SERVER  $OPENQRM_DATABASE_NAME > $SQL
-		RET=$?
-	fi
-	return $RET
-
-}
-
-function restore_database() {
-	local SQL=$1
-	echo "Restoring the openQRM-database from $SQL"
-	if [ -z "$OPENQRM_DATABASE_PASSWORD" ]; then
-		$MYSQL_CLIENT -u $OPENQRM_DATABASE_USER --host $OPENQRM_DATABASE_SERVER $OPENQRM_DATABASE_NAME < $SQL
-		RET=$?
-	else
-		$MYSQL_CLIENT -u $OPENQRM_DATABASE_USER -p$OPENQRM_DATABASE_PASSWORD --host $OPENQRM_DATABASE_SERVER $OPENQRM_DATABASE_NAME < $SQL
-		RET=$?
-	fi
-	return $RET
-
-}
-
-function drop_database() {
-	echo "Dropping the openQRM-database"
-	if [ -z "$OPENQRM_DATABASE_PASSWORD" ]; then
-		$MYSQL_CLIENT -u $OPENQRM_DATABASE_USER --host $OPENQRM_DATABASE_SERVER -e "drop database $OPENQRM_DATABASE_NAME" 1>/dev/null 2>&1
-		RET=$?
-	else
-		$MYSQL_CLIENT -u $OPENQRM_DATABASE_USER -p$OPENQRM_DATABASE_PASSWORD --host $OPENQRM_DATABASE_SERVER -e "drop database $OPENQRM_DATABASE_NAME" 1>/dev/null 2>&1
-		RET=$?
-	fi
-
-	# remove maintenance cron job
-	rm -f /etc/cron.daily/$OPENQRM_DATABASE_MAINTENANCE_FNAME
-	if [ -x "/etc/init.d/cron" ]; then
-	    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d cron reload
-	    else
-		/etc/init.d/cron reload
-	    fi
-	    elif [ -x "/etc/init.d/crond" ]; then
-	    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d crond reload
-	    else
-		/etc/init.d/crond reload
-	    fi
-	else
-	    echo "Could not find cron init script in /etc/init.d/. Please reload cron manually!"
-	fi
-
-	return $RET
-}
-
-
-
-########################### functions to update the db shema ###########################
-
-function check_table_exists(){
-    local DB_TABLE=$1
-	if [ -z "$OPENQRM_DATABASE_PASSWORD" ]; then
-        $MYSQL_CLIENT -u $OPENQRM_DATABASE_USER --host $OPENQRM_DATABASE_SERVER  $OPENQRM_DATABASE_NAME -e "select * from $DB_TABLE" 1>/dev/null 2>&1
-		RET=$?
-	else
-        $MYSQL_CLIENT -u $OPENQRM_DATABASE_USER -p$OPENQRM_DATABASE_PASSWORD --host $OPENQRM_DATABASE_SERVER  $OPENQRM_DATABASE_NAME -e "select * from $DB_TABLE" 1>/dev/null 2>&1
-		RET=$?
-	fi
-    return $RET
-}
-
-
-function check_column_in_table_exists(){
-    local DB_TABLE=$1
-    local DB_COLUMN=$2
-	if [ -z "$OPENQRM_DATABASE_PASSWORD" ]; then
-        $MYSQL_CLIENT -u $OPENQRM_DATABASE_USER --host $OPENQRM_DATABASE_SERVER  $OPENQRM_DATABASE_NAME -e "select $DB_COLUMN from $DB_TABLE" 1>/dev/null 2>&1
-		RET=$?
-	else
-        $MYSQL_CLIENT -u $OPENQRM_DATABASE_USER -p$OPENQRM_DATABASE_PASSWORD --host $OPENQRM_DATABASE_SERVER  $OPENQRM_DATABASE_NAME -e "select $DB_COLUMN from $DB_TABLE" 1>/dev/null 2>&1
-		RET=$?
-	fi
-    return $RET
-}
-
-
-function check_if_data_in_column_of_table_exists(){
-    local DB_TABLE=$1
-    local DB_COLUMN=$2
-    local DB_DATA=$3
-    local DB_OUTPUT_LOG="/tmp/dboutput.log"
-	if [ -z "$OPENQRM_DATABASE_PASSWORD" ]; then
-        $MYSQL_CLIENT -u $OPENQRM_DATABASE_USER --host $OPENQRM_DATABASE_SERVER  $OPENQRM_DATABASE_NAME -e "select * from $DB_TABLE where $DB_COLUMN=$DB_DATA" > $DB_OUTPUT_LOG
-		RET=$?
-	else
-        $MYSQL_CLIENT -u $OPENQRM_DATABASE_USER -p$OPENQRM_DATABASE_PASSWORD --host $OPENQRM_DATABASE_SERVER  $OPENQRM_DATABASE_NAME -e "select * from $DB_TABLE where $DB_COLUMN=$DB_DATA" > $DB_OUTPUT_LOG
-		RET=$?
-	fi
-    DB_OUTPUT=`cat $DB_OUTPUT_LOG`
-    if [ "$RET" == 0 ]; then
-        if [ "$DB_OUTPUT" == "" ]; then
-            return 1
-        else
-            return 0
-        fi
-    else
-        return $RET
-    fi
-}
-
-
-
-function run_sql(){
-    local DB_SQL=$@
-	if [ -z "$OPENQRM_DATABASE_PASSWORD" ]; then
-        $MYSQL_CLIENT -sN -u $OPENQRM_DATABASE_USER --host $OPENQRM_DATABASE_SERVER  $OPENQRM_DATABASE_NAME -e "$DB_SQL" 2>&1
-		RET=$?
-	else
-        $MYSQL_CLIENT -sN -u $OPENQRM_DATABASE_USER -p$OPENQRM_DATABASE_PASSWORD --host $OPENQRM_DATABASE_SERVER  $OPENQRM_DATABASE_NAME -e "$DB_SQL" 2>&1
-		RET=$?
-	fi
-    return $RET
-}
-
-
-
-
-function db_update()  {
-
-    # this function applies needed updates to the db-shema if needed in an idempotent way
-	if [ -f "$OPENQRM_SERVER_BASE_DIR/openqrm_pre_update/etc/openqrm-server.conf" ]; then
-		# for update we have to source the old configuration
-		. $OPENQRM_SERVER_BASE_DIR/openqrm_pre_update/etc/openqrm-server.conf
-	else
-		. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	fi
-
-    #---------------------------------------------------------------------------
-    # from 4.9 to 5.0 the following db changes are needed
-    #---------------------------------------------------------------------------
-	# 1  > ALTER TABLE cloud_users ADD cu_lang VARCHAR(4);
-	# 2  > UPDATE user_info set user_lang = 'en';
-	# 3  > ALTER TABLE user_info ADD user_wizard_name VARCHAR(255) AFTER user_capabilities;
-	# 4  > ALTER TABLE user_info ADD user_wizard_step INT(5) AFTER user_wizard_name;
-	# 5  > ALTER TABLE user_info ADD user_wizard_id INT(5) AFTER user_wizard_step;
-	# 6  > ALTER TABLE appliance_info ADD appliance_wizard VARCHAR(255) AFTER appliance_comment;
-	# 7  > ALTER TABLE appliance_info MODIFY appliance_cpumodel VARCHAR(255);
-	# 8  > ALTER TABLE resource_info MODIFY resource_cpumodel VARCHAR(255);
-	# 9  > ALTER TABLE cloud_config MODIFY cc_value VARCHAR(255);
-	# 10 > ALTER TABLE event_info MODIFY event_id BIGINT;
-	# 11 > insert into cloud_config(cc_id, cc_key, cc_value) values (38, 'deprovision_warning', '100');
-	# 12 > insert into cloud_config(cc_id, cc_key, cc_value) values (39, 'deprovision_pause', '50')
-
-
-    echo "- Checking database shema ..."
-
-    # if cloud enabled .....
-    if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/cloud" ]; then
-
-		# 1  > ALTER TABLE cloud_users ADD cu_lang VARCHAR(4);
-		if ! check_column_in_table_exists cloud_users cu_lang; then
-			echo " -- db change : ALTER TABLE cloud_users ADD cu_lang VARCHAR(4)"
-			run_sql "ALTER TABLE cloud_users ADD cu_lang VARCHAR(4);"
-		fi
-		# 9  > ALTER TABLE cloud_config MODIFY cc_value VARCHAR(255);
-		echo " -- db change : ALTER TABLE cloud_config MODIFY cc_value VARCHAR(255)"
-		run_sql "ALTER TABLE cloud_config MODIFY cc_value VARCHAR(255);"
-
-		# 11  > insert into cloud_config(cc_id, cc_key, cc_value) values (38, 'deprovision_warning', '100');
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 38; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (38, 'deprovision_warning', '100')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (38, 'deprovision_warning', '100');"
-            fi
-        fi
-
-		# 12  > insert into cloud_config(cc_id, cc_key, cc_value) values (39, 'deprovision_pause', '50')
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 39; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (39, 'deprovision_pause', '50')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (39, 'deprovision_pause', '50');"
-            fi
-        fi
-	fi
-
-	# 2  > UPDATE user_info set user_lang = 'en';
-	echo " -- db change : UPDATE user_info set user_lang = 'en'"
-	run_sql "UPDATE user_info set user_lang = 'en';"
-
-	# 3  > ALTER TABLE user_info ADD user_wizard_name VARCHAR(255) AFTER user_capabilities;
-	if ! check_column_in_table_exists user_info user_wizard_name; then
-		echo " -- db change : ALTER TABLE user_info ADD user_wizard_name VARCHAR(255) AFTER user_capabilities"
-		run_sql "ALTER TABLE user_info ADD user_wizard_name VARCHAR(255) AFTER user_capabilities;"
-	fi
-
-	# 4  > ALTER TABLE user_info ADD user_wizard_step INT(5) AFTER user_wizard_name;
-	if ! check_column_in_table_exists user_info user_wizard_step; then
-		echo " -- db change : ALTER TABLE user_info ADD user_wizard_step INT(5) AFTER user_wizard_name"
-		run_sql "ALTER TABLE user_info ADD user_wizard_step INT(5) AFTER user_wizard_name;"
-	fi
-
-	# 5  > ALTER TABLE user_info ADD user_wizard_id INT(5) AFTER user_wizard_step;
-	if ! check_column_in_table_exists user_info user_wizard_id; then
-		echo " -- db change : ALTER TABLE user_info ADD user_wizard_id INT(5) AFTER user_wizard_step"
-		run_sql "ALTER TABLE user_info ADD user_wizard_id INT(5) AFTER user_wizard_step;"
-	fi
-
-	# 6  > ALTER TABLE appliance_info ADD appliance_wizard VARCHAR(255) AFTER appliance_comment;
-	if ! check_column_in_table_exists appliance_info appliance_wizard; then
-		echo " -- db change : ALTER TABLE appliance_info ADD appliance_wizard VARCHAR(255) AFTER appliance_comment"
-		run_sql "ALTER TABLE appliance_info ADD appliance_wizard VARCHAR(255) AFTER appliance_comment;"
-	fi
-
-	# 7 > ALTER TABLE appliance_info MODIFY appliance_cpumodel VARCHAR(255);
-	echo " -- db change : ALTER TABLE appliance_info MODIFY appliance_cpumodel VARCHAR(255)"
-	run_sql "ALTER TABLE appliance_info MODIFY appliance_cpumodel VARCHAR(255);"
-
-	# 8 > ALTER TABLE resource_info MODIFY resource_cpumodel VARCHAR(255);
-	echo " -- db change : ALTER TABLE resource_info MODIFY resource_cpumodel VARCHAR(255)"
-	run_sql "ALTER TABLE resource_info MODIFY resource_cpumodel VARCHAR(255);"
-
-	# 10  > ALTER TABLE event_info MODIFY event_id BIGINT;
-	echo " -- db change : ALTER TABLE event_info MODIFY event_id BIGINT"
-	run_sql "ALTER TABLE event_info MODIFY event_id BIGINT;"
-
-	echo "- Database sanity check for version 4.9 to 5.0 finished"
-
-	# from 5.0 to 5.1
-    #---------------------------------------------------------------------------
-    # from 5.0 to 5.1 the following db changes are needed
-    #---------------------------------------------------------------------------
-	# 1  > insert into cloud_config(cc_id, cc_key, cc_value) values (40, 'vm_provision_delay', '0');
-	# 2  > insert into cloud_config(cc_id, cc_key, cc_value) values (41, 'vm_loadbalance_algorithm', '0');
-	# 3  > ALTER TABLE role_info ADD role_comment VARCHAR(255);
-	# 4  > ALTER TABLE virtualization_info MODIFY virtualization_type VARCHAR(50);
-	# 5  > ALTER TABLE image_info MODIFY image_type VARCHAR(255);
-	# 6  > update virtualization_info set virtualization_name = 'KVM VM (networkboot)', virtualization_type='kvm-vm-net' where virtualization_type='kvm-vm';
-	# 7  > update virtualization_info set virtualization_name = 'KVM VM (localboot)', virtualization_type='kvm-vm-local' where virtualization_type='kvm-storage-vm';
-	# 8  > insert into deployment_info(deployment_id, deployment_name, deployment_type, deployment_description, deployment_storagetype, deployment_storagedescription) values ($NEW_DEPLOYMENT_ID, 'kvm-gluster-deployment', 'kvm-gluster-deployment', 'Glusterfs deployment for KVM', 'kvm', 'KVM Gluster Storage');
-	# 9  > update virtualization_info set virtualization_name = 'Citrix VM (networkboot)', virtualization_type='citrix-vm-net' where virtualization_type='citrix-vm';
-	# 10 > update virtualization_info set virtualization_name = 'Citrix VM (localboot)', virtualization_type='citrix-vm-local' where virtualization_type='citrix-storage-vm';
-	# 11 > update virtualization_info set virtualization_name = 'LXC VM (localboot)', virtualization_type='lxc-vm-local' where virtualization_type='lxc-storage-vm';
-	# 12 > update virtualization_info set virtualization_name = 'OpenVZ VM (localboot)', virtualization_type='openvz-vm-local' where virtualization_type='openvz-storage-vm';
-	# 13 > update virtualization_info set virtualization_name = 'ESX VM (networkboot)', virtualization_type='vmware-esx-vm-net' where virtualization_type='vmware-esx-vm';
-	# 14 > update virtualization_info set virtualization_name = 'Xen VM (networkboot)', virtualization_type='xen-vm-net' where virtualization_type='xen-vm';
-	# 15 > update virtualization_info set virtualization_name = 'Xen VM (localboot)', virtualization_type='xen-vm-local' where virtualization_type='xen-storage-vm';
-	# 16 > create table datacenter_info(datacenter_id BIGINT NOT NULL PRIMARY KEY, datacenter_load_overall VARCHAR(50), datacenter_load_server VARCHAR(50), datacenter_load_storage VARCHAR(50), datacenter_cpu_total VARCHAR(50), datacenter_mem_total VARCHAR(50), datacenter_mem_used VARCHAR(50));
-	# 17 > ALTER TABLE appliance_info MODIFY appliance_comment VARCHAR(255);
-
-	# 3  > ALTER TABLE role_info ADD role_comment VARCHAR(255);
-	if ! check_column_in_table_exists role_info role_comment; then
-		echo " -- db change : ALTER TABLE role_info ADD role_comment VARCHAR(255)"
-		run_sql "ALTER TABLE role_info ADD role_comment VARCHAR(255);"
-	fi
-	# 4  > ALTER TABLE virtualization_info MODIFY virtualization_type VARCHAR(50);
-	echo " -- db change : ALTER TABLE virtualization_info MODIFY virtualization_type VARCHAR(50)"
-	run_sql "ALTER TABLE virtualization_info MODIFY virtualization_type VARCHAR(50);"
-	# 5  > ALTER TABLE image_info MODIFY image_type VARCHAR(255);
-	echo " -- db change : ALTER TABLE image_info MODIFY image_type VARCHAR(255)"
-	run_sql "ALTER TABLE image_info MODIFY image_type VARCHAR(255);"
-
-	# virtualization plugin merge
-	# citrix
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/citrix" ]; then
-		# 9  > update virtualization_info set virtualization_name = 'Citrix VM (networkboot)', virtualization_type='citrix-vm-net' where virtualization_type='citrix-vm';
-		echo " -- db change : update virtualization_info set virtualization_name = 'Citrix VM (networkboot)', virtualization_type='citrix-vm-net' where virtualization_type='citrix-vm'"
-		run_sql "update virtualization_info set virtualization_name = 'Citrix VM (networkboot)', virtualization_type='citrix-vm-net' where virtualization_type='citrix-vm';"
-	fi
-	# citrix-storage
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/citrix-storage" ]; then
-		# 10  > update virtualization_info set virtualization_name = 'Citrix VM (localboot)', virtualization_type='citrix-vm-local' where virtualization_type='citrix-storage-vm';
-		run_sql "update virtualization_info set virtualization_name = 'Citrix VM (localboot)', virtualization_type='citrix-vm-local' where virtualization_type='citrix-storage-vm';"
-	fi
-	# kvm
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/kvm" ]; then
-		echo "- adapting KVM Plugin database tables"
-		# 6  > update virtualization_info set virtualization_name = 'KVM VM (networkboot)', virtualization_type='kvm-vm-net' where virtualization_type='kvm-vm';
-		echo " -- db change : update virtualization_info set virtualization_name = 'KVM VM (networkboot)', virtualization_type='kvm-vm-net' where virtualization_type='kvm-vm';"
-		run_sql "update virtualization_info set virtualization_name = 'KVM VM (networkboot)', virtualization_type='kvm-vm-net' where virtualization_type='kvm-vm';"
-		# 8  > insert into deployment_info(deployment_id, deployment_name, deployment_type, deployment_description, deployment_storagetype, deployment_storagedescription) values ($NEW_DEPLOYMENT_ID, 'kvm-gluster-deployment', 'kvm-gluster-deployment', 'Glusterfs deployment for KVM', 'kvm', 'KVM Gluster Storage');
-		# glusterfs deployment
-		DEPLOYMENT_EXISTS=`run_sql "select deployment_id from deployment_info where deployment_type='kvm-gluster-deployment';"`
-		if [ "$DEPLOYMENT_EXISTS" == "" ]; then
-			NEW_DEPLOYMENT_ID=`run_sql "select count(deployment_id) from deployment_info;"`
-			NEW_DEPLOYMENT_ID=$(( NEW_DEPLOYMENT_ID + 1 ))
-			echo " -- db change : insert into deployment_info(deployment_id, deployment_name, deployment_type, deployment_description, deployment_storagetype, deployment_storagedescription) values ($NEW_DEPLOYMENT_ID, 'kvm-gluster-deployment', 'kvm-gluster-deployment', 'Glusterfs deployment for KVM', 'kvm', 'KVM Gluster Storage')"
-			run_sql "insert into deployment_info(deployment_id, deployment_name, deployment_type, deployment_description, deployment_storagetype, deployment_storagedescription) values ($NEW_DEPLOYMENT_ID, 'kvm-gluster-deployment', 'kvm-gluster-deployment', 'Glusterfs deployment for KVM', 'kvm', 'KVM Gluster Storage');"
-		fi
-	fi
-	# kvm-storage
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/kvm-storage" ]; then
-		# 7  > update virtualization_info set virtualization_name = 'KVM VM (localboot)', virtualization_type='kvm-vm-local' where virtualization_type='kvm-storage-vm';
-		echo " -- db change : update virtualization_info set virtualization_name = 'KVM VM (localboot)', virtualization_type='kvm-vm-local' where virtualization_type='kvm-storage-vm';"
-		run_sql "update virtualization_info set virtualization_name = 'KVM VM (localboot)', virtualization_type='kvm-vm-local' where virtualization_type='kvm-storage-vm';"
-	fi
-	# lxc-storage
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/lxc-storage" ]; then
-		# 11 > update virtualization_info set virtualization_name = 'LXC VM (localboot)', virtualization_type='lxc-vm-local' where virtualization_type='lxc-storage-vm';
-		run_sql "update virtualization_info set virtualization_name = 'LXC VM (localboot)', virtualization_type='lxc-vm-local' where virtualization_type='lxc-storage-vm';"
-	fi
-	# openvz
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/openvz-storage" ]; then
-		# 12 > update virtualization_info set virtualization_name = 'OpenVZ VM (localboot)', virtualization_type='openvz-vm-local' where virtualization_type='openvz-storage-vm';
-		run_sql "update virtualization_info set virtualization_name = 'OpenVZ VM (localboot)', virtualization_type='openvz-vm-local' where virtualization_type='openvz-storage-vm';"
-	fi
-	# vmware-esx
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/vmware-esx" ]; then
-		# 13  > update virtualization_info set virtualization_name = 'ESX VM (networkboot)', virtualization_type='vmware-esx-vm-net' where virtualization_type='vmware-esx-vm';
-		run_sql "update virtualization_info set virtualization_name = 'ESX VM (networkboot)', virtualization_type='vmware-esx-vm-net' where virtualization_type='vmware-esx-vm';"
-	fi
-	# xen
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/xen" ]; then
-		# 14 > update virtualization_info set virtualization_name = 'Xen VM (networkboot)', virtualization_type='xen-vm-net' where virtualization_type='xen-vm';
-		run_sql "update virtualization_info set virtualization_name = 'Xen VM (networkboot)', virtualization_type='xen-vm-net' where virtualization_type='xen-vm';"
-	fi
-	# xen-storage
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/xen-storage" ]; then
-		# 15 > update virtualization_info set virtualization_name = 'Xen VM (localboot)', virtualization_type='xen-vm-local' where virtualization_type='xen-storage-vm';
-		run_sql "update virtualization_info set virtualization_name = 'Xen VM (localboot)', virtualization_type='xen-vm-local' where virtualization_type='xen-storage-vm';"
-	fi
-    # if cloud enabled .....
-    if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/cloud" ]; then
-		# 1  > insert into cloud_config(cc_id, cc_key, cc_value) values (40, 'vm_provision_delay', '0');
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 40; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (40, 'vm_provision_delay', '0')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (40, 'vm_provision_delay', '0');"
-            fi
-        fi
-		# 2  > insert into cloud_config(cc_id, cc_key, cc_value) values (41, 'vm_loadbalance_algorithm', '0');
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 41; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (41, 'vm_loadbalance_algorithm', '0')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (41, 'vm_loadbalance_algorithm', '0');"
-            fi
-        fi
-	fi
-	# 16 > create table datacenter_info(datacenter_id INT(5) NOT NULL PRIMARY KEY, datacenter_load_overall VARCHAR(50), datacenter_load_server VARCHAR(50), datacenter_load_storage VARCHAR(50), datacenter_cpu_total VARCHAR(50), datacenter_mem_total VARCHAR(50), datacenter_mem_used VARCHAR(50));
-	if ! check_table_exists datacenter_info; then
-		echo " -- db change : create table datacenter_info(datacenter_id BIGINT NOT NULL PRIMARY KEY, datacenter_load_overall VARCHAR(50), datacenter_load_server VARCHAR(50), datacenter_load_storage VARCHAR(50), datacenter_cpu_total VARCHAR(50), datacenter_mem_total VARCHAR(50), datacenter_mem_used VARCHAR(50))"
-		run_sql "create table datacenter_info(datacenter_id BIGINT NOT NULL PRIMARY KEY, datacenter_load_overall VARCHAR(50), datacenter_load_server VARCHAR(50), datacenter_load_storage VARCHAR(50), datacenter_cpu_total VARCHAR(50), datacenter_mem_total VARCHAR(50), datacenter_mem_used VARCHAR(50));"
-	fi
-
-	# 17 > ALTER TABLE appliance_info MODIFY appliance_comment VARCHAR(255);
-	echo " -- db change : ALTER TABLE appliance_info MODIFY appliance_comment VARCHAR(255)"
-	run_sql "ALTER TABLE appliance_info MODIFY appliance_comment VARCHAR(255);"
-
-	echo "- Database sanity check for version 5.0 to 5.1 finished"
-
-	# from 5.1 to 5.2
-    #---------------------------------------------------------------------------
-    # from 5.1 to 5.2 the following db changes are needed
-    #---------------------------------------------------------------------------
-	# 1  > insert into cloud_config(cc_id, cc_key, cc_value) values (42, 'allow_vnc_access', 'true');
-	# 2  > ALTER TABLE cloud_requests ADD cr_image_password VARCHAR(255);
-	# 3  > create table lock_info(lock_id BIGINT NOT NULL PRIMARY KEY,lock_time VARCHAR(50),lock_section VARCHAR(50),lock_resource_id INT(5),lock_token VARCHAR(50),lock_description VARCHAR(255));
-	# 4  > adjust all base objects id to BIGINT
-	# 5  > adjust all cloud objects id to BIGINT
-	# 6  > adjust all plugin objects id to BIGINT
-	# 7  > ALTER TABLE appliance_info MODIFY appliance_capabilities VARCHAR(1000);
-	# 8  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_username VARCHAR(255);
-	# 9  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_password VARCHAR(255);
-	# 10  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_host VARCHAR(255);
-	# 11  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_port VARCHAR(255);
-	# 12  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_tenant VARCHAR(255);
-	# 13  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_endpoint VARCHAR(255);
-	# 14  > ALTER TABLE cloud_create_vm_lc MODIFY vc_cr_resource_number BIGINT;
-	# 15  > ALTER TABLE kernel_info MODIFY kernel_name VARCHAR(255);
-	# 16  > ALTER TABLE image_info MODIFY image_name VARCHAR(255);
-	# 17  > ALTER TABLE storage_info MODIFY storage_name VARCHAR(255);
-	# 18  > ALTER TABLE auth_blocker_info MODIFY ab_image_name VARCHAR(255);
-	# 19  > ALTER TABLE resource_info ADD resource_vname VARCHAR(255);
-	# 20  > ALTER TABLE resource_info ADD resource_vnc VARCHAR(30);
-	# 21  > insert into cloud_config(cc_id, cc_key, cc_value) values (43, 'max_network', '1000');
-	# 22  > insert into cloud_config(cc_id, cc_key, cc_value) values (44, 'max_memory', '10000');
-	# 23  > insert into cloud_config(cc_id, cc_key, cc_value) values (45, 'max_cpu', '100');
-	# 24  > ALTER TABLE cloud_selector MODIFY name VARCHAR(255);
-	# 25  > ALTER TABLE cloud_requests ADD cr_appliance_capabilities VARCHAR(1000);
-	# 26  > ALTER TABLE cloud_profiles ADD pr_appliance_capabilities VARCHAR(1000);
-	# 27  > update resource_info set resource_vtype=1 where resource_id=0 and resource_vtype IS NULL;
-	# 28  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_subscription_id VARCHAR(255);
-	# 29  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_keyfile VARCHAR(5000);
-
-
-    # if cloud enabled .....
-    if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/cloud" ]; then
-		# 1  > insert into cloud_config(cc_id, cc_key, cc_value) values (42, 'allow_vnc_access', 'true');
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 42; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (42, 'allow_vnc_access', 'true')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (42, 'allow_vnc_access', 'false');"
-            fi
-        fi
-		# 21  > insert into cloud_config(cc_id, cc_key, cc_value) values (43, 'max_network', '1000');
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 43; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (43, 'max_network', '1000')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (43, 'max_network', '1000');"
-            fi
-        fi
-		# 22  > insert into cloud_config(cc_id, cc_key, cc_value) values (44, 'max_memory', '10000');
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 44; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (44, 'max_memory', '10000')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (44, 'max_memory', '10000');"
-            fi
-        fi
-		# 23  > insert into cloud_config(cc_id, cc_key, cc_value) values (45, 'max_cpu', '100');
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 45; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (45, 'max_cpu', '100')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (45, 'max_cpu', '100');"
-            fi
-        fi
-		# 24  > ALTER TABLE cloud_selector MODIFY name VARCHAR(255);
-        if check_table_exists cloud_selector; then
-			echo " -- db change : ALTER TABLE cloud_selector MODIFY name VARCHAR(255);"
-			run_sql "ALTER TABLE cloud_selector MODIFY name VARCHAR(255);"
-		fi
-		# 2  > ALTER TABLE cloud_requests ADD cr_image_password VARCHAR(255);
-        if check_table_exists cloud_requests; then
-			if ! check_column_in_table_exists cloud_requests cr_image_password; then
-				echo " -- db change : ALTER TABLE cloud_requests ADD cr_image_password VARCHAR(255)"
-				run_sql "ALTER TABLE cloud_requests ADD cr_image_password VARCHAR(255);"
-			fi
-		fi
-		# 14  > ALTER TABLE cloud_create_vm_lc MODIFY vc_cr_resource_number BIGINT;
-        if check_table_exists cloud_create_vm_lc; then
-			echo " -- db change : ALTER TABLE cloud_create_vm_lc MODIFY vc_cr_resource_number BIGINT;"
-			run_sql "ALTER TABLE cloud_create_vm_lc MODIFY vc_cr_resource_number BIGINT;"
-		fi
-
-
-		# 25  > ALTER TABLE cloud_requests ADD cr_appliance_capabilities VARCHAR(1000);
-        if check_table_exists cloud_requests; then
-			if ! check_column_in_table_exists cloud_requests cr_appliance_capabilities; then
-				echo " -- db change : ALTER TABLE cloud_requests ADD cr_appliance_capabilities VARCHAR(1000);"
-				run_sql "ALTER TABLE cloud_requests ADD cr_appliance_capabilities VARCHAR(1000);"
-			fi
-		fi
-		# 26  > ALTER TABLE cloud_profiles ADD pr_appliance_capabilities VARCHAR(1000);
-        if check_table_exists cloud_profiles; then
-			if ! check_column_in_table_exists cloud_profiles pr_appliance_capabilities; then
-				echo " -- db change : ALTER TABLE cloud_profiles ADD pr_appliance_capabilities VARCHAR(1000);"
-				run_sql "ALTER TABLE cloud_profiles ADD pr_appliance_capabilities VARCHAR(1000);"
-			fi
-		fi
-	fi
-
-
-	# 3  > create table lock_info(lock_id BIGINT NOT NULL PRIMARY KEY,lock_time VARCHAR(50),lock_section VARCHAR(50),lock_resource_id INT(5),lock_token VARCHAR(50),lock_description VARCHAR(255));
-	if ! check_table_exists lock_info; then
-		echo " -- db change : create table lock_info(lock_id BIGINT NOT NULL PRIMARY KEY,lock_time VARCHAR(50),lock_section VARCHAR(50),lock_resource_id INT(5),lock_token VARCHAR(50),lock_description VARCHAR(255))"
-		run_sql "create table lock_info(lock_id BIGINT NOT NULL PRIMARY KEY,lock_time VARCHAR(50),lock_section VARCHAR(50),lock_resource_id INT(5),lock_token VARCHAR(50),lock_description VARCHAR(255));"
-	fi
-
-
-	# 4  > adjust all base objects id to BIGINT
-	echo " -- db change : adjusting all base object ids to BIGINT"
-	run_sql "ALTER TABLE resource_info MODIFY resource_id BIGINT;"
-	run_sql "ALTER TABLE resource_info MODIFY resource_imageid BIGINT;"
-	run_sql "ALTER TABLE resource_info MODIFY resource_applianceid BIGINT;"
-	run_sql "ALTER TABLE resource_info MODIFY resource_vtype BIGINT;"
-	run_sql "ALTER TABLE resource_info MODIFY resource_vhostid BIGINT;"
-	run_sql "ALTER TABLE resource_info MODIFY resource_execdport BIGINT;"
-	run_sql "ALTER TABLE resource_info MODIFY resource_senddelay BIGINT;"
-	run_sql "ALTER TABLE kernel_info MODIFY kernel_id BIGINT;"
-	run_sql "ALTER TABLE image_info MODIFY image_id BIGINT;"
-	run_sql "ALTER TABLE image_info MODIFY image_storageid BIGINT;"
-	run_sql "ALTER TABLE appliance_info MODIFY appliance_id BIGINT;"
-	run_sql "ALTER TABLE appliance_info MODIFY appliance_imageid BIGINT;"
-	run_sql "ALTER TABLE appliance_info MODIFY appliance_cluster BIGINT;"
-	run_sql "ALTER TABLE appliance_info MODIFY appliance_ssi BIGINT;"
-	run_sql "ALTER TABLE appliance_info MODIFY appliance_resources BIGINT;"
-	run_sql "ALTER TABLE appliance_info MODIFY appliance_highavailable BIGINT;"
-	run_sql "ALTER TABLE appliance_info MODIFY appliance_virtual BIGINT;"
-	run_sql "ALTER TABLE appliance_info MODIFY appliance_virtualization_host BIGINT;"
-	run_sql "ALTER TABLE event_info MODIFY event_image_id BIGINT;"
-	run_sql "ALTER TABLE event_info MODIFY event_resource_id BIGINT;"
-	run_sql "ALTER TABLE user_info MODIFY user_id BIGINT;"
-	run_sql "ALTER TABLE user_info MODIFY user_role BIGINT;"
-	run_sql "ALTER TABLE user_info MODIFY user_wizard_step BIGINT;"
-	run_sql "ALTER TABLE user_info MODIFY user_wizard_id BIGINT;"
-	run_sql "ALTER TABLE role_info MODIFY role_id BIGINT;"
-	run_sql "ALTER TABLE storage_info MODIFY storage_id BIGINT;"
-	run_sql "ALTER TABLE storage_info MODIFY storage_type BIGINT;"
-	run_sql "ALTER TABLE storage_info MODIFY storage_resource_id BIGINT;"
-	run_sql "ALTER TABLE resource_service MODIFY resource_id BIGINT;"
-	run_sql "ALTER TABLE image_service MODIFY image_id BIGINT;"
-	run_sql "ALTER TABLE image_authentication_info MODIFY ia_id BIGINT;"
-	run_sql "ALTER TABLE image_authentication_info MODIFY ia_image_id BIGINT;"
-	run_sql "ALTER TABLE image_authentication_info MODIFY ia_resource_id BIGINT;"
-	run_sql "ALTER TABLE image_authentication_info MODIFY ia_auth_type BIGINT;"
-	run_sql "ALTER TABLE auth_blocker_info MODIFY ab_id BIGINT;"
-	run_sql "ALTER TABLE auth_blocker_info MODIFY ab_image_id BIGINT;"
-	run_sql "ALTER TABLE deployment_info MODIFY deployment_id BIGINT;"
-	run_sql "ALTER TABLE virtualization_info MODIFY virtualization_id BIGINT;"
-	run_sql "ALTER TABLE lock_info MODIFY lock_resource_id BIGINT;"
-
-	# 6  > adjust all plugin objects id to BIGINT
-	if check_table_exists wakeuponlan; then
-		run_sql "ALTER TABLE wakeuponlan MODIFY wakeuponlan_id BIGINT;"
-		run_sql "ALTER TABLE wakeuponlan MODIFY wakeuponlan_user_id BIGINT;"
-		run_sql "ALTER TABLE wakeuponlan MODIFY wakeuponlan_appliance_id BIGINT;"
-		run_sql "ALTER TABLE wakeuponlan MODIFY wakeuponlan_nic_id BIGINT;"
-		run_sql "ALTER TABLE wakeuponlan MODIFY wakeuponlan_state BIGINT;"
-	fi
-
-	# 7  > ALTER TABLE appliance_info MODIFY appliance_capabilities VARCHAR(1000);
-	echo " -- db change : ALTER TABLE appliance_info MODIFY appliance_capabilities VARCHAR(1000);"
-	run_sql "ALTER TABLE appliance_info MODIFY appliance_capabilities VARCHAR(1000);"
-
-    # if hybrid-cloud enabled .....
-    if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/hybrid-cloud" ]; then
-        if check_table_exists hybrid_cloud_accounts; then
-			if ! check_column_in_table_exists hybrid_cloud_accounts hybrid_cloud_username; then
-				# 8  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_username VARCHAR(255);
-				run_sql "ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_username VARCHAR(255);"
-			fi
-			if ! check_column_in_table_exists hybrid_cloud_accounts hybrid_cloud_password; then
-				# 9  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_password VARCHAR(255);
-				run_sql "ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_password VARCHAR(255);"
-			fi
-			if ! check_column_in_table_exists hybrid_cloud_accounts hybrid_cloud_host; then
-				# 10  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_host VARCHAR(255);
-				run_sql "ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_host VARCHAR(255);"
-			fi
-			if ! check_column_in_table_exists hybrid_cloud_accounts hybrid_cloud_port; then
-				# 11  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_port VARCHAR(255);
-				run_sql "ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_port VARCHAR(255);"
-			fi
-			if ! check_column_in_table_exists hybrid_cloud_accounts hybrid_cloud_tenant; then
-				# 12  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_tenant VARCHAR(255);
-				run_sql "ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_tenant VARCHAR(255);"
-			fi
-			if ! check_column_in_table_exists hybrid_cloud_accounts hybrid_cloud_endpoint; then
-				# 13  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_endpoint VARCHAR(255);
-				run_sql "ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_endpoint VARCHAR(255);"
-			fi
-			if ! check_column_in_table_exists hybrid_cloud_accounts hybrid_cloud_subscription_id; then
-				# 28  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_subscription_id VARCHAR(255);
-				run_sql "ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_subscription_id VARCHAR(255);"
-			fi
-			if ! check_column_in_table_exists hybrid_cloud_accounts hybrid_cloud_keyfile; then
-				# 29  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_keyfile VARCHAR(5000);
-				run_sql "ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_keyfile VARCHAR(5000);"
-			fi
-		fi
-	fi
-
-	# 15  > ALTER TABLE kernel_info MODIFY kernel_name VARCHAR(255);
-	run_sql "ALTER TABLE kernel_info MODIFY kernel_name VARCHAR(255);"
-	# 16  > ALTER TABLE image_info MODIFY image_name VARCHAR(255);
-	run_sql "ALTER TABLE image_info MODIFY image_name VARCHAR(255);"
-	# 17  > ALTER TABLE storage_info MODIFY storage_name VARCHAR(255);
-	run_sql "ALTER TABLE storage_info MODIFY storage_name VARCHAR(255);"
-	# 18  > ALTER TABLE auth_blocker_info MODIFY ab_image_name VARCHAR(255);
-	run_sql "ALTER TABLE auth_blocker_info MODIFY ab_image_name VARCHAR(255);"
-
-	if ! check_column_in_table_exists resource_info resource_vname; then
-		# 19  > ALTER TABLE resource_info ADD resource_vname VARCHAR(255);
-		run_sql "ALTER TABLE resource_info ADD resource_vname VARCHAR(255);"
-	fi
-	if ! check_column_in_table_exists resource_info resource_vnc; then
-		# 20  > ALTER TABLE resource_info ADD resource_vnc VARCHAR(30);
-		run_sql "ALTER TABLE resource_info ADD resource_vnc VARCHAR(30);"
-	fi
-
-	# 27  > update resource_info set resource_vtype=1 where resource_id=0 and resource_vtype IS NULL;
-	run_sql "update resource_info set resource_vtype=1 where resource_id=0 and resource_vtype IS NULL;"
-
-	echo "- Database sanity check for version 5.1 to 5.2 finished"
-
-
-	# from 5.2 to 5.3
-    #---------------------------------------------------------------------------
-    # from 5.2 to 5.3 the following db changes are needed
-    #---------------------------------------------------------------------------
-	# 1  > ALTER TABLE image_info ADD image_size BIGINT(30);
-	# 2  > ALTER TABLE image_info MODIFY image_deployment_parameter VARCHAR(1000);
-	# 3  > ALTER TABLE cloud_requests ADD cr_size_req VARCHAR(255);
-	# 4  > ALTER TABLE cloud_profiles ADD pr_size_req VARCHAR(255);
-	# 5  > ALTER TABLE ip_mgmt ADD ip_mgmt_resource_id BIGINT(30);
-	# 6  > ALTER TABLE ip_mgmt ADD ip_mgmt_bridge_name VARCHAR(50);
-	# 7 > insert into cloud_config(cc_id, cc_key, cc_value) values (46, 'bandwidth_metering', 'true');
-
-	if ! check_column_in_table_exists image_info image_size; then
-		# 1  > ALTER TABLE image_info ADD image_size BIGINT(30);
-		run_sql "ALTER TABLE image_info ADD image_size BIGINT(30);"
-	fi
-
-	# 2  > ALTER TABLE image_info MODIFY image_deployment_parameter VARCHAR(1000);
-	echo " -- db change : ALTER TABLE image_info MODIFY image_deployment_parameter VARCHAR(1000);"
-	run_sql "ALTER TABLE image_info MODIFY image_deployment_parameter VARCHAR(1000);"
-
-	if ! check_column_in_table_exists cloud_requests cr_size_req; then
-		# 3  > ALTER TABLE cloud_requests ADD cr_size_req VARCHAR(255);
-		run_sql "ALTER TABLE cloud_requests ADD cr_size_req VARCHAR(255);"
-	fi
-	if ! check_column_in_table_exists cloud_profiles pr_size_req; then
-		# 4  > ALTER TABLE cloud_profiles ADD pr_size_req VARCHAR(255);
-		run_sql "ALTER TABLE cloud_profiles ADD pr_size_req VARCHAR(255);"
-	fi
-
-	if ! check_column_in_table_exists ip_mgmt ip_mgmt_resource_id; then
-		# 5  > ALTER TABLE ip_mgmt ADD ip_mgmt_resource_id BIGINT(30);
-		run_sql "ALTER TABLE ip_mgmt ADD ip_mgmt_resource_id BIGINT(30);"
-	fi
-
-	if ! check_column_in_table_exists ip_mgmt ip_mgmt_bridge_name; then
-		# 6  > ALTER TABLE ip_mgmt ADD ip_mgmt_bridge_name VARCHAR(50);
-		run_sql "ALTER TABLE ip_mgmt ADD ip_mgmt_bridge_name VARCHAR(50);"
-	fi
-
-	# 7 > insert into cloud_config(cc_id, cc_key, cc_value) values (46, 'bandwidth_metering', 'true');
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 46; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (46, 'bandwidth_metering', 'true')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (46, 'bandwidth_metering', 'true');"
-            fi
-        fi
-
-
-	echo "- Database sanity check for version 5.2 to 5.3 finished"
-
-
-}
-
-
-
-
-
-
-
-case "$1" in
-	init)
-		initialize_database
-		;;
-	backup)
-		backup_database $2
-		;;
-	restore)
-		restore_database $2
-		;;
-	drop)
-		drop_database
-		;;
-	update)
-		db_update
-		;;
-esac
diff --git a/openQRM-5.3.50-CE/src/etc/db/mysql/openqrm-mysql-init.sql b/openQRM-5.3.50-CE/src/etc/db/mysql/openqrm-mysql-init.sql
deleted file mode 100644
index c5e1b09..0000000
--- a/openQRM-5.3.50-CE/src/etc/db/mysql/openqrm-mysql-init.sql
+++ /dev/null
@@ -1,251 +0,0 @@
-# initializes the openqrm db
-
-create database OPENQRM_DB DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; 
-use OPENQRM_DB;
-
-
-# resource table
-create table resource_info(
-	resource_id BIGINT NOT NULL PRIMARY KEY,
-	resource_localboot INT(1),
-	resource_kernel VARCHAR(50),
-	resource_kernelid BIGINT(3),
-	resource_image VARCHAR(50),
-	resource_imageid BIGINT,
-	resource_openqrmserver VARCHAR(20),
-	resource_basedir VARCHAR(100),
-	resource_applianceid BIGINT,
-	resource_ip VARCHAR(20),
-	resource_subnet VARCHAR(20),
-	resource_broadcast VARCHAR(20),
-	resource_network VARCHAR(20),
-	resource_mac VARCHAR(20),
-	resource_nics INT(2),
-	resource_uptime BIGINT(10),
-	resource_cpunumber INT(2),
-	resource_cpuspeed BIGINT(10),
-	resource_cpumodel VARCHAR(255),
-	resource_memtotal BIGINT(10),
-	resource_memused BIGINT(10),
-	resource_swaptotal BIGINT(10),
-	resource_swapused BIGINT(10),
-	resource_hostname VARCHAR(60),
-	resource_vtype BIGINT,
-	resource_vhostid BIGINT,
-	resource_vname VARCHAR(255),
-	resource_vnc VARCHAR(30),
-	resource_load DOUBLE(3,2),
-	resource_execdport BIGINT,
-	resource_senddelay INT(3),
-	resource_capabilities VARCHAR(255),
-	resource_lastgood VARCHAR(10),
-	resource_state VARCHAR(20),
-	resource_event VARCHAR(20)
-);
-
-
-# kernel table
-create table kernel_info(
-	kernel_id BIGINT NOT NULL PRIMARY KEY,
-	kernel_name VARCHAR(255),
-	kernel_version VARCHAR(50),
-	kernel_capabilities VARCHAR(255),
-	kernel_comment VARCHAR(255)
-);
-
-
-# image table
-create table image_info(
-	image_id BIGINT NOT NULL PRIMARY KEY,
-	image_name VARCHAR(255),
-	image_version VARCHAR(30),
-	# can be : ramdisk, nfs, local, iscsi
-	image_type VARCHAR(255),
-	# can be : ram, /dev/hdX, /dev/sdX, nfs, iscsi
-	image_rootdevice VARCHAR(255),
-	image_size BIGINT(30),
-	# can be : ext2/3, nfs
-	image_rootfstype VARCHAR(255),
-	image_storageid BIGINT,
-	# freetext parameter for the deployment plugin
-	image_deployment_parameter VARCHAR(1000),
-	image_isshared INT(1),
-	image_isactive INT(1),
-	image_comment VARCHAR(255),
-	image_capabilities VARCHAR(255)
-);
-
-
-# appliance table
-create table appliance_info(
-	appliance_id BIGINT NOT NULL PRIMARY KEY,
-	appliance_name VARCHAR(50),
-	appliance_kernelid BIGINT(3),
-	appliance_imageid BIGINT,
-	appliance_starttime BIGINT(10),
-	appliance_stoptime BIGINT(10),
-	appliance_cpunumber INT(2),
-	appliance_cpuspeed BIGINT(10),
-	appliance_cpumodel VARCHAR(255),
-	appliance_memtotal BIGINT(10),
-	appliance_swaptotal BIGINT(10),
-	appliance_nics INT(2),
-	appliance_capabilities VARCHAR(1000),
-	appliance_cluster BIGINT,
-	appliance_ssi BIGINT,
-	appliance_resources BIGINT,
-	appliance_highavailable BIGINT,
-	appliance_virtual BIGINT,
-	appliance_virtualization VARCHAR(20),
-	appliance_virtualization_host BIGINT,
-	appliance_state VARCHAR(20),
-	appliance_comment VARCHAR(255),
-	appliance_wizard VARCHAR(255),
-	appliance_event VARCHAR(20)
-);
-
-
-
-
-# event table
-create table event_info(
-	event_id BIGINT NOT NULL PRIMARY KEY,
-	event_name VARCHAR(50),
-	event_time VARCHAR(50),
-	event_priority INT(4),
-	event_source VARCHAR(50),
-	event_description VARCHAR(255),
-	event_comment VARCHAR(100),
-	event_capabilities VARCHAR(255),
-	event_status INT(4),
-	event_image_id BIGINT,
-	event_resource_id BIGINT
-);
-
-
-create table user_info(
-	user_id BIGINT NOT NULL PRIMARY KEY,
-	user_name VARCHAR(20),
-	user_password VARCHAR(20),
-	user_gender VARCHAR(1),
-	user_first_name VARCHAR(50),
-	user_last_name VARCHAR(50),
-	user_department VARCHAR(50),
-	user_office VARCHAR(50),
-	user_role BIGINT,
-	user_last_update_time VARCHAR(50),
-	user_description VARCHAR(255),
-	user_capabilities VARCHAR(255),
-	user_wizard_name VARCHAR(255),
-	user_wizard_step BIGINT,
-	user_wizard_id BIGINT,
-	user_state VARCHAR(20),
-	user_lang VARCHAR(5)
-);
-
-create table role_info(
-	role_id BIGINT NOT NULL PRIMARY KEY,
-	role_name VARCHAR(20),
-	role_comment VARCHAR(255)
-);
-
-
-create table storage_info(
-	storage_id BIGINT NOT NULL PRIMARY KEY,
-	storage_name VARCHAR(255),
-	storage_resource_id BIGINT,
-	storage_type BIGINT,
-	storage_comment VARCHAR(100),
-	storage_capabilities VARCHAR(255),
-	storage_state VARCHAR(20)
-);
-
-
-create table resource_service (
-	resource_id BIGINT NOT NULL PRIMARY KEY,
-	service VARCHAR(50) NOT NULL,
-	INDEX(service)
-);
-
-create table image_service (
-	image_id BIGINT NOT NULL PRIMARY KEY,
-	service VARCHAR(50) NOT NULL,
-	INDEX(service)
-);
-
-
-# image_authentication table
-create table image_authentication_info(
-	ia_id BIGINT NOT NULL PRIMARY KEY,
-	ia_image_id BIGINT,
-	ia_resource_id BIGINT,
-	ia_auth_type BIGINT
-);
-
-# storage_authentication_blocker table
-create table auth_blocker_info(
-	ab_id BIGINT NOT NULL PRIMARY KEY,
-	ab_image_id BIGINT,
-	ab_image_name VARCHAR(255),
-	ab_start_time VARCHAR(20)
-);
-
-# plugg-able deployment types
-create table deployment_info(
-	deployment_id BIGINT NOT NULL PRIMARY KEY,
-	deployment_name VARCHAR(50),
-	deployment_type VARCHAR(50),
-	deployment_description VARCHAR(50),
-	deployment_storagetype VARCHAR(50),
-	deployment_storagedescription VARCHAR(50),
-	deployment_mapping VARCHAR(255)
-);
-
-# plugg-able virtualization types
-create table virtualization_info(
-	virtualization_id BIGINT NOT NULL PRIMARY KEY,
-	virtualization_name VARCHAR(50),
-	virtualization_type VARCHAR(50),
-	virtualization_mapping VARCHAR(255)
-);
-
-# datacenter statistics
-create table datacenter_info(
-	datacenter_id BIGINT NOT NULL PRIMARY KEY,
-	datacenter_load_overall VARCHAR(50),
-	datacenter_load_server VARCHAR(50),
-	datacenter_load_storage VARCHAR(50),
-	datacenter_cpu_total VARCHAR(50),
-	datacenter_mem_total VARCHAR(50),
-	datacenter_mem_used VARCHAR(50)
-);
-
-# global lock
-create table lock_info(
-	lock_id BIGINT NOT NULL PRIMARY KEY,
-	lock_time VARCHAR(50),
-	lock_section VARCHAR(50),
-	lock_resource_id BIGINT,
-	lock_token VARCHAR(50),
-	lock_description VARCHAR(255)
-);
-
-
-# initial data
-insert into kernel_info (kernel_id, kernel_name, kernel_version) values ('0', 'openqrm', 'openqrm');
-insert into image_info (image_id, image_name, image_version, image_type, image_rootdevice, image_isshared) values ('0', 'openqrm', 'openqrm', 'ram', 'ram', '0');
-
-insert into image_info (image_id, image_name, image_version, image_type, image_rootdevice, image_rootfstype, image_isshared) values ('1', 'idle', 'openqrm', 'ram', 'ram', 'ext2', '1');
-insert into resource_info (resource_id, resource_localboot, resource_kernel, resource_image, resource_openqrmserver, resource_ip, resource_vtype) values ('0', '1', 'local', 'local', 'OPENQRM_SERVER_IP_ADDRESS', 'OPENQRM_SERVER_IP_ADDRESS', '1');
-# base deployment type ram
-insert into deployment_info (deployment_id, deployment_name, deployment_type, deployment_description, deployment_storagetype, deployment_storagedescription ) values (1, 'ramdisk', 'ram', 'Ramdisk Deployment', 'none', 'none');
-# base virtualization type physical
-insert into virtualization_info (virtualization_id, virtualization_name, virtualization_type ) values (1, 'Physical System', 'physical');
-# user openqrm
-insert into user_info (user_id, user_name, user_password, user_gender, user_first_name, user_last_name, user_department, user_office, user_role, user_last_update_time, user_description, user_capabilities, user_state, user_lang) values (0, 'openqrm', 'openqrm', '-', '-', '-', '-', '-', 0, '-', 'default admin user', '', 'activated', 'en');
-insert into user_info (user_id, user_name, user_password, user_gender, user_first_name, user_last_name, user_department, user_office, user_role, user_last_update_time, user_description, user_capabilities, user_state, user_lang) values (1, 'anonymous', 'openqrm', '-', '-', '-', '-', '-', 1, '-', 'default readonly user', '', 'activated', 'en');
-insert into role_info (role_id, role_name) values (0, 'administrator');
-insert into role_info (role_id, role_name) values (1, 'readonly');
-
-insert into appliance_info (appliance_id, appliance_name, appliance_kernelid, appliance_imageid, appliance_starttime, appliance_resources, appliance_virtualization, appliance_state, appliance_comment) values (1, 'openqrm', 0, 0, '10', 0, 1, 'active', 'openQRM server');
-
diff --git a/openQRM-5.3.50-CE/src/etc/db/mysql/openqrm-mysql-maintenance b/openQRM-5.3.50-CE/src/etc/db/mysql/openqrm-mysql-maintenance
deleted file mode 100644
index 5fc8ecd..0000000
--- a/openQRM-5.3.50-CE/src/etc/db/mysql/openqrm-mysql-maintenance
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-# openQRM maintenance script, runs once a day via cron
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-. @@OPENQRM_SERVER_BASE_DIR@@/openqrm/etc/openqrm-server.conf
-. @@OPENQRM_SERVER_BASE_DIR@@/openqrm/include/openqrm-server-functions
-# get full server config
-openqrm_server_get_config
-
-# define maintenance dir for mysql backup files
-DB_MAINTENANCE_DIR="/var/spool/openqrm_db/"
-
-
-if ! which mysql 1>/dev/null 2>&1; then
-	echo "ERROR: Mysql client 'mysql' not installed/found on this system" | logger
-	exit 1
-else
-	export MYSQL_CLIENT=`which mysql`
-fi
-if ! which mysqldump 1>/dev/null 2>&1; then
-	echo "ERROR: Mysql 'mysqldump' not installed/found on this system"  | logger
-	exit 1
-else
-	export MYSQL_DUMP=`which mysqldump`
-fi
-
-BACKUP_TIME=`date +%T--%x | sed -e "s/:/-/g" | sed -e "s#/#-#g"`
-if  [ "$OPENQRM_DATABASE_PASSWORD" != "" ]; then
-	DB_PASS="-p$OPENQRM_DATABASE_PASSWORD"
-fi
-
-if [ ! -d "$DB_MAINTENANCE_DIR" ]; then
-	mkdir -p $DB_MAINTENANCE_DIR
-fi
-
-# backup event_info table
-echo "NOTICE: Saving event_info table to $DB_MAINTENANCE_DIR/openqrm_db_event_info_$BACKUP_TIME.sql"  | logger
-$MYSQL_DUMP -u $OPENQRM_DATABASE_USER $DB_PASS --host $OPENQRM_DATABASE_SERVER $OPENQRM_DATABASE_NAME event_info > $DB_MAINTENANCE_DIR/openqrm_db_event_info_$BACKUP_TIME.sql
-gzip $DB_MAINTENANCE_DIR/openqrm_db_event_info_$BACKUP_TIME.sql
-# clean up event_info table
-echo "NOTICE: Cleaning event_info table"  | logger
-$MYSQL_CLIENT -u $OPENQRM_DATABASE_USER $DB_PASS --host $OPENQRM_DATABASE_SERVER $OPENQRM_DATABASE_NAME -e "delete from event_info"
-# clean up datacenter_info table
-echo "NOTICE: Cleaning datacenter_info"  | logger
-$MYSQL_CLIENT -u $OPENQRM_DATABASE_USER $DB_PASS --host $OPENQRM_DATABASE_SERVER $OPENQRM_DATABASE_NAME -e "delete from datacenter_info"
-
-# backup cloud_transaction
-if $MYSQL_CLIENT -u $OPENQRM_DATABASE_USER $DB_PASS --host $OPENQRM_DATABASE_SERVER $OPENQRM_DATABASE_NAME -e "show tables" | grep cloud_transaction 1>/dev/null; then
-    echo "NOTICE: Saving cloud_transaction table to $DB_MAINTENANCE_DIR/openqrm_db_cloud_transaction_$BACKUP_TIME.sql"  | logger
-    $MYSQL_DUMP -u $OPENQRM_DATABASE_USER $DB_PASS --host $OPENQRM_DATABASE_SERVER $OPENQRM_DATABASE_NAME cloud_transaction > $DB_MAINTENANCE_DIR/openqrm_db_cloud_transaction_$BACKUP_TIME.sql
-    gzip $DB_MAINTENANCE_DIR/openqrm_db_cloud_transaction_$BACKUP_TIME.sql
-    # clean up cloud_transaction
-    echo "NOTICE: Cleaning cloud_transaction table"  | logger
-    $MYSQL_CLIENT -u $OPENQRM_DATABASE_USER $DB_PASS --host $OPENQRM_DATABASE_SERVER $OPENQRM_DATABASE_NAME -e "delete from cloud_transaction"
-fi
-
-# backup cloud_zones_transaction
-if $MYSQL_CLIENT -u $OPENQRM_DATABASE_USER $DB_PASS --host $OPENQRM_DATABASE_SERVER $OPENQRM_DATABASE_NAME -e "show tables" | grep cloud_zones_transaction 1>/dev/null; then
-    echo "NOTICE: Saving cloud_zones_transaction table to $DB_MAINTENANCE_DIR/openqrm_db_cloud_zones_transaction_$BACKUP_TIME.sql"  | logger
-    $MYSQL_DUMP -u $OPENQRM_DATABASE_USER $DB_PASS --host $OPENQRM_DATABASE_SERVER $OPENQRM_DATABASE_NAME cloud_zones_transaction > $DB_MAINTENANCE_DIR/openqrm_db_cloud_zones_transaction_$BACKUP_TIME.sql
-    gzip $DB_MAINTENANCE_DIR/openqrm_db_cloud_zones_transaction_$BACKUP_TIME.sql
-    # clean up cloud_zones_transaction
-    echo "NOTICE: Cleaning cloud_zones_transaction table"  | logger
-    $MYSQL_CLIENT -u $OPENQRM_DATABASE_USER $DB_PASS --host $OPENQRM_DATABASE_SERVER $OPENQRM_DATABASE_NAME -e "delete from cloud_zones_transaction"
-fi
-
diff --git a/openQRM-5.3.50-CE/src/etc/db/oracle/README b/openQRM-5.3.50-CE/src/etc/db/oracle/README
deleted file mode 100644
index 1194c31..0000000
--- a/openQRM-5.3.50-CE/src/etc/db/oracle/README
+++ /dev/null
@@ -1,20 +0,0 @@
-openqrm-server.conf setup for oracle database :
-
-OPENQRM_DATABASE_TYPE="oracle"                    # supported are : mysql, oracle, db2, postgres
-OPENQRM_DATABASE_SERVER="localhost"               # ip-address of the database server
-OPENQRM_DATABASE_NAME="oratest"                   # database name
-OPENQRM_DATABASE_USER="scott"                     # database user
-OPENQRM_DATABASE_PASSWORD="tiger"                 # database password
-
-
-Hints to compile php + oracle support :
-
-install oracle
-source /home/oracle/.bashrc  (add to /root/.bashrc)
-create database e.g. "oratest"
-
-configure + compile php with oracle/oci support :
-./configure  i386-redhat-linux --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --sysconfdir=/etc --datadir=/usr/share --includedir=/usr/include --libdir=/usr/lib --libexecdir=/usr/libexec --localstatedir=/var --sharedstatedir=/usr/com --mandir=/usr/share/man --infodir=/usr/share/info --prefix=/usr --with-config-file-path=/etc --enable-force-cgi-redirect --disable-debug --with-oci8=/opt/oracle/product/9.2.0/ --with-oracle=/opt/oracle/product/9.2.0/ --with-mysql=shared,/usr --with-apxs=/usr/sbin/apxs --enable-sigchild --no-create --no-recursion
-make 
-make install
-
diff --git a/openQRM-5.3.50-CE/src/etc/db/oracle/openqrm-oracle-functions b/openQRM-5.3.50-CE/src/etc/db/oracle/openqrm-oracle-functions
deleted file mode 100644
index 831c56f..0000000
--- a/openQRM-5.3.50-CE/src/etc/db/oracle/openqrm-oracle-functions
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-# openQRM oracle-specfic functions
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	echo "ERROR: Please export OPENQRM_SERVER_BASE_DIR before sourcing $0"
-	exit 1
-fi
-
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-OPENQRM_DATABASE_INIT="$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/oracle/openqrm-oracle-init.sql"
-OPENQRM_DATABASE_INIT_TMP="/tmp/openqrm-oracle-init.sql"
-
-
-function initialize_database() {
-
-	if ! which sqlplus 1>/dev/null 2>&1; then
-		echo "ERROR: Oracle client 'sqlplus' not installed/found on this system"
-		return 1
-	else
-		ORACLE_CLIENT=`which sqlplus`
-	fi
-
-	echo "Initializing the openQRM-database"
-	cat $OPENQRM_DATABASE_INIT |	\
-		sed -e "s/OPENQRM_SERVER_IP_ADDRESS/$OPENQRM_SERVER_IP_ADDRESS/g"	\
-		> $OPENQRM_DATABASE_INIT_TMP
-	$ORACLE_CLIENT $OPENQRM_DATABASE_USER/$OPENQRM_DATABASE_PASSWORD@$OPENQRM_DATABASE_NAME @$OPENQRM_DATABASE_INIT_TMP
-	return $?
-}
-
-
-function backup_database() {
-	local SQL=$1
-	echo "Creating backup of the openQRM-database at $SQL"
-	echo "NOTICE: Backup for Oracle databases not yet implemented"
-	return $RET
-
-}
-
-function restore_database() {
-	local SQL=$1
-	echo "Restoring the openQRM-database from $SQL"
-	echo "NOTICE: Restore for Oracle databases not yet implemented"
-	return $RET
-
-}
-
-function drop_database() {
-	echo "Dropping the openQRM-database"
-	echo "NOTICE: Drop for Oracle databases not yet implemented"
-	return $RET
-}
-
-
-
-case "$1" in
-	init)
-		initialize_database
-		;;
-	backup)
-		backup_database $2
-		;;
-	restore)
-		restore_database $2
-		;;
-	drop)
-		drop_database
-		;;
-esac
diff --git a/openQRM-5.3.50-CE/src/etc/db/oracle/openqrm-oracle-init.sql b/openQRM-5.3.50-CE/src/etc/db/oracle/openqrm-oracle-init.sql
deleted file mode 100644
index c4e9194..0000000
--- a/openQRM-5.3.50-CE/src/etc/db/oracle/openqrm-oracle-init.sql
+++ /dev/null
@@ -1,229 +0,0 @@
-
-drop table resource_info;
-create table resource_info(
-	resource_id INTEGER NOT NULL PRIMARY KEY,
-	resource_localboot INTEGER,
-	resource_kernel VARCHAR2(50),
-	resource_kernelid INTEGER,
-	resource_image VARCHAR2(50),
-	resource_imageid INTEGER,
-	resource_openqrmserver VARCHAR2(20),
-	resource_basedir VARCHAR2(100),
-	resource_applianceid INTEGER,
-	resource_ip VARCHAR2(20),
-	resource_subnet VARCHAR2(20),
-	resource_broadcast VARCHAR2(20),
-	resource_network VARCHAR2(20),
-	resource_mac VARCHAR2(20),
-	resource_nics INTEGER,
-	resource_uptime INTEGER,
-	resource_cpunumber INTEGER,
-	resource_cpuspeed INTEGER,
-	resource_cpumodel VARCHAR2(255),
-	resource_memtotal INTEGER,
-	resource_memused INTEGER,
-	resource_swaptotal INTEGER,
-	resource_swapused INTEGER,
-	resource_hostname VARCHAR2(60),
-	resource_vtype INTEGER,
-	resource_vhostid INTEGER,
-	resource_vname VARCHAR2(255),
-	resource_vnc VARCHAR2(30),
-	resource_load FLOAT,
-	resource_execdport INTEGER,
-	resource_senddelay INTEGER,
-	resource_capabilities VARCHAR2(255),
-	resource_lastgood VARCHAR2(10),
-	resource_state VARCHAR2(20),
-	resource_event VARCHAR2(20)
-);
-
-
-
-drop table kernel_info;
-create table kernel_info(
-	kernel_id INTEGER NOT NULL PRIMARY KEY,
-	kernel_name VARCHAR2(255),
-	kernel_version VARCHAR2(50),
-	kernel_capabilities VARCHAR2(255),
-	kernel_comment VARCHAR2(255)
-);
-
-
-
-drop table image_info;
-create table image_info(
-	image_id INTEGER NOT NULL PRIMARY KEY,
-	image_name VARCHAR2(255),
-	image_version VARCHAR2(30),
-	image_type VARCHAR2(255),
-	image_rootdevice VARCHAR2(255),
-	image_rootfstype VARCHAR2(255),
-	image_size INTEGER,
-	image_storageid INTEGER,
-	image_deployment_parameter VARCHAR2(1000),
-	image_isshared INTEGER,
-	image_isactive INTEGER,
-	image_comment VARCHAR2(255),
-	image_capabilities VARCHAR2(255)
-);
-
-drop table appliance_info;
-create table appliance_info(
-	appliance_id INTEGER NOT NULL PRIMARY KEY,
-	appliance_name VARCHAR2(50),
-	appliance_kernelid INTEGER,
-	appliance_imageid INTEGER,
-	appliance_starttime INTEGER,
-	appliance_stoptime INTEGER,
-	appliance_cpunumber INTEGER,
-	appliance_cpuspeed INTEGER,
-	appliance_cpumodel VARCHAR2(255),
-	appliance_memtotal INTEGER,
-	appliance_swaptotal INTEGER,
-	appliance_nics INTEGER,
-	appliance_capabilities VARCHAR2(1000),
-	appliance_cluster INTEGER,
-	appliance_ssi INTEGER,
-	appliance_resources INTEGER,
-	appliance_highavailable INTEGER,
-	appliance_virtual INTEGER,
-	appliance_virtualization VARCHAR2(20),
-	appliance_virtualization_host INTEGER,
-	appliance_state VARCHAR2(20),
-	appliance_comment VARCHAR2(255),
-	appliance_wizard VARCHAR2(255),
-	appliance_event VARCHAR2(20)
-);
-
-drop table event_info;
-create table event_info(
-	event_id INTEGER NOT NULL PRIMARY KEY,
-	event_name VARCHAR2(50),
-	event_time VARCHAR2(50),
-	event_priority INTEGER,
-	event_source VARCHAR2(50),
-	event_description VARCHAR2(255),
-	event_comment VARCHAR2(100),
-	event_capabilities VARCHAR2(255),
-	event_status INTEGER,
-	event_image_id INTEGER,
-	event_resource_id INTEGER
-);
-
-
-
-drop table user_info;
-create table user_info(
-	user_id INTEGER NOT NULL PRIMARY KEY,
-	user_name VARCHAR2(20),
-	user_password VARCHAR2(20),
-	user_gender VARCHAR2(1),
-	user_first_name VARCHAR2(50),
-	user_last_name VARCHAR2(50),
-	user_department VARCHAR2(50),
-	user_office VARCHAR2(50),
-	user_role INTEGER,
-	user_last_update_time VARCHAR2(50),
-	user_description VARCHAR2(255),
-	user_capabilities VARCHAR2(255),
-	user_wizard_name VARCHAR2(255),
-	user_wizard_step INTEGER,
-	user_wizard_id INTEGER,
-	user_state VARCHAR2(20),
-	user_lang VARCHAR2(5)
-);
-
-
-drop table role_info;
-create table role_info(
-	role_id INTEGER NOT NULL PRIMARY KEY,
-	role_name VARCHAR2(20)
-);
-
-
-drop table storage_info;
-create table storage_info(
-	storage_id INTEGER NOT NULL PRIMARY KEY,
-	storage_name VARCHAR2(255),
-	storage_resource_id INTEGER,
-	storage_type INTEGER,
-	storage_comment VARCHAR2(100),
-	storage_capabilities VARCHAR2(255),
-	storage_state VARCHAR2(20)
-);
-
-
-drop table resource_service;
-create table resource_service(
-	resource_id INTEGER NOT NULL PRIMARY KEY,
-	service VARCHAR2(50)
-);
-
-drop table image_service;
-create table image_service(
-	image_id INTEGER NOT NULL PRIMARY KEY,
-	service VARCHAR2(50)
-);
-
-drop table image_authentication_info;
-create table image_authentication_info(
-	ia_id INTEGER NOT NULL PRIMARY KEY,
-	ia_image_id INTEGER,
-	ia_resource_id INTEGER,
-	ia_auth_type INTEGER
-);
-
-drop table auth_blocker_info;
-create table auth_blocker_info(
-	ab_id INTEGER NOT NULL PRIMARY KEY,
-	ab_image_id INTEGER,
-	ab_image_name VARCHAR2(255),
-	ab_start_time VARCHAR2(20)
-);
-
-drop table deployment_info;
-create table deployment_info(
-	deployment_id INTEGER NOT NULL PRIMARY KEY,
-	deployment_storagetype_id INTEGER,
-	deployment_name VARCHAR2(50),
-	deployment_type VARCHAR2(50),
-	deployment_description VARCHAR2(50),
-	deployment_storagetype VARCHAR2(50),
-	deployment_storagedescription VARCHAR2(50),
-	deployment_mapping VARCHAR2(255)
-);
-
-drop table virtualization_info;
-create table virtualization_info(
-	virtualization_id INTEGER NOT NULL PRIMARY KEY,
-	virtualization_name VARCHAR2(50),
-	virtualization_type VARCHAR2(50),
-	virtualization_mapping VARCHAR2(255)
-);
-
-drop table datacenter_info;
-create table datacenter_info(
-	datacenter_id INTEGER NOT NULL PRIMARY KEY,
-	datacenter_load_overall VARCHAR2(50),
-	datacenter_load_server VARCHAR2(50),
-	datacenter_load_storage VARCHAR2(50),
-	datacenter_cpu_total VARCHAR2(50),
-	datacenter_mem_total VARCHAR2(50),
-	datacenter_mem_used VARCHAR2(50)
-);
-
-insert into kernel_info (kernel_id, kernel_name, kernel_version) values (0, 'openqrm', 'openqrm');
-insert into image_info (image_id, image_name, image_version, image_type, image_rootdevice, image_isshared) values (0, 'openqrm', 'openqrm', 'ram', 'ram', 0);
-
-insert into image_info (image_id, image_name, image_version, image_type, image_rootdevice, image_rootfstype, image_isshared) values ('1', 'idle', 'openqrm', 'ram', 'ram', 'ext2', '1');
-insert into resource_info (resource_id, resource_localboot, resource_kernel, resource_image, resource_openqrmserver, resource_ip) values ('0', '1', 'local', 'local', 'OPENQRM_SERVER_IP_ADDRESS', 'OPENQRM_SERVER_IP_ADDRESS');
-insert into deployment_info (deployment_id, deployment_name, deployment_type, deployment_description, deployment_storagetype, deployment_storagedescription ) values ('1', 'ramdisk', 'ram', 'Ramdisk Deployment', 'none', 'none');
-insert into virtualization_info (virtualization_id, virtualization_name, virtualization_type) values ('1', 'Physical System', 'physical');
-insert into user_info (user_id, user_name, user_password, user_gender, user_first_name, user_last_name, user_department, user_office, user_role, user_last_update_time, user_description, user_capabilities, user_state, user_lang) values (0, 'openqrm', 'openqrm', '-', '-', '-', '-', '-', 0, '-', 'default admin user', '-', 'activated', 'en');
-insert into user_info (user_id, user_name, user_password, user_gender, user_first_name, user_last_name, user_department, user_office, user_role, user_last_update_time, user_description, user_capabilities, user_state, user_lang) values (1, 'anonymous', 'openqrm', '-', '-', '-', '-', '-', 1, '-', 'default readonly user', '-', 'activated', 'en');
-insert into role_info (role_id, role_name) values (0, 'administrator');
-insert into role_info (role_id, role_name) values (1, 'readonly');
-
-
-quit
diff --git a/openQRM-5.3.50-CE/src/etc/db/postgres/README b/openQRM-5.3.50-CE/src/etc/db/postgres/README
deleted file mode 100644
index aca33b4..0000000
--- a/openQRM-5.3.50-CE/src/etc/db/postgres/README
+++ /dev/null
@@ -1,28 +0,0 @@
-openqrm-server.conf setup for postgres database :
-
-OPENQRM_DATABASE_TYPE="postgres"                  # supported are : mysql, oracle, db2, ...
-OPENQRM_DATABASE_SERVER="localhost"               # ip-address of the database server
-OPENQRM_DATABASE_NAME="openqrm"                   # database name
-OPENQRM_DATABASE_USER="openqrm"                   # database user
-OPENQRM_DATABASE_PASSWORD="test"                  # database password
-
-
-Hints for compiling php + postgress support :
-
-Use the standart php with postgres support
-start postgres and create db by :
-
-su - postgres
--bash-2.05b$ dropdb openqrm
-DROP DATABASE
--bash-2.05b$ createdb openqrm
-CREATE DATABASE
--bash-2.05b$ dropuser openqrm
-DROP USER
--bash-2.05b$ createuser -a -D -P openqrm
-Enter password for user "openqrm":
-Enter it again:
-CREATE USER
--bash-2.05b$
-
-
diff --git a/openQRM-5.3.50-CE/src/etc/db/postgres/openqrm-postgres-functions b/openQRM-5.3.50-CE/src/etc/db/postgres/openqrm-postgres-functions
deleted file mode 100644
index e4bb598..0000000
--- a/openQRM-5.3.50-CE/src/etc/db/postgres/openqrm-postgres-functions
+++ /dev/null
@@ -1,642 +0,0 @@
-#!/bin/bash
-# openQRM postgres-specfic functions
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	echo "ERROR: Please export OPENQRM_SERVER_BASE_DIR before sourcing $0"
-	exit 1
-fi
-
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-OPENQRM_DATABASE_INIT="$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/postgres/openqrm-postgres-init.sql"
-OPENQRM_DATABASE_INIT_TMP=/tmp/openqrm-postgres-init.sql
-OPENQRM_DATABASE_MAINTENANCE="$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/postgres/openqrm-postgres-maintenance"
-OPENQRM_DATABASE_MAINTENANCE_FNAME=`basename $OPENQRM_DATABASE_MAINTENANCE`
-
-
-if ! which psql 1>/dev/null 2>&1; then
-	echo "ERROR: Postgres client 'psql' not installed/found on this system"
-	exit 1
-else
-	POSTGRES_CLIENT=`which psql`
-fi
-if ! which pg_dump 1>/dev/null 2>&1; then
-	echo "ERROR: Postgres 'pg_dump' not installed/found on this system"
-	exit 1
-else
-	POSTGRES_DUMP=`which pg_dump`
-fi
-
-
-function initialize_database() {
-	echo "Initializing the openQRM-database"
-	cat $OPENQRM_DATABASE_INIT |	\
-		sed -e "s/OPENQRM_SERVER_IP_ADDRESS/$OPENQRM_SERVER_IP_ADDRESS/g"	\
-		> $OPENQRM_DATABASE_INIT_TMP
-	chmod 777 $OPENQRM_DATABASE_INIT_TMP
-	su - postgres -c "kill `ps ax | grep postgres | grep -w $OPENQRM_DATABASE_NAME | awk '{ print $1}'` && dropdb $OPENQRM_DATABASE_NAME" 1>/dev/null 2>&1
-	su - postgres -c "dropuser $OPENQRM_DATABASE_USER" 1>/dev/null 2>&1
-	su - postgres -c "createdb $OPENQRM_DATABASE_NAME"
-	su - postgres -c "createuser -s $OPENQRM_DATABASE_USER"
-	su - postgres -c "$POSTGRES_CLIENT -d $OPENQRM_DATABASE_NAME --set openqrmdbuser=$OPENQRM_DATABASE_USER -f $OPENQRM_DATABASE_INIT_TMP"
-	RET=$?
-	if [ "$OPENQRM_DATABASE_PASSWORD" != "" ]; then
-		su - postgres -c "$POSTGRES_CLIENT -c \"ALTER USER $OPENQRM_DATABASE_USER WITH PASSWORD '$OPENQRM_DATABASE_PASSWORD'\""
-	fi
-	rm -f $OPENQRM_DATABASE_INIT_TMP
-	# add the db maintenance to cron
-	cat $OPENQRM_DATABASE_MAINTENANCE | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" > /etc/cron.daily/$OPENQRM_DATABASE_MAINTENANCE_FNAME
-	chmod +x /etc/cron.daily/$OPENQRM_DATABASE_MAINTENANCE_FNAME
-	if [ -x "/etc/init.d/cron" ]; then
-	    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-			invoke-rc.d cron reload
-	    else
-			/etc/init.d/cron reload
-	    fi
-    elif [ -x "/etc/init.d/crond" ]; then
-	    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-			invoke-rc.d crond reload
-	    else
-			/etc/init.d/crond reload
-	    fi
-	else
-	    echo "Could not find cron init script in /etc/init.d/. Please reload cron manually!"
-	fi
-	return $RET
-}
-
-
-
-function backup_database() {
-	local SQL=$1
-	local PG_BACKUP_DIR=`dirname $SQL`
-	chown -R postgres $PG_BACKUP_DIR
-	echo "Creating backup of the openQRM-database at $SQL"
-	su - postgres -c "$POSTGRES_DUMP -w $OPENQRM_DATABASE_NAME > $SQL"
-	return $RET
-
-}
-
-function restore_database() {
-	local SQL=$1
-	echo "Restoring the openQRM-database from $SQL"
-	su - postgres -c "$POSTGRES_CLIENT -d $OPENQRM_DATABASE_NAME --set openqrmdbuser=$OPENQRM_DATABASE_USER -f $SQL"
-	return $RET
-}
-
-function drop_database() {
-	echo "Dropping the openQRM-database"
-	su - postgres -c "dropdb $OPENQRM_DATABASE_NAME" 1>/dev/null 2>&1
-	RET=$?
-	# remove maintenance cron job
-	rm -f /etc/cron.daily/$OPENQRM_DATABASE_MAINTENANCE_FNAME
-	if [ -x "/etc/init.d/cron" ]; then
-	    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d cron reload
-	    else
-		/etc/init.d/cron reload
-	    fi
-	    elif [ -x "/etc/init.d/crond" ]; then
-	    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d crond reload
-	    else
-		/etc/init.d/crond reload
-	    fi
-	else
-	    echo "Could not find cron init script in /etc/init.d/. Please reload cron manually!"
-	fi
-	return $RET
-}
-
-
-
-########################### functions to update the db shema ###########################
-
-function check_table_exists(){
-    local DB_TABLE=$1
-    local SQL="select * from $DB_TABLE"
-    su - postgres -c "$POSTGRES_CLIENT -d $OPENQRM_DATABASE_NAME --set openqrmdbuser=$OPENQRM_DATABASE_USER --command \"$SQL\"" 1>/dev/null 2>&1
-}
-
-
-function check_column_in_table_exists(){
-    local DB_TABLE=$1
-    local DB_COLUMN=$2
-    local SQL="select $DB_COLUMN from $DB_TABLE"
-    su - postgres -c "$POSTGRES_CLIENT -d $OPENQRM_DATABASE_NAME --set openqrmdbuser=$OPENQRM_DATABASE_USER --command \"$SQL\"" 1>/dev/null 2>&1
-}
-
-
-function check_if_data_in_column_of_table_exists(){
-    local DB_TABLE=$1
-    local DB_COLUMN=$2
-    local DB_DATA=$3
-    local DB_OUTPUT_LOG="/tmp/dboutput.log"
-    local SQL="select * from $DB_TABLE where $DB_COLUMN=$DB_DATA"
-    su - postgres -c "$POSTGRES_CLIENT -d $OPENQRM_DATABASE_NAME --set openqrmdbuser=$OPENQRM_DATABASE_USER --command \"$SQL\"" | head -n3 | grep -v "(.*)" | tail -n+3 | awk '{ print $1 }' > $DB_OUTPUT_LOG
-    RET=$?
-    DB_OUTPUT=`cat $DB_OUTPUT_LOG`
-    if [ "$RET" == 0 ]; then
-        if [ "$DB_OUTPUT" == "" ]; then
-            return 1
-        else
-            return 0
-        fi
-    else
-        return $RET
-    fi
-}
-
-
-
-function run_sql(){
-    local DB_SQL=$@
-    su - postgres -c "$POSTGRES_CLIENT -d $OPENQRM_DATABASE_NAME --set openqrmdbuser=$OPENQRM_DATABASE_USER --command \"$DB_SQL\""
-}
-
-
-
-
-function db_update()  {
-
-    # this function applies needed updates to the db-shema if needed in an idempotent way
-	if [ -f "$OPENQRM_SERVER_BASE_DIR/openqrm_pre_update/etc/openqrm-server.conf" ]; then
-		# for update we have to source the old configuration
-		. $OPENQRM_SERVER_BASE_DIR/openqrm_pre_update/etc/openqrm-server.conf
-	else
-		. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	fi
-
-
-    #---------------------------------------------------------------------------
-    # from 4.9 to 5.0 the following db changes are needed
-    #---------------------------------------------------------------------------
-	# 1  > ALTER TABLE cloud_users ADD cu_lang varchar(4);
-	# 2  > UPDATE user_info set user_lang = 'en';
-	# 3  > ALTER TABLE user_info ADD user_wizard_name varchar(255);
-	# 4  > ALTER TABLE user_info ADD user_wizard_step int8;
-	# 5  > ALTER TABLE user_info ADD user_wizard_id int8;
-	# 6  > ALTER TABLE appliance_info ADD appliance_wizard varchar(255);
-	# 7  > ALTER TABLE appliance_info ALTER appliance_cpumodel type varchar(255);
-	# 8  > ALTER TABLE resource_info ALTER resource_cpumodel type varchar(255);
-	# 9  > ALTER TABLE cloud_config ALTER cc_value type varchar(255);
-	# 10 > ALTER TABLE event_info ALTER event_id type int8;
-	# 11 > insert into cloud_config(cc_id, cc_key, cc_value) values (38, 'deprovision_warning', '100');
-	# 12 > insert into cloud_config(cc_id, cc_key, cc_value) values (39, 'deprovision_pause', '50')
-
-
-    echo "- Checking database shema ..."
-
-    # if cloud enabled .....
-    if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/cloud" ]; then
-
-		# 1  > ALTER TABLE cloud_users ADD cu_lang varchar(4);
-		if ! check_column_in_table_exists cloud_users cu_lang; then
-			echo " -- db change : ALTER TABLE cloud_users ADD cu_lang varchar(4)"
-			run_sql "ALTER TABLE cloud_users ADD cu_lang varchar(4);"
-		fi
-		# 9  > ALTER TABLE cloud_config ALTER cc_value type varchar(255);
-		echo " -- db change : ALTER TABLE cloud_config ALTER cc_value type varchar(255)"
-		run_sql "ALTER TABLE cloud_config ALTER cc_value type varchar(255);"
-
-		# 11  > insert into cloud_config(cc_id, cc_key, cc_value) values (38, 'deprovision_warning', '100');
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 38; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (38, 'deprovision_warning', '100')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (38, 'deprovision_warning', '100');"
-            fi
-        fi
-
-		# 12  > insert into cloud_config(cc_id, cc_key, cc_value) values (39, 'deprovision_pause', '50')
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 39; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (39, 'deprovision_pause', '50')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (39, 'deprovision_pause', '50');"
-            fi
-        fi
-	fi
-
-	# 2  > UPDATE user_info set user_lang = 'en';
-	echo " -- db change : UPDATE user_info set user_lang = 'en'"
-	run_sql "UPDATE user_info set user_lang = 'en';"
-
-	# 3  > ALTER TABLE user_info ADD user_wizard_name varchar(255);
-	if ! check_column_in_table_exists user_info user_wizard_name; then
-		echo " -- db change : ALTER TABLE user_info ADD user_wizard_name varchar(255)"
-		run_sql "ALTER TABLE user_info ADD user_wizard_name varchar(255);"
-	fi
-
-	# 4  > ALTER TABLE user_info ADD user_wizard_step int8;
-	if ! check_column_in_table_exists user_info user_wizard_step; then
-		echo " -- db change : ALTER TABLE user_info ADD user_wizard_step int8"
-		run_sql "ALTER TABLE user_info ADD user_wizard_step int8;"
-	fi
-
-	# 5  > ALTER TABLE user_info ADD user_wizard_id int8;
-	if ! check_column_in_table_exists user_info user_wizard_id; then
-		echo " -- db change : ALTER TABLE user_info ADD user_wizard_id int8"
-		run_sql "ALTER TABLE user_info ADD user_wizard_id int8;"
-	fi
-
-	# 6  > ALTER TABLE appliance_info ADD appliance_wizard varchar(255);
-	if ! check_column_in_table_exists appliance_info appliance_wizard; then
-		echo " -- db change : ALTER TABLE appliance_info ADD appliance_wizard varchar(255)"
-		run_sql "ALTER TABLE appliance_info ADD appliance_wizard varchar(255);"
-	fi
-
-	# 7  > ALTER TABLE appliance_info ALTER appliance_cpumodel type varchar(255);
-	echo " -- db change : ALTER TABLE appliance_info ALTER appliance_cpumodel type varchar(255)"
-	run_sql "ALTER TABLE appliance_info ALTER appliance_cpumodel type varchar(255);"
-
-	# 8  > ALTER TABLE resource_info ALTER resource_cpumodel type varchar(255);
-	echo " -- db change : ALTER TABLE resource_info ALTER resource_cpumodel type varchar(255)"
-	run_sql "ALTER TABLE resource_info ALTER resource_cpumodel type varchar(255);"
-
-	# 10 > ALTER TABLE event_info ALTER event_id type int8;
-	echo " -- db change : ALTER TABLE event_info ALTER event_id type int8"
-	run_sql "ALTER TABLE event_info ALTER event_id type int8;"
-
-	echo "- Database sanity check for version 4.9 to 5.0 finished"
-
-	# from 5.0 to 5.1
-    #---------------------------------------------------------------------------
-    # from 5.0 to 5.1 the following db changes are needed
-    #---------------------------------------------------------------------------
-	# 1  > insert into cloud_config(cc_id, cc_key, cc_value) values (40, 'vm_provision_delay', '0');
-	# 2  > insert into cloud_config(cc_id, cc_key, cc_value) values (41, 'vm_loadbalance_algorithm', '0');
-	# 3  > ALTER TABLE role_info ADD role_comment VARCHAR(255);
-	# 4  > ALTER TABLE virtualization_info ALTER virtualization_type type varchar(50);
-	# 5  > ALTER TABLE image_info ALTER image_type type varchar(255);
-	# 6  > update virtualization_info set virtualization_name = 'KVM VM (networkboot)', virtualization_type='kvm-vm-net' where virtualization_type='kvm-vm';
-	# 7  > update virtualization_info set virtualization_name = 'KVM VM (localboot)', virtualization_type='kvm-vm-local' where virtualization_type='kvm-storage-vm';
-	# 8  > insert into deployment_info(deployment_id, deployment_name, deployment_type, deployment_description, deployment_storagetype, deployment_storagedescription) values ($NEW_DEPLOYMENT_ID, 'kvm-gluster-deployment', 'kvm-gluster-deployment', 'Glusterfs deployment for KVM', 'kvm', 'KVM Gluster Storage');
-	# 9  > update virtualization_info set virtualization_name = 'Citrix VM (networkboot)', virtualization_type='citrix-vm-net' where virtualization_type='citrix-vm';
-	# 10 > update virtualization_info set virtualization_name = 'Citrix VM (localboot)', virtualization_type='citrix-vm-local' where virtualization_type='citrix-storage-vm';
-	# 11 > update virtualization_info set virtualization_name = 'LXC VM (localboot)', virtualization_type='lxc-vm-local' where virtualization_type='lxc-storage-vm';
-	# 12 > update virtualization_info set virtualization_name = 'OpenVZ VM (localboot)', virtualization_type='openvz-vm-local' where virtualization_type='openvz-storage-vm';
-	# 13 > update virtualization_info set virtualization_name = 'ESX VM (networkboot)', virtualization_type='vmware-esx-vm-net' where virtualization_type='vmware-esx-vm';
-	# 14 > update virtualization_info set virtualization_name = 'Xen VM (networkboot)', virtualization_type='xen-vm-net' where virtualization_type='xen-vm';
-	# 15 > update virtualization_info set virtualization_name = 'Xen VM (localboot)', virtualization_type='xen-vm-local' where virtualization_type='xen-storage-vm';
-	# 16 > create table datacenter_info(datacenter_id int8 NOT NULL PRIMARY KEY, datacenter_load_overall varchar(50), datacenter_load_server varchar(50), datacenter_load_storage varchar(50), datacenter_cpu_total varchar(50), datacenter_mem_total varchar(50), datacenter_mem_used varchar(50));
-	# 17 > ALTER TABLE appliance_info ALTER appliance_comment type varchar(255);
-
-
-	# 3  > ALTER TABLE role_info ADD role_comment VARCHAR(255);
-	if ! check_column_in_table_exists role_info role_comment; then
-		echo " -- db change : ALTER TABLE role_info ADD role_comment VARCHAR(255)"
-		run_sql "ALTER TABLE role_info ADD role_comment VARCHAR(255);"
-	fi
-	# 4  > ALTER TABLE virtualization_info ALTER virtualization_type type varchar(50);
-	echo " -- db change : ALTER TABLE virtualization_info ALTER virtualization_type type varchar(50)"
-	run_sql "ALTER TABLE virtualization_info ALTER virtualization_type type varchar(50);"
-	# 5  > ALTER TABLE image_info ALTER image_type type varchar(255);
-	echo " -- db change : ALTER TABLE image_info ALTER image_type type varchar(255)"
-	run_sql "ALTER TABLE image_info ALTER image_type type varchar(255);"
-
-	# virtualization plugin merge
-	# citrix
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/citrix" ]; then
-		# 9  > update virtualization_info set virtualization_name = 'Citrix VM (networkboot)', virtualization_type='citrix-vm-net' where virtualization_type='citrix-vm';
-		run_sql "update virtualization_info set virtualization_name = 'Citrix VM (networkboot)', virtualization_type='citrix-vm-net' where virtualization_type='citrix-vm';"
-	fi
-	# citrix-storage
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/citrix-storage" ]; then
-		# 10  > update virtualization_info set virtualization_name = 'Citrix VM (localboot)', virtualization_type='citrix-vm-local' where virtualization_type='citrix-storage-vm';
-		run_sql "update virtualization_info set virtualization_name = 'Citrix VM (localboot)', virtualization_type='citrix-vm-local' where virtualization_type='citrix-storage-vm';"
-	fi
-	# kvm
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/kvm" ]; then
-		echo "- adapting KVM Plugin database tables"
-		# 6  > update virtualization_info set virtualization_name = 'KVM VM (networkboot)', virtualization_type='kvm-vm-net' where virtualization_type='kvm-vm';
-		echo " -- db change : update virtualization_info set virtualization_name = 'KVM VM (networkboot)', virtualization_type='kvm-vm-net' where virtualization_type='kvm-vm';"
-		run_sql "update virtualization_info set virtualization_name = 'KVM VM (networkboot)', virtualization_type='kvm-vm-net' where virtualization_type='kvm-vm';"
-		# 8  > insert into deployment_info(deployment_id, deployment_name, deployment_type, deployment_description, deployment_storagetype, deployment_storagedescription) values ($NEW_DEPLOYMENT_ID, 'kvm-gluster-deployment', 'kvm-gluster-deployment', 'Glusterfs deployment for KVM', 'kvm', 'KVM Gluster Storage');
-		# glusterfs deployment
-		DEPLOYMENT_EXISTS=`run_sql "select deployment_id from deployment_info where deployment_type='kvm-gluster-deployment';" | head -n3 | grep -v "(.*)" | tail -n+3 | awk '{ print $1 }'`
-		if [ "$DEPLOYMENT_EXISTS" == "" ]; then
-			NEW_DEPLOYMENT_ID=`run_sql "select count(deployment_id) from deployment_info;" | head -n3 | grep -v "(.*)" | tail -n+3 | awk '{ print $1 }'`
-			NEW_DEPLOYMENT_ID=$(( NEW_DEPLOYMENT_ID + 1 ))
-			echo " -- db change : insert into deployment_info(deployment_id, deployment_name, deployment_type, deployment_description, deployment_storagetype, deployment_storagedescription) values ($NEW_DEPLOYMENT_ID, 'kvm-gluster-deployment', 'kvm-gluster-deployment', 'Glusterfs deployment for KVM', 'kvm', 'KVM Gluster Storage')"
-			run_sql "insert into deployment_info(deployment_id, deployment_name, deployment_type, deployment_description, deployment_storagetype, deployment_storagedescription) values ($NEW_DEPLOYMENT_ID, 'kvm-gluster-deployment', 'kvm-gluster-deployment', 'Glusterfs deployment for KVM', 'kvm', 'KVM Gluster Storage');"
-		fi
-	fi
-	# kvm-storage
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/kvm-storage" ]; then
-		# 7  > update virtualization_info set virtualization_name = 'KVM VM (localboot)', virtualization_type='kvm-vm-local' where virtualization_type='kvm-storage-vm';
-		echo " -- db change : update virtualization_info set virtualization_name = 'KVM VM (localboot)', virtualization_type='kvm-vm-local' where virtualization_type='kvm-storage-vm';"
-		run_sql "update virtualization_info set virtualization_name = 'KVM VM (localboot)', virtualization_type='kvm-vm-local' where virtualization_type='kvm-storage-vm';"
-	fi
-	# lxc-storage
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/lxc-storage" ]; then
-		# 11 > update virtualization_info set virtualization_name = 'LXC VM (localboot)', virtualization_type='lxc-vm-local' where virtualization_type='lxc-storage-vm';
-		run_sql "update virtualization_info set virtualization_name = 'LXC VM (localboot)', virtualization_type='lxc-vm-local' where virtualization_type='lxc-storage-vm';"
-	fi
-	# openvz
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/openvz-storage" ]; then
-		# 12 > update virtualization_info set virtualization_name = 'OpenVZ VM (localboot)', virtualization_type='openvz-vm-local' where virtualization_type='openvz-storage-vm';
-		run_sql "update virtualization_info set virtualization_name = 'OpenVZ VM (localboot)', virtualization_type='openvz-vm-local' where virtualization_type='openvz-storage-vm';"
-	fi
-	# vmware-esx
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/vmware-esx" ]; then
-		# 13  > update virtualization_info set virtualization_name = 'ESX VM (networkboot)', virtualization_type='vmware-esx-vm-net' where virtualization_type='vmware-esx-vm';
-		run_sql "update virtualization_info set virtualization_name = 'ESX VM (networkboot)', virtualization_type='vmware-esx-vm-net' where virtualization_type='vmware-esx-vm';"
-	fi
-	# xen
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/xen" ]; then
-		# 14 > update virtualization_info set virtualization_name = 'Xen VM (networkboot)', virtualization_type='xen-vm-net' where virtualization_type='xen-vm';
-		run_sql "update virtualization_info set virtualization_name = 'Xen VM (networkboot)', virtualization_type='xen-vm-net' where virtualization_type='xen-vm';"
-	fi
-	# xen-storage
-	if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/xen-storage" ]; then
-		# 15 > update virtualization_info set virtualization_name = 'Xen VM (localboot)', virtualization_type='xen-vm-local' where virtualization_type='xen-storage-vm';
-		run_sql "update virtualization_info set virtualization_name = 'Xen VM (localboot)', virtualization_type='xen-vm-local' where virtualization_type='xen-storage-vm';"
-	fi
-
-    # if cloud enabled .....
-    if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/cloud" ]; then
-		# 1  > insert into cloud_config(cc_id, cc_key, cc_value) values (40, 'vm_provision_delay', '0');
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 40; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (40, 'vm_provision_delay', '0')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (40, 'vm_provision_delay', '0');"
-            fi
-        fi
-		# 2  > insert into cloud_config(cc_id, cc_key, cc_value) values (41, 'vm_loadbalance_algorithm', '0');
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 41; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (41, 'vm_loadbalance_algorithm', '0')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (41, 'vm_loadbalance_algorithm', '0');"
-            fi
-        fi
-	fi
-
-	# datacenter statistics
-	# 16 > create table datacenter_info(datacenter_id int8 NOT NULL PRIMARY KEY, datacenter_load_overall varchar(50), datacenter_load_server varchar(50), datacenter_load_storage varchar(50), datacenter_cpu_total varchar(50), datacenter_mem_total varchar(50), datacenter_mem_used varchar(50));
-	if ! check_table_exists datacenter_info; then
-		echo " -- db change : create table datacenter_info(datacenter_id int8 NOT NULL PRIMARY KEY, datacenter_load_overall varchar(50), datacenter_load_server varchar(50), datacenter_load_storage varchar(50), datacenter_cpu_total varchar(50), datacenter_mem_total varchar(50), datacenter_mem_used varchar(50))"
-		run_sql "create table datacenter_info(datacenter_id int8 NOT NULL PRIMARY KEY, datacenter_load_overall varchar(50), datacenter_load_server varchar(50), datacenter_load_storage varchar(50), datacenter_cpu_total varchar(50), datacenter_mem_total varchar(50), datacenter_mem_used varchar(50));"
-	fi
-
-	# 17 > ALTER TABLE appliance_info ALTER appliance_comment type varchar(255);
-	echo " -- db change : ALTER TABLE appliance_info ALTER appliance_comment type varchar(255)"
-	run_sql "ALTER TABLE appliance_info ALTER appliance_comment type varchar(255);"
-
-	echo "- Database sanity check for version 5.0 to 5.1 finished"
-
-	# from 5.1 to 5.2
-    #---------------------------------------------------------------------------
-    # from 5.1 to 5.2 the following db changes are needed
-    #---------------------------------------------------------------------------
-	# 1  > insert into cloud_config(cc_id, cc_key, cc_value) values (42, 'allow_vnc_access', 'true');
-	# 2  > ALTER TABLE cloud_requests ADD cr_image_password VARCHAR(255);
-	# 3  > create table lock_info(lock_id int8 NOT NULL PRIMARY KEY,lock_time varchar(50),lock_section varchar(50),lock_resource_id int8,lock_token varchar(50),lock_description varchar(255));
-	# 4  > ALTER TABLE appliance_info ALTER appliance_capabilities type varchar(1000);
-	# 5  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_username VARCHAR(255);
-	# 6  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_password VARCHAR(255);
-	# 7  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_host VARCHAR(255);
-	# 8  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_port VARCHAR(255);
-	# 9  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_tenant VARCHAR(255);
-	# 10  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_endpoint VARCHAR(255);
-	# 11  > ALTER TABLE cloud_create_vm_lc ALTER vc_cr_resource_number type BIGINT;
-	# 12  > ALTER TABLE kernel_info ALTER kernel_name type VARCHAR(255);
-	# 13  > ALTER TABLE image_info ALTER image_name type VARCHAR(255);
-	# 14  > ALTER TABLE storage_info ALTER storage_name type VARCHAR(255);
-	# 15  > ALTER TABLE auth_blocker_info ALTER ab_image_name type VARCHAR(255);
-	# 16  > ALTER TABLE resource_info ADD resource_vname VARCHAR(255);
-	# 17  > ALTER TABLE resource_info ADD resource_vnc VARCHAR(30);
-	# 18  > insert into cloud_config(cc_id, cc_key, cc_value) values (43, 'max_network', '1000');
-	# 19  > insert into cloud_config(cc_id, cc_key, cc_value) values (44, 'max_memory', '10000');
-	# 20  > insert into cloud_config(cc_id, cc_key, cc_value) values (45, 'max_cpu', '100');
-	# 21  > ALTER TABLE cloud_selector ALTER name type VARCHAR(255);
-	# 22  > ALTER TABLE cloud_requests ADD cr_appliance_capabilities VARCHAR(1000);
-	# 23  > ALTER TABLE cloud_profiles ADD pr_appliance_capabilities VARCHAR(1000);
-	# 24  > update resource_info set resource_vtype=1 where resource_id=0 and resource_vtype IS NULL;
-	# 25  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_subscription_id VARCHAR(255);
-	# 26  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_keyfile VARCHAR(5000);
-
-
-    # if cloud enabled .....
-    if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/cloud" ]; then
-		# 1  > insert into cloud_config(cc_id, cc_key, cc_value) values (42, 'allow_vnc_access', 'true');
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 42; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (42, 'allow_vnc_access', 'true')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (42, 'allow_vnc_access', 'true')"
-            fi
-        fi
-		# 18  > insert into cloud_config(cc_id, cc_key, cc_value) values (43, 'max_network', '1000');
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 43; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (43, 'max_network', '1000')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (43, 'max_network', '1000');"
-            fi
-        fi
-		# 19  > insert into cloud_config(cc_id, cc_key, cc_value) values (44, 'max_memory', '10000');
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 44; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (44, 'max_memory', '10000')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (44, 'max_memory', '10000');"
-            fi
-        fi
-		# 20  > insert into cloud_config(cc_id, cc_key, cc_value) values (45, 'max_cpu', '100');
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 45; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (45, 'max_cpu', '100')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (45, 'max_cpu', '100');"
-            fi
-        fi
-
-		# 21  > ALTER TABLE cloud_selector ALTER name type VARCHAR(255);
-        if check_table_exists cloud_selector; then
-			echo " -- db change : ALTER TABLE cloud_selector ALTER name type VARCHAR(255);"
-			run_sql "ALTER TABLE cloud_selector ALTER name type VARCHAR(255);"
-		fi
-
-		# 2  > ALTER TABLE cloud_requests ADD cr_image_password VARCHAR(255);
-        if check_table_exists cloud_requests; then
-			if ! check_column_in_table_exists cloud_requests cr_image_password; then
-				echo " -- db change : ALTER TABLE cloud_requests ADD cr_image_password VARCHAR(255)"
-				run_sql "ALTER TABLE cloud_requests ADD cr_image_password VARCHAR(255);"
-			fi
-		fi
-		# 11  > ALTER TABLE cloud_create_vm_lc ALTER vc_cr_resource_number type BIGINT;
-        if check_table_exists cloud_create_vm_lc; then
-			echo " -- db change : ALTER TABLE cloud_create_vm_lc ALTER vc_cr_resource_number type BIGINT"
-			run_sql "ALTER TABLE cloud_create_vm_lc ALTER vc_cr_resource_number type BIGINT;"
-		fi
-		# 22  > ALTER TABLE cloud_requests ADD cr_appliance_capabilities VARCHAR(1000);
-        if check_table_exists cloud_requests; then
-			if ! check_column_in_table_exists cloud_requests cr_appliance_capabilities; then
-				echo " -- db change : ALTER TABLE cloud_requests ADD cr_appliance_capabilities VARCHAR(1000)"
-				run_sql "ALTER TABLE cloud_requests ADD cr_appliance_capabilities VARCHAR(1000);"
-			fi
-		fi
-		# 23  > ALTER TABLE cloud_profiles ADD pr_appliance_capabilities VARCHAR(1000);
-        if check_table_exists cloud_profiles; then
-			if ! check_column_in_table_exists cloud_profiles pr_appliance_capabilities; then
-				echo " -- db change : ALTER TABLE cloud_profiles ADD pr_appliance_capabilities VARCHAR(1000)"
-				run_sql "ALTER TABLE cloud_profiles ADD pr_appliance_capabilities VARCHAR(1000);"
-			fi
-		fi
-	fi
-
-	# 3  > create table lock_info(lock_id int8 NOT NULL PRIMARY KEY,lock_time varchar(50),lock_section varchar(50),lock_resource_id int8,lock_token varchar(50),lock_description varchar(255));
-	if ! check_table_exists lock_info; then
-		echo " -- db change : create table lock_info(lock_id int8 NOT NULL PRIMARY KEY,lock_time varchar(50),lock_section varchar(50),lock_resource_id int8,lock_token varchar(50),lock_description varchar(255))"
-		run_sql "create table lock_info(lock_id int8 NOT NULL PRIMARY KEY,lock_time varchar(50),lock_section varchar(50),lock_resource_id int8,lock_token varchar(50),lock_description varchar(255));"
-	fi
-
-	# 4  > ALTER TABLE appliance_info ALTER appliance_capabilities type varchar(1000);
-	echo " -- db change : ALTER TABLE appliance_info ALTER appliance_capabilities type varchar(1000);"
-	run_sql "ALTER TABLE appliance_info ALTER appliance_capabilities type varchar(1000);"
-
-    # if hybrid-cloud enabled .....
-    if [ -e "$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/hybrid-cloud" ]; then
-        if check_table_exists hybrid_cloud_accounts; then
-			if ! check_column_in_table_exists hybrid_cloud_accounts hybrid_cloud_username; then
-				# 5  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_username VARCHAR(255);
-				run_sql "ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_username VARCHAR(255);"
-			fi
-			if ! check_column_in_table_exists hybrid_cloud_accounts hybrid_cloud_password; then
-				# 6  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_password VARCHAR(255);
-				run_sql "ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_password VARCHAR(255);"
-			fi
-			if ! check_column_in_table_exists hybrid_cloud_accounts hybrid_cloud_host; then
-				# 7  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_host VARCHAR(255);
-				run_sql "ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_host VARCHAR(255);"
-			fi
-			if ! check_column_in_table_exists hybrid_cloud_accounts hybrid_cloud_port; then
-				# 8  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_port VARCHAR(255);
-				run_sql "ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_port VARCHAR(255);"
-			fi
-			if ! check_column_in_table_exists hybrid_cloud_accounts hybrid_cloud_tenant; then
-				# 9  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_tenant VARCHAR(255);
-				run_sql "ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_tenant VARCHAR(255);"
-			fi
-			if ! check_column_in_table_exists hybrid_cloud_accounts hybrid_cloud_endpoint; then
-				# 10  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_endpoint VARCHAR(255);
-				run_sql "ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_endpoint VARCHAR(255);"
-			fi
-
-			if ! check_column_in_table_exists hybrid_cloud_accounts hybrid_cloud_subscription_id; then
-				# 25  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_subscription_id VARCHAR(255);
-				run_sql "ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_subscription_id VARCHAR(255);"
-			fi
-			if ! check_column_in_table_exists hybrid_cloud_accounts hybrid_cloud_keyfile; then
-				# 26  > ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_keyfile VARCHAR(5000);
-				run_sql "ALTER TABLE hybrid_cloud_accounts ADD hybrid_cloud_keyfile VARCHAR(5000);"
-			fi
-		fi
-	fi
-
-	# 12  > ALTER TABLE kernel_info ALTER kernel_name type VARCHAR(255);
-	run_sql "ALTER TABLE kernel_info ALTER kernel_name type VARCHAR(255);"
-	# 13  > ALTER TABLE image_info ALTER image_name type VARCHAR(255);
-	run_sql "ALTER TABLE image_info ALTER image_name type VARCHAR(255);"
-	# 14  > ALTER TABLE storage_info ALTER storage_name type VARCHAR(255);
-	run_sql "ALTER TABLE storage_info ALTER storage_name type VARCHAR(255);"
-	# 15  > ALTER TABLE auth_blocker_info ALTER ab_image_name type VARCHAR(255);
-	run_sql "ALTER TABLE auth_blocker_info ALTER ab_image_name type VARCHAR(255);"
-
-	if ! check_column_in_table_exists resource_info resource_vname; then
-		# 16  > ALTER TABLE resource_info ADD resource_vname VARCHAR(255);
-		run_sql "ALTER TABLE resource_info ADD resource_vname VARCHAR(255);"
-	fi
-	if ! check_column_in_table_exists resource_info resource_vnc; then
-		# 17  > ALTER TABLE resource_info ADD resource_vnc VARCHAR(30);
-		run_sql "ALTER TABLE resource_info ADD resource_vnc VARCHAR(30);"
-	fi
-
-	# 24  > update resource_info set resource_vtype=1 where resource_id=0 and resource_vtype IS NULL;
-        run_sql "update resource_info set resource_vtype=1 where resource_id=0 and resource_vtype IS NULL;"
-
-	echo "- Database sanity check for version 5.1 to 5.2 finished"
-
-	# from 5.2 to 5.3
-    #---------------------------------------------------------------------------
-    # from 5.2 to 5.3 the following db changes are needed
-    #---------------------------------------------------------------------------
-	# 1  > ALTER TABLE image_info ADD image_size int8
-	# 2  > ALTER TABLE image_info ALTER image_deployment_parameter type varchar(1000);
-	# 3  > ALTER TABLE cloud_requests ADD cr_size_req VARCHAR(255);
-	# 4  > ALTER TABLE cloud_profiles ADD pr_size_req VARCHAR(255);
-	# 5  > ALTER TABLE ip_mgmt ADD ip_mgmt_resource_id BIGINT;
-	# 6  > ALTER TABLE ip_mgmt ADD ip_mgmt_bridge_name VARCHAR(50);
-	# 7 > insert into cloud_config(cc_id, cc_key, cc_value) values (46, 'bandwidth_metering', 'true');
-
-	if ! check_column_in_table_exists image_info image_size; then
-		# 1  > ALTER TABLE image_info ADD image_size int8
-		run_sql "ALTER TABLE image_info ADD image_size int8;"
-	fi
-
-	# 2  > ALTER TABLE image_info ALTER image_deployment_parameter type varchar(1000);
-	echo " -- db change : ALTER TABLE image_info ALTER image_deployment_parameter type varchar(1000);"
-	run_sql "ALTER TABLE image_info ALTER image_deployment_parameter type varchar(1000);"
-
-	if ! check_column_in_table_exists cloud_requests cr_size_req; then
-		# 3  > ALTER TABLE cloud_requests ADD cr_size_req VARCHAR(255);
-		run_sql "ALTER TABLE cloud_requests ADD cr_size_req VARCHAR(255);"
-	fi
-	if ! check_column_in_table_exists cloud_profiles pr_size_req; then
-		# 4  > ALTER TABLE cloud_profiles ADD pr_size_req VARCHAR(255);
-		run_sql "ALTER TABLE cloud_profiles ADD pr_size_req VARCHAR(255);"
-	fi
-
-	if ! check_column_in_table_exists ip_mgmt ip_mgmt_resource_id; then
-		# 5  > ALTER TABLE ip_mgmt ADD ip_mgmt_resource_id BIGINT(30);
-		run_sql "ALTER TABLE ip_mgmt ADD ip_mgmt_resource_id BIGINT(30);"
-	fi
-
-	if ! check_column_in_table_exists ip_mgmt ip_mgmt_bridge_name; then
-		# 6  > ALTER TABLE ip_mgmt ADD ip_mgmt_bridge_name VARCHAR(50);
-		run_sql "ALTER TABLE ip_mgmt ADD ip_mgmt_bridge_name VARCHAR(50);"
-	fi
-
-	# 7 > insert into cloud_config(cc_id, cc_key, cc_value) values (46, 'bandwidth_metering', 'true');
-        if check_table_exists cloud_config; then
-            if ! check_if_data_in_column_of_table_exists cloud_config cc_id 46; then
-                echo " -- db change : insert into cloud_config(cc_id, cc_key, cc_value) values (46, 'bandwidth_metering', 'true')"
-                run_sql "insert into cloud_config(cc_id, cc_key, cc_value) values (46, 'bandwidth_metering', 'true');"
-            fi
-        fi
-
-
-	echo "- Database sanity check for version 5.2 to 5.3 finished"
-
-
-
-}
-
-
-
-
-case "$1" in
-	init)
-		initialize_database
-		;;
-	backup)
-		backup_database $2
-		;;
-	restore)
-		restore_database $2
-		;;
-	drop)
-		drop_database
-		;;
-	update)
-		db_update
-		;;
-esac
diff --git a/openQRM-5.3.50-CE/src/etc/db/postgres/openqrm-postgres-init.sql b/openQRM-5.3.50-CE/src/etc/db/postgres/openqrm-postgres-init.sql
deleted file mode 100644
index 17469ee..0000000
--- a/openQRM-5.3.50-CE/src/etc/db/postgres/openqrm-postgres-init.sql
+++ /dev/null
@@ -1,252 +0,0 @@
-
-drop table resource_info;
-create table resource_info(
-	resource_id int8 NOT NULL PRIMARY KEY,
-	resource_localboot int8,
-	resource_kernel varchar(50),
-	resource_kernelid int8,
-	resource_image varchar(50),
-	resource_imageid int8,
-	resource_openqrmserver varchar(20),
-	resource_basedir varchar(100),
-	resource_applianceid int8,
-	resource_ip varchar(20),
-	resource_subnet varchar(20),
-	resource_broadcast varchar(20),
-	resource_network varchar(20),
-	resource_mac varchar(20),
-	resource_nics int8,
-	resource_uptime int8,
-	resource_cpunumber int8,
-	resource_cpuspeed int8,
-	resource_cpumodel varchar(255),
-	resource_memtotal int8,
-	resource_memused int8,
-	resource_swaptotal int8,
-	resource_swapused int8,
-	resource_hostname varchar(60),
-	resource_vtype int8,
-	resource_vhostid int8,
-	resource_vname varchar(255),
-	resource_vnc varchar(30),
-	resource_load decimal(4,2),
-	resource_execdport int8,
-	resource_senddelay int8,
-	resource_capabilities varchar(255),
-	resource_lastgood varchar(10),
-	resource_state varchar(20),
-	resource_event varchar(20)
-);
-
-
-drop table kernel_info;
-create table kernel_info(
-	kernel_id int8  NOT NULL PRIMARY KEY,
-	kernel_name varchar(255),
-	kernel_version varchar(50),
-	kernel_capabilities varchar(255),
-	kernel_comment varchar(255)
-);
-
-
-drop table image_info;
-create table image_info(
-	image_id int8  NOT NULL PRIMARY KEY,
-	image_name varchar(255),
-	image_version varchar(30),
-	image_type varchar(255),
-	image_rootdevice varchar(255),
-	image_rootfstype varchar(255),
-	image_size int8,
-	image_storageid int8,
-	image_deployment_parameter varchar(1000),
-	image_isshared int8,
-	image_isactive int8,
-	image_comment varchar(255),
-	image_capabilities varchar(255)
-);
-
-
-drop table appliance_info;
-create table appliance_info(
-	appliance_id int8 NOT NULL PRIMARY KEY,
-	appliance_name varchar(50),
-	appliance_kernelid int8,
-	appliance_imageid int8,
-	appliance_starttime int8,
-	appliance_stoptime int8,
-	appliance_cpunumber int8,
-	appliance_cpuspeed int8,
-	appliance_cpumodel varchar(255),
-	appliance_memtotal int8,
-	appliance_swaptotal int8,
-	appliance_nics int8,
-	appliance_capabilities varchar(1000),
-	appliance_cluster int8,
-	appliance_ssi int8,
-	appliance_resources int8,
-	appliance_highavailable int8,
-	appliance_virtual int8,
-	appliance_virtualization varchar(20),
-	appliance_virtualization_host int8,
-	appliance_state varchar(20),
-	appliance_comment varchar(255),
-	appliance_wizard varchar(255),
-	appliance_event varchar(20)
-);
-
-drop table event_info;
-create table event_info(
-	event_id int8 NOT NULL PRIMARY KEY,
-	event_name varchar(255),
-	event_time varchar(50),
-	event_priority int8,
-	event_source varchar(255),
-	event_description varchar(255),
-	event_comment varchar(255),
-	event_capabilities varchar(255),
-	event_status int8,
-	event_image_id int8,
-	event_resource_id int8
-);
-
-
-
-drop table user_info;
-create table user_info(
-	user_id int8 NOT NULL PRIMARY KEY,
-	user_name varchar(20),
-	user_password varchar(20),
-	user_gender varchar(1),
-	user_first_name varchar(50),
-	user_last_name varchar(50),
-	user_department varchar(50),
-	user_office varchar(50),
-	user_role int8,
-	user_last_update_time varchar(50),
-	user_description varchar(255),
-	user_capabilities varchar(255),
-	user_wizard_name varchar(255),
-	user_wizard_step int8,
-	user_wizard_id int8,
-	user_state varchar(20),
-	user_lang varchar(5)
-);
-
-
-drop table role_info;
-create table role_info(
-	role_id int8 NOT NULL PRIMARY KEY,
-	role_name varchar(20),
-	role_comment varchar(255)
-);
-
-
-drop table storage_info;
-create table storage_info(
-	storage_id int8 NOT NULL PRIMARY KEY,
-	storage_name varchar(255),
-	storage_resource_id int8,
-	storage_type int8,
-	storage_comment varchar(255),
-	storage_capabilities varchar(255),
-	storage_state varchar(20)
-);
-
-drop table resource_service;
-create table resource_service(
-	resource_id int8 NOT NULL PRIMARY KEY,
-	service varchar(50)
-);
-
-drop table image_service;
-create table image_service(
-	image_id int8 NOT NULL PRIMARY KEY,
-	service varchar(50)
-);
-
-drop table image_authentication_info;
-create table image_authentication_info(
-	ia_id int8 NOT NULL PRIMARY KEY,
-	ia_image_id int8,
-	ia_resource_id int8,
-	ia_auth_type int8
-);
-
-drop table auth_blocker_info;
-create table auth_blocker_info(
-	ab_id int8 NOT NULL PRIMARY KEY,
-	ab_image_id int8,
-	ab_image_name  varchar(255),
-	ab_start_time  varchar(20)
-);
-
-drop table deployment_info;
-create table deployment_info(
-	deployment_id int8 NOT NULL PRIMARY KEY,
-	deployment_storagetype_id int8,
-	deployment_name varchar(50),
-	deployment_type varchar(50),
-	deployment_description varchar(50),
-	deployment_storagetype varchar(50),
-	deployment_storagedescription varchar(50),
-	deployment_mapping varchar(255)
-);
-
-drop table virtualization_info;
-create table virtualization_info(
-	virtualization_id int8 NOT NULL PRIMARY KEY,
-	virtualization_name varchar(50),
-	virtualization_type varchar(50),
-	virtualization_mapping varchar(255)
-);
-
-drop table datacenter_info;
-create table datacenter_info(
-	datacenter_id int8 NOT NULL PRIMARY KEY,
-	datacenter_load_overall varchar(50),
-	datacenter_load_server varchar(50),
-	datacenter_load_storage varchar(50),
-	datacenter_cpu_total varchar(50),
-	datacenter_mem_total varchar(50),
-	datacenter_mem_used varchar(50)
-);
-
-drop table lock_info;
-create table lock_info(
-	lock_id int8 NOT NULL PRIMARY KEY,
-	lock_time varchar(50),
-	lock_section varchar(50),
-	lock_resource_id int8,
-	lock_token varchar(50),
-	lock_description varchar(255)
-);
-
-
-insert into kernel_info (kernel_id, kernel_name, kernel_version) values (0, 'openqrm', 'openqrm');
-insert into image_info (image_id, image_name, image_version, image_type, image_rootdevice, image_isshared) values (0, 'openqrm', 'openqrm', 'ram', 'ram', 0);
-
-insert into image_info (image_id, image_name, image_version, image_type, image_rootdevice, image_rootfstype, image_isshared) values ('1', 'idle', 'openQRM', 'ram', 'ram', 'ext2', '1');
-insert into resource_info (resource_id, resource_localboot, resource_kernel, resource_image, resource_openqrmserver, resource_ip, resource_vtype) values ('0', '1', 'local', 'local', 'OPENQRM_SERVER_IP_ADDRESS', 'OPENQRM_SERVER_IP_ADDRESS', '1');
-insert into deployment_info (deployment_id, deployment_name, deployment_type, deployment_description, deployment_storagetype, deployment_storagedescription ) values ('1', 'ramdisk', 'ram', 'Ramdisk Deployment', 'none', 'none');
-insert into virtualization_info (virtualization_id, virtualization_name, virtualization_type) values ('1', 'Physical System', 'physical');
-insert into user_info (user_id, user_name, user_password, user_gender, user_first_name, user_last_name, user_department, user_office, user_role, user_last_update_time, user_description, user_capabilities, user_state, user_lang) values (0, 'openqrm', 'openqrm', '-', '-', '-', '-', '-', 0, '-', 'default admin user', '', 'activated', 'en');
-insert into user_info (user_id, user_name, user_password, user_gender, user_first_name, user_last_name, user_department, user_office, user_role, user_last_update_time, user_description, user_capabilities, user_state, user_lang) values (1, 'anonymous', 'openqrm', '-', '-', '-', '-', '-', 1, '-', 'default readonly user', '', 'activated', 'en');
-insert into role_info (role_id, role_name) values (0, 'administrator');
-insert into role_info (role_id, role_name) values (1, 'readonly');
-
-insert into appliance_info (appliance_id, appliance_name, appliance_kernelid, appliance_imageid, appliance_starttime, appliance_resources, appliance_virtualization, appliance_state, appliance_comment) values (1, 'openqrm', 0, 0, '10', 0, 1, 'active', 'openQRM server');
-
-grant all on resource_info to :openqrmdbuser;
-grant all on kernel_info to :openqrmdbuser;
-grant all on image_info to :openqrmdbuser;
-grant all on event_info to :openqrmdbuser;
-grant all on user_info to :openqrmdbuser;
-grant all on appliance_info to :openqrmdbuser;
-grant all on role_info to :openqrmdbuser;
-grant all on storage_info to :openqrmdbuser;
-grant all on resource_service to :openqrmdbuser;
-grant all on image_service to :openqrmdbuser;
-grant all on deployment_info to :openqrmdbuser;
-grant all on virtualization_info to :openqrmdbuser;
-grant all on storage_info to :openqrmdbuser;
diff --git a/openQRM-5.3.50-CE/src/etc/db/postgres/openqrm-postgres-maintenance b/openQRM-5.3.50-CE/src/etc/db/postgres/openqrm-postgres-maintenance
deleted file mode 100644
index fbee099..0000000
--- a/openQRM-5.3.50-CE/src/etc/db/postgres/openqrm-postgres-maintenance
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-# openQRM maintenance script, runs once a day via cron
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-. @@OPENQRM_SERVER_BASE_DIR@@/openqrm/etc/openqrm-server.conf
-. @@OPENQRM_SERVER_BASE_DIR@@/openqrm/include/openqrm-server-functions
-# get full server config
-openqrm_server_get_config
-
-# define maintenance dir for postgres backup files
-DB_MAINTENANCE_DIR="/var/spool/openqrm_db/"
-
-if ! which psql 1>/dev/null 2>&1; then
-	echo "ERROR: Postgres client 'psql' not installed/found on this system"
-	exit 1
-else
-	POSTGRES_CLIENT=`which psql`
-fi
-if ! which pg_dump 1>/dev/null 2>&1; then
-	echo "ERROR: Postgres 'pg_dump' not installed/found on this system"
-	exit 1
-else
-	POSTGRES_DUMP=`which pg_dump`
-fi
-
-BACKUP_TIME=`date +%T--%x | sed -e "s/:/-/g" | sed -e "s#/#-#g"`
-if [ ! -d "$DB_MAINTENANCE_DIR" ]; then
-	mkdir -p $DB_MAINTENANCE_DIR
-fi
-
-# backup event_info table
-echo "NOTICE: Saving event_info table to $DB_MAINTENANCE_DIR/openqrm_db_event_info_$BACKUP_TIME.sql"  | logger
-su - $OPENQRM_DATABASE_USER -c "$POSTGRES_DUMP -w -t event_info $OPENQRM_DATABASE_NAME" > $DB_MAINTENANCE_DIR/openqrm_db_event_info_$BACKUP_TIME.sql
-gzip $DB_MAINTENANCE_DIR/openqrm_db_event_info_$BACKUP_TIME.sql
-# clean up event_info table
-echo "NOTICE: Cleaning event_info table"  | logger
-su - $OPENQRM_DATABASE_USER -c "$POSTGRES_CLIENT -d $OPENQRM_DATABASE_NAME --set openqrmdbuser=$OPENQRM_DATABASE_USER -c 'delete from event_info'"
-# clean up datacenter_info table
-echo "NOTICE: Cleaning datacenter_info"  | logger
-su - $OPENQRM_DATABASE_USER -c "$POSTGRES_CLIENT -d $OPENQRM_DATABASE_NAME --set openqrmdbuser=$OPENQRM_DATABASE_USER -c 'delete from datacenter_info'"
-
-# backup cloud_transaction
-if su - $OPENQRM_DATABASE_USER -c "$POSTGRES_CLIENT -d $OPENQRM_DATABASE_NAME --set openqrmdbuser=$OPENQRM_DATABASE_USER -c 'select * from pg_tables'" | grep cloud_transaction 1>/dev/null; then
-    echo "NOTICE: Saving cloud_transaction table to $DB_MAINTENANCE_DIR/openqrm_db_cloud_transaction_$BACKUP_TIME.sql"  | logger
-    su - $OPENQRM_DATABASE_USER -c "$POSTGRES_DUMP -w -t cloud_transaction $OPENQRM_DATABASE_NAME" > $DB_MAINTENANCE_DIR/openqrm_db_cloud_transaction_$BACKUP_TIME.sql
-    gzip $DB_MAINTENANCE_DIR/openqrm_db_cloud_transaction_$BACKUP_TIME.sql
-    # clean up cloud_transaction
-    echo "NOTICE: Cleaning cloud_transaction table"  | logger
-    su - $OPENQRM_DATABASE_USER -c "$POSTGRES_CLIENT -d $OPENQRM_DATABASE_NAME --set openqrmdbuser=$OPENQRM_DATABASE_USER -c 'delete from cloud_transaction'"
-fi
-
-# backup cloud_zones_transaction
-if su - $OPENQRM_DATABASE_USER -c "$POSTGRES_CLIENT -d $OPENQRM_DATABASE_NAME --set openqrmdbuser=$OPENQRM_DATABASE_USER -c 'select * from pg_tables'" | grep cloud_zones_transaction 1>/dev/null; then
-    echo "NOTICE: Saving cloud_zones_transaction table to $DB_MAINTENANCE_DIR/openqrm_db_cloud_zones_transaction_$BACKUP_TIME.sql"  | logger
-    su - $OPENQRM_DATABASE_USER -c "$POSTGRES_DUMP -w -t cloud_zones_transaction $OPENQRM_DATABASE_NAME" > $DB_MAINTENANCE_DIR/openqrm_db_cloud_zones_transaction_$BACKUP_TIME.sql
-    gzip $DB_MAINTENANCE_DIR/openqrm_db_cloud_zones_transaction_$BACKUP_TIME.sql
-    # clean up cloud_zones_transaction
-    echo "NOTICE: Cleaning cloud_zones_transaction table"  | logger
-    su - $OPENQRM_DATABASE_USER -c "$POSTGRES_CLIENT -d $OPENQRM_DATABASE_NAME --set openqrmdbuser=$OPENQRM_DATABASE_USER -c 'delete from cloud_zones_transaction'"
-fi
-
diff --git a/openQRM-5.3.50-CE/src/etc/httpd/openqrm-htaccess.conf b/openQRM-5.3.50-CE/src/etc/httpd/openqrm-htaccess.conf
deleted file mode 100644
index 79c1806..0000000
--- a/openQRM-5.3.50-CE/src/etc/httpd/openqrm-htaccess.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-AuthType Basic
-AuthName "openQRM-Server Login"
-AuthUserFile OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/.htpasswd
-require valid-user
diff --git a/openQRM-5.3.50-CE/src/etc/httpd/openqrm-httpd-vhost.conf b/openQRM-5.3.50-CE/src/etc/httpd/openqrm-httpd-vhost.conf
deleted file mode 100644
index 04e3097..0000000
--- a/openQRM-5.3.50-CE/src/etc/httpd/openqrm-httpd-vhost.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-NameVirtualHost *:80
-<VirtualHost *:80>
-	ServerAdmin webmaster@localhost
-
-	DocumentRoot @@OPENQRM_WEBSERVER_DOCUMENT_ROOT@@
-	<Directory />
-		Options FollowSymLinks
-		AllowOverride None
-	</Directory>
-	<Directory @@OPENQRM_WEBSERVER_DOCUMENT_ROOT@@/openqrm>
-		AllowOverride AuthConfig
-		Options FollowSymLinks
-	</Directory>
-
-
-	ErrorLog /var/log/apache2/openqrm-error.log
-
-	# Possible values include: debug, info, notice, warn, error, crit,
-	# alert, emerg.
-	LogLevel warn
-
-	CustomLog /var/log/apache2/access.log combined
-	ServerSignature On
-
-</VirtualHost>
diff --git a/openQRM-5.3.50-CE/src/etc/httpd/openqrm-httpd.conf b/openQRM-5.3.50-CE/src/etc/httpd/openqrm-httpd.conf
deleted file mode 100644
index 6e827d8..0000000
--- a/openQRM-5.3.50-CE/src/etc/httpd/openqrm-httpd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-<Directory OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm>
-    AllowOverride AuthConfig
-    Options FollowSymLinks
-</Directory>
-
diff --git a/openQRM-5.3.50-CE/src/etc/httpd/openqrm-https.conf b/openQRM-5.3.50-CE/src/etc/httpd/openqrm-https.conf
deleted file mode 100644
index 6c4a98d..0000000
--- a/openQRM-5.3.50-CE/src/etc/httpd/openqrm-https.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-NameVirtualHost *:443
-<VirtualHost *:443>
-	ServerAdmin webmaster@localhost
-
-	SSLEngine on
-	SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
-	SSLCertificateFile @@OPENQRM_SERVER_BASE_DIR@@/openqrm/etc/ssl/cert/openqrm.crt
-	SSLCertificateKeyFile @@OPENQRM_SERVER_BASE_DIR@@/openqrm/etc/ssl/private/openqrm-private.key
-	SSLCertificateChainFile @@OPENQRM_SERVER_BASE_DIR@@/openqrm/etc/ssl/chain/openqrm.csr
-
-	DocumentRoot @@OPENQRM_WEBSERVER_DOCUMENT_ROOT@@
-	<Directory />
-		Options FollowSymLinks
-		AllowOverride None
-	</Directory>
-	<Directory @@OPENQRM_WEBSERVER_DOCUMENT_ROOT@@/openqrm>
-		AllowOverride AuthConfig
-		Options FollowSymLinks
-	</Directory>
-
-
-	ErrorLog /var/log/apache2/openqrm-error.log
-
-	# Possible values include: debug, info, notice, warn, error, crit,
-	# alert, emerg.
-	LogLevel warn
-
-	CustomLog /var/log/apache2/access.log combined
-	ServerSignature On
-
-</VirtualHost>
diff --git a/openQRM-5.3.50-CE/src/etc/httpd/php.apache2.php b/openQRM-5.3.50-CE/src/etc/httpd/php.apache2.php
deleted file mode 100644
index b5074a8..0000000
--- a/openQRM-5.3.50-CE/src/etc/httpd/php.apache2.php
+++ /dev/null
@@ -1,1947 +0,0 @@
-[PHP]
-
-;;;;;;;;;;;;;;;;;;;
-; About php.ini   ;
-;;;;;;;;;;;;;;;;;;;
-; PHP's initialization file, generally called php.ini, is responsible for
-; configuring many of the aspects of PHP's behavior.
-
-; PHP attempts to find and load this configuration from a number of locations.
-; The following is a summary of its search order:
-; 1. SAPI module specific location.
-; 2. The PHPRC environment variable. (As of PHP 5.2.0)
-; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0)
-; 4. Current working directory (except CLI)
-; 5. The web server's directory (for SAPI modules), or directory of PHP
-; (otherwise in Windows)
-; 6. The directory from the --with-config-file-path compile time option, or the
-; Windows directory (usually C:\windows)
-; See the PHP docs for more specific information.
-; http://php.net/configuration.file
-
-; The syntax of the file is extremely simple.  Whitespace and lines
-; beginning with a semicolon are silently ignored (as you probably guessed).
-; Section headers (e.g. [Foo]) are also silently ignored, even though
-; they might mean something in the future.
-
-; Directives following the section heading [PATH=/www/mysite] only
-; apply to PHP files in the /www/mysite directory.  Directives
-; following the section heading [HOST=www.example.com] only apply to
-; PHP files served from www.example.com.  Directives set in these
-; special sections cannot be overridden by user-defined INI files or
-; at runtime. Currently, [PATH=] and [HOST=] sections only work under
-; CGI/FastCGI.
-; http://php.net/ini.sections
-
-; Directives are specified using the following syntax:
-; directive = value
-; Directive names are *case sensitive* - foo=bar is different from FOO=bar.
-; Directives are variables used to configure PHP or PHP extensions.
-; There is no name validation.  If PHP can't find an expected
-; directive because it is not set or is mistyped, a default value will be used.
-
-; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one
-; of the INI constants (On, Off, True, False, Yes, No and None) or an expression
-; (e.g. E_ALL & ~E_NOTICE), a quoted string ("bar"), or a reference to a
-; previously set variable or directive (e.g. ${foo})
-
-; Expressions in the INI file are limited to bitwise operators and parentheses:
-; |  bitwise OR
-; ^  bitwise XOR
-; &  bitwise AND
-; ~  bitwise NOT
-; !  boolean NOT
-
-; Boolean flags can be turned on using the values 1, On, True or Yes.
-; They can be turned off using the values 0, Off, False or No.
-
-; An empty string can be denoted by simply not writing anything after the equal
-; sign, or by using the None keyword:
-
-; foo =         ; sets foo to an empty string
-; foo = None    ; sets foo to an empty string
-; foo = "None"  ; sets foo to the string 'None'
-
-; If you use constants in your value, and these constants belong to a
-; dynamically loaded extension (either a PHP extension or a Zend extension),
-; you may only use these constants *after* the line that loads the extension.
-
-;;;;;;;;;;;;;;;;;;;
-; About this file ;
-;;;;;;;;;;;;;;;;;;;
-; PHP comes packaged with two INI files. One that is recommended to be used
-; in production environments and one that is recommended to be used in
-; development environments.
-
-; php.ini-production contains settings which hold security, performance and
-; best practices at its core. But please be aware, these settings may break
-; compatibility with older or less security conscience applications. We
-; recommending using the production ini in production and testing environments.
-
-; php.ini-development is very similar to its production variant, except it is
-; much more verbose when it comes to errors. We recommend using the
-; development version only in development environments, as errors shown to
-; application users can inadvertently leak otherwise secure information.
-
-; This is the php.ini-production INI file.
-
-;;;;;;;;;;;;;;;;;;;
-; Quick Reference ;
-;;;;;;;;;;;;;;;;;;;
-; The following are all the settings which are different in either the production
-; or development versions of the INIs with respect to PHP's default behavior.
-; Please see the actual settings later in the document for more details as to why
-; we recommend these changes in PHP's behavior.
-
-; display_errors
-;   Default Value: On
-;   Development Value: On
-;   Production Value: Off
-
-; display_startup_errors
-;   Default Value: Off
-;   Development Value: On
-;   Production Value: Off
-
-; error_reporting
-;   Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
-;   Development Value: E_ALL
-;   Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
-
-; log_errors
-;   Default Value: Off
-;   Development Value: On
-;   Production Value: On
-
-; max_input_time
-;   Default Value: -1 (Unlimited)
-;   Development Value: 60 (60 seconds)
-;   Production Value: 60 (60 seconds)
-
-; output_buffering
-;   Default Value: Off
-;   Development Value: 4096
-;   Production Value: 4096
-
-; register_argc_argv
-;   Default Value: On
-;   Development Value: Off
-;   Production Value: Off
-
-; request_order
-;   Default Value: None
-;   Development Value: "GP"
-;   Production Value: "GP"
-
-; session.gc_divisor
-;   Default Value: 100
-;   Development Value: 1000
-;   Production Value: 1000
-
-; session.sid_bits_per_character
-;   Default Value: 4
-;   Development Value: 5
-;   Production Value: 5
-
-; short_open_tag
-;   Default Value: On
-;   Development Value: Off
-;   Production Value: Off
-
-; variables_order
-;   Default Value: "EGPCS"
-;   Development Value: "GPCS"
-;   Production Value: "GPCS"
-
-;;;;;;;;;;;;;;;;;;;;
-; php.ini Options  ;
-;;;;;;;;;;;;;;;;;;;;
-; Name for user-defined php.ini (.htaccess) files. Default is ".user.ini"
-;user_ini.filename = ".user.ini"
-
-; To disable this feature set this option to an empty value
-;user_ini.filename =
-
-; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes)
-;user_ini.cache_ttl = 300
-
-;;;;;;;;;;;;;;;;;;;;
-; Language Options ;
-;;;;;;;;;;;;;;;;;;;;
-
-; Enable the PHP scripting language engine under Apache.
-; http://php.net/engine
-engine = On
-
-; This directive determines whether or not PHP will recognize code between
-; <? and ?> tags as PHP source which should be processed as such. It is
-; generally recommended that <?php and ?> should be used and that this feature
-; should be disabled, as enabling it may result in issues when generating XML
-; documents, however this remains supported for backward compatibility reasons.
-; Note that this directive does not control the <?= shorthand tag, which can be
-; used regardless of this directive.
-; Default Value: On
-; Development Value: Off
-; Production Value: Off
-; http://php.net/short-open-tag
-short_open_tag = Off
-
-; The number of significant digits displayed in floating point numbers.
-; http://php.net/precision
-precision = 14
-
-; Output buffering is a mechanism for controlling how much output data
-; (excluding headers and cookies) PHP should keep internally before pushing that
-; data to the client. If your application's output exceeds this setting, PHP
-; will send that data in chunks of roughly the size you specify.
-; Turning on this setting and managing its maximum buffer size can yield some
-; interesting side-effects depending on your application and web server.
-; You may be able to send headers and cookies after you've already sent output
-; through print or echo. You also may see performance benefits if your server is
-; emitting less packets due to buffered output versus PHP streaming the output
-; as it gets it. On production servers, 4096 bytes is a good setting for performance
-; reasons.
-; Note: Output buffering can also be controlled via Output Buffering Control
-;   functions.
-; Possible Values:
-;   On = Enabled and buffer is unlimited. (Use with caution)
-;   Off = Disabled
-;   Integer = Enables the buffer and sets its maximum size in bytes.
-; Note: This directive is hardcoded to Off for the CLI SAPI
-; Default Value: Off
-; Development Value: 4096
-; Production Value: 4096
-; http://php.net/output-buffering
-output_buffering = 4096
-
-; You can redirect all of the output of your scripts to a function.  For
-; example, if you set output_handler to "mb_output_handler", character
-; encoding will be transparently converted to the specified encoding.
-; Setting any output handler automatically turns on output buffering.
-; Note: People who wrote portable scripts should not depend on this ini
-;   directive. Instead, explicitly set the output handler using ob_start().
-;   Using this ini directive may cause problems unless you know what script
-;   is doing.
-; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler"
-;   and you cannot use both "ob_gzhandler" and "zlib.output_compression".
-; Note: output_handler must be empty if this is set 'On' !!!!
-;   Instead you must use zlib.output_handler.
-; http://php.net/output-handler
-;output_handler =
-
-; URL rewriter function rewrites URL on the fly by using
-; output buffer. You can set target tags by this configuration.
-; "form" tag is special tag. It will add hidden input tag to pass values.
-; Refer to session.trans_sid_tags for usage.
-; Default Value: "form="
-; Development Value: "form="
-; Production Value: "form="
-;url_rewriter.tags
-
-; URL rewriter will not rewrite absolute URL nor form by default. To enable
-; absolute URL rewrite, allowed hosts must be defined at RUNTIME.
-; Refer to session.trans_sid_hosts for more details.
-; Default Value: ""
-; Development Value: ""
-; Production Value: ""
-;url_rewriter.hosts
-
-; Transparent output compression using the zlib library
-; Valid values for this option are 'off', 'on', or a specific buffer size
-; to be used for compression (default is 4KB)
-; Note: Resulting chunk size may vary due to nature of compression. PHP
-;   outputs chunks that are few hundreds bytes each as a result of
-;   compression. If you prefer a larger chunk size for better
-;   performance, enable output_buffering in addition.
-; Note: You need to use zlib.output_handler instead of the standard
-;   output_handler, or otherwise the output will be corrupted.
-; http://php.net/zlib.output-compression
-zlib.output_compression = Off
-
-; http://php.net/zlib.output-compression-level
-;zlib.output_compression_level = -1
-
-; You cannot specify additional output handlers if zlib.output_compression
-; is activated here. This setting does the same as output_handler but in
-; a different order.
-; http://php.net/zlib.output-handler
-;zlib.output_handler =
-
-; Implicit flush tells PHP to tell the output layer to flush itself
-; automatically after every output block.  This is equivalent to calling the
-; PHP function flush() after each and every call to print() or echo() and each
-; and every HTML block.  Turning this option on has serious performance
-; implications and is generally recommended for debugging purposes only.
-; http://php.net/implicit-flush
-; Note: This directive is hardcoded to On for the CLI SAPI
-implicit_flush = Off
-
-; The unserialize callback function will be called (with the undefined class'
-; name as parameter), if the unserializer finds an undefined class
-; which should be instantiated. A warning appears if the specified function is
-; not defined, or if the function doesn't include/implement the missing class.
-; So only set this entry, if you really want to implement such a
-; callback-function.
-unserialize_callback_func =
-
-; The unserialize_max_depth specifies the default depth limit for unserialized
-; structures. Setting the depth limit too high may result in stack overflows
-; during unserialization. The unserialize_max_depth ini setting can be
-; overridden by the max_depth option on individual unserialize() calls.
-; A value of 0 disables the depth limit.
-;unserialize_max_depth = 4096
-
-; When floats & doubles are serialized, store serialize_precision significant
-; digits after the floating point. The default value ensures that when floats
-; are decoded with unserialize, the data will remain the same.
-; The value is also used for json_encode when encoding double values.
-; If -1 is used, then dtoa mode 0 is used which automatically select the best
-; precision.
-serialize_precision = -1
-
-; open_basedir, if set, limits all file operations to the defined directory
-; and below.  This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file.
-; Note: disables the realpath cache
-; http://php.net/open-basedir
-;open_basedir =
-
-; This directive allows you to disable certain functions.
-; It receives a comma-delimited list of function names.
-; http://php.net/disable-functions
-disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare,
-
-; This directive allows you to disable certain classes.
-; It receives a comma-delimited list of class names.
-; http://php.net/disable-classes
-disable_classes =
-
-; Colors for Syntax Highlighting mode.  Anything that's acceptable in
-; <span style="color: ???????"> would work.
-; http://php.net/syntax-highlighting
-;highlight.string  = #DD0000
-;highlight.comment = #FF9900
-;highlight.keyword = #007700
-;highlight.default = #0000BB
-;highlight.html    = #000000
-
-; If enabled, the request will be allowed to complete even if the user aborts
-; the request. Consider enabling it if executing long requests, which may end up
-; being interrupted by the user or a browser timing out. PHP's default behavior
-; is to disable this feature.
-; http://php.net/ignore-user-abort
-;ignore_user_abort = On
-
-; Determines the size of the realpath cache to be used by PHP. This value should
-; be increased on systems where PHP opens many files to reflect the quantity of
-; the file operations performed.
-; Note: if open_basedir is set, the cache is disabled
-; http://php.net/realpath-cache-size
-;realpath_cache_size = 4096k
-
-; Duration of time, in seconds for which to cache realpath information for a given
-; file or directory. For systems with rarely changing files, consider increasing this
-; value.
-; http://php.net/realpath-cache-ttl
-;realpath_cache_ttl = 120
-
-; Enables or disables the circular reference collector.
-; http://php.net/zend.enable-gc
-zend.enable_gc = On
-
-; If enabled, scripts may be written in encodings that are incompatible with
-; the scanner.  CP936, Big5, CP949 and Shift_JIS are the examples of such
-; encodings.  To use this feature, mbstring extension must be enabled.
-; Default: Off
-;zend.multibyte = Off
-
-; Allows to set the default encoding for the scripts.  This value will be used
-; unless "declare(encoding=...)" directive appears at the top of the script.
-; Only affects if zend.multibyte is set.
-; Default: ""
-;zend.script_encoding =
-
-; Allows to include or exclude arguments from stack traces generated for exceptions.
-; In production, it is recommended to turn this setting on to prohibit the output 
-; of sensitive information in stack traces
-; Default: Off
-zend.exception_ignore_args = On
-
-;;;;;;;;;;;;;;;;;
-; Miscellaneous ;
-;;;;;;;;;;;;;;;;;
-
-; Decides whether PHP may expose the fact that it is installed on the server
-; (e.g. by adding its signature to the Web server header).  It is no security
-; threat in any way, but it makes it possible to determine whether you use PHP
-; on your server or not.
-; http://php.net/expose-php
-expose_php = Off
-
-;;;;;;;;;;;;;;;;;;;
-; Resource Limits ;
-;;;;;;;;;;;;;;;;;;;
-
-; Maximum execution time of each script, in seconds
-; http://php.net/max-execution-time
-; Note: This directive is hardcoded to 0 for the CLI SAPI
-max_execution_time = 30
-
-; Maximum amount of time each script may spend parsing request data. It's a good
-; idea to limit this time on productions servers in order to eliminate unexpectedly
-; long running scripts.
-; Note: This directive is hardcoded to -1 for the CLI SAPI
-; Default Value: -1 (Unlimited)
-; Development Value: 60 (60 seconds)
-; Production Value: 60 (60 seconds)
-; http://php.net/max-input-time
-max_input_time = 60
-
-; Maximum input variable nesting level
-; http://php.net/max-input-nesting-level
-;max_input_nesting_level = 64
-
-; How many GET/POST/COOKIE input variables may be accepted
-;max_input_vars = 1000
-
-; Maximum amount of memory a script may consume
-; http://php.net/memory-limit
-memory_limit = 128M
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Error handling and logging ;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; This directive informs PHP of which errors, warnings and notices you would like
-; it to take action for. The recommended way of setting values for this
-; directive is through the use of the error level constants and bitwise
-; operators. The error level constants are below here for convenience as well as
-; some common settings and their meanings.
-; By default, PHP is set to take action on all errors, notices and warnings EXCEPT
-; those related to E_NOTICE and E_STRICT, which together cover best practices and
-; recommended coding standards in PHP. For performance reasons, this is the
-; recommend error reporting setting. Your production server shouldn't be wasting
-; resources complaining about best practices and coding standards. That's what
-; development servers and development settings are for.
-; Note: The php.ini-development file has this setting as E_ALL. This
-; means it pretty much reports everything which is exactly what you want during
-; development and early testing.
-;
-; Error Level Constants:
-; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 5.4.0)
-; E_ERROR           - fatal run-time errors
-; E_RECOVERABLE_ERROR  - almost fatal run-time errors
-; E_WARNING         - run-time warnings (non-fatal errors)
-; E_PARSE           - compile-time parse errors
-; E_NOTICE          - run-time notices (these are warnings which often result
-;                     from a bug in your code, but it's possible that it was
-;                     intentional (e.g., using an uninitialized variable and
-;                     relying on the fact it is automatically initialized to an
-;                     empty string)
-; E_STRICT          - run-time notices, enable to have PHP suggest changes
-;                     to your code which will ensure the best interoperability
-;                     and forward compatibility of your code
-; E_CORE_ERROR      - fatal errors that occur during PHP's initial startup
-; E_CORE_WARNING    - warnings (non-fatal errors) that occur during PHP's
-;                     initial startup
-; E_COMPILE_ERROR   - fatal compile-time errors
-; E_COMPILE_WARNING - compile-time warnings (non-fatal errors)
-; E_USER_ERROR      - user-generated error message
-; E_USER_WARNING    - user-generated warning message
-; E_USER_NOTICE     - user-generated notice message
-; E_DEPRECATED      - warn about code that will not work in future versions
-;                     of PHP
-; E_USER_DEPRECATED - user-generated deprecation warnings
-;
-; Common Values:
-;   E_ALL (Show all errors, warnings and notices including coding standards.)
-;   E_ALL & ~E_NOTICE  (Show all errors, except for notices)
-;   E_ALL & ~E_NOTICE & ~E_STRICT  (Show all errors, except for notices and coding standards warnings.)
-;   E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR  (Show only errors)
-; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
-; Development Value: E_ALL
-; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
-; http://php.net/error-reporting
-error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
-
-; This directive controls whether or not and where PHP will output errors,
-; notices and warnings too. Error output is very useful during development, but
-; it could be very dangerous in production environments. Depending on the code
-; which is triggering the error, sensitive information could potentially leak
-; out of your application such as database usernames and passwords or worse.
-; For production environments, we recommend logging errors rather than
-; sending them to STDOUT.
-; Possible Values:
-;   Off = Do not display any errors
-;   stderr = Display errors to STDERR (affects only CGI/CLI binaries!)
-;   On or stdout = Display errors to STDOUT
-; Default Value: On
-; Development Value: On
-; Production Value: Off
-; http://php.net/display-errors
-display_errors = Off
-
-; The display of errors which occur during PHP's startup sequence are handled
-; separately from display_errors. PHP's default behavior is to suppress those
-; errors from clients. Turning the display of startup errors on can be useful in
-; debugging configuration problems. We strongly recommend you
-; set this to 'off' for production servers.
-; Default Value: Off
-; Development Value: On
-; Production Value: Off
-; http://php.net/display-startup-errors
-display_startup_errors = Off
-
-; Besides displaying errors, PHP can also log errors to locations such as a
-; server-specific log, STDERR, or a location specified by the error_log
-; directive found below. While errors should not be displayed on productions
-; servers they should still be monitored and logging is a great way to do that.
-; Default Value: Off
-; Development Value: On
-; Production Value: On
-; http://php.net/log-errors
-log_errors = On
-
-; Set maximum length of log_errors. In error_log information about the source is
-; added. The default is 1024 and 0 allows to not apply any maximum length at all.
-; http://php.net/log-errors-max-len
-log_errors_max_len = 1024
-
-; Do not log repeated messages. Repeated errors must occur in same file on same
-; line unless ignore_repeated_source is set true.
-; http://php.net/ignore-repeated-errors
-ignore_repeated_errors = Off
-
-; Ignore source of message when ignoring repeated messages. When this setting
-; is On you will not log errors with repeated messages from different files or
-; source lines.
-; http://php.net/ignore-repeated-source
-ignore_repeated_source = Off
-
-; If this parameter is set to Off, then memory leaks will not be shown (on
-; stdout or in the log). This is only effective in a debug compile, and if
-; error reporting includes E_WARNING in the allowed list
-; http://php.net/report-memleaks
-report_memleaks = On
-
-; This setting is on by default.
-;report_zend_debug = 0
-
-; Store the last error/warning message in $php_errormsg (boolean). Setting this value
-; to On can assist in debugging and is appropriate for development servers. It should
-; however be disabled on production servers.
-; This directive is DEPRECATED.
-; Default Value: Off
-; Development Value: Off
-; Production Value: Off
-; http://php.net/track-errors
-;track_errors = Off
-
-; Turn off normal error reporting and emit XML-RPC error XML
-; http://php.net/xmlrpc-errors
-;xmlrpc_errors = 0
-
-; An XML-RPC faultCode
-;xmlrpc_error_number = 0
-
-; When PHP displays or logs an error, it has the capability of formatting the
-; error message as HTML for easier reading. This directive controls whether
-; the error message is formatted as HTML or not.
-; Note: This directive is hardcoded to Off for the CLI SAPI
-; http://php.net/html-errors
-;html_errors = On
-
-; If html_errors is set to On *and* docref_root is not empty, then PHP
-; produces clickable error messages that direct to a page describing the error
-; or function causing the error in detail.
-; You can download a copy of the PHP manual from http://php.net/docs
-; and change docref_root to the base URL of your local copy including the
-; leading '/'. You must also specify the file extension being used including
-; the dot. PHP's default behavior is to leave these settings empty, in which
-; case no links to documentation are generated.
-; Note: Never use this feature for production boxes.
-; http://php.net/docref-root
-; Examples
-;docref_root = "/phpmanual/"
-
-; http://php.net/docref-ext
-;docref_ext = .html
-
-; String to output before an error message. PHP's default behavior is to leave
-; this setting blank.
-; http://php.net/error-prepend-string
-; Example:
-;error_prepend_string = "<span style='color: #ff0000'>"
-
-; String to output after an error message. PHP's default behavior is to leave
-; this setting blank.
-; http://php.net/error-append-string
-; Example:
-;error_append_string = "</span>"
-
-; Log errors to specified file. PHP's default behavior is to leave this value
-; empty.
-; http://php.net/error-log
-; Example:
-error_log = /var/log/php.log
-; Log errors to syslog (Event Log on Windows).
-;error_log = syslog
-
-; The syslog ident is a string which is prepended to every message logged
-; to syslog. Only used when error_log is set to syslog.
-;syslog.ident = php
-
-; The syslog facility is used to specify what type of program is logging
-; the message. Only used when error_log is set to syslog.
-;syslog.facility = user
-
-; Set this to disable filtering control characters (the default).
-; Some loggers only accept NVT-ASCII, others accept anything that's not
-; control characters. If your logger accepts everything, then no filtering
-; is needed at all.
-; Allowed values are:
-;   ascii (all printable ASCII characters and NL)
-;   no-ctrl (all characters except control characters)
-;   all (all characters)
-;   raw (like "all", but messages are not split at newlines)
-; http://php.net/syslog.filter
-;syslog.filter = ascii
-
-;windows.show_crt_warning
-; Default value: 0
-; Development value: 0
-; Production value: 0
-
-;;;;;;;;;;;;;;;;;
-; Data Handling ;
-;;;;;;;;;;;;;;;;;
-
-; The separator used in PHP generated URLs to separate arguments.
-; PHP's default setting is "&".
-; http://php.net/arg-separator.output
-; Example:
-;arg_separator.output = "&amp;"
-
-; List of separator(s) used by PHP to parse input URLs into variables.
-; PHP's default setting is "&".
-; NOTE: Every character in this directive is considered as separator!
-; http://php.net/arg-separator.input
-; Example:
-;arg_separator.input = ";&"
-
-; This directive determines which super global arrays are registered when PHP
-; starts up. G,P,C,E & S are abbreviations for the following respective super
-; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty
-; paid for the registration of these arrays and because ENV is not as commonly
-; used as the others, ENV is not recommended on productions servers. You
-; can still get access to the environment variables through getenv() should you
-; need to.
-; Default Value: "EGPCS"
-; Development Value: "GPCS"
-; Production Value: "GPCS";
-; http://php.net/variables-order
-variables_order = "GPCS"
-
-; This directive determines which super global data (G,P & C) should be
-; registered into the super global array REQUEST. If so, it also determines
-; the order in which that data is registered. The values for this directive
-; are specified in the same manner as the variables_order directive,
-; EXCEPT one. Leaving this value empty will cause PHP to use the value set
-; in the variables_order directive. It does not mean it will leave the super
-; globals array REQUEST empty.
-; Default Value: None
-; Development Value: "GP"
-; Production Value: "GP"
-; http://php.net/request-order
-request_order = "GP"
-
-; This directive determines whether PHP registers $argv & $argc each time it
-; runs. $argv contains an array of all the arguments passed to PHP when a script
-; is invoked. $argc contains an integer representing the number of arguments
-; that were passed when the script was invoked. These arrays are extremely
-; useful when running scripts from the command line. When this directive is
-; enabled, registering these variables consumes CPU cycles and memory each time
-; a script is executed. For performance reasons, this feature should be disabled
-; on production servers.
-; Note: This directive is hardcoded to On for the CLI SAPI
-; Default Value: On
-; Development Value: Off
-; Production Value: Off
-; http://php.net/register-argc-argv
-register_argc_argv = Off
-
-; When enabled, the ENV, REQUEST and SERVER variables are created when they're
-; first used (Just In Time) instead of when the script starts. If these
-; variables are not used within a script, having this directive on will result
-; in a performance gain. The PHP directive register_argc_argv must be disabled
-; for this directive to have any effect.
-; http://php.net/auto-globals-jit
-auto_globals_jit = On
-
-; Whether PHP will read the POST data.
-; This option is enabled by default.
-; Most likely, you won't want to disable this option globally. It causes $_POST
-; and $_FILES to always be empty; the only way you will be able to read the
-; POST data will be through the php://input stream wrapper. This can be useful
-; to proxy requests or to process the POST data in a memory efficient fashion.
-; http://php.net/enable-post-data-reading
-;enable_post_data_reading = Off
-
-; Maximum size of POST data that PHP will accept.
-; Its value may be 0 to disable the limit. It is ignored if POST data reading
-; is disabled through enable_post_data_reading.
-; http://php.net/post-max-size
-post_max_size = 8M
-
-; Automatically add files before PHP document.
-; http://php.net/auto-prepend-file
-auto_prepend_file =
-
-; Automatically add files after PHP document.
-; http://php.net/auto-append-file
-auto_append_file =
-
-; By default, PHP will output a media type using the Content-Type header. To
-; disable this, simply set it to be empty.
-;
-; PHP's built-in default media type is set to text/html.
-; http://php.net/default-mimetype
-default_mimetype = "text/html"
-
-; PHP's default character set is set to UTF-8.
-; http://php.net/default-charset
-default_charset = "UTF-8"
-
-; PHP internal character encoding is set to empty.
-; If empty, default_charset is used.
-; http://php.net/internal-encoding
-;internal_encoding =
-
-; PHP input character encoding is set to empty.
-; If empty, default_charset is used.
-; http://php.net/input-encoding
-;input_encoding =
-
-; PHP output character encoding is set to empty.
-; If empty, default_charset is used.
-; See also output_buffer.
-; http://php.net/output-encoding
-;output_encoding =
-
-;;;;;;;;;;;;;;;;;;;;;;;;;
-; Paths and Directories ;
-;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; UNIX: "/path1:/path2"
-;include_path = ".:/usr/share/php"
-;
-; Windows: "\path1;\path2"
-;include_path = ".;c:\php\includes"
-;
-; PHP's default setting for include_path is ".;/path/to/php/pear"
-; http://php.net/include-path
-
-; The root of the PHP pages, used only if nonempty.
-; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-; if you are running php as a CGI under any web server (other than IIS)
-; see documentation for security issues.  The alternate is to use the
-; cgi.force_redirect configuration below
-; http://php.net/doc-root
-doc_root =
-
-; The directory under which PHP opens the script using /~username used only
-; if nonempty.
-; http://php.net/user-dir
-user_dir =
-
-; Directory in which the loadable extensions (modules) reside.
-; http://php.net/extension-dir
-;extension_dir = "./"
-; On windows:
-;extension_dir = "ext"
-
-; Directory where the temporary files should be placed.
-; Defaults to the system default (see sys_get_temp_dir)
-;sys_temp_dir = "/tmp"
-
-; Whether or not to enable the dl() function.  The dl() function does NOT work
-; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-; disabled on them.
-; http://php.net/enable-dl
-enable_dl = Off
-
-; cgi.force_redirect is necessary to provide security running PHP as a CGI under
-; most web servers.  Left undefined, PHP turns this on by default.  You can
-; turn it off here AT YOUR OWN RISK
-; **You CAN safely turn this off for IIS, in fact, you MUST.**
-; http://php.net/cgi.force-redirect
-;cgi.force_redirect = 1
-
-; if cgi.nph is enabled it will force cgi to always sent Status: 200 with
-; every request. PHP's default behavior is to disable this feature.
-;cgi.nph = 1
-
-; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
-; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
-; will look for to know it is OK to continue execution.  Setting this variable MAY
-; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
-; http://php.net/cgi.redirect-status-env
-;cgi.redirect_status_env =
-
-; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI.  PHP's
-; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
-; what PATH_INFO is.  For more information on PATH_INFO, see the cgi specs.  Setting
-; this to 1 will cause PHP CGI to fix its paths to conform to the spec.  A setting
-; of zero causes PHP to behave as before.  Default is 1.  You should fix your scripts
-; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
-; http://php.net/cgi.fix-pathinfo
-;cgi.fix_pathinfo=1
-
-; if cgi.discard_path is enabled, the PHP CGI binary can safely be placed outside
-; of the web tree and people will not be able to circumvent .htaccess security.
-;cgi.discard_path=1
-
-; FastCGI under IIS supports the ability to impersonate
-; security tokens of the calling client.  This allows IIS to define the
-; security context that the request runs under.  mod_fastcgi under Apache
-; does not currently support this feature (03/17/2002)
-; Set to 1 if running under IIS.  Default is zero.
-; http://php.net/fastcgi.impersonate
-;fastcgi.impersonate = 1
-
-; Disable logging through FastCGI connection. PHP's default behavior is to enable
-; this feature.
-;fastcgi.logging = 0
-
-; cgi.rfc2616_headers configuration option tells PHP what type of headers to
-; use when sending HTTP response code. If set to 0, PHP sends Status: header that
-; is supported by Apache. When this option is set to 1, PHP will send
-; RFC2616 compliant header.
-; Default is zero.
-; http://php.net/cgi.rfc2616-headers
-;cgi.rfc2616_headers = 0
-
-; cgi.check_shebang_line controls whether CGI PHP checks for line starting with #!
-; (shebang) at the top of the running script. This line might be needed if the
-; script support running both as stand-alone script and via PHP CGI<. PHP in CGI
-; mode skips this line and ignores its content if this directive is turned on.
-; http://php.net/cgi.check-shebang-line
-;cgi.check_shebang_line=1
-
-;;;;;;;;;;;;;;;;
-; File Uploads ;
-;;;;;;;;;;;;;;;;
-
-; Whether to allow HTTP file uploads.
-; http://php.net/file-uploads
-file_uploads = On
-
-; Temporary directory for HTTP uploaded files (will use system default if not
-; specified).
-; http://php.net/upload-tmp-dir
-;upload_tmp_dir =
-
-; Maximum allowed size for uploaded files.
-; http://php.net/upload-max-filesize
-upload_max_filesize = 2M
-
-; Maximum number of files that can be uploaded via a single request
-max_file_uploads = 20
-
-;;;;;;;;;;;;;;;;;;
-; Fopen wrappers ;
-;;;;;;;;;;;;;;;;;;
-
-; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
-; http://php.net/allow-url-fopen
-allow_url_fopen = On
-
-; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
-; http://php.net/allow-url-include
-allow_url_include = Off
-
-; Define the anonymous ftp password (your email address). PHP's default setting
-; for this is empty.
-; http://php.net/from
-;from="john@doe.com"
-
-; Define the User-Agent string. PHP's default setting for this is empty.
-; http://php.net/user-agent
-;user_agent="PHP"
-
-; Default timeout for socket based streams (seconds)
-; http://php.net/default-socket-timeout
-default_socket_timeout = 60
-
-; If your scripts have to deal with files from Macintosh systems,
-; or you are running on a Mac and need to deal with files from
-; unix or win32 systems, setting this flag will cause PHP to
-; automatically detect the EOL character in those files so that
-; fgets() and file() will work regardless of the source of the file.
-; http://php.net/auto-detect-line-endings
-;auto_detect_line_endings = Off
-
-;;;;;;;;;;;;;;;;;;;;;;
-; Dynamic Extensions ;
-;;;;;;;;;;;;;;;;;;;;;;
-
-; If you wish to have an extension loaded automatically, use the following
-; syntax:
-;
-;   extension=modulename
-;
-; For example:
-;
-;   extension=mysqli
-;
-; When the extension library to load is not located in the default extension
-; directory, You may specify an absolute path to the library file:
-;
-;   extension=/path/to/extension/mysqli.so
-;
-; Note : The syntax used in previous PHP versions ('extension=<ext>.so' and
-; 'extension='php_<ext>.dll') is supported for legacy reasons and may be
-; deprecated in a future PHP major version. So, when it is possible, please
-; move to the new ('extension=<ext>) syntax.
-;
-; Notes for Windows environments :
-;
-; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+)
-;   extension folders as well as the separate PECL DLL download (PHP 5+).
-;   Be sure to appropriately set the extension_dir directive.
-;
-;extension=bz2
-;extension=curl
-;extension=ffi
-;extension=ftp
-;extension=fileinfo
-;extension=gd2
-;extension=gettext
-;extension=gmp
-;extension=intl
-;extension=imap
-;extension=ldap
-;extension=mbstring
-;extension=exif      ; Must be after mbstring as it depends on it
-;extension=mysqli
-;extension=oci8_12c  ; Use with Oracle Database 12c Instant Client
-;extension=odbc
-;extension=openssl
-;extension=pdo_firebird
-;extension=pdo_mysql
-;extension=pdo_oci
-;extension=pdo_odbc
-;extension=pdo_pgsql
-;extension=pdo_sqlite
-;extension=pgsql
-;extension=shmop
-
-; The MIBS data available in the PHP distribution must be installed.
-; See http://www.php.net/manual/en/snmp.installation.php
-;extension=snmp
-
-;extension=soap
-;extension=sockets
-;extension=sodium
-;extension=sqlite3
-;extension=tidy
-;extension=xmlrpc
-;extension=xsl
-
-;;;;;;;;;;;;;;;;;;;
-; Module Settings ;
-;;;;;;;;;;;;;;;;;;;
-
-[CLI Server]
-; Whether the CLI web server uses ANSI color coding in its terminal output.
-cli_server.color = On
-
-[Date]
-; Defines the default timezone used by the date functions
-; http://php.net/date.timezone
-;date.timezone =
-
-; http://php.net/date.default-latitude
-;date.default_latitude = 31.7667
-
-; http://php.net/date.default-longitude
-;date.default_longitude = 35.2333
-
-; http://php.net/date.sunrise-zenith
-;date.sunrise_zenith = 90.583333
-
-; http://php.net/date.sunset-zenith
-;date.sunset_zenith = 90.583333
-
-[filter]
-; http://php.net/filter.default
-;filter.default = unsafe_raw
-
-; http://php.net/filter.default-flags
-;filter.default_flags =
-
-[iconv]
-; Use of this INI entry is deprecated, use global input_encoding instead.
-; If empty, default_charset or input_encoding or iconv.input_encoding is used.
-; The precedence is: default_charset < input_encoding < iconv.input_encoding
-;iconv.input_encoding =
-
-; Use of this INI entry is deprecated, use global internal_encoding instead.
-; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
-; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
-;iconv.internal_encoding =
-
-; Use of this INI entry is deprecated, use global output_encoding instead.
-; If empty, default_charset or output_encoding or iconv.output_encoding is used.
-; The precedence is: default_charset < output_encoding < iconv.output_encoding
-; To use an output encoding conversion, iconv's output handler must be set
-; otherwise output encoding conversion cannot be performed.
-;iconv.output_encoding =
-
-[imap]
-; rsh/ssh logins are disabled by default. Use this INI entry if you want to
-; enable them. Note that the IMAP library does not filter mailbox names before
-; passing them to rsh/ssh command, thus passing untrusted data to this function
-; with rsh/ssh enabled is insecure.
-;imap.enable_insecure_rsh=0
-
-[intl]
-;intl.default_locale =
-; This directive allows you to produce PHP errors when some error
-; happens within intl functions. The value is the level of the error produced.
-; Default is 0, which does not produce any errors.
-;intl.error_level = E_WARNING
-;intl.use_exceptions = 0
-
-[sqlite3]
-; Directory pointing to SQLite3 extensions
-; http://php.net/sqlite3.extension-dir
-;sqlite3.extension_dir =
-
-; SQLite defensive mode flag (only available from SQLite 3.26+)
-; When the defensive flag is enabled, language features that allow ordinary
-; SQL to deliberately corrupt the database file are disabled. This forbids
-; writing directly to the schema, shadow tables (eg. FTS data tables), or
-; the sqlite_dbpage virtual table.
-; https://www.sqlite.org/c3ref/c_dbconfig_defensive.html
-; (for older SQLite versions, this flag has no use)
-;sqlite3.defensive = 1
-
-[Pcre]
-; PCRE library backtracking limit.
-; http://php.net/pcre.backtrack-limit
-;pcre.backtrack_limit=100000
-
-; PCRE library recursion limit.
-; Please note that if you set this value to a high number you may consume all
-; the available process stack and eventually crash PHP (due to reaching the
-; stack size limit imposed by the Operating System).
-; http://php.net/pcre.recursion-limit
-;pcre.recursion_limit=100000
-
-; Enables or disables JIT compilation of patterns. This requires the PCRE
-; library to be compiled with JIT support.
-;pcre.jit=1
-
-[Pdo]
-; Whether to pool ODBC connections. Can be one of "strict", "relaxed" or "off"
-; http://php.net/pdo-odbc.connection-pooling
-;pdo_odbc.connection_pooling=strict
-
-;pdo_odbc.db2_instance_name
-
-[Pdo_mysql]
-; Default socket name for local MySQL connects.  If empty, uses the built-in
-; MySQL defaults.
-pdo_mysql.default_socket=
-
-[Phar]
-; http://php.net/phar.readonly
-;phar.readonly = On
-
-; http://php.net/phar.require-hash
-;phar.require_hash = On
-
-;phar.cache_list =
-
-[mail function]
-; For Win32 only.
-; http://php.net/smtp
-SMTP = localhost
-; http://php.net/smtp-port
-smtp_port = 25
-
-; For Win32 only.
-; http://php.net/sendmail-from
-;sendmail_from = me@example.com
-
-; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
-; http://php.net/sendmail-path
-;sendmail_path =
-
-; Force the addition of the specified parameters to be passed as extra parameters
-; to the sendmail binary. These parameters will always replace the value of
-; the 5th parameter to mail().
-;mail.force_extra_parameters =
-
-; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
-mail.add_x_header = Off
-
-; The path to a log file that will log all mail() calls. Log entries include
-; the full path of the script, line number, To address and headers.
-;mail.log =
-; Log mail to syslog (Event Log on Windows).
-;mail.log = syslog
-
-[ODBC]
-; http://php.net/odbc.default-db
-;odbc.default_db    =  Not yet implemented
-
-; http://php.net/odbc.default-user
-;odbc.default_user  =  Not yet implemented
-
-; http://php.net/odbc.default-pw
-;odbc.default_pw    =  Not yet implemented
-
-; Controls the ODBC cursor model.
-; Default: SQL_CURSOR_STATIC (default).
-;odbc.default_cursortype
-
-; Allow or prevent persistent links.
-; http://php.net/odbc.allow-persistent
-odbc.allow_persistent = On
-
-; Check that a connection is still valid before reuse.
-; http://php.net/odbc.check-persistent
-odbc.check_persistent = On
-
-; Maximum number of persistent links.  -1 means no limit.
-; http://php.net/odbc.max-persistent
-odbc.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent).  -1 means no limit.
-; http://php.net/odbc.max-links
-odbc.max_links = -1
-
-; Handling of LONG fields.  Returns number of bytes to variables.  0 means
-; passthru.
-; http://php.net/odbc.defaultlrl
-odbc.defaultlrl = 4096
-
-; Handling of binary data.  0 means passthru, 1 return as is, 2 convert to char.
-; See the documentation on odbc_binmode and odbc_longreadlen for an explanation
-; of odbc.defaultlrl and odbc.defaultbinmode
-; http://php.net/odbc.defaultbinmode
-odbc.defaultbinmode = 1
-
-[MySQLi]
-
-; Maximum number of persistent links.  -1 means no limit.
-; http://php.net/mysqli.max-persistent
-mysqli.max_persistent = -1
-
-; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
-; http://php.net/mysqli.allow_local_infile
-;mysqli.allow_local_infile = On
-
-; Allow or prevent persistent links.
-; http://php.net/mysqli.allow-persistent
-mysqli.allow_persistent = On
-
-; Maximum number of links.  -1 means no limit.
-; http://php.net/mysqli.max-links
-mysqli.max_links = -1
-
-; Default port number for mysqli_connect().  If unset, mysqli_connect() will use
-; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
-; compile-time value defined MYSQL_PORT (in that order).  Win32 will only look
-; at MYSQL_PORT.
-; http://php.net/mysqli.default-port
-mysqli.default_port = 3306
-
-; Default socket name for local MySQL connects.  If empty, uses the built-in
-; MySQL defaults.
-; http://php.net/mysqli.default-socket
-mysqli.default_socket = /run/mysqld/mysqld.sock
-
-; Default host for mysqli_connect() (doesn't apply in safe mode).
-; http://php.net/mysqli.default-host
-mysqli.default_host =
-
-; Default user for mysqli_connect() (doesn't apply in safe mode).
-; http://php.net/mysqli.default-user
-mysqli.default_user =
-
-; Default password for mysqli_connect() (doesn't apply in safe mode).
-; Note that this is generally a *bad* idea to store passwords in this file.
-; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw")
-; and reveal this password!  And of course, any users with read access to this
-; file will be able to reveal the password as well.
-; http://php.net/mysqli.default-pw
-mysqli.default_pw =
-
-; Allow or prevent reconnect
-mysqli.reconnect = Off
-
-[mysqlnd]
-; Enable / Disable collection of general statistics by mysqlnd which can be
-; used to tune and monitor MySQL operations.
-mysqlnd.collect_statistics = On
-
-; Enable / Disable collection of memory usage statistics by mysqlnd which can be
-; used to tune and monitor MySQL operations.
-mysqlnd.collect_memory_statistics = Off
-
-; Records communication from all extensions using mysqlnd to the specified log
-; file.
-; http://php.net/mysqlnd.debug
-;mysqlnd.debug =
-
-; Defines which queries will be logged.
-;mysqlnd.log_mask = 0
-
-; Default size of the mysqlnd memory pool, which is used by result sets.
-;mysqlnd.mempool_default_size = 16000
-
-; Size of a pre-allocated buffer used when sending commands to MySQL in bytes.
-;mysqlnd.net_cmd_buffer_size = 2048
-
-; Size of a pre-allocated buffer used for reading data sent by the server in
-; bytes.
-;mysqlnd.net_read_buffer_size = 32768
-
-; Timeout for network requests in seconds.
-;mysqlnd.net_read_timeout = 31536000
-
-; SHA-256 Authentication Plugin related. File with the MySQL server public RSA
-; key.
-;mysqlnd.sha256_server_public_key =
-
-[OCI8]
-
-; Connection: Enables privileged connections using external
-; credentials (OCI_SYSOPER, OCI_SYSDBA)
-; http://php.net/oci8.privileged-connect
-;oci8.privileged_connect = Off
-
-; Connection: The maximum number of persistent OCI8 connections per
-; process. Using -1 means no limit.
-; http://php.net/oci8.max-persistent
-;oci8.max_persistent = -1
-
-; Connection: The maximum number of seconds a process is allowed to
-; maintain an idle persistent connection. Using -1 means idle
-; persistent connections will be maintained forever.
-; http://php.net/oci8.persistent-timeout
-;oci8.persistent_timeout = -1
-
-; Connection: The number of seconds that must pass before issuing a
-; ping during oci_pconnect() to check the connection validity. When
-; set to 0, each oci_pconnect() will cause a ping. Using -1 disables
-; pings completely.
-; http://php.net/oci8.ping-interval
-;oci8.ping_interval = 60
-
-; Connection: Set this to a user chosen connection class to be used
-; for all pooled server requests with Oracle 11g Database Resident
-; Connection Pooling (DRCP).  To use DRCP, this value should be set to
-; the same string for all web servers running the same application,
-; the database pool must be configured, and the connection string must
-; specify to use a pooled server.
-;oci8.connection_class =
-
-; High Availability: Using On lets PHP receive Fast Application
-; Notification (FAN) events generated when a database node fails. The
-; database must also be configured to post FAN events.
-;oci8.events = Off
-
-; Tuning: This option enables statement caching, and specifies how
-; many statements to cache. Using 0 disables statement caching.
-; http://php.net/oci8.statement-cache-size
-;oci8.statement_cache_size = 20
-
-; Tuning: Enables statement prefetching and sets the default number of
-; rows that will be fetched automatically after statement execution.
-; http://php.net/oci8.default-prefetch
-;oci8.default_prefetch = 100
-
-; Compatibility. Using On means oci_close() will not close
-; oci_connect() and oci_new_connect() connections.
-; http://php.net/oci8.old-oci-close-semantics
-;oci8.old_oci_close_semantics = Off
-
-[PostgreSQL]
-; Allow or prevent persistent links.
-; http://php.net/pgsql.allow-persistent
-pgsql.allow_persistent = On
-
-; Detect broken persistent links always with pg_pconnect().
-; Auto reset feature requires a little overheads.
-; http://php.net/pgsql.auto-reset-persistent
-pgsql.auto_reset_persistent = Off
-
-; Maximum number of persistent links.  -1 means no limit.
-; http://php.net/pgsql.max-persistent
-pgsql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent).  -1 means no limit.
-; http://php.net/pgsql.max-links
-pgsql.max_links = -1
-
-; Ignore PostgreSQL backends Notice message or not.
-; Notice message logging require a little overheads.
-; http://php.net/pgsql.ignore-notice
-pgsql.ignore_notice = 0
-
-; Log PostgreSQL backends Notice message or not.
-; Unless pgsql.ignore_notice=0, module cannot log notice message.
-; http://php.net/pgsql.log-notice
-pgsql.log_notice = 0
-
-[bcmath]
-; Number of decimal digits for all bcmath functions.
-; http://php.net/bcmath.scale
-bcmath.scale = 0
-
-[browscap]
-; http://php.net/browscap
-;browscap = extra/browscap.ini
-
-[Session]
-; Handler used to store/retrieve data.
-; http://php.net/session.save-handler
-session.save_handler = files
-
-; Argument passed to save_handler.  In the case of files, this is the path
-; where data files are stored. Note: Windows users have to change this
-; variable in order to use PHP's session functions.
-;
-; The path can be defined as:
-;
-;     session.save_path = "N;/path"
-;
-; where N is an integer.  Instead of storing all the session files in
-; /path, what this will do is use subdirectories N-levels deep, and
-; store the session data in those directories.  This is useful if
-; your OS has problems with many files in one directory, and is
-; a more efficient layout for servers that handle many sessions.
-;
-; NOTE 1: PHP will not create this directory structure automatically.
-;         You can use the script in the ext/session dir for that purpose.
-; NOTE 2: See the section on garbage collection below if you choose to
-;         use subdirectories for session storage
-;
-; The file storage module creates files using mode 600 by default.
-; You can change that by using
-;
-;     session.save_path = "N;MODE;/path"
-;
-; where MODE is the octal representation of the mode. Note that this
-; does not overwrite the process's umask.
-; http://php.net/session.save-path
-;session.save_path = "/var/lib/php/sessions"
-
-; Whether to use strict session mode.
-; Strict session mode does not accept an uninitialized session ID, and
-; regenerates the session ID if the browser sends an uninitialized session ID.
-; Strict mode protects applications from session fixation via a session adoption
-; vulnerability. It is disabled by default for maximum compatibility, but
-; enabling it is encouraged.
-; https://wiki.php.net/rfc/strict_sessions
-session.use_strict_mode = 0
-
-; Whether to use cookies.
-; http://php.net/session.use-cookies
-session.use_cookies = 1
-
-; http://php.net/session.cookie-secure
-;session.cookie_secure =
-
-; This option forces PHP to fetch and use a cookie for storing and maintaining
-; the session id. We encourage this operation as it's very helpful in combating
-; session hijacking when not specifying and managing your own session id. It is
-; not the be-all and end-all of session hijacking defense, but it's a good start.
-; http://php.net/session.use-only-cookies
-session.use_only_cookies = 1
-
-; Name of the session (used as cookie name).
-; http://php.net/session.name
-session.name = PHPSESSID
-
-; Initialize session on request startup.
-; http://php.net/session.auto-start
-session.auto_start = 0
-
-; Lifetime in seconds of cookie or, if 0, until browser is restarted.
-; http://php.net/session.cookie-lifetime
-session.cookie_lifetime = 0
-
-; The path for which the cookie is valid.
-; http://php.net/session.cookie-path
-session.cookie_path = /
-
-; The domain for which the cookie is valid.
-; http://php.net/session.cookie-domain
-session.cookie_domain =
-
-; Whether or not to add the httpOnly flag to the cookie, which makes it
-; inaccessible to browser scripting languages such as JavaScript.
-; http://php.net/session.cookie-httponly
-session.cookie_httponly =
-
-; Add SameSite attribute to cookie to help mitigate Cross-Site Request Forgery (CSRF/XSRF)
-; Current valid values are "Strict", "Lax" or "None". When using "None",
-; make sure to include the quotes, as `none` is interpreted like `false` in ini files.
-; https://tools.ietf.org/html/draft-west-first-party-cookies-07
-session.cookie_samesite =
-
-; Handler used to serialize data. php is the standard serializer of PHP.
-; http://php.net/session.serialize-handler
-session.serialize_handler = php
-
-; Defines the probability that the 'garbage collection' process is started on every
-; session initialization. The probability is calculated by using gc_probability/gc_divisor,
-; e.g. 1/100 means there is a 1% chance that the GC process starts on each request.
-; Default Value: 1
-; Development Value: 1
-; Production Value: 1
-; http://php.net/session.gc-probability
-session.gc_probability = 0
-
-; Defines the probability that the 'garbage collection' process is started on every
-; session initialization. The probability is calculated by using gc_probability/gc_divisor,
-; e.g. 1/100 means there is a 1% chance that the GC process starts on each request.
-; For high volume production servers, using a value of 1000 is a more efficient approach.
-; Default Value: 100
-; Development Value: 1000
-; Production Value: 1000
-; http://php.net/session.gc-divisor
-session.gc_divisor = 1000
-
-; After this number of seconds, stored data will be seen as 'garbage' and
-; cleaned up by the garbage collection process.
-; http://php.net/session.gc-maxlifetime
-session.gc_maxlifetime = 1440
-
-; NOTE: If you are using the subdirectory option for storing session files
-;       (see session.save_path above), then garbage collection does *not*
-;       happen automatically.  You will need to do your own garbage
-;       collection through a shell script, cron entry, or some other method.
-;       For example, the following script is the equivalent of setting
-;       session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
-;          find /path/to/sessions -cmin +24 -type f | xargs rm
-
-; Check HTTP Referer to invalidate externally stored URLs containing ids.
-; HTTP_REFERER has to contain this substring for the session to be
-; considered as valid.
-; http://php.net/session.referer-check
-session.referer_check =
-
-; Set to {nocache,private,public,} to determine HTTP caching aspects
-; or leave this empty to avoid sending anti-caching headers.
-; http://php.net/session.cache-limiter
-session.cache_limiter = nocache
-
-; Document expires after n minutes.
-; http://php.net/session.cache-expire
-session.cache_expire = 180
-
-; trans sid support is disabled by default.
-; Use of trans sid may risk your users' security.
-; Use this option with caution.
-; - User may send URL contains active session ID
-;   to other person via. email/irc/etc.
-; - URL that contains active session ID may be stored
-;   in publicly accessible computer.
-; - User may access your site with the same session ID
-;   always using URL stored in browser's history or bookmarks.
-; http://php.net/session.use-trans-sid
-session.use_trans_sid = 0
-
-; Set session ID character length. This value could be between 22 to 256.
-; Shorter length than default is supported only for compatibility reason.
-; Users should use 32 or more chars.
-; http://php.net/session.sid-length
-; Default Value: 32
-; Development Value: 26
-; Production Value: 26
-session.sid_length = 26
-
-; The URL rewriter will look for URLs in a defined set of HTML tags.
-; <form> is special; if you include them here, the rewriter will
-; add a hidden <input> field with the info which is otherwise appended
-; to URLs. <form> tag's action attribute URL will not be modified
-; unless it is specified.
-; Note that all valid entries require a "=", even if no value follows.
-; Default Value: "a=href,area=href,frame=src,form="
-; Development Value: "a=href,area=href,frame=src,form="
-; Production Value: "a=href,area=href,frame=src,form="
-; http://php.net/url-rewriter.tags
-session.trans_sid_tags = "a=href,area=href,frame=src,form="
-
-; URL rewriter does not rewrite absolute URLs by default.
-; To enable rewrites for absolute paths, target hosts must be specified
-; at RUNTIME. i.e. use ini_set()
-; <form> tags is special. PHP will check action attribute's URL regardless
-; of session.trans_sid_tags setting.
-; If no host is defined, HTTP_HOST will be used for allowed host.
-; Example value: php.net,www.php.net,wiki.php.net
-; Use "," for multiple hosts. No spaces are allowed.
-; Default Value: ""
-; Development Value: ""
-; Production Value: ""
-;session.trans_sid_hosts=""
-
-; Define how many bits are stored in each character when converting
-; the binary hash data to something readable.
-; Possible values:
-;   4  (4 bits: 0-9, a-f)
-;   5  (5 bits: 0-9, a-v)
-;   6  (6 bits: 0-9, a-z, A-Z, "-", ",")
-; Default Value: 4
-; Development Value: 5
-; Production Value: 5
-; http://php.net/session.hash-bits-per-character
-session.sid_bits_per_character = 5
-
-; Enable upload progress tracking in $_SESSION
-; Default Value: On
-; Development Value: On
-; Production Value: On
-; http://php.net/session.upload-progress.enabled
-;session.upload_progress.enabled = On
-
-; Cleanup the progress information as soon as all POST data has been read
-; (i.e. upload completed).
-; Default Value: On
-; Development Value: On
-; Production Value: On
-; http://php.net/session.upload-progress.cleanup
-;session.upload_progress.cleanup = On
-
-; A prefix used for the upload progress key in $_SESSION
-; Default Value: "upload_progress_"
-; Development Value: "upload_progress_"
-; Production Value: "upload_progress_"
-; http://php.net/session.upload-progress.prefix
-;session.upload_progress.prefix = "upload_progress_"
-
-; The index name (concatenated with the prefix) in $_SESSION
-; containing the upload progress information
-; Default Value: "PHP_SESSION_UPLOAD_PROGRESS"
-; Development Value: "PHP_SESSION_UPLOAD_PROGRESS"
-; Production Value: "PHP_SESSION_UPLOAD_PROGRESS"
-; http://php.net/session.upload-progress.name
-;session.upload_progress.name = "PHP_SESSION_UPLOAD_PROGRESS"
-
-; How frequently the upload progress should be updated.
-; Given either in percentages (per-file), or in bytes
-; Default Value: "1%"
-; Development Value: "1%"
-; Production Value: "1%"
-; http://php.net/session.upload-progress.freq
-;session.upload_progress.freq =  "1%"
-
-; The minimum delay between updates, in seconds
-; Default Value: 1
-; Development Value: 1
-; Production Value: 1
-; http://php.net/session.upload-progress.min-freq
-;session.upload_progress.min_freq = "1"
-
-; Only write session data when session data is changed. Enabled by default.
-; http://php.net/session.lazy-write
-;session.lazy_write = On
-
-[Assertion]
-; Switch whether to compile assertions at all (to have no overhead at run-time)
-; -1: Do not compile at all
-;  0: Jump over assertion at run-time
-;  1: Execute assertions
-; Changing from or to a negative value is only possible in php.ini! (For turning assertions on and off at run-time, see assert.active, when zend.assertions = 1)
-; Default Value: 1
-; Development Value: 1
-; Production Value: -1
-; http://php.net/zend.assertions
-zend.assertions = -1
-
-; Assert(expr); active by default.
-; http://php.net/assert.active
-;assert.active = On
-
-; Throw an AssertionError on failed assertions
-; http://php.net/assert.exception
-;assert.exception = On
-
-; Issue a PHP warning for each failed assertion. (Overridden by assert.exception if active)
-; http://php.net/assert.warning
-;assert.warning = On
-
-; Don't bail out by default.
-; http://php.net/assert.bail
-;assert.bail = Off
-
-; User-function to be called if an assertion fails.
-; http://php.net/assert.callback
-;assert.callback = 0
-
-; Eval the expression with current error_reporting().  Set to true if you want
-; error_reporting(0) around the eval().
-; http://php.net/assert.quiet-eval
-;assert.quiet_eval = 0
-
-[COM]
-; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
-; http://php.net/com.typelib-file
-;com.typelib_file =
-
-; allow Distributed-COM calls
-; http://php.net/com.allow-dcom
-;com.allow_dcom = true
-
-; autoregister constants of a component's typlib on com_load()
-; http://php.net/com.autoregister-typelib
-;com.autoregister_typelib = true
-
-; register constants casesensitive
-; http://php.net/com.autoregister-casesensitive
-;com.autoregister_casesensitive = false
-
-; show warnings on duplicate constant registrations
-; http://php.net/com.autoregister-verbose
-;com.autoregister_verbose = true
-
-; The default character set code-page to use when passing strings to and from COM objects.
-; Default: system ANSI code page
-;com.code_page=
-
-[mbstring]
-; language for internal character representation.
-; This affects mb_send_mail() and mbstring.detect_order.
-; http://php.net/mbstring.language
-;mbstring.language = Japanese
-
-; Use of this INI entry is deprecated, use global internal_encoding instead.
-; internal/script encoding.
-; Some encoding cannot work as internal encoding. (e.g. SJIS, BIG5, ISO-2022-*)
-; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
-; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
-;mbstring.internal_encoding =
-
-; Use of this INI entry is deprecated, use global input_encoding instead.
-; http input encoding.
-; mbstring.encoding_translation = On is needed to use this setting.
-; If empty, default_charset or input_encoding or mbstring.input is used.
-; The precedence is: default_charset < input_encoding < mbstring.http_input
-; http://php.net/mbstring.http-input
-;mbstring.http_input =
-
-; Use of this INI entry is deprecated, use global output_encoding instead.
-; http output encoding.
-; mb_output_handler must be registered as output buffer to function.
-; If empty, default_charset or output_encoding or mbstring.http_output is used.
-; The precedence is: default_charset < output_encoding < mbstring.http_output
-; To use an output encoding conversion, mbstring's output handler must be set
-; otherwise output encoding conversion cannot be performed.
-; http://php.net/mbstring.http-output
-;mbstring.http_output =
-
-; enable automatic encoding translation according to
-; mbstring.internal_encoding setting. Input chars are
-; converted to internal encoding by setting this to On.
-; Note: Do _not_ use automatic encoding translation for
-;       portable libs/applications.
-; http://php.net/mbstring.encoding-translation
-;mbstring.encoding_translation = Off
-
-; automatic encoding detection order.
-; "auto" detect order is changed according to mbstring.language
-; http://php.net/mbstring.detect-order
-;mbstring.detect_order = auto
-
-; substitute_character used when character cannot be converted
-; one from another
-; http://php.net/mbstring.substitute-character
-;mbstring.substitute_character = none
-
-; overload(replace) single byte functions by mbstring functions.
-; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(),
-; etc. Possible values are 0,1,2,4 or combination of them.
-; For example, 7 for overload everything.
-; 0: No overload
-; 1: Overload mail() function
-; 2: Overload str*() functions
-; 4: Overload ereg*() functions
-; http://php.net/mbstring.func-overload
-;mbstring.func_overload = 0
-
-; enable strict encoding detection.
-; Default: Off
-;mbstring.strict_detection = On
-
-; This directive specifies the regex pattern of content types for which mb_output_handler()
-; is activated.
-; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml)
-;mbstring.http_output_conv_mimetype=
-
-; This directive specifies maximum stack depth for mbstring regular expressions. It is similar
-; to the pcre.recursion_limit for PCRE.
-; Default: 100000
-;mbstring.regex_stack_limit=100000
-
-; This directive specifies maximum retry count for mbstring regular expressions. It is similar
-; to the pcre.backtrack_limit for PCRE.
-; Default: 1000000
-;mbstring.regex_retry_limit=1000000
-
-[gd]
-; Tell the jpeg decode to ignore warnings and try to create
-; a gd image. The warning will then be displayed as notices
-; disabled by default
-; http://php.net/gd.jpeg-ignore-warning
-;gd.jpeg_ignore_warning = 1
-
-[exif]
-; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.
-; With mbstring support this will automatically be converted into the encoding
-; given by corresponding encode setting. When empty mbstring.internal_encoding
-; is used. For the decode settings you can distinguish between motorola and
-; intel byte order. A decode setting cannot be empty.
-; http://php.net/exif.encode-unicode
-;exif.encode_unicode = ISO-8859-15
-
-; http://php.net/exif.decode-unicode-motorola
-;exif.decode_unicode_motorola = UCS-2BE
-
-; http://php.net/exif.decode-unicode-intel
-;exif.decode_unicode_intel    = UCS-2LE
-
-; http://php.net/exif.encode-jis
-;exif.encode_jis =
-
-; http://php.net/exif.decode-jis-motorola
-;exif.decode_jis_motorola = JIS
-
-; http://php.net/exif.decode-jis-intel
-;exif.decode_jis_intel    = JIS
-
-[Tidy]
-; The path to a default tidy configuration file to use when using tidy
-; http://php.net/tidy.default-config
-;tidy.default_config = /usr/local/lib/php/default.tcfg
-
-; Should tidy clean and repair output automatically?
-; WARNING: Do not use this option if you are generating non-html content
-; such as dynamic images
-; http://php.net/tidy.clean-output
-tidy.clean_output = Off
-
-[soap]
-; Enables or disables WSDL caching feature.
-; http://php.net/soap.wsdl-cache-enabled
-soap.wsdl_cache_enabled=1
-
-; Sets the directory name where SOAP extension will put cache files.
-; http://php.net/soap.wsdl-cache-dir
-soap.wsdl_cache_dir="/tmp"
-
-; (time to live) Sets the number of second while cached file will be used
-; instead of original one.
-; http://php.net/soap.wsdl-cache-ttl
-soap.wsdl_cache_ttl=86400
-
-; Sets the size of the cache limit. (Max. number of WSDL files to cache)
-soap.wsdl_cache_limit = 5
-
-[sysvshm]
-; A default size of the shared memory segment
-;sysvshm.init_mem = 10000
-
-[ldap]
-; Sets the maximum number of open links or -1 for unlimited.
-ldap.max_links = -1
-
-[dba]
-;dba.default_handler=
-
-[opcache]
-; Determines if Zend OPCache is enabled
-;opcache.enable=1
-
-; Determines if Zend OPCache is enabled for the CLI version of PHP
-;opcache.enable_cli=0
-
-; The OPcache shared memory storage size.
-;opcache.memory_consumption=128
-
-; The amount of memory for interned strings in Mbytes.
-;opcache.interned_strings_buffer=8
-
-; The maximum number of keys (scripts) in the OPcache hash table.
-; Only numbers between 200 and 1000000 are allowed.
-;opcache.max_accelerated_files=10000
-
-; The maximum percentage of "wasted" memory until a restart is scheduled.
-;opcache.max_wasted_percentage=5
-
-; When this directive is enabled, the OPcache appends the current working
-; directory to the script key, thus eliminating possible collisions between
-; files with the same name (basename). Disabling the directive improves
-; performance, but may break existing applications.
-;opcache.use_cwd=1
-
-; When disabled, you must reset the OPcache manually or restart the
-; webserver for changes to the filesystem to take effect.
-;opcache.validate_timestamps=1
-
-; How often (in seconds) to check file timestamps for changes to the shared
-; memory storage allocation. ("1" means validate once per second, but only
-; once per request. "0" means always validate)
-;opcache.revalidate_freq=2
-
-; Enables or disables file search in include_path optimization
-;opcache.revalidate_path=0
-
-; If disabled, all PHPDoc comments are dropped from the code to reduce the
-; size of the optimized code.
-;opcache.save_comments=1
-
-; Allow file existence override (file_exists, etc.) performance feature.
-;opcache.enable_file_override=0
-
-; A bitmask, where each bit enables or disables the appropriate OPcache
-; passes
-;opcache.optimization_level=0x7FFFBFFF
-
-;opcache.dups_fix=0
-
-; The location of the OPcache blacklist file (wildcards allowed).
-; Each OPcache blacklist file is a text file that holds the names of files
-; that should not be accelerated. The file format is to add each filename
-; to a new line. The filename may be a full path or just a file prefix
-; (i.e., /var/www/x  blacklists all the files and directories in /var/www
-; that start with 'x'). Line starting with a ; are ignored (comments).
-;opcache.blacklist_filename=
-
-; Allows exclusion of large files from being cached. By default all files
-; are cached.
-;opcache.max_file_size=0
-
-; Check the cache checksum each N requests.
-; The default value of "0" means that the checks are disabled.
-;opcache.consistency_checks=0
-
-; How long to wait (in seconds) for a scheduled restart to begin if the cache
-; is not being accessed.
-;opcache.force_restart_timeout=180
-
-; OPcache error_log file name. Empty string assumes "stderr".
-;opcache.error_log=
-
-; All OPcache errors go to the Web server log.
-; By default, only fatal errors (level 0) or errors (level 1) are logged.
-; You can also enable warnings (level 2), info messages (level 3) or
-; debug messages (level 4).
-;opcache.log_verbosity_level=1
-
-; Preferred Shared Memory back-end. Leave empty and let the system decide.
-;opcache.preferred_memory_model=
-
-; Protect the shared memory from unexpected writing during script execution.
-; Useful for internal debugging only.
-;opcache.protect_memory=0
-
-; Allows calling OPcache API functions only from PHP scripts which path is
-; started from specified string. The default "" means no restriction
-;opcache.restrict_api=
-
-; Mapping base of shared memory segments (for Windows only). All the PHP
-; processes have to map shared memory into the same address space. This
-; directive allows to manually fix the "Unable to reattach to base address"
-; errors.
-;opcache.mmap_base=
-
-; Facilitates multiple OPcache instances per user (for Windows only). All PHP
-; processes with the same cache ID and user share an OPcache instance.
-;opcache.cache_id=
-
-; Enables and sets the second level cache directory.
-; It should improve performance when SHM memory is full, at server restart or
-; SHM reset. The default "" disables file based caching.
-;opcache.file_cache=
-
-; Enables or disables opcode caching in shared memory.
-;opcache.file_cache_only=0
-
-; Enables or disables checksum validation when script loaded from file cache.
-;opcache.file_cache_consistency_checks=1
-
-; Implies opcache.file_cache_only=1 for a certain process that failed to
-; reattach to the shared memory (for Windows only). Explicitly enabled file
-; cache is required.
-;opcache.file_cache_fallback=1
-
-; Enables or disables copying of PHP code (text segment) into HUGE PAGES.
-; This should improve performance, but requires appropriate OS configuration.
-;opcache.huge_code_pages=1
-
-; Validate cached file permissions.
-;opcache.validate_permission=0
-
-; Prevent name collisions in chroot'ed environment.
-;opcache.validate_root=0
-
-; If specified, it produces opcode dumps for debugging different stages of
-; optimizations.
-;opcache.opt_debug_level=0
-
-; Specifies a PHP script that is going to be compiled and executed at server
-; start-up.
-; http://php.net/opcache.preload
-;opcache.preload=
-
-; Preloading code as root is not allowed for security reasons. This directive
-; facilitates to let the preloading to be run as another user.
-; http://php.net/opcache.preload_user
-;opcache.preload_user=
-
-; Prevents caching files that are less than this number of seconds old. It
-; protects from caching of incompletely updated files. In case all file updates
-; on your site are atomic, you may increase performance by setting it to "0".
-;opcache.file_update_protection=2
-
-; Absolute path used to store shared lockfiles (for *nix only).
-;opcache.lockfile_path=/tmp
-
-[curl]
-; A default value for the CURLOPT_CAINFO option. This is required to be an
-; absolute path.
-;curl.cainfo =
-
-[openssl]
-; The location of a Certificate Authority (CA) file on the local filesystem
-; to use when verifying the identity of SSL/TLS peers. Most users should
-; not specify a value for this directive as PHP will attempt to use the
-; OS-managed cert stores in its absence. If specified, this value may still
-; be overridden on a per-stream basis via the "cafile" SSL stream context
-; option.
-;openssl.cafile=
-
-; If openssl.cafile is not specified or if the CA file is not found, the
-; directory pointed to by openssl.capath is searched for a suitable
-; certificate. This value must be a correctly hashed certificate directory.
-; Most users should not specify a value for this directive as PHP will
-; attempt to use the OS-managed cert stores in its absence. If specified,
-; this value may still be overridden on a per-stream basis via the "capath"
-; SSL stream context option.
-;openssl.capath=
-
-[ffi]
-; FFI API restriction. Possible values:
-; "preload" - enabled in CLI scripts and preloaded files (default)
-; "false"   - always disabled
-; "true"    - always enabled
-;ffi.enable=preload
-
-; List of headers files to preload, wildcard patterns allowed.
-;ffi.preload=
diff --git a/openQRM-5.3.50-CE/src/etc/httpd/php.cli.php b/openQRM-5.3.50-CE/src/etc/httpd/php.cli.php
deleted file mode 100644
index 2cb8b5c..0000000
--- a/openQRM-5.3.50-CE/src/etc/httpd/php.cli.php
+++ /dev/null
@@ -1,1948 +0,0 @@
-[PHP]
-
-;;;;;;;;;;;;;;;;;;;
-; About php.ini   ;
-;;;;;;;;;;;;;;;;;;;
-; PHP's initialization file, generally called php.ini, is responsible for
-; configuring many of the aspects of PHP's behavior.
-
-; PHP attempts to find and load this configuration from a number of locations.
-; The following is a summary of its search order:
-; 1. SAPI module specific location.
-; 2. The PHPRC environment variable. (As of PHP 5.2.0)
-; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0)
-; 4. Current working directory (except CLI)
-; 5. The web server's directory (for SAPI modules), or directory of PHP
-; (otherwise in Windows)
-; 6. The directory from the --with-config-file-path compile time option, or the
-; Windows directory (usually C:\windows)
-; See the PHP docs for more specific information.
-; http://php.net/configuration.file
-
-; The syntax of the file is extremely simple.  Whitespace and lines
-; beginning with a semicolon are silently ignored (as you probably guessed).
-; Section headers (e.g. [Foo]) are also silently ignored, even though
-; they might mean something in the future.
-
-; Directives following the section heading [PATH=/www/mysite] only
-; apply to PHP files in the /www/mysite directory.  Directives
-; following the section heading [HOST=www.example.com] only apply to
-; PHP files served from www.example.com.  Directives set in these
-; special sections cannot be overridden by user-defined INI files or
-; at runtime. Currently, [PATH=] and [HOST=] sections only work under
-; CGI/FastCGI.
-; http://php.net/ini.sections
-
-; Directives are specified using the following syntax:
-; directive = value
-; Directive names are *case sensitive* - foo=bar is different from FOO=bar.
-; Directives are variables used to configure PHP or PHP extensions.
-; There is no name validation.  If PHP can't find an expected
-; directive because it is not set or is mistyped, a default value will be used.
-
-; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one
-; of the INI constants (On, Off, True, False, Yes, No and None) or an expression
-; (e.g. E_ALL & ~E_NOTICE), a quoted string ("bar"), or a reference to a
-; previously set variable or directive (e.g. ${foo})
-
-; Expressions in the INI file are limited to bitwise operators and parentheses:
-; |  bitwise OR
-; ^  bitwise XOR
-; &  bitwise AND
-; ~  bitwise NOT
-; !  boolean NOT
-
-; Boolean flags can be turned on using the values 1, On, True or Yes.
-; They can be turned off using the values 0, Off, False or No.
-
-; An empty string can be denoted by simply not writing anything after the equal
-; sign, or by using the None keyword:
-
-; foo =         ; sets foo to an empty string
-; foo = None    ; sets foo to an empty string
-; foo = "None"  ; sets foo to the string 'None'
-
-; If you use constants in your value, and these constants belong to a
-; dynamically loaded extension (either a PHP extension or a Zend extension),
-; you may only use these constants *after* the line that loads the extension.
-
-;;;;;;;;;;;;;;;;;;;
-; About this file ;
-;;;;;;;;;;;;;;;;;;;
-; PHP comes packaged with two INI files. One that is recommended to be used
-; in production environments and one that is recommended to be used in
-; development environments.
-
-; php.ini-production contains settings which hold security, performance and
-; best practices at its core. But please be aware, these settings may break
-; compatibility with older or less security conscience applications. We
-; recommending using the production ini in production and testing environments.
-
-; php.ini-development is very similar to its production variant, except it is
-; much more verbose when it comes to errors. We recommend using the
-; development version only in development environments, as errors shown to
-; application users can inadvertently leak otherwise secure information.
-
-; This is the php.ini-production INI file.
-
-;;;;;;;;;;;;;;;;;;;
-; Quick Reference ;
-;;;;;;;;;;;;;;;;;;;
-; The following are all the settings which are different in either the production
-; or development versions of the INIs with respect to PHP's default behavior.
-; Please see the actual settings later in the document for more details as to why
-; we recommend these changes in PHP's behavior.
-
-; display_errors
-;   Default Value: On
-;   Development Value: On
-;   Production Value: Off
-
-; display_startup_errors
-;   Default Value: Off
-;   Development Value: On
-;   Production Value: Off
-
-; error_reporting
-;   Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
-;   Development Value: E_ALL
-;   Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
-
-; log_errors
-;   Default Value: Off
-;   Development Value: On
-;   Production Value: On
-
-; max_input_time
-;   Default Value: -1 (Unlimited)
-;   Development Value: 60 (60 seconds)
-;   Production Value: 60 (60 seconds)
-
-; output_buffering
-;   Default Value: Off
-;   Development Value: 4096
-;   Production Value: 4096
-
-; register_argc_argv
-;   Default Value: On
-;   Development Value: Off
-;   Production Value: Off
-
-; request_order
-;   Default Value: None
-;   Development Value: "GP"
-;   Production Value: "GP"
-
-; session.gc_divisor
-;   Default Value: 100
-;   Development Value: 1000
-;   Production Value: 1000
-
-; session.sid_bits_per_character
-;   Default Value: 4
-;   Development Value: 5
-;   Production Value: 5
-
-; short_open_tag
-;   Default Value: On
-;   Development Value: Off
-;   Production Value: Off
-
-; variables_order
-;   Default Value: "EGPCS"
-;   Development Value: "GPCS"
-;   Production Value: "GPCS"
-
-;;;;;;;;;;;;;;;;;;;;
-; php.ini Options  ;
-;;;;;;;;;;;;;;;;;;;;
-; Name for user-defined php.ini (.htaccess) files. Default is ".user.ini"
-;user_ini.filename = ".user.ini"
-
-; To disable this feature set this option to an empty value
-;user_ini.filename =
-
-; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes)
-;user_ini.cache_ttl = 300
-
-;;;;;;;;;;;;;;;;;;;;
-; Language Options ;
-;;;;;;;;;;;;;;;;;;;;
-
-; Enable the PHP scripting language engine under Apache.
-; http://php.net/engine
-engine = On
-
-; This directive determines whether or not PHP will recognize code between
-; <? and ?> tags as PHP source which should be processed as such. It is
-; generally recommended that <?php and ?> should be used and that this feature
-; should be disabled, as enabling it may result in issues when generating XML
-; documents, however this remains supported for backward compatibility reasons.
-; Note that this directive does not control the <?= shorthand tag, which can be
-; used regardless of this directive.
-; Default Value: On
-; Development Value: Off
-; Production Value: Off
-; http://php.net/short-open-tag
-short_open_tag = Off
-
-; The number of significant digits displayed in floating point numbers.
-; http://php.net/precision
-precision = 14
-
-; Output buffering is a mechanism for controlling how much output data
-; (excluding headers and cookies) PHP should keep internally before pushing that
-; data to the client. If your application's output exceeds this setting, PHP
-; will send that data in chunks of roughly the size you specify.
-; Turning on this setting and managing its maximum buffer size can yield some
-; interesting side-effects depending on your application and web server.
-; You may be able to send headers and cookies after you've already sent output
-; through print or echo. You also may see performance benefits if your server is
-; emitting less packets due to buffered output versus PHP streaming the output
-; as it gets it. On production servers, 4096 bytes is a good setting for performance
-; reasons.
-; Note: Output buffering can also be controlled via Output Buffering Control
-;   functions.
-; Possible Values:
-;   On = Enabled and buffer is unlimited. (Use with caution)
-;   Off = Disabled
-;   Integer = Enables the buffer and sets its maximum size in bytes.
-; Note: This directive is hardcoded to Off for the CLI SAPI
-; Default Value: Off
-; Development Value: 4096
-; Production Value: 4096
-; http://php.net/output-buffering
-output_buffering = 4096
-
-; You can redirect all of the output of your scripts to a function.  For
-; example, if you set output_handler to "mb_output_handler", character
-; encoding will be transparently converted to the specified encoding.
-; Setting any output handler automatically turns on output buffering.
-; Note: People who wrote portable scripts should not depend on this ini
-;   directive. Instead, explicitly set the output handler using ob_start().
-;   Using this ini directive may cause problems unless you know what script
-;   is doing.
-; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler"
-;   and you cannot use both "ob_gzhandler" and "zlib.output_compression".
-; Note: output_handler must be empty if this is set 'On' !!!!
-;   Instead you must use zlib.output_handler.
-; http://php.net/output-handler
-;output_handler =
-
-; URL rewriter function rewrites URL on the fly by using
-; output buffer. You can set target tags by this configuration.
-; "form" tag is special tag. It will add hidden input tag to pass values.
-; Refer to session.trans_sid_tags for usage.
-; Default Value: "form="
-; Development Value: "form="
-; Production Value: "form="
-;url_rewriter.tags
-
-; URL rewriter will not rewrite absolute URL nor form by default. To enable
-; absolute URL rewrite, allowed hosts must be defined at RUNTIME.
-; Refer to session.trans_sid_hosts for more details.
-; Default Value: ""
-; Development Value: ""
-; Production Value: ""
-;url_rewriter.hosts
-
-; Transparent output compression using the zlib library
-; Valid values for this option are 'off', 'on', or a specific buffer size
-; to be used for compression (default is 4KB)
-; Note: Resulting chunk size may vary due to nature of compression. PHP
-;   outputs chunks that are few hundreds bytes each as a result of
-;   compression. If you prefer a larger chunk size for better
-;   performance, enable output_buffering in addition.
-; Note: You need to use zlib.output_handler instead of the standard
-;   output_handler, or otherwise the output will be corrupted.
-; http://php.net/zlib.output-compression
-zlib.output_compression = Off
-
-; http://php.net/zlib.output-compression-level
-;zlib.output_compression_level = -1
-
-; You cannot specify additional output handlers if zlib.output_compression
-; is activated here. This setting does the same as output_handler but in
-; a different order.
-; http://php.net/zlib.output-handler
-;zlib.output_handler =
-
-; Implicit flush tells PHP to tell the output layer to flush itself
-; automatically after every output block.  This is equivalent to calling the
-; PHP function flush() after each and every call to print() or echo() and each
-; and every HTML block.  Turning this option on has serious performance
-; implications and is generally recommended for debugging purposes only.
-; http://php.net/implicit-flush
-; Note: This directive is hardcoded to On for the CLI SAPI
-implicit_flush = Off
-
-; The unserialize callback function will be called (with the undefined class'
-; name as parameter), if the unserializer finds an undefined class
-; which should be instantiated. A warning appears if the specified function is
-; not defined, or if the function doesn't include/implement the missing class.
-; So only set this entry, if you really want to implement such a
-; callback-function.
-unserialize_callback_func =
-
-; The unserialize_max_depth specifies the default depth limit for unserialized
-; structures. Setting the depth limit too high may result in stack overflows
-; during unserialization. The unserialize_max_depth ini setting can be
-; overridden by the max_depth option on individual unserialize() calls.
-; A value of 0 disables the depth limit.
-;unserialize_max_depth = 4096
-
-; When floats & doubles are serialized, store serialize_precision significant
-; digits after the floating point. The default value ensures that when floats
-; are decoded with unserialize, the data will remain the same.
-; The value is also used for json_encode when encoding double values.
-; If -1 is used, then dtoa mode 0 is used which automatically select the best
-; precision.
-serialize_precision = -1
-
-; open_basedir, if set, limits all file operations to the defined directory
-; and below.  This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file.
-; Note: disables the realpath cache
-; http://php.net/open-basedir
-;open_basedir =
-
-; This directive allows you to disable certain functions.
-; It receives a comma-delimited list of function names.
-; http://php.net/disable-functions
-disable_functions =
-
-; This directive allows you to disable certain classes.
-; It receives a comma-delimited list of class names.
-; http://php.net/disable-classes
-disable_classes =
-
-; Colors for Syntax Highlighting mode.  Anything that's acceptable in
-; <span style="color: ???????"> would work.
-; http://php.net/syntax-highlighting
-;highlight.string  = #DD0000
-;highlight.comment = #FF9900
-;highlight.keyword = #007700
-;highlight.default = #0000BB
-;highlight.html    = #000000
-
-; If enabled, the request will be allowed to complete even if the user aborts
-; the request. Consider enabling it if executing long requests, which may end up
-; being interrupted by the user or a browser timing out. PHP's default behavior
-; is to disable this feature.
-; http://php.net/ignore-user-abort
-;ignore_user_abort = On
-
-; Determines the size of the realpath cache to be used by PHP. This value should
-; be increased on systems where PHP opens many files to reflect the quantity of
-; the file operations performed.
-; Note: if open_basedir is set, the cache is disabled
-; http://php.net/realpath-cache-size
-;realpath_cache_size = 4096k
-
-; Duration of time, in seconds for which to cache realpath information for a given
-; file or directory. For systems with rarely changing files, consider increasing this
-; value.
-; http://php.net/realpath-cache-ttl
-;realpath_cache_ttl = 120
-
-; Enables or disables the circular reference collector.
-; http://php.net/zend.enable-gc
-zend.enable_gc = On
-
-; If enabled, scripts may be written in encodings that are incompatible with
-; the scanner.  CP936, Big5, CP949 and Shift_JIS are the examples of such
-; encodings.  To use this feature, mbstring extension must be enabled.
-; Default: Off
-;zend.multibyte = Off
-
-; Allows to set the default encoding for the scripts.  This value will be used
-; unless "declare(encoding=...)" directive appears at the top of the script.
-; Only affects if zend.multibyte is set.
-; Default: ""
-;zend.script_encoding =
-
-; Allows to include or exclude arguments from stack traces generated for exceptions.
-; In production, it is recommended to turn this setting on to prohibit the output 
-; of sensitive information in stack traces
-; Default: Off
-zend.exception_ignore_args = On
-
-;;;;;;;;;;;;;;;;;
-; Miscellaneous ;
-;;;;;;;;;;;;;;;;;
-
-; Decides whether PHP may expose the fact that it is installed on the server
-; (e.g. by adding its signature to the Web server header).  It is no security
-; threat in any way, but it makes it possible to determine whether you use PHP
-; on your server or not.
-; http://php.net/expose-php
-expose_php = On
-
-;;;;;;;;;;;;;;;;;;;
-; Resource Limits ;
-;;;;;;;;;;;;;;;;;;;
-
-; Maximum execution time of each script, in seconds
-; http://php.net/max-execution-time
-; Note: This directive is hardcoded to 0 for the CLI SAPI
-max_execution_time = 30
-
-; Maximum amount of time each script may spend parsing request data. It's a good
-; idea to limit this time on productions servers in order to eliminate unexpectedly
-; long running scripts.
-; Note: This directive is hardcoded to -1 for the CLI SAPI
-; Default Value: -1 (Unlimited)
-; Development Value: 60 (60 seconds)
-; Production Value: 60 (60 seconds)
-; http://php.net/max-input-time
-max_input_time = 60
-
-; Maximum input variable nesting level
-; http://php.net/max-input-nesting-level
-;max_input_nesting_level = 64
-
-; How many GET/POST/COOKIE input variables may be accepted
-;max_input_vars = 1000
-
-; Maximum amount of memory a script may consume
-; http://php.net/memory-limit
-memory_limit = -1
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Error handling and logging ;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; This directive informs PHP of which errors, warnings and notices you would like
-; it to take action for. The recommended way of setting values for this
-; directive is through the use of the error level constants and bitwise
-; operators. The error level constants are below here for convenience as well as
-; some common settings and their meanings.
-; By default, PHP is set to take action on all errors, notices and warnings EXCEPT
-; those related to E_NOTICE and E_STRICT, which together cover best practices and
-; recommended coding standards in PHP. For performance reasons, this is the
-; recommend error reporting setting. Your production server shouldn't be wasting
-; resources complaining about best practices and coding standards. That's what
-; development servers and development settings are for.
-; Note: The php.ini-development file has this setting as E_ALL. This
-; means it pretty much reports everything which is exactly what you want during
-; development and early testing.
-;
-; Error Level Constants:
-; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 5.4.0)
-; E_ERROR           - fatal run-time errors
-; E_RECOVERABLE_ERROR  - almost fatal run-time errors
-; E_WARNING         - run-time warnings (non-fatal errors)
-; E_PARSE           - compile-time parse errors
-; E_NOTICE          - run-time notices (these are warnings which often result
-;                     from a bug in your code, but it's possible that it was
-;                     intentional (e.g., using an uninitialized variable and
-;                     relying on the fact it is automatically initialized to an
-;                     empty string)
-; E_STRICT          - run-time notices, enable to have PHP suggest changes
-;                     to your code which will ensure the best interoperability
-;                     and forward compatibility of your code
-; E_CORE_ERROR      - fatal errors that occur during PHP's initial startup
-; E_CORE_WARNING    - warnings (non-fatal errors) that occur during PHP's
-;                     initial startup
-; E_COMPILE_ERROR   - fatal compile-time errors
-; E_COMPILE_WARNING - compile-time warnings (non-fatal errors)
-; E_USER_ERROR      - user-generated error message
-; E_USER_WARNING    - user-generated warning message
-; E_USER_NOTICE     - user-generated notice message
-; E_DEPRECATED      - warn about code that will not work in future versions
-;                     of PHP
-; E_USER_DEPRECATED - user-generated deprecation warnings
-;
-; Common Values:
-;   E_ALL (Show all errors, warnings and notices including coding standards.)
-;   E_ALL & ~E_NOTICE  (Show all errors, except for notices)
-;   E_ALL & ~E_NOTICE & ~E_STRICT  (Show all errors, except for notices and coding standards warnings.)
-;   E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR  (Show only errors)
-; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
-; Development Value: E_ALL
-; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
-; http://php.net/error-reporting
-error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
-
-; This directive controls whether or not and where PHP will output errors,
-; notices and warnings too. Error output is very useful during development, but
-; it could be very dangerous in production environments. Depending on the code
-; which is triggering the error, sensitive information could potentially leak
-; out of your application such as database usernames and passwords or worse.
-; For production environments, we recommend logging errors rather than
-; sending them to STDOUT.
-; Possible Values:
-;   Off = Do not display any errors
-;   stderr = Display errors to STDERR (affects only CGI/CLI binaries!)
-;   On or stdout = Display errors to STDOUT
-; Default Value: On
-; Development Value: On
-; Production Value: Off
-; http://php.net/display-errors
-display_errors = Off
-
-; The display of errors which occur during PHP's startup sequence are handled
-; separately from display_errors. PHP's default behavior is to suppress those
-; errors from clients. Turning the display of startup errors on can be useful in
-; debugging configuration problems. We strongly recommend you
-; set this to 'off' for production servers.
-; Default Value: Off
-; Development Value: On
-; Production Value: Off
-; http://php.net/display-startup-errors
-display_startup_errors = Off
-
-; Besides displaying errors, PHP can also log errors to locations such as a
-; server-specific log, STDERR, or a location specified by the error_log
-; directive found below. While errors should not be displayed on productions
-; servers they should still be monitored and logging is a great way to do that.
-; Default Value: Off
-; Development Value: On
-; Production Value: On
-; http://php.net/log-errors
-log_errors = On
-
-; Set maximum length of log_errors. In error_log information about the source is
-; added. The default is 1024 and 0 allows to not apply any maximum length at all.
-; http://php.net/log-errors-max-len
-log_errors_max_len = 1024
-
-; Do not log repeated messages. Repeated errors must occur in same file on same
-; line unless ignore_repeated_source is set true.
-; http://php.net/ignore-repeated-errors
-ignore_repeated_errors = Off
-
-; Ignore source of message when ignoring repeated messages. When this setting
-; is On you will not log errors with repeated messages from different files or
-; source lines.
-; http://php.net/ignore-repeated-source
-ignore_repeated_source = Off
-
-; If this parameter is set to Off, then memory leaks will not be shown (on
-; stdout or in the log). This is only effective in a debug compile, and if
-; error reporting includes E_WARNING in the allowed list
-; http://php.net/report-memleaks
-report_memleaks = On
-
-; This setting is on by default.
-;report_zend_debug = 0
-
-; Store the last error/warning message in $php_errormsg (boolean). Setting this value
-; to On can assist in debugging and is appropriate for development servers. It should
-; however be disabled on production servers.
-; This directive is DEPRECATED.
-; Default Value: Off
-; Development Value: Off
-; Production Value: Off
-; http://php.net/track-errors
-;track_errors = Off
-
-; Turn off normal error reporting and emit XML-RPC error XML
-; http://php.net/xmlrpc-errors
-;xmlrpc_errors = 0
-
-; An XML-RPC faultCode
-;xmlrpc_error_number = 0
-
-; When PHP displays or logs an error, it has the capability of formatting the
-; error message as HTML for easier reading. This directive controls whether
-; the error message is formatted as HTML or not.
-; Note: This directive is hardcoded to Off for the CLI SAPI
-; http://php.net/html-errors
-;html_errors = On
-
-; If html_errors is set to On *and* docref_root is not empty, then PHP
-; produces clickable error messages that direct to a page describing the error
-; or function causing the error in detail.
-; You can download a copy of the PHP manual from http://php.net/docs
-; and change docref_root to the base URL of your local copy including the
-; leading '/'. You must also specify the file extension being used including
-; the dot. PHP's default behavior is to leave these settings empty, in which
-; case no links to documentation are generated.
-; Note: Never use this feature for production boxes.
-; http://php.net/docref-root
-; Examples
-;docref_root = "/phpmanual/"
-
-; http://php.net/docref-ext
-;docref_ext = .html
-
-; String to output before an error message. PHP's default behavior is to leave
-; this setting blank.
-; http://php.net/error-prepend-string
-; Example:
-;error_prepend_string = "<span style='color: #ff0000'>"
-
-; String to output after an error message. PHP's default behavior is to leave
-; this setting blank.
-; http://php.net/error-append-string
-; Example:
-;error_append_string = "</span>"
-
-; Log errors to specified file. PHP's default behavior is to leave this value
-; empty.
-; http://php.net/error-log
-; Example:
-;error_log = php_errors.log
-error_log = /var/log/php.log
-; Log errors to syslog (Event Log on Windows).
-;error_log = syslog
-
-; The syslog ident is a string which is prepended to every message logged
-; to syslog. Only used when error_log is set to syslog.
-;syslog.ident = php
-
-; The syslog facility is used to specify what type of program is logging
-; the message. Only used when error_log is set to syslog.
-;syslog.facility = user
-
-; Set this to disable filtering control characters (the default).
-; Some loggers only accept NVT-ASCII, others accept anything that's not
-; control characters. If your logger accepts everything, then no filtering
-; is needed at all.
-; Allowed values are:
-;   ascii (all printable ASCII characters and NL)
-;   no-ctrl (all characters except control characters)
-;   all (all characters)
-;   raw (like "all", but messages are not split at newlines)
-; http://php.net/syslog.filter
-;syslog.filter = ascii
-
-;windows.show_crt_warning
-; Default value: 0
-; Development value: 0
-; Production value: 0
-
-;;;;;;;;;;;;;;;;;
-; Data Handling ;
-;;;;;;;;;;;;;;;;;
-
-; The separator used in PHP generated URLs to separate arguments.
-; PHP's default setting is "&".
-; http://php.net/arg-separator.output
-; Example:
-;arg_separator.output = "&amp;"
-
-; List of separator(s) used by PHP to parse input URLs into variables.
-; PHP's default setting is "&".
-; NOTE: Every character in this directive is considered as separator!
-; http://php.net/arg-separator.input
-; Example:
-;arg_separator.input = ";&"
-
-; This directive determines which super global arrays are registered when PHP
-; starts up. G,P,C,E & S are abbreviations for the following respective super
-; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty
-; paid for the registration of these arrays and because ENV is not as commonly
-; used as the others, ENV is not recommended on productions servers. You
-; can still get access to the environment variables through getenv() should you
-; need to.
-; Default Value: "EGPCS"
-; Development Value: "GPCS"
-; Production Value: "GPCS";
-; http://php.net/variables-order
-variables_order = "GPCS"
-
-; This directive determines which super global data (G,P & C) should be
-; registered into the super global array REQUEST. If so, it also determines
-; the order in which that data is registered. The values for this directive
-; are specified in the same manner as the variables_order directive,
-; EXCEPT one. Leaving this value empty will cause PHP to use the value set
-; in the variables_order directive. It does not mean it will leave the super
-; globals array REQUEST empty.
-; Default Value: None
-; Development Value: "GP"
-; Production Value: "GP"
-; http://php.net/request-order
-request_order = "GP"
-
-; This directive determines whether PHP registers $argv & $argc each time it
-; runs. $argv contains an array of all the arguments passed to PHP when a script
-; is invoked. $argc contains an integer representing the number of arguments
-; that were passed when the script was invoked. These arrays are extremely
-; useful when running scripts from the command line. When this directive is
-; enabled, registering these variables consumes CPU cycles and memory each time
-; a script is executed. For performance reasons, this feature should be disabled
-; on production servers.
-; Note: This directive is hardcoded to On for the CLI SAPI
-; Default Value: On
-; Development Value: Off
-; Production Value: Off
-; http://php.net/register-argc-argv
-register_argc_argv = Off
-
-; When enabled, the ENV, REQUEST and SERVER variables are created when they're
-; first used (Just In Time) instead of when the script starts. If these
-; variables are not used within a script, having this directive on will result
-; in a performance gain. The PHP directive register_argc_argv must be disabled
-; for this directive to have any effect.
-; http://php.net/auto-globals-jit
-auto_globals_jit = On
-
-; Whether PHP will read the POST data.
-; This option is enabled by default.
-; Most likely, you won't want to disable this option globally. It causes $_POST
-; and $_FILES to always be empty; the only way you will be able to read the
-; POST data will be through the php://input stream wrapper. This can be useful
-; to proxy requests or to process the POST data in a memory efficient fashion.
-; http://php.net/enable-post-data-reading
-;enable_post_data_reading = Off
-
-; Maximum size of POST data that PHP will accept.
-; Its value may be 0 to disable the limit. It is ignored if POST data reading
-; is disabled through enable_post_data_reading.
-; http://php.net/post-max-size
-post_max_size = 8M
-
-; Automatically add files before PHP document.
-; http://php.net/auto-prepend-file
-auto_prepend_file =
-
-; Automatically add files after PHP document.
-; http://php.net/auto-append-file
-auto_append_file =
-
-; By default, PHP will output a media type using the Content-Type header. To
-; disable this, simply set it to be empty.
-;
-; PHP's built-in default media type is set to text/html.
-; http://php.net/default-mimetype
-default_mimetype = "text/html"
-
-; PHP's default character set is set to UTF-8.
-; http://php.net/default-charset
-default_charset = "UTF-8"
-
-; PHP internal character encoding is set to empty.
-; If empty, default_charset is used.
-; http://php.net/internal-encoding
-;internal_encoding =
-
-; PHP input character encoding is set to empty.
-; If empty, default_charset is used.
-; http://php.net/input-encoding
-;input_encoding =
-
-; PHP output character encoding is set to empty.
-; If empty, default_charset is used.
-; See also output_buffer.
-; http://php.net/output-encoding
-;output_encoding =
-
-;;;;;;;;;;;;;;;;;;;;;;;;;
-; Paths and Directories ;
-;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; UNIX: "/path1:/path2"
-;include_path = ".:/usr/share/php"
-;
-; Windows: "\path1;\path2"
-;include_path = ".;c:\php\includes"
-;
-; PHP's default setting for include_path is ".;/path/to/php/pear"
-; http://php.net/include-path
-
-; The root of the PHP pages, used only if nonempty.
-; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-; if you are running php as a CGI under any web server (other than IIS)
-; see documentation for security issues.  The alternate is to use the
-; cgi.force_redirect configuration below
-; http://php.net/doc-root
-doc_root =
-
-; The directory under which PHP opens the script using /~username used only
-; if nonempty.
-; http://php.net/user-dir
-user_dir =
-
-; Directory in which the loadable extensions (modules) reside.
-; http://php.net/extension-dir
-;extension_dir = "./"
-; On windows:
-;extension_dir = "ext"
-
-; Directory where the temporary files should be placed.
-; Defaults to the system default (see sys_get_temp_dir)
-;sys_temp_dir = "/tmp"
-
-; Whether or not to enable the dl() function.  The dl() function does NOT work
-; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-; disabled on them.
-; http://php.net/enable-dl
-enable_dl = Off
-
-; cgi.force_redirect is necessary to provide security running PHP as a CGI under
-; most web servers.  Left undefined, PHP turns this on by default.  You can
-; turn it off here AT YOUR OWN RISK
-; **You CAN safely turn this off for IIS, in fact, you MUST.**
-; http://php.net/cgi.force-redirect
-;cgi.force_redirect = 1
-
-; if cgi.nph is enabled it will force cgi to always sent Status: 200 with
-; every request. PHP's default behavior is to disable this feature.
-;cgi.nph = 1
-
-; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
-; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
-; will look for to know it is OK to continue execution.  Setting this variable MAY
-; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
-; http://php.net/cgi.redirect-status-env
-;cgi.redirect_status_env =
-
-; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI.  PHP's
-; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
-; what PATH_INFO is.  For more information on PATH_INFO, see the cgi specs.  Setting
-; this to 1 will cause PHP CGI to fix its paths to conform to the spec.  A setting
-; of zero causes PHP to behave as before.  Default is 1.  You should fix your scripts
-; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
-; http://php.net/cgi.fix-pathinfo
-;cgi.fix_pathinfo=1
-
-; if cgi.discard_path is enabled, the PHP CGI binary can safely be placed outside
-; of the web tree and people will not be able to circumvent .htaccess security.
-;cgi.discard_path=1
-
-; FastCGI under IIS supports the ability to impersonate
-; security tokens of the calling client.  This allows IIS to define the
-; security context that the request runs under.  mod_fastcgi under Apache
-; does not currently support this feature (03/17/2002)
-; Set to 1 if running under IIS.  Default is zero.
-; http://php.net/fastcgi.impersonate
-;fastcgi.impersonate = 1
-
-; Disable logging through FastCGI connection. PHP's default behavior is to enable
-; this feature.
-;fastcgi.logging = 0
-
-; cgi.rfc2616_headers configuration option tells PHP what type of headers to
-; use when sending HTTP response code. If set to 0, PHP sends Status: header that
-; is supported by Apache. When this option is set to 1, PHP will send
-; RFC2616 compliant header.
-; Default is zero.
-; http://php.net/cgi.rfc2616-headers
-;cgi.rfc2616_headers = 0
-
-; cgi.check_shebang_line controls whether CGI PHP checks for line starting with #!
-; (shebang) at the top of the running script. This line might be needed if the
-; script support running both as stand-alone script and via PHP CGI<. PHP in CGI
-; mode skips this line and ignores its content if this directive is turned on.
-; http://php.net/cgi.check-shebang-line
-;cgi.check_shebang_line=1
-
-;;;;;;;;;;;;;;;;
-; File Uploads ;
-;;;;;;;;;;;;;;;;
-
-; Whether to allow HTTP file uploads.
-; http://php.net/file-uploads
-file_uploads = On
-
-; Temporary directory for HTTP uploaded files (will use system default if not
-; specified).
-; http://php.net/upload-tmp-dir
-;upload_tmp_dir =
-
-; Maximum allowed size for uploaded files.
-; http://php.net/upload-max-filesize
-upload_max_filesize = 2M
-
-; Maximum number of files that can be uploaded via a single request
-max_file_uploads = 20
-
-;;;;;;;;;;;;;;;;;;
-; Fopen wrappers ;
-;;;;;;;;;;;;;;;;;;
-
-; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
-; http://php.net/allow-url-fopen
-allow_url_fopen = On
-
-; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
-; http://php.net/allow-url-include
-allow_url_include = Off
-
-; Define the anonymous ftp password (your email address). PHP's default setting
-; for this is empty.
-; http://php.net/from
-;from="john@doe.com"
-
-; Define the User-Agent string. PHP's default setting for this is empty.
-; http://php.net/user-agent
-;user_agent="PHP"
-
-; Default timeout for socket based streams (seconds)
-; http://php.net/default-socket-timeout
-default_socket_timeout = 60
-
-; If your scripts have to deal with files from Macintosh systems,
-; or you are running on a Mac and need to deal with files from
-; unix or win32 systems, setting this flag will cause PHP to
-; automatically detect the EOL character in those files so that
-; fgets() and file() will work regardless of the source of the file.
-; http://php.net/auto-detect-line-endings
-;auto_detect_line_endings = Off
-
-;;;;;;;;;;;;;;;;;;;;;;
-; Dynamic Extensions ;
-;;;;;;;;;;;;;;;;;;;;;;
-
-; If you wish to have an extension loaded automatically, use the following
-; syntax:
-;
-;   extension=modulename
-;
-; For example:
-;
-;   extension=mysqli
-;
-; When the extension library to load is not located in the default extension
-; directory, You may specify an absolute path to the library file:
-;
-;   extension=/path/to/extension/mysqli.so
-;
-; Note : The syntax used in previous PHP versions ('extension=<ext>.so' and
-; 'extension='php_<ext>.dll') is supported for legacy reasons and may be
-; deprecated in a future PHP major version. So, when it is possible, please
-; move to the new ('extension=<ext>) syntax.
-;
-; Notes for Windows environments :
-;
-; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+)
-;   extension folders as well as the separate PECL DLL download (PHP 5+).
-;   Be sure to appropriately set the extension_dir directive.
-;
-;extension=bz2
-;extension=curl
-;extension=ffi
-;extension=ftp
-;extension=fileinfo
-;extension=gd2
-;extension=gettext
-;extension=gmp
-;extension=intl
-;extension=imap
-;extension=ldap
-;extension=mbstring
-;extension=exif      ; Must be after mbstring as it depends on it
-;extension=mysqli
-;extension=oci8_12c  ; Use with Oracle Database 12c Instant Client
-;extension=odbc
-;extension=openssl
-;extension=pdo_firebird
-;extension=pdo_mysql
-;extension=pdo_oci
-;extension=pdo_odbc
-;extension=pdo_pgsql
-;extension=pdo_sqlite
-;extension=pgsql
-;extension=shmop
-
-; The MIBS data available in the PHP distribution must be installed.
-; See http://www.php.net/manual/en/snmp.installation.php
-;extension=snmp
-
-;extension=soap
-;extension=sockets
-;extension=sodium
-;extension=sqlite3
-;extension=tidy
-;extension=xmlrpc
-;extension=xsl
-
-;;;;;;;;;;;;;;;;;;;
-; Module Settings ;
-;;;;;;;;;;;;;;;;;;;
-
-[CLI Server]
-; Whether the CLI web server uses ANSI color coding in its terminal output.
-cli_server.color = On
-
-[Date]
-; Defines the default timezone used by the date functions
-; http://php.net/date.timezone
-;date.timezone =
-
-; http://php.net/date.default-latitude
-;date.default_latitude = 31.7667
-
-; http://php.net/date.default-longitude
-;date.default_longitude = 35.2333
-
-; http://php.net/date.sunrise-zenith
-;date.sunrise_zenith = 90.583333
-
-; http://php.net/date.sunset-zenith
-;date.sunset_zenith = 90.583333
-
-[filter]
-; http://php.net/filter.default
-;filter.default = unsafe_raw
-
-; http://php.net/filter.default-flags
-;filter.default_flags =
-
-[iconv]
-; Use of this INI entry is deprecated, use global input_encoding instead.
-; If empty, default_charset or input_encoding or iconv.input_encoding is used.
-; The precedence is: default_charset < input_encoding < iconv.input_encoding
-;iconv.input_encoding =
-
-; Use of this INI entry is deprecated, use global internal_encoding instead.
-; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
-; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
-;iconv.internal_encoding =
-
-; Use of this INI entry is deprecated, use global output_encoding instead.
-; If empty, default_charset or output_encoding or iconv.output_encoding is used.
-; The precedence is: default_charset < output_encoding < iconv.output_encoding
-; To use an output encoding conversion, iconv's output handler must be set
-; otherwise output encoding conversion cannot be performed.
-;iconv.output_encoding =
-
-[imap]
-; rsh/ssh logins are disabled by default. Use this INI entry if you want to
-; enable them. Note that the IMAP library does not filter mailbox names before
-; passing them to rsh/ssh command, thus passing untrusted data to this function
-; with rsh/ssh enabled is insecure.
-;imap.enable_insecure_rsh=0
-
-[intl]
-;intl.default_locale =
-; This directive allows you to produce PHP errors when some error
-; happens within intl functions. The value is the level of the error produced.
-; Default is 0, which does not produce any errors.
-;intl.error_level = E_WARNING
-;intl.use_exceptions = 0
-
-[sqlite3]
-; Directory pointing to SQLite3 extensions
-; http://php.net/sqlite3.extension-dir
-;sqlite3.extension_dir =
-
-; SQLite defensive mode flag (only available from SQLite 3.26+)
-; When the defensive flag is enabled, language features that allow ordinary
-; SQL to deliberately corrupt the database file are disabled. This forbids
-; writing directly to the schema, shadow tables (eg. FTS data tables), or
-; the sqlite_dbpage virtual table.
-; https://www.sqlite.org/c3ref/c_dbconfig_defensive.html
-; (for older SQLite versions, this flag has no use)
-;sqlite3.defensive = 1
-
-[Pcre]
-; PCRE library backtracking limit.
-; http://php.net/pcre.backtrack-limit
-;pcre.backtrack_limit=100000
-
-; PCRE library recursion limit.
-; Please note that if you set this value to a high number you may consume all
-; the available process stack and eventually crash PHP (due to reaching the
-; stack size limit imposed by the Operating System).
-; http://php.net/pcre.recursion-limit
-;pcre.recursion_limit=100000
-
-; Enables or disables JIT compilation of patterns. This requires the PCRE
-; library to be compiled with JIT support.
-;pcre.jit=1
-
-[Pdo]
-; Whether to pool ODBC connections. Can be one of "strict", "relaxed" or "off"
-; http://php.net/pdo-odbc.connection-pooling
-;pdo_odbc.connection_pooling=strict
-
-;pdo_odbc.db2_instance_name
-
-[Pdo_mysql]
-; Default socket name for local MySQL connects.  If empty, uses the built-in
-; MySQL defaults.
-pdo_mysql.default_socket=
-
-[Phar]
-; http://php.net/phar.readonly
-;phar.readonly = On
-
-; http://php.net/phar.require-hash
-;phar.require_hash = On
-
-;phar.cache_list =
-
-[mail function]
-; For Win32 only.
-; http://php.net/smtp
-SMTP = localhost
-; http://php.net/smtp-port
-smtp_port = 25
-
-; For Win32 only.
-; http://php.net/sendmail-from
-;sendmail_from = me@example.com
-
-; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
-; http://php.net/sendmail-path
-;sendmail_path =
-
-; Force the addition of the specified parameters to be passed as extra parameters
-; to the sendmail binary. These parameters will always replace the value of
-; the 5th parameter to mail().
-;mail.force_extra_parameters =
-
-; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
-mail.add_x_header = Off
-
-; The path to a log file that will log all mail() calls. Log entries include
-; the full path of the script, line number, To address and headers.
-;mail.log =
-; Log mail to syslog (Event Log on Windows).
-;mail.log = syslog
-
-[ODBC]
-; http://php.net/odbc.default-db
-;odbc.default_db    =  Not yet implemented
-
-; http://php.net/odbc.default-user
-;odbc.default_user  =  Not yet implemented
-
-; http://php.net/odbc.default-pw
-;odbc.default_pw    =  Not yet implemented
-
-; Controls the ODBC cursor model.
-; Default: SQL_CURSOR_STATIC (default).
-;odbc.default_cursortype
-
-; Allow or prevent persistent links.
-; http://php.net/odbc.allow-persistent
-odbc.allow_persistent = On
-
-; Check that a connection is still valid before reuse.
-; http://php.net/odbc.check-persistent
-odbc.check_persistent = On
-
-; Maximum number of persistent links.  -1 means no limit.
-; http://php.net/odbc.max-persistent
-odbc.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent).  -1 means no limit.
-; http://php.net/odbc.max-links
-odbc.max_links = -1
-
-; Handling of LONG fields.  Returns number of bytes to variables.  0 means
-; passthru.
-; http://php.net/odbc.defaultlrl
-odbc.defaultlrl = 4096
-
-; Handling of binary data.  0 means passthru, 1 return as is, 2 convert to char.
-; See the documentation on odbc_binmode and odbc_longreadlen for an explanation
-; of odbc.defaultlrl and odbc.defaultbinmode
-; http://php.net/odbc.defaultbinmode
-odbc.defaultbinmode = 1
-
-[MySQLi]
-
-; Maximum number of persistent links.  -1 means no limit.
-; http://php.net/mysqli.max-persistent
-mysqli.max_persistent = -1
-
-; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
-; http://php.net/mysqli.allow_local_infile
-;mysqli.allow_local_infile = On
-
-; Allow or prevent persistent links.
-; http://php.net/mysqli.allow-persistent
-mysqli.allow_persistent = On
-
-; Maximum number of links.  -1 means no limit.
-; http://php.net/mysqli.max-links
-mysqli.max_links = -1
-
-; Default port number for mysqli_connect().  If unset, mysqli_connect() will use
-; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
-; compile-time value defined MYSQL_PORT (in that order).  Win32 will only look
-; at MYSQL_PORT.
-; http://php.net/mysqli.default-port
-mysqli.default_port = 3306
-
-; Default socket name for local MySQL connects.  If empty, uses the built-in
-; MySQL defaults.
-; http://php.net/mysqli.default-socket
-mysqli.default_socket = /run/mysqld/mysqld.sock
-
-; Default host for mysqli_connect() (doesn't apply in safe mode).
-; http://php.net/mysqli.default-host
-mysqli.default_host =
-
-; Default user for mysqli_connect() (doesn't apply in safe mode).
-; http://php.net/mysqli.default-user
-mysqli.default_user =
-
-; Default password for mysqli_connect() (doesn't apply in safe mode).
-; Note that this is generally a *bad* idea to store passwords in this file.
-; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw")
-; and reveal this password!  And of course, any users with read access to this
-; file will be able to reveal the password as well.
-; http://php.net/mysqli.default-pw
-mysqli.default_pw =
-
-; Allow or prevent reconnect
-mysqli.reconnect = Off
-
-[mysqlnd]
-; Enable / Disable collection of general statistics by mysqlnd which can be
-; used to tune and monitor MySQL operations.
-mysqlnd.collect_statistics = On
-
-; Enable / Disable collection of memory usage statistics by mysqlnd which can be
-; used to tune and monitor MySQL operations.
-mysqlnd.collect_memory_statistics = Off
-
-; Records communication from all extensions using mysqlnd to the specified log
-; file.
-; http://php.net/mysqlnd.debug
-;mysqlnd.debug =
-
-; Defines which queries will be logged.
-;mysqlnd.log_mask = 0
-
-; Default size of the mysqlnd memory pool, which is used by result sets.
-;mysqlnd.mempool_default_size = 16000
-
-; Size of a pre-allocated buffer used when sending commands to MySQL in bytes.
-;mysqlnd.net_cmd_buffer_size = 2048
-
-; Size of a pre-allocated buffer used for reading data sent by the server in
-; bytes.
-;mysqlnd.net_read_buffer_size = 32768
-
-; Timeout for network requests in seconds.
-;mysqlnd.net_read_timeout = 31536000
-
-; SHA-256 Authentication Plugin related. File with the MySQL server public RSA
-; key.
-;mysqlnd.sha256_server_public_key =
-
-[OCI8]
-
-; Connection: Enables privileged connections using external
-; credentials (OCI_SYSOPER, OCI_SYSDBA)
-; http://php.net/oci8.privileged-connect
-;oci8.privileged_connect = Off
-
-; Connection: The maximum number of persistent OCI8 connections per
-; process. Using -1 means no limit.
-; http://php.net/oci8.max-persistent
-;oci8.max_persistent = -1
-
-; Connection: The maximum number of seconds a process is allowed to
-; maintain an idle persistent connection. Using -1 means idle
-; persistent connections will be maintained forever.
-; http://php.net/oci8.persistent-timeout
-;oci8.persistent_timeout = -1
-
-; Connection: The number of seconds that must pass before issuing a
-; ping during oci_pconnect() to check the connection validity. When
-; set to 0, each oci_pconnect() will cause a ping. Using -1 disables
-; pings completely.
-; http://php.net/oci8.ping-interval
-;oci8.ping_interval = 60
-
-; Connection: Set this to a user chosen connection class to be used
-; for all pooled server requests with Oracle 11g Database Resident
-; Connection Pooling (DRCP).  To use DRCP, this value should be set to
-; the same string for all web servers running the same application,
-; the database pool must be configured, and the connection string must
-; specify to use a pooled server.
-;oci8.connection_class =
-
-; High Availability: Using On lets PHP receive Fast Application
-; Notification (FAN) events generated when a database node fails. The
-; database must also be configured to post FAN events.
-;oci8.events = Off
-
-; Tuning: This option enables statement caching, and specifies how
-; many statements to cache. Using 0 disables statement caching.
-; http://php.net/oci8.statement-cache-size
-;oci8.statement_cache_size = 20
-
-; Tuning: Enables statement prefetching and sets the default number of
-; rows that will be fetched automatically after statement execution.
-; http://php.net/oci8.default-prefetch
-;oci8.default_prefetch = 100
-
-; Compatibility. Using On means oci_close() will not close
-; oci_connect() and oci_new_connect() connections.
-; http://php.net/oci8.old-oci-close-semantics
-;oci8.old_oci_close_semantics = Off
-
-[PostgreSQL]
-; Allow or prevent persistent links.
-; http://php.net/pgsql.allow-persistent
-pgsql.allow_persistent = On
-
-; Detect broken persistent links always with pg_pconnect().
-; Auto reset feature requires a little overheads.
-; http://php.net/pgsql.auto-reset-persistent
-pgsql.auto_reset_persistent = Off
-
-; Maximum number of persistent links.  -1 means no limit.
-; http://php.net/pgsql.max-persistent
-pgsql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent).  -1 means no limit.
-; http://php.net/pgsql.max-links
-pgsql.max_links = -1
-
-; Ignore PostgreSQL backends Notice message or not.
-; Notice message logging require a little overheads.
-; http://php.net/pgsql.ignore-notice
-pgsql.ignore_notice = 0
-
-; Log PostgreSQL backends Notice message or not.
-; Unless pgsql.ignore_notice=0, module cannot log notice message.
-; http://php.net/pgsql.log-notice
-pgsql.log_notice = 0
-
-[bcmath]
-; Number of decimal digits for all bcmath functions.
-; http://php.net/bcmath.scale
-bcmath.scale = 0
-
-[browscap]
-; http://php.net/browscap
-;browscap = extra/browscap.ini
-
-[Session]
-; Handler used to store/retrieve data.
-; http://php.net/session.save-handler
-session.save_handler = files
-
-; Argument passed to save_handler.  In the case of files, this is the path
-; where data files are stored. Note: Windows users have to change this
-; variable in order to use PHP's session functions.
-;
-; The path can be defined as:
-;
-;     session.save_path = "N;/path"
-;
-; where N is an integer.  Instead of storing all the session files in
-; /path, what this will do is use subdirectories N-levels deep, and
-; store the session data in those directories.  This is useful if
-; your OS has problems with many files in one directory, and is
-; a more efficient layout for servers that handle many sessions.
-;
-; NOTE 1: PHP will not create this directory structure automatically.
-;         You can use the script in the ext/session dir for that purpose.
-; NOTE 2: See the section on garbage collection below if you choose to
-;         use subdirectories for session storage
-;
-; The file storage module creates files using mode 600 by default.
-; You can change that by using
-;
-;     session.save_path = "N;MODE;/path"
-;
-; where MODE is the octal representation of the mode. Note that this
-; does not overwrite the process's umask.
-; http://php.net/session.save-path
-;session.save_path = "/var/lib/php/sessions"
-
-; Whether to use strict session mode.
-; Strict session mode does not accept an uninitialized session ID, and
-; regenerates the session ID if the browser sends an uninitialized session ID.
-; Strict mode protects applications from session fixation via a session adoption
-; vulnerability. It is disabled by default for maximum compatibility, but
-; enabling it is encouraged.
-; https://wiki.php.net/rfc/strict_sessions
-session.use_strict_mode = 0
-
-; Whether to use cookies.
-; http://php.net/session.use-cookies
-session.use_cookies = 1
-
-; http://php.net/session.cookie-secure
-;session.cookie_secure =
-
-; This option forces PHP to fetch and use a cookie for storing and maintaining
-; the session id. We encourage this operation as it's very helpful in combating
-; session hijacking when not specifying and managing your own session id. It is
-; not the be-all and end-all of session hijacking defense, but it's a good start.
-; http://php.net/session.use-only-cookies
-session.use_only_cookies = 1
-
-; Name of the session (used as cookie name).
-; http://php.net/session.name
-session.name = PHPSESSID
-
-; Initialize session on request startup.
-; http://php.net/session.auto-start
-session.auto_start = 0
-
-; Lifetime in seconds of cookie or, if 0, until browser is restarted.
-; http://php.net/session.cookie-lifetime
-session.cookie_lifetime = 0
-
-; The path for which the cookie is valid.
-; http://php.net/session.cookie-path
-session.cookie_path = /
-
-; The domain for which the cookie is valid.
-; http://php.net/session.cookie-domain
-session.cookie_domain =
-
-; Whether or not to add the httpOnly flag to the cookie, which makes it
-; inaccessible to browser scripting languages such as JavaScript.
-; http://php.net/session.cookie-httponly
-session.cookie_httponly =
-
-; Add SameSite attribute to cookie to help mitigate Cross-Site Request Forgery (CSRF/XSRF)
-; Current valid values are "Strict", "Lax" or "None". When using "None",
-; make sure to include the quotes, as `none` is interpreted like `false` in ini files.
-; https://tools.ietf.org/html/draft-west-first-party-cookies-07
-session.cookie_samesite =
-
-; Handler used to serialize data. php is the standard serializer of PHP.
-; http://php.net/session.serialize-handler
-session.serialize_handler = php
-
-; Defines the probability that the 'garbage collection' process is started on every
-; session initialization. The probability is calculated by using gc_probability/gc_divisor,
-; e.g. 1/100 means there is a 1% chance that the GC process starts on each request.
-; Default Value: 1
-; Development Value: 1
-; Production Value: 1
-; http://php.net/session.gc-probability
-session.gc_probability = 0
-
-; Defines the probability that the 'garbage collection' process is started on every
-; session initialization. The probability is calculated by using gc_probability/gc_divisor,
-; e.g. 1/100 means there is a 1% chance that the GC process starts on each request.
-; For high volume production servers, using a value of 1000 is a more efficient approach.
-; Default Value: 100
-; Development Value: 1000
-; Production Value: 1000
-; http://php.net/session.gc-divisor
-session.gc_divisor = 1000
-
-; After this number of seconds, stored data will be seen as 'garbage' and
-; cleaned up by the garbage collection process.
-; http://php.net/session.gc-maxlifetime
-session.gc_maxlifetime = 1440
-
-; NOTE: If you are using the subdirectory option for storing session files
-;       (see session.save_path above), then garbage collection does *not*
-;       happen automatically.  You will need to do your own garbage
-;       collection through a shell script, cron entry, or some other method.
-;       For example, the following script is the equivalent of setting
-;       session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
-;          find /path/to/sessions -cmin +24 -type f | xargs rm
-
-; Check HTTP Referer to invalidate externally stored URLs containing ids.
-; HTTP_REFERER has to contain this substring for the session to be
-; considered as valid.
-; http://php.net/session.referer-check
-session.referer_check =
-
-; Set to {nocache,private,public,} to determine HTTP caching aspects
-; or leave this empty to avoid sending anti-caching headers.
-; http://php.net/session.cache-limiter
-session.cache_limiter = nocache
-
-; Document expires after n minutes.
-; http://php.net/session.cache-expire
-session.cache_expire = 180
-
-; trans sid support is disabled by default.
-; Use of trans sid may risk your users' security.
-; Use this option with caution.
-; - User may send URL contains active session ID
-;   to other person via. email/irc/etc.
-; - URL that contains active session ID may be stored
-;   in publicly accessible computer.
-; - User may access your site with the same session ID
-;   always using URL stored in browser's history or bookmarks.
-; http://php.net/session.use-trans-sid
-session.use_trans_sid = 0
-
-; Set session ID character length. This value could be between 22 to 256.
-; Shorter length than default is supported only for compatibility reason.
-; Users should use 32 or more chars.
-; http://php.net/session.sid-length
-; Default Value: 32
-; Development Value: 26
-; Production Value: 26
-session.sid_length = 26
-
-; The URL rewriter will look for URLs in a defined set of HTML tags.
-; <form> is special; if you include them here, the rewriter will
-; add a hidden <input> field with the info which is otherwise appended
-; to URLs. <form> tag's action attribute URL will not be modified
-; unless it is specified.
-; Note that all valid entries require a "=", even if no value follows.
-; Default Value: "a=href,area=href,frame=src,form="
-; Development Value: "a=href,area=href,frame=src,form="
-; Production Value: "a=href,area=href,frame=src,form="
-; http://php.net/url-rewriter.tags
-session.trans_sid_tags = "a=href,area=href,frame=src,form="
-
-; URL rewriter does not rewrite absolute URLs by default.
-; To enable rewrites for absolute paths, target hosts must be specified
-; at RUNTIME. i.e. use ini_set()
-; <form> tags is special. PHP will check action attribute's URL regardless
-; of session.trans_sid_tags setting.
-; If no host is defined, HTTP_HOST will be used for allowed host.
-; Example value: php.net,www.php.net,wiki.php.net
-; Use "," for multiple hosts. No spaces are allowed.
-; Default Value: ""
-; Development Value: ""
-; Production Value: ""
-;session.trans_sid_hosts=""
-
-; Define how many bits are stored in each character when converting
-; the binary hash data to something readable.
-; Possible values:
-;   4  (4 bits: 0-9, a-f)
-;   5  (5 bits: 0-9, a-v)
-;   6  (6 bits: 0-9, a-z, A-Z, "-", ",")
-; Default Value: 4
-; Development Value: 5
-; Production Value: 5
-; http://php.net/session.hash-bits-per-character
-session.sid_bits_per_character = 5
-
-; Enable upload progress tracking in $_SESSION
-; Default Value: On
-; Development Value: On
-; Production Value: On
-; http://php.net/session.upload-progress.enabled
-;session.upload_progress.enabled = On
-
-; Cleanup the progress information as soon as all POST data has been read
-; (i.e. upload completed).
-; Default Value: On
-; Development Value: On
-; Production Value: On
-; http://php.net/session.upload-progress.cleanup
-;session.upload_progress.cleanup = On
-
-; A prefix used for the upload progress key in $_SESSION
-; Default Value: "upload_progress_"
-; Development Value: "upload_progress_"
-; Production Value: "upload_progress_"
-; http://php.net/session.upload-progress.prefix
-;session.upload_progress.prefix = "upload_progress_"
-
-; The index name (concatenated with the prefix) in $_SESSION
-; containing the upload progress information
-; Default Value: "PHP_SESSION_UPLOAD_PROGRESS"
-; Development Value: "PHP_SESSION_UPLOAD_PROGRESS"
-; Production Value: "PHP_SESSION_UPLOAD_PROGRESS"
-; http://php.net/session.upload-progress.name
-;session.upload_progress.name = "PHP_SESSION_UPLOAD_PROGRESS"
-
-; How frequently the upload progress should be updated.
-; Given either in percentages (per-file), or in bytes
-; Default Value: "1%"
-; Development Value: "1%"
-; Production Value: "1%"
-; http://php.net/session.upload-progress.freq
-;session.upload_progress.freq =  "1%"
-
-; The minimum delay between updates, in seconds
-; Default Value: 1
-; Development Value: 1
-; Production Value: 1
-; http://php.net/session.upload-progress.min-freq
-;session.upload_progress.min_freq = "1"
-
-; Only write session data when session data is changed. Enabled by default.
-; http://php.net/session.lazy-write
-;session.lazy_write = On
-
-[Assertion]
-; Switch whether to compile assertions at all (to have no overhead at run-time)
-; -1: Do not compile at all
-;  0: Jump over assertion at run-time
-;  1: Execute assertions
-; Changing from or to a negative value is only possible in php.ini! (For turning assertions on and off at run-time, see assert.active, when zend.assertions = 1)
-; Default Value: 1
-; Development Value: 1
-; Production Value: -1
-; http://php.net/zend.assertions
-zend.assertions = -1
-
-; Assert(expr); active by default.
-; http://php.net/assert.active
-;assert.active = On
-
-; Throw an AssertionError on failed assertions
-; http://php.net/assert.exception
-;assert.exception = On
-
-; Issue a PHP warning for each failed assertion. (Overridden by assert.exception if active)
-; http://php.net/assert.warning
-;assert.warning = On
-
-; Don't bail out by default.
-; http://php.net/assert.bail
-;assert.bail = Off
-
-; User-function to be called if an assertion fails.
-; http://php.net/assert.callback
-;assert.callback = 0
-
-; Eval the expression with current error_reporting().  Set to true if you want
-; error_reporting(0) around the eval().
-; http://php.net/assert.quiet-eval
-;assert.quiet_eval = 0
-
-[COM]
-; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
-; http://php.net/com.typelib-file
-;com.typelib_file =
-
-; allow Distributed-COM calls
-; http://php.net/com.allow-dcom
-;com.allow_dcom = true
-
-; autoregister constants of a component's typlib on com_load()
-; http://php.net/com.autoregister-typelib
-;com.autoregister_typelib = true
-
-; register constants casesensitive
-; http://php.net/com.autoregister-casesensitive
-;com.autoregister_casesensitive = false
-
-; show warnings on duplicate constant registrations
-; http://php.net/com.autoregister-verbose
-;com.autoregister_verbose = true
-
-; The default character set code-page to use when passing strings to and from COM objects.
-; Default: system ANSI code page
-;com.code_page=
-
-[mbstring]
-; language for internal character representation.
-; This affects mb_send_mail() and mbstring.detect_order.
-; http://php.net/mbstring.language
-;mbstring.language = Japanese
-
-; Use of this INI entry is deprecated, use global internal_encoding instead.
-; internal/script encoding.
-; Some encoding cannot work as internal encoding. (e.g. SJIS, BIG5, ISO-2022-*)
-; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
-; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
-;mbstring.internal_encoding =
-
-; Use of this INI entry is deprecated, use global input_encoding instead.
-; http input encoding.
-; mbstring.encoding_translation = On is needed to use this setting.
-; If empty, default_charset or input_encoding or mbstring.input is used.
-; The precedence is: default_charset < input_encoding < mbstring.http_input
-; http://php.net/mbstring.http-input
-;mbstring.http_input =
-
-; Use of this INI entry is deprecated, use global output_encoding instead.
-; http output encoding.
-; mb_output_handler must be registered as output buffer to function.
-; If empty, default_charset or output_encoding or mbstring.http_output is used.
-; The precedence is: default_charset < output_encoding < mbstring.http_output
-; To use an output encoding conversion, mbstring's output handler must be set
-; otherwise output encoding conversion cannot be performed.
-; http://php.net/mbstring.http-output
-;mbstring.http_output =
-
-; enable automatic encoding translation according to
-; mbstring.internal_encoding setting. Input chars are
-; converted to internal encoding by setting this to On.
-; Note: Do _not_ use automatic encoding translation for
-;       portable libs/applications.
-; http://php.net/mbstring.encoding-translation
-;mbstring.encoding_translation = Off
-
-; automatic encoding detection order.
-; "auto" detect order is changed according to mbstring.language
-; http://php.net/mbstring.detect-order
-;mbstring.detect_order = auto
-
-; substitute_character used when character cannot be converted
-; one from another
-; http://php.net/mbstring.substitute-character
-;mbstring.substitute_character = none
-
-; overload(replace) single byte functions by mbstring functions.
-; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(),
-; etc. Possible values are 0,1,2,4 or combination of them.
-; For example, 7 for overload everything.
-; 0: No overload
-; 1: Overload mail() function
-; 2: Overload str*() functions
-; 4: Overload ereg*() functions
-; http://php.net/mbstring.func-overload
-;mbstring.func_overload = 0
-
-; enable strict encoding detection.
-; Default: Off
-;mbstring.strict_detection = On
-
-; This directive specifies the regex pattern of content types for which mb_output_handler()
-; is activated.
-; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml)
-;mbstring.http_output_conv_mimetype=
-
-; This directive specifies maximum stack depth for mbstring regular expressions. It is similar
-; to the pcre.recursion_limit for PCRE.
-; Default: 100000
-;mbstring.regex_stack_limit=100000
-
-; This directive specifies maximum retry count for mbstring regular expressions. It is similar
-; to the pcre.backtrack_limit for PCRE.
-; Default: 1000000
-;mbstring.regex_retry_limit=1000000
-
-[gd]
-; Tell the jpeg decode to ignore warnings and try to create
-; a gd image. The warning will then be displayed as notices
-; disabled by default
-; http://php.net/gd.jpeg-ignore-warning
-;gd.jpeg_ignore_warning = 1
-
-[exif]
-; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.
-; With mbstring support this will automatically be converted into the encoding
-; given by corresponding encode setting. When empty mbstring.internal_encoding
-; is used. For the decode settings you can distinguish between motorola and
-; intel byte order. A decode setting cannot be empty.
-; http://php.net/exif.encode-unicode
-;exif.encode_unicode = ISO-8859-15
-
-; http://php.net/exif.decode-unicode-motorola
-;exif.decode_unicode_motorola = UCS-2BE
-
-; http://php.net/exif.decode-unicode-intel
-;exif.decode_unicode_intel    = UCS-2LE
-
-; http://php.net/exif.encode-jis
-;exif.encode_jis =
-
-; http://php.net/exif.decode-jis-motorola
-;exif.decode_jis_motorola = JIS
-
-; http://php.net/exif.decode-jis-intel
-;exif.decode_jis_intel    = JIS
-
-[Tidy]
-; The path to a default tidy configuration file to use when using tidy
-; http://php.net/tidy.default-config
-;tidy.default_config = /usr/local/lib/php/default.tcfg
-
-; Should tidy clean and repair output automatically?
-; WARNING: Do not use this option if you are generating non-html content
-; such as dynamic images
-; http://php.net/tidy.clean-output
-tidy.clean_output = Off
-
-[soap]
-; Enables or disables WSDL caching feature.
-; http://php.net/soap.wsdl-cache-enabled
-soap.wsdl_cache_enabled=1
-
-; Sets the directory name where SOAP extension will put cache files.
-; http://php.net/soap.wsdl-cache-dir
-soap.wsdl_cache_dir="/tmp"
-
-; (time to live) Sets the number of second while cached file will be used
-; instead of original one.
-; http://php.net/soap.wsdl-cache-ttl
-soap.wsdl_cache_ttl=86400
-
-; Sets the size of the cache limit. (Max. number of WSDL files to cache)
-soap.wsdl_cache_limit = 5
-
-[sysvshm]
-; A default size of the shared memory segment
-;sysvshm.init_mem = 10000
-
-[ldap]
-; Sets the maximum number of open links or -1 for unlimited.
-ldap.max_links = -1
-
-[dba]
-;dba.default_handler=
-
-[opcache]
-; Determines if Zend OPCache is enabled
-;opcache.enable=1
-
-; Determines if Zend OPCache is enabled for the CLI version of PHP
-;opcache.enable_cli=0
-
-; The OPcache shared memory storage size.
-;opcache.memory_consumption=128
-
-; The amount of memory for interned strings in Mbytes.
-;opcache.interned_strings_buffer=8
-
-; The maximum number of keys (scripts) in the OPcache hash table.
-; Only numbers between 200 and 1000000 are allowed.
-;opcache.max_accelerated_files=10000
-
-; The maximum percentage of "wasted" memory until a restart is scheduled.
-;opcache.max_wasted_percentage=5
-
-; When this directive is enabled, the OPcache appends the current working
-; directory to the script key, thus eliminating possible collisions between
-; files with the same name (basename). Disabling the directive improves
-; performance, but may break existing applications.
-;opcache.use_cwd=1
-
-; When disabled, you must reset the OPcache manually or restart the
-; webserver for changes to the filesystem to take effect.
-;opcache.validate_timestamps=1
-
-; How often (in seconds) to check file timestamps for changes to the shared
-; memory storage allocation. ("1" means validate once per second, but only
-; once per request. "0" means always validate)
-;opcache.revalidate_freq=2
-
-; Enables or disables file search in include_path optimization
-;opcache.revalidate_path=0
-
-; If disabled, all PHPDoc comments are dropped from the code to reduce the
-; size of the optimized code.
-;opcache.save_comments=1
-
-; Allow file existence override (file_exists, etc.) performance feature.
-;opcache.enable_file_override=0
-
-; A bitmask, where each bit enables or disables the appropriate OPcache
-; passes
-;opcache.optimization_level=0x7FFFBFFF
-
-;opcache.dups_fix=0
-
-; The location of the OPcache blacklist file (wildcards allowed).
-; Each OPcache blacklist file is a text file that holds the names of files
-; that should not be accelerated. The file format is to add each filename
-; to a new line. The filename may be a full path or just a file prefix
-; (i.e., /var/www/x  blacklists all the files and directories in /var/www
-; that start with 'x'). Line starting with a ; are ignored (comments).
-;opcache.blacklist_filename=
-
-; Allows exclusion of large files from being cached. By default all files
-; are cached.
-;opcache.max_file_size=0
-
-; Check the cache checksum each N requests.
-; The default value of "0" means that the checks are disabled.
-;opcache.consistency_checks=0
-
-; How long to wait (in seconds) for a scheduled restart to begin if the cache
-; is not being accessed.
-;opcache.force_restart_timeout=180
-
-; OPcache error_log file name. Empty string assumes "stderr".
-;opcache.error_log=
-
-; All OPcache errors go to the Web server log.
-; By default, only fatal errors (level 0) or errors (level 1) are logged.
-; You can also enable warnings (level 2), info messages (level 3) or
-; debug messages (level 4).
-;opcache.log_verbosity_level=1
-
-; Preferred Shared Memory back-end. Leave empty and let the system decide.
-;opcache.preferred_memory_model=
-
-; Protect the shared memory from unexpected writing during script execution.
-; Useful for internal debugging only.
-;opcache.protect_memory=0
-
-; Allows calling OPcache API functions only from PHP scripts which path is
-; started from specified string. The default "" means no restriction
-;opcache.restrict_api=
-
-; Mapping base of shared memory segments (for Windows only). All the PHP
-; processes have to map shared memory into the same address space. This
-; directive allows to manually fix the "Unable to reattach to base address"
-; errors.
-;opcache.mmap_base=
-
-; Facilitates multiple OPcache instances per user (for Windows only). All PHP
-; processes with the same cache ID and user share an OPcache instance.
-;opcache.cache_id=
-
-; Enables and sets the second level cache directory.
-; It should improve performance when SHM memory is full, at server restart or
-; SHM reset. The default "" disables file based caching.
-;opcache.file_cache=
-
-; Enables or disables opcode caching in shared memory.
-;opcache.file_cache_only=0
-
-; Enables or disables checksum validation when script loaded from file cache.
-;opcache.file_cache_consistency_checks=1
-
-; Implies opcache.file_cache_only=1 for a certain process that failed to
-; reattach to the shared memory (for Windows only). Explicitly enabled file
-; cache is required.
-;opcache.file_cache_fallback=1
-
-; Enables or disables copying of PHP code (text segment) into HUGE PAGES.
-; This should improve performance, but requires appropriate OS configuration.
-;opcache.huge_code_pages=1
-
-; Validate cached file permissions.
-;opcache.validate_permission=0
-
-; Prevent name collisions in chroot'ed environment.
-;opcache.validate_root=0
-
-; If specified, it produces opcode dumps for debugging different stages of
-; optimizations.
-;opcache.opt_debug_level=0
-
-; Specifies a PHP script that is going to be compiled and executed at server
-; start-up.
-; http://php.net/opcache.preload
-;opcache.preload=
-
-; Preloading code as root is not allowed for security reasons. This directive
-; facilitates to let the preloading to be run as another user.
-; http://php.net/opcache.preload_user
-;opcache.preload_user=
-
-; Prevents caching files that are less than this number of seconds old. It
-; protects from caching of incompletely updated files. In case all file updates
-; on your site are atomic, you may increase performance by setting it to "0".
-;opcache.file_update_protection=2
-
-; Absolute path used to store shared lockfiles (for *nix only).
-;opcache.lockfile_path=/tmp
-
-[curl]
-; A default value for the CURLOPT_CAINFO option. This is required to be an
-; absolute path.
-;curl.cainfo =
-
-[openssl]
-; The location of a Certificate Authority (CA) file on the local filesystem
-; to use when verifying the identity of SSL/TLS peers. Most users should
-; not specify a value for this directive as PHP will attempt to use the
-; OS-managed cert stores in its absence. If specified, this value may still
-; be overridden on a per-stream basis via the "cafile" SSL stream context
-; option.
-;openssl.cafile=
-
-; If openssl.cafile is not specified or if the CA file is not found, the
-; directory pointed to by openssl.capath is searched for a suitable
-; certificate. This value must be a correctly hashed certificate directory.
-; Most users should not specify a value for this directive as PHP will
-; attempt to use the OS-managed cert stores in its absence. If specified,
-; this value may still be overridden on a per-stream basis via the "capath"
-; SSL stream context option.
-;openssl.capath=
-
-[ffi]
-; FFI API restriction. Possible values:
-; "preload" - enabled in CLI scripts and preloaded files (default)
-; "false"   - always disabled
-; "true"    - always enabled
-;ffi.enable=preload
-
-; List of headers files to preload, wildcard patterns allowed.
-;ffi.preload=
diff --git a/openQRM-5.3.50-CE/src/etc/init.d/openqrm b/openQRM-5.3.50-CE/src/etc/init.d/openqrm
deleted file mode 100644
index 13229b6..0000000
--- a/openQRM-5.3.50-CE/src/etc/init.d/openqrm
+++ /dev/null
@@ -1,661 +0,0 @@
-#!/bin/bash
-# openqrm-server	openQRM-server init script
-#
-# chkconfig: 2345 98 24
-# description: openQRM is the next generation Linux Data Center management
-
-# support for LSB init script
-### BEGIN INIT INFO
-# Provides: openqrm
-# Required-Start: $local_fs $network $remote_fs
-# Required-Stop: $local_fs $network $remote_fs
-# Default-Start:  2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: openQRM-Server init script
-# Description: openQRM-Server init script
-### END INIT INFO
-
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export LANG=C
-PATH=/usr/bin:/sbin:/bin:/usr/sbin:$PATH
-export PATH
-LOCKFILE=/var/lock/subsys/openqrm
-mkdir -p $(dirname $LOCKFILE)
-# a new line for sed
-NEWLINE='
-'
-
-# unset http_proxy environment
-unset http_proxy
-unset https_proxy
-
-
-# find the openqrm-server-base-dir
-readlink() {
-	local path=$1 ll
-	if [ -L "$path" ]; then
-		ll="$(LC_ALL=C ls -l "$path" 2> /dev/null)" &&
-		echo "${ll/* -> }"
-	else
-		return 1
-	fi
-}
-
-SCRIPT=$0
-while [ -L "$SCRIPT" ]; do
-	SRC=$(readlink $SCRIPT)
-	if [ "${SRC:0:1}" != "/" ]; then
-		SRC=$(dirname $SCRIPT)/$SRC
-	fi
-	SCRIPT=$SRC
-done
-export OPENQRM_SERVER_BASE_DIR=`pushd \`dirname $SCRIPT\`/../../../ 1>/dev/null && pwd && popd 1>/dev/null`
-
-# get the openqrm-server configuration + functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/$OPENQRM_DATABASE_TYPE/openqrm-$OPENQRM_DATABASE_TYPE-functions
-
-# 64bit ?
-if ((1 == 1<<32)); then
-	echo "ERROR: openQRM requires a 64bit operating system!!"
-	exit 1
-fi
-
-
-# functions
-
-function stop_exec_subsystem_force() {
-	kill `ps ax | grep dropbear | grep -v grep | grep openqrm | awk {' print $1 '}` 2>/dev/null || true
-	kill `ps ax | grep openqrm-cmd-queue | grep -v grep | awk {' print $1 '}` 2>/dev/null || true
-	kill `ps ax | grep openqrm-rabbitmq-cmd-queue | grep -v grep | awk {' print $1 '}` 2>/dev/null || true
-	kill `ps ax | grep openqrm-monitord | grep -v grep | awk {' print $1 '}` 2>/dev/null || true
-	return 0
-}
-
-
-
-function openqrm_server_init() {
-
-	echo "First startup detected. Running initialization."
-	# make sure to have all enabled plugins stopped and uninstalled
-	if [ -d $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/ ]; then
-		for OPENQRM_PLUGIN in `ls $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/`; do
-			if [ -x $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN ]; then
-				$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN stop
-				rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/$OPENQRM_PLUGIN
-			fi
-		done
-	fi
-
-	# do some extra checks for redhat/centos regarding selinux + firewall
-	if [ -f /etc/redhat-release ]; then
-		# selinux disabled ?
-		if selinuxenabled; then
-			echo "ERROR: Found SELinux enabled!"
-			echo "ERROR: Please set SELINUX=disabled in /etc/selinux/config and reboot!"
-			exit 1
-		fi
-		# iptables ?
-		if which iptables 1>/dev/null; then
-			if iptables -L | grep REJECT 1>/dev/null; then
-				echo "NOTICE: Found iptables firewall enabled!"
-				echo "NOTICE: An active firewall may cause troubles during the initialization!"
-				echo "NOTICE: openQRM at least needs access to the following ports : 80, 443, $OPENQRM_EXEC_PORT"
-				echo
-				echo "NOTICE: Press 'c' to continue with the current iptables firewall configuration"
-				echo "NOTICE: Press 's' to stop the iptables firewall for the initialization"
-				while (:); do
-					read -n1 IPTABLES
-					if [ "$IPTABLES" == "c" ]; then
-						break
-					fi
-					if [ "$IPTABLES" == "s" ]; then
-						break
-					fi
-				done
-				if [ "$IPTABLES" == "c" ]; then
-					echo "... continuing with the current iptables firewall configuration"
-				elif [ "$IPTABLES" == "s" ]; then
-					echo "NOTICE: Stopping the iptables firewall"
-					if [ -x /etc/init.d/iptables ]; then
-						/etc/init.d/iptables stop
-					else
-						iptables --flush
-					fi
-				else
-					echo "ERROR: No such option!"
-					exit 1
-				fi
-
-
-			fi
-		fi
-	fi
-
-	# link the web application directory to the documentroot
-	HTPASSWD="htpasswd"
-	echo -n " Creating custom apache config.."
-	if [ -f /etc/debian_version ]; then
-		ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/web/ $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm
-		# the default apache config normally does not allow to override the authconfig (needed for basic auth)
-		# so we allow it for the openqrm directory
-		APACHE_CUSTOM_CONFIG_DIR="/etc/apache2/conf.d"
-		# support for Ubuntu 14.04 - new apache enabled-conf dir
-		if [ -d /etc/apache2/conf-enabled ]; then
-			APACHE_CUSTOM_CONFIG_DIR="/etc/apache2/conf-enabled"
-			# preserve backwards compatibility for other projects e.g. linuxcoe
-			ln -sf /etc/apache2/conf-enabled /etc/apache2/conf.d
-			cat $OPENQRM_SERVER_BASE_DIR/openqrm/etc/httpd/openqrm-httpd-vhost.conf | \
-				sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | \
-				sed -e "s#@@OPENQRM_WEBSERVER_DOCUMENT_ROOT@@#$OPENQRM_WEBSERVER_DOCUMENT_ROOT#g" \
-				> $APACHE_CUSTOM_CONFIG_DIR/openqrm-httpd.conf
-		else
-			cat $OPENQRM_SERVER_BASE_DIR/openqrm/etc/httpd/openqrm-httpd.conf | sed -e "s#OPENQRM_WEBSERVER_DOCUMENT_ROOT#$OPENQRM_WEBSERVER_DOCUMENT_ROOT#g" >> $APACHE_CUSTOM_CONFIG_DIR/openqrm-httpd.conf
-		fi
-		echo ".$APACHE_CUSTOM_CONFIG_DIR/openqrm-httpd.conf"
-		# care about php disable_functions in php.ini
-		if [ -f /etc/php5/apache2/php.ini ]; then
-			sed -i -e "s/^disable_functions/;disable_functions/g" /etc/php5/apache2/php.ini
-		fi
-	elif [ -f /etc/redhat-release ]; then
-		APACHE_CUSTOM_CONFIG_DIR="/etc/httpd/conf.d"
-		ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/web/ $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm
-		cat $OPENQRM_SERVER_BASE_DIR/openqrm/etc/httpd/openqrm-httpd.conf | sed -e "s#OPENQRM_WEBSERVER_DOCUMENT_ROOT#$OPENQRM_WEBSERVER_DOCUMENT_ROOT#g" >> $APACHE_CUSTOM_CONFIG_DIR/openqrm-httpd.conf
-		echo ".$APACHE_CUSTOM_CONFIG_DIR/openqrm-httpd.conf"
-	elif [ -f /etc/SuSE-release ]; then
-		APACHE_CUSTOM_CONFIG_DIR="/etc/apache2/conf.d"
-		HTPASSWD="htpasswd2"
-		ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/web/ $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm
-		cat $OPENQRM_SERVER_BASE_DIR/openqrm/etc/httpd/openqrm-httpd.conf | sed -e "s#OPENQRM_WEBSERVER_DOCUMENT_ROOT#$OPENQRM_WEBSERVER_DOCUMENT_ROOT#g" >> $APACHE_CUSTOM_CONFIG_DIR/openqrm-httpd.conf
-		echo ".$APACHE_CUSTOM_CONFIG_DIR/openqrm-httpd.conf"
-		# we need a special treatment for suse to allow followsymlinks in the default-setup
-		DEFAULT_CONF=/etc/apache2/default-server.conf
-		NEW_CONF=/etc/apache2/default-server.conf.new
-		if [ -f $DEFAULT_CONF ]; then
-			if grep Options $DEFAULT_CONF | grep -v "#" | head -n1 | grep None 1>/dev/null; then
-				echo "Need to allow FollowSymLinks in default-server.conf"
-				OLD_IFS=$IFS
-				IFS=$NEWLINE
-				for LINE in `cat $DEFAULT_CONF`; do
-					if echo $LINE | grep -v '#' | grep Options | grep None 1>/dev/null; then
-						echo "  Options FollowSymLinks" >> $NEW_CONF
-					else
-						echo $LINE >> $NEW_CONF
-					fi
-				done
-				IFS=$OLD_IFS
-				cp -f $DEFAULT_CONF $DEFAULT_CONF.org
-				mv -f $NEW_CONF $DEFAULT_CONF
-			fi
-		fi
-	fi
-
-	# ssl ?
-	echo -n " Checking $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf for OPENQRM_WEB_PROTOCOL=https.."
-	if [ "$OPENQRM_WEB_PROTOCOL" == "https" ]; then
-		echo ".yes."
-		echo "  Setting up SSL secured openQRM website."
-		# apache ssl setup, on centos it is enabled by default
-		if [ -f /etc/debian_version ]; then
-			if ! a2enmod ssl; then
-				echo "ERROR: Could not enable SSL in the Apache webserver ! Exiting."
-				return 1
-			fi
-		fi
-
-		# check for hostname settings
-		ETCHOSTS=/etc/hosts
-		MYHOSTNAME=`hostname`
-
-		if grep $MYHOSTNAME $ETCHOSTS | grep 127.0. 1>/dev/null || ! grep $MYHOSTNAME $ETCHOSTS 1>/dev/null; then
-			echo "   Found system hostname $MYHOSTNAME connected to loopback (127.0) interface"
-			echo "   [WARNING] This could cause problems when enabling SSL on the apache webserver."
-
-##			AVAIL_IPS=`ifconfig -a | grep -v inet6  | grep -B1 inet | grep -i -A1 link | grep -v lo | grep inet | grep -v 127.0.0.1 | cut -d':' -f2 | awk {' print $1 '}`
-#			AVAIL_IPS=`ifconfig -a | grep -v inet6  | grep -B1 inet | grep -i -A1 UP | grep -v lo | grep inet | grep -v 127.0.0.1 | cut -d':' -f2 | awk {' print $2 '}`
-			AVAIL_IPS=`ip -4 addr | grep -oP '(?<=inet\s)\d+(\.\d+){3}' | grep -v 127.0.0.1`
-
-			while (true); do
-				echo
-				echo "   Please type one of the following ip addresses to be connected to this"
-				echo "   hostname: $MYHOSTNAME in $ETCHOSTS (Your current hosts file will be backed up):"
-				echo "$AVAIL_IPS"
-				echo -n "> "
-				read HOSTIP
-				if openqrm_validate_ip "$HOSTIP"; then
-					if echo $AVAIL_IPS | grep "$HOSTIP" 1>/dev/null; then
-						break;
-					else
-						echo "$HOSTIP is not available on this system!"
-					fi
-				else
-					echo "$HOSTIP is invalid!"
-				fi
-			done
-			echo "   Connecting $HOSTIP to $MYHOSTNAME in $ETCHOSTS (we made a backup $ETCHOSTS.openqrm.bak).."
-			# remove first
-			sed -i -e "s/.*$MYHOSTNAME.*//g" $ETCHOSTS
-			sed -i -e "s/.*openQRM.*//g" $ETCHOSTS
-			# make sure we did not remove the loopback entry copmletely
-			if ! grep "127.0.*.localhost" $ETCHOSTS 1>/dev/null; then
-				echo "127.0.0.1 localhost" >> $ETCHOSTS.new
-				cat $ETCHOSTS >> $ETCHOSTS.new
-				cp -f $ETCHOSTS $ETCHOSTS.openqrm.bak
-				mv -f $ETCHOSTS.new $ETCHOSTS
-			fi
-			echo "# added by openQRM" >> $ETCHOSTS
-			echo "$HOSTIP	$MYHOSTNAME" >> $ETCHOSTS
-		fi
-
-		# creating the cert + key
-		PRIVATE_KEY=$OPENQRM_SERVER_BASE_DIR/openqrm/etc/ssl/private/openqrm-private.key
-		CERTIFICATE_FILE=$OPENQRM_SERVER_BASE_DIR/openqrm/etc/ssl/cert/openqrm.crt
-		CHAIN_FILE=$OPENQRM_SERVER_BASE_DIR/openqrm/etc/ssl/chain/openqrm.csr
-		VALID_DAYS=3650
-		mkdir -p `dirname $PRIVATE_KEY`
-		mkdir -p `dirname $CERTIFICATE_FILE`
-		mkdir -p `dirname $CHAIN_FILE`
-		rm -f $PRIVATE_KEY $CERTIFICATE_FILE $CHAIN_FILE
-
-		sleep 2
-		clear
-		echo
-		echo "########## Creating new private/public-keys for server $MYHOSTNAME ##########"
-		echo 
-		echo "   -> please go on with the defaults!"
-		echo "   -> for 'Common Name' please use $MYHOSTNAME"
-		echo "   -> please provide an empty password!"
-		echo 
-		echo "#############################################################################"
-		sleep 4
-		echo
-		openssl genrsa -des3 -passout pass:xXxXxX -out /tmp/server.pass.key 2048
-		openssl rsa -passin pass:xXxXxX -in /tmp/server.pass.key -out $PRIVATE_KEY
-		rm -f /tmp/server.pass.key
-		openssl req -new -key $PRIVATE_KEY -out $CHAIN_FILE
-		openssl x509 -req -days 365 -in $CHAIN_FILE -signkey $PRIVATE_KEY -out $CERTIFICATE_FILE
-
-		echo
-		echo -n "   Creating custom apache ssl config.."
-		cat $OPENQRM_SERVER_BASE_DIR/openqrm/etc/httpd/openqrm-https.conf | \
-			sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | \
-			sed -e "s#@@OPENQRM_WEBSERVER_DOCUMENT_ROOT@@#$OPENQRM_WEBSERVER_DOCUMENT_ROOT#g" \
-			> $APACHE_CUSTOM_CONFIG_DIR/openqrm-https.conf
-		echo ".$APACHE_CUSTOM_CONFIG_DIR/openqrm-https.conf"
-		# check if to adjust the error log location
-		if [ -f /etc/redhat-release ]; then
-			sed -i -e "s/apache2/httpd/g" $APACHE_CUSTOM_CONFIG_DIR/openqrm-https.conf
-		fi
-	fi
-
-	openqrm_webserver reload
-
-	# create the .htaccess file
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/etc/httpd/openqrm-htaccess.conf | sed -e "s#OPENQRM_WEBSERVER_DOCUMENT_ROOT#$OPENQRM_WEBSERVER_DOCUMENT_ROOT#g" > $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/.htaccess
-	# create the default admin user
-	$HTPASSWD -bc $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/.htpasswd openqrm openqrm
-	chmod 666 $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/.htpasswd
-
-	# create the image-auth and upload dir
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/web/action/image-auth
-	chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/web/action/image-auth
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/tmp
-	chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/tmp
-
-	# link the tftpboot/boot dir to the boot-services
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/boot
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/ $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/boot
-
-	# init the remote execution layer
-	case "$OPENQRM_EXECUTION_LAYER" in
-		dropbear)
-			# init the openQRM exec-mechanism via dropbear
-			echo " Initializing dropbear..."
-			# on debian and ubuntu, lets make sure it is not started as a service due to our install
-			if test -e /etc/default/dropbear; then
-				if grep '^NO_START=0' /etc/default/dropbear 1>/dev/null|| ! grep 'NO_START' /etc/default/dropbear 1>/dev/null; then
-					# looks like it has been set to start by default; let's revert that
-					/etc/init.d/dropbear stop
-					sed -i -e "s/^NO_START=0/NO_START=1/g" /etc/default/dropbear
-					# just in case it was never there in the first place
-					echo "NO_START=1" >> /etc/default/dropbear
-				fi
-			fi
-			# prepare dropbear config
-			/bin/rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear
-			mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear/
-			if ! dropbearkey -t rsa -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear/dropbear_rsa_host_key; then
-				echo "ERROR: Could not create host key with dropbearkey. Please check to have dropbear installed correctly!"
-				return 1
-			fi
-			# allow the webserver user to read it
-			chmod 600 $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear/dropbear_rsa_host_key
-
-			# create authorized_keys
-			PUBLIC_KEY=`dropbearkey -y -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear/dropbear_rsa_host_key | grep ssh`
-			if [ ! -d /root/.ssh ]; then
-				mkdir /root/.ssh
-				chmod 700 /root/.ssh
-			fi
-			echo "  Adding public key to /root/.ssh/authorized_keys..."
-			echo
-			if [ ! -f /root/.ssh/authorized_keys ]; then
-				echo "$PUBLIC_KEY" > /root/.ssh/authorized_keys
-				chmod 600 /root/.ssh/authorized_keys
-			else
-				OPENQRM_HOST=`echo $PUBLIC_KEY | awk {' print $3 '}`
-				if grep $OPENQRM_HOST /root/.ssh/authorized_keys 1>/dev/null; then
-					sed -i -e "s#.*$OPENQRM_HOST.*##g" /root/.ssh/authorized_keys
-				fi
-				echo "$PUBLIC_KEY" >> /root/.ssh/authorized_keys
-				chmod 600 /root/.ssh/authorized_keys
-			fi
-			# and put it in the boot-service dir for the resources to download
-			echo "$PUBLIC_KEY" > $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/openqrm-server-public-rsa-key
-			# create the command-queue dir
-			mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/var/spool/ $OPENQRM_SERVER_BASE_DIR/openqrm/var/lock/
-			chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/var/spool $OPENQRM_SERVER_BASE_DIR/openqrm/var/lock/
-			;;
-
-		rabbitmq)
-			echo "- Initializing RabbitMQ as command execution mechanism"
-			;;
-		*)
-			echo "ERROR: Un-supported command execution layer $openqrm_execution_layer ! Exiting."
-			return 1
-			;;
-	esac
-
-	# here we start the init
-	# add automatic startup
-	openqrm_chkconfig add openqrm
-
-	# create unconfigured file containing a list of available network cards to setup openQRM on
-	ip a s | grep ^[0-9] | cut -d':' -f2 | awk '{ print $1 }' | grep -v lo > $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/unconfigured
-
-	# use the first nic to preconfigure the openqrm-server.conf
-	FIRST_NIC=`ip a s | grep ^[0-9] | cut -d':' -f2 | awk '{ print $1 }' | grep -v lo | head -n 1`
-	if [ "$FIRST_NIC" != "" ]; then
-		sed -i -e "s/OPENQRM_SERVER_INTERFACE=.*/OPENQRM_SERVER_INTERFACE=$FIRST_NIC/g" $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	fi
-
-}
-
-
-
-function openqrm_server_uninstall() {
-
-	echo "Uninstalling openQRM-server ver. $OPENQRM_SERVER_VERSION."
-	# backup state
-	chmod +x $OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/$OPENQRM_DATABASE_TYPE/openqrm-$OPENQRM_DATABASE_TYPE-functions
-	openqrm_server_state backup uninstall
-
-	# stop first
-	openqrm_server_stop
-
-	# drop db
-	$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/$OPENQRM_DATABASE_TYPE/openqrm-$OPENQRM_DATABASE_TYPE-functions drop
-
-	# remove automatic startup
-	openqrm_chkconfig del openqrm
-	rm -f /etc/init.d/openqrm
-
-	# removing the apache web + config
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm
-	if [ -f /etc/debian_version ]; then
-		rm -f /etc/apache2/conf.d/openqrm-httpd.conf
-		rm -f /etc/apache2/conf.d/openqrm-https.conf
-	elif [ -f /etc/redhat-release ]; then
-		rm -f /etc/httpd/conf.d/openqrm-httpd.conf
-		rm -f /etc/httpd/conf.d/openqrm-https.conf
-	elif [ -f /etc/SuSE-release ]; then
-		rm -f /etc/apache2/conf.d/openqrm-httpd.conf
-		rm -f /etc/apache2/conf.d/openqrm-https.conf
-	fi
-	openqrm_webserver reload
-
-	# remove default file to re-init at next startup
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/default
-
-	case "$OPENQRM_EXECUTION_LAYER" in
-		dropbear)
-			# remove dropbear key
-			rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear
-			rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/var
-			;;
-	esac
-	echo "Uninstallation of openQRM-server finished."
-}
-
-
-function openqrm_server_start() {
-
-	if [ -f ${LOCKFILE} ]; then
-		echo "openQRM-server ver. $OPENQRM_SERVER_VERSION is already running."
-		return 1
-	fi
-	if [ -x /usr/bin/screen.real ]; then
-		RUNSCREEN="/usr/bin/screen.real"
-	else
-		RUNSCREEN=`which screen`
-	fi
-	# make sure apache is up
-	if [ -f /etc/debian_version ]; then
-		if ! ps ax | grep apache2 | grep -v grep 1>/dev/null; then
-			openqrm_webserver start
-		fi
-	elif [ -f /etc/redhat-release ]; then
-		if ! ps ax | grep httpd | grep -v grep 1>/dev/null; then
-			openqrm_webserver start
-			openqrm_chkconfig add httpd
-		fi
-		if ! ps ax | grep mysqld | grep -v grep 1>/dev/null; then
-			if [ -f /etc/centos-release ]; then
-				service mysql start
-				service mariadb start
-				systemctl enable mysql
-				systemctl enable httpd
-			else
-				# make sure the db is up
-				/etc/init.d/mysqld start
-				openqrm_chkconfig add mysqld
-			fi
-		fi
-	elif [ -f /etc/SuSE-release ]; then
-		if ! ps ax | grep apache | grep -v grep 1>/dev/null; then
-			openqrm_webserver start
-		fi
-	fi
-
-	# check if we are at first-startup, if yes do initialization
-	if [ ! -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/default ]; then
-		openqrm_server_init
-	fi
-	echo "Starting the openQRM-server ver. $OPENQRM_SERVER_VERSION."
-
-	# start the execution layer
-	stop_exec_subsystem_force
-	case "$OPENQRM_EXECUTION_LAYER" in
-		dropbear)
-			# start the openqrm-execd daemon
-			if ! dropbear -p $OPENQRM_EXEC_PORT -r $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear/dropbear_rsa_host_key; then
-				echo "ERROR: Could not start the dropbear server. Please check to have dropbear installed correctly!"
-				return 1
-			fi
-			# start the openqrm-cmd-queue
-			$RUNSCREEN -dmS cmdqueue $OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-cmd-queue
-			;;
-		rabbitmq)
-			echo "- Using RabbitMQ as command execution mechanism"
-			if [ "$OPENQRM_RABBITMQ_PASSWORD" == "" ]; then
-				echo "ERROR: OPENQRM_RABBITMQ_PASSWORD not set in $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf!"
-				return 1
-			fi
-			openqrm_server_get_config
-			export RABBITMQ_SERVER="$OPENQRM_SERVER_IP_ADDRESS"
-			export RABBITMQ_PASSWORD="$OPENQRM_RABBITMQ_PASSWORD"
-			export RABBITMQ_QUEUE_NAME="$OPENQRM_SERVER_IP_ADDRESS"
-			$RUNSCREEN -dmS cmdqueue $OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-rabbitmq-cmd-queue
-			;;
-		*)
-			echo "ERROR: Un-supported command execution layer $openqrm_execution_layer ! Exiting."
-			return 1
-			;;
-	esac
-	touch ${LOCKFILE}
-
-	if [ -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/unconfigured ]; then
-		echo
-		if [ "$OPENQRM_SERVER_IP_ADDRESS" != "" ]; then
-			echo "Initialization complete. Please configure your openQRM Server at: $OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/"
-		else
-			echo "Initialization complete.  Please configure your openQRM Server at: $OPENQRM_WEB_PROTOCOL://[server-ip-address]/openqrm/"
-		fi
-		echo "-> User: openqrm  -> Password: openqrm"
-		echo
-		sleep 2
-	else
-		# check openqrm-interface
-		if ! ifconfig | grep ^"$OPENQRM_SERVER_INTERFACE" 1>/dev/null; then
-			ifup "$OPENQRM_SERVER_INTERFACE"
-			sleep 2
-		fi
-		ifconfig "$OPENQRM_SERVER_INTERFACE" | grep inet 1>/dev/null 2>&1 || \
-		{ echo "Interface $OPENQRM_SERVER_INTERFACE is down. Please configure and activate it and try again"; return 1; }
-
-		CONFIGURED_IP=$(cat $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/default | grep "openqrm=" | sed -e "s/.*openqrm=//" | awk {' print $1 '})
-		OPENQRM_SERVER_IP_ADDRESS=`ip a s $OPENQRM_SERVER_INTERFACE | grep -w $OPENQRM_SERVER_INTERFACE$ | grep -w inet | awk '{ print $2 }' | cut -d'/' -f1`
-
-		if [ "$OPENQRM_SERVER_IP_ADDRESS" != "$CONFIGURED_IP" ]; then
-			echo "$OPENQRM_SERVER_IP_ADDRESS  != $CONFIGURED_IP" > /tmp/lll-ip-check
-			echo -e "Interface $OPENQRM_SERVER_INTERFACE has the wrong ip-configuration.\n" \
-			"       The openQRM-server is configured to have the ip-address $CONFIGURED_IP\n" \
-			"       but the interface $OPENQRM_SERVER_INTERFACE is running with the ip-address $OPENQRM_SERVER_IP_ADDRESS"
-
-			# create lockfile again to forcre re-configuration
-			ip a s | grep ^[0-9] | cut -d':' -f2 | awk '{ print $1 }' | grep -v lo > $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/unconfigured
-			echo
-			if [ "$OPENQRM_SERVER_IP_ADDRESS" != "" ]; then
-				echo "Please re-configure your openQRM Server at : http://$OPENQRM_SERVER_IP_ADDRESS/openqrm/"
-			else
-				echo "Please re-configure your openQRM Server at : http://[server-ip-address]/openqrm/"
-			fi
-			echo
-			sleep 2
-			return 1
-		fi
-
-		# and the monitoring infra-structure
-		$RUNSCREEN -dmS monitord $OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-monitord
-		# start all enabled plugins
-		echo "Starting enabled openQRM-server plugins..."
-		for OPENQRM_PLUGIN in `ls $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/`; do
-			# make sure they are stopped before
-			if [ -e $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/$OPENQRM_PLUGIN/.running ]; then
-				if [ -x $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN ]; then
-					$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN stop 1>/dev/null 2>/dev/null
-					touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/$OPENQRM_PLUGIN/.openqrm_stopped
-				fi
-			fi
-			if [ -e $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/$OPENQRM_PLUGIN/.openqrm_stopped ]; then
-				if [ -x $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN ]; then
-					$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN start
-					rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/$OPENQRM_PLUGIN/.openqrm_stopped
-				fi
-			fi
-		done
-	fi
-
-}
-
-
-function openqrm_server_stop() {
-
-	if [ ! -f ${LOCKFILE} ]; then
-		echo "openQRM-server ver. $OPENQRM_SERVER_VERSION is not running."
-	else
-		# stop all enabled plugins
-		echo "Stopping enabled openQRM-server plugins..."
-		for OPENQRM_PLUGIN in `ls $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/`; do
-			if [ -e $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/$OPENQRM_PLUGIN/.running ]; then
-				if [ -x $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN ]; then
-					$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/init.d/openqrm-plugin-$OPENQRM_PLUGIN stop
-					touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/$OPENQRM_PLUGIN/.openqrm_stopped
-				fi
-			fi
-		done
-		echo "Stopping the openQRM-server ver. $OPENQRM_SERVER_VERSION."
-		stop_exec_subsystem_force
-		/bin/rm -f ${LOCKFILE}
-	fi
-}
-
-
-function openqrm_server_status() {
-	if [ -f ${LOCKFILE} ]; then
-		echo "openQRM-server ver. $OPENQRM_SERVER_VERSION is running."
-		exit 0
-	else
-		echo "openQRM-server ver. $OPENQRM_SERVER_VERSION is not running."
-		exit 3
-	fi
-}
-
-
-# main
-ADDITIONAL_PARAM=$2
-case "$1" in
-	start)
-		openqrm_server_start
-		;;
-	stop)
-		openqrm_server_stop
-		;;
-	status)
-		openqrm_server_status
-		;;
-	restart)
-		openqrm_server_stop
-		sleep 1
-		openqrm_server_start
-		;;
-	reload)
-		openqrm_server_stop
-		sleep 1
-		openqrm_server_start
-		;;
-	force-reload)
-		openqrm_server_stop
-		sleep 1
-		openqrm_server_start
-		;;
-	init)
-		openqrm_server_init
-		;;
-	uninstall)
-		openqrm_server_uninstall
-		;;
-	*)
-		echo "Usage: $0 {start|stop|status|restart|reload|force-reload|init|uninstall}"
-		exit 1
-
-esac
-
-
-
diff --git a/openQRM-5.3.50-CE/src/etc/init.d/openqrm-client b/openQRM-5.3.50-CE/src/etc/init.d/openqrm-client
deleted file mode 100644
index 23e3f81..0000000
--- a/openQRM-5.3.50-CE/src/etc/init.d/openqrm-client
+++ /dev/null
@@ -1,385 +0,0 @@
-#!/bin/bash
-# openqrm-client	openQRM init script for the managed resources
-#
-# chkconfig: 2345 98 19
-# description: openQRM is the next generation Linux Data Center management
-
-# support for LSB init scripts
-### BEGIN INIT INFO
-# Provides: openqrm-client
-# Required-Start: $all
-# Required-Stop: $all
-# Default-Start:  2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: openQRM init script for the managed resources
-# Description: openQRM init script for the managed resources
-### END INIT INFO
-
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export LANG=C
-PATH=/usr/bin:/sbin:/bin:/usr/sbin
-export PATH
-LOCKFILE=/var/lock/subsys/openqrm
-mkdir -p $(dirname $LOCKFILE)
-
-export `eval cat /proc/cmdline`	2>/dev/null
-. /var/openqrm/openqrm-resource.conf
-# make sure to have a valid backup of the parameters, at least including the openQRM server ip
-if [ ! -f /var/openqrm/openqrm-resource.conf.last ]; then
-	/bin/cp -f /var/openqrm/openqrm-resource.conf /var/openqrm/openqrm-resource.conf.last
-fi
-if [ "$resource_mac" == "" ]; then
-	/bin/cp -f /var/openqrm/openqrm-resource.conf.last /var/openqrm/openqrm-resource.conf
-	. /var/openqrm/openqrm-resource.conf
-fi
-export OPENQRM_SERVER_BASE_DIR=$resource_basedir
-export OPENQRM_SOURCE_DIR=$resource_basedir/openqrm
-. $resource_basedir/openqrm/include/openqrm-functions
-. $resource_basedir/openqrm/include/openqrm-package-functions
-
-
-# define max-start-retries
-MAX_START_RETRY=120
-
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET="wget -q --no-check-certificate"
-else
-	WGET="wget -q"
-fi
-
-# gets/starts/stops enabled boot-services for the resources
-function openqrm_boot_service() {
-	local BOOT_SERVICE=$1
-	local BOOT_SERVICE_CMD=$2
-	local CURRENT=`pwd`
-
-	# get + install the package during start
-	if [ "$BOOT_SERVICE_CMD" == "start" ]; then
-		echo "Getting boot-service package $BOOT_SERVICE"
-		mkdir -p  $resource_basedir/openqrm/plugins/$BOOT_SERVICE
-		cd $resource_basedir/openqrm/plugins/$BOOT_SERVICE
-		if ! $WGET $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/boot-service-$BOOT_SERVICE.tgz; then
-			echo "ERROR: Could not get boot-service package for boot-service $BOOT_SERVICE !"
-			return 1
-		fi
-		tar -xzf boot-service-$BOOT_SERVICE.tgz
-		rm -f boot-service-$BOOT_SERVICE.tgz
-		# get optional custom appliance config
-		if [ "$appliance_name" != "" ]; then
-			if [ ! -d $resource_basedir/openqrm/plugins/$BOOT_SERVICE/etc/ ]; then
-				mkdir -p $resource_basedir/openqrm/plugins/$BOOT_SERVICE/etc/
-			fi
-			if $WGET -O $resource_basedir/openqrm/plugins/$BOOT_SERVICE/etc/openqrm-plugin-$BOOT_SERVICE.conf.$appliance_name.conf $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/plugins/$BOOT_SERVICE/openqrm-plugin-$BOOT_SERVICE.$appliance_name.conf; then
-				echo "- applying custom $BOOT_SERVICE boot-service configuration for appliance $appliance_name"
-				/bin/cp -f $resource_basedir/openqrm/plugins/$BOOT_SERVICE/etc/openqrm-plugin-$BOOT_SERVICE.conf $resource_basedir/openqrm/plugins/$BOOT_SERVICE/etc/openqrm-plugin-$BOOT_SERVICE.conf.default
-				/bin/cp -f $resource_basedir/openqrm/plugins/$BOOT_SERVICE/etc/openqrm-plugin-$BOOT_SERVICE.conf.$appliance_name.conf $resource_basedir/openqrm/plugins/$BOOT_SERVICE/etc/openqrm-plugin-$BOOT_SERVICE.conf
-			fi
-		fi
-	fi
-	# run the boot-service cmd
-	BOOT_SERVICE_INIT="$resource_basedir/openqrm/plugins/$BOOT_SERVICE/etc/init.d/$BOOT_SERVICE"
-	if [ -x $BOOT_SERVICE_INIT ]; then
-		echo "Running $BOOT_SERVICE_CMD on boot-service $BOOT_SERVICE"
-		$BOOT_SERVICE_INIT $BOOT_SERVICE_CMD
-	fi
-	cd $CURRENT
-}
-
-
-
-
-
-function openqrm_client_start() {
-
-	echo "Starting openQRM-client"
-	openqrm_client_stop 1>/dev/null 2>&1
-	START_RETRY=0
-	LOOP_CONNECT=0
-	MAX_CONNECT=10
-
-	# checks
-	umount /initrd/lib/modules 1>/dev/null 2>&1
-	umount /initrd/boot 1>/dev/null 2>&1
-	umount /initrd/ 1>/dev/null 2>&1
-
-	grep -q "/initrd" /proc/mounts && umount /initrd
-
-	chmod 666 /dev/null
-
-	if [ ! -e /dev/tty ]; then
-		cd /dev
-		mknod tty c 5 0
-		cd
-	fi
-
-	# network up ?
-	echo "NOTICE: Checking connection to openQRM server at $resource_openqrmserver"
-	while ! $WGET -q -t 1 -T 4 -O /dev/null "$openqrm_web_protocol://$resource_openqrmserver/openqrm/action/resource-monitor.php"; do
-		echo -n "."
-		sleep 2
-		LOOP_CONNECT=$(( LOOP_CONNECT + 1 ))
-		if [ "$LOOP_CONNECT" == "$MAX_CONNECT" ]; then
-			echo "WARNING: Could not connect to openQRM server at $resource_openqrmserver! Trying to continue ..."
-			break
-		fi
-	done
-
-	# check if we have resource_mac, if not try to find the right interface integrated in openQRM
-	if ip a s | grep "link/ether" | awk '{ print $2 }' | cut -d'/' -f1 | grep -i $resource_mac &>/dev/null; then
-		# if not in the initrd try to refresh the resource parameters
-		if [ ! -f /etc/initrd-devices.conf ]; then
-			if ! $WGET -q -t 1 -T 4 -O /var/openqrm/openqrm-resource.conf "$openqrm_web_protocol://$resource_openqrmserver/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_mac=$resource_mac"; then
-				# restore
-				/bin/cp -f /var/openqrm/openqrm-resource.conf.last /var/openqrm/openqrm-resource.conf
-				echo "NOTICE: Could not refresh resource-parameters. Using previous one."
-			else
-				. /var/openqrm/openqrm-resource.conf
-			fi
-		fi
-	else
-		# here we do not found the resource_mac on one of the systems network cards
-		# assuming auto-install or clone to local-disk
-		/bin/cp -f /var/openqrm/openqrm-resource.conf /var/openqrm/openqrm-resource.conf.previous_res
-		for RESOURCE_MAC in `ip a s | grep "link/ether" | awk '{ print $2 }' | cut -d'/' -f1`; do
-			echo "NOTICE: Refreshing resource-parameters. Trying $RESOURCE_MAC."
-			if $WGET -q -t 1 -T 4 -O /var/openqrm/openqrm-resource.conf "$openqrm_web_protocol://$resource_openqrmserver/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_mac=$RESOURCE_MAC"; then
-				if grep -i $RESOURCE_MAC /var/openqrm/openqrm-resource.conf &>/dev/null; then
-					. /var/openqrm/openqrm-resource.conf
-					break
-				fi
-			fi
-		done
-	fi
-
-	# do some extra checks for redhat/centos regarding firewall
-	if [ -f /etc/redhat-release ]; then
-		# iptables ?
-		if which iptables 1>/dev/null; then
-			if iptables -L | grep REJECT 1>/dev/null; then
-				echo "NOTICE: Found iptables firewall enabled!"
-				echo "NOTICE: Inserting rule to allow access to the openQRM management port $resource_execdport"
-				iptables -I INPUT -m state --state NEW -m tcp -p tcp --dport $resource_execdport -j ACCEPT
-			fi
-		fi
-	fi
-
-	case "$openqrm_execution_layer" in
-		dropbear)
-			# install and use the distro dropbear package
-			DROPBEAR=`which dropbear`
-			if test -z $DROPBEAR; then
-				FORCE_INSTALL=true openqrm_install_os_dependency dropbear
-				# on debian and ubuntu, lets make sure it is not started as a service due to our install
-				if test -e /etc/default/dropbear; then
-					if grep '^NO_START=0' /etc/default/dropbear 1>/dev/null|| ! grep 'NO_START' /etc/default/dropbear 1>/dev/null; then
-						# looks like it has been set to start by default; let's revert that
-						/etc/init.d/dropbear stop
-						sed -i -e "s/^NO_START=0/NO_START=1/g" /etc/default/dropbear
-						# just in case it was never there in the first place
-						echo "NO_START=1" >> /etc/default/dropbear
-					fi
-				fi
-			fi
-			# start dropbear as openqrm-execd
-			/bin/rm -rf $resource_basedir/openqrm/etc/dropbear
-			mkdir -p $resource_basedir/openqrm/etc/dropbear/
-			if ! dropbearkey -t rsa -f $resource_basedir/openqrm/etc/dropbear/dropbear_rsa_host_key; then
-				echo "ERROR: Could not create host key with dropbearkey. Please check to have dropbear installed correctly!"
-				return 1
-			fi
-			# get the public key of the openQRM server
-			while (true); do
-				if ! $WGET $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/openqrm-server-public-rsa-key; then
-					if [ "$START_RETRY" == "$MAX_START_RETRY" ]; then
-						echo "ERROR: Could not get the public key of the openQRM-server at $resource_openqrmserver ! Please check the certificates !"
-						return 1
-					fi
-					START_RETRY=$(( START_RETRY + 1 ))
-					sleep 1
-				else
-					break
-				fi
-			done
-			if [ ! -d /root/.ssh ]; then
-				mkdir -p /root/.ssh
-				chmod 700 /root/.ssh
-			fi
-			if [ ! -f /root/.ssh/authorized_keys ]; then
-				mv -f openqrm-server-public-rsa-key /root/.ssh/authorized_keys
-				chmod 600 /root/.ssh/authorized_keys
-			else
-				OPENQRM_HOST=`cat openqrm-server-public-rsa-key | awk {' print $3 '}`
-				if grep $OPENQRM_HOST /root/.ssh/authorized_keys 1>/dev/null; then
-					sed -i -e "s#.*$OPENQRM_HOST.*##g" /root/.ssh/authorized_keys
-				fi
-				cat openqrm-server-public-rsa-key >> /root/.ssh/authorized_keys
-				rm -f openqrm-server-public-rsa-key
-				chmod 600 /root/.ssh/authorized_keys
-			fi
-			# start dropbear
-			killall dropbear 1>/dev/null 2>&1
-			for OPENQRM_PID in `ps ax 2>/dev/null | grep dropbear | grep -v grep | awk {' print $1 '}`; do
-				kill $OPENQRM_PID
-			done
-			dropbear -p $resource_execdport -r $resource_basedir/openqrm/etc/dropbear/dropbear_rsa_host_key
-			;;
-
-
-		rabbitmq)
-			RUNSCREEN=`which screen`
-			if test -z $RUNSCREEN; then
-				FORCE_INSTALL=true openqrm_install_os_dependency screen
-			fi
-			if [ -x /usr/bin/screen.real ]; then
-				RUNSCREEN="/usr/bin/screen.real"
-			else
-				RUNSCREEN=`which screen`
-			fi
-			echo "- installing python pip installer"
-			if ! openqrm_full_fill_os_dependency pip python3-pip; then
-				echo "ERROR: Failed to install python3-pip!"
-				exit 1
-			fi
-			echo "- installing python pika"
-			if ! pip install pika==0.9.8; then
-				echo "ERROR: Failed to install python pika!"
-				exit 1
-			fi
-			# export RABBITMQ_PASSWORD="$OPENQRM_PASSWORD"
-			eval $appliance_capabilities
-			export RABBITMQ_PASSWORD
-			export RABBITMQ_SERVER="$resource_openqrmserver"
-			export RABBITMQ_QUEUE_NAME="$resource_ip"
-			$RUNSCREEN -dmS cmdqueue $resource_basedir/openqrm/sbin/openqrm-rabbitmq-cmd-queue
-			;;
-
-		*)
-			echo "ERROR: Un-supported command execution layer $openqrm_execution_layer ! Exiting."
-			return 1
-			;;
-	esac
-
-	# start openqrm-monitord
-	if [ ! -d /tmp ]; then mkdir -p /tmp; fi
-	nohup $resource_basedir/openqrm/sbin/openqrm-monitord 1>/tmp/openqrm-monitord.out 2>&1 &
-	rm -f /tmp/openqrm-monitord.out
-
-	# allow to overwrite the resource-configuration e.g. for cluster-resources
-	if [ -f /var/openqrm/openqrm-resource.conf.static ]; then
-		cat /var/openqrm/openqrm-resource.conf.static >> /var/openqrm/openqrm-resource.conf
-	fi
-
-	# set the image password - if not in the initrd
-	if [ ! -f /etc/initrd-devices.conf ]; then
-#		if  $WGET -O /tmp/iauth.$image_id $openqrm_web_protocol://$resource_openqrmserver/openqrm/action/image-auth/iauth.$image_id.php 2>/tmp/iauth.log; then
-		if  $WGET -O /tmp/iauth.$image_id $openqrm_web_protocol://$resource_openqrmserver/openqrm/action/image-auth/iauth.php?id=$image_id 2>/tmp/iauth.log; then
-			cryptedpassword=`cat /tmp/iauth.$image_id`
-			rm -f /tmp/iauth.$image_id /tmp/iauth.log
-			if [ "$cryptedpassword" != "" ]; then
-				sed -i "s#^root:[^:]*#root:$cryptedpassword#" /etc/shadow
-				sed -i "s#^root:[^:]*#root:$cryptedpassword#" /etc/shadow-
-			fi
-		fi
-
-		# upate package manager, the boot-services may want to install additional os-deps, disabled for now
-		# openqrm_update_package_manager
-		# start boot-services from enabled plugins
-		for boot_service in $openqrm_boot_services; do
-			openqrm_boot_service $boot_service start
-		done
-	fi
-
-	openqrm_post_event $resource_id "openqrm-client" 5 openqrm_client_start "Resource $resource_id fully started"
-	touch ${LOCKFILE}
-
-}
-
-
-function openqrm_client_stop() {
-	echo "Stopping openQRM-client"
-
-	if [ ! -f /linuxrc ]; then
-		# stop boot-services from enabled plugins
-		for boot_service in $openqrm_boot_services; do
-			openqrm_boot_service $boot_service stop
-		done
-	fi
-	# stop openqrm-execd
-	case "$openqrm_execution_layer" in
-		dropbear)
-			killall dropbear 1>/dev/null 2>&1
-			for OPENQRM_PID in `ps ax 2>/dev/null | grep dropbear | grep -v grep | awk {' print $1 '}`; do
-				kill $OPENQRM_PID
-			done
-			;;
-		rabbitmq)
-			kill `ps ax | grep openqrm-rabbitmq-cmd-queue | grep -v grep | awk {' print $1 '}` 2>/dev/null || true
-			;;
-		*)
-			echo "ERROR: Un-supported command execution layer $openqrm_execution_layer ! Exiting."
-			return 1
-			;;
-	esac
-	killall openqrm-monitord 1>/dev/null 2>&1
-	# in case we do not have killall (e.g. on debian-minimal install) be sure to stop the openqrm-agents anyway
-	for OPENQRM_PID in `ps ax 2>/dev/null | grep openqrm-monitord | grep -v grep | awk {' print $1 '}`; do
-		kill $OPENQRM_PID
-	done
-
-	# remove firewall rule for exec port
-	if [ -f /etc/redhat-release ]; then
-		# iptables ?
-		if which iptables 1>/dev/null; then
-			if iptables -L | grep REJECT 1>/dev/null; then
-				iptables -D INPUT -m state --state NEW -m tcp -p tcp --dport $resource_execdport -j ACCEPT 2>/dev/null
-			fi
-		fi
-	fi
-	/bin/rm -f ${LOCKFILE}
-}
-
-function openqrm_client_status() {
-	if [ -f ${LOCKFILE} ]; then
-		echo "openQRM-client service is running"
-	else
-		echo "openQRM-client service is not running"
-	fi
-}
-
-
-
-case "$1" in
-	start)
-		openqrm_client_start
-		;;
-	stop)
-		openqrm_client_stop
-		;;
-	status)
-		openqrm_client_status
-		;;
-	restart)
-		openqrm_client_stop
-		openqrm_client_start
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|status|restart}"
-		exit 1
-		;;
-esac
-
diff --git a/openQRM-5.3.50-CE/src/etc/init.d/openqrm-server.postinstall b/openQRM-5.3.50-CE/src/etc/init.d/openqrm-server.postinstall
deleted file mode 100644
index 90002f3..0000000
--- a/openQRM-5.3.50-CE/src/etc/init.d/openqrm-server.postinstall
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-# this is the postinstall script for the packaging stage
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# is this an update ?
-if [ -f "/usr/share/openqrm_pre_update/etc/openqrm-server.conf" ]; then
-	if [ -x "/etc/init.d/openqrm" ]; then
-		/etc/init.d/openqrm stop || echo
-	fi
-	if [ -x "/usr/share/openqrm/bin/openqrm-update" ]; then
-		/usr/share/openqrm/bin/openqrm-update base -f
-		/usr/share/openqrm/bin/openqrm-update post -f
-		/usr/share/openqrm/bin/openqrm-update initrds -f
-	fi
-	# save state
-	touch /usr/share/openqrm/package-update.state
-fi
-# add openqrm init
-chmod +x /usr/share/openqrm/etc/init.d/openqrm
-ln -sf /usr/share/openqrm/etc/init.d/openqrm /etc/init.d/openqrm
-/etc/init.d/openqrm start
-
-
diff --git a/openQRM-5.3.50-CE/src/etc/init.d/openqrm-server.preinstall b/openQRM-5.3.50-CE/src/etc/init.d/openqrm-server.preinstall
deleted file mode 100644
index e8e2577..0000000
--- a/openQRM-5.3.50-CE/src/etc/init.d/openqrm-server.preinstall
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-# this is the preinstall script for the packaging stage
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-if [ -f "/usr/share/openqrm/etc/openqrm-server.conf" ]; then
-	# this is an update
-	if [ -x "/usr/share/openqrm/bin/openqrm-update" ]; then
-		/usr/share/openqrm/bin/openqrm-update pre -f
-	fi
-fi
-
-
diff --git a/openQRM-5.3.50-CE/src/etc/init.d/openqrm-server.preremove b/openQRM-5.3.50-CE/src/etc/init.d/openqrm-server.preremove
deleted file mode 100644
index 8fba6ca..0000000
--- a/openQRM-5.3.50-CE/src/etc/init.d/openqrm-server.preremove
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-# this is the pre-remove script for the packaging stage
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-if [ -x "/etc/init.d/openqrm" ]; then
-	/etc/init.d/openqrm stop || echo
-fi
-
diff --git a/openQRM-5.3.50-CE/src/etc/openqrm-server.conf b/openQRM-5.3.50-CE/src/etc/openqrm-server.conf
deleted file mode 100644
index 71ab40e..0000000
--- a/openQRM-5.3.50-CE/src/etc/openqrm-server.conf
+++ /dev/null
@@ -1,149 +0,0 @@
-# this is the main openQRM-server config file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-############## start of user setup     ##############
-
-# OPENQRM_SERVER_BASE_DIR sets the installation for the openQRM-server. 
-# Please adjust to your needs before running "make install"
-# (default is "/usr/share")
-OPENQRM_SERVER_BASE_DIR=/usr/share
-
-# OPENQRM_SERVER_INTERFACE configures on which network interface
-# the openQRM-server should run on
-# Please adjust to your needs before running "make install"
-# (default is "eth0")
-OPENQRM_SERVER_INTERFACE=ens18
-
-############## start of database setup ##############
-# default LAMP setup
-OPENQRM_DATABASE_TYPE=mysql
-OPENQRM_DATABASE_SERVER=localhost
-OPENQRM_DATABASE_NAME=openqrm
-OPENQRM_DATABASE_USER=openqrm
-OPENQRM_DATABASE_PASSWORD=openqrm
-
-# please find configuration templates for 
-# the different supported database types below :
-
-# configuration for using a db2 database
-#OPENQRM_DATABASE_TYPE="db2"
-#OPENQRM_DATABASE_SERVER="localhost"
-#OPENQRM_DATABASE_NAME="openqrm"
-#OPENQRM_DATABASE_USER="db2inst1"
-#OPENQRM_DATABASE_PASSWORD="db2"
-
-# configuration for using a oracle database
-#OPENQRM_DATABASE_TYPE="oracle"
-#OPENQRM_DATABASE_SERVER="localhost"
-#OPENQRM_DATABASE_NAME="orcl"
-#OPENQRM_DATABASE_USER="scott"
-#OPENQRM_DATABASE_PASSWORD="tiger"
-#OPENQRM_LD_LIBRARY_PATH="/u01/app/oracle/product/11.1.0/db_1/lib"
-#OPENQRM_ORACLE_HOME="/u01/app/oracle/product/11.1.0/db_1"
-#OPENQRM_TNS_ADMIN="/u01/app/oracle/product/11.1.0/db_1"
-
-# configuration for using a postgres database
-#OPENQRM_DATABASE_TYPE="postgres"
-#OPENQRM_DATABASE_SERVER="localhost"
-#OPENQRM_DATABASE_NAME="openqrm"
-#OPENQRM_DATABASE_USER="postgres"
-#OPENQRM_DATABASE_PASSWORD=""
-
-############## end of database setup ##############
-
-############## end of user setup     ##############
-
-###################################################
-# do not change anything below except you are knowing what you are doing ;)
-OPENQRM_SERVER_VERSION="5.3"
-OPENQRM_MINOR_RELEASE_VERSION="50"
-
-# OPENQRM_EXEC_PORT defines the network port for running administrative
-# commands on the openQRM-server and its managed resources
-OPENQRM_EXEC_PORT=1667
-
-# OPENQRM_RESOURCE_BASE_DIR defines the basedir to use for
-# openQRM related stuff on the managed resources
-# by default it is set to the same as openQRM-server base-directory (/usr/share)
-OPENQRM_RESOURCE_BASE_DIR=/usr/share
-
-# these are the main openQRM-server dependencies
-# which configure the package-dependencies for the
-# different supported linux distributions
-
-# OPENQRM_SERVER_DEPENDENCIES defines the package dependencies of
-# the main openQRM-server
-
-# OPENQRM_WEBSERVER_DOCUMENT_ROOT defines the web-servers document-root
-# The openQRM-server web-application will be sym-linked to this
-# directory during installation
-# for debian/ubuntu based systems the default doc root is at /var/www
-# for redhat-based systems docroot is at /var/www/html
-# for suse-based systems docroot is at /srv/www/htdocs/
-
-if [ -f /etc/debian_version ]; then
-	OPENQRM_SERVER_DEPENDENCIES="apache2, php, php-mysql, php-xml, libphp-adodb, mariadb-client, mariadb-server, pxelinux, screen, procmail, openssl, dropbear, libapache2-mod-php, net-tools"
-	OPENQRM_SERVER_BUILD_REQUIREMENTS="make, wget, tar, bzip2, unzip"
-	OPENQRM_WEBSERVER_DOCUMENT_ROOT=/var/www
-	OPENQRM_WEBSERVER_CONFIG=/etc/apache2/sites-available/default
-elif [ -f /etc/redhat-release ]; then
-	if [ -f /etc/centos-release ]; then
-		OPENQRM_SERVER_DEPENDENCIES="httpd, php, php-mysql, php-soap, mod_ssl, mariadb, mariadb-server, syslinux, screen, procmail, openssl, dropbear, crontabs, cronie"
-	else
-		OPENQRM_SERVER_DEPENDENCIES="httpd, php, php-mysql, php-soap, mod_ssl, mariadb, mariadb-server, syslinux, screen, procmail, openssl, dropbear, crontabs, cronie"
-	fi
-	OPENQRM_SERVER_BUILD_REQUIREMENTS="make, wget, tar, bzip2, unzip"
-	OPENQRM_WEBSERVER_DOCUMENT_ROOT=/var/www/html
-	OPENQRM_WEBSERVER_CONFIG=/etc/httpd/conf/httpd.conf
-elif [ -f /etc/SuSE-release ]; then
-	#add maridb repo
-	rpm --import https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
-	zypper addrepo --gpgcheck --refresh https://yum.mariadb.org/10.5/opensuse/15/x86_64 mariadb
-	
-	OPENQRM_SERVER_DEPENDENCIES="apache2, apache2-mod_php7, php7, php7-mysql, MariaDB-server MariaDB-client, syslinux, screen, procmail, openssl, dropbear"
-	OPENQRM_SERVER_BUILD_REQUIREMENTS="make, wget, tar, bzip2, unzip"
-	OPENQRM_WEBSERVER_DOCUMENT_ROOT=/srv/www/htdocs
-	OPENQRM_WEBSERVER_CONFIG=/etc/apache2/httpd.conf
-fi
-
-# which web protocol to use for the openQRM apache webserver
-# supported are http and https, default is http
-OPENQRM_WEB_PROTOCOL="https"
-
-# OPENQRM_EXECUTION_LAYER defines the subsystem used for executing commands 
-# on the openQRM server and on the managed servers
-# Supported values are :
-# - dropbear		(ssl authentication based on key-pair, default)
-# - rabbitmq		(Message queuing via a RabbitMQ server, enterprise)
-OPENQRM_EXECUTION_LAYER="dropbear"
-
-# OPENQRM_TEMP_DIR defines the tmp location for openQRM-server
-OPENQRM_TEMP_DIR=/tmp
-
-# OPENQRM_PACKAGE_TMP_DIR defines the location for package creation (deb + rpm)
-OPENQRM_PACKAGE_TMP_DIR=/tmp
-
-# OPENQRM_BUILD_TMP_DIR defines the location for compiling third-party components
-OPENQRM_BUILD_TMP_DIR=${OPENQRM_SOURCE_DIR}/../buildtmp
-
-# OPENQRM_DEFAULT_CMD_TIMEOUT defines how long commands are allowed to run
-OPENQRM_DEFAULT_CMD_TIMEOUT=120
-
-# OPENQRM_CMD_QUEUE_RETRY defines if commands should be re-run if failed
-OPENQRM_CMD_QUEUE_RETRY=false
-
-# OPENQRM_RABBITMQ_PASSWORD defines the password to connect to RabbitMQ 
-# requires that OPENQRM_EXECUTION_LAYER is to "rabbitmq"
-OPENQRM_RABBITMQ_PASSWORD=""
diff --git a/openQRM-5.3.50-CE/src/etc/systemd/system/openqrm-client.service b/openQRM-5.3.50-CE/src/etc/systemd/system/openqrm-client.service
deleted file mode 100644
index 5cf1ce0..0000000
--- a/openQRM-5.3.50-CE/src/etc/systemd/system/openqrm-client.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=openQRM is the next generation Linux Data Center management
-After=network-online.target
-Wants=network-online.target
-#After=network.target
-# chrony.service
-#Requires=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/share/openqrm/etc/init.d/openqrm-client start
-ExecStop=/usr/share/openqrm/etc/init.d/openqrm-client stop
-TimeoutSec=120
-#StandardOutput=tty
-
-[Install]
-Alias=openqrm-client.service
-WantedBy=multi-user.target
-##WantedBy=network.target
diff --git a/openQRM-5.3.50-CE/src/etc/templates/openqrm-linuxrc b/openQRM-5.3.50-CE/src/etc/templates/openqrm-linuxrc
deleted file mode 100644
index 474ea2c..0000000
--- a/openQRM-5.3.50-CE/src/etc/templates/openqrm-linuxrc
+++ /dev/null
@@ -1,731 +0,0 @@
-#!/bin/bash
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# linuxrc for the openQRM initrd
-export SHELL=/bin/bash
-PATH=/sbin:/bin:/usr/bin:/usr/sbin
-export PATH
-
-# some defines 
-export IMAGE_FSTAB=/mnt/etc/fstab
-export IMAGE_FSTAB_STATIC=/mnt/etc/fstab-static
-export NETWORK_SERVICES_TO_ADJUST="/etc/init.d/portmap /etc/init.d/netfs /etc/rc.d/init.d/portmap /etc/rc.d/init.d/netfs /etc/init.d/network /etc/rc.d/init.d/network /etc/init.d/networking /etc/rc.d/init.d/networking"
-
-#export NOT_START_SERVICE="dbus avahi-daemon kudzu"
-export NOT_START_SERVICE="avahi-daemon kudzu"
-
-# functions
-function prepare_udev() {
-	mkdir -p /mnt/initrd
-	if [ ! -e /mnt/dev/console ] || [ ! -e /mnt/dev/null ]; then
-		if [ ! -d /mnt/dev ]; then
-			mkdir -p /mnt/dev
-		fi
-		mount -t tmpfs none /mnt/dev/
-		cp -a /dev/* /mnt/dev/
-		mkdir -p /mnt/dev/.udevdb/
-	fi
-	# clean udev rulez
-	rm -f /mnt/etc/udev/rules.d/*
-}
-
-function prepare_var() {
-	VAR_LOOP=0
-	local OLD_IFS=$IFS
-	IFS=$'\n'
-	for var_run_dir in $(ls -al /mnt/var/run | grep ^d); do
-		unset IFS
-		VAR_ARRAY=($var_run_dir)
-		VAR_DIR=${VAR_ARRAY[8]}
-		if [ "$VAR_DIR" != "." ] && [ "$VAR_DIR" != ".." ]; then
-			VAR_USER=${VAR_ARRAY[2]}
-			VAR_GROUP=${VAR_ARRAY[3]}
-			VAR_RUN_DIR[$VAR_LOOP]="$VAR_DIR $VAR_USER $VAR_GROUP"
-			VAR_LOOP=$(( VAR_LOOP + 1 ))
-		fi
-	done
-	mount -n -t tmpfs none /mnt/var/run
-	rm -f /mnt/var/log/wtmp
-	ln -s -f ../run/wtmp /mnt/var/log/wtmp
-	touch /mnt/var/run/wtmp
-	chmod 0664 /mnt/var/run/wtmp
-	for (( d=0;d<$VAR_LOOP;d++)); do
-		VAR_ARRAY=(${VAR_RUN_DIR[$d]})
-		VAR_DIR=${VAR_ARRAY[0]}
-		VAR_USER=${VAR_ARRAY[1]}
-		VAR_GROUP=${VAR_ARRAY[2]}
-		mkdir -p /mnt/var/run/$VAR_DIR
-		chown $VAR_USER:$VAR_GROUP /mnt/var/run/$VAR_DIR 1>/dev/null
-	done
-	unset IFS
-	return 0
-}
-
-function import_kernel() {
-
-	mkdir -p /tmp_download
-	mount -t tmpfs none /tmp_download
-	mount -t tmpfs none /lib/modules
-	cd /tmp_download
-
-	echo -n "Attempting http(s) get modules"
-	if ! $WGET -q -O modules-$kernel_name.tgz $openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/boot/modules-$kernel_name.tgz; then
-		echo ": skipped"
-		echo "Attempting tftp modules"
-		tftp $OPENQRM_SERVER_IP_ADDRESS -g -r boot/modules-$kernel_name.tgz -l modules-$kernel_name.tgz
-	else
-		echo "...."
-	fi
-
-	tar -C / -xzf /tmp_download/modules-$kernel_name.tgz
-	rm -f modules-$kernel_name.tgz
-	sync
-	mkdir -p /boot
-	mount -t tmpfs none /boot
-	cd /boot
-
-	echo -n "Attempting http(s) get kernel"
-	if ! $WGET -q -O vmlinuz-$kernel_name $openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/boot/vmlinuz-$kernel_name; then
-		echo ": skipped"
-		echo "Attempting tftp get kernel"
-		tftp $OPENQRM_SERVER_IP_ADDRESS -g -r boot/vmlinuz-$kernel_name -l vmlinuz-$kernel_name
-	else
-		echo "...."
-	fi
-	mv vmlinuz-$kernel_name vmlinuz-$kernel_version
-
-	echo -n "Attempting http(s) get System.map"
-	if ! $WGET -q -O System.map-$kernel_name $openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/boot/System.map-$kernel_name; then
-		echo ": skipped"
-		echo "Attempting tftp get System.map"
-		tftp $OPENQRM_SERVER_IP_ADDRESS -g -r boot/System.map-$kernel_name -l System.map-$kernel_name
-	else
-		echo "...."
-	fi
-
-	mv System.map-$kernel_name System.map-$kernel_version
-	cd /
-	mknod /dev/ptmx c 5 2
-	chmod 666 /dev/ptmx
-	# and mount /dev/pts
-	mkdir -p /dev/pts
-	mount /dev/pts
-	depmod -a
-
-	# pcimap ?
-	if [ ! -f /lib/modules/$KERNEL_VERSION/modules.pcimap ]; then
-		depmod -a -m
-		if [ ! -f /lib/modules/$KERNEL_VERSION/modules.pcimap ]; then
-			echo "WARNING: Could not create /lib/modules/$KERNEL_VERSION/modules.pcimap!"
-			echo "WARNING: Automatic hardware-detection may fail!"
-		fi
-	fi
-	# manually load ide disk + cdroms
-	modprobe ide-core 2>/mplog1
-	modprobe ide-generic 2>/mplog1
-	modprobe ide-disk 2>/mplog1
-	modprobe ata_piix 2>/mplog1
-	modprobe sata_nv 2>/mplog1
-	modprobe sd_mod 2>/mplog1
-	rm -f /mplog1
-	echo "- (2) Starting hardware detection (all system components)"
-	for module in `/sbin/pcimodules`; do
-		if [ "$module" == "matroxfb_base" ]; then
-			# skip this, it makes the kvm vm vnc console unreadable
-			continue
-		fi
-		if [ "$module" == "cirrusfb" ]; then
-			# skip this, it crashes the xen vm qemu-dm when accessing the vnc console on debian-lenny
-			continue
-		fi
-		if [ "$module" == "virtio" ] || [ "$module" == "virtio_pci" ] || [ "$module" == "virtio_ring" ] || [ "$module" == "virtio_net" ]; then
-			#skip these modules already loaded
-			echo "Skipping modules; virtio, virtio_pci, virtio_ring, virtio_net"
-			continue
-		fi
-		echo " -- loading $module"
-		modprobe -s "$module"
-	done
-
-	umount /tmp_download
-	rmdir /tmp_download
-
-	# start udev
-	udevd --daemon
-
-	# give time to settle, especially needed for some scsi devices
-	sleep 3
-
-#	#lvm
-#	if [ -x /bin/lvm ]; then
-#		if /bin/lvm lvdisplay | grep -E "LV Path" 1>/dev/null; then
-#			LVM_VOLME_GREP="LV Path"
-#		else
-#			LVM_VOLME_GREP="LV Name"
-#		fi
-#		echo "- Scanning for physical lvm drives "
-#		/bin/lvm pvscan
-#		echo "- Scanning for logical volume groups"
-#		/bin/lvm vgscan
-#		echo "- Activating logical volume groups"
-#		/bin/lvm vgchange -ay
-#		echo "- Scanning for logical volumes"
-#		/bin/lvm lvscan
-#		echo "- Activating logical volumes"
-#		for LVOL in `/bin/lvm lvdisplay | grep -i "$LVM_VOLME_GREP" | awk {' print $3 '}`; do
-#			echo "- Activating $LVOL"
-#			/bin/lvm lvchange -ay -y $LVOL
-#		done
-#	fi
-
-}
-
-
-# this functions adds the common entries to the images fstab
-function create_fstab_commons() {
-
-	local OLD_IFS=$IFS
-	echo "none	 /dev/pts     devpts   gid=5,mode=620     0 0" >> $IMAGE_FSTAB
-	echo "none	 /proc	proc     defaults	   0 0" >> $IMAGE_FSTAB
-	echo "none	 /dev/shm     tmpfs    defaults	   0 0" >> $IMAGE_FSTAB
-	echo "/dev/fd0     /mnt/floppy  auto     noauto,owner,kudzu 0 0" >> $IMAGE_FSTAB
-	IFS=$'\n'
-
-	if [ -d /proc/ide ]; then
-		for IDEDEVICES in $(ls /proc/ide); do
-			if grep cdrom /proc/ide/$IDEDEVICES/media 1>/dev/null 2>&1; then
-				echo "Found cdrom at $IDEDEVICES"
-				mkdir -p /mnt/cdrom$LOOP 1>/dev/null
-				echo "/dev/$IDEDEVICES     /mnt/cdrom$LOOP   udf,iso9660 noauto,owner,kudzu,ro 0 0" >> $IMAGE_FSTAB
-				LOOP=$(( LOOP +1 ))
-			fi
-		done
-	fi
-
-	FOUND_SWAP=0
-#	for SWPSPACE in $(cat /proc/partitions |grep '[0-9]' | awk '{print $4}'); do
-#		if swapon /dev/${SWPSPACE} 1>/dev/null 2>&1; then
-#			swapoff /dev/${SWPSPACE} 1>/dev/null
-#			echo "Adding /dev/${SWPSPACE} as swap space"
-#			echo "/dev/${SWPSPACE} swap	swap	defaults	0 0" >> $IMAGE_FSTAB
-#			FOUND_SWAP=1
-#		fi
-#	done
-#	if [ "$FOUND_SWAP" == "0" ]; then
-#		# we need to create a small swap file
-#		dd if=/dev/zero of=/mnt/tmp/mini-swap.swap bs=1M count=1
-#		mkswap /mnt/tmp/mini-swap.swap
-#		echo "Adding mini-swap file as swap space"
-#		echo "/tmp/mini-swap.swap swap	swap	noauto	0 0" >> $IMAGE_FSTAB
-#	fi
-
-	IFS=$OLD_IFS
-
-	# fetch a custom fstab part from openqrm if exists
-#	if $WGET -q -O /fstab-custom "$openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/atu/custom/fstab/fstab.$appliance_name"; then
-#		cat /fstab-custom >> $IMAGE_FSTAB
-#	elif [ -f $IMAGE_FSTAB_STATIC ]; then
-#		echo "Found $IMAGE_FSTAB_STATIC, adding to $IMAGE_FSTAB"
-#		cat $IMAGE_FSTAB_STATIC >> $IMAGE_FSTAB
-#	fi
-
-	if [ -f /custom/fstab-static ]; then
-		cat /custom/fstab-static >> $IMAGE_FSTAB
-	fi
-
-	if [ -f /custom/fstab.$appliance_name ]; then
-		cat /custom/fstab.$appliance_name >> $IMAGE_FSTAB
-	fi
-
-	if [ -f /custom/modules.$appliance_name ]; then
-		/bin/cp -f /custom/modules.$appliance_name /mnt/etc/modules
-	elif [ -f /custom/modules ]; then
-		/bin/cp -f /custom/modules /mnt/etc/modules
-	fi
-
-	if [ -f /custom/interfaces.$appliance_name ]; then
-		/bin/cp -f /custom/interfaces.$appliance_name /mnt/etc/network/interfaces
-	fi
-
-	if [ -f /custom/hosts-static ]; then
-		/bin/cp -f /custom/hosts-static /mnt/etc/hosts
-	fi
-
-	if [ -f /custom/hosts-atu ]; then
-		cat /custom/hosts-atu >> /mnt/etc/hosts
-	fi
-
-	if [ -f /custom/hosts.$appliance_name ]; then
-		cat /custom/hosts.$appliance_name >> /mnt/etc/hosts
-	fi
-
-}
-
-
-function set_root_password() {
-	local id=$1
-
-#	if $WGET -q -O /iauth.$id $openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/image-auth/iauth.$id.php 2>/iauth.log; then
-	if $WGET -q -O /iauth.$id "$openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/image-auth/iauth.php?id=$id" 2>/iauth.log; then
-		cryptedpassword=`cat /iauth.$id`
-		rm -f /iauth.$id iauth.log
-		if [ "$cryptedpassword" != "" ]; then
-			sed -i "s#^root:[^:]*#root:$cryptedpassword#" /mnt/etc/shadow
-			sed -i "s#^root:[^:]*#root:$cryptedpassword#" /mnt/etc/shadow-
-		fi
-	fi
-}
-
-function prepare_services() {
-
-	if [ ! -e /mnt/bin/systemd ] && [ ! -e /mnt/usr/bin/systemd ] ; then
-		chroot /mnt ln -sf /$resource_basedir/openqrm/etc/init.d/openqrm-client /etc/init.d/openqrm-client
-	fi
-	
-	echo "#!/bin/bash -x" > /mnt/tmp/openqrm-client.enable
-	echo "OPENQRM_SERVER_BASE_DIR=$resource_basedir" >> /mnt/tmp/openqrm-client.enable
-	echo ". /$resource_basedir/openqrm/include/openqrm-functions" >> /mnt/tmp/openqrm-client.enable
-	echo "openqrm_chkconfig add openqrm-client" >> /mnt/tmp/openqrm-client.enable
-	for SERVICE in $NOT_START_SERVICE; do
-		echo "openqrm_chkconfig del $SERVICE" >> /mnt/tmp/openqrm-client.enable
-	done
-	chmod +x /mnt/tmp/openqrm-client.enable
-	chroot /mnt /tmp/openqrm-client.enable 1>/dev/null 2>&1
-	rm -f /mnt/tmp/openqrm-client.enable
-}
-
-
-function prepare_net_init() {
-	INIT_SCRIPTS_TO_PREPARE="$@"
-	for INIT_SCRIPT in $INIT_SCRIPTS_TO_PREPARE; do
-		if [ -f /mnt/$INIT_SCRIPT ]; then
-			if ! grep -A2 "stop)" /mnt/$INIT_SCRIPT | grep -q "openqrm" ; then
-				echo "Preparing init script $INIT_SCRIPT"
-				sed -e "s/^[ \t]*stop)\(.*\)/stop) exit # added by openqrm \n\1/" /mnt/$INIT_SCRIPT > /mnt/${INIT_SCRIPT}.openqrm
-				mv -f /mnt/${INIT_SCRIPT}.openqrm /mnt/$INIT_SCRIPT
-				chmod +x /mnt/$INIT_SCRIPT
-			fi
-		fi
-	done
-}
-
-
-
-
-# main
-mount -t proc proc /proc
-# creating the devices
-echo "Creating the devices ..."
-makedevs -d /etc/initrd-devices.conf /
-mkdir -p /dev/fd
-ln -sf /proc/self/fd /dev/fd
-mknod /dev/tty c 5 0
-ln -sf /dev/ram1 /dev/ram
-mknod /dev/random c 1 8
-mknod /dev/urandom c 1 9
-echo 0x0100 > /proc/sys/kernel/real-root-dev
-echo 6 > /proc/sys/kernel/printk
-syslogd &&  klogd
-
-# need to run depmod 2 times as experienced
-depmod -a
-depmod -a
-
-KERNEL_VERSION=`uname -r`
-if [ ! -f /lib/modules/$KERNEL_VERSION/modules.pcimap ]; then
-	# create the legacy maps
-	echo " - /lib/modules/$KERNEL_VERSION/modules.pcimap missing. Trying to create it"
-	depmod -a -m
-	if [ -f /lib/modules/$KERNEL_VERSION/modules.pcimap ]; then
-		echo " - /lib/modules/$KERNEL_VERSION/modules.pcimap created"
-	else
-		echo "WARNING: Could not create /lib/modules/$KERNEL_VERSION/modules.pcimap!"
-		echo "WARNING: Automatic hardware-detection may fail!"
-	fi
-fi
-
-# load virtio drivers for KVM + Xen VMs
-for module in xen-netfront virtio virtio_pci virtio_ring virtio_net crc32c e1000 e1000e igb forcedeth mdio dma ioatdma ixgbe hid usbhid hid-generic ; do
-    echo " -- loading $module"
-    modprobe "$module" 2>/mplog
-done
-rm -f  /mplog
-if grep -q sysfs /proc/filesystems ; then
-    mount -t sysfs none /sys
-fi
-
-# firmware rules existing ?
-if [ ! -f /etc/udev/rules.d/50-firmware.rules ]; then
-	# debian/ubuntu
-	if [ -x /lib/udev/firmware ]; then
-		echo 'SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware"' > /etc/udev/rules.d/50-firmware.rules
-	fi
-	# centos/rh
-	if [ -x /lib/udev/firmware.sh ]; then
-		echo 'SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"' > /etc/udev/rules.d/50-firmware.rules
-	fi
-fi
-mkdir -p /run/udev
-udevd --daemon
-
-# start acpid early if existing
-if which acpid 1>/dev/null; then
-	echo "Starting acpid daemon"
-	acpid
-fi
-sleep 4
-
-#jump into bash for debugging - no longer needed
-#/bin/bash
-
-if [ -f /lib/modules/$KERNEL_VERSION/modules.pcimap ]; then
-	echo "- (1) Starting hardware detection (network)"
-	for module in `/sbin/pcimodules`; do
-		echo " -- loading $module"
-		modprobe -s "$module"
-	done
-else
-	echo "- (1) Starting hardware detection (network)"
-	echo "NOTICE: No modules.pcimap available. Probing all network devices"
-	for module in `find /lib/modules/$KERNEL_VERSION/* -name "*.ko"`; do
-		module=`basename $module | cut -d'.' -f1`
-		echo " -- loading $module"
-		modprobe -s "$module"
-	done
-fi
-
-# bnx2x support, bring up the faster nics first as eth0/1
-if lsmod | grep ^bnx2x 1>/dev/null; then
-	rmmod tg3
-	rmmod bnx2x
-	udevd --daemon
-	modprobe bnx2x
-	ifconfig eth0 up
-	ifconfig eth1 up
-	modprobe tg3
-fi
-
-eval `cat /proc/cmdline`
-sleep 3
-killall udevd 2>/mplog
-rm -f  /mplog
-sleep 3
-
-# collecting some infos from /proc/cmdline
-OPENQRM_RESOURCE_MAC_ADDRESS=`echo $BOOTIF | sed -e "s/-/:/g"  | sed -e "s/^01://g" | tr '[:lower:]' '[:upper:]'`
-
-OPENQRM_RESOURCE_MANAGED_INTERFACE=`ifconfig -a | grep $OPENQRM_RESOURCE_MAC_ADDRESS | awk {' print $1 '} | head -n 1`
-#OPENQRM_RESOURCE_MANAGED_INTERFACE=`ifconfig -a | grep $OPENQRM_RESOURCE_MAC_ADDRESS -B3 | awk {' print substr($1, 1, length($1)-1) '} | head -n 1`
-
-OPENQRM_RESOURCE_IP_ADDRESS=`echo $ip | cut -d':' -f1`
-OPENQRM_SERVER_IP_ADDRESS=`echo $ip | cut -d':' -f2`
-OPENQRM_RESOURCE_DEFAULT_GATEWAY=`echo $ip | cut -d':' -f3`
-OPENQRM_RESOURCE_SUBNETMASK=`echo $ip | cut -d':' -f4`
-OPENQRM_RESOURCE_BROADCAST=`ipcalc -b $OPENQRM_RESOURCE_IP_ADDRESS $OPENQRM_RESOURCE_SUBNETMASK | cut -d'=' -f2`
-
-OPENQRM_RESOURCE_PARAMETER_FILE="/var/openqrm/openqrm-resource.conf"
-mkdir -p `dirname $OPENQRM_RESOURCE_PARAMETER_FILE`
-
-# adjust arp settings
-if [ -f /proc/sys/net/ipv4/conf/$OPENQRM_RESOURCE_MANAGED_INTERFACE/arp_filter ]; then
-	echo 1 > /proc/sys/net/ipv4/conf/$OPENQRM_RESOURCE_MANAGED_INTERFACE/arp_filter
-fi
-if [ -f /proc/sys/net/ipv4/conf/$OPENQRM_RESOURCE_MANAGED_INTERFACE/rp_filter ]; then
-	echo 1 > /proc/sys/net/ipv4/conf/$OPENQRM_RESOURCE_MANAGED_INTERFACE/rp_filter
-fi
-
-# get the net working
-echo "Bringing up $OPENQRM_RESOURCE_MANAGED_INTERFACE:oq"
-echo "-> mac-address		: $OPENQRM_RESOURCE_MAC_ADDRESS"
-echo "-> ip-address		: $OPENQRM_RESOURCE_IP_ADDRESS"
-echo "-> subnetmask		: $OPENQRM_RESOURCE_SUBNETMASK"
-echo "-> broadcast		: $OPENQRM_RESOURCE_BROADCAST"
-echo "-> default gw		: $OPENQRM_RESOURCE_DEFAULT_GATEWAY"
-echo "-> openQRM-server	: $OPENQRM_SERVER_IP_ADDRESS"
-
-#/bin/bash
-
-#echo "loopback up"
-ifconfig lo 127.0.0.1 up
-
-##
-#echo "Interface: $OPENQRM_RESOURCE_MANAGED_INTERFACE down"
-ifconfig $OPENQRM_RESOURCE_MANAGED_INTERFACE down
-#
-#echo "Interface: $OPENQRM_RESOURCE_MANAGED_INTERFACE up"
-ifconfig $OPENQRM_RESOURCE_MANAGED_INTERFACE 0.0.0.0 up
-#
-#echo "Interface: $OPENQRM_RESOURCE_MANAGED_INTERFACE:oq $OPENQRM_RESOURCE_IP_ADDRESS up"
-ifconfig $OPENQRM_RESOURCE_MANAGED_INTERFACE:oq $OPENQRM_RESOURCE_IP_ADDRESS netmask $OPENQRM_RESOURCE_SUBNETMASK broadcast $OPENQRM_RESOURCE_BROADCAST up
-if [ "$OPENQRM_RESOURCE_DEFAULT_GATEWAY" != "0.0.0.0" ]; then
-	route add default gw $OPENQRM_RESOURCE_DEFAULT_GATEWAY
-fi
-##
-# force a small delay for the networkcard to initialize
-ping -c 5 -q $OPENQRM_SERVER_IP_ADDRESS > /dev/null
-
-# get resource parameter
-echo "Getting resource-parameters ..."
-if [ "$id" == "-1" ]; then
-	echo "New resource detected ! Adding to the openQRM-server at $OPENQRM_SERVER_IP_ADDRESS"
-fi	
-
-# sending resource-id will add the resource if not existing (-1 = new resource)
-# loop get-parameters in case the network card is still not ready initialized
-NETWORKCARD_LOOP=0
-
-while (true); do
-	# try https first
-	if wget --no-check-certificate --random-file=/dev/random -q -O $OPENQRM_RESOURCE_PARAMETER_FILE "https://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_id=$id&resource_mac=$OPENQRM_RESOURCE_MAC_ADDRESS&resource_ip=$OPENQRM_RESOURCE_IP_ADDRESS&resource_subnet=$OPENQRM_RESOURCE_SUBNETMASK"; then
-		if ! grep "<html>" $OPENQRM_RESOURCE_PARAMETER_FILE >/out; then
-			echo "-> got parameters via https"
-			break
-		fi
-		rm -f /out
-	fi
-	# try http
-	if wget -q -O $OPENQRM_RESOURCE_PARAMETER_FILE "http://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_id=$id&resource_mac=$OPENQRM_RESOURCE_MAC_ADDRESS&resource_ip=$OPENQRM_RESOURCE_IP_ADDRESS&resource_subnet=$OPENQRM_RESOURCE_SUBNETMASK"; then
-		if ! grep "<html>" $OPENQRM_RESOURCE_PARAMETER_FILE >/out; then
-			echo "-> got parameter via http"
-			break
-		fi
-		rm -f /out
-	fi
-	# no chance ?
-	if [ "$NETWORKCARD_LOOP" == "10" ]; then
-		echo "ERROR: Could not reach the openQRM-Server at $OPENQRM_SERVER_IP_ADDRESS!"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	NETWORKCARD_LOOP=$(( NETWORKCARD_LOOP + 1 ))
-	sleep 5
-done
-# source parameters
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-
-# define wget
-if [ "$openqrm_web_protocol" == "https" ]; then
-	export WGET="wget --no-check-certificate --random-file=/dev/random"
-else
-	export WGET="wget"
-fi
-
-# get kernel + modules by tftp
-echo "Importing kernel files"
-import_kernel
-# load usb modules
-for module in usbcore hid usbhid; do
-    echo " -- loading $module"
-    modprobe "$module" 2>/mplog
-done
-rm -f  /mplog
-
-# run default openqrm-client boot-service
-KERNEL_ARCH=`uname -m`
-if echo $KERNEL_ARCH | grep i.*86 1>/dev/null; then
-	# i386
-	OPENQRM_CLIENT_ARCH=i386
-else
-	OPENQRM_CLIENT_ARCH=x86_64
-fi
-
-cd /
-if ! $WGET -q -O openqrm-client.tgz "$openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/openqrm-client.tgz"; then
-	rm -f openqrm-client.tgz
-	echo "WARNING: Failed to get the openqrm-client package! Starting an emergency shell"
-	/bin/bash
-fi
-tar -xzf openqrm-client.tgz
-rm -f openqrm-client.tgz
-
-$resource_basedir/openqrm/etc/init.d/openqrm-client start
-
-#/bin/bash
-
-if [ "$image_type" == "ram" ] || [ "$image_type" == "" ]; then
-
-	# send idle/available
-	echo "Sending idle/available to openQRM-server at $OPENQRM_SERVER_IP_ADDRESS"
-	$WGET -q -O /dev/null "$openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-monitor.php?resource_command=update_status&resource_id=$resource_id&resource_state=active&resource_event=available"
-	hostname idle$resource_id
-	# rcs0 will be started here from init
-	# for initramfs initrds we start a shell here
-	if [ -x /init ]; then
-		echo "Detected initrd as initramfs, starting a shell"
-		exec setsid /bin/bash -c 'exec /bin/bash </dev/tty1 >/dev/tty1 2>&1'
-	fi
-
-else
-
-#	/bin/bash
-
-	# if any deployment plugin is enabled, handle over the control
-	# -> deployment plugins will take care to mount the root fs
-	#    and do the pivot_root if needed
-
-	# pre-root-mount-hook to setup everything which needs to be done before the root-mount
-	cd /
-	for boot_service in $openqrm_boot_services; do
-		if $WGET -q -O /pre-root-mount-hook.$boot_service "$openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/pre-root-mount-hook.$boot_service"; then
-			echo " - Running for pre-root-mount-hook of boot-service $boot_service"
-			chmod +x pre-root-mount-hook.$boot_service
-			. ./pre-root-mount-hook.$boot_service
-			pre_mount_rootfs
-		else
-			rm -f /pre-root-mount-hook.$boot_service
-		fi
-	done
-	
-#	/bin/bash
-
-	# root-mount-hook
-	eval $image_deployment_parameter
-	cd /
-	$WGET -q "$openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/root-mount.$image_type"
-	chmod +x root-mount.$image_type
-	
-#	/bin/bash
-	
-	# source the deployment plugin command, it will provide
-	# the functions to mount/remount the rootfs at /mnt according
-	# to the deployment-type and the image_deployment_parameters
-	. ./root-mount.$image_type
-
-	# mount ro (provided by the deployment plugin)
-	###############################################################
-	# DEPLOYMENT PLUGIN HOOK ######################################
-	###############################################################
-	mount_rootfs
-
-#	/bin/bash
-
-	# here we have the rootfs mounted rw so we get the openQRM client according
-	# distro and arch
-	# find out the short distri name
-	if [ -f /mnt/etc/debian_version ]; then
-		# debian or ubuntu, try to find out without lsb-release which may not be installed
-		if grep -i ubuntu /mnt/etc/apt/sources.list 1>/dev/null; then
-			OPENQRM_SHORT_DISTRI_NAME="ubuntu"
-		else
-			OPENQRM_SHORT_DISTRI_NAME="debian"
-		fi
-	elif [ -f /mnt/etc/redhat-release ]; then
-		OPENQRM_SHORT_DISTRI_NAME="centos"
-	elif [ -f /mnt/etc/SuSE-release ]; then
-		OPENQRM_SHORT_DISTRI_NAME="suse"
-	else
-		OPENQRM_SHORT_DISTRI_NAME="custom"
-	fi
-	
-#	/bin/bash
-	
-	# get the openQRM client package fitting to distri + arch
-	rm -rf /mnt/$resource_basedir/openqrm
-	cd /
-	echo "Getting openqrm-client package(2)................"
-	if ! $WGET -q -O /mnt/openqrm-client.tgz "$openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/openqrm-client.tgz"; then
-		rm -f /mnt/openqrm-client.tgz
-		echo "WARNING: Failed to get the openqrm-client package!"
-		# copy openQRM client which is on the initrd
-		mkdir /mnt/$resource_basedir/openqrm/
-		cp -a /$resource_basedir/openqrm/* /mnt/$resource_basedir/openqrm/
-	else
-		# use the openQRM client which fits to the distri and arch
-		cd /mnt/
-		tar -xzf openqrm-client.tgz
-		rm -f openqrm-client.tgz
-		cd /
-	fi
-
-
-	# fill /boot and /lib/modules on the fs-image
-	echo "Filling /boot and /lib/modules"
-	
-	#create modules dir incase it does not exist, stops errors
-	if [ ! -d /mnt/lib/modules/$kernel_version ]; then
-		mkdir -p /mnt/lib/modules/$kernel_version
-	fi
-	
-	rm -rf /mnt/boot/vmlinuz-$kernel_version /mnt/boot/System.map-$kernel_version /mnt/lib/modules/$kernel_version
-	cp -af /boot/vmlinuz-$kernel_version /mnt/boot/vmlinuz-$kernel_version
-	cp -af /boot/System.map-$kernel_version /mnt/boot/System.map-$kernel_version
-	cp -af /lib/modules/$kernel_version /mnt/lib/modules/
-
-
-
-	# create custom fstab / needed for the remount rw during the system init
-	# (custom entry provided by the deployment plugin)
-	###############################################################
-	# DEPLOYMENT PLUGIN HOOK ######################################
-	###############################################################
-	create_fstab
-
-	# (common entries provided by a local function)
-	create_fstab_commons
-
-#	/bin/bash
-
-	# transfer resource basedir
-	echo "Preparing resource openQRM client"
-
-	# copy resource parameter
-	mkdir -p /mnt/`dirname $OPENQRM_RESOURCE_PARAMETER_FILE`
-	cp -af $OPENQRM_RESOURCE_PARAMETER_FILE /mnt/$OPENQRM_RESOURCE_PARAMETER_FILE
-
-	# prepare init according plugin services
-	echo "Preparing system init"
-	prepare_udev
-	prepare_var
-	prepare_services
-	prepare_net_init $NETWORK_SERVICES_TO_ADJUST
-
-	# managed shared image
-	if [ "$image_isshared" != "" ]; then
-		echo "Prepare image as shared"
-	fi
-	
-	# set root password
-	set_root_password $image_id
-
-	# remount rw (provided by the deployment plugin)
-	###############################################################
-	# DEPLOYMENT PLUGIN HOOK ######################################
-	###############################################################
-	remount_rootfs
-
-	# chroot + init
-	killall syslogd klogd 1>/dev/null 2>&1
-	killall udevd 1>/dev/null 2>&1
-	killall acpid 1>/dev/null 2>&1
-	killall dropbear 1>/dev/null 2>&1
-
-	sleep 2
-	if grep sysfs /proc/filesystems 1>/dev/null ; then
-		umount /sys
-	fi
-	umount /proc
-	umount /boot
-	umount /lib/modules
-
-	exec switch_root /mnt /sbin/init
-	# here the system will do a normal init
-	# from the mounted rootfs image
-	
-fi
-
-
-#modprobe hid-generic
-
diff --git a/openQRM-5.3.50-CE/src/etc/templates/openqrm-linuxrc~ b/openQRM-5.3.50-CE/src/etc/templates/openqrm-linuxrc~
deleted file mode 100644
index 5fed43b..0000000
--- a/openQRM-5.3.50-CE/src/etc/templates/openqrm-linuxrc~
+++ /dev/null
@@ -1,732 +0,0 @@
-#!/bin/bash
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# linuxrc for the openQRM initrd
-export SHELL=/bin/bash
-PATH=/sbin:/bin:/usr/bin:/usr/sbin
-export PATH
-
-# some defines 
-export IMAGE_FSTAB=/mnt/etc/fstab
-export IMAGE_FSTAB_STATIC=/mnt/etc/fstab-static
-export NETWORK_SERVICES_TO_ADJUST="/etc/init.d/portmap /etc/init.d/netfs /etc/rc.d/init.d/portmap /etc/rc.d/init.d/netfs /etc/init.d/network /etc/rc.d/init.d/network /etc/init.d/networking /etc/rc.d/init.d/networking"
-
-#export NOT_START_SERVICE="dbus avahi-daemon kudzu"
-export NOT_START_SERVICE="avahi-daemon kudzu"
-
-# functions
-function prepare_udev() {
-	mkdir -p /mnt/initrd
-	if [ ! -e /mnt/dev/console ] || [ ! -e /mnt/dev/null ]; then
-		if [ ! -d /mnt/dev ]; then
-			mkdir -p /mnt/dev
-		fi
-		mount -t tmpfs none /mnt/dev/
-		cp -a /dev/* /mnt/dev/
-		mkdir -p /mnt/dev/.udevdb/
-	fi
-	# clean udev rulez
-	rm -f /mnt/etc/udev/rules.d/*
-}
-
-function prepare_var() {
-	VAR_LOOP=0
-	local OLD_IFS=$IFS
-	IFS=$'\n'
-	for var_run_dir in $(ls -al /mnt/var/run | grep ^d); do
-		unset IFS
-		VAR_ARRAY=($var_run_dir)
-		VAR_DIR=${VAR_ARRAY[8]}
-		if [ "$VAR_DIR" != "." ] && [ "$VAR_DIR" != ".." ]; then
-			VAR_USER=${VAR_ARRAY[2]}
-			VAR_GROUP=${VAR_ARRAY[3]}
-			VAR_RUN_DIR[$VAR_LOOP]="$VAR_DIR $VAR_USER $VAR_GROUP"
-			VAR_LOOP=$(( VAR_LOOP + 1 ))
-		fi
-	done
-	mount -n -t tmpfs none /mnt/var/run
-	rm -f /mnt/var/log/wtmp
-	ln -s -f ../run/wtmp /mnt/var/log/wtmp
-	touch /mnt/var/run/wtmp
-	chmod 0664 /mnt/var/run/wtmp
-	for (( d=0;d<$VAR_LOOP;d++)); do
-		VAR_ARRAY=(${VAR_RUN_DIR[$d]})
-		VAR_DIR=${VAR_ARRAY[0]}
-		VAR_USER=${VAR_ARRAY[1]}
-		VAR_GROUP=${VAR_ARRAY[2]}
-		mkdir -p /mnt/var/run/$VAR_DIR
-		chown $VAR_USER:$VAR_GROUP /mnt/var/run/$VAR_DIR 1>/dev/null
-	done
-	unset IFS
-	return 0
-}
-
-function import_kernel() {
-
-	mkdir -p /tmp_download
-	mount -t tmpfs none /tmp_download
-	mount -t tmpfs none /lib/modules
-	cd /tmp_download
-
-	echo -n "Attempting http(s) get modules"
-	if ! $WGET -q -O modules-$kernel_name.tgz $openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/boot/modules-$kernel_name.tgz; then
-		echo ": skipped"
-		echo "Attempting tftp modules"
-		tftp $OPENQRM_SERVER_IP_ADDRESS -g -r boot/modules-$kernel_name.tgz -l modules-$kernel_name.tgz
-	else
-		echo "...."
-	fi
-
-	tar -C / -xzf /tmp_download/modules-$kernel_name.tgz
-	rm -f modules-$kernel_name.tgz
-	sync
-	mkdir -p /boot
-	mount -t tmpfs none /boot
-	cd /boot
-
-	echo -n "Attempting http(s) get kernel"
-	if ! $WGET -q -O vmlinuz-$kernel_name $openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/boot/vmlinuz-$kernel_name; then
-		echo ": skipped"
-		echo "Attempting tftp get kernel"
-		tftp $OPENQRM_SERVER_IP_ADDRESS -g -r boot/vmlinuz-$kernel_name -l vmlinuz-$kernel_name
-	else
-		echo "...."
-	fi
-	mv vmlinuz-$kernel_name vmlinuz-$kernel_version
-
-	echo -n "Attempting http(s) get System.map"
-	if ! $WGET -q -O System.map-$kernel_name $openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/boot/System.map-$kernel_name; then
-		echo ": skipped"
-		echo "Attempting tftp get System.map"
-		tftp $OPENQRM_SERVER_IP_ADDRESS -g -r boot/System.map-$kernel_name -l System.map-$kernel_name
-	else
-		echo "...."
-	fi
-
-	mv System.map-$kernel_name System.map-$kernel_version
-	cd /
-	mknod /dev/ptmx c 5 2
-	chmod 666 /dev/ptmx
-	# and mount /dev/pts
-	mkdir -p /dev/pts
-	mount /dev/pts
-	depmod -a
-
-	# pcimap ?
-	if [ ! -f /lib/modules/$KERNEL_VERSION/modules.pcimap ]; then
-		depmod -a -m
-		if [ ! -f /lib/modules/$KERNEL_VERSION/modules.pcimap ]; then
-			echo "WARNING: Could not create /lib/modules/$KERNEL_VERSION/modules.pcimap!"
-			echo "WARNING: Automatic hardware-detection may fail!"
-		fi
-	fi
-	# manually load ide disk + cdroms
-	modprobe ide-core 2>/mplog1
-	modprobe ide-generic 2>/mplog1
-	modprobe ide-disk 2>/mplog1
-	modprobe ata_piix 2>/mplog1
-	modprobe sata_nv 2>/mplog1
-	modprobe sd_mod 2>/mplog1
-	rm -f /mplog1
-	echo "- (2) Starting hardware detection (all system components)"
-	for module in `/sbin/pcimodules`; do
-		if [ "$module" == "matroxfb_base" ]; then
-			# skip this, it makes the kvm vm vnc console unreadable
-			continue
-		fi
-		if [ "$module" == "cirrusfb" ]; then
-			# skip this, it crashes the xen vm qemu-dm when accessing the vnc console on debian-lenny
-			continue
-		fi
-		if [ "$module" == "virtio" ] || [ "$module" == "virtio_pci" ] || [ "$module" == "virtio_ring" ] || [ "$module" == "virtio_net" ]; then
-			#skip these modules already loaded
-			echo "Skipping modules; virtio, virtio_pci, virtio_ring, virtio_net"
-			continue
-		fi
-		echo " -- loading $module"
-		modprobe -s "$module"
-	done
-
-	umount /tmp_download
-	rmdir /tmp_download
-
-	# start udev
-	udevd --daemon
-
-	# give time to settle, especially needed for some scsi devices
-	sleep 3
-
-#	#lvm
-#	if [ -x /bin/lvm ]; then
-#		if /bin/lvm lvdisplay | grep -E "LV Path" 1>/dev/null; then
-#			LVM_VOLME_GREP="LV Path"
-#		else
-#			LVM_VOLME_GREP="LV Name"
-#		fi
-#		echo "- Scanning for physical lvm drives "
-#		/bin/lvm pvscan
-#		echo "- Scanning for logical volume groups"
-#		/bin/lvm vgscan
-#		echo "- Activating logical volume groups"
-#		/bin/lvm vgchange -ay
-#		echo "- Scanning for logical volumes"
-#		/bin/lvm lvscan
-#		echo "- Activating logical volumes"
-#		for LVOL in `/bin/lvm lvdisplay | grep -i "$LVM_VOLME_GREP" | awk {' print $3 '}`; do
-#			echo "- Activating $LVOL"
-#			/bin/lvm lvchange -ay -y $LVOL
-#		done
-#	fi
-
-}
-
-
-# this functions adds the common entries to the images fstab
-function create_fstab_commons() {
-
-	local OLD_IFS=$IFS
-	echo "none	 /dev/pts     devpts   gid=5,mode=620     0 0" >> $IMAGE_FSTAB
-	echo "none	 /proc	proc     defaults	   0 0" >> $IMAGE_FSTAB
-	echo "none	 /dev/shm     tmpfs    defaults	   0 0" >> $IMAGE_FSTAB
-	echo "/dev/fd0     /mnt/floppy  auto     noauto,owner,kudzu 0 0" >> $IMAGE_FSTAB
-	IFS=$'\n'
-
-	if [ -d /proc/ide ]; then
-		for IDEDEVICES in $(ls /proc/ide); do
-			if grep cdrom /proc/ide/$IDEDEVICES/media 1>/dev/null 2>&1; then
-				echo "Found cdrom at $IDEDEVICES"
-				mkdir -p /mnt/cdrom$LOOP 1>/dev/null
-				echo "/dev/$IDEDEVICES     /mnt/cdrom$LOOP   udf,iso9660 noauto,owner,kudzu,ro 0 0" >> $IMAGE_FSTAB
-				LOOP=$(( LOOP +1 ))
-			fi
-		done
-	fi
-
-	FOUND_SWAP=0
-#	for SWPSPACE in $(cat /proc/partitions |grep '[0-9]' | awk '{print $4}'); do
-#		if swapon /dev/${SWPSPACE} 1>/dev/null 2>&1; then
-#			swapoff /dev/${SWPSPACE} 1>/dev/null
-#			echo "Adding /dev/${SWPSPACE} as swap space"
-#			echo "/dev/${SWPSPACE} swap	swap	defaults	0 0" >> $IMAGE_FSTAB
-#			FOUND_SWAP=1
-#		fi
-#	done
-#	if [ "$FOUND_SWAP" == "0" ]; then
-#		# we need to create a small swap file
-#		dd if=/dev/zero of=/mnt/tmp/mini-swap.swap bs=1M count=1
-#		mkswap /mnt/tmp/mini-swap.swap
-#		echo "Adding mini-swap file as swap space"
-#		echo "/tmp/mini-swap.swap swap	swap	noauto	0 0" >> $IMAGE_FSTAB
-#	fi
-
-	IFS=$OLD_IFS
-
-	# fetch a custom fstab part from openqrm if exists
-#	if $WGET -q -O /fstab-custom "$openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/atu/custom/fstab/fstab.$appliance_name"; then
-#		cat /fstab-custom >> $IMAGE_FSTAB
-#	elif [ -f $IMAGE_FSTAB_STATIC ]; then
-#		echo "Found $IMAGE_FSTAB_STATIC, adding to $IMAGE_FSTAB"
-#		cat $IMAGE_FSTAB_STATIC >> $IMAGE_FSTAB
-#	fi
-
-	if [ -f /custom/fstab-static ]; then
-		cat /custom/fstab-static >> $IMAGE_FSTAB
-	fi
-
-	if [ -f /custom/fstab.$appliance_name ]; then
-		cat /custom/fstab.$appliance_name >> $IMAGE_FSTAB
-	fi
-
-	if [ -f /custom/modules.$appliance_name ]; then
-		/bin/cp -f /custom/modules.$appliance_name /mnt/etc/modules
-	elif [ -f /custom/modules ]; then
-		/bin/cp -f /custom/modules /mnt/etc/modules
-	fi
-
-	if [ -f /custom/interfaces.$appliance_name ]; then
-		/bin/cp -f /custom/interfaces.$appliance_name /mnt/etc/network/interfaces
-	fi
-
-	if [ -f /custom/hosts-static ]; then
-		/bin/cp -f /custom/hosts-static /mnt/etc/hosts
-	fi
-
-	if [ -f /custom/hosts-atu ]; then
-		cat /custom/hosts-atu >> /mnt/etc/hosts
-	fi
-
-	if [ -f /custom/hosts.$appliance_name ]; then
-		cat /custom/hosts.$appliance_name >> /mnt/etc/hosts
-	fi
-
-}
-
-
-function set_root_password() {
-	local id=$1
-
-#	if $WGET -q -O /iauth.$id $openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/image-auth/iauth.$id.php 2>/iauth.log; then
-	if $WGET -q -O /iauth.$id "$openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/image-auth/iauth.php?id=$id" 2>/iauth.log; then
-		cryptedpassword=`cat /iauth.$id`
-		rm -f /iauth.$id iauth.log
-		if [ "$cryptedpassword" != "" ]; then
-			sed -i "s#^root:[^:]*#root:$cryptedpassword#" /mnt/etc/shadow
-			sed -i "s#^root:[^:]*#root:$cryptedpassword#" /mnt/etc/shadow-
-		fi
-	fi
-}
-
-function prepare_services() {
-
-	if [ ! -e /mnt/bin/systemd ] && [ ! -e /mnt/usr/bin/systemd ] ; then
-		chroot /mnt ln -sf /$resource_basedir/openqrm/etc/init.d/openqrm-client /etc/init.d/openqrm-client
-	fi
-	
-	echo "#!/bin/bash -x" > /mnt/tmp/openqrm-client.enable
-	echo "OPENQRM_SERVER_BASE_DIR=$resource_basedir" >> /mnt/tmp/openqrm-client.enable
-	echo ". /$resource_basedir/openqrm/include/openqrm-functions" >> /mnt/tmp/openqrm-client.enable
-	echo "openqrm_chkconfig add openqrm-client" >> /mnt/tmp/openqrm-client.enable
-	for SERVICE in $NOT_START_SERVICE; do
-		echo "openqrm_chkconfig del $SERVICE" >> /mnt/tmp/openqrm-client.enable
-	done
-	chmod +x /mnt/tmp/openqrm-client.enable
-	chroot /mnt /tmp/openqrm-client.enable 1>/dev/null 2>&1
-	rm -f /mnt/tmp/openqrm-client.enable
-}
-
-
-function prepare_net_init() {
-	INIT_SCRIPTS_TO_PREPARE="$@"
-	for INIT_SCRIPT in $INIT_SCRIPTS_TO_PREPARE; do
-		if [ -f /mnt/$INIT_SCRIPT ]; then
-			if ! grep -A2 "stop)" /mnt/$INIT_SCRIPT | grep -q "openqrm" ; then
-				echo "Preparing init script $INIT_SCRIPT"
-				sed -e "s/^[ \t]*stop)\(.*\)/stop) exit # added by openqrm \n\1/" /mnt/$INIT_SCRIPT > /mnt/${INIT_SCRIPT}.openqrm
-				mv -f /mnt/${INIT_SCRIPT}.openqrm /mnt/$INIT_SCRIPT
-				chmod +x /mnt/$INIT_SCRIPT
-			fi
-		fi
-	done
-}
-
-
-
-
-# main
-mount -t proc proc /proc
-# creating the devices
-echo "Creating the devices ..."
-makedevs -d /etc/initrd-devices.conf /
-mkdir -p /dev/fd
-ln -sf /proc/self/fd /dev/fd
-mknod /dev/tty c 5 0
-ln -sf /dev/ram1 /dev/ram
-mknod /dev/random c 1 8
-mknod /dev/urandom c 1 9
-echo 0x0100 > /proc/sys/kernel/real-root-dev
-echo 6 > /proc/sys/kernel/printk
-syslogd &&  klogd
-
-# need to run depmod 2 times as experienced
-depmod -a
-depmod -a
-
-KERNEL_VERSION=`uname -r`
-if [ ! -f /lib/modules/$KERNEL_VERSION/modules.pcimap ]; then
-	# create the legacy maps
-	echo " - /lib/modules/$KERNEL_VERSION/modules.pcimap missing. Trying to create it"
-	depmod -a -m
-	if [ -f /lib/modules/$KERNEL_VERSION/modules.pcimap ]; then
-		echo " - /lib/modules/$KERNEL_VERSION/modules.pcimap created"
-	else
-		echo "WARNING: Could not create /lib/modules/$KERNEL_VERSION/modules.pcimap!"
-		echo "WARNING: Automatic hardware-detection may fail!"
-	fi
-fi
-
-# load virtio drivers for KVM + Xen VMs
-#for module in xen-netfront virtio virtio_pci virtio_ring virtio_net crc32c; do
-for module in xen-netfront virtio virtio_pci virtio_ring virtio_net crc32c e1000 e1000e igb forcedeth dca ioatdma ixgbe hid usbhid hid-generic ; do
-    echo " -- loading $module"
-    modprobe "$module" 2>/mplog
-done
-rm -f  /mplog
-if grep -q sysfs /proc/filesystems ; then
-    mount -t sysfs none /sys
-fi
-
-# firmware rules existing ?
-if [ ! -f /etc/udev/rules.d/50-firmware.rules ]; then
-	# debian/ubuntu
-	if [ -x /lib/udev/firmware ]; then
-		echo 'SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware"' > /etc/udev/rules.d/50-firmware.rules
-	fi
-	# centos/rh
-	if [ -x /lib/udev/firmware.sh ]; then
-		echo 'SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"' > /etc/udev/rules.d/50-firmware.rules
-	fi
-fi
-mkdir -p /run/udev
-udevd --daemon
-
-# start acpid early if existing
-if which acpid 1>/dev/null; then
-	echo "Starting acpid daemon"
-	acpid
-fi
-sleep 4
-
-#jump into bash for debugging - no longer needed
-#/bin/bash
-
-if [ -f /lib/modules/$KERNEL_VERSION/modules.pcimap ]; then
-	echo "- (1) Starting hardware detection (network)"
-	for module in `/sbin/pcimodules`; do
-		echo " -- loading $module"
-		modprobe -s "$module"
-	done
-else
-	echo "- (1) Starting hardware detection (network)"
-	echo "NOTICE: No modules.pcimap available. Probing all network devices"
-	for module in `find /lib/modules/$KERNEL_VERSION/* -name "*.ko"`; do
-		module=`basename $module | cut -d'.' -f1`
-		echo " -- loading $module"
-		modprobe -s "$module"
-	done
-fi
-
-# bnx2x support, bring up the faster nics first as eth0/1
-if lsmod | grep ^bnx2x 1>/dev/null; then
-	rmmod tg3
-	rmmod bnx2x
-	udevd --daemon
-	modprobe bnx2x
-	ifconfig eth0 up
-	ifconfig eth1 up
-	modprobe tg3
-fi
-
-eval `cat /proc/cmdline`
-sleep 3
-killall udevd 2>/mplog
-rm -f  /mplog
-sleep 3
-
-# collecting some infos from /proc/cmdline
-OPENQRM_RESOURCE_MAC_ADDRESS=`echo $BOOTIF | sed -e "s/-/:/g"  | sed -e "s/^01://g" | tr '[:lower:]' '[:upper:]'`
-
-OPENQRM_RESOURCE_MANAGED_INTERFACE=`ifconfig -a | grep $OPENQRM_RESOURCE_MAC_ADDRESS | awk {' print $1 '} | head -n 1`
-#OPENQRM_RESOURCE_MANAGED_INTERFACE=`ifconfig -a | grep $OPENQRM_RESOURCE_MAC_ADDRESS -B3 | awk {' print substr($1, 1, length($1)-1) '} | head -n 1`
-
-OPENQRM_RESOURCE_IP_ADDRESS=`echo $ip | cut -d':' -f1`
-OPENQRM_SERVER_IP_ADDRESS=`echo $ip | cut -d':' -f2`
-OPENQRM_RESOURCE_DEFAULT_GATEWAY=`echo $ip | cut -d':' -f3`
-OPENQRM_RESOURCE_SUBNETMASK=`echo $ip | cut -d':' -f4`
-OPENQRM_RESOURCE_BROADCAST=`ipcalc -b $OPENQRM_RESOURCE_IP_ADDRESS $OPENQRM_RESOURCE_SUBNETMASK | cut -d'=' -f2`
-
-OPENQRM_RESOURCE_PARAMETER_FILE="/var/openqrm/openqrm-resource.conf"
-mkdir -p `dirname $OPENQRM_RESOURCE_PARAMETER_FILE`
-
-# adjust arp settings
-if [ -f /proc/sys/net/ipv4/conf/$OPENQRM_RESOURCE_MANAGED_INTERFACE/arp_filter ]; then
-	echo 1 > /proc/sys/net/ipv4/conf/$OPENQRM_RESOURCE_MANAGED_INTERFACE/arp_filter
-fi
-if [ -f /proc/sys/net/ipv4/conf/$OPENQRM_RESOURCE_MANAGED_INTERFACE/rp_filter ]; then
-	echo 1 > /proc/sys/net/ipv4/conf/$OPENQRM_RESOURCE_MANAGED_INTERFACE/rp_filter
-fi
-
-# get the net working
-echo "Bringing up $OPENQRM_RESOURCE_MANAGED_INTERFACE:oq"
-echo "-> mac-address		: $OPENQRM_RESOURCE_MAC_ADDRESS"
-echo "-> ip-address		: $OPENQRM_RESOURCE_IP_ADDRESS"
-echo "-> subnetmask		: $OPENQRM_RESOURCE_SUBNETMASK"
-echo "-> broadcast		: $OPENQRM_RESOURCE_BROADCAST"
-echo "-> default gw		: $OPENQRM_RESOURCE_DEFAULT_GATEWAY"
-echo "-> openQRM-server	: $OPENQRM_SERVER_IP_ADDRESS"
-
-#/bin/bash
-
-#echo "loopback up"
-ifconfig lo 127.0.0.1 up
-
-##
-#echo "Interface: $OPENQRM_RESOURCE_MANAGED_INTERFACE down"
-ifconfig $OPENQRM_RESOURCE_MANAGED_INTERFACE down
-#
-#echo "Interface: $OPENQRM_RESOURCE_MANAGED_INTERFACE up"
-ifconfig $OPENQRM_RESOURCE_MANAGED_INTERFACE 0.0.0.0 up
-#
-#echo "Interface: $OPENQRM_RESOURCE_MANAGED_INTERFACE:oq $OPENQRM_RESOURCE_IP_ADDRESS up"
-ifconfig $OPENQRM_RESOURCE_MANAGED_INTERFACE:oq $OPENQRM_RESOURCE_IP_ADDRESS netmask $OPENQRM_RESOURCE_SUBNETMASK broadcast $OPENQRM_RESOURCE_BROADCAST up
-if [ "$OPENQRM_RESOURCE_DEFAULT_GATEWAY" != "0.0.0.0" ]; then
-	route add default gw $OPENQRM_RESOURCE_DEFAULT_GATEWAY
-fi
-##
-# force a small delay for the networkcard to initialize
-ping -c 5 -q $OPENQRM_SERVER_IP_ADDRESS > /dev/null
-
-# get resource parameter
-echo "Getting resource-parameters ..."
-if [ "$id" == "-1" ]; then
-	echo "New resource detected ! Adding to the openQRM-server at $OPENQRM_SERVER_IP_ADDRESS"
-fi	
-
-# sending resource-id will add the resource if not existing (-1 = new resource)
-# loop get-parameters in case the network card is still not ready initialized
-NETWORKCARD_LOOP=0
-
-while (true); do
-	# try https first
-	if wget --no-check-certificate --random-file=/dev/random -q -O $OPENQRM_RESOURCE_PARAMETER_FILE "https://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_id=$id&resource_mac=$OPENQRM_RESOURCE_MAC_ADDRESS&resource_ip=$OPENQRM_RESOURCE_IP_ADDRESS&resource_subnet=$OPENQRM_RESOURCE_SUBNETMASK"; then
-		if ! grep "<html>" $OPENQRM_RESOURCE_PARAMETER_FILE >/out; then
-			echo "-> got parameters via https"
-			break
-		fi
-		rm -f /out
-	fi
-	# try http
-	if wget -q -O $OPENQRM_RESOURCE_PARAMETER_FILE "http://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_id=$id&resource_mac=$OPENQRM_RESOURCE_MAC_ADDRESS&resource_ip=$OPENQRM_RESOURCE_IP_ADDRESS&resource_subnet=$OPENQRM_RESOURCE_SUBNETMASK"; then
-		if ! grep "<html>" $OPENQRM_RESOURCE_PARAMETER_FILE >/out; then
-			echo "-> got parameter via http"
-			break
-		fi
-		rm -f /out
-	fi
-	# no chance ?
-	if [ "$NETWORKCARD_LOOP" == "10" ]; then
-		echo "ERROR: Could not reach the openQRM-Server at $OPENQRM_SERVER_IP_ADDRESS!"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	NETWORKCARD_LOOP=$(( NETWORKCARD_LOOP + 1 ))
-	sleep 5
-done
-# source parameters
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-
-# define wget
-if [ "$openqrm_web_protocol" == "https" ]; then
-	export WGET="wget --no-check-certificate --random-file=/dev/random"
-else
-	export WGET="wget"
-fi
-
-# get kernel + modules by tftp
-echo "Importing kernel files"
-import_kernel
-# load usb modules
-for module in usbcore hid usbhid; do
-    echo " -- loading $module"
-    modprobe "$module" 2>/mplog
-done
-rm -f  /mplog
-
-# run default openqrm-client boot-service
-KERNEL_ARCH=`uname -m`
-if echo $KERNEL_ARCH | grep i.*86 1>/dev/null; then
-	# i386
-	OPENQRM_CLIENT_ARCH=i386
-else
-	OPENQRM_CLIENT_ARCH=x86_64
-fi
-
-cd /
-if ! $WGET -q -O openqrm-client.tgz "$openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/openqrm-client.tgz"; then
-	rm -f openqrm-client.tgz
-	echo "WARNING: Failed to get the openqrm-client package! Starting an emergency shell"
-	/bin/bash
-fi
-tar -xzf openqrm-client.tgz
-rm -f openqrm-client.tgz
-
-$resource_basedir/openqrm/etc/init.d/openqrm-client start
-
-#/bin/bash
-
-if [ "$image_type" == "ram" ] || [ "$image_type" == "" ]; then
-
-	# send idle/available
-	echo "Sending idle/available to openQRM-server at $OPENQRM_SERVER_IP_ADDRESS"
-	$WGET -q -O /dev/null "$openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-monitor.php?resource_command=update_status&resource_id=$resource_id&resource_state=active&resource_event=available"
-	hostname idle$resource_id
-	# rcs0 will be started here from init
-	# for initramfs initrds we start a shell here
-	if [ -x /init ]; then
-		echo "Detected initrd as initramfs, starting a shell"
-		exec setsid /bin/bash -c 'exec /bin/bash </dev/tty1 >/dev/tty1 2>&1'
-	fi
-
-else
-
-#	/bin/bash
-
-	# if any deployment plugin is enabled, handle over the control
-	# -> deployment plugins will take care to mount the root fs
-	#    and do the pivot_root if needed
-
-	# pre-root-mount-hook to setup everything which needs to be done before the root-mount
-	cd /
-	for boot_service in $openqrm_boot_services; do
-		if $WGET -q -O /pre-root-mount-hook.$boot_service "$openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/pre-root-mount-hook.$boot_service"; then
-			echo " - Running for pre-root-mount-hook of boot-service $boot_service"
-			chmod +x pre-root-mount-hook.$boot_service
-			. ./pre-root-mount-hook.$boot_service
-			pre_mount_rootfs
-		else
-			rm -f /pre-root-mount-hook.$boot_service
-		fi
-	done
-	
-#	/bin/bash
-
-	# root-mount-hook
-	eval $image_deployment_parameter
-	cd /
-	$WGET -q "$openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/root-mount.$image_type"
-	chmod +x root-mount.$image_type
-	
-#	/bin/bash
-	
-	# source the deployment plugin command, it will provide
-	# the functions to mount/remount the rootfs at /mnt according
-	# to the deployment-type and the image_deployment_parameters
-	. ./root-mount.$image_type
-
-	# mount ro (provided by the deployment plugin)
-	###############################################################
-	# DEPLOYMENT PLUGIN HOOK ######################################
-	###############################################################
-	mount_rootfs
-
-#	/bin/bash
-
-	# here we have the rootfs mounted rw so we get the openQRM client according
-	# distro and arch
-	# find out the short distri name
-	if [ -f /mnt/etc/debian_version ]; then
-		# debian or ubuntu, try to find out without lsb-release which may not be installed
-		if grep -i ubuntu /mnt/etc/apt/sources.list 1>/dev/null; then
-			OPENQRM_SHORT_DISTRI_NAME="ubuntu"
-		else
-			OPENQRM_SHORT_DISTRI_NAME="debian"
-		fi
-	elif [ -f /mnt/etc/redhat-release ]; then
-		OPENQRM_SHORT_DISTRI_NAME="centos"
-	elif [ -f /mnt/etc/SuSE-release ]; then
-		OPENQRM_SHORT_DISTRI_NAME="suse"
-	else
-		OPENQRM_SHORT_DISTRI_NAME="custom"
-	fi
-	
-#	/bin/bash
-	
-	# get the openQRM client package fitting to distri + arch
-	rm -rf /mnt/$resource_basedir/openqrm
-	cd /
-	echo "Getting openqrm-client package(2)................"
-	if ! $WGET -q -O /mnt/openqrm-client.tgz "$openqrm_web_protocol://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/openqrm-client.tgz"; then
-		rm -f /mnt/openqrm-client.tgz
-		echo "WARNING: Failed to get the openqrm-client package!"
-		# copy openQRM client which is on the initrd
-		mkdir /mnt/$resource_basedir/openqrm/
-		cp -a /$resource_basedir/openqrm/* /mnt/$resource_basedir/openqrm/
-	else
-		# use the openQRM client which fits to the distri and arch
-		cd /mnt/
-		tar -xzf openqrm-client.tgz
-		rm -f openqrm-client.tgz
-		cd /
-	fi
-
-
-	# fill /boot and /lib/modules on the fs-image
-	echo "Filling /boot and /lib/modules"
-	
-	#create modules dir incase it does not exist, stops errors
-	if [ ! -d /mnt/lib/modules/$kernel_version ]; then
-		mkdir -p /mnt/lib/modules/$kernel_version
-	fi
-	
-	rm -rf /mnt/boot/vmlinuz-$kernel_version /mnt/boot/System.map-$kernel_version /mnt/lib/modules/$kernel_version
-	cp -af /boot/vmlinuz-$kernel_version /mnt/boot/vmlinuz-$kernel_version
-	cp -af /boot/System.map-$kernel_version /mnt/boot/System.map-$kernel_version
-	cp -af /lib/modules/$kernel_version /mnt/lib/modules/
-
-
-
-	# create custom fstab / needed for the remount rw during the system init
-	# (custom entry provided by the deployment plugin)
-	###############################################################
-	# DEPLOYMENT PLUGIN HOOK ######################################
-	###############################################################
-	create_fstab
-
-	# (common entries provided by a local function)
-	create_fstab_commons
-
-#	/bin/bash
-
-	# transfer resource basedir
-	echo "Preparing resource openQRM client"
-
-	# copy resource parameter
-	mkdir -p /mnt/`dirname $OPENQRM_RESOURCE_PARAMETER_FILE`
-	cp -af $OPENQRM_RESOURCE_PARAMETER_FILE /mnt/$OPENQRM_RESOURCE_PARAMETER_FILE
-
-	# prepare init according plugin services
-	echo "Preparing system init"
-	prepare_udev
-	prepare_var
-	prepare_services
-	prepare_net_init $NETWORK_SERVICES_TO_ADJUST
-
-	# managed shared image
-	if [ "$image_isshared" != "" ]; then
-		echo "Prepare image as shared"
-	fi
-	
-	# set root password
-	set_root_password $image_id
-
-	# remount rw (provided by the deployment plugin)
-	###############################################################
-	# DEPLOYMENT PLUGIN HOOK ######################################
-	###############################################################
-	remount_rootfs
-
-	# chroot + init
-	killall syslogd klogd 1>/dev/null 2>&1
-	killall udevd 1>/dev/null 2>&1
-	killall acpid 1>/dev/null 2>&1
-	killall dropbear 1>/dev/null 2>&1
-
-	sleep 2
-	if grep sysfs /proc/filesystems 1>/dev/null ; then
-		umount /sys
-	fi
-	umount /proc
-	umount /boot
-	umount /lib/modules
-
-	exec switch_root /mnt /sbin/init
-	# here the system will do a normal init
-	# from the mounted rootfs image
-	
-fi
-
-
-#modprobe hid-generic
-
diff --git a/openQRM-5.3.50-CE/src/etc/templates/openqrm-openssl-configuration b/openQRM-5.3.50-CE/src/etc/templates/openqrm-openssl-configuration
deleted file mode 100644
index d5b0465..0000000
--- a/openQRM-5.3.50-CE/src/etc/templates/openqrm-openssl-configuration
+++ /dev/null
@@ -1,53 +0,0 @@
-[ ca ]                                                     
-default_ca = openqrmca                                        
-
-[ openqrmca ]                                                 
-dir = .                                                    
-certificate = $dir/cacert.pem                              
-database = $dir/index.txt                                  
-new_certs_dir = $dir/certs                                 
-private_key = $dir/private/cakey.pem                       
-serial = $dir/serial                                       
-
-default_crl_days = 7                                       
-default_days = 365
-default_md = sha1                                          
-
-policy = openqrmca_policy                                     
-x509_extensions = certificate_extensions                   
-
-[ openqrmca_policy ]                                          
-commonName = supplied                                      
-stateOrProvinceName = optional                             
-countryName = optional                                     
-emailAddress = optional                                    
-organizationName = optional                                
-organizationalUnitName = optional                          
-
-[ certificate_extensions ]                                 
-basicConstraints = CA:false                                
-
-[ req ]                                                    
-default_bits = 2048                                        
-default_keyfile = ./private/cakey.pem                      
-default_md = sha1                                          
-prompt = yes                                               
-distinguished_name = root_ca_distinguished_name            
-x509_extensions = root_ca_extensions                       
-
-[ root_ca_distinguished_name ]                             
-commonName = sensu
-
-[ root_ca_extensions ]                                     
-basicConstraints = CA:true                                 
-keyUsage = keyCertSign, cRLSign                            
-
-[ client_ca_extensions ]                                   
-basicConstraints = CA:false                                
-keyUsage = digitalSignature                                
-extendedKeyUsage = 1.3.6.1.5.5.7.3.2                       
-
-[ server_ca_extensions ]                                   
-basicConstraints = CA:false                                
-keyUsage = keyEncipherment                                 
-extendedKeyUsage = 1.3.6.1.5.5.7.3.1
diff --git a/openQRM-5.3.50-CE/src/etc/templates/openqrm-pxelinux b/openQRM-5.3.50-CE/src/etc/templates/openqrm-pxelinux
deleted file mode 100644
index afa4f77..0000000
--- a/openQRM-5.3.50-CE/src/etc/templates/openqrm-pxelinux
+++ /dev/null
@@ -1,9 +0,0 @@
-default linux
-
-label linux
-kernel boot/OPENQRM_BOOTIMAGE_KERNEL
-append ramdisk_size=131072 apm=off initrd=boot/OPENQRM_BOOTIMAGE_INITRD id=OPENQRM_RESOURCE_ID openqrm=OPENQRM_SERVER_IP_ADDRESS selinux=0 net.ifnames=0
-ipappend 3
-
-label local
-LOCALBOOT 0
diff --git a/openQRM-5.3.50-CE/src/etc/templates/openqrm-rabbitmq-ssl-configuration b/openQRM-5.3.50-CE/src/etc/templates/openqrm-rabbitmq-ssl-configuration
deleted file mode 100644
index fd5d778..0000000
--- a/openQRM-5.3.50-CE/src/etc/templates/openqrm-rabbitmq-ssl-configuration
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-    {rabbit, [
-    {ssl_listeners, [5671]},
-    {ssl_options, [{cacertfile,"/etc/rabbitmq/ssl/cacert.pem"},
-                   {certfile,"/etc/rabbitmq/ssl/server_cert.pem"},
-                   {keyfile,"/etc/rabbitmq/ssl/server_key.pem"}]}
-  ]}
-].
diff --git a/openQRM-5.3.50-CE/src/etc/templates/prepare_net_init.sh b/openQRM-5.3.50-CE/src/etc/templates/prepare_net_init.sh
deleted file mode 100644
index 03f6c54..0000000
--- a/openQRM-5.3.50-CE/src/etc/templates/prepare_net_init.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -x
-
-function prepare_net_init() {
-        INIT_SCRIPTS_TO_PREPARE="$@"
-        for INIT_SCRIPT in $INIT_SCRIPTS_TO_PREPARE; do
-                if [ -f /mnt/$INIT_SCRIPT ]; then
-                        if ! grep -A2 "stop)" /mnt/$INIT_SCRIPT | grep -q "openqrm" ; then
-                                echo "Preparing init script $INIT_SCRIPT"
-                                sed -e "s/^[ \t]*stop)\(.*\)/stop) exit # added by openqrm \n\1/" /mnt/$INIT_SCRIPT > /mnt/${INIT_SCRIPT}.openqrm
-                                mv -f /mnt/${INIT_SCRIPT}.openqrm /mnt/$INIT_SCRIPT
-                                chmod +x /mnt/$INIT_SCRIPT
-                        fi
-                fi
-        done
-}
-
-export NETWORK_SERVICES_TO_ADJUST="/etc/init.d/portmap /etc/init.d/netfs /etc/rc.d/init.d/portmap /etc/rc.d/init.d/netfs /etc/init.d/network /etc/rc.d/init.d/network /etc/init.d/networking /etc/rc.d/init.d/networking"
-
-prepare_net_init $NETWORK_SERVICES_TO_ADJUST
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/fill-build-cache b/openQRM-5.3.50-CE/src/fill-build-cache
deleted file mode 100644
index 1eb1aba..0000000
--- a/openQRM-5.3.50-CE/src/fill-build-cache
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-
-export OPENQRM_SERVER_BASE_DIR=`dirname $0`
-export OPENQRM_SOURCE_DIR=$OPENQRM_SERVER_BASE_DIR
-. include/openqrm-functions
-. include/openqrm-build-functions
-
-for COMPONENT_CONFIG in `find etc/build.conf/ -type f -name *.conf | grep -v initrd-devices` ; do
-	COMPONENT=`basename $COMPONENT_CONFIG`
-	COMPONENT=`echo $COMPONENT | sed -e 's/\.conf//g'`
-	echo "Checking $COMPONENT"
-	openqrm_cache_or_download $COMPONENT $COMPONENT_CONFIG
-done
-for COMPONENT_CONFIG in $PLUGIN_CONFS; do
-	COMPONENT=`basename $COMPONENT_CONFIG`
-	COMPONENT=`echo $COMPONENT | sed -e 's/\.conf//g'`
-	echo "Checking $COMPONENT"
-	openqrm_cache_or_download $COMPONENT $COMPONENT_CONFIG
-done
-
diff --git a/openQRM-5.3.50-CE/src/include/Makefile b/openQRM-5.3.50-CE/src/include/Makefile
deleted file mode 100644
index d7ece81..0000000
--- a/openQRM-5.3.50-CE/src/include/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# this is the openQRM include Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/include
-	. $(OPENQRM_SERVER_CONF) && cp openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/include/
-
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/include/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/include
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/include/openqrm-build-functions b/openQRM-5.3.50-CE/src/include/openqrm-build-functions
deleted file mode 100644
index 794e668..0000000
--- a/openQRM-5.3.50-CE/src/include/openqrm-build-functions
+++ /dev/null
@@ -1,911 +0,0 @@
-#!/bin/bash -x
-########################## build functions ##########################
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# in the stage these function are used the files may be not installed yet
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	echo "ERROR: Please export OPENQRM_SERVER_BASE_DIR before sourcing $0"
-	exit 1
-fi
-if [ "$OPENQRM_SOURCE_DIR" == "" ]; then
-	echo "ERROR: Please export OPENQRM_SOURCE_DIR before sourcing $0"
-	exit 1
-fi
-# source the openqrm-functions file for more features
-. $OPENQRM_SOURCE_DIR/include/openqrm-functions
-# include package functions for package management
-. $OPENQRM_SOURCE_DIR/include/openqrm-package-functions
-# source the openqrm-server.conf which resets the OPENQRM_SERVER_BASE_DIR again
-. $OPENQRM_SOURCE_DIR/etc/openqrm-server.conf
-
-if [ -x "/sbin/rpcbind" ]; then
-	# portmap was replaced with rpcbind on fc > 7
-	OPENQRM_INITRD_COMPONENTS="/sbin/rpcbind"
-else
-	OPENQRM_INITRD_COMPONENTS="/sbin/portmap"
-fi
-if [ -x "/sbin/rpc.statd" ]; then
-	OPENQRM_INITRD_COMPONENTS="$OPENQRM_INITRD_COMPONENTS /sbin/rpc.statd"
-fi
-
-
-OPENQRM_INITRD_COMPONENTS="$OPENQRM_INITRD_COMPONENTS /bin/bash /usr/bin/rsync /usr/bin/wget /sbin/modprobe /sbin/depmod /sbin/insmod /sbin/lsmod /sbin/mke2fs /sbin/sfdisk /sbin/udevd /sbin/lvm `which ethtool 2>/dev/null` `which acpid 2>/dev/null`"
-OPENQRM_INITRD_DIRECTORIES="bin etc etc/rc.d/init.d etc/sysconfig etc/X11 lib lib/modules lib/i686 loopfs mnt old_root proc sys sysroot usr usr/lib usr/bin usr/sbin var var/lock var/lock/subsys var/log var/run /var/lib /var/lib/nfs /var/lib/nfs/statd"
-
-# colorize/emphasize terminal output
-USE_COLORS=1
-
-#
-# Print a message to STDOUT
-#
-# $1: the message
-# $2: (optional) use "bold" to get bold-printed output
-#
-function print_message() {
-	bold="\033[1m"
-	esc="\033[m"
-	if [ $USE_COLORS == 1 -a "$2" == 'bold' ]; then
-		echo -e "${bold}${1}${esc}"
-	else
-		echo "$1"
-	fi
-}
-
-function print_error() {
-	bold="\033[1m"
-	red="\033[31m"
-	esc="\033[m"
-	if [ $USE_COLORS == 1 ]; then
-		echo -e "${red}ERROR: ${1}${esc}"
-	else
-		echo "ERROR: $1"
-	fi
-}
-
-function print_notice() {
-	echo "NOTICE: $1"
-}
-
-
-#
-# Display all library files (not links) a binary depends on
-# -> this is generic
-#
-# $1: path to the binary
-#
-function openqrm_build_find_libs() {
-	BINARY=$1
-	for LIBRARY in `ldd $BINARY | awk {' print $3 '}`; do
-		REAL_LIBRARYFILE=`readlink $LIBRARY`
-		if [ "$REAL_LIBRARYFILE" == "" ]; then
-			REAL_LIBRARYFILE=`basename $LIBRARY`
-		fi
-		FULL_PATH_TO_LIBRARY=`dirname $LIBRARY`
-		if [ "$FULL_PATH_TO_LIBRARY" != "." ]; then
-			echo $FULL_PATH_TO_LIBRARY/$REAL_LIBRARYFILE
-		fi
-	done
-}
-
-
-
-#
-# Check requirements for the compile phase
-# -> this is for "make all" / compilation phase
-#
-function openqrm_check_build_requirements() {
-	echo "Checking requirements for the compilation phase"
-	export FORCE_INSTALL=true
-	# check which command to use for checking the requirements
-	if [ -f /etc/debian_version ]; then
-		OPENQRM_PACKAGE_TYPE=deb
-		OPENQRM_REQUIREMENTS_CHECK_COMMAND="dpkg -L"
-	elif [ -f /etc/redhat-release ]; then
-		OPENQRM_PACKAGE_TYPE=rpm
-		OPENQRM_REQUIREMENTS_CHECK_COMMAND="rpm -qs"
-	elif [ -f /etc/SuSE-release ]; then
-		OPENQRM_PACKAGE_TYPE=rpm
-		OPENQRM_REQUIREMENTS_CHECK_COMMAND="rpm -qs"
-	else
-		echo "NOTICE: Could not find out which compile-requirements to use"
-		echo "        Please make sure to have all needed components installed!"
-		sleep 4
-		echo "... Continuing anyway"
-		return 0
-	fi
-
-	# check for required packages and install them if possible
-	echo "openqrm-server requires: $OPENQRM_SERVER_BUILD_REQUIREMENTS"
-	for DEP in `echo $OPENQRM_SERVER_BUILD_REQUIREMENTS | sed -e "s/,//g"`; do
-		if $OPENQRM_REQUIREMENTS_CHECK_COMMAND $DEP 1>/dev/null 2>&1; then
-			print_message "found $DEP installed" bold
-		else
-			print_notice "Trying to automatically install $DEP ..."
-			openqrm_install_os_dependency $DEP
-			if [ $? != 0 ]; then
-				print_error "$DEP could not be installed. Please install manually to continue"
-				return 1
-			fi
-		fi
-	done
-
-	# check if the build tmp directory is writable
-	if [ ! -d "$OPENQRM_BUILD_TMP_DIR" ]; then
-		if ! mkdir -p "$OPENQRM_BUILD_TMP_DIR"; then
-			print_error "$OPENQRM_BUILD_TMP_DIR could not be created by user `whoami`."
-			return 1;
-		fi
-	elif [ ! -w "$OPENQRM_BUILD_TMP_DIR" -o ! -x "$OPENQRM_BUILD_TMP_DIR" ]; then
-		print_error "$OPENQRM_BUILD_TMP_DIR must exist and be writable by user `whoami`."
-		return 1;
-	fi
-
-	# get a list of plugins for checking their requirements
-	OPENQRM_PACKAGE_COMPONENT_LIST=`ls $OPENQRM_SOURCE_DIR/plugins | grep -v Makefile | grep -v CVS`
-	for OPENQRM_PLUGIN in $OPENQRM_PACKAGE_COMPONENT_LIST; do
-		PLUGIN_CONF=$OPENQRM_SOURCE_DIR/plugins/$OPENQRM_PLUGIN/etc/openqrm-plugin-$OPENQRM_PLUGIN"".conf
-		if [ -f $PLUGIN_CONF ]; then
-			. $PLUGIN_CONF
-		else
-			print_notice "openqrm-plugin-$OPENQRM_PLUGIN has no config file. Unable to check dependencies!"
-			continue
-		fi
-		echo "openqrm-plugin-$OPENQRM_PLUGIN requires: `echo $OPENQRM_PLUGIN_BUILD_REQUIREMENTS`"
-		for DEP in `echo $OPENQRM_PLUGIN_BUILD_REQUIREMENTS | sed -e "s/,//g"`; do
-			if $OPENQRM_REQUIREMENTS_CHECK_COMMAND $DEP 1>/dev/null 2>&1; then
-				print_message "found $DEP installed" bold
-			else
-				echo "NOTICE: Trying to automatically install $DEP ..."
-				openqrm_install_os_dependency $DEP
-				if [ $? != 0 ]; then
-					print_error "$DEP could not be installed. Please install manually to continue"
-					return 1
-				fi
-			fi
-		done
-	done
-	echo "Checking for required components to compile openQRM finished successfully"
-
-}
-
-
-# function to download+cache source packages in the package-dir
-# -> this is for "make all" / comilation phase
-function openqrm_cache_or_download() {
-	# 1 param: 		component name
-	# 2 param:		component build config file
-	OPENQRM_SOURCE_COMPONENT_NAME=$1
-	OPENQRM_SOURCE_COMPONENT_BUILD_CONFIG=$2
-	if [ "$OPENQRM_SOURCE_COMPONENT_BUILD_CONFIG" == "" ]; then
-		. $OPENQRM_SOURCE_DIR/etc/build.conf/$OPENQRM_SOURCE_COMPONENT_NAME.conf
-	else
-		. $OPENQRM_SOURCE_COMPONENT_BUILD_CONFIG
-	fi
-	OPENQRM_SOURCE_COMPONENT_FILE=`basename $OPENQRM_SOURCE_DOWNLOAD`
-	CURRENT_DIR=`pwd`
-	if [ -f $OPENQRM_BUILD_TMP_DIR/openqrm-build/$OPENQRM_SOURCE_COMPONENT_NAME/source/$OPENQRM_SOURCE_COMPONENT_FILE ]; then
-		print_message "-> found component $OPENQRM_SOURCE_COMPONENT_NAME ($OPENQRM_SOURCE_COMPONENT_FILE) already downloaded" bold
-	else
-		mkdir -p $OPENQRM_BUILD_TMP_DIR/openqrm-build/$OPENQRM_SOURCE_COMPONENT_NAME/source/
-		cd $OPENQRM_BUILD_TMP_DIR/openqrm-build/$OPENQRM_SOURCE_COMPONENT_NAME/source/
-		if ! wget $OPENQRM_SOURCE_DOWNLOAD; then
-			print_error "Could not download $OPENQRM_SOURCE_COMPONENT_NAME from " \
-				"$OPENQRM_SOURCE_DOWNLOAD" \
-			print_error "Please put $OPENQRM_SOURCE_COMPONENT_FILE in " \
-				"$OPENQRM_BUILD_TMP_DIR/openqrm-build/$OPENQRM_SOURCE_COMPONENT_NAME/source/" \
-				" and try again."
-			exit 1
-		fi
-		cd $CURRENT_DIR
-	fi
-	cd $CURRENT_DIR
-}
-
-
-
-#function to compile a component from the source
-# -> this is for "make all" / compilation phase
-function openqrm_compile_from_source() {
-	# 1 param: 		component name
-	# 2 param:		component build config file
-	# optional variables :
-	# OPENQRM_CONFIGURE		command to use for configure (default "./configure" if exists)
-	# OPENQRM_PRE_MAKE		commands to run before make
-	# OPENQRM_POST_MAKE		commands to run after make
-	OPENQRM_SOURCE_COMPONENT_NAME=$1
-	OPENQRM_SOURCE_COMPONENT_BUILD_CONFIG=$2
-	if [ "$OPENQRM_SOURCE_COMPONENT_BUILD_CONFIG" == "" ]; then
-		. $OPENQRM_SOURCE_DIR/etc/build.conf/$OPENQRM_SOURCE_COMPONENT_NAME.conf
-	else
-		. $OPENQRM_SOURCE_COMPONENT_BUILD_CONFIG
-	fi
-	OPENQRM_SOURCE_COMPONENT_FILE=`basename $OPENQRM_SOURCE_DOWNLOAD`
-	CURRENT_DIR=`pwd`
-	# check if it is already compiled
-	if [ ! -f $OPENQRM_BUILD_TMP_DIR/openqrm-build/$OPENQRM_SOURCE_COMPONENT_NAME/$OPENQRM_SOURCE_BINARY_RESULT ]; then
-		# nope, then we have to build it
-		# unpack
-		cd $OPENQRM_BUILD_TMP_DIR/openqrm-build/$OPENQRM_SOURCE_COMPONENT_NAME/
-		OPENQRM_SOURCE_COMPONENT_FILE_TYPE=`echo $OPENQRM_SOURCE_COMPONENT_FILE | sed -e "s/.*\.//g"`
-		if [ "$OPENQRM_SOURCE_COMPONENT_FILE_TYPE" == "bz2" ]; then
-			tar -xjf source/$OPENQRM_SOURCE_COMPONENT_FILE
-		else
-			tar -xzf source/$OPENQRM_SOURCE_COMPONENT_FILE
-		fi
-		cd $OPENQRM_SOURCE_COMPONENT_NAME-$OPENQRM_SOURCE_VERSION
-
-		# configure
-		if [ "$OPENQRM_CONFIGURE" != "" ]; then
-			$OPENQRM_CONFIGURE
-		elif [ -f ./configure ]; then
-			chmod +x ./configure && ./configure
-		fi
-
-		# pre-make
-		eval $OPENQRM_PRE_MAKE
-
-		# make
-		make $OPENQRM_MAKE_TARGET
-		# we do not run make install, if needed pls run it in post-make
-
-		# post-make
-		eval $OPENQRM_POST_MAKE
-
-		unset OPENQRM_CONFIGURE OPENQRM_PRE_MAKE OPENQRM_POST_MAKE
-		cd $CURRENT_DIR
-	else
-		print_message "-> Found $OPENQRM_SOURCE_BINARY_RESULT already in the build-cache" bold
-		print_message "-> Skipping compilation, taking the ready built component from the cache" bold
-	fi
-}
-
-
-
-# function to create the default initrd-template during the compile stage
-# -> this is for "make install" / installation phase
-function openqrm_create_default_initrd_template() {
-
-	CURRENT_DIR=`pwd`
-	OPENQRM_SOURCE_DIR_FULL_PATH=`cd $OPENQRM_SOURCE_DIR && pwd && cd $CURRENT_DIR`
-	echo "Creating the default initrd-template"
-	# install build deps
-	export FORCE_INSTALL=true
-	if [ -f /etc/debian_version ]; then
-		openqrm_install_os_dependency gcc
-		openqrm_install_os_dependency rpcbind
-		openqrm_install_os_dependency rsync
-		openqrm_install_os_dependency zlib1g-dev
-		openqrm_install_os_dependency netbase
-		openqrm_install_os_dependency patch
-		openqrm_install_os_dependency lvm2
-		openqrm_install_os_dependency ethtool
-		openqrm_install_os_dependency dropbear
-		openqrm_install_os_dependency acpid
-	elif [ -f /etc/redhat-release ]; then
-		openqrm_install_os_dependency gcc
-		openqrm_install_os_dependency glibc-static
-		openqrm_install_os_dependency rpcbind
-		openqrm_install_os_dependency rsync
-		openqrm_install_os_dependency zlib-devel
-		openqrm_install_os_dependency zlib-static
-		openqrm_install_os_dependency lvm2
-		openqrm_install_os_dependency ethtool
-		openqrm_install_os_dependency dropbear
-		openqrm_install_os_dependency acpid
-	elif [ -f /etc/SuSE-release ]; then
-		openqrm_install_os_dependency gcc
-		openqrm_install_os_dependency rpcbind
-		openqrm_install_os_dependency rsync
-		openqrm_install_os_dependency zlib-devel
-		openqrm_install_os_dependency lvm2
-		openqrm_install_os_dependency ethtool
-		openqrm_install_os_dependency dropbear
-		openqrm_install_os_dependency acpid
-	fi
-
-	# getting + compiling busybox
-	. $OPENQRM_SOURCE_DIR/etc/build.conf/busybox.conf
-	openqrm_cache_or_download busybox
-	OPENQRM_SOURCE_COMPONENT_BUILD_DIR=$OPENQRM_BUILD_TMP_DIR/openqrm-build/busybox/busybox-$OPENQRM_SOURCE_VERSION/
-	export OPENQRM_PRE_MAKE="cp $OPENQRM_SOURCE_DIR_FULL_PATH/etc/build.conf/busybox.configuration $OPENQRM_SOURCE_COMPONENT_BUILD_DIR/.config && make oldconfig"
-	export OPENQRM_POST_MAKE="make install"
-	openqrm_compile_from_source busybox
-	unset OPENQRM_PRE_MAKE
-	unset OPENQRM_POST_MAKE
-
-	# getting pciutils
-	openqrm_cache_or_download pciutils
-	# compile static
-	export LDFLAGS="-static"
-	# patch for pcimodules
-	. $OPENQRM_SOURCE_DIR/etc/build.conf/pciutils.conf
-	OPENQRM_SOURCE_PCIUTILS_DIR="$OPENQRM_BUILD_TMP_DIR/openqrm-build/pciutils/pciutils-$OPENQRM_SOURCE_VERSION/"
-	export OPENQRM_PRE_MAKE="cd $OPENQRM_SOURCE_PCIUTILS_DIR; patch -p1 < $OPENQRM_SOURCE_DIR/etc/build.conf/pciutils-pcimodules.patch; cd -"
-	openqrm_compile_from_source pciutils
-	unset LDFLAGS
-	unset OPENQRM_PRE_MAKE
-	unset OPENQRM_POST_MAKE
-
-	# create the initroot
-	mkdir -p $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot
-	cp -aR $OPENQRM_SOURCE_COMPONENT_BUILD_DIR/_install/* $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/
-	# create symlink to /lib64 for 64bit systems
-	cd $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/
-	ln -sf lib lib64
-	cd $CURRENT_DIR
-	# create lib dir + copy ld-linux
-	mkdir -p $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/lib
-	if ls /lib64/ld-* 2>/dev/null 1>&1; then
-		for LDLINUX in `ls /lib64/ld-*`; do
-			cp -af $LDLINUX $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/lib/
-			if [ -h $LDLINUX ]; then
-				LDDFILE=`readlink -f $LDLINUX`
-				LDDIR=`dirname $LDDFILE`
-				mkdir -p $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/$LDDIR
-				cp -af $LDDFILE $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/$LDDIR
-			fi
-		done
-	else
-		for LDLINUX in `ls /lib/ld-*`; do
-			cp -af $LDLINUX $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/lib/
-			if [ -h $LDLINUX ]; then
-				LDDFILE=`readlink -f $LDLINUX`
-				LDDIR=`dirname $LDDFILE`
-				mkdir -p $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/$LDDIR
-				cp -af $LDDFILE $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/$LDDIR
-			fi
-		done
-	fi
-	# add the libs busybox depends on
-	for LIB in `openqrm_build_find_libs $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/bin/busybox`; do
-		LIB=`echo $LIB | sed -e "s/-[0-9].*.so//g" | sed -e "s/\.so.[0-9].*//g"`
-		if [ "$LIB" != "/lib/" ]; then
-			cp -a $LIB""* $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/lib/
-		fi
-	done
-	# remove wget link
-	rm -f $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/bin/wget
-	# add some more utils + their libs
-	for UTIL in $OPENQRM_INITRD_COMPONENTS; do
-		cp -a $UTIL $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/bin
-		echo "Adding $UTIL to default initrd-template"
-		for LIB in `openqrm_build_find_libs $UTIL`; do
-			LIB=`echo $LIB | sed -e "s/-[0-9].*.so//g" | sed -e "s/\.so.[0-9].*//g"`
-			if [ "$LIB" != "/lib/" ]; then
-				cp -af $LIB""* $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/lib/
-			fi
-		done
-	done
-	# fix wget
-	rm -f $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/usr/bin/wget
-	# if lvm is a link to lvm.static (e.g. on centos)
-	if [ -x /sbin/lvm.static ]; then
-		cp -a /sbin/lvm.static $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/bin/
-	fi
-	# create default udhcpc script
-	mkdir -p $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/usr/share/udhcpc
-	cat > $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/usr/share/udhcpc/default.script << EOF
-#!/bin/sh
-# udhcpc script edited by Tim Riker <Tim@Rikers.org>
-# changed by infernix <infernix@infernix.net>: we don't need to do resolv.conf again
-# because we only call this for additional interfaces
-[ -z "\$1" ] && echo "Error: should be called from udhcpc" && exit 1
-[ -n "\$broadcast" ] && BROADCAST="broadcast \$broadcast"
-[ -n "\$subnet" ] && NETMASK="netmask \$subnet"
-
-case "\$1" in
-	deconfig)
-		ifconfig \$interface 0.0.0.0
-		;;
-	renew|bound)
-		ifconfig \$interface \$ip \$BROADCAST \$NETMASK
-		if [ -n "\$router" ] ; then
-			echo "deleting routers"
-			while /sbin/route del default gw 0.0.0.0 dev \$interface ; do
-				:
-			done
-			metric=0
-			for i in \$router ; do
-				/sbin/route add default gw \$i dev \$interface metric \$((metric++))
-			done
-		fi
-		;;
-esac
-exit 0
-EOF
-	chmod 755 $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/usr/share/udhcpc/default.script
-
-	# take vol_id or blkid
-	if [ -x  /lib/udev/vol_id ]; then
-		UDEV_UTIL="/lib/udev/vol_id"
-	elif [ -x /sbin/blkid ]; then
-		UDEV_UTIL="/sbin/blkid"
-	fi
-	cp -a $UDEV_UTIL $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/bin
-	echo "Adding $UDEV_UTIL to default initrd-template"
-	for LIB in `openqrm_build_find_libs $UDEV_UTIL`; do
-		LIB=`echo $LIB | sed -e "s/-[0-9].*.so//g" | sed -e "s/\.so.[0-9].*//g"`
-		if [ "$LIB" != "/lib/" ]; then
-			cp -af $LIB""* $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/lib/
-		fi
-	done
-	if [ "$UDEV_UTIL" == "/sbin/blkid" ]; then
-		cp -af $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/bin/blkid $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/bin/vol_id
-	fi
-
-
-	# fix reboot for the initrd -> reboot -f (it's simply faster)
-	rm -f $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/sbin/reboot
-	cat >> $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/sbin/reboot << EOF
-#!/bin/bash
-/bin/busybox reboot -f
-EOF
-	chmod +x $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/sbin/reboot
-	# create shutdown from reboot
-	cp -af $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/sbin/reboot $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/sbin/shutdown
-	# creating initrd directories
-	for DIR in $OPENQRM_INITRD_DIRECTORIES; do
-		mkdir -p $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/$DIR
-	done
-	touch $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/var/lib/nfs/rmtab
-	touch $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/var/lib/nfs/xtab
-	touch $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/var/lib/nfs/etab
-	touch $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/var/lib/nfs/state
-	# prepare etc
-	cd $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/etc
-	ln -sf /proc/mounts mtab
-	ln -sf rc.d/init.d init.d
-	touch localtime
-	# create shells file
-	echo "/bin/bash" > shells
-	echo "none            /dev/pts        devpts        gid=0,mode=620    0 0" > fstab
-	# passwd + group
-	echo "root:x:0:0:root:/root:/bin/bash" > passwd
-	echo "rpc:x:100:100:rpc:/tmp:/bin/bash" >> passwd
-	echo "root:x:0:root" > group
-	echo "rpc:x:100:root" >> group
-	# hosts
-	echo "127.0.0.1" > hosts
-	# netconfig ? fedora has + needs it
-	if [ -f "/etc/netconfig" ]; then
-		cp -a /etc/netconfig .
-	fi
-	# services
-	cp -a /etc/services .
-	# nsswitch
-	echo "passwd:     files" > nsswitch.conf
-	echo "shadow:     files" >> nsswitch.conf
-	echo "group:      files" >> nsswitch.conf
-	# cp libnss
-	if ls /lib64/libnss_files* 2>/dev/null 1>&1; then
-		cp -aR /lib64/libnss_files* $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/lib/
-	else
-		cp -aR /lib/libnss_files* $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/lib/  2>/dev/null
-	fi
-	if ls /lib/x86_64-linux-gnu/libnss_files* 2>/dev/null 1>&1; then
-		mkdir -p $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/lib/x86_64-linux-gnu/
-		cp -aR /lib/x86_64-linux-gnu/libnss_files* $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/lib/x86_64-linux-gnu/
-	fi
-
-	# installing pciutils + pcimodules
-	cp -a $OPENQRM_SOURCE_PCIUTILS_DIR/lspci $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/sbin/
-	cp -a $OPENQRM_SOURCE_PCIUTILS_DIR/pcimodules $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/sbin/
-	# installing dropbear
-	DROPBEAR_BIN=`which dropbear`
-	DBCLIENT_BIN=`which dbclient`
-	DROPBEARKEY_BIN=`which dropbearkey`
-	cp -a $DROPBEAR_BIN $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/sbin/
-	cp -a $DBCLIENT_BIN $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/bin/
-	cp -a $DROPBEARKEY_BIN $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/bin/
-	# install dropbear libs
-	for LIB in `openqrm_build_find_libs $DROPBEAR_BIN`; do
-		LIB=`echo $LIB | sed -e "s/-[0-9].*.so//g" | sed -e "s/\.so.[0-9].*//g"`
-		if [ "$LIB" != "/lib/" ]; then
-			cp -af $LIB""* $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/lib/
-		fi
-	done
-	# creating the initrd devices
-	cp -a $OPENQRM_SOURCE_DIR_FULL_PATH/etc/build.conf/initrd-devices.conf $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/etc/
-	rm -rf $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/dev
-	mkdir -p $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/dev
-	# copy acpi config
-	if [ -d /etc/acpi ]; then
-		cp -aR /etc/acpi $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/etc/
-	fi
-	# create rcS
-	rm -f $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/etc/rc.d/init.d/rcS
-	cat >> $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/etc/rc.d/init.d/rcS << EOF
-#!/bin/bash
-export SHELL=/bin/bash
-export \$(eval cat /proc/cmdline)
-echo "openQRM resource \$id is starting rcS" > /dev/console
-
-EOF
-	chmod +x $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/etc/rc.d/init.d/rcS
-
-	# create inittab
-	rm -f $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/etc/inittab
-	cat >> $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/etc/inittab << EOF
-
-# inittab
-::askfirst:-/bin/bash
-tty2::askfirst:-/bin/bash
-tty3::askfirst:-/bin/bash
-tty4::askfirst:-/bin/bash
-::sysinit:/etc/init.d/rcS
-::restart:/sbin/reboot
-
-# Stuff to do before rebooting
-::ctrlaltdel:/sbin/reboot
-::shutdown:/sbin/halt
-
-EOF
-}
-
-
-# function to create a tgz file out of the initroot/initrd-content
-# -> this is for "make install" / installation phase
-function openqrm_pack_default_initrd_template() {
-	# pack
-	CURRENT_DIR=`pwd`
-	OPENQRM_SOURCE_DIR_FULL_PATH=`cd $OPENQRM_SOURCE_DIR && pwd && cd $CURRENT_DIR`
-	mkdir -p $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/sbin $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/bin
-	# create the initrd package fitting to the build arch + distri
-	KERNEL_ARCH=`uname -m`
-	if echo $KERNEL_ARCH | grep i.*86 1>/dev/null; then
-		# i386
-		OPENQRM_CLIENT_ARCH=i386
-	else
-		OPENQRM_CLIENT_ARCH=x86_64
-	fi
-	# find out the short distri name
-	if [ -f /etc/debian_version ]; then
-		# debian or ubuntu, try to find out without lsb-release which may not be installed
-		if grep -i ubuntu /etc/apt/sources.list 1>/dev/null; then
-			OPENQRM_SHORT_DISTRI_NAME="ubuntu"
-		else
-			OPENQRM_SHORT_DISTRI_NAME="debian"
-		fi
-	elif [ -f /etc/redhat-release ]; then
-		OPENQRM_SHORT_DISTRI_NAME="centos"
-	fi
-	rm -f $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-initrd-template.$OPENQRM_SHORT_DISTRI_NAME.$OPENQRM_CLIENT_ARCH.tgz
-	cd $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/
-	tar -czf $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-initrd-template.$OPENQRM_SHORT_DISTRI_NAME.$OPENQRM_CLIENT_ARCH.tgz *
-	cd $CURRENT_DIR
-	echo "Created initrd-template $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-initrd-template.$OPENQRM_SHORT_DISTRI_NAME.$OPENQRM_CLIENT_ARCH.tgz"
-}
-
-
-# function to provide adodb for Suse+Redhat systems only
-# -> this is for "make" phase
-function openqrm_get_adodb() {
-	if [ ! -f /etc/debian_version ]; then
-		CURRENT_DIR=`pwd`
-		openqrm_cache_or_download adodb
-		cd $OPENQRM_BUILD_TMP_DIR/openqrm-build/adodb/
-		tar -xzf source/adodb*.tgz
-		cd $CURRENT_DIR
-	fi
-}
-
-# function to install adodb for Suse + Redhat systems only
-# -> this is for "make install" phase
-function openqrm_install_adodb() {
-	if [ ! -f /etc/debian_version ]; then
-		cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/adodb/adodb $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/include/
-	fi
-}
-
-
-
-# function to provide the api-documentation
-# -> this is for "make" phase
-function openqrm_get_api_docu() {
-	CURRENT_DIR=`pwd`
-	openqrm_cache_or_download openqrm-api-docu
-	cd $OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-api-docu/
-	tar -xzf source/openqrm-api-docu-$OPENQRM_SERVER_VERSION.tgz
-	cd $CURRENT_DIR
-}
-
-# function to install the api-documentation
-# -> this is for "make install" phase
-function openqrm_install_api_docu() {
-	mkdir -p $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/zz_documentation/api
-	cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-api-docu/openqrm-api-docu-$OPENQRM_SERVER_VERSION/* $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/zz_documentation/api/
-}
-
-
-# function to get the jquery bundle
-# -> this is for "make " phase
-function openqrm_get_jquery_bundle() {
-	# TODO gather version from build.conf file
-	JQUERY_VERSION="1.3.2"
-	CURRENT_DIR=`pwd`
-	openqrm_cache_or_download jquery
-	cd $OPENQRM_BUILD_TMP_DIR/openqrm-build/jquery/
-	tar -xzf source/jquery-$JQUERY_VERSION.tgz
-	cd $CURRENT_DIR
-}
-
-# function to install the jquery-bundle
-# -> this is for "make install" phase
-function openqrm_install_jquery_bundle() {
-
-	JQUERY_VERSION="1.3.2"
-	mkdir -p $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/js/jquery
-	mkdir -p $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/css/jquery
-	cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/jquery/jquery-$JQUERY_VERSION/* $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/js/jquery/
-
-	# exclude .txt files
-	rm -f $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/js/jquery/development-bundle/*.txt
-
-	# css
-	rm -rf $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/js/jquery/css
-	cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/jquery/jquery-$JQUERY_VERSION/css/* $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/css/jquery/
-
-	# also install it for the cloud plugin
-	mkdir -p $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/user/js
-	mkdir -p $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/user/css
-	cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/jquery/jquery-$JQUERY_VERSION/* $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/user/js/
-
-	# exclude .txt files
-	rm -f $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/user/js/development-bundle/*.txt
-
-	# css
-	rm -rf $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/user/js/css
-	cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/jquery/jquery-$JQUERY_VERSION/css/* $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/user/css/
-
-	# also install it for the cloud-zones plugin
-	if [ -d $OPENQRM_SOURCE_DIR/plugins/cloud-zones ]; then
-		mkdir -p $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud-zones/cloud-portal/web/user/js
-		mkdir -p $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud-zones/cloud-portal/web/user/css
-		cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/jquery/jquery-$JQUERY_VERSION/* $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud-zones/cloud-portal/web/user/js/
-		# exclude .txt files
-		rm -f $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud-zones/cloud-portal/web/user/js/development-bundle/*.txt
-		# css
-		rm -rf $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud-zones/cloud-portal/web/user/js/css
-		cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/jquery/jquery-$JQUERY_VERSION/css/* $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud-zones/cloud-portal/web/user/css/
-	fi
-
-}
-
-
-# function to get the interface js
-# -> this is for "make " phase
-function openqrm_get_js_interface() {
-	# TODO gather version from build.conf file
-	INTERFACE_VERSION="1.2"
-	CURRENT_DIR=`pwd`
-	openqrm_cache_or_download js-interface
-	rm -rf "$OPENQRM_BUILD_TMP_DIR/openqrm-build/js-interface/interface $INTERFACE_VERSION"
-	rm -rf "$OPENQRM_BUILD_TMP_DIR/openqrm-build/js-interface/interface_$INTERFACE_VERSION"
-	cd $OPENQRM_BUILD_TMP_DIR/openqrm-build/js-interface/
-	unzip -q source/interface_$INTERFACE_VERSION.zip
-	for f in *; do mv "$f" `echo $f | tr ' ' '_'` 2>/dev/null; done
-	cd $CURRENT_DIR
-}
-
-
-# function to install the jquery-bundle
-# -> this is for "make install" phase
-function openqrm_install_js_interface() {
-	INTERFACE_VERSION="1.2"
-	mkdir -p $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/js/interface
-	cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/js-interface/interface_$INTERFACE_VERSION/interface.js $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/js/interface/
-	# also install it for the cloud plugin
-	mkdir -p $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/user/js
-	cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/js-interface/interface_$INTERFACE_VERSION/interface.js $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/user/js/
-	# also install it for the cloud-zones plugin
-	if [ -d $OPENQRM_SOURCE_DIR/plugins/cloud-zones ]; then
-		mkdir -p $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud-zones/cloud-portal/web/user/js
-		cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/js-interface/interface_$INTERFACE_VERSION/interface.js $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud-zones/cloud-portal/web/user/js/
-	fi
-}
-
-
-
-# function to get the htmlobjects
-# -> this is for "make " phase
-function openqrm_get_htmlobjects() {
-	HTMLOBJECTS_VERSION="v1.1_r193"
-	CURRENT_DIR=`pwd`
-	openqrm_cache_or_download htmlobjects
-	rm -rf "$OPENQRM_BUILD_TMP_DIR/openqrm-build/htmlobjects/htmlobjects"
-	cd $OPENQRM_BUILD_TMP_DIR/openqrm-build/htmlobjects/
-	tar -xzf source/htmlobjects_$HTMLOBJECTS_VERSION.tar.gz
-	cd $CURRENT_DIR
-}
-
-
-# function to install the htmlobjects
-# -> this is for "make install" phase
-function openqrm_install_htmlobjects() {
-	mkdir -p $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/class/htmlobjects
-	cp -aR $OPENQRM_BUILD_TMP_DIR/openqrm-build/htmlobjects/htmlobjects/* $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/class/htmlobjects/
-}
-
-
-
-# function to get the jqClock jquery plugin
-# -> this is for "make " phase
-function openqrm_get_jqclock() {
-	JQCLOCK_VERSION="2.0.1"
-	CURRENT_DIR=`pwd`
-	openqrm_cache_or_download jqclock
-	rm -rf "$OPENQRM_BUILD_TMP_DIR/openqrm-build/jqclock/jqclock"
-	cd $OPENQRM_BUILD_TMP_DIR/openqrm-build/jqclock/
-	tar -xzf source/jqclock-$JQCLOCK_VERSION.tgz
-	cd $CURRENT_DIR
-}
-
-
-# function to install the jqClock jquery plugin
-# -> this is for "make install" phase
-function openqrm_install_jqclock() {
-	mkdir -p $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/js
-	cp -aR $OPENQRM_BUILD_TMP_DIR/openqrm-build/jqclock/jqClock.min.js $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/js/
-}
-
-
-# function to get the treemenu.js
-# -> this is for "make " phase
-function openqrm_get_treemenu_js() {
-	TREEMENUJS_VERSION="0.1"
-	CURRENT_DIR=`pwd`
-	openqrm_cache_or_download treemenujs
-	rm -rf "$OPENQRM_BUILD_TMP_DIR/openqrm-build/treemenujs/treemenujs"
-	cd $OPENQRM_BUILD_TMP_DIR/openqrm-build/treemenujs/
-	tar -xzf source/treemenu-js.$TREEMENUJS_VERSION.tgz
-	cd $CURRENT_DIR
-}
-
-
-# function to install the treemenu.js
-# -> this is for "make install" phase
-function openqrm_install_treemenu_js() {
-	mkdir -p $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/js
-	cp -aR $OPENQRM_BUILD_TMP_DIR/openqrm-build/treemenujs/treemenu.js $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/js/
-	cp -aR $OPENQRM_BUILD_TMP_DIR/openqrm-build/treemenujs/menu.js $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/js/
-}
-
-
-# function to get the treemenu icons
-# -> this is for "make " phase
-function openqrm_get_treemenu_icons() {
-	TREEMENU_ICONS_VERSION="0.1"
-	CURRENT_DIR=`pwd`
-	openqrm_cache_or_download treemenuicons
-	rm -rf "$OPENQRM_BUILD_TMP_DIR/openqrm-build/treemenuicons/treemenuicons"
-	cd $OPENQRM_BUILD_TMP_DIR/openqrm-build/treemenuicons/
-	tar -xzf source/treemenu-icons.$TREEMENU_ICONS_VERSION.tgz
-	cd $CURRENT_DIR
-}
-
-
-# function to install the treemenu icons
-# -> this is for "make install" phase
-function openqrm_install_treemenu_icons() {
-	mkdir -p $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu
-	cp -aR $OPENQRM_BUILD_TMP_DIR/openqrm-build/treemenuicons/*.png $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu
-}
-
-
-
-# function to get the phplib class
-# -> this is for "make " phase
-function openqrm_get_phplib() {
-	CURRENT_DIR=`pwd`
-	openqrm_cache_or_download phplib
-	cd $OPENQRM_BUILD_TMP_DIR/openqrm-build/phplib/
-	tar -xzf source/phplib.tgz
-	cd $CURRENT_DIR
-}
-
-
-# function to install the phplib class
-# -> this is for "make install" phase
-function openqrm_install_phplib() {
-	mkdir -p $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/class
-	cp -aR $OPENQRM_BUILD_TMP_DIR/openqrm-build/phplib/*.php $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/class/
-}
-
-
-# function to get the additional initrd-templates
-# -> this is for "make " phase
-function openqrm_get_initrd_templates() {
-#	openqrm_cache_or_download openqrm-initrd-template.centos.i386
-	openqrm_cache_or_download openqrm-initrd-template.centos.x86_64
-#	openqrm_cache_or_download openqrm-initrd-template.debian.i386
-	openqrm_cache_or_download openqrm-initrd-template.debian.x86_64
-#	openqrm_cache_or_download openqrm-initrd-template.ubuntu.i386
-	openqrm_cache_or_download openqrm-initrd-template.ubuntu.x86_64
-}
-
-
-# function to install the additional initrd-templates
-# -> this is for "make install" phase
-function openqrm_install_initrd_templates() {
-
-	CLIENT_VERSION="5.3.1"
-	KERNEL_ARCH=`uname -m`
-	if echo $KERNEL_ARCH | grep i.*86 1>/dev/null; then
-		# i386
-		OPENQRM_CLIENT_ARCH=i386
-	else
-		OPENQRM_CLIENT_ARCH=x86_64
-	fi
-	# find out the short distri name
-	if [ -f /etc/debian_version ]; then
-		# debian or ubuntu, try to find out without lsb-release which may not be installed
-		if grep -i ubuntu /etc/apt/sources.list 1>/dev/null; then
-			OPENQRM_SHORT_DISTRI_NAME="ubuntu"
-		else
-			OPENQRM_SHORT_DISTRI_NAME="debian"
-		fi
-	elif [ -f /etc/redhat-release ]; then
-		OPENQRM_SHORT_DISTRI_NAME="centos"
-	elif [ -f /etc/SuSE-release ]; then
-		OPENQRM_SHORT_DISTRI_NAME="centos"
-	fi
-
-#	cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-initrd-template.centos.i386/source/openqrm-initrd-template.$CLIENT_VERSION.centos.i386.tgz $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-initrd-template.centos.i386.tgz
-	cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-initrd-template.centos.x86_64/source/openqrm-initrd-template.$CLIENT_VERSION.centos.x86_64.tgz $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-initrd-template.centos.x86_64.tgz
-
-#	cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-initrd-template.debian.i386/source/openqrm-initrd-template.$CLIENT_VERSION.debian.i386.tgz $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-initrd-template.debian.i386.tgz
-	cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-initrd-template.debian.x86_64/source/openqrm-initrd-template.$CLIENT_VERSION.debian.x86_64.tgz $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-initrd-template.debian.x86_64.tgz
-
-#	cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-initrd-template.ubuntu.i386/source/openqrm-initrd-template.$CLIENT_VERSION.ubuntu.i386.tgz $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-initrd-template.ubuntu.i386.tgz
-	cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-initrd-template.ubuntu.x86_64/source/openqrm-initrd-template.$CLIENT_VERSION.ubuntu.x86_64.tgz $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-initrd-template.ubuntu.x86_64.tgz
-
-	# set the default initrd template for creating the default kernel during init
-	cp -a $OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-initrd-template.$OPENQRM_SHORT_DISTRI_NAME.$OPENQRM_CLIENT_ARCH/source/openqrm-initrd-template.$CLIENT_VERSION.$OPENQRM_SHORT_DISTRI_NAME.$OPENQRM_CLIENT_ARCH.tgz $DESTINATION_DIR$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-initrd-default.tgz
-
-}
-
-
-
-# --------------------------------------------------------------------
-# ------------------------- update function --------------------------
-# --------------------------------------------------------------------
-
-# function to run commands before the update of openQRM
-function openqrm_pre_update() {
-	$OPENQRM_SERVER_BASE_DIR/openqrm/bin/openqrm-update pre -f
-}
-
-# function to run commands after the update of openQRM
-function openqrm_post_update() {
-	$OPENQRM_SERVER_BASE_DIR/openqrm/bin/openqrm-update post -f
-}
-
-# function to update openQRM base
-function openqrm_base_update() {
-	$OPENQRM_SERVER_BASE_DIR/openqrm/bin/openqrm-update base -f
-}
-
-# function to update the openQRM initrds
-function openqrm_initrd_update() {
-	$OPENQRM_SERVER_BASE_DIR/openqrm/bin/openqrm-update initrds -f
-}
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/include/openqrm-functions b/openQRM-5.3.50-CE/src/include/openqrm-functions
deleted file mode 100644
index ae3547a..0000000
--- a/openQRM-5.3.50-CE/src/include/openqrm-functions
+++ /dev/null
@@ -1,813 +0,0 @@
-#!/bin/bash
-# this is the main function file for openQRM
-# only general + generic functions should go in here
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	echo "ERROR: Please export OPENQRM_SERVER_BASE_DIR before sourcing $0"
-	exit 1
-fi
-# some static defines
-OPENQRM_RESOURCE_PARAMETER_FILE="/var/openqrm/openqrm-resource.conf"
-OPENQRM_CMD_QUEUE_STARTING_LOCK="/var/run/openqrm/starting-queue-command.lock"
-
-# be sure cmd output is english
-export LANGUAGE=C
-export LANG=C
-export LC_ALL=C
-
-# A more portable "chkconfig".
-# Uses chkconfig or rc.d-update as found, if not then "manual".
-function openqrm_chkconfig() {
-	action="$1"
-	service="$2"
-
-	if [ $action != "add" ] && [ $action != "del" ] ; then
-		echo "openqrm_chkconfig: action must be either \"add\" or \"del\""
-		return 1
-	fi
-	if [ -z "${service}" ] ; then
-		echo "openqrm_chkconfig: service must be valid service name"
-		return 1
-	fi
-
-
-
-#	# For systemd
-	if [ -x /bin/systemd ] || [ -x /usr/bin/systemd ] ; then
-
-		case $action in
-			add)
-				if [ ! -d /etc/systemd/system/ ] ; then
-					mkdir -p /etc/systemd/system/
-				fi
-				if [ "${service}" == "openqrm-client" ] ; then
-					cp $OPENQRM_SERVER_BASE_DIR/openqrm/etc/systemd/system/openqrm-client.service /etc/systemd/system/openqrm-client.service
-				fi
-				/bin/systemctl enable ${service} 
-				/bin/systemctl daemon-reload
-				;;
-			del)
-				/bin/systemctl disable ${service}
-				/bin/systemctl daemon-reload
-				;;
-		esac
-
-#	# For Redhat/SuSe
-	elif [ -x /sbin/chkconfig ] ; then
-		ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d/openqrm-client /etc/init.d/openqrm-client
-	
-		case $action in
-			add)
-				local do_chkconfig=1
-				# check if the init is not configured
-				chkconfig --list ${service} > /dev/null 2>&1 && do_chkconfig=
-
-				# maybe it is configured, but for our runlevel not (tam)
-				if [ -z "$do_chkconfig" ]; then
-					do_chkconfig=1
-					local runlevel=$(grep initdefault /etc/inittab | grep id |cut -d ':' -f2)
-					for f in /etc/rc${runlevel}.d/S??${service} /etc/init.d/rc${runlevel}.d/S??${service}; do
-						[ -e $f ] && do_chkconfig=
-					done
-				fi
-				if [ $do_chkconfig ]; then
-					chkconfig --add ${service}
-					if [ ! -f /etc/UnitedLinux-release ]; then
-						chkconfig ${service} on
-					else
-						chkconfig --add ${service}
-					fi
-				fi
-				;;
-			del)
-				#check if service exists
-				if chkconfig --list ${service} > /dev/null 2>&1 ; then
-					chkconfig --del ${service}
-				fi
-				;;
-
-		esac
-	# For Debian/Ubuntu
-	elif [ -x /usr/sbin/update-rc.d ] ; then
-		# according to manuals, update-rc.d does nothing if links already exist
-		
-		ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d/openqrm-client /etc/init.d/openqrm-client
-		
-		if [ $action == "add" ] ; then
-			# check for start + stop leven
-			start_l=`grep chkconfig /etc/init.d/${service} | grep ^'#' | awk {' print $4 '}`
-			stop_l=`grep chkconfig /etc/init.d/${service} | grep ^'#' | awk {' print $5 '}`
-			update-rc.d ${service}  defaults $start_l $stop_l
-			# check for upstart
-			if [ "$service" == "openqrm" ]; then
-				# debian 6 using insserv, be sure to start in rc 2
-				/bin/cp -a /etc/rc3.d/S*openqrm /etc/rc2.d/
-				if [ -d /etc/init/ ]; then
-					echo '# openQRM - starts openQRM' > /etc/init/openqrm.conf
-					echo 'description       "openQRM Server"' >> /etc/init/openqrm.conf
-					echo 'start on net-device-up' >> /etc/init/openqrm.conf
-					echo 'exec /etc/init.d/openqrm start' >> /etc/init/openqrm.conf
-				fi
-			fi
-			if [ "$service" == "openqrm-client" ]; then
-				# debian 6 using insserv, be sure to start in rc 2
-				/bin/cp -a /etc/rc3.d/S*openqrm-client /etc/rc2.d/
-				if [ -d /etc/init/ ]; then
-					echo '# openQRM Client - starts openQRM Client' > /etc/init/openqrm-client.conf
-					echo 'description       "openQRM Client"' >> /etc/init/openqrm-client.conf
-					echo 'start on net-device-up' >> /etc/init/openqrm-client.conf
-					echo 'exec /etc/init.d/openqrm-client start' >> /etc/init/openqrm-client.conf
-				fi
-			fi
-			if [ "$service" == "openqrm-local-vm-client" ]; then
-				# debian 6 using insserv, be sure to start in rc 2
-				/bin/cp -a /etc/rc3.d/S*openqrm-local-vm-client /etc/rc2.d/
-				if [ -d /etc/init/ ]; then
-					echo '# openQRM Client - starts openQRM Client' > /etc/init/openqrm-local-vm-client.conf
-					echo 'description       "openQRM Client"' >> /etc/init/openqrm-local-vm-client.conf
-					echo 'start on net-device-up' >> /etc/init/openqrm-local-vm-client.conf
-					echo 'exec /etc/init.d/openqrm-local-vm-client start' >> /etc/init/openqrm-local-vm-client.conf
-				fi
-			fi
-		elif [ $action == "del" ] ; then
-			update-rc.d -f ${service} remove 1>/dev/null 2>&1
-			# check for upstart
-			if [ "$service" == "openqrm-client" ]; then
-				# debian 6 using insserv, remove from rc 2
-				rm -f /etc/rc2.d/S*openqrm-client
-				if [ -e /etc/init/openqrm-client.conf ]; then
-					rm -f /etc/init/openqrm-client.conf
-				fi
-			fi
-			if [ "$service" == "openqrm" ]; then
-				rm -f /etc/rc2.d/S*openqrm
-				if [ -e /etc/init/openqrm.conf ]; then
-					rm -f /etc/init/openqrm.conf
-				fi
-			fi
-			if [ "$service" == "openqrm-local-vm-client" ]; then
-				rm -f /etc/rc2.d/S*openqrm-local-vm-client
-				if [ -e /etc/init/openqrm-local-vm-client.conf ]; then
-					rm -f /etc/init/openqrm-local-vm-client.conf
-				fi
-			fi
-		fi
-	# "Manual".  Uses S91 by default
-	else
-		ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d/openqrm-client /etc/init.d/openqrm-client
-	
-		# Get default runlevel
-		runlevel=$( grep default /etc/inittab | grep ^id: | cut -f 2 -d: )
-
-		# Find directory for script links
-		if [ -d /etc/rc.d/ ] ; then
-				rcdir=/etc/rc.d/rc${runlevel}.d
-		else
-				rcdir=/etc/rc${runlevel}.d
-		fi
-
-		if [ $action == "add" ] ; then
-			if [ ! -f $rcdir/S??${service} ] && [ -f /etc/init.d/${service} ] ; then
-				   ln -s /etc/init.d/${service} $rcdir/S91${service}
-			fi
-		elif [ $action == "del" ] ; then
-			if [ -f $rcdir/S??${service} ] ; then
-				   rm $rcdir/S??${service}
-			fi
-		fi
-	fi
-	return 0
-}
-
-
-
-# create short name for distro for the package stage
-function openqrm_get_distro() {
-	# find out which distribution it is
-	# find out which version it is
-	# give the ROOT_DIR as the first cmdline param
-	local ROOT_DIR=${1:-/}
-	if [ -f $ROOT_DIR/etc/fedora-release ]; then
-		RELEASE=$(cat $ROOT_DIR/etc/fedora-release | head -1)
-			case $RELEASE in
-				*Fedora*9*)
-					echo "fedora9"
-					;;
-				*Fedora*10*)
-					echo "fedora10"
-					;;
-				*)
-					echo "fedora"
-					;;
-			esac
-	elif [ -f $ROOT_DIR/etc/redhat-release ]; then
-		RELEASE=$(cat $ROOT_DIR/etc/redhat-release | head -1)
-		case $RELEASE in
-			*Werewolf*)
-				echo "fc8"
-				;;
-			*Moonshine*)
-				echo "fc7"
-				;;
-			*Zod*)
-				echo "fc6"
-				;;
-			*Bordeaux*)
-				echo "fc5"
-				;;
-			*Stentz*)
-				echo "fc4"
-				;;
-			*Nahant*)
-				echo "el4"
-				;;
-			*Shrike*)
-				echo "rh9"
-				;;
-			*Psyche*)
-				echo "rh8"
-				;;
-			*Valhalla*)
-				echo "rh73"
-				;;
-			*Taroon*)
-				echo "el3"
-				;;
-			*CentOS*5*)
-				echo "centos5"
-				;;
-			*CentOS*6*)
-				echo "centos6"
-				;;
-			*CentOS*7*)
-				echo "centos7"
-				;;
-			*)
-				echo "rh"
-				;;
-		esac
-	elif [ -f $ROOT_DIR/etc/UnitedLinux-release ]; then
-		RELEASE=$(cat $ROOT_DIR/etc/UnitedLinux-release | head -1)
-		case $RELEASE in
-			*UnitedLinux*)
-				echo "suse8"
-				;;
-			*)
-				echo "suse"
-				;;
-		esac
-	elif [ -f $ROOT_DIR/etc/SuSE-release ]; then
-		RELEASE=$(cat $ROOT_DIR/etc/SuSE-release | head -1)
-		case $RELEASE in
-			*openSUSE*10*)
-				echo "opensuse10"
-				;;
-			*SUSE*9*)
-				echo "suse9"
-				;;
-			*SUSE*10*)
-				echo "suse10"
-				;;
-			*SUSE*11*)
-				echo "suse11"
-				;;
-			*)
-				echo "suse"
-				;;
-		esac
-
-	elif [ -f $ROOT_DIR/etc/debian_version ]; then
-		RELEASE=$(cat $ROOT_DIR/etc/debian_version | head -1)
-		case $RELEASE in
-			*3.1*)
-				echo "debian31"
-				;;
-			*4.0*)
-				echo "debian40"
-				;;
-			*5.0*)
-				echo "debian50"
-				;;
-			*lenny/sid*)
-				if [ -f $ROOT_DIR/etc/lsb-release ]; then
-					if grep hardy $ROOT_DIR/etc/lsb-release 1>/dev/null; then
-						echo "ubuntu804"
-					elif grep intrepid $ROOT_DIR/etc/lsb-release 1>/dev/null; then
-						echo "ubuntu810"
-					else
-						echo "ubuntu804"
-					fi
-				else
-					echo "ubuntu804"
-				fi
-				;;
-			*)
-				echo "debian"
-				;;
-		esac
-	else
-		echo "generic"
-	fi
-}
-
-#
-# get the distribution name
-# $1:      root directory of the installation (optional; default is "/")
-# returns: one of fedora|rhel|suse|ubuntu|debian|unknown
-#
-function openqrm_get_distro_name() {
-	local ROOT_DIR=${1:-/}
-	if [-f "$ROOT_DIR/etc/fedora-release" ]; then
-		echo "fedora"
-	elif [ -f "$ROOT_DIR/etc/redhat-release" ]; then
-		# CentOS uses /etc/redhat-release, too
-		echo 'rhel';
-	elif [ -f "$ROOT_DIR/etc/UnitedLinux-release" ]; then
-		echo "suse"
-	elif [ -f "$ROOT_DIR/etc/SuSE-release" ]; then
-		echo "suse"
-	elif [ -f "$ROOT_DIR/etc/ubuntu_version" ]; then
-		echo "ubuntu"
-	elif [ -f "$ROOT_DIR/etc/debian_version" ]; then
-		echo "debian"
-	else
-		echo "unknown"
-	fi
-}
-
-#
-# get the distribution's version
-#
-# you can choose to get the result as integer or as string. Use the integer
-# output if you want to have a condition like distro_version > 100 (equals 10.0)
-# Use string output for user-visible display. Default is "string".
-#
-# Note one Debian specific feature: if testing/unstable is installed (there is no 
-# version number for these), "string" will return "testing/unstable", "integer" 
-# returns -1!
-# 
-# Note that old Redhat releases (before 2003, ending with Redhat 9) are NOT
-# supported. There is only RedHat Enterprise (RHEL) and Fedora.
-#
-# integer will return 
-# - version * 10 (e.g. 103 instead of 10.3) for Debian and SUSE
-# - version for RHEL/CentOS and Fedora
-#
-# FIXME: use lsb_release as soon as it is usable by many distributions 
-# (required since LSB 3.0, but not installed by default on RHEL/CentOS)
-# 
-#
-# $1:      string|integer return as integer or as string (optional; default is string)
-# $2:      root directory of the installation (optional; default is "/")
-# returns: the distribution's version number
-#
-function openqrm_get_distro_version() {
-	local RETURN_AS=$1
-	if [ "$1" == '' ]; then
-		RETURN_AS=string
-	fi
-
-	case `openqrm_get_distro_name()` in
-		"suse")
-			# tested with: openSUSE 10.3
-			# XXX: This is not tested for SLES/SLED yet
-			if [ $RETURN_AS == 'string' ]; then
-				local VERSION=$(cat "$ROOT_DIR/etc/SuSE-release" | tail -1 | sed 's/VERSION = \([0-9]\+\.[0-9]\)/\1/')
-				echo $VERSION
-			elif [ $RETURN_AS == 'integer' ]; then
-				local VERSION=$(cat "$ROOT_DIR/etc/SuSE-release" | tail -1 | sed 's/VERSION = \([0-9]\+\)\.\([0-9]\)/\1\2/')
-				echo $VERSION
-			fi
-		;;
-		"rhel")
-			# tested with: CentOS 5.1
-			# XXX: RHEL/CentOS does not give us the service release number (e.g. only 5 instead of 5.1)
-			local VERSION=$(cat "$ROOT_DIR/etc/redhat-release" | head -n1 | sed 's/.*release \([0-9]\+\).*/\1/')
-						echo $VERSION
-		;;
-		"fedora")
-			# tested with: Fedora Core 3, Fedora Core 6, Fedora 8
-						local VERSION=$(cat "$ROOT_DIR/etc/fedora-release" | head -n1 | sed 's/.*release \([0-9]\+\) .*/\1/')
-						echo $VERSION
-		;;
-		"debian")
-			# tested with: 4.0 (etch), unstable/testing
-			if [ $RETURN_AS == 'string' ]; then
-								local VERSION=$(cat "$ROOT_DIR/etc/debian_version")
-								echo $VERSION
-						elif [ $RETURN_AS == 'integer' ]; then
-				if [ `cat "$ROOT_DIR/etc/debian_version"` == 'testing/unstable' ]; then
-					echo -1
-				else
-									local VERSION=$(cat "$ROOT_DIR/etc/debian_version" | sed 's/\([0-9]\+\)\.\([0-9]\)/\1\2/')
-									echo $VERSION
-				fi
-			fi
-			;;
-			*)
-			echo 0
-			;;
-	esac
-}
-
-
-
-# function to send events to the openQRM-server
-# param 1 = resource_id
-# param 2 = event_name
-# param 3 = event_priority
-# param 4 = event_source
-# param 5 = event_description
-function openqrm_post_event() {
-	resource_id=`urlencodestring $1`
-	event_name=`urlencodestring $2`
-	event_priority=`urlencodestring $3`
-	event_source=`urlencodestring $4`
-	event_description=`urlencodestring $5`
-	# are we on the openQRM server or on a resource ?
-	if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-		. $OPENQRM_RESOURCE_PARAMETER_FILE
-	elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-		. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-		. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-		openqrm_server_get_config
-		resource_id=0
-		resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-		openqrm_web_protocol=$OPENQRM_WEB_PROTOCOL
-	fi
-	# define wget to use with https
-	if [ "$openqrm_web_protocol" == "https" ]; then
-		WGET_NO_CERT_CHECK="--no-check-certificate"
-	fi
-	MESSAGEDATA="resource_id=$resource_id&event_name=$event_name&event_priority=$event_priority&event_source=$event_source&event_description=$event_description";
-	OPENQRM_RESOURCE_EVENT_URL="$openqrm_web_protocol://$resource_openqrmserver/openqrm/action/resource-monitor.php?resource_command=post_event&$MESSAGEDATA"
-	wget -q $WGET_NO_CERT_CHECK -O /dev/null --tries=200 --retry-connrefused -T 10 --random-wait --no-proxy "$OPENQRM_RESOURCE_EVENT_URL" &
-}
-
-
-
-# a generic function to start portmap
-# -> on some systems (e.g. fedora) we need to start rpcbind
-function openqrm_portmap_start() {
-	if which rpcbind 1>/dev/null; then
-		rpcbind
-		rpc.statd
-	else
-		portmap
-	fi
-}
-
-
-
-# a generic function to stop portmap
-# -> on some systems (e.g. fedora) we need to stop rpcbind
-function openqrm_portmap_stop() {
-	if which rpcbind 1>/dev/null; then
-		killall rpc.statd
-		killall rpcbind
-	else
-		killall portmap
-	fi
-}
-
-
-
-
-# a function to validate an ip address
-function openqrm_validate_ip() {
-	IP_A=$1
-	OLDIFS=$IFS
-	IFS=.
-	set -- $IP_A
-	if [ "$#" -ne "4" ]; then
-		IFS=$OLDIFS
-		return 1
-	fi
-
-	for oct in $1 $2 $3 $4; do
-		echo $oct | egrep "^[0-9]+$" >/dev/null 2>&1
-		if [ "$?" -ne "0" ]; then
-			IFS=$OLDIFS
-			return 1
-		else
-			if [ "$oct" -lt "0" -o "$oct" -gt "255" ]; then
-				IFS=$OLDIFS
-				return 1
-			fi
-		fi
-	done
-	echo "$IP_A" | grep "\.$" >/dev/null 2>&1
-	if [ "$?" -eq "0" ]; then
-		IFS=$OLDIFS
-		return 1
-	fi
-	IFS=$OLDIFS
-	return 0
-}
-
-
-
-
-# a generic function to get the LVM volumes paths
-# newer version of lvdisplay (>=2.02.95 in Ubuntu 12.10) output "LV Path"  instead of "LV Name"
-# https://github.com/stevenshiau/clonezilla/blob/master/sbin/ocs-lvm2-stop
-function openqrm_get_lvm_volume_paths() {
-	if lvdisplay | grep -E "LV Path" 1>/dev/null; then
-		LVM_VOLME_GREP="LV Path"
-	else
-		LVM_VOLME_GREP="LV Name"
-	fi
-	lvdisplay | grep "$LVM_VOLME_GREP" | awk {' print $3 '}
-}
-
-
-
-# reciever command queue locking function, one queue per <sub-section-name>
-# use like :
-# LOCK_TIME=`openqrm_lock_queue aquire <sub-section-name>`
-# run-locked-commands
-# openqrm_lock_queue release <sub-section-name> $LOCK_TIME
-#
-function openqrm_lock_queue() {
-	local COMMAND=$1
-	local SUBSECTION=$2
-	local OPENQRM_CMD_LOCK_FILE=/var/run/openqrm/lock-$SUBSECTION.lock
-	local OPENQRM_CMD_LOCK_DELAY=2
-	local OPENQRM_CMD_LOCK_RETRY=1200
-	local OPENQRM_CMD_LOCK_TIMEOUT=240
-	local OPENQRM_CMD_QUEUE_WARNING_1=30
-	local OPENQRM_CMD_QUEUE_WARNING_2=60
-	local OPENQRM_CMD_QUEUE_WARNING_3=90
-
-	local OPENQRM_CMD_QUEUE_WARNING_LIMIT_1=10
-	local OPENQRM_CMD_QUEUE_WARNING_LIMIT_2=50
-	local OPENQRM_CMD_QUEUE_WARNING_LIMIT_3=100
-
-	if [ -f "$OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions" ]; then
-		resource_id=0
-	else
-		. $OPENQRM_RESOURCE_PARAMETER_FILE
-	fi
-	local LOCK_FILE_DIR=`dirname $OPENQRM_CMD_LOCK_FILE`
-	if [ ! -d "$LOCK_FILE_DIR" ]; then
-		mkdir -p "$LOCK_FILE_DIR"
-	fi
-	case "$COMMAND" in
-		aquire)
-			local EXACTNOW=`date +%s%N`
-			trap "rm -f $OPENQRM_CMD_LOCK_FILE.$EXACTNOW" EXIT
-			lockfile -s $OPENQRM_CMD_LOCK_DELAY -r $OPENQRM_CMD_LOCK_RETRY -l $OPENQRM_CMD_LOCK_TIMEOUT $OPENQRM_CMD_LOCK_FILE.$EXACTNOW
-			echo $$ > $OPENQRM_CMD_LOCK_FILE.$EXACTNOW
-			local LOOP_TIMEOUT=0
-			local LOCK_TIMESTAMP_LAST=""
-			while (:); do
-				LOCK_TIMESTAMP_NEXT=`ls $OPENQRM_CMD_LOCK_FILE.* 2>/dev/null | cut -d '.' -f3 | sort -g | head -n1 2>/dev/null | grep -v $EXACTNOW`
-				if [ "$LOCK_TIMESTAMP_NEXT" == "" ]; then
-					openqrm_post_event $resource_id "aquire $SUBSECTION" 5 "openqrm_lock_queue" "NOTICE: Resource $resource_id running cmd $0 - $EXACTNOW" 1>/dev/null 2>&1
-					break
-				else
-					if [ "$EXACTNOW" == "$LOCK_TIMESTAMP_NEXT" ]; then
-						openqrm_post_event $resource_id "aquire $SUBSECTION" 5 "openqrm_lock_queue" "NOTICE: Resource $resource_id running cmd $0 running now - $EXACTNOW == $LOCK_TIMESTAMP_NEXT" 1>/dev/null 2>&1
-						break
-					else
-						# debug + reporting
-						if [ "$LOOP_TIMEOUT" == "$OPENQRM_CMD_QUEUE_WARNING_1" ] || [ "$LOOP_TIMEOUT" == "$OPENQRM_CMD_QUEUE_WARNING_2" ] || [ "$LOOP_TIMEOUT" == "$OPENQRM_CMD_QUEUE_WARNING_3" ]; then
-							BLOCK_PID=`cat $OPENQRM_CMD_LOCK_FILE.$LOCK_TIMESTAMP_NEXT 2>/dev/null`
-							openqrm_post_event $resource_id "aquire $SUBSECTION" 5 "openqrm_lock_queue" "NOTICE: Resource $resource_id cmd $0 waiting for PID $BLOCK_PID to finish - $EXACTNOW != $LOCK_TIMESTAMP_NEXT - $LOOP_TIMEOUT" 1>/dev/null 2>&1
-							WAITING_COMMANDS=`ls $OPENQRM_CMD_LOCK_FILE.* 2>/dev/null | wc -l`
-							if [ "$WAITING_COMMANDS" != "" ]; then
-								if [ $WAITING_COMMANDS -gt $OPENQRM_CMD_QUEUE_WARNING_LIMIT_3 ];  then
-									openqrm_post_event $resource_id "aquire $SUBSECTION" 9 "openqrm_lock_queue" "ERROR: Resource $resource_id cmd $0 reporting $WAITING_COMMANDS waiting commands in $SUBSECTION queue" 1>/dev/null 2>&1
-								elif [ $WAITING_COMMANDS -gt $OPENQRM_CMD_QUEUE_WARNING_LIMIT_2 ];  then
-									openqrm_post_event $resource_id "aquire $SUBSECTION" 9 "openqrm_lock_queue" "ERROR: Resource $resource_id cmd $0 reporting $WAITING_COMMANDS waiting commands in $SUBSECTION queue" 1>/dev/null 2>&1
-								elif [ $WAITING_COMMANDS -gt $OPENQRM_CMD_QUEUE_WARNING_LIMIT_1 ];  then
-									openqrm_post_event $resource_id "aquire $SUBSECTION" 9 "openqrm_lock_queue" "WARNING: Resource $resource_id cmd $0 reporting $WAITING_COMMANDS waiting commands in $SUBSECTION queue" 1>/dev/null 2>&1
-								else
-									openqrm_post_event $resource_id "aquire $SUBSECTION" 5 "openqrm_lock_queue" "NOTICE: Resource $resource_id cmd $0 reporting $WAITING_COMMANDS waiting commands in $SUBSECTION queue" 1>/dev/null 2>&1
-								fi
-							else
-								openqrm_post_event $resource_id "aquire $SUBSECTION" 5 "openqrm_lock_queue" "NOTICE: Resource $resource_id cmd $0 reporting no waiting commands in $SUBSECTION queue" 1>/dev/null 2>&1
-							fi
-						fi
-					fi
-				fi
-
-				if [ "$LOCK_TIMESTAMP_NEXT" == "$LOCK_TIMESTAMP_LAST" ]; then
-					LOOP_TIMEOUT=$(( LOOP_TIMEOUT + 1 ))
-				else
-					# new command, reset loop counter
-					LOOP_TIMEOUT=0
-				fi
-				if [ "$OPENQRM_CMD_LOCK_RETRY" == "$LOOP_TIMEOUT" ]; then
-					BLOCK_PID=`cat $OPENQRM_CMD_LOCK_FILE.$LOCK_TIMESTAMP_NEXT 2>/dev/null`
-					kill $BLOCK_PID 2>/dev/null
-					rm -f $OPENQRM_CMD_LOCK_FILE.$LOCK_TIMESTAMP_NEXT
-					LOCK_TIMESTAMP_LAST=$LOCK_TIMESTAMP_NEXT
-					openqrm_post_event $resource_id "aquire $SUBSECTION" 3 "openqrm_lock_queue" "ERROR: Resource $resource_id cmd $0 could not get lock after $OPENQRM_CMD_LOCK_RETRY retries!" 1>/dev/null 2>&1
-					openqrm_post_event $resource_id "aquire $SUBSECTION" 3 "openqrm_lock_queue" "ERROR: Resource $resource_id cmd $0 stopped blocking process $BLOCK_PID" 1>/dev/null 2>&1
-					openqrm_post_event $resource_id "aquire $SUBSECTION" 9 "openqrm_lock_queue" "WARNING: Resource $resource_id force removed lock $OPENQRM_CMD_LOCK_FILE.$LOCK_TIMESTAMP_NEXT" 1>/dev/null 2>&1
-					break
-				fi
-				LOCK_TIMESTAMP_LAST=$LOCK_TIMESTAMP_NEXT
-				sleep $OPENQRM_CMD_LOCK_DELAY
-			done
-			# output timestamp
-			echo $EXACTNOW
-			trap '' EXIT
-			return 0
-			;;
-		release)
-			local LOCKFILE_TIMESTAMP=$3
-			if [ "$LOCKFILE_TIMESTAMP" == "" ]; then
-				openqrm_post_event $resource_id "release $SUBSECTION" 3 "openqrm_lock_queue" "ERROR: Resource $resource_id cmd $0 lock parameter wrong" 1>/dev/null 2>&1
-				return 1
-			fi
-			if [ ! -f "$OPENQRM_CMD_LOCK_FILE.$LOCKFILE_TIMESTAMP" ]; then
-				return 1
-			fi
-			/bin/rm -f $OPENQRM_CMD_LOCK_FILE.$LOCKFILE_TIMESTAMP
-			openqrm_post_event $resource_id "release $SUBSECTION" 5 "openqrm_lock_queue" "NOTICE: Resource $resource_id cmd $0 released the lock $OPENQRM_CMD_LOCK_FILE.$LOCKFILE_TIMESTAMP" 1>/dev/null 2>&1
-			return 0
-			;;
-		*)
-			openqrm_post_event $resource_id "release $SUBSECTION" 3 "openqrm_lock_queue" "ERROR: Resource $resource_id cmd $0 command parameter wrong" 1>/dev/null 2>&1
-			return 1
-			;;
-	esac
-}
-
-
-# function to unblock the starting command queue
-function openqrm_unblock_starting_queue() {
-	if ! echo $@ | grep "\-\-openqrm\-internal\-cmd" 1>/dev/null; then
-		if echo $@ | grep "\-\-openqrm\-ui\-user" 1>/dev/null; then
-			rm -f /var/run/openqrm/starting-queue-command.lock.ui-cmd-queue
-		else
-			rm -f /var/run/openqrm/starting-queue-command.lock.bg-cmd-queue
-		fi
-	fi
-}
-
-
-
-function openqrm_format_error_msg() {
-	ERROR_MSG=$@
-	if [ ! -d /var/log/openqrm/ ]; then
-		mkdir -p /var/log/openqrm/
-	fi
-	echo "openQRM command error: "$ERROR_MSG | logger
-	echo $ERROR_MSG | cut -b1-200 > /var/log/openqrm/$$.log
-	sed -i -e "s/\"//g" /var/log/openqrm/$$.log
-	sed -i -e "s/\'//g" /var/log/openqrm/$$.log
-	sed -i -e "s/\`//g" /var/log/openqrm/$$.log
-	sed -i -e "s/'//g" /var/log/openqrm/$$.log
-	FORMAT_ERROR_MSG=`cat /var/log/openqrm/$$.log`
-	FORMAT_ERROR_MSG=`urlencodestring $FORMAT_ERROR_MSG`
-	rm -f /var/log/openqrm/$$.log
-	echo $FORMAT_ERROR_MSG
-}
-
-
-
-function openqrm_global_lock() {
-	local LOCK_CMD=$1
-	local SECTION=$2
-	local OPENQRM_USER=$3
-	local OPENQRM_PASSWORD=$4
-	local TOKEN=$5
-	local DESCRIPTION=`urlencodestring $6`
-	local GB_TIMEOUT=120
-	local GB_LOOP=0
-
-	# are we on the openQRM server or on a resource ?
-	if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-		. $OPENQRM_RESOURCE_PARAMETER_FILE
-	elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-		. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-		. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-		openqrm_server_get_config
-		resource_id=0
-		resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-		openqrm_web_protocol=$OPENQRM_WEB_PROTOCOL
-	fi
-	# define wget to use with https
-	if [ "$openqrm_web_protocol" == "https" ]; then
-		WGET_NO_CERT_CHECK="--no-check-certificate"
-	fi
-	if [ "$LOCK_CMD" != "aquire" ] && [ "$LOCK_CMD" != "release" ]; then
-		openqrm_post_event $resource_id "lock" 3 "aquire_global_lock" "Wrong lock command parameter! Use aquire and release." 1>/dev/null 2>&1
-		return 1
-	fi
-
-	OPENQRM_GLOBAL_LOCK_URL="$openqrm_web_protocol://$resource_openqrmserver/openqrm/base/api.php?action=lock&lock=$LOCK_CMD&resource_id=$resource_id&section=$SECTION&token=$TOKEN&description=$DESCRIPTION"
-	while (:); do
-		unset GLOBAL_LOCK_ID
-		GLOBAL_LOCK_ID=`wget -q $WGET_NO_CERT_CHECK --http-user=$OPENQRM_USER --http-passwd=$OPENQRM_PASSWORD -O - "$OPENQRM_GLOBAL_LOCK_URL"`
-		if [ "$?" != 0 ]; then
-			echo "ERROR: Could not post global lock to the openQRM-server at $resource_openqrmserver !" | logger
-			return 1
-		fi
-		if [ "$GLOBAL_LOCK_ID" != "" ]; then
-			if [[ $GLOBAL_LOCK_ID = *[[:digit:]]* ]]; then
-				openqrm_post_event $resource_id "lock" 5 "aquire_global_lock" "$LOCK_CMD global lock $GLOBAL_LOCK_ID for section $SECTION." 1>/dev/null 2>&1
-				return 0
-			fi
-		else
-			if [ "$LOCK_CMD" == "release" ]; then
-				return 0
-			fi
-		fi
-		if [ "$GB_TIMEOUT" == "$GB_LOOP" ]; then
-			openqrm_post_event $resource_id "lock" 3 "aquire_global_lock" "Giving up $LOCK_CMD global lock $GLOBAL_LOCK_ID for section $SECTION after $GB_TIMEOUT secs." 1>/dev/null 2>&1
-			return 1
-		fi
-		sleep 1
-	done
-	return 0
-}
-
-
-
-
-function urlencodechar() {
-	# notice : "%", "*" and "\" are not supported
-	UCHAR=$1
-	UCHAR=${UCHAR/\~/%7E}
-	UCHAR=${UCHAR/\!/%21}
-	UCHAR=${UCHAR/\@/%40}
-	UCHAR=${UCHAR/\\#/%23}
-	UCHAR=${UCHAR/\\$/%24}
-	#UCHAR=${UCHAR/\%/%25}
-	UCHAR=${UCHAR/\^/%5E}
-	UCHAR=${UCHAR/\&/%26}
-	#UCHAR=${UCHAR/\\*/%2A}
-	UCHAR=${UCHAR/\(/%28}
-	UCHAR=${UCHAR/\)/%29}
-	UCHAR=${UCHAR/\+/%2B}
-	UCHAR=${UCHAR/\|/%7C}
-	UCHAR=${UCHAR/\{/%7B}
-	UCHAR=${UCHAR/\}/%7D}
-	UCHAR=${UCHAR/\:/%3A}
-	UCHAR=${UCHAR/\"/%22}
-	UCHAR=${UCHAR/\</%3C}
-	UCHAR=${UCHAR/\>/%3E}
-	UCHAR=${UCHAR/\\?/%3F}
-	UCHAR=${UCHAR/\`/%60}
-	UCHAR=${UCHAR/\=/%3D}
-	#UCHAR=${UCHAR/\\/%5C}
-	UCHAR=${UCHAR/\[/%5B}
-	UCHAR=${UCHAR/\]/%5D}
-	UCHAR=${UCHAR/\;/%3B}
-	UCHAR=${UCHAR/\'/%27}
-	UCHAR=${UCHAR/\,/%2C}
-	UCHAR=${UCHAR/\//%2F}
-	# whitespace
-	if [ -z $UCHAR ]; then
-			UCHAR=%20
-	fi
-	echo "$UCHAR"
-}
-
-
-function urlencodestring() {
-	USERINPUT=$@
-	LENGTH=${#USERINPUT}
-	for (( LOOP=0; LOOP<$LENGTH; LOOP++ )); do
-		TESTCHAR=`echo ${USERINPUT:$LOOP:1}`
-		TESTCHAR=`urlencodechar $TESTCHAR`
-		echo -n $TESTCHAR
-	done
-}
-
-
-# a generic function to manage the openQRM webserver
-function openqrm_webserver() {
-	local ACTION=$1
-	if [ -f /etc/debian_version ]; then
-		/etc/init.d/apache2 $ACTION
-	elif [ -f /etc/redhat-release ]; then
-		if [ -f /etc/centos-release ]; then
-			systemctl $ACTION httpd
-		else
-			/etc/init.d/httpd $ACTION
-		fi
-	elif [ -f /etc/SuSE-release ]; then
-		/etc/init.d/apache2 $ACTION
-	fi
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/include/openqrm-package-functions b/openQRM-5.3.50-CE/src/include/openqrm-package-functions
deleted file mode 100644
index ab3b58f..0000000
--- a/openQRM-5.3.50-CE/src/include/openqrm-package-functions
+++ /dev/null
@@ -1,780 +0,0 @@
-#!/bin/bash
-# this is the package function file for openQRM
-# only functions needed for packaging should go in here
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	echo "ERROR: Please export OPENQRM_SERVER_BASE_DIR before sourcing $0"
-	exit 1
-fi
-if [ "$OPENQRM_SOURCE_DIR" == "" ]; then
-	echo "ERROR: Please export OPENQRM_SOURCE_DIR before sourcing $0"
-	exit 1
-fi
-
-# get the openqrm-server configuration + functions
-if [ -f $OPENQRM_SOURCE_DIR/etc/openqrm-server.conf ]; then
-	. $OPENQRM_SOURCE_DIR/etc/openqrm-server.conf
-	. $OPENQRM_SOURCE_DIR/include/openqrm-functions
-	for VAR in `cat $OPENQRM_SOURCE_DIR/etc/openqrm-server.conf | grep -v ^# | grep OPENQRM | cut -d'=' -f1`; do
-		eval `export $VAR`
-	done
-	PACKAGE_MANAGER_TIME_OUT=3600
-else
-	PACKAGE_MANAGER_TIME_OUT=30
-fi
-# get distribution
-export OPENQRM_PACKAGE_DISTRIBUTION=`openqrm_get_distro`
-
-
-# runs a command with a timeout
-function openqrm_cmd_timeout() {
-	sleep_time=$PACKAGE_MANAGER_TIME_OUT
-	command=$@
-	$command &
-	cmd_pid=$!
-	( sleep $sleep_time && kill $cmd_pid &>/dev/null && echo "Stopped $command due to timeout $sleep_time exceeded" ) &
-	killer_pid=$!
-	wait $cmd_pid &> /dev/null
-	wait_status=$?
-	if [ $wait_status == 0 ]; then
-		disown $killer_pid
-		kill $killer_pid &>/dev/null
-	fi
-	return $wait_status
-}
-
-
-
-
-
-#
-# updates the system's package manager
-#
-# returns the return code of the package manager; the only reliable check is
-# to check for a non-zero returncode (which means an error has occurred).
-#
-function openqrm_update_package_manager() {
-	local PACKAGE=$1
-	# check which dependencies to use
-	if [ -f /etc/debian_version ]; then
-		WHOAMI=`whoami`
-		if [ "$WHOAMI" != "root" ]; then
-			export SUDO="sudo"
-		fi
-		openqrm_cmd_timeout $SUDO apt-get update
-	fi
-}
-
-
-#
-# Install a system dependency using the system's package manager
-#
-# $1: package name
-# returns the return code of the package manager; the only reliable check is
-# to check for a non-zero returncode (which means an error has occurred).
-#
-function openqrm_install_os_dependency() {
-	local PACKAGE=$1
-	# check which dependencies to use
-	if [ -f /etc/debian_version ]; then
-		WHOAMI=`whoami`
-		if [ "$WHOAMI" != "root" ]; then
-			export SUDO="sudo"
-		fi
-
-		# support different php versions on debian/ubuntu
-		ADAPT_PACKAGE=false
-		if echo $PACKAGE | grep ^php 1>/dev/null; then
-		    ADAPT_PACKAGE=true
-		fi
-		if [ "$PACKAGE" == "libapache2-mod-php" ]; then
-		    ADAPT_PACKAGE=true
-		fi
-		if [ "$ADAPT_PACKAGE" == "true" ]; then
-		    PHP_VERSION=`apt-cache search php | grep ^'php[0-9].* ' | awk {' print $1 '} | grep -v '-' | grep -v cc | head -n1 | sed -e "s/php//g"`
-		    if [ "$PHP_VERSION" == "" ]; then
-			echo "ERROR: Could not find PHP version to install!"
-			echo "-> please install $PACKAGE manually!"
-			return 1
-		    fi
-		    # php-xml does not exists in php version 5
-		    if [ "$PACKAGE" == "php-xml" ]; then
-			if echo $PHP_VERSION | grep ^5 1>/dev/null; then
-			    return 0
-			fi
-		    fi
-		    # php modules
-		    if echo $PACKAGE | grep ^php-* 1>/dev/null; then
-			PACKAGE=`echo $PACKAGE | sed -e "s/php-/php$PHP_VERSION-/"g`
-		    fi
-		    # php main
-		    if [ "$PACKAGE" == "php" ] ; then
-			PACKAGE=$PACKAGE""$PHP_VERSION
-		    fi
-		    # libapache2-mod-php5
-		    if [ "$PACKAGE" == "libapache2-mod-php" ] ; then
-			PACKAGE=$PACKAGE""$PHP_VERSION
-		    fi
-
-		fi
-
-
-		# if we already have the package installed, don't install it
-		local PACKAGESTATE=`dpkg -s $PACKAGE | grep '^Status' | awk '{print $4}'`
-		if [ "$PACKAGESTATE" != "installed" ]; then
-			if [ "$FORCE_INSTALL" == "true" ]; then
-				$SUDO apt-get -y install $PACKAGE
-			else
-				$SUDO apt-get install $PACKAGE
-			fi
-		fi
-	elif [ -f /etc/redhat-release ]; then
-		if [ "$FORCE_INSTALL" == "true" ]; then
-			su - root -c "yum -y install $PACKAGE"
-		else
-			su - root -c "yum install $PACKAGE"
-		fi
-
-	elif [ -f /etc/SuSE-release ]; then
-		if [ "$FORCE_INSTALL" == "true" ]; then
-			su - root -c "rpm -e --nodeps $PACKAGE"
-		fi
-		# special handling for SUSE and zypper. We get a 0 return code,
-		# even if the requested package is not available. This wrapper
-		# returns 1 if the package is not found.
-		local TMPFILE=$OPENQRM_BUILD_TMP_DIR/$(basename $0).$RANDOM.txt
-		LC_ALL=C su - root -c "zypper --non-interactive install $PACKAGE" 2>&1 | tee "$TMPFILE"
-		local RETURNCODE=${PIPESTATUS[0]}
-		if cat "$TMPFILE" | grep -c "not found" >/dev/null ; then
-			rm "$TMPFILE"
-			return 1;
-		else
-			rm "$TMPFILE"
-			return $RETURNCODE
-		fi
-	fi
-}
-
-
-
-#
-# Install a system dependency using openqrm_install_os_dependency
-#
-# $1: binary name
-# $2: package name
-# returns 0 in case of success, post an error in case of failue
-function openqrm_full_fill_os_dependency() {
-	local BINARY_DEP=$1
-	local PACKAGE_DEP=$2
-	export FORCE_INSTALL=true
-	if ! which $BINARY_DEP 1>/dev/null; then
-		openqrm_install_os_dependency $PACKAGE_DEP
-	else
-		return 0
-	fi
-	if ! which $BINARY_DEP 1>/dev/null; then
-		openqrm_post_event 0 "dependency" 2 "openqrm-package-functions" "Could not auto-install $PACKAGE_DEP on resource $resource_id!"
-		openqrm_post_event 0 "dependency" 2 "openqrm-package-functions" "Please manually install $PACKAGE_DEP on resource $resource_id!"
-		return 1
-	else
-		return 0
-	fi
-
-}
-
-
-
-function openqrm_check_requirements() {
-	if [ ! -d "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins" ]; then
-		print_error "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins does not exist. Run make check after installing openQRM!"
-		return 1
-	fi
-	export FORCE_INSTALL=true
-	# check which dependencies to use
-	if [ -f /etc/debian_version ]; then
-		print_message "Checking the requirements for Debian/Ubuntu based systems ..."
-	elif [ -f /etc/redhat-release ]; then
-		print_message "Checking the requirements for RedHat based systems ..."
-		# check for epel-release
-		echo "Checking for epel-release repository ..."
-		if rpm -qa | grep epel-release 1>/dev/null; then
-			echo "-> found epel-release repository available"
-		else
-			echo "ERROR: Please enable the epel-release repository!"
-			return 1
-		fi
-	elif [ -f /etc/SuSE-release ]; then
-		print_message "Checking the requirements for SUSE based systems ..."
-	else
-		print_notice "NOTICE: Could not find out which dependencies to use" \
-			"Please make sure to have all needed components installed!"
-		sleep 4
-		print_message "... Continuing anyway"
-		return 0
-	fi
-
-	print_message "openqrm-server requires: $OPENQRM_SERVER_DEPENDENCIES"
-	for DEP in `echo $OPENQRM_SERVER_DEPENDENCIES | sed -e "s/,//g"`; do
-		openqrm_install_os_dependency $DEP
-		if [ $? != 0 ]; then
-			print_error "$DEP could not be installed. Please install manually to continue"
-			return 1
-		fi
-	done
-
-
-	# get a list of plugins for checking their dependencies
-	OPENQRM_PACKAGE_COMPONENT_LIST=`ls $OPENQRM_SERVER_BASE_DIR/openqrm/plugins`
-	for OPENQRM_PLUGIN in $OPENQRM_PACKAGE_COMPONENT_LIST; do
-		PLUGIN_CONF=$OPENQRM_SOURCE_DIR/plugins/$OPENQRM_PLUGIN/etc/openqrm-plugin-$OPENQRM_PLUGIN"".conf
-		if [ -f $PLUGIN_CONF ]; then
-			. $PLUGIN_CONF
-		else
-			print_notice "openqrm-plugin-$OPENQRM_PLUGIN has no config file. Unable to check dependencies!"
-			continue
-		fi
-		print_message "openqrm-plugin-$OPENQRM_PLUGIN requires: `echo $OPENQRM_PLUGIN_DEPENDENCIES | sed -e "s/openqrm-server//g"`"
-		for DEP in `echo $OPENQRM_PLUGIN_DEPENDENCIES | sed -e "s/,//g" | sed -e "s/openqrm-server//g"`; do
-			openqrm_install_os_dependency $DEP
-			if [ $? != 0 ]; then
-				print_error "$DEP could not be installed. Please install manually to continue"
-				return 1
-			fi
-		done
-	done
-	print_message "Checking for required components finished successfully"
-}
-
-
-
-function openqrm_rpm_package() {
-	CDIR=`pwd`
-	# make sure to have some additional deps installed
-	if [ -f /etc/SuSE-release ]; then
-		export FORCE_INSTALL=true
-		openqrm_install_os_dependency rpm-build
-	else
-		export FORCE_INSTALL=true
-		openqrm_install_os_dependency redhat-rpm-config
-		openqrm_install_os_dependency rpm-build
-		openqrm_install_os_dependency rpmdevtools
-		openqrm_install_os_dependency rpm-devel
-
-		# check for epel-release
-		echo "Checking for epel-release repository ..."
-		if rpm -qa | grep epel-release 1>/dev/null; then
-			echo "-> found epel-release repository available"
-		else
-			echo "ERROR: Please enable the epel-release repository!"
-			return 1
-		fi
-	fi
-
-	# this is only rpm packaging, debian package are build with the standard debian package tools
-	OPENQRM_PACKAGE_ARCHITECTURE=` uname -i`
-	if [ -f /etc/redhat-release ]; then
-		OPENQRM_PACKAGE_SUB_DIR="redhat"
-	elif [ -f /etc/SuSE-release ]; then
-		OPENQRM_PACKAGE_SUB_DIR="packages"
-	fi
-	# check where our build root is. Centos 6 puts it in /root/rpmbuild
-	if [ ! -d "/usr/src/$OPENQRM_PACKAGE_SUB_DIR" ]; then
-		if [ -d /root/rpmbuild ]; then
-			ln -sf /root/rpmbuild /usr/src/$OPENQRM_PACKAGE_SUB_DIR
-		else
-			# here we have just installed rpm-build and no ~/rpmbuild exists yet
-			# we create one by running rpmbuild on a non-existin dummy spec
-			rpmbuild dummy.spec 1>/dev/null 2>&1
-			if [ -d /root/rpmbuild ]; then
-				ln -sf /root/rpmbuild /usr/src/$OPENQRM_PACKAGE_SUB_DIR
-			else
-				echo "ERROR: Could not find nor create the ~/rpmbuild directory!"
-				return 1
-			fi
-		fi
-	fi
-
-	# openqrm package ##########################################################
-
-	# enterprise or community ?
-	if [ -d plugins/cloud-zones ]; then
-		OPENQRM_PACKAGE_NAME="openqrm-enterprise"
-		OPENQRM_PACKAGE_LICENSE="GNU General Public License version 2"
-		OPENQRM_PACKAGE_CONFLICTS="openqrm"
-	else
-		OPENQRM_PACKAGE_NAME="openqrm"
-		OPENQRM_PACKAGE_LICENSE="GPL"
-		OPENQRM_PACKAGE_CONFLICTS="openqrm-enterprise"
-	fi
-
-	# set postinst + prerm
-	OPENQRM_PACKAGE_PREINSTALL="sh /usr/share/openqrm/etc/init.d/openqrm-server.preinstall"
-	OPENQRM_PACKAGE_PREINSTALL_SCRIPT="/usr/share/openqrm/etc/init.d/openqrm-server.preinstall"
-	OPENQRM_PACKAGE_POSTINSTALL="sh /usr/share/openqrm/etc/init.d/openqrm-server.postinstall"
-	OPENQRM_PACKAGE_PREREMOVE="sh /usr/share/openqrm/etc/init.d/openqrm-server.preremove"
-
-	# get a list of plugins for checking their dependencies
-	. etc/openqrm-server.conf
-	OPENQRM_PACKAGE_DEPENDENCIES="$OPENQRM_SERVER_DEPENDENCIES"
-	OPENQRM_PACKAGE_COMPONENT_LIST=`ls plugins`
-	for OPENQRM_PLUGIN in $OPENQRM_PACKAGE_COMPONENT_LIST; do
-		PLUGIN_CONF="plugins/$OPENQRM_PLUGIN/etc/openqrm-plugin-$OPENQRM_PLUGIN"".conf"
-		if [ -f $PLUGIN_CONF ]; then
-			. $PLUGIN_CONF
-		fi
-		for DEP in `echo $OPENQRM_PLUGIN_DEPENDENCIES | sed -e "s/,//g" | sed -e "s/openqrm-server//g"`; do
-			if ! echo $OPENQRM_PACKAGE_DEPENDENCIES | grep -w $DEP 1>/dev/null; then
-				OPENQRM_PACKAGE_DEPENDENCIES="$OPENQRM_PACKAGE_DEPENDENCIES, $DEP"
-			fi
-		done
-	done
-	if [ "$OPENQRM_MINOR_RELEASE_VERSION" != "" ]; then
-		export OPENQRM_SERVER_VERSION="$OPENQRM_SERVER_VERSION"."$OPENQRM_MINOR_RELEASE_VERSION"
-	fi
-	# clean up
-	rm -rf /usr/src/$OPENQRM_PACKAGE_SUB_DIR/BUILD/buildtmp /usr/src/$OPENQRM_PACKAGE_SUB_DIR/BUILD/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION
-	# create the source package
-	rm -rf $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION-$OPENQRM_PACKAGE_DISTRIBUTION.$OPENQRM_PACKAGE_ARCHITECTURE/source/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION
-	mkdir -p $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION-$OPENQRM_PACKAGE_DISTRIBUTION.$OPENQRM_PACKAGE_ARCHITECTURE/source/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION
-	cp -aR * $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION-$OPENQRM_PACKAGE_DISTRIBUTION.$OPENQRM_PACKAGE_ARCHITECTURE/source/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION/
-	rm -rf `find $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION-$OPENQRM_PACKAGE_DISTRIBUTION.$OPENQRM_PACKAGE_ARCHITECTURE/source/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION/ -name .svn`
-	# include the thirdparty source packages
-	if [ -d $CDIR/../buildtmp/openqrm-build ]; then
-		cp -aR $CDIR/../buildtmp $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION-$OPENQRM_PACKAGE_DISTRIBUTION.$OPENQRM_PACKAGE_ARCHITECTURE/source/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION/thirdparty
-	else
-		if [ ! -d ~/openqrm-thirdparty-cache ]; then
-			./fill-build-cache
-			cp -aR ../buildtmp $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION-$OPENQRM_PACKAGE_DISTRIBUTION.$OPENQRM_PACKAGE_ARCHITECTURE/source/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION/thirdparty
-		else
-			cp -aR ~/openqrm-thirdparty-cache $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION-$OPENQRM_PACKAGE_DISTRIBUTION.$OPENQRM_PACKAGE_ARCHITECTURE/source/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION/thirdparty
-		fi
-	fi
-	rm -f /usr/src/$OPENQRM_PACKAGE_SUB_DIR/SOURCES/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION.tgz
-	tar -C $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION-$OPENQRM_PACKAGE_DISTRIBUTION.$OPENQRM_PACKAGE_ARCHITECTURE/source/ -czf /usr/src/$OPENQRM_PACKAGE_SUB_DIR/SOURCES/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION.tgz $OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION/
-
-	# create spec file from template
-	cat rpm/openqrm.spec |	\
-		sed -e "s/OPENQRM_PACKAGE_NAME/$OPENQRM_PACKAGE_NAME/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_VERSION/$OPENQRM_SERVER_VERSION/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_LICENSE/$OPENQRM_PACKAGE_LICENSE/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_ARCHITECTURE/$OPENQRM_PACKAGE_ARCHITECTURE/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_DISTRIBUTION/$OPENQRM_PACKAGE_DISTRIBUTION/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_DEPENDENCIES/$OPENQRM_PACKAGE_DEPENDENCIES/g" |	\
-		sed -e "s/OPENQRM_SERVER_BUILD_REQUIREMENTS/$OPENQRM_SERVER_BUILD_REQUIREMENTS/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_CONFLICTS/$OPENQRM_PACKAGE_CONFLICTS/g" |	\
-		sed -e "s#OPENQRM_BUILD_POSTINSTALL#$OPENQRM_BUILD_POSTINSTALL#g" |	\
-		sed -e "s#OPENQRM_PACKAGE_PREINSTALL_SCRIPT#$OPENQRM_PACKAGE_PREINSTALL_SCRIPT#g" |	\
-		sed -e "s#OPENQRM_PACKAGE_PREINSTALL#$OPENQRM_PACKAGE_PREINSTALL#g" |	\
-		sed -e "s#OPENQRM_PACKAGE_POSTINSTALL#$OPENQRM_PACKAGE_POSTINSTALL#g" |	\
-		sed -e "s#OPENQRM_PACKAGE_PREREMOVE#$OPENQRM_PACKAGE_PREREMOVE#g"	\
-		> /usr/src/$OPENQRM_PACKAGE_SUB_DIR/SOURCES/$OPENQRM_PACKAGE_NAME.spec
-
-	rm -rf $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging
-	mkdir -p $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME
-	# build the rpm package
-	rpmbuild -ba /usr/src/$OPENQRM_PACKAGE_SUB_DIR/SOURCES/$OPENQRM_PACKAGE_NAME.spec
-	rm -rf $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging
-}
-
-
-
-
-
-
-# function to create a debian/ubuntu source package
-function openqrm_create_deb_source() {
-
-	# find out the short distri name
-	if [ -f /etc/debian_version ]; then
-		# debian or ubuntu, try to find out without lsb-release which may not be installed
-		if grep -i ubuntu /etc/apt/sources.list 1>/dev/null; then
-			OPENQRM_SHORT_DISTRI_NAME="ubuntu"
-		else
-			OPENQRM_SHORT_DISTRI_NAME="debian"
-		fi
-	fi
-	# make sure to have some additional deps installed
-	export FORCE_INSTALL=true
-	openqrm_install_os_dependency build-essential
-	openqrm_install_os_dependency pbuilder
-	openqrm_install_os_dependency fakeroot
-	openqrm_install_os_dependency debhelper
-	openqrm_install_os_dependency rpcbind
-	openqrm_install_os_dependency zlib1g-dev
-	openqrm_install_os_dependency lvm2
-	openqrm_install_os_dependency rsync
-	openqrm_install_os_dependency ethtool
-
-	CDIR=`pwd`
-	TMPBUILD_DIR=`mktemp -d /tmp/deb_source.XXXXXXXXXX` || exit 1
-	if [ "$OPENQRM_MINOR_RELEASE_VERSION" != "" ]; then
-		export OPENQRM_SERVER_VERSION="$OPENQRM_SERVER_VERSION"."$OPENQRM_MINOR_RELEASE_VERSION"
-	fi
-	OPENQRM_UBUNTU_VERSION="$OPENQRM_SERVER_VERSION"
-	export OPENQRM_PACKAGE_NAME="openqrm-enterprise"
-	export OPENQRM_PACKAGE_CONFLICTS="openqrm"
-	mkdir -p $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION
-#	tar cf - . --exclude=".svn" | ( cd $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/; tar xfp -)
-	tar cf - . | ( cd $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/; tar xfp -)
-	cd $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/
-
-	#create deps
-	OPENQRM_PACKAGE_DEPENDENCIES="$OPENQRM_SERVER_DEPENDENCIES"
-	OPENQRM_PACKAGE_COMPONENT_LIST=`ls plugins | grep -v Makefile`
-	for OPENQRM_PLUGIN in $OPENQRM_PACKAGE_COMPONENT_LIST; do
-		rm -rf plugins/$OPENQRM_PLUGIN
-	done
-
-	# copy changelog for package naming
-	cp -f debian/changelog.$OPENQRM_SHORT_DISTRI_NAME debian/changelog
-	sed -i -e "s/^openqrm/openqrm-enterprise/g" debian/changelog
-	for F in `ls debian/openqrm.*`; do
-		FNEW=`echo $F | sed -e "s/openqrm/openqrm-enterprise/g"`
-		mv -f $F $FNEW
-	done
-	# use the enterprise copyright
-	if [ -f debian/copyright.enterprise ]; then
-		mv -f debian/copyright.enterprise debian/copyright
-	fi
-	# create spec file from template
-	cat debian/control |	\
-		sed -e "s/OPENQRM_PACKAGE_NAME/$OPENQRM_PACKAGE_NAME/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_DEPENDENCIES/$OPENQRM_PACKAGE_DEPENDENCIES/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_CONFLICTS/$OPENQRM_PACKAGE_CONFLICTS/g" \
-		> debian/control.configured
-	mv -f debian/control.configured debian/control
-	# remove svn dirs
-	rm -rf `find -name .svn `
-	rm -rf `find -name .git `
-	# avoid the following build confs.
-	rm -f etc/build.conf/adodb.conf
-	rm -f etc/build.conf/busybox.conf
-	rm -f etc/build.conf/dropbear.conf
-	rm -f etc/build.conf/initrd-devices.conf
-	rm -f etc/build.conf/pciutils.conf
-
-	TPDIR=""
-	if [ -d $CDIR/../buildtmp/openqrm-build ]; then
-		TPDIR="$CDIR/../buildtmp"
-	else
-		if [ ! -d ~/openqrm-thirdparty-cache ]; then
-			./fill-build-cache
-			TPDIR="../buildtmp"
-		else
-			TPDIR="~/openqrm-thirdparty-cache"
-		fi
-	fi
-	if [ "$TPDIR" != "" ]; then
-		mkdir -p thirdparty/openqrm-build
-		cp -aR $TPDIR/openqrm-build/htmlobjects thirdparty/openqrm-build/
-		cp -aR $TPDIR/openqrm-build/jqclock thirdparty/openqrm-build/
-		cp -aR $TPDIR/openqrm-build/jquery thirdparty/openqrm-build/
-		cp -aR $TPDIR/openqrm-build/js-interface thirdparty/openqrm-build/
-		cp -aR $TPDIR/openqrm-build/jsmin thirdparty/openqrm-build/
-		cp -aR $TPDIR/openqrm-build/phplib thirdparty/openqrm-build/
-		cp -aR $TPDIR/openqrm-build/treemenuicons thirdparty/openqrm-build/
-		cp -aR $TPDIR/openqrm-build/treemenujs thirdparty/openqrm-build/
-		cp -aR $TPDIR/openqrm-build/openqrm-initrd-template.* thirdparty/openqrm-build/
-	fi
-
-	# prepare openqrm_[version].orig.tar.gz
-	cd $TMPBUILD_DIR/
-	mv $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/debian .
-	tar -czf $OPENQRM_PACKAGE_NAME"_"$OPENQRM_UBUNTU_VERSION.orig.tar.gz $OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION
-	mv $TMPBUILD_DIR/debian $OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/
-	# build the source package
-	cd $OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION
-	if [ "$GPGKEY" != "" ]; then
-		dpkg-buildpackage -S -sa -rfakeroot -k$GPGKEY
-	else
-		dpkg-buildpackage -S -sa -rfakeroot
-	fi
-	cd $CDIR
-	mv -f $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME"_"* ../
-	rm -rf $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION
-	rm -rf $TMPBUILD_DIR/buildtmp
-	rmdir $TMPBUILD_DIR
-}
-
-
-# function to create a debian/ubuntu binary package via pbuilder
-function openqrm_pbuilder() {
-	CDIR=`pwd`
-	# find out the short distri name
-	if [ -f /etc/debian_version ]; then
-		# debian or ubuntu, try to find out without lsb-release which may not be installed
-		if grep -i ubuntu /etc/apt/sources.list 1>/dev/null; then
-			OPENQRM_SHORT_DISTRI_NAME="ubuntu"
-		else
-			OPENQRM_SHORT_DISTRI_NAME="debian"
-		fi
-	fi
-	# make sure to have some additional deps installed
-	export FORCE_INSTALL=true
-	openqrm_install_os_dependency build-essential
-	openqrm_install_os_dependency pbuilder
-	openqrm_install_os_dependency fakeroot
-	openqrm_install_os_dependency debhelper
-	openqrm_install_os_dependency rpcbind
-	openqrm_install_os_dependency zlib1g-dev
-	openqrm_install_os_dependency lvm2
-
-	OPENQRM_UBUNTU_VERSION=`cat debian/changelog.$OPENQRM_SHORT_DISTRI_NAME | head -n1 | cut -d'(' -f2 | cut -d')' -f1`
-	DISTRIBUTION_VERSION=`cat debian/changelog.$OPENQRM_SHORT_DISTRI_NAME  | head -n1 | cut -d';' -f1 | awk '{ print $3 }'`
-	OPENQRM_PACKAGE_NAME="openqrm-enterprise"
-	PACKAGE_DESCRIPTION=$OPENQRM_PACKAGE_NAME"_"$OPENQRM_UBUNTU_VERSION.dsc
-	if [ ! -f "../$PACKAGE_DESCRIPTION" ]; then
-		openqrm_create_deb_source
-	fi
-	cd ..
-	# set proxy env for pbuilder if needed
-	PBUILDER_PROXY=""
-	if grep http_proxy /root/.bashrc 1>/dev/null 2>/dev/null; then
-		PBUILDER_PROXY=`grep http_proxy /root/.bashrc | head -n1 | sed -e "s/.*=//g" | sed -e 's/"//g'`
-		export PBUILDER_PROXY_PARAMETER=" --http-proxy $PBUILDER_PROXY"
-	fi
-	# check if to init pbuilder
-	if [ ! -f /var/cache/pbuilder/base.tgz ]; then
-		pbuilder create --distribution $DISTRIBUTION_VERSION $PBUILDER_PROXY_PARAMETER
-	fi
-	# run pbuilder
-	pbuilder build $PACKAGE_DESCRIPTION $PBUILDER_PROXY_PARAMETER
-	echo
-	echo "Packaging finished. Please find the created packages in /var/cache/pbuilder/result"
-	ls -lh /var/cache/pbuilder/result/openqrm*
-	cd $CDIR
-}
-
-
-
-
-
-
-
-# function to create a debian/ubuntu plugin source package
-function openqrm_plugin_create_deb_source() {
-
-	PLUGIN_NAME=$1
-	echo "- building plugin package $PLUGIN_NAME"
-	# find out the short distri name
-	if [ -f /etc/debian_version ]; then
-		# debian or ubuntu, try to find out without lsb-release which may not be installed
-		if grep -i ubuntu /etc/apt/sources.list 1>/dev/null; then
-			OPENQRM_SHORT_DISTRI_NAME="ubuntu"
-		else
-			OPENQRM_SHORT_DISTRI_NAME="debian"
-		fi
-	fi
-	# make sure to have some additional deps installed
-	export FORCE_INSTALL=true
-	openqrm_install_os_dependency build-essential
-	openqrm_install_os_dependency pbuilder
-	openqrm_install_os_dependency fakeroot
-	openqrm_install_os_dependency debhelper
-	openqrm_install_os_dependency rpcbind
-	openqrm_install_os_dependency zlib1g-dev
-	openqrm_install_os_dependency lvm2
-
-	CDIR=`pwd`
-	TMPBUILD_DIR=`mktemp -d /tmp/deb_source.XXXXXXXXXX` || exit 1
-
-	. plugins/$PLUGIN_NAME/etc/openqrm-plugin-$PLUGIN_NAME.conf
-	OPENQRM_UBUNTU_VERSION="$OPENQRM_PLUGIN_VERSION"
-	export OPENQRM_PACKAGE_NAME="openqrm-enterprise-plugin-$PLUGIN_NAME"
-	export OPENQRM_PACKAGE_CONFLICTS="openqrm"
-	mkdir -p $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION
-#	tar cf - . --exclude=".svn" | ( cd $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/; tar xfp -)
-	tar cf - . | ( cd $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/; tar xfp -)
-	cd $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/
-
-	#create deps
-	OPENQRM_PACKAGE_DEPENDENCIES=`echo $OPENQRM_PLUGIN_DEPENDENCIES | sed -e "s/openqrm-server/openqrm-enterprise/g"`
-
-	# copy changelog for package naming
-	cp -f debian/changelog.$OPENQRM_SHORT_DISTRI_NAME debian/changelog
-	sed -i -e "s/^openqrm/openqrm-enterprise-plugin-$PLUGIN_NAME/g" debian/changelog
-	for F in `ls debian/openqrm.*`; do
-		FNEW=`echo $F | sed -e "s/openqrm/openqrm-enterprise-plugin-$PLUGIN_NAME/g"`
-		mv -f $F $FNEW
-	done
-
-	# adapt rules, not copying docs
-	cp -f debian/rules.plugin debian/rules
-	rm -f debian/rules.plugin
-	# remove postinst, postrm and preinst
-	rm -f debian/openqrm*.postinst
-	rm -f debian/openqrm*.postrm
-	rm -f debian/openqrm*.preinst
-	rm -f debian/openqrm*.prerm
-
-	# use the enterprise copyright
-	if [ -f debian/copyright.enterprise ]; then
-		mv -f debian/copyright.enterprise debian/copyright
-	fi
-	# create spec file from template
-	cat debian/control |	\
-		sed -e "s/OPENQRM_PACKAGE_NAME/$OPENQRM_PACKAGE_NAME/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_DEPENDENCIES/$OPENQRM_PACKAGE_DEPENDENCIES/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_CONFLICTS/$OPENQRM_PACKAGE_CONFLICTS/g" \
-		> debian/control.configured
-	mv -f debian/control.configured debian/control
-	# remove svn dirs
-	rm -rf `find -name .svn `
-
-	# remove base
-	rm -rf bin doc rpm sbin tftpboot web
-	# re-create empty Makefile for etc
-	rm -rf etc/build.conf etc/db etc/enterprise etc/httpd etc/init.d etc/templates
-	rm -f etc/Makefile
-	echo "all:" > etc/Makefile
-	echo "install:" >> etc/Makefile
-	echo "clean:" >> etc/Makefile
-	echo "realclean:" >> etc/Makefile
-	echo "uninstall:" >> etc/Makefile
-	echo "configure:" >> etc/Makefile
-	echo "compile:" >> etc/Makefile
-	# re-create empty Makefile for include
-	rm -f include/Makefile
-	echo "all:" > include/Makefile
-	echo "install:" >> include/Makefile
-	echo "clean:" >> include/Makefile
-	echo "realclean:" >> include/Makefile
-	echo "uninstall:" >> include/Makefile
-	echo "configure:" >> include/Makefile
-	echo "compile:" >> include/Makefile
-
-	# remove all other plugins
-	OPENQRM_PACKAGE_COMPONENT_LIST=`ls plugins | grep -v Makefile | grep -v ^$PLUGIN_NAME$`
-	for OPENQRM_PLUGIN in $OPENQRM_PACKAGE_COMPONENT_LIST; do
-		rm -rf plugins/$OPENQRM_PLUGIN
-	done
-
-	TPDIR=""
-	if [ -d $CDIR/../buildtmp/openqrm-build ]; then
-		TPDIR="$CDIR/../buildtmp"
-	else
-		if [ ! -d ~/openqrm-thirdparty-cache ]; then
-			./fill-build-cache
-			TPDIR="../buildtmp"
-		else
-			TPDIR="~/openqrm-thirdparty-cache"
-		fi
-	fi
-	if [ "$TPDIR" != "" ]; then
-		mkdir -p thirdparty/openqrm-build
-
-		if [ -d plugins/$PLUGIN_NAME/etc/build.conf ]; then
-			echo "- configuring build cache for plugin $PLUGIN_NAME"
-			for BUILD_CONF in `ls plugins/$PLUGIN_NAME/etc/build.conf/ | sed -e "s/\.conf//g"`; do
-				echo "- copying $BUILD_CONF to build cache"
-				cp -aR $TPDIR/openqrm-build/$BUILD_CONF thirdparty/openqrm-build/
-			done
-		fi
-	fi
-
-	# prepare openqrm_[version].orig.tar.gz
-	cd $TMPBUILD_DIR/
-	mv $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/debian .
-	tar -czf $OPENQRM_PACKAGE_NAME"_"$OPENQRM_UBUNTU_VERSION.orig.tar.gz $OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION
-	mv $TMPBUILD_DIR/debian $OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/
-	# build the source package
-	cd $OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION
-	if [ "$GPGKEY" != "" ]; then
-		dpkg-buildpackage -S -sa -rfakeroot -k$GPGKEY
-	else
-		dpkg-buildpackage -S -sa -rfakeroot
-	fi
-	cd $CDIR
-	mv -f $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME"_"* ../
-	rm -rf $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION
-	rm -rf $TMPBUILD_DIR/buildtmp
-	rmdir $TMPBUILD_DIR
-}
-
-
-
-
-# function to create a debian/ubuntu plugin binary package via pbuilder
-function openqrm_plugin_pbuilder() {
-
-	PLUGIN_NAME=$1
-	CDIR=`pwd`
-	# find out the short distri name
-	if [ -f /etc/debian_version ]; then
-		# debian or ubuntu, try to find out without lsb-release which may not be installed
-		if grep -i ubuntu /etc/apt/sources.list 1>/dev/null; then
-			OPENQRM_SHORT_DISTRI_NAME="ubuntu"
-		else
-			OPENQRM_SHORT_DISTRI_NAME="debian"
-		fi
-	fi
-	# make sure to have some additional deps installed
-	export FORCE_INSTALL=true
-	openqrm_install_os_dependency build-essential
-	openqrm_install_os_dependency pbuilder
-	openqrm_install_os_dependency fakeroot
-	openqrm_install_os_dependency debhelper
-	openqrm_install_os_dependency rpcbind
-	openqrm_install_os_dependency zlib1g-dev
-	openqrm_install_os_dependency lvm2
-
-	OPENQRM_UBUNTU_VERSION=`cat debian/changelog.$OPENQRM_SHORT_DISTRI_NAME | head -n1 | cut -d'(' -f2 | cut -d')' -f1`
-	DISTRIBUTION_VERSION=`cat debian/changelog.$OPENQRM_SHORT_DISTRI_NAME  | head -n1 | cut -d';' -f1 | awk '{ print $3 }'`
-	OPENQRM_PACKAGE_NAME="openqrm-enterprise-plugin-$PLUGIN_NAME"
-	PACKAGE_DESCRIPTION=$OPENQRM_PACKAGE_NAME"_"$OPENQRM_UBUNTU_VERSION.dsc
-	if [ ! -f "../$PACKAGE_DESCRIPTION" ]; then
-		openqrm_plugin_create_deb_source $PLUGIN_NAME
-	fi
-	cd ..
-	# set proxy env for pbuilder if needed
-	PBUILDER_PROXY=""
-	if grep http_proxy /root/.bashrc 1>/dev/null 2>/dev/null; then
-		PBUILDER_PROXY=`grep http_proxy /root/.bashrc | head -n1 | sed -e "s/.*=//g" | sed -e 's/"//g'`
-		export PBUILDER_PROXY_PARAMETER=" --http-proxy $PBUILDER_PROXY"
-	fi
-	# check if to init pbuilder
-	if [ ! -f /var/cache/pbuilder/base.tgz ]; then
-		pbuilder create --distribution $DISTRIBUTION_VERSION $PBUILDER_PROXY_PARAMETER
-	fi
-	# run pbuilder
-	pbuilder build $PACKAGE_DESCRIPTION $PBUILDER_PROXY_PARAMETER
-	echo
-	echo "Packaging finished. Please find the created packages in /var/cache/pbuilder/result"
-	ls -lh /var/cache/pbuilder/result/openqrm*
-	cd $CDIR
-}
-
-
-
-
-# function to create a debian/ubuntu plugin binary package via pbuilder
-function openqrm_packages() {
-	clear
-	echo "building base"
-	sleep 5
-	openqrm_create_deb_source
-	openqrm_pbuilder
-
-	for PLUGIN in `ls plugins | grep -v Makefile`; do
-		clear
-		echo "building plugin $PLUGIN"
-		sleep 5
-		openqrm_plugin_create_deb_source $PLUGIN
-		openqrm_plugin_pbuilder $PLUGIN
-	done
-	
-}
diff --git a/openQRM-5.3.50-CE/src/include/openqrm-server-functions b/openQRM-5.3.50-CE/src/include/openqrm-server-functions
deleted file mode 100644
index d396ef6..0000000
--- a/openQRM-5.3.50-CE/src/include/openqrm-server-functions
+++ /dev/null
@@ -1,841 +0,0 @@
-#!/bin/bash
-# this is the server function file for openQRM
-# only server functions should go in here
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export LANGUAGE=C
-export LANG=C
-export LC_ALL=C
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	echo "ERROR: Please export OPENQRM_SERVER_BASE_DIR before sourcing $0"
-	exit 1
-fi
-
-# source the server configuration
-OPENQRM_SERVER_CONF=$OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_CONF
-
-# some definitions
-#OPENQRM_UNWANTED_MODULES="cops.o ipddp.o ltpc.o hdlcdrv.o airo_cs.o aironet4500_cs.o airo.o axnet_cs.o fmvj18x_cs.o ibmtr_cs.o netwave_cs.o nmclan_cs.o pcnet_cs.o ray_cs.o smc91c92_cs.o wavelan_cs.o wvlan_cs.o xirc2ps_cs.o xircom_cb.o xircom_tulip_cb.o ppp_async.o ppp_deflate.o ppp_generic.o ppp_synctty.o wavelan.o wd.o winbond-840.o airo_cs.o airo.o hermes.o orinoco_cs.o orinoco.o orinoco_plx.o orinoco_old_cs.o cops.ko ipddp.ko ltpc.ko hdlcdrv.ko airo_cs.ko aironet4500_cs.ko airo.ko axnet_cs.ko fmvj18x_cs.ko ibmtr_cs.ko netwave_cs.ko nmclan_cs.ko pcnet_cs.ko ray_cs.ko smc91c92_cs.ko wavelan_cs.ko wvlan_cs.ko xirc2ps_cs.ko xircom_cb.ko xircom_tulip_cb.ko ppp_async.ko ppp_deflate.ko ppp_generic.ko ppp_synctty.ko wavelan.ko wd.ko winbond-840.ko airo_cs.ko airo.ko hermes.ko orinoco_cs.ko orinoco.ko orinoco_plx.ko orinoco_old_cs.ko de600.ko de620.ko defxx.ko depca.ko hp100.ko hp.ko hp-plus.ko ne3210.ko ne.ko netwave_cs.ko ipw2100.ko proteon.ko skisa.ko vga16fb.ko atyfb.ko xen-netfront.ko"
-OPENQRM_UNWANTED_MODULES="cops.o ipddp.o ltpc.o hdlcdrv.o airo_cs.o aironet4500_cs.o airo.o axnet_cs.o fmvj18x_cs.o ibmtr_cs.o netwave_cs.o nmclan_cs.o pcnet_cs.o ray_cs.o smc91c92_cs.o wavelan_cs.o wvlan_cs.o xirc2ps_cs.o xircom_cb.o xircom_tulip_cb.o ppp_async.o ppp_deflate.o ppp_generic.o ppp_synctty.o wavelan.o wd.o winbond-840.o airo_cs.o airo.o hermes.o orinoco_cs.o orinoco.o orinoco_plx.o orinoco_old_cs.o cops.ko ipddp.ko ltpc.ko hdlcdrv.ko airo_cs.ko aironet4500_cs.ko airo.ko axnet_cs.ko fmvj18x_cs.ko ibmtr_cs.ko netwave_cs.ko nmclan_cs.ko pcnet_cs.ko ray_cs.ko smc91c92_cs.ko wavelan_cs.ko wvlan_cs.ko xirc2ps_cs.ko xircom_cb.ko xircom_tulip_cb.ko ppp_async.ko ppp_deflate.ko ppp_generic.ko ppp_synctty.ko wavelan.ko wd.ko winbond-840.ko airo_cs.ko airo.ko hermes.ko orinoco_cs.ko orinoco.ko orinoco_plx.ko orinoco_old_cs.ko de600.ko de620.ko defxx.ko depca.ko hp100.ko hp.ko hp-plus.ko ne3210.ko ne.ko netwave_cs.ko ipw2100.ko proteon.ko skisa.ko atyfb.ko xen-netfront.ko"
-
-OPENQRM_DEFAULT_INITRD_TEMPLATE="$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-initrd-default.tgz"
-OPENQRM_SERVER_LINUXRC="$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-linuxrc"
-OPENQRM_MAX_INITRD_SIZE=128000
-OPENQRM_DEFAULT_RAM_DISK_BLOCK_SIZE=1024
-# static directory define for the server state backups
-OPENQRM_SERVER_STATE_DIR="/var/spool/openqrm-state"
-# which files/dirs to backup/restore (base only, plugin need to care about their bacukp/restore themselves)
-OPENQRM_SERVER_STATE_FILES="$OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-initrd-default.tgz	\
-	$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-linuxrc"
-OPENQRM_SERVER_STATE_DIRS="$OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/ \
-	$OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/	\
-	$OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/	\
-	$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/"
-
-
-
-# translates cidr to subnet mask
-function cidr2subnet () {
-	if [ "$1" != "" ]; then
-		set -- $(( 5 - ($1 / 8) )) 255 255 255 255 $(( (255 << (8 - ($1 % 8))) & 255 )) 0 0 0
-		[ $1 -gt 1 ] && shift $1 || shift
-		echo ${1-0}.${2-0}.${3-0}.${4-0}
-	fi
-}
-
-
-# function to export all given configuration from the
-# main openQRM-server config file
-function openqrm_server_get_config() {
-	. $OPENQRM_SERVER_CONF
-	for VAR in `cat $OPENQRM_SERVER_CONF | grep -v ^# | grep OPENQRM | cut -d'=' -f1`; do
-		eval `export $VAR`
-	done
-
-	# make sure /sbin and /usr/sbin are in our PATH, because we might be running as the webserver user,
-	# in which case the ifconfig and route commands will fail, leaving the variables empty (bad!)
-	PATH=/sbin:/usr/sbin:$PATH
-	# get ip configuration
-	export OPENQRM_SERVER_IP_ADDRESS=`ip a s $OPENQRM_SERVER_INTERFACE 2>/dev/null | grep -w $OPENQRM_SERVER_INTERFACE$ | grep -w inet | awk '{ print $2 }' | cut -d'/' -f1`
-	export OPENQRM_SERVER_BROADCAST_ADDRESS=`ip a s $OPENQRM_SERVER_INTERFACE 2>/dev/null | grep -w $OPENQRM_SERVER_INTERFACE$ | grep -w inet | awk '{ print $4 }' | cut -d'/' -f1`
-	export OPENQRM_SERVER_CIDR=`ip a s $OPENQRM_SERVER_INTERFACE 2>/dev/null | grep -w $OPENQRM_SERVER_INTERFACE$ | grep -w inet | awk '{ print $2 }' | cut -d'/' -f2`
-	export OPENQRM_SERVER_SUBNET_MASK=`cidr2subnet $OPENQRM_SERVER_CIDR`
-	export OPENQRM_SERVER_DEFAULT_GATEWAY=`route -n | grep ^0.0.0.0 | head -n1 | awk {' print $2 '}`
-}
-# run immediatly
-openqrm_server_get_config
-
-# define wget to use with https
-if [ "$OPENQRM_WEB_PROTOCOL" == "https" ]; then
-	export WGET="wget --no-check-certificate"
-else
-	export WGET="wget"
-fi
-
-
-# --------------------------------------------------------------------
-# ------------------------- kernel functions -------------------------
-# --------------------------------------------------------------------
-
-
-
-# function resolve kernel module dependencies
-# param 1	: full path to kernel module
-function modresolvdeps() {
-	MODULE=$1
-	FMOD=`basename $MODULE`
-	FREST=`echo $MODULE | sed -e "s#.*\/kernel\/##g"`
-	DMOD=`echo $MODULE | sed -e "s#$FREST##g"`
-	DPENDLIST=`modinfo $MODULE | grep ^depends | cut -d':' -f2 | awk '{ print $1 }' | sed -e "s/,/ /g"`
-	if [ "$DPENDLIST" != "" ]; then
-		for MOD in `echo $DPENDLIST`; do
-			#echo $MOD
-			MODFULLPATH=`find $DMOD -name $MOD.ko`
-			echo $MODFULLPATH
-			modresolvdeps $MODFULLPATH
-		done
-	fi
-
-}
-
-
-
-
-# function to create kernels
-# param 1	: kernel name
-# param 2	: kernel-version
-# param 3	: path-to-kernel-files
-function openqrm_server_create_kernel() {
-
-	OPENQRM_SERVER_KERNEL_NAME=$1
-	OPENQRM_SERVER_KERNEL_VERSION=$2
-	OPENQRM_SERVER_KERNEL_LOCATION=$3
-
-	# OPENQRM_SERVER_KERNEL_TYPE can be "ext2" or "initramfs"
-	OPENQRM_SERVER_KERNEL_TYPE=$4
-	OPENQRM_SERVER_INITRD_TEMPLATE=$5
-	OPENQRM_SERVER_UNWANTED_MODULES=$6
-
-	if [ "$OPENQRM_SERVER_UNWANTED_MODULES" != "" ]; then
-		OPENQRM_SERVER_UNWANTED_MODULES_SPACES=`echo $OPENQRM_SERVER_UNWANTED_MODULES | sed -e "s/,/\.ko /g"`".ko"
-		OPENQRM_UNWANTED_MODULES="$OPENQRM_UNWANTED_MODULES $OPENQRM_SERVER_UNWANTED_MODULES_SPACES"
-		for MO in `echo $OPENQRM_SERVER_UNWANTED_MODULES_SPACES`; do
-			MODULES_EXCLUDE="$MODULES_EXCLUDE --exclude=$MO"
-		done
-	fi
-
-	if [ "$OPENQRM_SERVER_KERNEL_TYPE" == "" ]; then
-		export OPENQRM_SERVER_KERNEL_TYPE="initramfs"
-	fi
-	if [ "$OPENQRM_SERVER_INITRD_TEMPLATE" == "" ]; then
-		export OPENQRM_SERVER_INITRD_TEMPLATE=$OPENQRM_DEFAULT_INITRD_TEMPLATE
-	fi
-	# kernel there ?
-	if [ ! -f "$OPENQRM_SERVER_KERNEL_LOCATION/boot/vmlinuz-$OPENQRM_SERVER_KERNEL_VERSION" ]; then
-		echo "ERROR: Cannot find kernel file at $OPENQRM_SERVER_KERNEL_LOCATION/boot/vmlinuz-$OPENQRM_SERVER_KERNEL_VERSION!"
-		return 1
-	fi
-	# system.map there ?
-	if [ ! -f "$OPENQRM_SERVER_KERNEL_LOCATION/boot/System.map-$OPENQRM_SERVER_KERNEL_VERSION" ]; then
-		echo "ERROR: Cannot find System.map at $OPENQRM_SERVER_KERNEL_LOCATION/boot/System.map-$OPENQRM_SERVER_KERNEL_VERSION!"
-		return 1
-	fi
-	# module dir there ?
-	if [ ! -d "$OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION" ]; then
-		echo "ERROR: Cannot find kernel module directory at $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION!"
-		return 1
-	fi
-	# modules.pcimap there ?
-	if [ ! -f "$OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/modules.pcimap" ]; then
-		echo "WARNING: Cannot find modules.pcimap in kernel module directory at $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION. Trying to create it ..."
-		if ! depmod -a -m -F $OPENQRM_SERVER_KERNEL_LOCATION/boot/System.map-$OPENQRM_SERVER_KERNEL_VERSION -b $OPENQRM_SERVER_KERNEL_LOCATION $OPENQRM_SERVER_KERNEL_VERSION; then
-			echo "WARNING: Could not create modules.pcimap in kernel module directory at $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION! Trying to continue ..."
-		else
-			echo "NOTICE: Created modules.pcimap in kernel module directory at $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION."
-		fi
-	fi
-
-	echo "Creating kernel $OPENQRM_SERVER_KERNEL_NAME version $OPENQRM_SERVER_KERNEL_VERSION ($OPENQRM_SERVER_KERNEL_TYPE initrd)"
-
-	# copy kernel + System-map
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot
-	cp -a $OPENQRM_SERVER_KERNEL_LOCATION/boot/vmlinuz-$OPENQRM_SERVER_KERNEL_VERSION $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/vmlinuz-$OPENQRM_SERVER_KERNEL_NAME
-	cp -a $OPENQRM_SERVER_KERNEL_LOCATION/boot/System.map-$OPENQRM_SERVER_KERNEL_VERSION $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/System.map-$OPENQRM_SERVER_KERNEL_NAME
-
-	# modules
-	#tar -C $OPENQRM_SERVER_KERNEL_LOCATION/ -czf $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/modules-$OPENQRM_SERVER_KERNEL_NAME.tgz lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-	tar -C $OPENQRM_SERVER_KERNEL_LOCATION/ -czf $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/modules-$OPENQRM_SERVER_KERNEL_NAME.tgz $MODULES_EXCLUDE lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-
-	# initrd
-	mkdir -p $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME
-	mkdir -p $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-	for MODULE in `find $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net -type f | grep -v wireless`; do
-		MODULE_NAME=`echo $MODULE | sed -e "s/.*\///"`
-		if ! echo $OPENQRM_UNWANTED_MODULES | grep $MODULE_NAME 1>/dev/null; then
-			/bin/cp -f $MODULE $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-			# resolve deps
-			for L in `modresolvdeps $MODULE`; do
-				DEPNAME=`basename $L`
-				echo "--- adding module dependency $MODULE_NAME -> $DEPNAME"
-				/bin/cp -f $L $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-			done
-		fi
-	done
-
-	# also need virtio* for kvm virtio pci network card
-	for MODULE in `find $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers -type f -name virtio*`; do
-		MODULE_NAME=`echo $MODULE | sed -e "s/.*\///"`
-		if ! echo $OPENQRM_UNWANTED_MODULES | grep $MODULE_NAME 1>/dev/null; then
-			/bin/cp -f $MODULE $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-		fi
-	done
-
-
-#	# also need igb for network cards
-#	for MODULE in `find $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers -type f -name igb`; do
-#		MODULE_NAME=`echo $MODULE | sed -e "s/.*\///"`
-#		if ! echo $OPENQRM_UNWANTED_MODULES | grep $MODULE_NAME 1>/dev/null; then
-#			/bin/cp -f $MODULE $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-#		fi
-#	done
-
-#	# also need ixgbe for network cards
-#	for MODULE in `find $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers -type f -name ixgbe`; do
-#		MODULE_NAME=`echo $MODULE | sed -e "s/.*\///"`
-#		if ! echo $OPENQRM_UNWANTED_MODULES | grep $MODULE_NAME 1>/dev/null; then
-#			/bin/cp -f $MODULE $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-#		fi
-#	done
-
-	# for networks support
-	for MODULE in `find  $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/ -type f | egrep 'mptbase|mptsas|mptscsih|scsi_transport_sas|jfs|crc32|bnx2|bnx2x|usbhid|hid|mdio|dca|virtio'`; do
-		MODULE_NAME=`echo $MODULE | sed -e "s/.*\///"`
-		if ! echo $OPENQRM_UNWANTED_MODULES | grep $MODULE_NAME 1>/dev/null; then
-			/bin/cp -f $MODULE $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-		fi
-	done
-
-	
-	# need i2c modules - for igb
-	mkdir -p $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/
-
-	/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/i2c $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/
-	/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/dca $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/
-	/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/dma $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/
-
-	/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/mfd $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/
-	/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/watchdog $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/
-
-	#for e1000e; ptp, pps
-	if [ -d $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net/ethernet/ ]; then
-		mkdir -p $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net/ethernet/
-		/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net/ethernet/* $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net/ethernet/
-	elif [ -d $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net/ ]; then
-		mkdir -p $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net/ 
-		/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net/* $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net/
-	fi
-	#end igb
-
-	#ptp, pps
-	if [ -d $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/ptp ]; then
-		/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/ptp $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/
-	fi
-	
-	if [ -d $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/pps ]; then
-		/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/pps $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/
-	fi
-	# end ptp, pps
-	
-
-	# also need dma modules
-	for MODULE in `find $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/dma -type f`; do
-		MODULE_NAME=`echo $MODULE | sed -e "s/.*\///"`
-		if ! echo $OPENQRM_UNWANTED_MODULES | grep $MODULE_NAME 1>/dev/null; then
-			echo "- adding dma module $MODULE_NAME"
-			/bin/cp -f $MODULE $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-			# resolve deps
-			for L in `modresolvdeps $MODULE`; do
-				DEPNAME=`basename $L`
-				echo "--- adding module dependency $MODULE_NAME -> $DEPNAME"
-				/bin/cp -f $L $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-			done
-		fi
-	done
-	#end dma
-
-
-	# for bnx2 support
-	for MODULE in `find  $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/ -type f | egrep 'mptbase|mptsas|mptscsih|scsi_transport_sas|jfs|crc32|bnx2|bnx2x|hid|mdio|dca|virtio'`; do
-		MODULE_NAME=`echo $MODULE | sed -e "s/.*\///"`
-		if ! echo $OPENQRM_UNWANTED_MODULES | grep $MODULE_NAME 1>/dev/null; then
-			/bin/cp -f $MODULE $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-		fi
-	done
-
-	# include firmware for bnx2/bnx2x
-	rm -rf   $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/firmware
-	mkdir -p $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/firmware/
-	if ls $OPENQRM_SERVER_KERNEL_LOCATION/lib/firmware/bnx2* 2>/dev/null 1>&2; then
-		/bin/cp -aRf  $OPENQRM_SERVER_KERNEL_LOCATION/lib/firmware/bnx2* $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/firmware/
-#		/bin/cp -aRf  /lib/firmware/bnx2* $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/firmware/
-	fi
-	#end bnx2
-
-
-	# include firmware for cxgb4 T4 & T5 adapters 
-	/bin/cp -aRf  $OPENQRM_SERVER_KERNEL_LOCATION/lib/firmware/cxgb4 $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/firmware/
-	#/bin/cp -aRf  /lib/firmware/cxgb4 $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/firmware/
-	#end add firmware for cxgb4 T4 & T5 adapters
-	
-
-	# also we need to take the modules.pcimap for the hardware detection to work
-	cp -a $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/modules.* $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/
-
-	# unpack the initrd-template
-	echo "-> using initrd-template from $OPENQRM_SERVER_INITRD_TEMPLATE"
-	tar -C $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME -xzf $OPENQRM_SERVER_INITRD_TEMPLATE
-
-	# check size
-	OPENQRM_INITRD_SIZE=`du -s $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/ | awk {' print $1 '}`
-	OPENQRM_INITRD_SIZE=$(( OPENQRM_INITRD_SIZE + 16000 ))
-	if (( $OPENQRM_INITRD_SIZE > $OPENQRM_MAX_INITRD_SIZE )); then
-		echo "ERROR: Initrd got too big"
-		return 1
-	fi
-
-	# take udev from kernel-location
-	rm -rf $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/etc/udev
-	cp -aR $OPENQRM_SERVER_KERNEL_LOCATION/etc/udev $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/etc/
-
-	# and /lib/udev
-	rm -rf $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/udev
-	cp -aR $OPENQRM_SERVER_KERNEL_LOCATION/lib/udev $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/
-
-	# take the initial console device
-	cp -aR $OPENQRM_SERVER_KERNEL_LOCATION/dev/console $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/dev/
-
-	# create run/udev dir for binding udevd socket
-	mkdir -p $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/run/udev
-
-	# creating the initrd file
-	if [ "$OPENQRM_SERVER_KERNEL_TYPE" == "ext2" ]; then
-		echo "Creating the initrd as $OPENQRM_SERVER_KERNEL_TYPE"
-		dd if=/dev/zero of=$OPENQRM_TEMP_DIR/bootimage/initrd-$OPENQRM_SERVER_KERNEL_NAME.img bs=1k count=$OPENQRM_INITRD_SIZE
-		#get ram block size there is a problem in newer kernels with size 4096
-		if [ -f "$OPENQRM_SERVER_KERNEL_LOCATION/boot/config-$OPENQRM_SERVER_KERNEL_VERSION" ]; then
-			ram_block_size=`cat $OPENQRM_SERVER_KERNEL_LOCATION/boot/config-$OPENQRM_SERVER_KERNEL_VERSION | grep  CONFIG_BLK_DEV_RAM_BLOCKSIZE | awk -F= '{print $2}'`
-			if [ -z $ram_block_size ]; then
-				ram_block_size=$OPENQRM_DEFAULT_RAM_DISK_BLOCK_SIZE
-			fi
-		else
-			ram_block_size=$OPENQRM_DEFAULT_RAM_DISK_BLOCK_SIZE
-		fi
-		mkfs.ext2 -q -b $ram_block_size -F $OPENQRM_TEMP_DIR/bootimage/initrd-$OPENQRM_SERVER_KERNEL_NAME.img
-		tune2fs -c 0 -i 0 $OPENQRM_TEMP_DIR/bootimage/initrd-$OPENQRM_SERVER_KERNEL_NAME.img
-		mkdir -p $OPENQRM_TEMP_DIR/bootimage/mnt
-		mount -o loop $OPENQRM_TEMP_DIR/bootimage/initrd-$OPENQRM_SERVER_KERNEL_NAME.img $OPENQRM_TEMP_DIR/bootimage/mnt
-		mv $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/* $OPENQRM_TEMP_DIR/bootimage/mnt/
-		# add the openQRM-linuxrc
-		rm -f $OPENQRM_TEMP_DIR/bootimage/mnt/linuxrc
-		cp $OPENQRM_SERVER_LINUXRC $OPENQRM_TEMP_DIR/bootimage/mnt/linuxrc
-		chmod +x $OPENQRM_TEMP_DIR/bootimage/mnt/linuxrc
-		umount $OPENQRM_TEMP_DIR/bootimage/mnt
-		gzip $OPENQRM_TEMP_DIR/bootimage/initrd-$OPENQRM_SERVER_KERNEL_NAME.img
-		mv $OPENQRM_TEMP_DIR/bootimage/initrd-$OPENQRM_SERVER_KERNEL_NAME.img.gz $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/initrd-$OPENQRM_SERVER_KERNEL_NAME.img
-		rm -rf $OPENQRM_TEMP_DIR/bootimage
-	elif [ "$OPENQRM_SERVER_KERNEL_TYPE" == "initramfs" ]; then
-		echo "Creating the initrd as $OPENQRM_SERVER_KERNEL_TYPE"
-		DIR_CURRENT=`pwd`
-		# add the openQRM-linuxrc as init
-		rm -f $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/linuxrc
-		rm -f $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/init
-		cp $OPENQRM_SERVER_LINUXRC $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/init
-		chmod +x $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/init
-		# pack with cpio
-		cd $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/
-		find . | cpio -o -H newc | gzip -9 > $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/initrd-$OPENQRM_SERVER_KERNEL_NAME.img
-		cd $DIR_CURRENT
-		rm -rf $OPENQRM_TEMP_DIR/bootimage
-	else
-		echo "ERROR: Supported initrd types are ext2 and initramfs. type: " . $OPENQRM_SERVER_KERNEL_TYPE
-		return 1
-	fi
-	chmod 444 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/initrd-$OPENQRM_SERVER_KERNEL_NAME.img
-	chmod 444 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/vmlinuz-$OPENQRM_SERVER_KERNEL_NAME
-	chmod 444 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/System.map-$OPENQRM_SERVER_KERNEL_NAME
-	chmod 444 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/modules-$OPENQRM_SERVER_KERNEL_NAME.tgz
-
-	# hook for plugins
-	for OPENQRM_PLUGIN in `ls $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/`; do
-		if [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/include/openqrm-plugin-$OPENQRM_PLUGIN-kernel-hook ]; then
-			. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/include/openqrm-plugin-$OPENQRM_PLUGIN-kernel-hook
-			PLUGIN_FUNCTION_NAME=`echo $OPENQRM_PLUGIN | sed -e "s/-/_/g"`""_kernel_hook
-			$PLUGIN_FUNCTION_NAME $OPENQRM_SERVER_KERNEL_NAME $OPENQRM_SERVER_KERNEL_VERSION $OPENQRM_SERVER_KERNEL_LOCATION $OPENQRM_SERVER_KERNEL_TYPE
-		fi
-	done
-
-}
-
-
-
-# function to add/remove a kernel to the openQRM-server db
-# param 1	: add/remove
-# param 2	: user
-# param 3	: password
-# param 4	: kernel name
-# param 5	: kernel-version
-function openqrm_server_manage_kernel() {
-	OPENQRM_USER=$2
-	OPENQRM_USER_PASSWORD=$3
-	OPENQRM_SERVER_KERNEL_NAME=$4
-	OPENQRM_SERVER_KERNEL_VERSION=$5
-	if [ "$OPENQRM_SERVER_IP_ADDRESS" == "" ]; then
-		OPENQRM_SERVER_IP_ADDRESS="localhost"
-	fi
-	case "$1" in
-		add)
-			echo "openQRM-server: Adding kernel $OPENQRM_SERVER_KERNEL_NAME version $OPENQRM_SERVER_KERNEL_VERSION" | logger
-			if ! $WGET -O /dev/null --http-user=$OPENQRM_USER --http-password=$OPENQRM_USER_PASSWORD "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/base/server/kernel/kernel-action.php?kernel_command=new_kernel&kernel_name=$OPENQRM_SERVER_KERNEL_NAME&kernel_version=$OPENQRM_SERVER_KERNEL_VERSION"; then
-				echo "ERROR: Could not add kernel $OPENQRM_SERVER_KERNEL_NAME to the openQRM-server!" | logger
-				return 1
-			fi
-			return 0
-			;;
-		remove)
-			echo "openQRM-server: Removing kernel $OPENQRM_SERVER_KERNEL_NAME" | logger
-			if ! $WGET -O /dev/null --http-user=$OPENQRM_USER --http-password=$OPENQRM_USER_PASSWORD "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/base/server/kernel/kernel-action.php?kernel_command=remove_by_name&kernel_name=$OPENQRM_SERVER_KERNEL_NAME"; then
-				echo "ERROR: Could not remove kernel $OPENQRM_SERVER_KERNEL_NAME to the openQRM-server!" | logger
-				return 1
-			fi
-			return 0
-			;;
-	esac
-}
-
-
-# function to set the default kernel
-# param 1	: kernel-name
-function openqrm_server_set_default_kernel() {
-	OPENQRM_KERNEL_NAME=$1
-	echo "openQRM-server: Setting kernel $OPENQRM_KERNEL_NAME as default kernel" | logger
-	if [ "$OPENQRM_KERNEL_NAME" != "default" ]; then
-		cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/vmlinuz-$OPENQRM_KERNEL_NAME $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/vmlinuz-default
-		cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/System.map-$OPENQRM_KERNEL_NAME $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/System.map-default
-		cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/initrd-$OPENQRM_KERNEL_NAME.img $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/initrd-default.img
-		cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/modules-$OPENQRM_KERNEL_NAME.tgz $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/modules-default.tgz
-	fi
-}
-
-
-# --------------------------------------------------------------------
-# ------------------------- image functions --------------------------
-# --------------------------------------------------------------------
-
-
-# function to create a crypted password file for an image
-# param 1	: image id
-# param 2	: plain password
-function openqrm_server_set_image_password() {
-	OPENQRM_IMAGE_ID=$1
-	OPENQRM_IMAGE_PASSWORD=$2
-	echo "openQRM-server: Setting root-password for image $OPENQRM_IMAGE_ID" | logger
-	$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-crypt $OPENQRM_IMAGE_PASSWORD > $OPENQRM_SERVER_BASE_DIR/openqrm/web/action/image-auth/iauth.$OPENQRM_IMAGE_ID.php
-	chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/web/action/image-auth/iauth.$OPENQRM_IMAGE_ID.php
-}
-
-
-
-
-
-# --------------------------------------------------------------------
-# ------------------------- deployments functions -------------------------
-# --------------------------------------------------------------------
-
-# function to add a deployment method to the openQRM-server db
-# this function is used by the init+uninstall functions of the deployment plugins
-# param 1	: username
-# param 2	: password
-# param 3	: deployment name
-# param 4	: deployment type
-# param 5	: deployment description
-# param 6	: deployment storagetype
-# param 7	: deployment storagetype description
-# param 8	: deployment mapping
-function openqrm_server_add_deployment_type() {
-	OPENQRM_USER=$1
-	OPENQRM_USER_PASSWORD=$2
-	OPENQRM_SERVER_DEPLOYMENT_NAME=$3
-	OPENQRM_SERVER_DEPLOYMENT_TYPE=$4
-	OPENQRM_SERVER_DEPLOYMENT_DESCRIPTION=$5
-	OPENQRM_SERVER_DEPLOYMENT_STORAGE_TYPE=$6
-	OPENQRM_SERVER_DEPLOYMENT_STORAGE_DESCRIPTION=$7
-	OPENQRM_SERVER_DEPLOYMENT_MAPPING=$8
-	if [ "$OPENQRM_SERVER_IP_ADDRESS" == "" ]; then
-		OPENQRM_SERVER_IP_ADDRESS="localhost"
-	fi
-	echo "openQRM-server: Adding deployment type $OPENQRM_SERVER_DEPLOYMENT_NAME  to the openQRM-server" | logger
-	if ! $WGET -O /dev/null -q --http-user=$OPENQRM_USER --http-password=$OPENQRM_USER_PASSWORD "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/base/server/image/image-action.php?image_command=add_deployment_type&deployment_name=$OPENQRM_SERVER_DEPLOYMENT_NAME&deployment_type=$OPENQRM_SERVER_DEPLOYMENT_TYPE&deployment_description=$OPENQRM_SERVER_DEPLOYMENT_DESCRIPTION&deployment_storagetype=$OPENQRM_SERVER_DEPLOYMENT_STORAGE_TYPE&deployment_storagedescription=$OPENQRM_SERVER_DEPLOYMENT_STORAGE_DESCRIPTION&deployment_mapping=$OPENQRM_SERVER_DEPLOYMENT_MAPPING"; then
-		echo "ERROR: Could not add deployment type $OPENQRM_SERVER_DEPLOYMENT_NAME to the openQRM-server!" | logger
-		return 1
-	fi
-	return 0
-}
-
-# function to remove a deployment method to the openQRM-server db
-# this function is used by the init+uninstall functions of the deployment plugins
-# param 1	: username
-# param 2	: password
-# param 3	: deployment name
-function openqrm_server_remove_deployment_type() {
-	OPENQRM_USER=$1
-	OPENQRM_USER_PASSWORD=$2
-	OPENQRM_SERVER_DEPLOYMENT_NAME=$3
-	if [ "$OPENQRM_SERVER_IP_ADDRESS" == "" ]; then
-		OPENQRM_SERVER_IP_ADDRESS="localhost"
-	fi
-	echo "openQRM-server: Removing deployment type $OPENQRM_SERVER_DEPLOYMENT_NAME  from the openQRM-server" | logger
-	if ! $WGET -O /dev/null -q --http-user=$OPENQRM_USER --http-password=$OPENQRM_USER_PASSWORD "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/base/server/image/image-action.php?image_command=remove_deployment_type&deployment_name=$OPENQRM_SERVER_DEPLOYMENT_NAME"; then
-		echo "ERROR: Could not remove deployment type $OPENQRM_SERVER_DEPLOYMENT_NAME from the openQRM-server!" | logger
-		return 1
-	fi
-	return 0
-}
-
-
-
-# --------------------------------------------------------------------
-# ------------------------- virtualization functions -------------------------
-# --------------------------------------------------------------------
-
-# function to add a virtualization method to the openQRM-server db
-# this function is used by the init+uninstall functions of the virtualization plugins
-# param 1	: username
-# param 2	: password
-# param 3	: virtualization type
-# param 4	: virtualization name
-function openqrm_server_add_virtualization_type() {
-	OPENQRM_USER=$1
-	OPENQRM_USER_PASSWORD=$2
-	OPENQRM_SERVER_VIRTUALIZATION_TYPE=$3
-	OPENQRM_SERVER_VIRTUALIZATION_NAME=$4
-	if [ "$OPENQRM_SERVER_IP_ADDRESS" == "" ]; then
-		OPENQRM_SERVER_IP_ADDRESS="localhost"
-	fi
-	echo "openQRM-server: Adding virtualization type $OPENQRM_SERVER_VIRTUALIZATION_TYPE  to the openQRM-server" | logger
-	if ! $WGET -O /dev/null -q --http-user=$OPENQRM_USER --http-password=$OPENQRM_USER_PASSWORD "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/base/server/resource/resource-action.php?resource_command=add_virtualization_type&virtualization_type=$OPENQRM_SERVER_VIRTUALIZATION_TYPE&virtualization_name=$OPENQRM_SERVER_VIRTUALIZATION_NAME"; then
-		echo "ERROR: Could not add virtualization type $OPENQRM_SERVER_VIRTUALIZATION_TYPE to the openQRM-server!" | logger
-		return 1
-	fi
-	return 0
-}
-
-# function to remove a virtualization method to the openQRM-server db
-# this function is used by the init+uninstall functions of the virtualization plugins
-# param 1	: username
-# param 2	: password
-# param 3	: virtualization type
-function openqrm_server_remove_virtualization_type() {
-	OPENQRM_USER=$1
-	OPENQRM_USER_PASSWORD=$2
-	OPENQRM_SERVER_VIRTUALIZATION_TYPE=$3
-	if [ "$OPENQRM_SERVER_IP_ADDRESS" == "" ]; then
-		OPENQRM_SERVER_IP_ADDRESS="localhost"
-	fi
-	echo "openQRM-server: Removing virtualization type $OPENQRM_SERVER_VIRTUALIZATION_TYPE  from the openQRM-server" | logger
-	if ! $WGET -O /dev/null -q --http-user=$OPENQRM_USER --http-password=$OPENQRM_USER_PASSWORD "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/base/server/resource/resource-action.php?resource_command=remove_virtualization_type&virtualization_type=$OPENQRM_SERVER_VIRTUALIZATION_TYPE"; then
-		echo "ERROR: Could not remove virtualization type $OPENQRM_SERVER_VIRTUALIZATION_TYPE from the openQRM-server!" | logger
-		return 1
-	fi
-	return 0
-}
-
-
-
-
-# --------------------------------------------------------------------
-# ------------------------- resource functions -----------------------
-# --------------------------------------------------------------------
-
-
-
-# function adding a new resource to the openQRM-server
-# param 1	: resource_id
-# param 2	: kernel name
-# param 3	: pxelinux.cfg filename
-function openqrm_server_create_pxe_config() {
-	local RESOURCE_ID=$1
-	local KERNEL_NAME=$2
-	local RESOURCE_PXELINUXCFG_FILE=$3
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-pxelinux |	\
-		sed -e "s/OPENQRM_BOOTIMAGE_KERNEL/vmlinuz-$KERNEL_NAME/g" |	\
-		sed -e "s/OPENQRM_BOOTIMAGE_INITRD/initrd-$KERNEL_NAME.img/g" |	\
-		sed -e "s/OPENQRM_RESOURCE_ID/$RESOURCE_ID/g" |	\
-		sed -e "s/OPENQRM_SERVER_IP_ADDRESS/$OPENQRM_SERVER_IP_ADDRESS/g" \
-		> $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-	chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-
-	# allow plugin to re-write the pxe-config
-	for OPENQRM_PLUGIN in `ls $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/`; do
-		if [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/include/openqrm-plugin-$OPENQRM_PLUGIN-assign-hook ]; then
-			. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/include/openqrm-plugin-$OPENQRM_PLUGIN-assign-hook
-			OPENQRM_PLUGIN=`echo $OPENQRM_PLUGIN | sed -e "s/-/_/g"`
-			$OPENQRM_PLUGIN""_assign_hook $RESOURCE_ID $KERNEL_NAME $RESOURCE_PXELINUXCFG_FILE
-		fi
-	done
-}
-
-
-
-# function adding a new resource to the openQRM-server
-# param 1	: resource_id
-# param 2	: resource_mac
-# param 3	: resouce_ip
-function openqrm_server_add_resource() {
-	local RESOURCE_ID=$1
-	local RESOURCE_MAC=$2
-	local RESOURCE_IP_ADDRESS=$3
-	local RESOURCE_PXELINUXCFG_FILE=`echo 01-$RESOURCE_MAC | sed -e "s/:/-/g" | tr '[:upper:]' '[:lower:]'`
-	echo "openQRM-server: Adding resource $RESOURCE_ID $RESOURCE_MAC/$RESOURCE_IP_ADDRESS" | logger
-	openqrm_server_create_pxe_config $RESOURCE_ID default $RESOURCE_PXELINUXCFG_FILE
-}
-
-
-# function to remove a resource from the openQRM-server
-# param 1	: resource_id
-# param 2	: resource_mac
-function openqrm_remove_resource() {
-	local RESOURCE_ID=$1
-	local RESOURCE_MAC=$2
-	local RESOURCE_PXELINUXCFG_FILE=`echo 01-$RESOURCE_MAC | sed -e "s/:/-/g" | tr '[:upper:]' '[:lower:]'`
-	echo "openQRM-server: Removing resource $RESOURCE_ID $RESOURCE_MAC/$RESOURCE_IP_ADDRESS" | logger
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE.idle
-}
-
-
-
-# function to set a resource net or local boot
-# param 1	: resource_id
-# param 2	: resource_mac
-# param 3	: resouce_ip
-function openqrm_server_set_boot() {
-	local RESOURCE_BOOT=$1
-	local RESOURCE_ID=$2
-	local RESOURCE_MAC=$3
-	local RESOURCE_IP_ADDRESS=$4
-	local RESOURCE_PXELINUXCFG_FILE=`echo 01-$RESOURCE_MAC | sed -e "s/:/-/g" | tr '[:upper:]' '[:lower:]'`
-	if [ "$RESOURCE_BOOT" == "net" ]; then
-		echo "openQRM-server: Setting resource $RESOURCE_ID $RESOURCE_MAC/$RESOURCE_IP_ADDRESS to netboot" | logger
-		openqrm_server_create_pxe_config $RESOURCE_ID default $RESOURCE_PXELINUXCFG_FILE
-	else
-		echo "openQRM-server: Setting resource $RESOURCE_ID $RESOURCE_MAC/$RESOURCE_IP_ADDRESS to localboot" | logger
-		sed -i -e "s/^default.*/default local/g" $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-		chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-	fi
-}
-
-
-
-
-# function to assign a kernel to a resource
-# param 1	: resource_id
-# param 2	: resource_mac
-# param 3	: resouce_ip
-function openqrm_assign_kernel() {
-	local RESOURCE_ID=$1
-	local RESOURCE_MAC=$2
-	local RESOURCE_KERNEL=$3
-	local RESOURCE_PXELINUXCFG_FILE=`echo 01-$RESOURCE_MAC | sed -e "s/:/-/g" | tr '[:upper:]' '[:lower:]'`
-	echo "openQRM-server: Assigning resource $RESOURCE_ID $RESOURCE_MAC to kernel $RESOURCE_KERNEL" | logger
-	openqrm_server_create_pxe_config $RESOURCE_ID $RESOURCE_KERNEL $RESOURCE_PXELINUXCFG_FILE
-}
-
-
-
-
-# function to get infos about a resource
-# param 1	: resource_mac
-function openqrm_get_resource_parameter() {
-	local mac=$1
-	if [ "$OPENQRM_SERVER_IP_ADDRESS" == "" ]; then
-		OPENQRM_SERVER_IP_ADDRESS="localhost"
-	fi
-	$WGET -q -O /tmp/$mac "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_mac=$mac"
-	. /tmp/$mac
-	for param in `cat /tmp/$mac`; do
-		KEY=`echo $param | cut -d'=' -f1`
-		if [ "$KEY" != '"' ]; then
-			export $KEY 2>/dev/null
-		fi
-	done
-}
-
-
-
-
-# --------------------------------------------------------------------
-# ------------------------- plugin functions -------------------------
-# --------------------------------------------------------------------
-
-# function to run a plugin command
-# param 1	: plugin_name
-function openqrm_server_plugin_command() {
-	local PLUGIN_NAME=$1
-	local PLUGIN_COMMAND=$2
-	local PLUGIN_USER=$3
-	local PLUGIN_PASS=$4
-	local PLUGIN_INIT_SCRIPT="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/etc/init.d/openqrm-plugin-$PLUGIN_NAME"
-	if [ -x $PLUGIN_INIT_SCRIPT ]; then
-		echo "openQRM-server: $PLUGIN_COMMAND openQRM plugin $PLUGIN_NAME user $PLUGIN_USER" | logger
-		$PLUGIN_INIT_SCRIPT $PLUGIN_COMMAND $PLUGIN_USER $PLUGIN_PASS &
-	else
-		echo "openQRM-server: $PLUGIN_NAME init script not found or not executable !" | logger
-	fi
-}
-
-
-
-
-
-
-# --------------------------------------------------------------------
-# ------------------------- state backup/restore functions -------------------------
-# --------------------------------------------------------------------
-
-# function to backup/restore a server-state
-# param 1	: <backup/restore/remove/list>
-# param 1	: [name]
-function openqrm_server_state() {
-	local CMD=$1
-	local NAME=$2
-	local NOW=`date +"%D_%T" | sed -e "s#/#-#g" | sed -e "s#:#.#g"`
-	local USAGE="Usage : openqrm_server_state backup/restore/remove/list [name]"
-	if [ ! -d $OPENQRM_SERVER_STATE_DIR ]; then
-		mkdir -p $OPENQRM_SERVER_STATE_DIR
-	fi
-	if [ "$CMD" == "" ]; then
-		echo $USAGE
-		return 1
-	fi
-	if [ "$CMD" != "list" ] && [ "$NAME" == "" ]; then
-		echo $USAGE
-		return 1
-	fi
-
-
-
-	case $CMD in
-		backup)
-				echo "openQRM-server: Creating backup of the server state $NAME-$NOW"
-				rm -rf $OPENQRM_SERVER_STATE_DIR/$NAME
-				mkdir -p $OPENQRM_SERVER_STATE_DIR/$NAME
-
-				# dirs
-				# adding the plugin-backup dirs to the dirlist
-				for OPENQRM_PLUGIN in `ls $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/`; do
-					if [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/openqrm-plugin-$OPENQRM_PLUGIN.conf ]; then
-						. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/openqrm-plugin-$OPENQRM_PLUGIN.conf
-						OPENQRM_SERVER_STATE_DIRS="$OPENQRM_SERVER_STATE_DIRS $OPENQRM_PLUGIN_STATE_DIRS"
-						unset OPENQRM_PLUGIN_STATE_DIRS
-					fi
-				done
-				# now the static dirs
-				for DIR in $OPENQRM_SERVER_STATE_DIRS; do
-					if [ -d "$DIR" ]; then
-						mkdir -p `dirname $OPENQRM_SERVER_STATE_DIR/$NAME/$DIR`
-						cp -aR $DIR `dirname $OPENQRM_SERVER_STATE_DIR/$NAME/$DIR`
-					fi
-				done
-
-				# files
-				# first add the enabled plugins state file
-				for RUNNING in `ls $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/`; do
-					if [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$RUNNING/web/.running ]; then
-						mkdir -p $OPENQRM_SERVER_STATE_DIR/$NAME/$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$RUNNING/web/
-						touch $OPENQRM_SERVER_STATE_DIR/$NAME/$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$RUNNING/web/.running
-					fi
-				done
-				# now adding the plugin-backup files to the filelist
-				for OPENQRM_PLUGIN in `ls $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/`; do
-					if [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/openqrm-plugin-$OPENQRM_PLUGIN.conf ]; then
-						. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/openqrm-plugin-$OPENQRM_PLUGIN.conf
-						OPENQRM_SERVER_STATE_FILES="$OPENQRM_SERVER_STATE_FILES $OPENQRM_PLUGIN_STATE_FILES"
-						unset OPENQRM_PLUGIN_STATE_FILES
-					fi
-				done
-				# now the static files
-				for FILE in $OPENQRM_SERVER_STATE_FILES; do
-					if [ -f "$FILE" ]; then
-						mkdir -p `dirname $OPENQRM_SERVER_STATE_DIR/$NAME/$FILE`
-						cp -af $FILE $OPENQRM_SERVER_STATE_DIR/$NAME/$FILE
-					fi
-				done
-
-				RELATIVE_OPENQRM_SERVER_BASE_DIR=`echo $OPENQRM_SERVER_BASE_DIR | sed -e s"#/##"`
-				# db
-				$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/$OPENQRM_DATABASE_TYPE/openqrm-$OPENQRM_DATABASE_TYPE-functions backup $OPENQRM_SERVER_STATE_DIR/$NAME/$RELATIVE_OPENQRM_SERVER_BASE_DIR/openqrm/database.sql
-
-				# package
-				tar -C $OPENQRM_SERVER_STATE_DIR/$NAME -czf $OPENQRM_SERVER_STATE_DIR/$NAME-$NOW.tgz $RELATIVE_OPENQRM_SERVER_BASE_DIR/openqrm
-				rm -rf $OPENQRM_SERVER_STATE_DIR/$NAME
-				;;
-
-		restore)
-				if [ -f $OPENQRM_SERVER_STATE_DIR/$NAME.tgz ]; then
-					echo "openQRM-server: Restoring server state from $OPENQRM_SERVER_STATE_DIR/$NAME.tgz"
-					# files + dirs
-					tar -C / -xzf $OPENQRM_SERVER_STATE_DIR/$NAME.tgz
-					# db
-					$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/$OPENQRM_DATABASE_TYPE/openqrm-$OPENQRM_DATABASE_TYPE-functions restore $OPENQRM_SERVER_BASE_DIR/openqrm/database.sql
-					rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/database.sql
-				else
-					echo "openQRM-server: No such sever state file $NAME"
-					return 1
-				fi
-				;;
-
-		remove)
-				if [ -f $OPENQRM_SERVER_STATE_DIR/$NAME.tgz ]; then
-					echo "openQRM-server: Removing server state $NAME-$NOW"
-					rm -f $OPENQRM_SERVER_STATE_DIR/$NAME.tgz
-				else
-					echo "openQRM-server: No such sever state file $NAME"
-					return 1
-				fi
-				;;
-		list)
-				ls $OPENQRM_SERVER_STATE_DIR | sed -s "s/\.tgz//g"
-				;;
-
-		*)
-				echo "openQRM-server: No such server-state command!"
-				return 1
-				;;
-
-
-
-	esac
-
-}
-
-
-# --------------------------------------------------------------------
-
-
-
diff --git a/openQRM-5.3.50-CE/src/include/openqrm-server-functions~ b/openQRM-5.3.50-CE/src/include/openqrm-server-functions~
deleted file mode 100644
index a717688..0000000
--- a/openQRM-5.3.50-CE/src/include/openqrm-server-functions~
+++ /dev/null
@@ -1,834 +0,0 @@
-#!/bin/bash
-# this is the server function file for openQRM
-# only server functions should go in here
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export LANGUAGE=C
-export LANG=C
-export LC_ALL=C
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	echo "ERROR: Please export OPENQRM_SERVER_BASE_DIR before sourcing $0"
-	exit 1
-fi
-
-# source the server configuration
-OPENQRM_SERVER_CONF=$OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_CONF
-
-# some definitions
-#OPENQRM_UNWANTED_MODULES="cops.o ipddp.o ltpc.o hdlcdrv.o airo_cs.o aironet4500_cs.o airo.o axnet_cs.o fmvj18x_cs.o ibmtr_cs.o netwave_cs.o nmclan_cs.o pcnet_cs.o ray_cs.o smc91c92_cs.o wavelan_cs.o wvlan_cs.o xirc2ps_cs.o xircom_cb.o xircom_tulip_cb.o ppp_async.o ppp_deflate.o ppp_generic.o ppp_synctty.o wavelan.o wd.o winbond-840.o airo_cs.o airo.o hermes.o orinoco_cs.o orinoco.o orinoco_plx.o orinoco_old_cs.o cops.ko ipddp.ko ltpc.ko hdlcdrv.ko airo_cs.ko aironet4500_cs.ko airo.ko axnet_cs.ko fmvj18x_cs.ko ibmtr_cs.ko netwave_cs.ko nmclan_cs.ko pcnet_cs.ko ray_cs.ko smc91c92_cs.ko wavelan_cs.ko wvlan_cs.ko xirc2ps_cs.ko xircom_cb.ko xircom_tulip_cb.ko ppp_async.ko ppp_deflate.ko ppp_generic.ko ppp_synctty.ko wavelan.ko wd.ko winbond-840.ko airo_cs.ko airo.ko hermes.ko orinoco_cs.ko orinoco.ko orinoco_plx.ko orinoco_old_cs.ko de600.ko de620.ko defxx.ko depca.ko hp100.ko hp.ko hp-plus.ko ne3210.ko ne.ko netwave_cs.ko ipw2100.ko proteon.ko skisa.ko vga16fb.ko atyfb.ko xen-netfront.ko"
-OPENQRM_UNWANTED_MODULES="cops.o ipddp.o ltpc.o hdlcdrv.o airo_cs.o aironet4500_cs.o airo.o axnet_cs.o fmvj18x_cs.o ibmtr_cs.o netwave_cs.o nmclan_cs.o pcnet_cs.o ray_cs.o smc91c92_cs.o wavelan_cs.o wvlan_cs.o xirc2ps_cs.o xircom_cb.o xircom_tulip_cb.o ppp_async.o ppp_deflate.o ppp_generic.o ppp_synctty.o wavelan.o wd.o winbond-840.o airo_cs.o airo.o hermes.o orinoco_cs.o orinoco.o orinoco_plx.o orinoco_old_cs.o cops.ko ipddp.ko ltpc.ko hdlcdrv.ko airo_cs.ko aironet4500_cs.ko airo.ko axnet_cs.ko fmvj18x_cs.ko ibmtr_cs.ko netwave_cs.ko nmclan_cs.ko pcnet_cs.ko ray_cs.ko smc91c92_cs.ko wavelan_cs.ko wvlan_cs.ko xirc2ps_cs.ko xircom_cb.ko xircom_tulip_cb.ko ppp_async.ko ppp_deflate.ko ppp_generic.ko ppp_synctty.ko wavelan.ko wd.ko winbond-840.ko airo_cs.ko airo.ko hermes.ko orinoco_cs.ko orinoco.ko orinoco_plx.ko orinoco_old_cs.ko de600.ko de620.ko defxx.ko depca.ko hp100.ko hp.ko hp-plus.ko ne3210.ko ne.ko netwave_cs.ko ipw2100.ko proteon.ko skisa.ko atyfb.ko xen-netfront.ko"
-
-OPENQRM_DEFAULT_INITRD_TEMPLATE="$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-initrd-default.tgz"
-OPENQRM_SERVER_LINUXRC="$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-linuxrc"
-OPENQRM_MAX_INITRD_SIZE=128000
-OPENQRM_DEFAULT_RAM_DISK_BLOCK_SIZE=1024
-# static directory define for the server state backups
-OPENQRM_SERVER_STATE_DIR="/var/spool/openqrm-state"
-# which files/dirs to backup/restore (base only, plugin need to care about their bacukp/restore themselves)
-OPENQRM_SERVER_STATE_FILES="$OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-initrd-default.tgz	\
-	$OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-linuxrc"
-OPENQRM_SERVER_STATE_DIRS="$OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/ \
-	$OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/	\
-	$OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/	\
-	$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/"
-
-
-
-# translates cidr to subnet mask
-function cidr2subnet () {
-	if [ "$1" != "" ]; then
-		set -- $(( 5 - ($1 / 8) )) 255 255 255 255 $(( (255 << (8 - ($1 % 8))) & 255 )) 0 0 0
-		[ $1 -gt 1 ] && shift $1 || shift
-		echo ${1-0}.${2-0}.${3-0}.${4-0}
-	fi
-}
-
-
-# function to export all given configuration from the
-# main openQRM-server config file
-function openqrm_server_get_config() {
-	. $OPENQRM_SERVER_CONF
-	for VAR in `cat $OPENQRM_SERVER_CONF | grep -v ^# | grep OPENQRM | cut -d'=' -f1`; do
-		eval `export $VAR`
-	done
-
-	# make sure /sbin and /usr/sbin are in our PATH, because we might be running as the webserver user,
-	# in which case the ifconfig and route commands will fail, leaving the variables empty (bad!)
-	PATH=/sbin:/usr/sbin:$PATH
-	# get ip configuration
-	export OPENQRM_SERVER_IP_ADDRESS=`ip a s $OPENQRM_SERVER_INTERFACE 2>/dev/null | grep -w $OPENQRM_SERVER_INTERFACE$ | grep -w inet | awk '{ print $2 }' | cut -d'/' -f1`
-	export OPENQRM_SERVER_BROADCAST_ADDRESS=`ip a s $OPENQRM_SERVER_INTERFACE 2>/dev/null | grep -w $OPENQRM_SERVER_INTERFACE$ | grep -w inet | awk '{ print $4 }' | cut -d'/' -f1`
-	export OPENQRM_SERVER_CIDR=`ip a s $OPENQRM_SERVER_INTERFACE 2>/dev/null | grep -w $OPENQRM_SERVER_INTERFACE$ | grep -w inet | awk '{ print $2 }' | cut -d'/' -f2`
-	export OPENQRM_SERVER_SUBNET_MASK=`cidr2subnet $OPENQRM_SERVER_CIDR`
-	export OPENQRM_SERVER_DEFAULT_GATEWAY=`route -n | grep ^0.0.0.0 | head -n1 | awk {' print $2 '}`
-}
-# run immediatly
-openqrm_server_get_config
-
-# define wget to use with https
-if [ "$OPENQRM_WEB_PROTOCOL" == "https" ]; then
-	export WGET="wget --no-check-certificate"
-else
-	export WGET="wget"
-fi
-
-
-# --------------------------------------------------------------------
-# ------------------------- kernel functions -------------------------
-# --------------------------------------------------------------------
-
-
-
-# function resolve kernel module dependencies
-# param 1	: full path to kernel module
-function modresolvdeps() {
-	MODULE=$1
-	FMOD=`basename $MODULE`
-	FREST=`echo $MODULE | sed -e "s#.*\/kernel\/##g"`
-	DMOD=`echo $MODULE | sed -e "s#$FREST##g"`
-	DPENDLIST=`modinfo $MODULE | grep ^depends | cut -d':' -f2 | awk '{ print $1 }' | sed -e "s/,/ /g"`
-	if [ "$DPENDLIST" != "" ]; then
-		for MOD in `echo $DPENDLIST`; do
-			#echo $MOD
-			MODFULLPATH=`find $DMOD -name $MOD.ko`
-			echo $MODFULLPATH
-			modresolvdeps $MODFULLPATH
-		done
-	fi
-
-}
-
-
-
-
-# function to create kernels
-# param 1	: kernel name
-# param 2	: kernel-version
-# param 3	: path-to-kernel-files
-function openqrm_server_create_kernel() {
-
-	OPENQRM_SERVER_KERNEL_NAME=$1
-	OPENQRM_SERVER_KERNEL_VERSION=$2
-	OPENQRM_SERVER_KERNEL_LOCATION=$3
-
-	# OPENQRM_SERVER_KERNEL_TYPE can be "ext2" or "initramfs"
-	OPENQRM_SERVER_KERNEL_TYPE=$4
-	OPENQRM_SERVER_INITRD_TEMPLATE=$5
-	OPENQRM_SERVER_UNWANTED_MODULES=$6
-
-	if [ "$OPENQRM_SERVER_UNWANTED_MODULES" != "" ]; then
-		OPENQRM_SERVER_UNWANTED_MODULES_SPACES=`echo $OPENQRM_SERVER_UNWANTED_MODULES | sed -e "s/,/\.ko /g"`".ko"
-		OPENQRM_UNWANTED_MODULES="$OPENQRM_UNWANTED_MODULES $OPENQRM_SERVER_UNWANTED_MODULES_SPACES"
-		for MO in `echo $OPENQRM_SERVER_UNWANTED_MODULES_SPACES`; do
-			MODULES_EXCLUDE="$MODULES_EXCLUDE --exclude=$MO"
-		done
-	fi
-
-	if [ "$OPENQRM_SERVER_KERNEL_TYPE" == "" ]; then
-		export OPENQRM_SERVER_KERNEL_TYPE="initramfs"
-	fi
-	if [ "$OPENQRM_SERVER_INITRD_TEMPLATE" == "" ]; then
-		export OPENQRM_SERVER_INITRD_TEMPLATE=$OPENQRM_DEFAULT_INITRD_TEMPLATE
-	fi
-	# kernel there ?
-	if [ ! -f "$OPENQRM_SERVER_KERNEL_LOCATION/boot/vmlinuz-$OPENQRM_SERVER_KERNEL_VERSION" ]; then
-		echo "ERROR: Cannot find kernel file at $OPENQRM_SERVER_KERNEL_LOCATION/boot/vmlinuz-$OPENQRM_SERVER_KERNEL_VERSION!"
-		return 1
-	fi
-	# system.map there ?
-	if [ ! -f "$OPENQRM_SERVER_KERNEL_LOCATION/boot/System.map-$OPENQRM_SERVER_KERNEL_VERSION" ]; then
-		echo "ERROR: Cannot find System.map at $OPENQRM_SERVER_KERNEL_LOCATION/boot/System.map-$OPENQRM_SERVER_KERNEL_VERSION!"
-		return 1
-	fi
-	# module dir there ?
-	if [ ! -d "$OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION" ]; then
-		echo "ERROR: Cannot find kernel module directory at $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION!"
-		return 1
-	fi
-	# modules.pcimap there ?
-	if [ ! -f "$OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/modules.pcimap" ]; then
-		echo "WARNING: Cannot find modules.pcimap in kernel module directory at $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION. Trying to create it ..."
-		if ! depmod -a -m -F $OPENQRM_SERVER_KERNEL_LOCATION/boot/System.map-$OPENQRM_SERVER_KERNEL_VERSION -b $OPENQRM_SERVER_KERNEL_LOCATION $OPENQRM_SERVER_KERNEL_VERSION; then
-			echo "WARNING: Could not create modules.pcimap in kernel module directory at $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION! Trying to continue ..."
-		else
-			echo "NOTICE: Created modules.pcimap in kernel module directory at $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION."
-		fi
-	fi
-
-	echo "Creating kernel $OPENQRM_SERVER_KERNEL_NAME version $OPENQRM_SERVER_KERNEL_VERSION ($OPENQRM_SERVER_KERNEL_TYPE initrd)"
-
-	# copy kernel + System-map
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot
-	cp -a $OPENQRM_SERVER_KERNEL_LOCATION/boot/vmlinuz-$OPENQRM_SERVER_KERNEL_VERSION $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/vmlinuz-$OPENQRM_SERVER_KERNEL_NAME
-	cp -a $OPENQRM_SERVER_KERNEL_LOCATION/boot/System.map-$OPENQRM_SERVER_KERNEL_VERSION $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/System.map-$OPENQRM_SERVER_KERNEL_NAME
-
-	# modules
-	#tar -C $OPENQRM_SERVER_KERNEL_LOCATION/ -czf $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/modules-$OPENQRM_SERVER_KERNEL_NAME.tgz lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-	tar -C $OPENQRM_SERVER_KERNEL_LOCATION/ -czf $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/modules-$OPENQRM_SERVER_KERNEL_NAME.tgz $MODULES_EXCLUDE lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-
-	# initrd
-	mkdir -p $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME
-	mkdir -p $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-	for MODULE in `find $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net -type f | grep -v wireless`; do
-		MODULE_NAME=`echo $MODULE | sed -e "s/.*\///"`
-		if ! echo $OPENQRM_UNWANTED_MODULES | grep $MODULE_NAME 1>/dev/null; then
-			/bin/cp -f $MODULE $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-			# resolve deps
-			for L in `modresolvdeps $MODULE`; do
-				DEPNAME=`basename $L`
-				echo "--- adding module dependency $MODULE_NAME -> $DEPNAME"
-				/bin/cp -f $L $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-			done
-		fi
-	done
-
-	# also need virtio* for kvm virtio pci network card
-	for MODULE in `find $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers -type f -name virtio*`; do
-		MODULE_NAME=`echo $MODULE | sed -e "s/.*\///"`
-		if ! echo $OPENQRM_UNWANTED_MODULES | grep $MODULE_NAME 1>/dev/null; then
-			/bin/cp -f $MODULE $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-		fi
-	done
-
-
-#	# also need igb for network cards
-#	for MODULE in `find $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers -type f -name igb`; do
-#		MODULE_NAME=`echo $MODULE | sed -e "s/.*\///"`
-#		if ! echo $OPENQRM_UNWANTED_MODULES | grep $MODULE_NAME 1>/dev/null; then
-#			/bin/cp -f $MODULE $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-#		fi
-#	done
-
-#	# also need ixgbe for network cards
-#	for MODULE in `find $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers -type f -name ixgbe`; do
-#		MODULE_NAME=`echo $MODULE | sed -e "s/.*\///"`
-#		if ! echo $OPENQRM_UNWANTED_MODULES | grep $MODULE_NAME 1>/dev/null; then
-#			/bin/cp -f $MODULE $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-#		fi
-#	done
-
-	# for networks support
-	for MODULE in `find  $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/ -type f | egrep 'mptbase|mptsas|mptscsih|scsi_transport_sas|jfs|crc32|bnx2|bnx2x|usbhid|hid|mdio|dca|virtio'`; do
-		MODULE_NAME=`echo $MODULE | sed -e "s/.*\///"`
-		if ! echo $OPENQRM_UNWANTED_MODULES | grep $MODULE_NAME 1>/dev/null; then
-			/bin/cp -f $MODULE $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-		fi
-	done
-
-	
-	# need i2c modules - for igb
-	mkdir -p $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/
-
-	/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/i2c $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/
-	/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/dca $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/
-	/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/dma $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/
-
-	/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/mfd $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/
-	/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/watchdog $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/
-
-	#for e1000e; ptp, pps
-	if [ -d $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net/ethernet/ ]; then
-		mkdir -p $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net/ethernet/
-		/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net/ethernet/* $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net/ethernet/
-	elif [ -d $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net/ ]; then
-		mkdir -p $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net/ 
-		/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net/* $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/net/
-	fi
-	#end igb
-
-	#ptp, pps
-	if [ -d $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/ptp ]; then
-		/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/ptp $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/
-	fi
-	
-	if [ -d $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/pps ]; then
-		/bin/cp -Rf $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/pps $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/
-	fi
-	# end ptp, pps
-	
-
-	# also need dma modules
-	for MODULE in `find $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/kernel/drivers/dma -type f`; do
-		MODULE_NAME=`echo $MODULE | sed -e "s/.*\///"`
-		if ! echo $OPENQRM_UNWANTED_MODULES | grep $MODULE_NAME 1>/dev/null; then
-			echo "- adding dma module $MODULE_NAME"
-			/bin/cp -f $MODULE $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-			# resolve deps
-			for L in `modresolvdeps $MODULE`; do
-				DEPNAME=`basename $L`
-				echo "--- adding module dependency $MODULE_NAME -> $DEPNAME"
-				/bin/cp -f $L $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-			done
-		fi
-	done
-	#end dma
-
-	# for bnx2 support
-	for MODULE in `find  $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/ -type f | egrep 'mptbase|mptsas|mptscsih|scsi_transport_sas|jfs|crc32|bnx2|bnx2x|hid|mdio|dca|virtio'`; do
-		MODULE_NAME=`echo $MODULE | sed -e "s/.*\///"`
-		if ! echo $OPENQRM_UNWANTED_MODULES | grep $MODULE_NAME 1>/dev/null; then
-			/bin/cp -f $MODULE $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION
-		fi
-	done
-	# include firmware for bnx2/bnx2x
-	rm -rf   $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/firmware
-	mkdir -p $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/firmware/
-	if ls $OPENQRM_SERVER_KERNEL_LOCATION/lib/firmware/bnx2* 2>/dev/null 1>&2; then
-#		/bin/cp -aRf  $OPENQRM_SERVER_KERNEL_LOCATION/lib/firmware/bnx2* $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/firmware/
-		/bin/cp -aRf  /lib/firmware/bnx2* $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/firmware/
-	fi
-	#end bnx2
-
-
-	# include firmware for cxgb4 T4 & T5 adapters 
-	#/bin/cp -aRf  $OPENQRM_SERVER_KERNEL_LOCATION/lib/firmware/cxgb4 $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/firmware/
-	/bin/cp -aRf  /lib/firmware/cxgb4 $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/firmware/
-	#end add firmware for cxgb4 T4 & T5 adapters
-	
-
-	# also we need to take the modules.pcimap for the hardware detection to work
-	cp -a $OPENQRM_SERVER_KERNEL_LOCATION/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/modules.* $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/modules/$OPENQRM_SERVER_KERNEL_VERSION/
-	# unpack the initrd-template
-	echo "-> using initrd-template from $OPENQRM_SERVER_INITRD_TEMPLATE"
-	tar -C $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME -xzf $OPENQRM_SERVER_INITRD_TEMPLATE
-
-	# check size
-	OPENQRM_INITRD_SIZE=`du -s $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/ | awk {' print $1 '}`
-	OPENQRM_INITRD_SIZE=$(( OPENQRM_INITRD_SIZE + 16000 ))
-	if (( $OPENQRM_INITRD_SIZE > $OPENQRM_MAX_INITRD_SIZE )); then
-		echo "ERROR: Initrd got too big"
-		return 1
-	fi
-
-	# take udev from kernel-location
-	rm -rf $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/etc/udev
-	cp -aR $OPENQRM_SERVER_KERNEL_LOCATION/etc/udev $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/etc/
-	# and /lib/udev
-	rm -rf $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/udev
-	cp -aR $OPENQRM_SERVER_KERNEL_LOCATION/lib/udev $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/lib/
-	# take the initial console device
-	cp -aR $OPENQRM_SERVER_KERNEL_LOCATION/dev/console $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/dev/
-
-	# create run/udev dir for binding udevd socket
-	mkdir -p $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/run/udev
-
-	# creating the initrd file
-	if [ "$OPENQRM_SERVER_KERNEL_TYPE" == "ext2" ]; then
-		echo "Creating the initrd as $OPENQRM_SERVER_KERNEL_TYPE"
-		dd if=/dev/zero of=$OPENQRM_TEMP_DIR/bootimage/initrd-$OPENQRM_SERVER_KERNEL_NAME.img bs=1k count=$OPENQRM_INITRD_SIZE
-		#get ram block size there is a problem in newer kernels with size 4096
-		if [ -f "$OPENQRM_SERVER_KERNEL_LOCATION/boot/config-$OPENQRM_SERVER_KERNEL_VERSION" ]; then
-			ram_block_size=`cat $OPENQRM_SERVER_KERNEL_LOCATION/boot/config-$OPENQRM_SERVER_KERNEL_VERSION | grep  CONFIG_BLK_DEV_RAM_BLOCKSIZE | awk -F= '{print $2}'`
-			if [ -z $ram_block_size ]; then
-				ram_block_size=$OPENQRM_DEFAULT_RAM_DISK_BLOCK_SIZE
-			fi
-		else
-			ram_block_size=$OPENQRM_DEFAULT_RAM_DISK_BLOCK_SIZE
-		fi
-		mkfs.ext2 -q -b $ram_block_size -F $OPENQRM_TEMP_DIR/bootimage/initrd-$OPENQRM_SERVER_KERNEL_NAME.img
-		tune2fs -c 0 -i 0 $OPENQRM_TEMP_DIR/bootimage/initrd-$OPENQRM_SERVER_KERNEL_NAME.img
-		mkdir -p $OPENQRM_TEMP_DIR/bootimage/mnt
-		mount -o loop $OPENQRM_TEMP_DIR/bootimage/initrd-$OPENQRM_SERVER_KERNEL_NAME.img $OPENQRM_TEMP_DIR/bootimage/mnt
-		mv $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/* $OPENQRM_TEMP_DIR/bootimage/mnt/
-		# add the openQRM-linuxrc
-		rm -f $OPENQRM_TEMP_DIR/bootimage/mnt/linuxrc
-		cp $OPENQRM_SERVER_LINUXRC $OPENQRM_TEMP_DIR/bootimage/mnt/linuxrc
-		chmod +x $OPENQRM_TEMP_DIR/bootimage/mnt/linuxrc
-		umount $OPENQRM_TEMP_DIR/bootimage/mnt
-		gzip $OPENQRM_TEMP_DIR/bootimage/initrd-$OPENQRM_SERVER_KERNEL_NAME.img
-		mv $OPENQRM_TEMP_DIR/bootimage/initrd-$OPENQRM_SERVER_KERNEL_NAME.img.gz $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/initrd-$OPENQRM_SERVER_KERNEL_NAME.img
-		rm -rf $OPENQRM_TEMP_DIR/bootimage
-	elif [ "$OPENQRM_SERVER_KERNEL_TYPE" == "initramfs" ]; then
-		echo "Creating the initrd as $OPENQRM_SERVER_KERNEL_TYPE"
-		DIR_CURRENT=`pwd`
-		# add the openQRM-linuxrc as init
-		rm -f $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/linuxrc
-		rm -f $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/init
-		cp $OPENQRM_SERVER_LINUXRC $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/init
-		chmod +x $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/init
-		# pack with cpio
-		cd $OPENQRM_TEMP_DIR/bootimage/$OPENQRM_SERVER_KERNEL_NAME/
-		find . | cpio -o -H newc | gzip -9 > $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/initrd-$OPENQRM_SERVER_KERNEL_NAME.img
-		cd $DIR_CURRENT
-		rm -rf $OPENQRM_TEMP_DIR/bootimage
-	else
-		echo "ERROR: Supported initrd types are ext2 and initramfs. type: " . $OPENQRM_SERVER_KERNEL_TYPE
-		return 1
-	fi
-	chmod 444 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/initrd-$OPENQRM_SERVER_KERNEL_NAME.img
-	chmod 444 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/vmlinuz-$OPENQRM_SERVER_KERNEL_NAME
-	chmod 444 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/System.map-$OPENQRM_SERVER_KERNEL_NAME
-	chmod 444 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/modules-$OPENQRM_SERVER_KERNEL_NAME.tgz
-	# hook for plugins
-	for OPENQRM_PLUGIN in `ls $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/`; do
-		if [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/include/openqrm-plugin-$OPENQRM_PLUGIN-kernel-hook ]; then
-			. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/include/openqrm-plugin-$OPENQRM_PLUGIN-kernel-hook
-			PLUGIN_FUNCTION_NAME=`echo $OPENQRM_PLUGIN | sed -e "s/-/_/g"`""_kernel_hook
-			$PLUGIN_FUNCTION_NAME $OPENQRM_SERVER_KERNEL_NAME $OPENQRM_SERVER_KERNEL_VERSION $OPENQRM_SERVER_KERNEL_LOCATION $OPENQRM_SERVER_KERNEL_TYPE
-		fi
-	done
-}
-
-
-
-# function to add/remove a kernel to the openQRM-server db
-# param 1	: add/remove
-# param 2	: user
-# param 3	: password
-# param 4	: kernel name
-# param 5	: kernel-version
-function openqrm_server_manage_kernel() {
-	OPENQRM_USER=$2
-	OPENQRM_USER_PASSWORD=$3
-	OPENQRM_SERVER_KERNEL_NAME=$4
-	OPENQRM_SERVER_KERNEL_VERSION=$5
-	if [ "$OPENQRM_SERVER_IP_ADDRESS" == "" ]; then
-		OPENQRM_SERVER_IP_ADDRESS="localhost"
-	fi
-	case "$1" in
-		add)
-			echo "openQRM-server: Adding kernel $OPENQRM_SERVER_KERNEL_NAME version $OPENQRM_SERVER_KERNEL_VERSION" | logger
-			if ! $WGET -O /dev/null --http-user=$OPENQRM_USER --http-password=$OPENQRM_USER_PASSWORD "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/base/server/kernel/kernel-action.php?kernel_command=new_kernel&kernel_name=$OPENQRM_SERVER_KERNEL_NAME&kernel_version=$OPENQRM_SERVER_KERNEL_VERSION"; then
-				echo "ERROR: Could not add kernel $OPENQRM_SERVER_KERNEL_NAME to the openQRM-server!" | logger
-				return 1
-			fi
-			return 0
-			;;
-		remove)
-			echo "openQRM-server: Removing kernel $OPENQRM_SERVER_KERNEL_NAME" | logger
-			if ! $WGET -O /dev/null --http-user=$OPENQRM_USER --http-password=$OPENQRM_USER_PASSWORD "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/base/server/kernel/kernel-action.php?kernel_command=remove_by_name&kernel_name=$OPENQRM_SERVER_KERNEL_NAME"; then
-				echo "ERROR: Could not remove kernel $OPENQRM_SERVER_KERNEL_NAME to the openQRM-server!" | logger
-				return 1
-			fi
-			return 0
-			;;
-	esac
-}
-
-
-# function to set the default kernel
-# param 1	: kernel-name
-function openqrm_server_set_default_kernel() {
-	OPENQRM_KERNEL_NAME=$1
-	echo "openQRM-server: Setting kernel $OPENQRM_KERNEL_NAME as default kernel" | logger
-	if [ "$OPENQRM_KERNEL_NAME" != "default" ]; then
-		cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/vmlinuz-$OPENQRM_KERNEL_NAME $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/vmlinuz-default
-		cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/System.map-$OPENQRM_KERNEL_NAME $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/System.map-default
-		cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/initrd-$OPENQRM_KERNEL_NAME.img $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/initrd-default.img
-		cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/modules-$OPENQRM_KERNEL_NAME.tgz $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/modules-default.tgz
-	fi
-}
-
-
-# --------------------------------------------------------------------
-# ------------------------- image functions --------------------------
-# --------------------------------------------------------------------
-
-
-# function to create a crypted password file for an image
-# param 1	: image id
-# param 2	: plain password
-function openqrm_server_set_image_password() {
-	OPENQRM_IMAGE_ID=$1
-	OPENQRM_IMAGE_PASSWORD=$2
-	echo "openQRM-server: Setting root-password for image $OPENQRM_IMAGE_ID" | logger
-	$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-crypt $OPENQRM_IMAGE_PASSWORD > $OPENQRM_SERVER_BASE_DIR/openqrm/web/action/image-auth/iauth.$OPENQRM_IMAGE_ID.php
-	chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/web/action/image-auth/iauth.$OPENQRM_IMAGE_ID.php
-}
-
-
-
-
-
-# --------------------------------------------------------------------
-# ------------------------- deployments functions -------------------------
-# --------------------------------------------------------------------
-
-# function to add a deployment method to the openQRM-server db
-# this function is used by the init+uninstall functions of the deployment plugins
-# param 1	: username
-# param 2	: password
-# param 3	: deployment name
-# param 4	: deployment type
-# param 5	: deployment description
-# param 6	: deployment storagetype
-# param 7	: deployment storagetype description
-# param 8	: deployment mapping
-function openqrm_server_add_deployment_type() {
-	OPENQRM_USER=$1
-	OPENQRM_USER_PASSWORD=$2
-	OPENQRM_SERVER_DEPLOYMENT_NAME=$3
-	OPENQRM_SERVER_DEPLOYMENT_TYPE=$4
-	OPENQRM_SERVER_DEPLOYMENT_DESCRIPTION=$5
-	OPENQRM_SERVER_DEPLOYMENT_STORAGE_TYPE=$6
-	OPENQRM_SERVER_DEPLOYMENT_STORAGE_DESCRIPTION=$7
-	OPENQRM_SERVER_DEPLOYMENT_MAPPING=$8
-	if [ "$OPENQRM_SERVER_IP_ADDRESS" == "" ]; then
-		OPENQRM_SERVER_IP_ADDRESS="localhost"
-	fi
-	echo "openQRM-server: Adding deployment type $OPENQRM_SERVER_DEPLOYMENT_NAME  to the openQRM-server" | logger
-	if ! $WGET -O /dev/null -q --http-user=$OPENQRM_USER --http-password=$OPENQRM_USER_PASSWORD "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/base/server/image/image-action.php?image_command=add_deployment_type&deployment_name=$OPENQRM_SERVER_DEPLOYMENT_NAME&deployment_type=$OPENQRM_SERVER_DEPLOYMENT_TYPE&deployment_description=$OPENQRM_SERVER_DEPLOYMENT_DESCRIPTION&deployment_storagetype=$OPENQRM_SERVER_DEPLOYMENT_STORAGE_TYPE&deployment_storagedescription=$OPENQRM_SERVER_DEPLOYMENT_STORAGE_DESCRIPTION&deployment_mapping=$OPENQRM_SERVER_DEPLOYMENT_MAPPING"; then
-		echo "ERROR: Could not add deployment type $OPENQRM_SERVER_DEPLOYMENT_NAME to the openQRM-server!" | logger
-		return 1
-	fi
-	return 0
-}
-
-# function to remove a deployment method to the openQRM-server db
-# this function is used by the init+uninstall functions of the deployment plugins
-# param 1	: username
-# param 2	: password
-# param 3	: deployment name
-function openqrm_server_remove_deployment_type() {
-	OPENQRM_USER=$1
-	OPENQRM_USER_PASSWORD=$2
-	OPENQRM_SERVER_DEPLOYMENT_NAME=$3
-	if [ "$OPENQRM_SERVER_IP_ADDRESS" == "" ]; then
-		OPENQRM_SERVER_IP_ADDRESS="localhost"
-	fi
-	echo "openQRM-server: Removing deployment type $OPENQRM_SERVER_DEPLOYMENT_NAME  from the openQRM-server" | logger
-	if ! $WGET -O /dev/null -q --http-user=$OPENQRM_USER --http-password=$OPENQRM_USER_PASSWORD "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/base/server/image/image-action.php?image_command=remove_deployment_type&deployment_name=$OPENQRM_SERVER_DEPLOYMENT_NAME"; then
-		echo "ERROR: Could not remove deployment type $OPENQRM_SERVER_DEPLOYMENT_NAME from the openQRM-server!" | logger
-		return 1
-	fi
-	return 0
-}
-
-
-
-# --------------------------------------------------------------------
-# ------------------------- virtualization functions -------------------------
-# --------------------------------------------------------------------
-
-# function to add a virtualization method to the openQRM-server db
-# this function is used by the init+uninstall functions of the virtualization plugins
-# param 1	: username
-# param 2	: password
-# param 3	: virtualization type
-# param 4	: virtualization name
-function openqrm_server_add_virtualization_type() {
-	OPENQRM_USER=$1
-	OPENQRM_USER_PASSWORD=$2
-	OPENQRM_SERVER_VIRTUALIZATION_TYPE=$3
-	OPENQRM_SERVER_VIRTUALIZATION_NAME=$4
-	if [ "$OPENQRM_SERVER_IP_ADDRESS" == "" ]; then
-		OPENQRM_SERVER_IP_ADDRESS="localhost"
-	fi
-	echo "openQRM-server: Adding virtualization type $OPENQRM_SERVER_VIRTUALIZATION_TYPE  to the openQRM-server" | logger
-	if ! $WGET -O /dev/null -q --http-user=$OPENQRM_USER --http-password=$OPENQRM_USER_PASSWORD "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/base/server/resource/resource-action.php?resource_command=add_virtualization_type&virtualization_type=$OPENQRM_SERVER_VIRTUALIZATION_TYPE&virtualization_name=$OPENQRM_SERVER_VIRTUALIZATION_NAME"; then
-		echo "ERROR: Could not add virtualization type $OPENQRM_SERVER_VIRTUALIZATION_TYPE to the openQRM-server!" | logger
-		return 1
-	fi
-	return 0
-}
-
-# function to remove a virtualization method to the openQRM-server db
-# this function is used by the init+uninstall functions of the virtualization plugins
-# param 1	: username
-# param 2	: password
-# param 3	: virtualization type
-function openqrm_server_remove_virtualization_type() {
-	OPENQRM_USER=$1
-	OPENQRM_USER_PASSWORD=$2
-	OPENQRM_SERVER_VIRTUALIZATION_TYPE=$3
-	if [ "$OPENQRM_SERVER_IP_ADDRESS" == "" ]; then
-		OPENQRM_SERVER_IP_ADDRESS="localhost"
-	fi
-	echo "openQRM-server: Removing virtualization type $OPENQRM_SERVER_VIRTUALIZATION_TYPE  from the openQRM-server" | logger
-	if ! $WGET -O /dev/null -q --http-user=$OPENQRM_USER --http-password=$OPENQRM_USER_PASSWORD "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/base/server/resource/resource-action.php?resource_command=remove_virtualization_type&virtualization_type=$OPENQRM_SERVER_VIRTUALIZATION_TYPE"; then
-		echo "ERROR: Could not remove virtualization type $OPENQRM_SERVER_VIRTUALIZATION_TYPE from the openQRM-server!" | logger
-		return 1
-	fi
-	return 0
-}
-
-
-
-
-# --------------------------------------------------------------------
-# ------------------------- resource functions -----------------------
-# --------------------------------------------------------------------
-
-
-
-# function adding a new resource to the openQRM-server
-# param 1	: resource_id
-# param 2	: kernel name
-# param 3	: pxelinux.cfg filename
-function openqrm_server_create_pxe_config() {
-	local RESOURCE_ID=$1
-	local KERNEL_NAME=$2
-	local RESOURCE_PXELINUXCFG_FILE=$3
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/etc/templates/openqrm-pxelinux |	\
-		sed -e "s/OPENQRM_BOOTIMAGE_KERNEL/vmlinuz-$KERNEL_NAME/g" |	\
-		sed -e "s/OPENQRM_BOOTIMAGE_INITRD/initrd-$KERNEL_NAME.img/g" |	\
-		sed -e "s/OPENQRM_RESOURCE_ID/$RESOURCE_ID/g" |	\
-		sed -e "s/OPENQRM_SERVER_IP_ADDRESS/$OPENQRM_SERVER_IP_ADDRESS/g" \
-		> $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-	chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-
-	# allow plugin to re-write the pxe-config
-	for OPENQRM_PLUGIN in `ls $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/`; do
-		if [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/include/openqrm-plugin-$OPENQRM_PLUGIN-assign-hook ]; then
-			. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/include/openqrm-plugin-$OPENQRM_PLUGIN-assign-hook
-			OPENQRM_PLUGIN=`echo $OPENQRM_PLUGIN | sed -e "s/-/_/g"`
-			$OPENQRM_PLUGIN""_assign_hook $RESOURCE_ID $KERNEL_NAME $RESOURCE_PXELINUXCFG_FILE
-		fi
-	done
-}
-
-
-
-# function adding a new resource to the openQRM-server
-# param 1	: resource_id
-# param 2	: resource_mac
-# param 3	: resouce_ip
-function openqrm_server_add_resource() {
-	local RESOURCE_ID=$1
-	local RESOURCE_MAC=$2
-	local RESOURCE_IP_ADDRESS=$3
-	local RESOURCE_PXELINUXCFG_FILE=`echo 01-$RESOURCE_MAC | sed -e "s/:/-/g" | tr '[:upper:]' '[:lower:]'`
-	echo "openQRM-server: Adding resource $RESOURCE_ID $RESOURCE_MAC/$RESOURCE_IP_ADDRESS" | logger
-	openqrm_server_create_pxe_config $RESOURCE_ID default $RESOURCE_PXELINUXCFG_FILE
-}
-
-
-# function to remove a resource from the openQRM-server
-# param 1	: resource_id
-# param 2	: resource_mac
-function openqrm_remove_resource() {
-	local RESOURCE_ID=$1
-	local RESOURCE_MAC=$2
-	local RESOURCE_PXELINUXCFG_FILE=`echo 01-$RESOURCE_MAC | sed -e "s/:/-/g" | tr '[:upper:]' '[:lower:]'`
-	echo "openQRM-server: Removing resource $RESOURCE_ID $RESOURCE_MAC/$RESOURCE_IP_ADDRESS" | logger
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE.idle
-}
-
-
-
-# function to set a resource net or local boot
-# param 1	: resource_id
-# param 2	: resource_mac
-# param 3	: resouce_ip
-function openqrm_server_set_boot() {
-	local RESOURCE_BOOT=$1
-	local RESOURCE_ID=$2
-	local RESOURCE_MAC=$3
-	local RESOURCE_IP_ADDRESS=$4
-	local RESOURCE_PXELINUXCFG_FILE=`echo 01-$RESOURCE_MAC | sed -e "s/:/-/g" | tr '[:upper:]' '[:lower:]'`
-	if [ "$RESOURCE_BOOT" == "net" ]; then
-		echo "openQRM-server: Setting resource $RESOURCE_ID $RESOURCE_MAC/$RESOURCE_IP_ADDRESS to netboot" | logger
-		openqrm_server_create_pxe_config $RESOURCE_ID default $RESOURCE_PXELINUXCFG_FILE
-	else
-		echo "openQRM-server: Setting resource $RESOURCE_ID $RESOURCE_MAC/$RESOURCE_IP_ADDRESS to localboot" | logger
-		sed -i -e "s/^default.*/default local/g" $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-		chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-	fi
-}
-
-
-
-
-# function to assign a kernel to a resource
-# param 1	: resource_id
-# param 2	: resource_mac
-# param 3	: resouce_ip
-function openqrm_assign_kernel() {
-	local RESOURCE_ID=$1
-	local RESOURCE_MAC=$2
-	local RESOURCE_KERNEL=$3
-	local RESOURCE_PXELINUXCFG_FILE=`echo 01-$RESOURCE_MAC | sed -e "s/:/-/g" | tr '[:upper:]' '[:lower:]'`
-	echo "openQRM-server: Assigning resource $RESOURCE_ID $RESOURCE_MAC to kernel $RESOURCE_KERNEL" | logger
-	openqrm_server_create_pxe_config $RESOURCE_ID $RESOURCE_KERNEL $RESOURCE_PXELINUXCFG_FILE
-}
-
-
-
-
-# function to get infos about a resource
-# param 1	: resource_mac
-function openqrm_get_resource_parameter() {
-	local mac=$1
-	if [ "$OPENQRM_SERVER_IP_ADDRESS" == "" ]; then
-		OPENQRM_SERVER_IP_ADDRESS="localhost"
-	fi
-	$WGET -q -O /tmp/$mac "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_mac=$mac"
-	. /tmp/$mac
-	for param in `cat /tmp/$mac`; do
-		KEY=`echo $param | cut -d'=' -f1`
-		if [ "$KEY" != '"' ]; then
-			export $KEY 2>/dev/null
-		fi
-	done
-}
-
-
-
-
-# --------------------------------------------------------------------
-# ------------------------- plugin functions -------------------------
-# --------------------------------------------------------------------
-
-# function to run a plugin command
-# param 1	: plugin_name
-function openqrm_server_plugin_command() {
-	local PLUGIN_NAME=$1
-	local PLUGIN_COMMAND=$2
-	local PLUGIN_USER=$3
-	local PLUGIN_PASS=$4
-	local PLUGIN_INIT_SCRIPT="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$PLUGIN_NAME/etc/init.d/openqrm-plugin-$PLUGIN_NAME"
-	if [ -x $PLUGIN_INIT_SCRIPT ]; then
-		echo "openQRM-server: $PLUGIN_COMMAND openQRM plugin $PLUGIN_NAME user $PLUGIN_USER" | logger
-		$PLUGIN_INIT_SCRIPT $PLUGIN_COMMAND $PLUGIN_USER $PLUGIN_PASS &
-	else
-		echo "openQRM-server: $PLUGIN_NAME init script not found or not executable !" | logger
-	fi
-}
-
-
-
-
-
-
-# --------------------------------------------------------------------
-# ------------------------- state backup/restore functions -------------------------
-# --------------------------------------------------------------------
-
-# function to backup/restore a server-state
-# param 1	: <backup/restore/remove/list>
-# param 1	: [name]
-function openqrm_server_state() {
-	local CMD=$1
-	local NAME=$2
-	local NOW=`date +"%D_%T" | sed -e "s#/#-#g" | sed -e "s#:#.#g"`
-	local USAGE="Usage : openqrm_server_state backup/restore/remove/list [name]"
-	if [ ! -d $OPENQRM_SERVER_STATE_DIR ]; then
-		mkdir -p $OPENQRM_SERVER_STATE_DIR
-	fi
-	if [ "$CMD" == "" ]; then
-		echo $USAGE
-		return 1
-	fi
-	if [ "$CMD" != "list" ] && [ "$NAME" == "" ]; then
-		echo $USAGE
-		return 1
-	fi
-
-
-
-	case $CMD in
-		backup)
-				echo "openQRM-server: Creating backup of the server state $NAME-$NOW"
-				rm -rf $OPENQRM_SERVER_STATE_DIR/$NAME
-				mkdir -p $OPENQRM_SERVER_STATE_DIR/$NAME
-
-				# dirs
-				# adding the plugin-backup dirs to the dirlist
-				for OPENQRM_PLUGIN in `ls $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/`; do
-					if [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/openqrm-plugin-$OPENQRM_PLUGIN.conf ]; then
-						. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/openqrm-plugin-$OPENQRM_PLUGIN.conf
-						OPENQRM_SERVER_STATE_DIRS="$OPENQRM_SERVER_STATE_DIRS $OPENQRM_PLUGIN_STATE_DIRS"
-						unset OPENQRM_PLUGIN_STATE_DIRS
-					fi
-				done
-				# now the static dirs
-				for DIR in $OPENQRM_SERVER_STATE_DIRS; do
-					if [ -d "$DIR" ]; then
-						mkdir -p `dirname $OPENQRM_SERVER_STATE_DIR/$NAME/$DIR`
-						cp -aR $DIR `dirname $OPENQRM_SERVER_STATE_DIR/$NAME/$DIR`
-					fi
-				done
-
-				# files
-				# first add the enabled plugins state file
-				for RUNNING in `ls $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/`; do
-					if [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$RUNNING/web/.running ]; then
-						mkdir -p $OPENQRM_SERVER_STATE_DIR/$NAME/$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$RUNNING/web/
-						touch $OPENQRM_SERVER_STATE_DIR/$NAME/$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$RUNNING/web/.running
-					fi
-				done
-				# now adding the plugin-backup files to the filelist
-				for OPENQRM_PLUGIN in `ls $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/`; do
-					if [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/openqrm-plugin-$OPENQRM_PLUGIN.conf ]; then
-						. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$OPENQRM_PLUGIN/etc/openqrm-plugin-$OPENQRM_PLUGIN.conf
-						OPENQRM_SERVER_STATE_FILES="$OPENQRM_SERVER_STATE_FILES $OPENQRM_PLUGIN_STATE_FILES"
-						unset OPENQRM_PLUGIN_STATE_FILES
-					fi
-				done
-				# now the static files
-				for FILE in $OPENQRM_SERVER_STATE_FILES; do
-					if [ -f "$FILE" ]; then
-						mkdir -p `dirname $OPENQRM_SERVER_STATE_DIR/$NAME/$FILE`
-						cp -af $FILE $OPENQRM_SERVER_STATE_DIR/$NAME/$FILE
-					fi
-				done
-
-				RELATIVE_OPENQRM_SERVER_BASE_DIR=`echo $OPENQRM_SERVER_BASE_DIR | sed -e s"#/##"`
-				# db
-				$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/$OPENQRM_DATABASE_TYPE/openqrm-$OPENQRM_DATABASE_TYPE-functions backup $OPENQRM_SERVER_STATE_DIR/$NAME/$RELATIVE_OPENQRM_SERVER_BASE_DIR/openqrm/database.sql
-
-				# package
-				tar -C $OPENQRM_SERVER_STATE_DIR/$NAME -czf $OPENQRM_SERVER_STATE_DIR/$NAME-$NOW.tgz $RELATIVE_OPENQRM_SERVER_BASE_DIR/openqrm
-				rm -rf $OPENQRM_SERVER_STATE_DIR/$NAME
-				;;
-
-		restore)
-				if [ -f $OPENQRM_SERVER_STATE_DIR/$NAME.tgz ]; then
-					echo "openQRM-server: Restoring server state from $OPENQRM_SERVER_STATE_DIR/$NAME.tgz"
-					# files + dirs
-					tar -C / -xzf $OPENQRM_SERVER_STATE_DIR/$NAME.tgz
-					# db
-					$OPENQRM_SERVER_BASE_DIR/openqrm/etc/db/$OPENQRM_DATABASE_TYPE/openqrm-$OPENQRM_DATABASE_TYPE-functions restore $OPENQRM_SERVER_BASE_DIR/openqrm/database.sql
-					rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/database.sql
-				else
-					echo "openQRM-server: No such sever state file $NAME"
-					return 1
-				fi
-				;;
-
-		remove)
-				if [ -f $OPENQRM_SERVER_STATE_DIR/$NAME.tgz ]; then
-					echo "openQRM-server: Removing server state $NAME-$NOW"
-					rm -f $OPENQRM_SERVER_STATE_DIR/$NAME.tgz
-				else
-					echo "openQRM-server: No such sever state file $NAME"
-					return 1
-				fi
-				;;
-		list)
-				ls $OPENQRM_SERVER_STATE_DIR | sed -s "s/\.tgz//g"
-				;;
-
-		*)
-				echo "openQRM-server: No such server-state command!"
-				return 1
-				;;
-
-
-
-	esac
-
-}
-
-
-# --------------------------------------------------------------------
-
-
-
diff --git a/openQRM-5.3.50-CE/src/make-assistant b/openQRM-5.3.50-CE/src/make-assistant
deleted file mode 100644
index f69eac3..0000000
--- a/openQRM-5.3.50-CE/src/make-assistant
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-# this script helps the "make" to call functions 
-# from within the Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=`pwd`/`dirname $0`
-OPENQRM_SOURCE_DIR=$OPENQRM_SERVER_BASE_DIR
-. $OPENQRM_SOURCE_DIR/etc/openqrm-server.conf
-. $OPENQRM_SOURCE_DIR/include/openqrm-functions
-. $OPENQRM_SOURCE_DIR/include/openqrm-build-functions
-. $OPENQRM_SOURCE_DIR/include/openqrm-package-functions
-MAKE_COMMAND=$1
-
-if [ "$MAKE_COMMAND" == "" ]; then
-	echo "This script helps the "make" to call functions from within the Makefiles"
-	exit 0
-fi
-
-$@
diff --git a/openQRM-5.3.50-CE/src/plugins/Makefile b/openQRM-5.3.50-CE/src/plugins/Makefile
deleted file mode 100644
index e63ddd8..0000000
--- a/openQRM-5.3.50-CE/src/plugins/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# this is the main openQRM plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../etc/openqrm-server.conf
-
-all:	configure compile
-	@for SRC_DIR in `find -mindepth 1 -maxdepth 1 -type d -not -name ".svn"`; do cd $$SRC_DIR && if [ ! -f deprecated ]; then make all; fi && cd ..; done
-
-configure:
-	@for SRC_DIR in `find -mindepth 1 -maxdepth 1 -type d -not -name ".svn"`; do cd $$SRC_DIR && if [ ! -f deprecated ]; then make configure; fi && cd ..; done
-
-compile:
-	@for SRC_DIR in `find -mindepth 1 -maxdepth 1 -type d -not -name ".svn"`; do cd $$SRC_DIR && if [ ! -f deprecated ]; then make; fi && cd ..; done
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins
-	@for SRC_DIR in `find -mindepth 1 -maxdepth 1 -type d -not -name ".svn"`; do cd $$SRC_DIR && if [ ! -f deprecated ]; then make install; fi && cd ..; done
-
-uninstall:
-	@for SRC_DIR in `find -mindepth 1 -maxdepth 1 -type d -not -name ".svn"`; do cd $$SRC_DIR && if [ ! -f deprecated ]; then make uninstall; fi && cd ..; done
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins
-
-clean:
-	@for SRC_DIR in `find -mindepth 1 -maxdepth 1 -type d -not -name ".svn"`; do cd $$SRC_DIR && if [ ! -f deprecated ]; then make clean; fi && cd ..; done
-
-realclean:	clean
-	@for SRC_DIR in `find -mindepth 1 -maxdepth 1 -type d -not -name ".svn"`; do cd $$SRC_DIR && if [ ! -f deprecated ]; then make realclean; fi && cd ..; done
-
-zips:
-	@for SRC_DIR in `find -mindepth 1 -maxdepth 1 -type d -not -name ".svn"`; do zip -r `basename $$SRC_DIR`.zip $$SRC_DIR; done
-
-.PHONY: all configure compile install uninstall clean realclean
-
diff --git a/openQRM-5.3.50-CE/src/plugins/amazon/Makefile b/openQRM-5.3.50-CE/src/plugins/amazon/Makefile
deleted file mode 100644
index 5948698..0000000
--- a/openQRM-5.3.50-CE/src/plugins/amazon/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/amazon/etc
-	cp etc/openqrm-plugin-amazon.conf /usr/share/openqrm/plugins/amazon/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/amazon/etc/openqrm-plugin-amazon.conf b/openQRM-5.3.50-CE/src/plugins/amazon/etc/openqrm-plugin-amazon.conf
deleted file mode 100644
index ea7605e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/amazon/etc/openqrm-plugin-amazon.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Amazon Cloud Computing with <a href='http://aws.amazon.com/ec2/' target='_BLANK'>Amazon EC2 Public Cloud</a>. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="cloud"
diff --git a/openQRM-5.3.50-CE/src/plugins/android/Makefile b/openQRM-5.3.50-CE/src/plugins/android/Makefile
deleted file mode 100644
index 56fce04..0000000
--- a/openQRM-5.3.50-CE/src/plugins/android/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/android/etc
-	cp etc/openqrm-plugin-android.conf /usr/share/openqrm/plugins/android/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/android/etc/openqrm-plugin-android.conf b/openQRM-5.3.50-CE/src/plugins/android/etc/openqrm-plugin-android.conf
deleted file mode 100644
index 19e73c8..0000000
--- a/openQRM-5.3.50-CE/src/plugins/android/etc/openqrm-plugin-android.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Support for the Android Operating System in openQRM. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="deployment"
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/Makefile b/openQRM-5.3.50-CE/src/plugins/ansible/Makefile
deleted file mode 100644
index e16abe2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# this is the openQRM ansible-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/ansible* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/default
-	. $(OPENQRM_SERVER_CONF) && cp -aR etc/default/* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/default/
-	. $(OPENQRM_SERVER_CONF) && rm -rf `find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/default/ -name .svn`
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/cron.d
-	. $(OPENQRM_SERVER_CONF) && cp -aR etc/cron.d/*.cron $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/cron.d/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/img
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && chmod 777 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/lang/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/bin
-	. $(OPENQRM_SERVER_CONF) && cp bin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/bin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/bin/openqrm*
-	. $(OPENQRM_SERVER_CONF) && tar -C $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible -czvf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/boot-service-ansible.tgz include/ etc/init.d/ansible
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/ansible
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/ansible/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/bin/openqrm-ansible-config b/openQRM-5.3.50-CE/src/plugins/ansible/bin/openqrm-ansible-config
deleted file mode 100644
index dbad922..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/bin/openqrm-ansible-config
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-# this script gets activated via cron to sequentially check 
-# if there are new config updates in the svn repo
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-SVN_COMMIT_MESSAGE="Automatically updated through openQRM ansible plugin"
-CUR=`pwd`
-export LANGUAGE=C
-export LANG=C
-export LC_ALL=C
-
-# here it commits any changes made through the web-interface
-cd $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/ansible/
-# check for removed files
-for r in `svn status . | grep ^"!" | awk {' print $2 '}`; do
-	echo "found removed file $r" | logger
-	svn del $r
-	svn commit -m "$SVN_COMMIT_MESSAGE" . | logger
-done
-
-# add new files
-svn add `find | grep -v svn` | logger
-# commit
-svn commit -m "$SVN_COMMIT_MESSAGE" . | logger
-# update eventual changes from external
-svn update . | logger
-
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/bin/openqrm-ansible-manager b/openQRM-5.3.50-CE/src/plugins/ansible/bin/openqrm-ansible-manager
deleted file mode 100644
index 2b9c88b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/bin/openqrm-ansible-manager
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/bash
-# this script automatically manages ansible
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/include/openqrm-plugin-ansible-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/openqrm-plugin-ansible.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-openqrm_server_get_config
-export resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-export LANG=C
-ANSIBLE_PLAYBOOK_LOG="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/log/playbook-apply.log"
-export PATH=$PATH:/usr/local/bin
-
-# retries for applying playbooks
-if [ "$OPENQRM_PLUGIN_ANSIBLE_RETRY" == "" ]; then
-	OPENQRM_PLUGIN_ANSIBLE_RETRY="60"
-fi
-# delay/timeout in seconds for retruying failed playbooks
-if [ "$OPENQRM_PLUGIN_ANSIBLE_DELAY" == "" ]; then
-	OPENQRM_PLUGIN_ANSIBLE_DELAY="10"
-fi
-
-
-# let only root run this script
-WHOAMI=`whoami`
-if [ "$WHOAMI" != "root" ]; then
-	echo "ERROR: Please run this script as root!"
-	exit 6
-fi
-
-if ! which ansible 1>/dev/null; then
-	openqrm_unblock_starting_queue $@
-	openqrm_post_event 0 "check" 3 "openqrm-ansible-manager" "The ansible utility is not installed! Please install and try again."
-	echo "ERROR: The 'ansible' utility is not installed! Please install and try again."
-	exit 6
-fi
-if ! which ansible-playbook 1>/dev/null; then
-	openqrm_unblock_starting_queue $@
-	openqrm_post_event 0 "check" 3 "openqrm-ansible-manager" "The ansible-playbook utility is not installed! Please install and try again."
-	echo "ERROR: The 'ansible-playbook' utility is not installed! Please install and try again."
-	exit 6
-fi
-
-
-function ansible_manager_usage() {
-	echo "Usage : $0 apply server-id server-name server-ip"
-	exit 1
-}
-
-
-FULL_COMMANDLINE="$0 $@"
-ANSIBLE_MANAGER_COMMAND=$1
-
-# main
-case "$ANSIBLE_MANAGER_COMMAND" in 
-	apply)
-		SERVER_ID=$2
-		SERVER_NAME=$3
-		SERVER_IP=$4
-		SERVER_PLAYBOOK_CONFIG="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/ansible/server/$SERVER_NAME"
-		if [ ! -f "$SERVER_PLAYBOOK_CONFIG" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "apply" 5 "openqrm-ansible-manager" "No Ansible Playbooks configured for Server $SERVER_NAME"
-			exit 0
-		fi
-		openqrm_post_event 0 "apply" 5 "openqrm-ansible-manager" "Starting Ansible configuration management for Server $SERVER_NAME"
-
-		LOCK_TIME=`openqrm_lock_queue aquire ansible`
-		trap "openqrm_lock_queue release ansible $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# make sure the host/ip is not in the knownhosts file
-		ssh-keygen -R $SERVER_IP
-		ssh-keygen -R $SERVER_NAME
-		# add it to the knownhosts file by running a simple command
-		ANSIBLE_PLAYBOOK_RETRY_LOOP=0
-		while ! $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/bin/openqrm-ansible-ssh $SERVER_IP ls; do
-			ANSIBLE_PLAYBOOK_RETRY_LOOP=$(( ANSIBLE_PLAYBOOK_RETRY_LOOP + 1 ))
-			if [ "$OPENQRM_PLUGIN_ANSIBLE_RETRY" == "$ANSIBLE_PLAYBOOK_RETRY_LOOP" ]; then
-				openqrm_post_event 0 "apply" 3 "openqrm-ansible-manager" "Applying Ansible Playbook $PLAYBOOK.yml to Server $SERVER_NAME timed out!"
-				break
-			fi
-			sleep $OPENQRM_PLUGIN_ANSIBLE_DELAY
-		done
-
-		# run the configured playbooks
-		mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/log
-		ANSIBLE_HOST_FILE=`mktemp /tmp/ansible.$SERVER_NAME.XXXXXX` || exit 1
-		ANSIBLE_PLAYBOOK_FILE=`mktemp /tmp/ansible.$SERVER_NAME.XXXXXX` || exit 1
-		echo $SERVER_IP > $ANSIBLE_HOST_FILE
-		for PLAYBOOK in `cat $SERVER_PLAYBOOK_CONFIG`; do
-			openqrm_post_event 0 "apply" 9 "openqrm-ansible-manager" "Applying Ansible Playbook $PLAYBOOK.yml to Server $SERVER_NAME"
-			cp $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/ansible/playbooks/$PLAYBOOK.yml -f $ANSIBLE_PLAYBOOK_FILE
-			sed -i -e "s/@@IP@@/$SERVER_IP/g" $ANSIBLE_PLAYBOOK_FILE
-			if ! ansible-playbook $ANSIBLE_PLAYBOOK_FILE -i $ANSIBLE_HOST_FILE 2>$ANSIBLE_PLAYBOOK_LOG 1>$ANSIBLE_PLAYBOOK_LOG; then
-				openqrm_post_event 0 "apply" 3 "openqrm-ansible-manager" "Applying Ansible Playbook $PLAYBOOK.yml to Server $SERVER_NAME failed!"
-			fi
-			openqrm_post_event 0 "apply" 10 "openqrm-ansible-manager" "Applying Ansible Playbook $PLAYBOOK.yml to Server $SERVER_NAME"
-			rm -f $ANSIBLE_PLAYBOOK_FILE
-		done
-		rm -f $ANSIBLE_HOST_FILE
-
-		openqrm_lock_queue release ansible $LOCK_TIME
-		trap '' EXIT
-
-		openqrm_post_event 0 "apply" 5 "openqrm-ansible-manager" "Ansible configuration management for Server $SERVER_NAME finished"
-		;;
-
-	start)
-		SERVER_ID=$2
-		SERVER_NAME=$3
-		SERVER_IP=$4
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		openqrm_post_event 0 "start" 5 "openqrm-ansible-manager" "Server $SERVER_NAME id $SERVER_ID starting with ip-address $SERVER_IP."
-		;;
-	stop)
-		SERVER_ID=$2
-		SERVER_NAME=$3
-		SERVER_IP=$4
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		openqrm_post_event 0 "stop" 5 "openqrm-ansible-manager" "Server $SERVER_NAME id $SERVER_ID stopping with ip-address $SERVER_IP."
-		;;
-	*)
-		echo "ERROR: Free commandline arguments are not allowed!"
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		ansible_manager_usage
-		exit 6
-		;;
-esac
-
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/bin/openqrm-ansible-ssh b/openQRM-5.3.50-CE/src/plugins/ansible/bin/openqrm-ansible-ssh
deleted file mode 100644
index 6426d14..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/bin/openqrm-ansible-ssh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/expect -f
-# expect script to answer the connect question at first login
-#
-# This file is part of openQRM.
-#
-# openQRM is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2
-# as published by the Free Software Foundation.
-#
-# openQRM 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with openQRM.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Copyright 2011, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-if {[llength $argv]<2} {
-	send_user "usage: $argv0 <hostname> <command>\n"
-	exit
-}
-set hostname [lrange $argv 0 0]
-set command [lrange $argv 1 1]
-set timeout -1
-
-spawn ssh root@$hostname $command
-match_max 100000
-
-expect {
-	-re ".*yes.*no.*" {
-	send "yes\r"
-	exp_continue
-	}
-    -re "Connection refused" {puts "Host error -> $expect_out(buffer)";exit 1}
-    -re "Connection closed"  {puts "Host error -> $expect_out(buffer)";exit 1}
-    -re "no address.*" {puts "Host error -> $expect_out(buffer)";exit 1}
-    -re "Read from socket failed:.*" {puts "Host error -> $expect_out(buffer)";exit 1}
-    -re ".*Connection reset.*" {puts "Host error -> $expect_out(buffer)";exit 1}
-    timeout {puts "Timeout error. Is device down or unreachable?? ssh_expect";exit 1}
-
-	send -- "$command\r"
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/etc/cron.d/openqrm-ansible-config.cron b/openQRM-5.3.50-CE/src/plugins/ansible/etc/cron.d/openqrm-ansible-config.cron
deleted file mode 100644
index 0d1ac02..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/etc/cron.d/openqrm-ansible-config.cron
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-MAILTO=""
-* * * * * root @@OPENQRM_SERVER_BASE_DIR@@/openqrm/plugins/ansible/bin/openqrm-ansible-config
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/etc/default/playbooks/webserver.yml b/openQRM-5.3.50-CE/src/plugins/ansible/etc/default/playbooks/webserver.yml
deleted file mode 100644
index ed8926f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/etc/default/playbooks/webserver.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- hosts: @@IP@@
-  vars:
-  user: root
-  tasks:
-  - name: my custom command
-    shell: "/bin/echo hallo > /tmp/playbook.cmd"
-  handlers:
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/etc/init.d/ansible b/openQRM-5.3.50-CE/src/plugins/ansible/etc/init.d/ansible
deleted file mode 100644
index a9df2ad..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/etc/init.d/ansible
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/bash
-# this is the boot-service init script for the ansible resources
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-# for including the package functions
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/include/openqrm-plugin-ansible-functions
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-OPENQRM_SERVER_IP=$resource_openqrmserver
-
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET="wget -q --no-check-certificate"
-else
-	WGET="wget -q"
-fi
-
-# do not run on idle resources
-if [ "$resource_image" == "idle" ]; then
-	exit 0
-fi
-
-# also do not run before the real init of the rootfs
-# if we have this file /etc/initrd-devices.conf we are still in the initrd
-if [ -f /etc/initrd-devices.conf ]; then
-	exit 0
-fi
-
-
-function ansible_start() {
-	echo "Starting the openQRM ansible-plugin"
-	ansible_stop 1>/dev/null 2>&1
-
-	# get the public ssh key from openQRM
-	SSHKEY_TMP_FILE=`mktemp /tmp/ansible.XXXXXX` || exit 1
-
-	if ! $WGET -O $SSHKEY_TMP_FILE $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/openqrm-server-public-ssh-key; then
-		echo "ERROR: Could not get the public ssh-key from opernQRM at $resource_openqrmserver!"
-		return 1
-	fi
-	# add to authorized_keys
-	OPENQRM_PUBLIC_SSHKEY=`cat $SSHKEY_TMP_FILE`
-	if ! grep "$OPENQRM_PUBLIC_SSHKEY" /root/.ssh/authorized_keys 1>/dev/null 2>/dev/null; then
-		if [ ! -d /root/.ssh ]; then
-			mkdir -p /root/.ssh
-			chmod 700 /root/.ssh
-		fi
-		echo >> /root/.ssh/authorized_keys
-		cat $SSHKEY_TMP_FILE >> /root/.ssh/authorized_keys
-		echo >> /root/.ssh/authorized_keys
-	fi
-	if ! ps -C sshd 1>/dev/null; then
-		echo "...trying to start ssh/sshd"
-		if [ -x "/etc/init.d/ssh" ]; then
-			/etc/init.d/ssh start
-		elif [ -x "/etc/init.d/sshd" ]; then
-			/etc/init.d/sshd start
-		else
-			echo "WARNING: Could not start ssh/sshd! Init script not found"
-		fi
-	fi
-
-	# trigger openQRM to apply the playbooks
-	if ! $WGET -O /dev/null "$openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/openqrm-ansible-apply.php?ansible_command=apply&ansible_id=$appliance_id&ansible_name=$appliance_name&ansible_mac=$resource_mac&ansible_ip=$resource_ip"; then
-		echo "ERROR: Could not apply Ansible Playbooks!"
-		return 1
-	else
-		return 0
-	fi
-}
-
-
-function ansible_stop() {
-	echo "Stopping the openQRM ansible-plugin"
-}
-
-
-
-
-
-case "$1" in
-	start)
-		ansible_start
-		;;
-	stop)
-		ansible_stop
-		;;
-	restart)
-		ansible_stop
-		sleep 1
-		ansible_start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/etc/init.d/openqrm-plugin-ansible b/openQRM-5.3.50-CE/src/plugins/ansible/etc/init.d/openqrm-plugin-ansible
deleted file mode 100644
index 84236cb..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/etc/init.d/openqrm-plugin-ansible
+++ /dev/null
@@ -1,206 +0,0 @@
-#!/bin/bash
-# init script for the openQRM ansible-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/include/openqrm-plugin-ansible-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/openqrm-plugin-ansible.conf
-openqrm_server_get_config
-export resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-export LANG=C
-# define wget to use with https
-if [ "$OPENQRM_WEB_PROTOCOL" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-
-function openqrm_plugin_ansible_start() {
-	echo "Starting the openQRM ansible-plugin"
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/ansible/.running
-}
-
-
-function openqrm_plugin_ansible_stop() {
-	echo "Stopping the openQRM ansible-plugin"
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/ansible/.running
-}
-
-function openqrm_plugin_ansible_uninstall() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "ansible: Please give a username to uninstall the plugin : "
-		read USERNAME
-		echo
-		echo -n "ansible: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Uninstalling the openQRM ansible-plugin"
-	openqrm_plugin_ansible_stop
-	rm -f /etc/cron.d/openqrm-ansible-config
-	if [ -x "/etc/init.d/cron" ]; then
-		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-			invoke-rc.d cron reload
-		else
-			/etc/init.d/cron reload
-		fi
-	elif [ -x /etc/init.d/crond ]; then
-		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-			invoke-rc.d crond reload
-		else
-			/etc/init.d/crond reload
-		fi
-	else
-		openqrm_post_event 0 "openqrm_plugin_ansible_start" 3 "openqrm-plugin-ansible" "Could not find cron init script in /etc/init.d/. Please reload cron manually!"
-	fi
-
-	# trigger init action to eventually remove cloud products
-	if [ -e $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/cloud ]; then
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$USERNAME --http-password=$PASSWORD "$OPENQRM_WEB_PROTOCOL://$resource_openqrmserver/openqrm/base/plugins/ansible/ansible-action.php?ansible_command=uninstall"; then
-			openqrm_post_event 0 "openqrm_plugin_ansible_start" 3 "openqrm-plugin-ansible" "Could not trigger database hook. Please manually remove any Ansible Cloud products!"
-		fi
-	fi
-
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/ansible
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-ansible.tgz
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/openqrm-ansible-apply.php
-	rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/ansible
-	return 0
-}
-
-function openqrm_plugin_ansible_init() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "ansible: Please give a username to init the plugin : "
-		read USERNAME
-		echo
-		echo -n "ansible: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	# check for the public ssh key
-	if [ ! -f "$OPENQRM_PLUGIN_ANSIBLE_PUBLIC_SSHKEY" ]; then
-		openqrm_post_event 0 "openqrm_plugin_ansible_start" 3 "openqrm-plugin-ansible" "Public SSH key file $OPENQRM_PLUGIN_ANSIBLE_PUBLIC_SSHKEY does not exists! Please create it!"
-		return 1
-	fi
-	cp -f $OPENQRM_PLUGIN_ANSIBLE_PUBLIC_SSHKEY $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/openqrm-server-public-ssh-key
-	# add to authorized_keys
-	OPENQRM_PUBLIC_SSHKEY=`cat $OPENQRM_PLUGIN_ANSIBLE_PUBLIC_SSHKEY`
-	if ! grep "$OPENQRM_PUBLIC_SSHKEY" /root/.ssh/authorized_keys 1>/dev/null 2>/dev/null; then
-		openqrm_post_event 0 "openqrm_plugin_ansible_start" 5 "openqrm-plugin-ansible" "Adding Public SSH key file $OPENQRM_PLUGIN_ANSIBLE_PUBLIC_SSHKEY to /root/.ssh/authorized_keys"
-		echo >> /root/.ssh/authorized_keys
-		cat $OPENQRM_PLUGIN_ANSIBLE_PUBLIC_SSHKEY >> /root/.ssh/authorized_keys
-		echo >> /root/.ssh/authorized_keys
-	fi
-	CURRENTD=`pwd`
-	echo "Initializing the openQRM ansible-plugin"
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/ansible
-	# link the boot-service
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/boot-service-ansible.tgz $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-ansible.tgz
-	# link the apply
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/openqrm-ansible-apply.php $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/openqrm-ansible-apply.php
-	# create the svn dir
-	rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/ansible
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/ansible
-	svnadmin create $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/ansible
-	svn import -q $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/default/ file://$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/ansible/ -m "initial import"
-	# also co the files for the web-dir
-	rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/ansible/
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/ansible/
-	cd $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/ansible/
-	svn co -q file://$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/ansible/ .
-	chmod -R 777 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/web/ansible/
-	# setup access through ssh+svn
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/ansible/conf/svnserve.conf
-	echo "[general]" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/ansible/conf/svnserve.conf
-	echo "anon-access = read" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/ansible/conf/svnserve.conf
-	echo "auth-access = write" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/ansible/conf/svnserve.conf
-	echo "realm = openQRM Ansible configuration" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/ansible/conf/svnserve.conf
-	echo "password-db = passwd" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/ansible/conf/svnserve.conf
-	chmod -R 777 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/ansible/db
-	cd $CURRENTD
-	# create cron job which will update the svn repo with files which were added by the web gui
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/cron.d/openqrm-ansible-config.cron | \
-		sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" > /etc/cron.d/openqrm-ansible-config
-	if [ -x "/etc/init.d/cron" ]; then
-		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-			invoke-rc.d cron reload
-		else
-			/etc/init.d/cron reload
-		fi
-	elif [ -x /etc/init.d/crond ]; then
-		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-			invoke-rc.d crond reload
-		else
-			/etc/init.d/crond reload
-		fi
-	else
-		echo "Could not find cron init script in /etc/init.d/. Please reload cron manually!"
-		openqrm_post_event 0 "openqrm_plugin_ansible_start" 3 "openqrm-plugin-ansible" "Could not find cron init script in /etc/init.d/. Please reload cron manually!"
-	fi
-
-	# trigger init action to eventually add cloud products
-	if [ -e $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/cloud ]; then
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$USERNAME --http-password=$PASSWORD "$OPENQRM_WEB_PROTOCOL://$resource_openqrmserver/openqrm/base/plugins/ansible/ansible-action.php?ansible_command=init"; then
-			openqrm_post_event 0 "openqrm_plugin_ansible_start" 3 "openqrm-plugin-ansible" "Could not trigger database hook. Please manually add Ansible Cloud products!"
-		fi
-	fi
-	return 0
-}
-
-
-
-
-
-
-
-USER=$2
-PASS=$3
-
-case "$1" in
-	start)
-		openqrm_plugin_ansible_start
-		;;
-	stop)
-		openqrm_plugin_ansible_stop
-		;;
-	restart)
-		openqrm_plugin_ansible_stop
-		sleep 1
-		openqrm_plugin_ansible_start
-		;;
-	init)
-		openqrm_plugin_ansible_init $USER $PASS
-		;;
-	uninstall)
-		openqrm_plugin_ansible_uninstall $USER $PASS
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/etc/init.d/openqrm-plugin-ansible.postinstall b/openQRM-5.3.50-CE/src/plugins/ansible/etc/init.d/openqrm-plugin-ansible.postinstall
deleted file mode 100644
index f6758ec..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/etc/init.d/openqrm-plugin-ansible.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-ansible postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/etc/init.d/openqrm-plugin-ansible.preremove b/openQRM-5.3.50-CE/src/plugins/ansible/etc/init.d/openqrm-plugin-ansible.preremove
deleted file mode 100644
index 298f54d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/etc/init.d/openqrm-plugin-ansible.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-ansible preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-ansible stop
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/etc/openqrm-plugin-ansible.conf b/openQRM-5.3.50-CE/src/plugins/ansible/etc/openqrm-plugin-ansible.conf
deleted file mode 100644
index 611b264..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/etc/openqrm-plugin-ansible.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# this is the openQRM-plugin-ansible info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen, subversion, expect"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen, subversion, expect, ansible"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen, subversion, expect, ansible"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="Integrates <a href='http://www.ansibleworks.com' target='_BLANK'>Ansible</a> for fully automated Configuration Management and Application deployment."
-OPENQRM_PLUGIN_TYPE="deployment"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES=""
-
-# the public ssh key to use
-OPENQRM_PLUGIN_ANSIBLE_PUBLIC_SSHKEY="/root/.ssh/id_rsa.pub"
-
-# retries for applying playbooks
-OPENQRM_PLUGIN_ANSIBLE_RETRY="60"
-
-# delay/timeout in seconds for retruying failed playbooks
-OPENQRM_PLUGIN_ANSIBLE_DELAY="10"
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES=""
-# dirs which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_DIRS="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/ansible/etc/ansible"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/include/openqrm-plugin-ansible-functions b/openQRM-5.3.50-CE/src/plugins/ansible/include/openqrm-plugin-ansible-functions
deleted file mode 100644
index 0f63879..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/include/openqrm-plugin-ansible-functions
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-# this is the functions file for the ansible-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-################ common ansible functions
-
-# logs for ansible
-function ansible_log() {
-	local COMPONENT=$1
-	shift
-	local MESSAGE=$@
-	logger -i -t "ansible plug-in" "$COMPONENT : $MESSAGE"
-}
-
-
-
-
-
-################ ansible functions
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/ansible-action.php b/openQRM-5.3.50-CE/src/plugins/ansible/web/ansible-action.php
deleted file mode 100644
index 927b51b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/ansible-action.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once $RootDir."/include/openqrm-database-functions.php";
-require_once $RootDir."/include/user.inc.php";
-require_once $RootDir."/include/openqrm-server-config.php";
-require_once $RootDir."/class/storage.class.php";
-require_once $RootDir."/class/resource.class.php";
-require_once $RootDir."/class/event.class.php";
-require_once $RootDir."/class/authblocker.class.php";
-require_once $RootDir."/class/openqrm_server.class.php";
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-// filter inputs
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-$ansible_command = $request->get('ansible_command');
-$cloud_product_hook = $RootDir.'/plugins/ansible/openqrm-ansible-cloud-product-hook.php';
-$cloud_selector_class = $RootDir.'/plugins/cloud/class/cloudselector.class.php';
-
-global $IMAGE_INFO_TABLE;
-global $DEPLOYMENT_INFO_TABLE;
-global $OPENQRM_SERVER_BASE_DIR;
-
-// global event for logging
-$event = new event();
-
-// user/role authentication
-if ($OPENQRM_USER->role != "administrator") {
-	$event->log("authorization", $_SERVER['REQUEST_TIME'], 1, "ansible-action", "Un-Authorized access to ansible-actions from $OPENQRM_USER->name", "", "", 0, 0, 0);
-	exit();
-}
-
-
-$event->log("$ansible_command", $_SERVER['REQUEST_TIME'], 5, "ansible-action", "Processing ansible command $ansible_command", "", "", 0, 0, 0);
-switch ($ansible_command) {
-		case 'init':
-			if (file_exists($cloud_selector_class)) {
-				if (file_exists($cloud_product_hook)) {
-					require_once $cloud_product_hook;
-					openqrm_ansible_cloud_product("add", NULL);
-				}
-			}
-			break;
-
-	case 'uninstall':
-			if (file_exists($cloud_selector_class)) {
-				if (file_exists($cloud_product_hook)) {
-					require_once $cloud_product_hook;
-					openqrm_ansible_cloud_product("remove", NULL);
-				}
-			}
-			break;
-	
-	default:
-		$event->log("$ansible_command", $_SERVER['REQUEST_TIME'], 3, "ansible-action", "No such ansible command ($ansible_command)", "", "", 0, 0, 0);
-		break;
-
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible-about.controller.class.php
deleted file mode 100644
index e7fe6f1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible-about.controller.class.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/**
- * Ansible Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class ansible_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'ansible_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'ansible_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'ansible_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'ansible_about_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About Ansible',
-		'label' => 'About Ansible',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The Ansible plugin provides automated configuration-management for Server in openQRM.
-			It seamlessly integrates <a href="http://www.ansibleworks.com" target="_BLANK">Ansible</a> within the openQRM GUI and assists to apply pre-made or custom Ansible Playbooks to specific Server.
-			By enabling the plugin the Ansible-environment is pre-configured and initialyzed automatically according to best-practice experiences e.g. by keeping the ansible-configuration within a svn-repsitory.
-			Custom Ansible Playbookds can be added to the playbooks directory in the subversion repository.
-			All Playbooks will be automatically displayed in the Ansible plugin server manager.
-			The ansible-configuration repository is also available for external svn clients.
-			To check out the ansible-repo please run<br><br>:',
-		'introduction_title1' => 'Assigning Applications to Server',
-		'introduction_content1' => '<ol><li>Go to the "Server" in the Ansible plugin menu</li>
-			<li>Select a Server to be configured via Ansible</li>
-			<li>Select the Ansible Playbookds to be applied to the server</li></ol>
-			Within short time the ansible-server will distribute the new configuration to the Appliance automatically.',
-		'requirements_title' => 'Requirements',
-		'requirements_list' => '<li>The Ansible Plugin depends on the Dhcpd Plugin! Please make sure to have the Dhcpd Plugin enabled and started before.</li>',
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-		'provides_title' => 'Provides',
-		'provides_list' => '<li>Automated configuration-management for Server in openQRM</li>',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Deployment',
-		'documentation_title' => 'Documentation',
-		'use_case_title' => 'Use-Case',
-	),
-);
-
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/ansible/lang", 'ansible-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/ansible/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About Ansible
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/ansible/class/ansible-about.documentation.class.php');
-			$controller = new ansible_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible-about.documentation.class.php
deleted file mode 100644
index 6666fb1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible-about.documentation.class.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * ansible-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class ansible_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'ansible_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "ansible_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-		$this->basedir    = $this->openqrm->get('basedir');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$svn_co_command = "svn co svn+ssh://[user]@[openqrm-server-ip]".$this->basedir."/openqrm/plugins/ansible/etc/ansible/";
-		$t = $this->response->html->template($this->tpldir.'/ansible-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['provides_title'], 'provides_title');
-		$t->add($this->lang['provides_list'], 'provides_list');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($svn_co_command, 'introduction_command');
-		$t->add($this->lang['introduction_title1'], 'introduction_title1');
-		$t->add($this->lang['introduction_content1'], 'introduction_content1');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible.class.php b/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible.class.php
deleted file mode 100644
index 223676c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible.class.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This class represents a ansible user in openQRM
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/folder.class.php";
-require_once "$RootDir/class/file.class.php";
-
-$event = new event();
-global $event;
-
-$ansible_playbook_dir = "$RootDir/plugins/ansible/ansible/playbooks";
-global $ansible_playbook_dir;
-$ansible_server_dir = "$RootDir/plugins/ansible/ansible/server";
-global $ansible_server_dir;
-
-class ansible {
-
-		function __construct() {
-			$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-			$this->playbook_dir = $RootDir.'/plugins/ansible/ansible/playbooks';
-			$this->server_dir = $RootDir.'/plugins/ansible/ansible/server';
-			$this->event = new event();
-		}
-
-// ---------------------------------------------------------------------------------
-// general ansibleconfig methods
-// ---------------------------------------------------------------------------------
-
-
-function get_available_playbooks() {
-	$app_dir = new folder();
-	$app_dir->getFolderContent($this->playbook_dir);
-	$ansible_playbooks = array();
-	$ansible_playbooks = $app_dir->files;
-	$ansible_playbook_array = array();
-	foreach($ansible_playbooks as $ansible) {
-		$ansible_playbook = str_replace(".yml", "", $ansible->name);
-		$ansible_playbook_array[] .= $ansible_playbook;
-	}
-	return $ansible_playbook_array;
-}
-
-
-
-function get_playbook_info($group_name) {
-	$filename = $this->playbook_dir."/".$group_name.".yml";
-	if (file_exists($filename)) {
-		if (!$handle = fopen($filename, 'r')) {
-			$this->event->log("get_playbook_info", $_SERVER['REQUEST_TIME'], 2, "ansible.class.php", "Cannot open file ($filename)", "", "", 0, 0, 0);
-			exit;
-		}
-		while (!feof($handle)) {
-			$info = fgets($handle, 4096);
-			if (strstr($info, "#")) {
-				$info = str_replace("#", "", $info);
-				fclose($handle);
-				return $info;
-			}
-		}
-	}
-}
-
-
-function get_supported_os($group_name) {
-	$filename = $this->playbook_dir."/".$group_name.".yml";
-	if (file_exists($filename)) {
-		if (!$handle = fopen($filename, 'r')) {
-			$this->event->log("get_supported_os", $_SERVER['REQUEST_TIME'], 2, "ansible.class.php", "Cannot open file ($filename)", "", "", 0, 0, 0);
-			exit;
-		}
-		while (!feof($handle)) {
-			$os_version = fgets($handle, 4096);
-			if (strstr($os_version, "# os:")) {
-				$os_version = str_replace("# os:", "", $os_version);
-				fclose($handle);
-				$os_version_arr = explode(",", $os_version);
-				return $os_version_arr;
-			}
-		}
-	}
-}
-
-
-function set_playbooks($appliance_name, $ansible_playbook_array) {
-	$filename = $this->server_dir."/".$appliance_name;
-	if (!$handle = fopen($filename, 'w+')) {
-		$this->event->log("set_playbook", $_SERVER['REQUEST_TIME'], 2, "ansible.class.php", "Cannot open file ($filename)", "", "", 0, 0, 0);
-		exit;
-	}
-	foreach($ansible_playbook_array as $ansible_playbook) {
-		fwrite($handle, $ansible_playbook."\n");
-	}
-	$empty = count($ansible_playbook_array);
-	fclose($handle);
-}
-
-
-function get_playbooks($appliance_name) {
-	$ansible_playbook_array = array();
-	$filename = $this->server_dir."/".$appliance_name;
-
-	if (file_exists($filename)) {
-		if (!$handle = fopen($filename, 'r')) {
-			$this->event->log("get_playbooks", $_SERVER['REQUEST_TIME'], 2, "ansible.class.php", "Cannot open file ($filename)", "", "", 0, 0, 0);
-			exit;
-		}
-		while (!feof($handle)) {
-			$buffer = fgets($handle, 4096);
-			$buffer = trim($buffer);
-			$ansible_playbook_array[] .= $buffer;
-		}
-		fclose($handle);
-	}
-	return $ansible_playbook_array;
-}
-
-function remove_appliance($appliance_name) {
-	$filename = $this->server_dir."/".$appliance_name;
-	if (file_exists($filename)) {
-		unlink($filename);
-	}
-}
-
-
-// ---------------------------------------------------------------------------------
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible.controller.class.php b/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible.controller.class.php
deleted file mode 100644
index 843375a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible.controller.class.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/**
- * Ansible Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class ansible_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'ansible_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "ansible_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'ansible_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'ansible_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array(
-		'tab' => 'Appliances',
-		'label' => 'Ansible Appliances',
-		'id' => 'ID',
-		'appliance' => 'Appliance',
-		'name' => 'Name',
-		'resource' => 'Resource',
-		'playbooks' => 'Playbooks',
-		'action_edit' => 'edit',
-		'please_wait' => 'Loading. Please wait ..',
-	),
-	'edit' => array(
-		'tab' => 'Edit',
-		'label' => 'Ansible playbooks for appliance %s',
-		'ansible_playbooks' => 'Ansible Playbooks',
-		'apply_playbooks' => 'Direct apply the Playbooks',
-		'msg_updated' => 'Updated appliance %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..'
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/ansible/lang", 'ansible.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/ansible/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = 'select';
-		}
-
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			default:
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'edit':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->auto_tab = false;
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select appliance
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/ansible/class/ansible.select.class.php');
-			$controller = new ansible_select($this->openqrm, $this->response);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit appliance 
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function edit( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/ansible/class/ansible.edit.class.php');
-			$controller = new ansible_edit($this->openqrm, $this->response);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['edit'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['edit']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'edit' );
-		$content['onclick'] = false;
-		if($this->action === 'edit'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible.edit.class.php b/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible.edit.class.php
deleted file mode 100644
index 853c77f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible.edit.class.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/**
- * ansible Appliance
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class ansible_edit
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'ansible_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "ansible_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'ansible_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'ansible_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->tpldir   = $this->rootdir.'/plugins/ansible/tpl';
-
-		require_once($this->openqrm->get('basedir').'/plugins/ansible/web/class/ansible.class.php');
-		$this->ansible = new ansible();
-
-		$id = $this->response->html->request()->get('appliance_id');
-		$this->response->add('appliance_id', $id);
-
-		$appliance = $this->openqrm->appliance();
-		$this->appliance = $appliance->get_instance_by_id($id);
-		$resource = $this->openqrm->resource();
-		$this->resource = $resource->get_instance_by_id($appliance->resources);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action() {
-
-		$response = $this->edit();
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		if(isset($response->msg)) {
-			$response->redirect(
-					$response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		$data['canceled'] = $this->lang['canceled'];
-		$data['please_wait'] = $this->lang['please_wait'];
-		$data['prefix_tab'] = $this->prefix_tab;
-		$data['label'] = sprintf($this->lang['label'], $this->appliance->name);
-		$data['baseurl'] = $this->openqrm->get('baseurl');
-		$data['thisfile']    = $response->html->thisfile;
-		$t = $response->html->template($this->tpldir.'/ansible-edit.tpl.php');
-		$t->add($response->form);
-		$t->add($data);
-		$t->group_elements(array('param_' => 'form'));
-
-		return $t;
-
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function edit() {
-		$response = $this->get_response();
-		$form = $response->form;
-		if(!$form->get_errors() && $response->submit()) {
-			$playbooks = $form->get_request('playbooks');
-			$this->ansible->remove_appliance($this->appliance->name);
-			if(!in_array('{empty}', $playbooks)) {
-				$this->ansible->set_playbooks($this->appliance->name, $playbooks);
-			}
-			// apply directly
-			$apply = $form->get_request('apply');
-			if ($apply == '1') {
-				$command  = $this->openqrm->get('basedir')."/plugins/ansible/bin/openqrm-ansible-manager apply ".$this->appliance->id." ".$this->appliance->name." ".$this->resource->ip;
-				$command  .= " --openqrm-cmd-mode fork";
-				$openqrm_server = new openqrm_server();
-				$openqrm_server->send_command($command);
-			}
-			$response->msg = sprintf($this->lang['msg_updated'], $this->appliance->name);
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param enum $mode [select|edit]
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-
-		$response = $this->response;
-		$form     = $response->get_form($this->actions_name, 'edit');
-		$selected = $this->ansible->get_playbooks($this->appliance->name);
-		$playbooks   = $this->ansible->get_available_playbooks();
-
-		$select = array('{empty}', '&#160;');
-		foreach($playbooks as $v) {
-			$o = $response->html->option();
-			$o->value = $v;
-			$o->label = $v;
-			$o->title = $this->ansible->get_playbook_info($v);
-			$select[] = $o;
-		}
-		$d['select']['label']                        = $this->lang['ansible_playbooks'];
-		$d['select']['object']['type']               = 'htmlobject_select';
-		$d['select']['object']['attrib']['name']     = 'playbooks[]';
-		$d['select']['object']['attrib']['index']    = array(0,1);
-		$d['select']['object']['attrib']['multiple'] = true;
-		$d['select']['object']['attrib']['css']      = 'ansible_select';
-		$d['select']['object']['attrib']['options']  = $select;
-		$d['select']['object']['attrib']['selected'] = $selected;
-
-		$d['apply']['label']                       = $this->lang['apply_playbooks'];
-		$d['apply']['object']['type']              = 'htmlobject_input';
-		$d['apply']['object']['attrib']['type']    = 'checkbox';
-		$d['apply']['object']['attrib']['name']    = 'apply';
-		$d['apply']['object']['attrib']['value']   = '1';
-		$d['apply']['object']['attrib']['checked'] = true;
-
-		$form->add($d);
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$response->form = $form;
-		return $response;
-
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible.select.class.php b/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible.select.class.php
deleted file mode 100644
index 3922b5f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/class/ansible.select.class.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/**
- * ansible Appliance
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class ansible_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'ansible_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "ansible_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'ansible_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'ansible_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->tpldir   = $this->rootdir.'/plugins/ansible/tpl';
-
-		require_once($this->openqrm->get('basedir').'/plugins/ansible/web/class/ansible.class.php');
-		$this->ansible = new ansible();
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$response = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/ansible-select.tpl.php');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->table, 'table');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function select() {
-		$response = $this->response;
-		$appliance = new appliance();
-
-		$table = $this->response->html->tablebuilder('ansible', $this->response->get_array($this->actions_name, 'select'));
-		$table->offset = 0;
-		$table->sort = 'appliance_id';
-		$table->limit = 10;
-		$table->order = 'ASC';
-		$table->max   = $appliance->get_count();
-
-		$table->init();
-
-		$h['appliance_id']['title']    = $this->lang['id'];
-		$h['appliance_id']['sortable'] = true;
-		$h['appliance_id']['hidden']   = true;
-
-		$h['appliance']['title']    = $this->lang['appliance'];
-		$h['appliance']['sortable'] = false;
-
-		$h['appliance_name']['title']    = $this->lang['name'];
-		$h['appliance_name']['sortable'] = true;
-		$h['appliance_name']['hidden']   = true;
-
-		$h['appliance_resources']['title']    = $this->lang['resource'];
-		$h['appliance_resources']['sortable'] = true;
-		$h['appliance_resources']['hidden']   = true;
-
-
-		$h['playbooks']['title']    = $this->lang['playbooks'];
-		$h['playbooks']['sortable'] = false;
-		$h['edit']['title']    = '&#160;';
-		$h['edit']['sortable'] = false;
-
-		$result = $appliance->display_overview($table->offset, $table->limit, $table->sort, $table->order);
-		$b = array();
-		foreach($result as $k => $v) {
-
-			$resource = new resource();
-			$resource = $resource->get_instance_by_id($v['appliance_resources']);
-
-			$tmp = array();
-			$tmp['appliance_id'] = $v['appliance_id'];
-			$tmp['appliance_name'] = $v['appliance_name'];
-			$tmp['appliance_resources'] = $v['appliance_resources'];
-			$tmp['appliance']  = '<b>'.$this->lang['id'].':</b> '.$v['appliance_id'].'<br>';
-			$tmp['appliance'] .= '<b>'.$this->lang['name'].':</b> '.$v['appliance_name'].'<br>';
-			$tmp['appliance'] .= '<b>'.$this->lang['resource'].':</b> '.$resource->id.' / '.$resource->ip.'<br>';
-
-			$playbooks = $this->ansible->get_playbooks($v['appliance_name']);
-			$tmp['playbooks'] = implode(', ', $playbooks);
-
-			$a          = $response->html->a();
-			$a->href    = $response->get_url($this->actions_name, 'edit' ).'&appliance_id='.$v['appliance_id'];
-			$a->label   = $this->lang['action_edit'];
-			$a->title   = $this->lang['action_edit'];
-			$a->css     = 'edit';				
-			$a->handler = 'onclick="wait();"';
-			$tmp['edit'] = $a->get_string();
-
-			$b[] = $tmp;
-		}
-
-		$table->css          = 'htmlobject_table';
-		$table->border       = 0;
-		$table->id           = 'Tabelle';
-		$table->form_action	 = $this->response->html->thisfile;
-		$table->head         = $h;
-		$table->body         = $b;
-		$table->sort_params  = $response->get_string( $this->actions_name, 'select' );
-		$table->sort_form    = true;
-		$table->sort_link    = false;
-		$table->autosort     = false;
-		$table->limit_select = array(
-				array("value" => 10, "text" => 10),
-				array("value" => 20, "text" => 20),
-				array("value" => 30, "text" => 30),
-				array("value" => 40, "text" => 40),
-				array("value" => 50, "text" => 50),
-				);
-		$response->table = $table;
-		return $response;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/css/ansible.css b/openQRM-5.3.50-CE/src/plugins/ansible/web/css/ansible.css
deleted file mode 100644
index e69de29..0000000
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/ansible/web/img/plugin.png
deleted file mode 100644
index e969688..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/ansible/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/lang/de.ansible-about.ini b/openQRM-5.3.50-CE/src/plugins/ansible/web/lang/de.ansible-about.ini
deleted file mode 100644
index 1b98de0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/lang/de.ansible-about.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-[documentation]
-tab = "Über Ansible"
-label = "Über Ansible"
-introduction_title = "Einleitung"
-introduction_content = "Das Ansible-Plugin bietet automatisches Konfiguration-Managment (Applikations-Deployment plus Vorkonfiguration) für Server in openQRM. Es integriert  <a href='http://www.ansibleworks.com' target='_BLANK'>Ansible</a> in den openQRM-Server und erlaubt die Provisionierung spezifischer Applikationen mittels einfacher Zuordnung von Ansible Playbooks.</p>
-	<p>Das Ansible-Plugin beinhaltet einen nach 'best-practise' konfigurierten Ansible Umgebung. Die Ansible Playbooks werden dabei automatisch in einem Subversion-Repository abgelegt. Die Ansible-Konfiguration ist in Server und Playbooks organisiert. Eigene Playbooks werden dem <code>playbooks</code> Verzeichnis hinzugefügt. Die vorhandenden Playbooks können direkt in der openQRM-Benutzeroberfläche specifischen Servern zugeordnet werden. Der Inhalt des Playbooks Verzeichnis wird automatisch in der UI dargestellt.	Das Ansible-Plugin beinhaltet einige vorgefertigte Ansible Playbooks wie z.B.
-	<ul>
-		<li>webserver</li>
-		<li>database-server</li>
-		<li>lamp</li>
-	</ul>
-	Diese vordefinierten Playbooks können selbstverständlich nach eigenen Bedürfnissen angepasst werden. Das Ansible Konfigurations-Repository von openQRM ist auch für externe Subversion Clients verfügbar unter:"
-
-introduction_title1 = "Applikationen den Server zuordnen"
-introduction_content1 = "<ol>
-					<li>Klicken Sie auf 'Server' im Ansible-plugin Menu</li>
-					<li>Wählen Sie einen Server die von Ansible verwaltet werden soll</li>
-					<li>Wählen Sie die Ansible Playbooks die auf dem Server ausgeführt werden sollen</li>
-				</ol>
-				Innerhalb kürzester Zeit wird openQRM die für den Server konfigurierten Playbooks automatisch auf den Server angewenden."
-requirements_title = "Anforderungen"
-requirements_list = "Das Ansible-Plugin ist abhängig vom Dhcpd-Plugin. Bitte vergewissern Sie sich, dass das Dhcpd-Plugin vor dem Ansible-Plugin gestartet wurde."
-tested_title = "Getestet mit"
-tested_content = "Dieses Plugin ist getestet mit Debian, Ubuntu und CentOS"
-
-provides_title = "Bietet"
-provides_list = "Automatisches Konfigurations-Managment für Server in openQRM"
-
-type_title = "Plugin-Typ"
-type_content = "<span class="pill">Deployment</span>"
-
-documentation_title = "Dokumentation"
-use_case_title = "Anwendungsfall"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/lang/de.ansible.ini b/openQRM-5.3.50-CE/src/plugins/ansible/web/lang/de.ansible.ini
deleted file mode 100644
index 0f4eea6..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/lang/de.ansible.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[select]
-tab = "Server"
-label = "Ansible Server"
-id = "ID"
-appliance = "Server"
-name = "Name"
-resource = "Resource"
-playbooks = "Playbooks"
-action_edit = "bearbeiten"
-please_wait = "Lade. Bitte warten .."
-[edit]
-tab = "Bearbeiten"
-label = "Ansible Playbooks für Server %s"
-ansible_playbooks = "Ansible Playbooks"
-apply_playbooks = "Playbooks direkt anwenden"
-msg_updated = "Server %s aktuallisiert"
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/lang/en.ansible-about.ini b/openQRM-5.3.50-CE/src/plugins/ansible/web/lang/en.ansible-about.ini
deleted file mode 100644
index 5f0ed66..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/lang/en.ansible-about.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[documentation]
-tab = "About Ansible"
-label = "About Ansible"
-introduction_title = "Introduction"
-introduction_content = "<p>The Ansible plugin provides automated configuration-management for Server in openQRM.
-			It seamlessly integrates <a href='http://www.ansibleworks.com' target='_BLANK'>Ansible</a> within the openQRM GUI and assists to apply pre-made or custom Ansible Playbooks to specific Server.</p>
-			<p>By enabling the plugin the Ansible-environment is pre-configured and initialyzed automatically according to best-practice experiences e.g. by keeping the ansible-configuration within a svn-repsitory.</p>
-			<p>Custom Ansible Playbooks can be added to the playbooks directory in the subversion repository. All Playbooks will be automatically displayed in the Ansible plugin server manager.
-			A collection of basic Playbooks is provided by openQRM. Those are
-			<ul>
-				<li>webserver</li>
-				<li>database-server</li>
-				<li>lamp</li>
-			</ul>
-			Those provided Playbooks can be of course customized according own requirements. The ansible-configuration repository is also available for external svn clients. To check out the ansible-repo please run:</p>"
-
-introduction_title1 = "Assigning applications to server"
-introduction_content1 = "<ol><li>Go to the 'Server' in the Ansible plugin menu</li>
-							<li>Select an server to be configured via Ansible</li>
-							<li>Select the Ansible Playbookds to be applied to the server</li>
-						</ol>
-						Within short time the ansible server will distribute the new configuration to the server automatically."
-
-requirements_title = "Requirements"
-requirements_list = "The ansible plugin depends on the Dhcpd plugin! Please make sure to have the Dhcpd plugin enabled and started before."
-
-tested_title = "Tested with"
-tested_content = "This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions."
-
-provides_title = "Provides"
-provides_list = "Automated configuration management for Server in openQRM"
-
-type_title = "Plugin type"
-type_content = "<span class="pill">Deployment</span>"
-
-documentation_title = "Documentation"
-use_case_title = "Use case"
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/lang/en.ansible.ini b/openQRM-5.3.50-CE/src/plugins/ansible/web/lang/en.ansible.ini
deleted file mode 100644
index 8530b6e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/lang/en.ansible.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[select]
-tab = "Server"
-label = "Ansible Server"
-id = "ID"
-appliance = "Server"
-name = "Name"
-resource = "Resource"
-playbooks = "Playbooks"
-action_edit = "edit"
-please_wait = "Loading. Please wait .."
-[edit]
-tab = "Edit"
-label = "Ansible playbooks for Server %s"
-ansible_playbooks = "Ansible Playbooks"
-apply_playbooks = "Direct apply the Playbooks"
-msg_updated = "Updated Server %s"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/ansible/web/menu.txt
deleted file mode 100644
index 7183b52..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/menu.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|Ansible
-...|Server|index.php?plugin=ansible|Apply Ansible Classes to Server
-...|About|index.php?plugin=ansible&controller=ansible-about|How to use
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/openqrm-ansible-appliance-edit-hook.php b/openQRM-5.3.50-CE/src/plugins/ansible/web/openqrm-ansible-appliance-edit-hook.php
deleted file mode 100644
index 114b8ee..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/openqrm-ansible-appliance-edit-hook.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-function get_ansible_appliance_edit($appliance_id, $openqrm, $response) {
-	$appliance = new appliance();
-	$appliance->get_instance_by_id($appliance_id);
-	$plugin_title = "Configure Application on Appliance ".$appliance->name;
-
-	$a = $response->html->a();
-	$a->label = '<image height="24" width="24" alt="'.$plugin_title.'" title="'.$plugin_title.'" src="'.$openqrm->get('baseurl').'/plugins/ansible/img/plugin.png">';
-	$a->href = $openqrm->get('baseurl').'/index.php?base=appliance&appliance_action=load_edit&aplugin=ansible&appliance_id='.$appliance_id.'&ansible_action=edit';
-	$a->handler = '';
-
-	return $a;
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/openqrm-ansible-apply.php b/openQRM-5.3.50-CE/src/plugins/ansible/web/openqrm-ansible-apply.php
deleted file mode 100644
index 7997037..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/openqrm-ansible-apply.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-$thisfile = basename($_SERVER['PHP_SELF']);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-$BaseDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/';
-require_once $RootDir."/include/user.inc.php";
-require_once $RootDir."/class/image.class.php";
-require_once $RootDir."/class/resource.class.php";
-require_once $RootDir."/class/virtualization.class.php";
-require_once $RootDir."/class/appliance.class.php";
-require_once $RootDir."/class/deployment.class.php";
-require_once $RootDir."/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-// filter inputs
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-$ansible_command = $request->get('ansible_command');
-$ansible_server_id = $request->get('ansible_id');
-$ansible_server_name = $request->get('ansible_name');
-$ansible_server_mac = $request->get('ansible_mac');
-$ansible_server_ip = $request->get('ansible_ip');
-
-global $OPENQRM_SERVER_BASE_DIR;
-
-$event = new event();
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $event;
-
-
-// main
-$event->log($ansible_command, $_SERVER['REQUEST_TIME'], 5, "ansible-apply", "Processing ansible command ".$ansible_command, "", "", 0, 0, 0);
-
-	switch ($ansible_command) {
-
-		case 'apply':
-			$appliance = new appliance();
-			$appliance->get_instance_by_id($ansible_server_id);
-			if ($ansible_server_name == $appliance->name) {
-				$resource = new resource();
-				$resource->get_instance_by_id($appliance->resources);
-				if (($ansible_server_mac == $resource->mac) && ($ansible_server_ip == $resource->ip)) {
-					$command  = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/ansible/bin/openqrm-ansible-manager apply ".$appliance->id." ".$appliance->name." ".$resource->ip."  --openqrm-cmd-mode fork";
-					$openqrm_server = new openqrm_server();
-					$openqrm_server->send_command($command);
-				} else {
-					$event->log($ansible_command, $_SERVER['REQUEST_TIME'], 3, "ansible-apply", "Request for Ansible apply for server id ".$ansible_server_id." with wrong resource ".$resource->id, "", "", 0, 0, 0);
-				}
-			} else {
-				$event->log($ansible_command, $_SERVER['REQUEST_TIME'], 3, "ansible-apply", "Request for Ansible apply for server id ".$ansible_server_id." with wrong name ".$ansible_server_name, "", "", 0, 0, 0);
-			}
-			break;
-
-		default:
-			$event->log($ansible_command, $_SERVER['REQUEST_TIME'], 3, "ansible-apply", "No such command ".$ansible_command, "", "", 0, 0, 0);
-			break;
-
-
-	}
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/openqrm-ansible-cloud-application-hook.php b/openQRM-5.3.50-CE/src/plugins/ansible/web/openqrm-ansible-cloud-application-hook.php
deleted file mode 100644
index 9e348af..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/openqrm-ansible-cloud-application-hook.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once $RootDir."/include/user.inc.php";
-require_once $RootDir."/class/event.class.php";
-require_once $RootDir."/class/resource.class.php";
-require_once $RootDir."/class/openqrm_server.class.php";
-require_once $RootDir."/include/openqrm-server-config.php";
-require_once $RootDir."/plugins/ansible/class/ansible.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-
-
-// cloud hook to get the available application groups
-function openqrm_ansible_get_cloud_applications() {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-
-	$ansible_group_list = array();
-	$ansible = new ansible();
-	$ansible_group_array = $ansible->get_available_playbooks();
-	foreach ($ansible_group_array as $index => $ansible_app) {
-		$ansible_group_list[] = "ansible/".$ansible_app;
-	}
-	return $ansible_group_list;
-}
-
-
-// cloud hook to get the supported os version by application
-function openqrm_ansible_get_supported_os_version($application) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	$ansible = new ansible();
-	$ansible_os_array = $ansible->get_supported_os($application);
-	return $ansible_os_array;
-}
-
-
-
-// cloud hook to set applications for a cloud server
-function openqrm_ansible_set_cloud_applications($appliance_name, $application_array) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	$ansible = new ansible();
-	$ansible->set_playbooks($appliance_name, $application_array);
-}
-
-
-// cloud hook to remove applications from a cloud server
-function openqrm_ansible_remove_cloud_applications($appliance_name) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	$ansible = new ansible();
-	$ansible->remove_appliance($appliance_name);
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/openqrm-ansible-cloud-product-hook.php b/openQRM-5.3.50-CE/src/plugins/ansible/web/openqrm-ansible-cloud-product-hook.php
deleted file mode 100644
index aad86bb..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/openqrm-ansible-cloud-product-hook.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once $RootDir."/plugins/ansible/class/ansible.class.php";
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $IMAGE_AUTHENTICATION_TABLE;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $openqrm_server;
-$event = new event();
-global $event;
-
-
-
-function openqrm_ansible_cloud_product($cmd, $cloud_hook_config) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RootDir;
-
-	$openqrm_server = new openqrm_server();
-
-	$event->log("openqrm_ansible_cloud_product", $_SERVER['REQUEST_TIME'], 5, "openqrm-ansible-cloud-product-hook.php", "Handling ".$cmd." event", "", "", 0, 0, 0);
-	switch($cmd) {
-			case "add":
-				// create application products
-				$next_sort_id = 0;
-				$db=openqrm_get_db_connection();
-				$ansible = new ansible();
-				$ansible_group_array = $ansible->get_available_playbooks();
-				foreach ($ansible_group_array as $index => $ansible_app) {
-					$event->log("openqrm_ansible_cloud_product", $_SERVER['REQUEST_TIME'], 5, "openqrm-ansible-cloud-product-hook.php", "Adding application ".$ansible_app." as cloud-product", "", "", 0, 0, 0);
-					$cloud_product_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$create_application_cloudselector_config = "insert into cloud_selector (id, type, sort_id, quantity, price, name, description, state) VALUES (".$cloud_product_id.", 'application', ".$next_sort_id.", 'ansible/".$ansible_app."', 1, '".$ansible_app."', '".$ansible_app." via ansible', 1);";
-					$recordSet = $db->Execute($create_application_cloudselector_config);
-					$next_sort_id++;
-				}
-				break;
-				
-			case "remove":
-				$cloud_product_class = $RootDir."/plugins/cloud/class/cloudselector.class.php";
-				if (file_exists($cloud_product_class)) {
-					require_once $cloud_product_class;
-					$cloud_selector = new cloudselector();
-					$cloud_selector_id_ar = $cloud_selector->get_all_ids();
-					foreach ($cloud_selector_id_ar as $key => $value) {
-						$id = $value['id'];
-						$cloud_selector->get_instance_by_id($id);
-						$pos = strpos($cloud_selector->quantity, 'ansible/');
-						if ($pos !== false) {
-							$event->log("openqrm_ansible_cloud_product", $_SERVER['REQUEST_TIME'], 5, "openqrm-ansible-cloud-product-hook.php", "Removing application ".$cloud_selector->quantity." from cloud-products", "", "", 0, 0, 0);
-							$cloud_selector->remove($id);
-						}
-					}
-				}
-				break;
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/tpl/ansible-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/ansible/web/tpl/ansible-about-documentation.tpl.php
deleted file mode 100644
index f17797c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/tpl/ansible-about-documentation.tpl.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-
-	<div class="span7">
-
-		<h3>{introduction_title}</h3>
-		{introduction_content}
-		<pre>{introduction_command}</pre>
-	
-		<h3>{introduction_title1}</h3>
-		{introduction_content1}
-	
-		<h3>{provides_title}</h3>
-		{provides_list}
-	
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-	</div>
-
-	<div class="span2 offset1">
-		<h3>{type_title}</h3>
-		<span class="pill">{type_content}</span>
-	
-		<h3>{tested_title}</h3>
-		{tested_content}
-	</div>
-
-
-</div>
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/tpl/ansible-apply.tpl.php b/openQRM-5.3.50-CE/src/plugins/ansible/web/tpl/ansible-apply.tpl.php
deleted file mode 100644
index 85520e9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/tpl/ansible-apply.tpl.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>Apply Ansible Classes II</h2>
-
-<h4>Please Select the Ansible-groups for the appliance {appliance_name}</h4>
-<br>
-{ansible_groups_table}
-<a href="ansible-manager.php"><- back</a>
-<br>
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/tpl/ansible-edit.tpl.php b/openQRM-5.3.50-CE/src/plugins/ansible/web/tpl/ansible-edit.tpl.php
deleted file mode 100644
index b5781cc..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/tpl/ansible-edit.tpl.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div id="form">
-	<form action="{thisfile}" method="POST">
-	{form}
-	{select}
-	{apply}
-	{submit}&#160;{cancel}
-	</form>
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/ansible/web/tpl/ansible-select.tpl.php b/openQRM-5.3.50-CE/src/plugins/ansible/web/tpl/ansible-select.tpl.php
deleted file mode 100644
index bd68de0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ansible/web/tpl/ansible-select.tpl.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-{table}
diff --git a/openQRM-5.3.50-CE/src/plugins/aoe-storage/Makefile b/openQRM-5.3.50-CE/src/plugins/aoe-storage/Makefile
deleted file mode 100644
index 53790cf..0000000
--- a/openQRM-5.3.50-CE/src/plugins/aoe-storage/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/aoe-storage/etc
-	cp etc/openqrm-plugin-aoe-storage.conf /usr/share/openqrm/plugins/aoe-storage/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/aoe-storage/etc/openqrm-plugin-aoe-storage.conf b/openQRM-5.3.50-CE/src/plugins/aoe-storage/etc/openqrm-plugin-aoe-storage.conf
deleted file mode 100644
index 2b98bde..0000000
--- a/openQRM-5.3.50-CE/src/plugins/aoe-storage/etc/openqrm-plugin-aoe-storage.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Integrates <a href='http://aoetools.sourceforge.net/' target='_BLANK'>AOE (ATA over Ethernet)</a> as Storage technology (network-deployment). <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="storage"
diff --git a/openQRM-5.3.50-CE/src/plugins/atu/Makefile b/openQRM-5.3.50-CE/src/plugins/atu/Makefile
deleted file mode 100644
index aa0d0bd..0000000
--- a/openQRM-5.3.50-CE/src/plugins/atu/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/atu/etc
-	cp etc/openqrm-plugin-atu.conf /usr/share/openqrm/plugins/atu/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/atu/etc/openqrm-plugin-atu.conf b/openQRM-5.3.50-CE/src/plugins/atu/etc/openqrm-plugin-atu.conf
deleted file mode 100644
index 061da6c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/atu/etc/openqrm-plugin-atu.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="ATU's openQRM Plugin. Server and Cluster Configuration management <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="misc"
diff --git a/openQRM-5.3.50-CE/src/plugins/autoscale/Makefile b/openQRM-5.3.50-CE/src/plugins/autoscale/Makefile
deleted file mode 100644
index 0995a1f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/autoscale/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/autoscale/etc
-	cp etc/openqrm-plugin-autoscale.conf /usr/share/openqrm/plugins/autoscale/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/autoscale/etc/openqrm-plugin-autoscale.conf b/openQRM-5.3.50-CE/src/plugins/autoscale/etc/openqrm-plugin-autoscale.conf
deleted file mode 100644
index 3e2b783..0000000
--- a/openQRM-5.3.50-CE/src/plugins/autoscale/etc/openqrm-plugin-autoscale.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Autoscale Cloud Computing with <a href='http://aws.autoscale.com/ec2/' target='_BLANK'>Autoscale EC2 Public Cloud</a>. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="cloud"
diff --git a/openQRM-5.3.50-CE/src/plugins/azure/Makefile b/openQRM-5.3.50-CE/src/plugins/azure/Makefile
deleted file mode 100644
index 16ceb52..0000000
--- a/openQRM-5.3.50-CE/src/plugins/azure/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/azure/etc
-	cp etc/openqrm-plugin-azure.conf /usr/share/openqrm/plugins/azure/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/azure/etc/openqrm-plugin-azure.conf b/openQRM-5.3.50-CE/src/plugins/azure/etc/openqrm-plugin-azure.conf
deleted file mode 100644
index 89b801f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/azure/etc/openqrm-plugin-azure.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Azure Cloud Computing with <a href='http://aws.amazon.com/ec2/' target='_BLANK'>Amazon Public Cloud</a>, <a href='http://www.ubuntu.com/business/cloud/overview' target='_BLANK'>Ubuntu Enterprise Cloud</a> and <a href='http://www.eucalyptus.com/' target='_BLANK'>Eucalyptus</a>. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="cloud"
diff --git a/openQRM-5.3.50-CE/src/plugins/bandwidth/Makefile b/openQRM-5.3.50-CE/src/plugins/bandwidth/Makefile
deleted file mode 100644
index 41d46e0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/bandwidth/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/bandwidth/etc
-	cp etc/openqrm-plugin-bandwidth.conf /usr/share/openqrm/plugins/bandwidth/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/bandwidth/etc/openqrm-plugin-bandwidth.conf b/openQRM-5.3.50-CE/src/plugins/bandwidth/etc/openqrm-plugin-bandwidth.conf
deleted file mode 100644
index 2469a38..0000000
--- a/openQRM-5.3.50-CE/src/plugins/bandwidth/etc/openqrm-plugin-bandwidth.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Network-mangement for the Appliances public IP-addresses. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="network"
diff --git a/openQRM-5.3.50-CE/src/plugins/citrix/Makefile b/openQRM-5.3.50-CE/src/plugins/citrix/Makefile
deleted file mode 100644
index 041cf8a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/citrix/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/citrix/etc
-	cp etc/openqrm-plugin-citrix.conf /usr/share/openqrm/plugins/citrix/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/citrix/etc/openqrm-plugin-citrix.conf b/openQRM-5.3.50-CE/src/plugins/citrix/etc/openqrm-plugin-citrix.conf
deleted file mode 100644
index 332a1f2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/citrix/etc/openqrm-plugin-citrix.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Integrates the <a href='http://xenserver.org/' target='_BLANK'>Citrix XenServer</a> Virtualization Technology. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="virtualization"
diff --git a/openQRM-5.3.50-CE/src/plugins/clonezilla/Makefile b/openQRM-5.3.50-CE/src/plugins/clonezilla/Makefile
deleted file mode 100644
index d0134e5..0000000
--- a/openQRM-5.3.50-CE/src/plugins/clonezilla/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/clonezilla/etc
-	cp etc/openqrm-plugin-clonezilla.conf /usr/share/openqrm/plugins/clonezilla/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/clonezilla/etc/openqrm-plugin-clonezilla.conf b/openQRM-5.3.50-CE/src/plugins/clonezilla/etc/openqrm-plugin-clonezilla.conf
deleted file mode 100644
index dc5b731..0000000
--- a/openQRM-5.3.50-CE/src/plugins/clonezilla/etc/openqrm-plugin-clonezilla.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Automatic disk-cloning with <a href='http://clonezilla.org/' target='_BLANK'>Clonezilla</a> (local-deployment). <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="deployment"
diff --git a/openQRM-5.3.50-CE/src/plugins/cloud-zones/Makefile b/openQRM-5.3.50-CE/src/plugins/cloud-zones/Makefile
deleted file mode 100644
index 247b567..0000000
--- a/openQRM-5.3.50-CE/src/plugins/cloud-zones/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/cloud-zones/etc
-	cp etc/openqrm-plugin-cloud-zones.conf /usr/share/openqrm/plugins/cloud-zones/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/cloud-zones/etc/openqrm-plugin-cloud-zones.conf b/openQRM-5.3.50-CE/src/plugins/cloud-zones/etc/openqrm-plugin-cloud-zones.conf
deleted file mode 100644
index 171618b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/cloud-zones/etc/openqrm-plugin-cloud-zones.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Manage multiple datacenter locations with <a href='http://www.openqrm-enterprise.com/news/details/article/openqrm-enterprise-cloud-zones-the-next-level-of-cloud-computing.html' target='_BLANK'>openQRM Enterprise Cloud Zones</a>. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="cloud"
diff --git a/openQRM-5.3.50-CE/src/plugins/cloud/Makefile b/openQRM-5.3.50-CE/src/plugins/cloud/Makefile
deleted file mode 100644
index 48288be..0000000
--- a/openQRM-5.3.50-CE/src/plugins/cloud/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/cloud/etc
-	cp etc/openqrm-plugin-cloud.conf /usr/share/openqrm/plugins/cloud/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/cloud/etc/openqrm-plugin-cloud.conf b/openQRM-5.3.50-CE/src/plugins/cloud/etc/openqrm-plugin-cloud.conf
deleted file mode 100644
index c24be92..0000000
--- a/openQRM-5.3.50-CE/src/plugins/cloud/etc/openqrm-plugin-cloud.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Private/Public Cloud Computing with openQRM. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="cloud"
diff --git a/openQRM-5.3.50-CE/src/plugins/cobbler/Makefile b/openQRM-5.3.50-CE/src/plugins/cobbler/Makefile
deleted file mode 100644
index 55500e3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/cobbler/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/cobbler/etc
-	cp etc/openqrm-plugin-cobbler.conf /usr/share/openqrm/plugins/cobbler/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/cobbler/etc/openqrm-plugin-cobbler.conf b/openQRM-5.3.50-CE/src/plugins/cobbler/etc/openqrm-plugin-cobbler.conf
deleted file mode 100644
index 8efd657..0000000
--- a/openQRM-5.3.50-CE/src/plugins/cobbler/etc/openqrm-plugin-cobbler.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Integrates <a href='http://cobbler.github.com/' target='_BLANK'>Cobbler</a> Install Server for automatic Linux deployments (local-deployment). <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="deployment"
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/Makefile b/openQRM-5.3.50-CE/src/plugins/collectd/Makefile
deleted file mode 100644
index 2a7fe9e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# this is the openQRM collectd-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/collectd* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc/templates
-	. $(OPENQRM_SERVER_CONF) && cp etc/templates/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc/templates/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/img
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/img/
-	. $(OPENQRM_SERVER_CONF) && chmod 777 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/lang/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/bin
-	. $(OPENQRM_SERVER_CONF) && cp bin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/bin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/bin/*
-	. $(OPENQRM_SERVER_CONF) && tar -C $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd -czvf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/boot-service-collectd.tgz include/ etc/init.d/collectd etc/templates/openqrm-collectd.conf
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/collectd
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/collectd/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/bin/openqrm-collectd-manager b/openQRM-5.3.50-CE/src/plugins/collectd/bin/openqrm-collectd-manager
deleted file mode 100644
index 5a0a1d9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/bin/openqrm-collectd-manager
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/bash
-# this script automatically manages collectd
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-# unblock starting command queue early for non-blocking + ui commands
-COLLECTD_MANAGER_COMMAND=$1
-if [ "$COLLECTD_MANAGER_COMMAND" == "remove" ]; then
-	openqrm_unblock_starting_queue $@
-	NON_BLOCKING=true
-fi
-
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/include/openqrm-plugin-collectd-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc/openqrm-plugin-collectd.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-openqrm_server_get_config
-export resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-export LANG=C
-CURRENT_DIR=`pwd`
-
-# let only root run this script
-WHOAMI=`whoami`
-if [ "$WHOAMI" != "root" ]; then
-	echo "ERROR: Please run this script as root!"
-	exit 6
-fi
-
-# the collectd plugin depends on dns working so it needs the dns plugin available+enabled
-# collectd autosigning needs a domain name. This we get from the dns-plugin config
-if [ ! -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/openqrm-plugin-dns.conf ]; then
-	openqrm_post_event 0 "collectd-plugin" 3 "collectd-plugin" "The openQRM collectd-plugin depends on the dns-plugin. Please enable the dns-plugin first!"
-	exit 1
-fi
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/openqrm-plugin-dns.conf
-
-function collectd_manager_usage() {
-	echo "Usage : $0 graph"
-	echo "      : $0 remove <appliance-name> [now/later]"
-	echo ""
-	echo "Optional parameters:"
-	echo "             [--openqrm-ui-user <username>]"
-	echo "             [--openqrm-internal-cmd <true/false>]"
-	echo "             [--openqrm-cmd-mode <regular/background/fork>]"
-	exit 1
-}
-
-
-COLLECTD_MANAGER_COMMAND=$1
-# main
-case "$COLLECTD_MANAGER_COMMAND" in 
-	graph)
-		# running by crond
-		LOCK_TIME=`openqrm_lock_queue aquire collectd-graph`
-		trap "openqrm_lock_queue release collectd-graph $LOCK_TIME" EXIT
-
-		for APPLIANCE_NAME in `ls $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/data/`; do
-			echo "Creating graphs for Appliance $APPLIANCE_NAME"
-			rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/graphs/$APPLIANCE_NAME.work
-			mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/graphs/$APPLIANCE_NAME.work/data-snapshot/
-			cp -a `find $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/data/$APPLIANCE_NAME/ -name *.rrd` $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/graphs/$APPLIANCE_NAME.work/data-snapshot/
-			cd $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/graphs/$APPLIANCE_NAME.work
-			nice -n 19 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/bin/collectd2html.pl --data-dir=$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/graphs/$APPLIANCE_NAME.work/data-snapshot/ --host=$APPLIANCE_NAME | logger
-			ln -sf $APPLIANCE_NAME.html index.html
-			rm -rf data-snapshot/
-			cd $CURRENT_DIR
-			rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/graphs/$APPLIANCE_NAME
-			mv $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/graphs/$APPLIANCE_NAME.work $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/graphs/$APPLIANCE_NAME
-		done
-		openqrm_lock_queue release collectd-graph $LOCK_TIME
-		trap '' EXIT
-		;;
-	remove)
-		# running from the engine
-		APPLIANCE_NAME=$2
-		WHEN=$3
-		if [ "$APPLIANCE_NAME" == "" ]; then
-			exit
-		fi
-		if [ "$WHEN" == "later" ]; then
-			# wait until the appliance is fully stopped
-			sleep 60
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire collectd`
-		trap "openqrm_lock_queue release collectd $LOCK_TIME" EXIT
-
-		# remove data
-		rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/data/$APPLIANCE_NAME
-		# remove graphs
-		rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/graphs/$APPLIANCE_NAME
-
-		openqrm_lock_queue release collectd $LOCK_TIME
-		trap '' EXIT
-		;;
-	*)
-		echo "ERROR: Free commandline arguments are not allowed"
-		collectd_manager_usage
-		exit 6
-		;;
-esac
-
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/etc/init.d/collectd b/openQRM-5.3.50-CE/src/plugins/collectd/etc/init.d/collectd
deleted file mode 100644
index 6faabb5..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/etc/init.d/collectd
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/bash
-# this is the boot-service init script for the collectd resources
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-# for including the package functions
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/include/openqrm-plugin-collectd-functions
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-OPENQRM_SERVER_IP=$resource_openqrmserver
-
-COLLECTD_CONF="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc/collectd.conf"
-# for the clients we use the regular data dir since they are sending
-# their stats to the server anyway
-COLLECTD_DATA_DIR="/var/lib/collectd/rdd"
-
-# do not run on idle resources
-if [ "$resource_image" == "idle" ]; then
-	exit 0
-fi
-
-# set the hostname early :)
-hostname $appliance_name
-
-# also do not run before the real init of the rootfs
-# if we have this file /etc/initrd-devices.conf we are still in the initrd
-if [ -f /etc/initrd-devices.conf ]; then
-	exit 0
-fi
-if [ -f /etc/debian_version ]; then
-	echo "$appliance_name" > /etc/hostname
-elif [ -f /etc/redhat-release ]; then
-	sed -i -e "s#HOSTNAME=.*#HOSTNAME=$appliance_name#g" /etc/sysconfig/network
-elif [ -f /etc/SuSE-release ]; then
-	echo "$appliance_name" > /etc/HOSTNAME
-fi
-
-
-function collectd_start() {
-	echo "Starting the openQRM collectd-plugin"
-	collectd_stop 1>/dev/null 2>&1
-	if ! openqrm_full_fill_os_dependency collectd collectd; then
-		return 0
-	fi
-	openqrm_chkconfig del collectd
-	collectd_stop 1>/dev/null 2>&1
-
-	# prepare collectd client config
-	mkdir -p $COLLECTD_DATA_DIR
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc/templates/openqrm-collectd.conf | \
-		sed -e "s/@@MODE@@/Server/g" |  \
-		sed -e "s#@@COLLECTD_DATA_DIR@@#$COLLECTD_DATA_DIR#g" |  \
-		sed -e "s#@@OPENQRM_HOSTNAME@@#$appliance_name#g" |  \
-		sed -e "s/@@OPENQRM_SERVER_IP_ADDRESS@@/$resource_openqrmserver/g" > $COLLECTD_CONF
-
-	# start collectd
-	if [ -x /usr/sbin/collectdmon ]; then
-		if ! /usr/sbin/collectdmon -P /var/run/collectdmon.pid -- -C $COLLECTD_CONF 1>/dev/null 2>&1; then
-			echo "ERROR: Could not start collectd"
-		fi
-	elif [ -x /usr/sbin/collectd ]; then
-		if ! /usr/sbin/collectd -C $COLLECTD_CONF; then
-			echo "ERROR: Could not start collectd"
-		fi
-	fi
-}
-
-
-function collectd_stop() {
-	echo "Stopping the openQRM collectd-plugin"
-	if [ -x /etc/init.d/collectd ]; then
-		/etc/init.d/collectd stop
-	fi
-	kill `ps ax | grep collectd.conf | grep -v grep | awk {' print $1 '}` 2>/dev/null
-	# be sure it is gone
-	kill -9 `ps ax | grep collectd.conf | grep -v grep | awk {' print $1 '}` 2>/dev/null
-}
-
-
-
-
-
-case "$1" in
-	start)
-		collectd_start
-		;;
-	stop)
-		collectd_stop
-		;;
-	restart)
-		collectd_stop
-		sleep 1
-		collectd_start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/etc/init.d/openqrm-plugin-collectd b/openQRM-5.3.50-CE/src/plugins/collectd/etc/init.d/openqrm-plugin-collectd
deleted file mode 100644
index 5161293..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/etc/init.d/openqrm-plugin-collectd
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/bin/bash
-# init script for the openQRM collectd-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/include/openqrm-plugin-collectd-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc/openqrm-plugin-collectd.conf
-openqrm_server_get_config
-export resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-
-COLLECTD_CONF="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc/collectd.conf"
-COLLECTD_DATA_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/data"
-
-function openqrm_plugin_collectd_start() {
-	echo "Starting the openQRM collectd-plugin"
-	kill -9 `ps ax | grep collectd | grep -v openqrm | grep -v grep | awk {' print $1 '}` 2>/dev/null
-	openqrm_chkconfig del collectd
-	# start collectd
-	if [ -x /usr/sbin/collectdmon ]; then
-		if /usr/sbin/collectdmon -P /var/run/collectdmon.pid -- -C $COLLECTD_CONF; then
-			touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/collectd/.running
-		fi
-	fi
-}
-
-
-function openqrm_plugin_collectd_stop() {
-	echo "Stopping the openQRM collectd-plugin"
-	/etc/init.d/collectd stop
-	# be sure it is stopped
-	kill `ps ax | grep collectd | grep -v openqrm | grep -v grep | awk {' print $1 '}` 2>/dev/null
-	# be sure it is gone
-	kill -9 `ps ax | grep collectd | grep -v openqrm | grep -v grep | awk {' print $1 '}` 2>/dev/null
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/collectd/.running
-}
-
-function openqrm_plugin_collectd_uninstall() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "collectd: Please give a username to uninstall the plugin : "
-		read USERNAME
-		echo
-		echo -n "collectd: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Uninstalling the openQRM collectd-plugin"
-	openqrm_plugin_collectd_stop
-
-	# remove from cron
-	if [ -e /etc/cron.d/openqrm-collectd-graph ]; then
-		rm -f /etc/cron.d/openqrm-collectd-graph
-		if [ -x /etc/init.d/cron ]; then
-			/etc/init.d/cron reload
-		elif [ -x /etc/init.d/crond ]; then
-			/etc/init.d/crond reload
-		else
-			echo "Could not find cron init script in /etc/init.d/. Please reload cron manually!"
-		fi
-	fi
-
-	# remove data dir
-	rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/data
-	rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/graphs
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/collectd
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-collectd.tgz
-	rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc/collectd
-}
-
-function openqrm_plugin_collectd_init() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "collectd: Please give a username to init the plugin : "
-		read USERNAME
-		echo
-		echo -n "collectd: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-
-	# the collectd plugin depends on dns working so it needs the dns plugin available+enabled
-	# collectd needs a hostname name. This we get from the dns-plugin config
-	if [ ! -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/openqrm-plugin-dns.conf ]; then
-		echo "ERROR: The openQRM collectd-plugin depends on the dns-plugin. Please enable the dns-plugin first!"
-		openqrm_post_event 0 "collectd-plugin" 3 "collectd-plugin" "The openQRM collectd-plugin depends on the dns-plugin. Please enable the dns-plugin first!"
-		exit 1
-	fi
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/openqrm-plugin-dns.conf
-	echo "Initializing the openQRM collectd-plugin"
-
-	# prepare collectd server config
-	mkdir -p $COLLECTD_DATA_DIR
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc/templates/openqrm-collectd.conf | \
-		sed -e "s/@@MODE@@/Listen/g" |  \
-		sed -e "s#@@COLLECTD_DATA_DIR@@#$COLLECTD_DATA_DIR#g" |  \
-		sed -e "s#@@OPENQRM_HOSTNAME@@#openqrm#g" |  \
-		sed -e "s/@@OPENQRM_SERVER_IP_ADDRESS@@/$OPENQRM_SERVER_IP_ADDRESS/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc/collectd.conf
-
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/collectd
-	# link the boot-service
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/web/boot-service-collectd.tgz $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-collectd.tgz
-}
-
-USER=$2
-PASS=$3
-
-case "$1" in
-	start)
-		openqrm_plugin_collectd_start
-		;;
-	stop)
-		openqrm_plugin_collectd_stop
-		;;
-	restart)
-		openqrm_plugin_collectd_stop
-		sleep 1
-		openqrm_plugin_collectd_start
-		;;
-	init)
-		openqrm_plugin_collectd_init $USER $PASS
-		;;
-	uninstall)
-		openqrm_plugin_collectd_uninstall $USER $PASS
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/etc/init.d/openqrm-plugin-collectd.postinstall b/openQRM-5.3.50-CE/src/plugins/collectd/etc/init.d/openqrm-plugin-collectd.postinstall
deleted file mode 100644
index 0aecc73..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/etc/init.d/openqrm-plugin-collectd.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-collectd postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/etc/init.d/openqrm-plugin-collectd.preremove b/openQRM-5.3.50-CE/src/plugins/collectd/etc/init.d/openqrm-plugin-collectd.preremove
deleted file mode 100644
index c71ec82..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/etc/init.d/openqrm-plugin-collectd.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-collectd preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-collectd stop
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/etc/openqrm-plugin-collectd.conf b/openQRM-5.3.50-CE/src/plugins/collectd/etc/openqrm-plugin-collectd.conf
deleted file mode 100644
index 515f499..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/etc/openqrm-plugin-collectd.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# this is the openQRM-plugin-collectd info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen, collectd"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen, collectd, collectd-rrdtool"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen, collectd"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="Monitor systems with <a href='http://collectd.org/' target='_BLANK'>Collectd</a> providing long-term statistics and graphs."
-OPENQRM_PLUGIN_TYPE="monitoring"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES=""
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/collectd/etc/openqrm-plugin-collectd.conf"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/etc/templates/openqrm-collectd.conf b/openQRM-5.3.50-CE/src/plugins/collectd/etc/templates/openqrm-collectd.conf
deleted file mode 100644
index f02f6d3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/etc/templates/openqrm-collectd.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-# this is the openqrm-plugin-collectd client configuration file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-FQDNLookup false
-Hostname "@@OPENQRM_HOSTNAME@@"
-
-LoadPlugin syslog
-<Plugin syslog>
-	LogLevel info
-</Plugin>
-#LoadPlugin battery
-#LoadPlugin cpu
-#LoadPlugin df
-#LoadPlugin disk
-#LoadPlugin entropy
-#LoadPlugin interface
-#LoadPlugin irq
-LoadPlugin load
-LoadPlugin memory
-LoadPlugin network
-#LoadPlugin processes
-LoadPlugin rrdtool
-#LoadPlugin swap
-#LoadPlugin users
-
-<Plugin network>
-	@@MODE@@ "@@OPENQRM_SERVER_IP_ADDRESS@@" "25826"
-	TimeToLive 128
-	Forward false
-	CacheFlush 1800
-</Plugin>
-<Plugin rrdtool>
-	DataDir "@@COLLECTD_DATA_DIR@@"
-</Plugin>
-
-<Plugin "df">
-	Device "/dev"
-	Device "/dev/shm"
-	IgnoreSelected false
-</Plugin>
-
-Include "/etc/collectd/thresholds.conf"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/include/openqrm-plugin-collectd-functions b/openQRM-5.3.50-CE/src/plugins/collectd/include/openqrm-plugin-collectd-functions
deleted file mode 100644
index b3203be..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/include/openqrm-plugin-collectd-functions
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-# this is the functions file for the collectd-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-################ common collectd functions
-
-
-
-################ collectd functions
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd-about.bootservice.class.php b/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd-about.bootservice.class.php
deleted file mode 100644
index 197b438..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd-about.bootservice.class.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * collectd-about Boot-Service
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class collectd_about_bootservice
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'collectd_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "collectd_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/collectd-about-bootservice.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['boot_service_title'], 'boot_service_title');
-		$t->add($this->lang['boot_service_content'], 'boot_service_content');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd-about.controller.class.php
deleted file mode 100644
index 92cc43d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd-about.controller.class.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?php
-/**
- * collectd-about Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class collectd_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'collectd_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'collectd_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'collectd_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'collectd_about_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About Collectd',
-		'label' => 'About Collectd',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The "Collectd" plugin automatically provides System statistics for server.
-						It seamlessly integrates <a href="http://collectd.org/" target="_BLANK">Collectd</a> within openQRM
-						and provides hourly, daily, weekly and monthly system graphs created from the collected data via <a href="http://oss.oetiker.ch/rrdtool/" target="_BLANK">rrdtool</a>.
-						By enabling the plugin collectd is pre-configured and initialized automatically.
-						The system graphs are updated sequentially via a cron-job. It may take some minutes after the start of a server to collect enough data to create the graphs.',
-		'requirements_title' => 'Requirements',
-		'requirements_list' => 'none',
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-
-		'provides_title' => 'Provides',
-		'provides_list' => 'System statistics for Appliances',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Monitoring',
-
-		'documentation_title' => 'Documentation',
-		'use_case_title' => 'Use-Case',
-	),
-	'bootservice' => array (
-		'tab' => 'Boot-Service',
-		'label' => 'Collectd Boot-Service',
-		'boot_service_title' => 'Collectd Boot-Service',
-		'boot_service_content' => 'The Collectd Plugin provides an openQRM Boot-Service.
-			This "Collectd Boot-Service" is automatically downloaded and executed by the openQRM-Client on all integrated Systems.
-			The Boot-Service is located at:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/collectd/web/boot-service-collectd.tgz</b></i>
-			<br>
-			<br>
-			The "Collectd Boot-Service contains the Client files of the Collectd Plugin.<br>
-			Also a configuration file for the Collectd Hosts is included in this Boot-Service.<br>
-			<br>
-			The Boot-Service configuration can be viewed and administrated by the "openqrm" utility.<br>
-			To view the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n collectd -a default</b></i>
-			<br>
-			<br>
-			To view a Boot-Service configuration of a specific appliance run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n collectd -a [appliance-name]</b></i>
-			<br>
-			<br>
-			To adapt a parameter in the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n collectd -a default -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			To adapt a paramter in the Boot-Service configuration of a specific appliance run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n collectd -a [appliance-name] -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			In case the openmQRM Server itself is used as the Collectd Host please edit:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/collectd/etc/openqrm-plugin-collectd.conf</b></i>
-			<br>
-			<br>
-			',
-	),
-	'usage' => array (
-		'tab' => 'About Collectd',
-		'label' => 'Collectd Use-Cases',
-	),
-
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/collectd/lang", 'collectd-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/collectd/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "documentation";
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-			case 'bootservice':
-				$content[] = $this->bootservice(true);
-			break;
-			case 'usage':
-				$content[] = $this->usage(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About Collectd
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/collectd/class/collectd-about.documentation.class.php');
-			$controller = new collectd_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Boot-Service
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function bootservice( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/collectd/class/collectd-about.bootservice.class.php');
-			$controller = new collectd_about_bootservice($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['bootservice'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['bootservice']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'bootservice' );
-		$content['onclick'] = false;
-		if($this->action === 'bootservice'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-
-
-	//--------------------------------------------
-	/**
-	 * About Collectd Use-Cases
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function usage( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/collectd/class/collectd-about.usage.class.php');
-			$controller = new collectd_about_usage($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['usage'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['usage']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'usage' );
-		$content['onclick'] = false;
-		if($this->action === 'usage'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd-about.documentation.class.php
deleted file mode 100644
index c4104d3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd-about.documentation.class.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * collectd-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class collectd_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'collectd_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "collectd_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/collectd-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['provides_title'], 'provides_title');
-		$t->add($this->lang['provides_list'], 'provides_list');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd-about.usage.class.php b/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd-about.usage.class.php
deleted file mode 100644
index e461203..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd-about.usage.class.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * collectd-about Usage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class collectd_about_usage
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'collectd_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "collectd_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/collectd-about-usage.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd.api.class.php b/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd.api.class.php
deleted file mode 100644
index 6b2f655..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd.api.class.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-/**
- * Collectd Api
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-class collectd_api
-{
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param object $controller
-	 */
-	//--------------------------------------------
-	function __construct($controller) {
-		$this->controller = $controller;
-		$this->user       = $this->controller->user;
-		$this->html       = $this->controller->response->html;
-		$this->response   = $this->html->response();
-		$this->file       = $this->controller->file;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function action() {
-		$action = $this->response->html->request()->get($this->controller->actions_name);
-		switch( $action ) {
-			case 'image':
-				$this->image();
-			break;
-			case 'download':
-				$this->download();
-			break;
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Image
-	 *
-	 * @param array $_REQUEST[values]
-	 * @param string $_REQUEST[interval]
-	 * @param string $_REQUEST[path]
-	 * @param int $_REQUEST[width] optional
-	 * @param int $_REQUEST[height] optional
-	 * @access public
-	 */
-	//--------------------------------------------
-	function image( $raw = false ) {
-		$values   = $this->response->html->request()->get('values');
-		$interval = $this->response->html->request()->get('interval');
-		$path     = $this->response->html->request()->get('path');
-		$width    = 800;
-		if($this->response->html->request()->get('width') !== '') {
-			$width = $this->response->html->request()->get('width');
-		}
-		$height = 200;
-		if($this->response->html->request()->get('height') !== '') {
-			$height = $this->response->html->request()->get('height');
-		}
-		$bcolors  = array('#ffe8e8','#e8e8ff','#e2ffe2');
-		$lcolors  = array('#ff7777','#7777ff','#55ff55');
-
-		$i   = 0;
-		$str = '';
-		foreach($values as $value) {
-			if($value !== '') {
-				$str.= 'DEF:'.$value.'_avg='.$path.':'.$value.':AVERAGE ';
-				$str.= 'DEF:'.$value.'_max='.$path.':'.$value.':MAX ';
-				$str.= 'AREA:'.$value.'_max'.$bcolors[$i].' ';
-				$str.= 'LINE2:'.$value.'_avg'.$lcolors[$i].':'.$value.' ';
-				$str.= 'GPRINT:'.$value.'_avg:AVERAGE:%5.1lf%sAvg ';
-				$i++;
-			}
-		}
-
-		$names = explode('/', dirname($path));
-		$head = $names[count($names)-1];
-		$host = $names[count($names)-2];
-		$name  = str_replace('.rrd', '',basename($path));
-		$title = $host.' '.$head.' '. str_replace($head, '', $name).' '.$interval.' '.date('d. F Y H:i:s', time());
-
-		$cmd  = 'rrdtool graph - ';
-		$cmd .= '-t "'.$title.'" ';
-		$cmd .= '--imgformat PNG ';
-		$cmd .= '--width '.$width.' ';
-		$cmd .= '--height '.$height.' ';
-		$cmd .= '--start now-'.$interval.' ';
-		$cmd .= '--end now ';
-		$cmd .= '--interlaced ';
-		$cmd .= $str;
-
-		$return = shell_exec($cmd);
-		if($raw === false) {
-			$size   = strlen($return);
-			$mime   = 'image/png';
-			header("Pragma: public");
-			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-			header("Cache-Control: must-revalidate");
-			header("Content-type: $mime");
-			header("Content-Length: ".$size);
-			header("Content-disposition: inline; filename=test");
-			header("Accept-Ranges: ".$size);
-			flush();
-			echo $return;
-			exit(0);
-		}
-		else if ($raw === true) {
-			return $return;
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Download
-	 *
-	 * @param string $_REQUEST[appliance_id]
-	 * @param string $_REQUEST[interval]
-	 * @access public
-	 */
-	//--------------------------------------------
-	function download() {
-
-		$_REQUEST[$this->controller->actions_name] = 'statistics';
-		$role  = $this->controller->openqrm->role($this->response);
-		$allow = $role->check_permission($this->controller, true);
-		if($allow === true) {
-			$file = tempnam('/dummydir', 'xx');
-			$dir = dirname($file).'/'.time().'/';
-			$error = $this->file->mkdir($dir);
-			if($error === '') {
-				$this->controller->action = 'statistics';
-				$tab = $this->controller->statistics(true);
-				$images = $tab['value']->get_elements('images');
-
-				$x = preg_match_all('~<img src="([^"].*?)"~is', $images, $matches);
-				if(isset($matches[1][0])) {
-	
-					foreach($matches[1] as $match) {
-						$values = array();
-						$tmp    = explode('?', $match);
-						$params = explode('&amp;', $tmp[1]);
-						foreach($params as $param) {
-							$tmp = explode('=', $param);
-							if($tmp[0] === 'path') {
-								$path = $tmp[1];
-							}
-							else if($tmp[0] === 'interval') {
-								$interval = $tmp[1];
-							}
-							else if($tmp[0] === urlencode('values[]')) {
-								$values[] = $tmp[1];
-							}
-							else if($tmp[0] === 'width') {
-								$width = $tmp[1];
-							}
-							else if($tmp[0] === 'height') {
-								$height = $tmp[1];
-							}
-						}
-						$_REQUEST['path']     = $path;
-						$_REQUEST['interval'] = $interval;
-						$_REQUEST['values']   = $values;
-						$_REQUEST['width']    = $width;
-						$_REQUEST['height']   = $height;
-
-						$names = explode('/', dirname($path));
-						$head = $names[count($names)-1];
-						$name = str_replace('.rrd', '',basename($path));
-
-						$filename = $head.'-'.$name.'-'.$interval.'.png';
-						$this->file->mkfile($dir.$filename, $this->image(true), 'w+', true);
-						$images = str_replace($match, $filename, $images);
-					}
-				}
-				$tab['value']->add('', 'form');
-				$tab['value']->add('', 'interval');
-				$tab['value']->add('', 'submit');
-				$tab['value']->add('', 'download');
-				$tab['value']->add($images, 'images');
-				$data  = '<!DOCTYPE html><html><head><title>collectd</title>';
-				$data .= '<style type="text/css">'.$this->file->get_contents($_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/collectd/css/collectd.css').'</style>';
-				$data .= '</head><body>';
-				$data .= $tab['value']->get_string();
-				$data .= '</body></html>';
-				$this->file->mkfile($dir.'index.html', $data,'w+', true);
-
-				shell_exec('cd '.$dir.' && tar -czvf '.$file.' *');
-
-				$size = filesize($file);
-				header("Pragma: public");
-				header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-				header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-				header("Cache-Control: must-revalidate");
-				header("Content-type: application/x-tar");
-				header("Content-Length: ".$size);
-				header("Content-disposition: inline; filename=collectd_".time().".tar");
-				header("Accept-Ranges: ".$size);
-				flush();
-				readfile($file);
-				$this->file->remove($file);
-				$this->file->remove($dir, true);
-				exit(0);
-			}
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd.controller.class.php b/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd.controller.class.php
deleted file mode 100644
index d2cc6bf..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd.controller.class.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-/**
- * Collectd System statistics Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class collectd_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'collectd_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "collectd_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'collectd_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'collectd_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'statistics' => array(
-		'tab' => 'Collectd',
-		'label' => 'Statistics on resource %s',
-		'action_download' => 'download',
-		'no_data' => 'No statistics found',
-		'form_interval' => 'Interval',
-		'please_wait' => 'Loading Collectd Data. Please wait ..',
-	),
-);
-/**
-* path to image
-* @access public
-* @var string
-*/
-var $image_path = 'api.php?action=plugin&plugin=collectd&collectd_action=image';
-/**
-* image_width
-* @access public
-* @var integer
-*/
-var $image_width = 800;
-/**
-* image_height
-* @access public
-* @var integer
-*/
-var $image_height = 243;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/collectd/lang", 'collectd.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/collectd/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = 'statistics';
-		}
-
-		$content = array();
-		switch( $this->action ) {
-			case 'statistics':
-				$content[] = $this->statistics(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->rootdir.'/plugins/collectd/class/collectd.api.class.php');
-		$controller = new collectd_api($this);
-		$controller->action();
-	}
-
-	//--------------------------------------------
-	/**
-	 * View statistics
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function statistics( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/collectd/class/collectd.statistics.class.php');
-			$controller = new collectd_statistics($this->openqrm, $this->response);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['statistics'];
-			$controller->image_path    = $this->image_path;
-			$controller->image_width   = $this->image_width;
-			$controller->image_height  = $this->image_height;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['statistics']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'statistics' );
-		$content['onclick'] = false;
-		if($this->action === 'statistics'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd.statistics.class.php b/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd.statistics.class.php
deleted file mode 100644
index 6b80d77..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/class/collectd.statistics.class.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-/**
- * collectd statistics
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class collectd_statistics
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'collectd_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "collectd_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'collectd_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'collectd_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-/**
-* path to image
-* @access public
-* @var string
-*/
-var $image_path = 'api.php?action=plugin&plugin=collectd&collectd_action=image';
-/**
-* image_width
-* @access public
-* @var integer
-*/
-var $image_width = 243;
-/**
-* image_height
-* @access public
-* @var integer
-*/
-var $image_height = 800;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->tpldir   = $this->rootdir.'/plugins/collectd/tpl';
-		if($this->response->html->request()->get('appliance_id') !== '') {
-			$appliance = $this->openqrm->appliance();
-			$appliance->get_instance_by_id($this->response->html->request()->get('appliance_id'));
-			$this->appliance = $appliance;
-			if(isset($appliance->resources) && $appliance->resources !== '') {
-				$resource = new resource();
-				$resource->get_instance_by_id($appliance->resources);
-				$this->resource = $resource;
-			}
-		}
-		$this->response->add('appliance_id', $this->response->html->request()->get('appliance_id'));
-		$this->lib = '/usr/share/openqrm/plugins/collectd/data';
-
-		$intervals[0] = array('all');
-		$intervals[1] = array('1hour');
-		$intervals[2] = array('1day');
-		$intervals[3] = array('1week');
-		$intervals[4] = array('1month');
-		$this->intervals = $intervals;
-		$this->response->add('interval', $this->response->html->request()->get('interval'));
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$response = $this->statistics();
-		$t = $this->response->html->template($this->tpldir.'/collectd-statistics.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->images, 'images');
-		$t->add($response->links, 'links');
-		$t->add($response->download, 'download');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		if(isset($this->resource)) {
-			$t->add(sprintf($this->lang['label'], $this->resource->hostname), 'label');
-		} else {
-			$t->add($this->lang['no_data'], 'label');
-		}
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Statistics
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function statistics() {
-		$response = $this->get_response();
-		$images = '';
-		$links  = '';
-		if(isset($this->resource)) {
-			$folder = $this->lib.'/'.$this->appliance->name;
-			// if resource is the openqrm server
-			if ($this->resource->id == 0) {
-				$folder = $this->lib.'/openqrm';
-			}
-			if($this->file->exists($folder)) {
-				$folders =$this->file->get_folders($folder);
-				$i       = 0;
-				$max     = count($folders) -1;
-				foreach($folders as $dir) {
-					if($i === $max && $max > 2) {
-						$links .= '<a href="#'.$dir['name'].'" class="last">'.ucfirst($dir['name']).'</a>';
-					} else {
-						$links  .= '<a href="#'.$dir['name'].'">'.ucfirst($dir['name']).'</a>';
-					}
-					$images .= '<h3><a id="'.$dir['name'].'">'.ucfirst($dir['name']).'</a><a href="#top" class="toplink">&and;</a></h3><div class="image_box">';
-					$files = $this->file->get_files($dir['path']);
-					foreach($files as $file) {
-						$path = $file['path'];
-						$cmd  = 'rrdtool info '.$path;
-						$cmd .= "|grep 'ds\['";
-						$cmd .= "|sed 's/^ds\[//'";
-						$cmd .= "|sed 's/\].*//'";
-						$cmd .= "|sort";
-						$cmd .= "|uniq";
-						$ret  = shell_exec($cmd);
-						$src  = $this->image_path;
-						$src .= '&amp;path='.$path;
-						$src .= '&amp;width='.$this->image_width;
-						$src .= '&amp;height='.$this->image_height;
-						if(isset($ret)) {
-							$values = explode("\n", $ret);
-							foreach($values as $value) {
-								if($value !== '') {
-									$src .= '&amp;'.urlencode('values[]').'='.$value;
-								}
-							}
-						}
-						if($this->response->html->request()->get('interval') === '') {
-							$intervals = $this->intervals[1];
-						} 
-						else if ($this->response->html->request()->get('interval') === 'all') {
-							for($i=1;$i<count($this->intervals);$i++) {
-								$intervals[] = $this->intervals[$i][0];
-							}
-						} else {
-							$intervals = array($this->response->html->request()->get('interval'));
-						}
-						$images .= '<h4>'.str_replace('.rrd', '', $file['name']).'</h4>';
-						foreach ($intervals as $interval) {
-							$alt = str_replace('.rrd', '', basename($path)).'_'.$interval;
-							$images .= '<img src="'.$src.'&amp;interval='.$interval.'&amp;uniqe='.time().'" alt="'.$alt.'">';
-						}
-					}
-					$images .= '</div>';
-					$i++;
-				}
-			}
-		}
-
-		$a = $response->html->a();
-		$a->label  = $this->lang['action_download'];
-		$a->id     = 'downloadlink';
-		$a->css    = 'badge';
-		$a->href   = $this->image_path;
-		$a->href  .= '&interval='.$this->response->html->request()->get('interval');
-		$a->href  .= '&appliance_id='.$this->response->html->request()->get('appliance_id');
-		$a->href  .= '&'.$this->actions_name.'=download';
-		$response->download  = $a;
-		$response->links  = $links;
-		$response->images = $images;
-		return $response;
-	}
-
-
-
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'statistics');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$submit->css = 'interval_submit';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$d['interval']['label']                       = $this->lang['form_interval'];
-		$d['interval']['object']['type']              = 'htmlobject_select';
-		$d['interval']['object']['attrib']['id']      = 'interval';
-		$d['interval']['object']['attrib']['handler'] = 'onchange="wait();this.form.submit();"';
-		$d['interval']['object']['attrib']['name']    = 'interval';
-		$d['interval']['object']['attrib']['index']   = array(0,0);
-		$d['interval']['object']['attrib']['options'] = $this->intervals;
-		if($this->response->html->request()->get('interval') === '') {
-			$d['interval']['object']['attrib']['selected'] = array($this->intervals[1][0]);
-		} 
-
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/css/collectd.css b/openQRM-5.3.50-CE/src/plugins/collectd/web/css/collectd.css
deleted file mode 100644
index 007ca13..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/css/collectd.css
+++ /dev/null
@@ -1,103 +0,0 @@
-#collectd_statistics h3 {
-	margin-left: 15px;
-	margin-right: 15px;
-	margin-bottom: 20px;
-	padding: 0 0 10px 0;
-	border-bottom: 1px solid #ccc;
-}
-#collectd_statistics h3 a.toplink {
-	float: right;
-	padding:0 4px;
-	margin: 4px 15px 0 0;
-	line-height:16px;
-	font-size: 12px;
-	color: #ccc;
-	border: 1px solid #ccc;
-	text-decoration: none;
-}
-#collectd_statistics h4 {
-	text-align: left;
-	margin-left: 50px;
-	margin-top: 20px;
-}
-#collectd_statistics #downloadlink {
-	margin-left: 15px;
-	margin-top: 15px;
-	display: block;
-	width: 80px;
-	text-align: center;
-	float: left;
-}
-#collectd_statistics .image_box {
-	border: 0px none;
-	text-align: center;
-	margin-right: 15px;
-}
-#collectd_statistics .image_box img {
-	margin: 0 0 0 0;
-}
-#collectd_statistics #links{
-	float: right;
-	display: block;
-	width: 165px;
-	height: 59px;
-	overflow: auto;
-	margin-right: 28px;
-	border-left: 1px solid #ccc;
-	border-top: 1px solid #ccc;
-	border-bottom: 1px solid #ccc;
-}
-#collectd_statistics #links .linkswrapper{
-	height: 60px;
-}
-#collectd_statistics #links a {
-	padding: 0 0 0 3px;
-	display: block;
-	font-size: 13px;
-	line-height: 19px;
-	text-decoration: none;
-	border-bottom: 1px solid #ccc;
-	color: black;
-}
-#collectd_statistics #links a.last {
-	border-bottom: 0px none;
-}
-#collectd_statistics #form {
-	float:right;
-	margin: -55px 20px 0 0;
-}
-#collectd_statistics #intervalbox,
-#collectd_statistics #buttons {
-	float:left;
-}
-#collectd_statistics #interval_box .left {
-	width: auto;
-	padding: 2px 15px 0 0;
-}
-#collectd_statistics #interval_box .right select {
-	width: 80px;
-	margin: 3px 0 0 0;
-}
-#collectd_statistics .interval_submit {
-	vertical-align: middle;
-	margin: 0 0 0 8px;
-	width: 30px;
-	height: 30px;
-	text-indent: -1000px;
-	background-color: transparent;
-	background-image: url(../../../img/glyphicons/glyphicons.png);
-	background-position: -44px -382px;
-}
-
-.floatbreaker {
-	clear:both;
-	height:0px !important;
-	position:relative;
-	line-height:0px;
-	font-size:0px;
-	border:0px none;
-	margin:0;
-	padding:0;
-	overflow:hidden;
-	width:0px;
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/collectd/web/img/plugin.png
deleted file mode 100644
index d41daa5..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/collectd/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/lang/de.collectd-about.ini b/openQRM-5.3.50-CE/src/plugins/collectd/web/lang/de.collectd-about.ini
deleted file mode 100644
index 7a4f5ee..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/lang/de.collectd-about.ini
+++ /dev/null
@@ -1,50 +0,0 @@
-[documentation]
-tab = "Über Collectd"
-label = "Über Collectd"
-introduction_title = "Einleitung"
-introduction_content = "Das <code>collectd</code> Plugin stellt automatisch System-Statistiken der Server in openQRM bereit.
-	Es integriert <a href='http://collectd.org/' target='_BLANK'>collectd</a> in openQRM und erstellt Grafiken der System-Statistiken aus den gesammelten Collectd-Daten mittels <a href="http://oss.oetiker.ch/rrdtool/" target="_BLANK">rrdtool</a> (stündlich, täglich, wöchentlich und monatlich). Einschalten und starten des Collectd-Plugins konfiguriert automatisch openQRM als Collectd Master, der die Statistik Daten der verwalteten Systeme	automatisch sammelt und aufbereitet. Auf den Client-Systemen sorgt der Collectd-Boot-Service für die automatische Konfiguration. Die System Grafiken werden sequenziell mittels eines <code>cron</code> Jobs erzeugt.
-	</p>
-	<p><span class="pill ok">tipp</span> <em>Es kann einige Zeit dauern bis genügend Daten zur Verfügung stehen um die Grafiken zu generieren.</em>"
-
-requirements_title = "Anforderungen"
-requirements_list = "keine"
-tested_title = "Testet mit"
-tested_content = "Diese Plugin ist getestet mit Debian-, Ubuntu- und CentOS-Linux-Distributionen"
-
-provides_title = "Bietet"
-provides_list = "System-Statistiken der Server"
-
-type_title = "Plugin-Typ"
-type_content = "<span class="pill">Monitoring</span>"
-
-documentation_title = "Dokumentation"
-use_case_title = "Anwendungsfall"
-
-[bootservice]
-tab = "Boot-Service"
-label = "Collectd Boot-Service"
-boot_service_title = "Collectd Boot-Service"
-boot_service_content = "Das Collectd Plugin beinhaltet einen openQRM Boot-Service. Dieser 'Collectd Boot-Service' wird automatisch von allen in openQRM integrierten Systeme heruntergeladen und ausgeführt. Der Boot-Service befindet sich unter:
-			<pre>/usr/share/openqrm/plugins/collectd/web/boot-service-collectd.tgz</pre>
-			Der 'Collectd Boot-Service' beinhaltet die 'Client' Dateien des Collectd Plugin.
-			Eine Konfigurationsdatei für den Collectd ist ebenfalls enhalten.
-			Die Boot-Service konfiguration wird mittels des <code>openqrm</code> Kommandozeilenwerkzeugs verwaltet.
-			
-			Der folgende Befehl zeigt die aktuelle <code>default</code> Boot-Service-Konfiguration an:
-			<pre>/usr/share/openqrm/bin/openqrm boot-service view -n collectd -a default</pre>
-			
-			Die Boot-Service-Konfiguration eines speziellen Servers zeigt der folgende Befehl an:
-			<pre>/usr/share/openqrm/bin/openqrm boot-service view -n collectd -a [appliance-name]</pre>
-			
-			Der folgende Befehl passt einen Konfigurationparameter des <code>default</code> Boot-Service an:
-			<pre>/usr/share/openqrm/bin/openqrm boot-service configure -n collectd -a default -k [key] -v [value]</pre>
-			
-			Die Boot-Service Konfigurarationsparameter eines speziellen Server passt der folgende Befehl an:
-			<pre>/usr/share/openqrm/bin/openqrm boot-service configure -n collectd -a [appliance-name] -k [key] -v [value]</pre>
-			
-			Im Falle das der openmQRM-Server selber als Collectd genutzt wird werden die Konfigurationsparameter in der folgenden Datei manuell angepasst:
-			<pre>/usr/share/openqrm/plugins/collectd/etc/openqrm-plugin-collectd.conf</pre>"
-[usage]
-tab = "Über Collectd"
-label = "Collectd Anwendungsfälle"
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/lang/de.collectd.ini b/openQRM-5.3.50-CE/src/plugins/collectd/web/lang/de.collectd.ini
deleted file mode 100644
index a842152..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/lang/de.collectd.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[statistics]
-tab = "Collectd"
-label = "Statistik auf Ressource %s"
-form_interval = "Zeitraum"
-action_download = "download"
-no_data = "Keien Statistik gefunden"
-please_wait = "Lade Collectd Daten. Bitte warten .."
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/lang/en.collectd-about.ini b/openQRM-5.3.50-CE/src/plugins/collectd/web/lang/en.collectd-about.ini
deleted file mode 100644
index 21d390a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/lang/en.collectd-about.ini
+++ /dev/null
@@ -1,40 +0,0 @@
-[documentation]
-tab = "About collectd"
-label = "About collectd"
-introduction_title = "Introduction"
-introduction_content = "The <code>collectd</code> plugin automatically provides system statistics for server. It seamlessly integrates <a href='http://collectd.org/' target='_blank'>collectd</a> within openQRM and provides hourly, daily, weekly and monthly system graphs created from the collected data via <a href='http://oss.oetiker.ch/rrdtool/' target='_blank'>rrdtool</a>.
-						By enabling the plugin <code>collectd</code> is pre-configured and initialized automatically. The system graphs are updated sequentially via a <code>cron</code> job.</p>
-						<p><span class="pill green">hint</span> <em>It may take some minutes after the start of a server to collect enough data to create the graphs.</em>"
-requirements_title = "Requirements"
-requirements_list = "none"
-tested_title = "Tested with"
-tested_content = "This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions."
-
-provides_title = "Provides"
-provides_list = "System statistics for server"
-type_title = "Plugin type"
-type_content = "<span class=\"pill\">Monitoring</span>"
-
-documentation_title = "Documentation"
-use_case_title = "Use case"
-
-[bootservice]
-tab = "boot service"
-label = "Collectd boot service"
-boot_service_title = "Collectd boot service"
-boot_service_content = "<p>The <code>collectd</code> plugin provides an openQRM boot service which is automatically downloaded and executed by the openQRM client on all integrated systems. The boot service is located at:
-			<pre>/usr/share/openqrm/plugins/collectd/web/boot-service-collectd.tgz</pre>
-			The boot service contains the client files of the collectd plugin. and a configuration file for the collectd hosts. The boot service configuration can be viewed and administrated by the 'openqrm' utility. To view the current default boot service configuration run:
-			<pre>/usr/share/openqrm/bin/openqrm boot-service view -n collectd -a default</pre>
-			To view a boot service configuration of a specific Server run:
-			<pre>/usr/share/openqrm/bin/openqrm boot-service view -n collectd -a [appliance-name]</pre>
-			To adapt a parameter in the current default boot-service configuration run:
-			<pre>/usr/share/openqrm/bin/openqrm boot-service configure -n collectd -a default -k [key] -v [value]</pre>
-			To adapt a parameter in the boot service configuration of a specific Server run:<br>
-			<pre>/usr/share/openqrm/bin/openqrm boot-service configure -n collectd -a [appliance-name] -k [key] -v [value]</pre>
-			In case the openQRM server itself is used as the collectd host please edit:<br>
-			<pre>/usr/share/openqrm/plugins/collectd/etc/openqrm-plugin-collectd.conf</pre>"
-
-[usage]
-tab = "About collectd"
-label = "Collectd use cases"
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/lang/en.collectd.ini b/openQRM-5.3.50-CE/src/plugins/collectd/web/lang/en.collectd.ini
deleted file mode 100644
index cb69491..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/lang/en.collectd.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[statistics]
-tab = "Collectd"
-label = "Statistics on resource %s"
-form_interval = "Interval"
-action_download = "download"
-no_data = "No statistics found"
-please_wait = "Loading Collectd Data. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/collectd/web/menu.txt
deleted file mode 100644
index cf9f47c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/menu.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|Collectd
-...|About|index.php?plugin=collectd&controller=collectd-about|How to use
-...|Config|index.php?plugin=collectd&collectd_about_action=bootservice&controller=collectd-about|Collectd Boot-Service
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/openqrm-collectd-appliance-hook.php b/openQRM-5.3.50-CE/src/plugins/collectd/web/openqrm-collectd-appliance-hook.php
deleted file mode 100644
index 97bed7c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/openqrm-collectd-appliance-hook.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-
-
-function openqrm_collectd_appliance($cmd, $appliance_fields) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	$appliance_id=$appliance_fields["appliance_id"];
-	$appliance_name=$appliance_fields["appliance_name"];
-	$resource = new resource();
-	$resource->get_instance_by_id($appliance_fields["appliance_resources"]);
-	$appliance_ip=$resource->ip;
-
-
-	$event->log("openqrm_new_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-collectd-appliance-hook.php", "Handling $cmd event $appliance_id/$appliance_name/$appliance_ip", "", "", 0, 0, $appliance_id);
-	// we remove the stats on add and remove
-	switch($cmd) {
-		case "add":
-			$openqrm_server = new openqrm_server();
-			$openqrm_server->send_command($OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/collectd/bin/openqrm-collectd-manager remove ".$appliance_name." now --openqrm-cmd-mode background");
-			break;
-		case "remove":
-			$openqrm_server = new openqrm_server();
-			$openqrm_server->send_command($OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/collectd/bin/openqrm-collectd-manager remove ".$appliance_name." now --openqrm-cmd-mode background");
-			break;
-
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/openqrm-collectd-appliance-link-hook.php b/openQRM-5.3.50-CE/src/plugins/collectd/web/openqrm-collectd-appliance-link-hook.php
deleted file mode 100644
index 47fad2c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/openqrm-collectd-appliance-link-hook.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/htmlobjects/htmlobject.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-$event = new event();
-global $event;
-
-
-
-function get_collectd_appliance_link($appliance_id) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-
-	$appliance_name='';
-
-	$appliance = new appliance();
-	$appliance->get_instance_by_id($appliance_id);
-	$resource = new resource();
-	$resource->get_instance_by_id($appliance->resources);
-	$hostname = $appliance->name;
-	if ($resource->id == 0) {
-		$hostname = 'openqrm';
-	}
-
-	$a = '';
-	if(file_exists('/usr/share/openqrm/plugins/collectd/data/'.$hostname)) {
-		$html = new htmlobject($OPENQRM_SERVER_BASE_DIR.'/openqrm/web/base/class/htmlobjects');
-		$a = $html->a();
-		$a->label = 'collectd';
-		$a->css = 'badge';
-		$a->handler = 'onclick="wait();"';
-		$a->href = '/openqrm/base/index.php?plugin=collectd&controller=collectd&collectd_action=statistics&appliance_id='.$appliance->id;
-	}
-	return $a;
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/tpl/collectd-about-bootservice.tpl.php b/openQRM-5.3.50-CE/src/plugins/collectd/web/tpl/collectd-about-bootservice.tpl.php
deleted file mode 100644
index 83406ed..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/tpl/collectd-about-bootservice.tpl.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-
-<h2 class="hidden">{label}</h2>
-
-<div id="documentation_content" class="row">
-	<div class="span7">
-		<h2>{boot_service_title}</h2>
-
-		{boot_service_content}
-	
-	</div>
-</div>
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/tpl/collectd-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/collectd/web/tpl/collectd-about-documentation.tpl.php
deleted file mode 100644
index 180d9a2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/tpl/collectd-about-documentation.tpl.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span6">
-		<h3>{introduction_title}</h3>
-		{introduction_content}
-		
-		<hr>
-		<h3>{provides_title}</h3>
-		{provides_list}
-		
-		<hr>
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-		
-	</div>
-
-
-	<div class="span2 offset1">
-
-		<h3>{type_title}</h3>
-		{type_content}
-
-		<h3>{tested_title}</h3>
-		{tested_content}
-	</div>
-</div>
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/tpl/collectd-about-usage.tpl.php b/openQRM-5.3.50-CE/src/plugins/collectd/web/tpl/collectd-about-usage.tpl.php
deleted file mode 100644
index 102297f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/tpl/collectd-about-usage.tpl.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<hr>
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/collectd/web/tpl/collectd-statistics.tpl.php b/openQRM-5.3.50-CE/src/plugins/collectd/web/tpl/collectd-statistics.tpl.php
deleted file mode 100644
index e9dc875..0000000
--- a/openQRM-5.3.50-CE/src/plugins/collectd/web/tpl/collectd-statistics.tpl.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div id="collectd_statistics">
-<div id="form">
-<form action="{thisfile}" method="GET">
-	{form}
-	<div id="intervalbox">{interval}</div>
-	<div id="buttons">{submit}</div>
-	<div class="floatbreaker">&#160;</div>
-</form>
-</div>
-<div class="floatbreaker">&#160;</div>
-{download}
-<div id="links"><div class="linkswrapper">{links}</div></div>
-<div class="floatbreaker">&#160;</div>
-{images}
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/development/Makefile b/openQRM-5.3.50-CE/src/plugins/development/Makefile
deleted file mode 100644
index e8e506a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# this is the openQRM development-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/web/img
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/web/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && chmod 777 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/web
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/web/lang/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/web/css/
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/development
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/development/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/development/etc/init.d/openqrm-plugin-development b/openQRM-5.3.50-CE/src/plugins/development/etc/init.d/openqrm-plugin-development
deleted file mode 100644
index 875f63b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/etc/init.d/openqrm-plugin-development
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-# init script for the openQRM development-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/include/openqrm-plugin-development-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/etc/openqrm-plugin-development.conf
-openqrm_server_get_config
-export LANG=C
-# define wget to use with https
-if [ "$OPENQRM_WEB_PROTOCOL" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-
-function openqrm_plugin_development_start() {
-	echo "Starting the openQRM development-plugin"
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/development/.running
-}
-
-
-function openqrm_plugin_development_stop() {
-	echo "Stopping the openQRM development-plugin"
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/development/.running
-}
-
-function openqrm_plugin_development_uninstall() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "development: Please give a username to uninstall the plugin : "
-		read USERNAME
-		echo
-		echo -n "development: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Uninstalling the openQRM development-plugin"
-	openqrm_plugin_development_stop
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/development
-}
-
-function openqrm_plugin_development_init() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "development: Please give a username to init the plugin : "
-		read USERNAME
-		echo
-		echo -n "development: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-
-	echo "Initializing the openQRM development-plugin"
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/development/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/development
-
-}
-
-
-
-
-
-
-
-USER=$2
-PASS=$3
-
-case "$1" in
-	start)
-		openqrm_plugin_development_start
-		;;
-	stop)
-		openqrm_plugin_development_stop
-		;;
-	restart)
-		openqrm_plugin_development_stop
-		sleep 1
-		openqrm_plugin_development_start
-		;;
-	init)
-		openqrm_plugin_development_init $USER $PASS
-		;;
-	uninstall)
-		openqrm_plugin_development_uninstall $USER $PASS
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/development/etc/init.d/openqrm-plugin-development.postinstall b/openQRM-5.3.50-CE/src/plugins/development/etc/init.d/openqrm-plugin-development.postinstall
deleted file mode 100644
index c3a3525..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/etc/init.d/openqrm-plugin-development.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-documentation postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/development/etc/init.d/openqrm-plugin-development.preremove b/openQRM-5.3.50-CE/src/plugins/development/etc/init.d/openqrm-plugin-development.preremove
deleted file mode 100644
index 44712f7..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/etc/init.d/openqrm-plugin-development.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-development preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-development stop
diff --git a/openQRM-5.3.50-CE/src/plugins/development/etc/openqrm-plugin-development.conf b/openQRM-5.3.50-CE/src/plugins/development/etc/openqrm-plugin-development.conf
deleted file mode 100644
index b845044..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/etc/openqrm-plugin-development.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# this is the openQRM-plugin-development info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="Documentation for Plugin-Development."
-OPENQRM_PLUGIN_TYPE="misc"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES=""
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES=""
-# dirs which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_DIRS=""
-
diff --git a/openQRM-5.3.50-CE/src/plugins/development/include/openqrm-plugin-development-functions b/openQRM-5.3.50-CE/src/plugins/development/include/openqrm-plugin-development-functions
deleted file mode 100644
index afb9a5a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/include/openqrm-plugin-development-functions
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-# this is the functions file for the development-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-DEVELOPMENT_MANAGER_LOCK_FILE=/var/run/openqrm/development-plugin.lock
-DEVELOPMENT_MANAGER_LOCK_DELAY=5
-DEVELOPMENT_MANAGER_LOCK_RETRY=100
-DEVELOPMENT_MANAGER_LOCK_TIMEOUT=500
-################ common development functions
-
-# logs for development
-function development_manager_log() {
-	local COMPONENT=$1
-	shift
-	local MESSAGE=$@
-	logger -i -t "development plug-in" "$COMPONENT : $MESSAGE"
-}
-
-
-# locking function
-function development_manager_lock() {
-	local COMMAND=$1
-	local RET=1
-
-	if [ ! -d `dirname $DEVELOPMENT_MANAGER_LOCK_FILE` ]; then
-		mkdir -p `dirname $DEVELOPMENT_MANAGER_LOCK_FILE`
-	fi
-	case "$COMMAND" in
-		aquire)
-				lockfile -s $DEVELOPMENT_MANAGER_LOCK_DELAY -r $DEVELOPMENT_MANAGER_LOCK_RETRY -l $DEVELOPMENT_MANAGER_LOCK_TIMEOUT $DEVELOPMENT_MANAGER_LOCK_FILE
-				RET=$?
-				development_manager_log development_manager_lock "Aquired the lock"
-				return $RET
-				;;
-		release)
-				/bin/rm -f $DEVELOPMENT_MANAGER_LOCK_FILE
-				RET=$?
-				development_manager_log development_manager_lock "Released the lock"
-				return $RET
-				;;
-		*)
-			development_manager_log development_manager_lock "No such command. Try 'aquire' or 'release'"
-			return 1
-			;;
-	esac
-}
-
-
-
-################ development functions
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/class/development-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/development/web/class/development-about.controller.class.php
deleted file mode 100644
index e7c5af4..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/class/development-about.controller.class.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
- * Documentation Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class development_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'development_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'development_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'development_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'development_about_identifier';
-/**
-* path to developments
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About Development',
-		'label' => 'About Development',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The Development plugin provides developer informations like translation and rest api for base and plugins.',
-		'requirements_title' => 'Requirements',
-		'requirements_list' => 'none',
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Misc',
-	),
-);
-
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/development/lang", 'development-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/development/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About Documentation
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/development/class/development-about.documentation.class.php');
-			$controller = new development_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/class/development-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/development/web/class/development-about.documentation.class.php
deleted file mode 100644
index c474285..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/class/development-about.documentation.class.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * development-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class development_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'development_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "development_about_msg";
-/**
-* path to documentations
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-		$this->basedir    = $this->openqrm->get('basedir');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_documentation
-	 */
-	//--------------------------------------------
-	function action() {
-		$svn_co_command = "";
-		$t = $this->response->html->template($this->tpldir.'/development-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.api.class.php b/openQRM-5.3.50-CE/src/plugins/development/web/class/development.api.class.php
deleted file mode 100644
index c973cff..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.api.class.php
+++ /dev/null
@@ -1,376 +0,0 @@
-<?php
-/**
- * Development Api
- *
-	openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-	All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-	This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-	The latest version of this license can be found here: src/doc/LICENSE.txt
-
-	By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-				http://openqrm-enterprise.com
-
-	Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class development_api
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'development_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "development_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'development_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'development_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-
-		$this->openqrm    = $openqrm;
-		$this->controller = $controller;
-		$this->user       = $this->openqrm->user();
-		$this->rootdir    = $this->openqrm->get('basedir');
-		$this->tpldir     = $this->rootdir.'/plugins/development/tpl';
-		$this->response   = $response;
-		$this->file       = $this->openqrm->file();
-
-		$plugin = $this->response->html->request()->get('plugin_name');
-		$this->response->add('plugin_name', $plugin);
-		$base = $this->response->html->request()->get('base_name');
-		$this->response->add('base_name', $base);
-		$this->methods = array('api', 'action');
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$name = $this->response->html->request()->get('plugin_name');
-			$data['label'] = sprintf($this->lang['label_plugin'], $name);
-		}
-		else if ($this->response->html->request()->get('base_name') !== '') {
-			$name = $this->response->html->request()->get('base_name');
-			$data['label'] = sprintf($this->lang['label_base'], $name);
-		}
-		$data['canceled'] = $this->lang['canceled'];
-		$data['wait'] = $this->lang['please_wait'];
-		$data['prefix_tab'] = $this->prefix_tab;
-		$vars = array_merge(
-			$data, 
-			array(
-				'thisfile' => $this->response->html->thisfile,
-		));
-		$t = $this->response->html->template($this->tpldir.'/development-rest.tpl.php');
-		$t->add($vars);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-
-		return $this->edit($t);
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function edit($template) {
-
-		// cache output
-		ob_start();
-
-		require_once($this->openqrm->get('webdir').'/class/htmlobjects/htmlobject.response.class.php');
-		$response = new htmlobject_response($this->response->html, $this->response->id);
-		$response->html->debug();
-
-		require_once($this->openqrm->get('basedir').'/plugins/development/web/class/dummyuser.class.php');
-		$dummy = new dummyuser('xxx');
-
-		require_once($this->openqrm->get('basedir').'/web/base/class/openqrm.class.php');
-		$oq = new openqrm($this->file, $dummy, $response);
-
-
-
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$path = $this->rootdir.'/plugins/'.$this->response->html->request()->get('plugin_name').'/web/class/';
-		}
-		if($this->response->html->request()->get('base_name') !== '') {
-			if($this->response->html->request()->get('base_name') !== 'plugins') {
-				$path = $this->rootdir.'/web/base/server/'.$this->response->html->request()->get('base_name').'/class/';
-			}
-			elseif ($this->response->html->request()->get('base_name') === 'plugins') {
-				$path = $this->rootdir.'/web/base/plugins/aa_plugins/class/';
-			}
-		}
-
-		$files = $this->file->get_files($path);
-		$name = array();
-		$objs = array();
-		if(is_array($files)) {
-			foreach($files as $file) {
-				if(strripos($file['name'], 'controller') !== false && strripos($file['name'], 'about') === false) {
-					require_once($file['path']);
-					$class = str_replace('.class.php', '', $file['name']);
-					$class = str_replace('.', '_', $class);
-					$class = str_replace('-', '_', $class);
-					$class = new $class($oq, $response->response());
-					$objs[] = $class;
-					$name[] = str_replace('.controller.class.php','',  $file['name']);
-				}
-			}
-		}
-
-		$content = array();
-		$i = 0;
-		foreach($objs as $obj) {
-				$content[$i]['name'] = $name[$i];
-				$content[$i]['object'] = $obj;
-				$content[$i]['class'] = get_class($obj);
-				if(get_class_methods($obj)) {
-						$content[$i]['methods'] = get_class_methods($obj);
-				} else {
-						$content[$i]['methods'] = '';
-				}
-				$content[$i]['vars'] = get_class_vars(get_class($obj));
-				$i++;
-		}
-
-		$legend = '';
-		$doc = '';
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$plugin = 'plugin='.$this->response->html->request()->get('plugin_name');
-			$action = 'plugin';
-		}
-		else if($this->response->html->request()->get('base_name') !== '') {
-			$plugin = 'base='.$this->response->html->request()->get('base_name');
-			$action = 'base';
-		}
-		if(count($content) > 0) {
-			foreach($content as $con) {
-				foreach($con as $k => $v) {
-					if($k === 'name') {
-						$controller = 'controller='.$v;
-					}
-					if($k === 'methods') {
-						if(is_array($v)) {
-							$i = 0;
-							foreach($v as $value) {
-								$css = '';
-								if(stripos($value, 'api') !== false && $controller !== 'controller=development') {
-									$file = $con['name'].'.'.str_replace('_', '-', $value).'.class.php';
-									if($this->file->exists($path.$file)) {
-										$css = 'action';
-										if($i === 0) { $i++; $css = 'action first'; }
-										require_once($path.$file);
-										$class = str_replace('.class.php', '', $file);
-										$class = str_replace('.', '_', $class);
-										$class = str_replace('-', '_', $class);
-										$class = new $class($con['object']);
-										// check lang
-										if(isset($con['object']->lang[$value])) {
-											$class->lang = $con['object']->lang[$value];
-										} else {
-											$class->lang = $con['object']->lang;
-										}
-										
-										$t = $this->__template($path.$file);
-										$doc .= '<div class="link"><b>Link:</b> api.php?action='.$action.'&amp;'.$plugin.'&amp;'.$controller.'&amp;'.$con['vars']['actions_name'].'=...</div>';
-										$doc .= $t->get_string();
-									} else {
-										$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missing file <b>'.$file.'</b> for action '.$value.'</div>';
-									}
-								}
-								
-							}
-						}
-					}
-				}
-			}
-		} else {
-			$oop = false;
-			foreach($files as $file) {
-				if(strripos($file['name'], 'controller') !== false && strripos($file['name'], 'about') !== false) {
-					$oop = true;
-					$doc = '<div>Plugin '.$this->response->html->request()->get('plugin_name').' is about controller only</div>';
-					break;
-				}
-			}
-			if($oop === false) {
-				$doc = '<div>Plugin '.$this->response->html->request()->get('plugin_name').' is not OOP</div>';
-			}
-		}
-
-		if($doc === '') {
-			$doc = '<div>Plugin has no API</div>';
-		}
-
-		$template->add($doc, 'controllers');
-		$template->add($legend, 'legend');
-
-		// handle errors
-		$phpinfo = '';
-		if($this->response->html->request()->get('debug') !== '' ) {
-			if(isset($GLOBALS['error_controller']) && count($GLOBALS['error_controller']) > 0) {
-				$phpinfo .= implode('', $GLOBALS['error_controller']);
-			}
-			if(isset($GLOBALS['error_action']) && count($GLOBALS['error_action']) > 0) {
-				$phpinfo .= implode('', $GLOBALS['error_action']);
-			}
-			if(isset($GLOBALS['error_php']) && count($GLOBALS['error_php']) > 0) {
-				$phpinfo .= implode('', $GLOBALS['error_php']);
-			}
-			$messages = trim(ob_get_contents());
-			if($messages !== '') {
-				$phpinfo .= '<b>HTMLOBJECTS DEBUG:</b><br>'.$messages;
-			}
-		}
-
-		// end cache
-		ob_end_clean();
-
-		if($phpinfo !== '') {
-			$phpinfo = '<div class="phpinfobox">'.$phpinfo.'</div>';
-		} else {
-			$phpinfo = '&#160;';
-		}
-		$template->add($phpinfo, 'phpinfo');
-		$template = $this->controller->__get_navi($template, 'api');
-
-
-		// event cleanup, some methods creating events if constructed without parameters
-		$event = new event();
-		$event->remove_by_description('Could not create instance of');
-		return $template;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Classreader Template
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function __template($path) {
-
-		require_once($this->rootdir.'/plugins/development/web/class/docblock.class.php');
-		$reader = new docblock($path);
-
-		$template = $this->response->html->template($this->rootdir.'/plugins/development/web/tpl/docblock.tpl.php');
-
-		$ar = $reader->get();
-		$out = array();
-		$out['class'] = $ar['classname'];
-		foreach($ar as $key => $value) {
-		
-			if($value !== '') {
-				$out[$key] = '<b>'.$key.':</b> '.$value;
-			} else {
-				$out[$key] = '';
-			}
-			if($key === 'docblock') {
-				$out['docblock'] = implode('<br>', $ar['docblock']);
-			}
-			if($key === 'attribs') {
-				if(is_array($ar['attribs'])) {
-					$out['attribs']    = '';
-					$out['attribs-ul'] = '<ul>';
-					foreach($ar['attribs'] as $k => $attrib) {
-						$out['attribs'] .= '<a name="'.$ar['classname'].'-attrib-'.$k.'" href="#'.$ar['classname'].'">top</a>';
-						$out['attribs'] .= '<div><b>attribute:</b> '. $k;
-						$out['attribs'] .= '<br>';
-						$out['attribs'] .= '<b>access:</b> '. $attrib['access'].'<br>';
-						$out['attribs'] .= '<b>default:</b><div class="indent"><pre>'. $attrib['default'].'</pre></div><br>';
-						$out['attribs'] .= '<pre>'.implode("\n", $attrib['docblock']).'</pre></div>';
-
-						$out['attribs-ul'] .= '<li><a href="#'.$ar['classname'].'-attrib-'.trim($k).'">'.$k.'</a></li>';
-					}
-					$out['attribs-ul'] .= '</ul>';
-				} else {
-					$out['attribs']    = '';
-					$out['attribs-ul'] = '';
-				}
-			}
-			if($key === 'methods') {
-				if(is_array($ar['methods'])) {
-					$out['methods'] = '';
-					$out['methods-ul'] = '<ul>';
-					foreach($ar['methods'] as $k => $attrib) {
-						$out['methods'] .= '<a name="'.$ar['classname'].'-method-'.$k.'" href="#'.$ar['classname'].'">top</a>';
-						$out['methods'] .= '<div><b>function:</b> '. $k;
-						$out['methods'] .= '<br>';
-						if($attrib['params'] !== '') {
-							$out['methods'] .= '<b>params:</b><div class="indent"><pre>';
-							$out['methods'] .= str_replace(array(', ',','), "\n", $attrib['params']);
-							$out['methods'] .= '</pre></div><br>';
-						} else {
-							$out['methods'] .= '<br>';
-						}
-						$out['methods'] .= '<pre>'.implode("\n", $attrib['docblock']).'</pre></div>';
-
-						$out['methods-ul'] .= '<li><a href="#'.$ar['classname'].'-method-'.trim($k).'">'.$k.'</a></li>';
-					}
-					$out['methods-ul'] .= '</ul>';
-				} else {
-					$out['methods']    = '';
-					$out['methods-ul'] = '';
-				}
-			}	
-
-		}
-		$template->add($out);
-		return $template;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.controller.class.php b/openQRM-5.3.50-CE/src/plugins/development/web/class/development.controller.class.php
deleted file mode 100644
index 61230f3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.controller.class.php
+++ /dev/null
@@ -1,725 +0,0 @@
-<?php
-/**
- * development Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-function myErrorHandler($code, $txt, $file, $line, $context)
-{
-	$text = $file." [".$line."] ".$txt ."\n";
-	switch ($code) {
-	case E_PARSE:
-		echo '<b>E_PARSE:</b> '.$text;
-		break;
-	case E_ERROR:
-		echo '<b>E_ERROR:</b> '.$text;
-		break;
-	case E_DEPRECATED:
-		$GLOBALS['error_php'][] = '<div><b>E_DEPRECATED:</b> '.$text.'</div>';
-		break;
-	case E_STRICT:
-		$GLOBALS['error_php'][] = '<div><b>E_STRICT:</b> '.$text.'</div>';
-		break;
-	case E_WARNING:
-		$GLOBALS['error_php'][] = '<div><b>E_WARNING:</b> '.$text.'</div>';
-		break;
-	case E_NOTICE:
-		$GLOBALS['error_php'][] = '<div><b>E_NOTICE:</b> '.$text.'</div>';
-		break;
-	default:
-		$GLOBALS['error_php'][] = '<div><b>'.$code.':</b> '.$text.'</div>';
-		break;
-	}
-	/* Don't execute PHP internal error handler */
-	return true;
-}
-
-
-
-class development_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'development_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "development_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'development_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'development_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array(
-		'tab' => 'Development',
-		'label' => 'Development',
-		'id' => 'Name',
-		'action_docblock' => 'docblock',
-		'action_rest' => 'rest',
-		'action_lang' => 'lang',
-		'action_template' => 'templates',
-		'action_api' => 'api',
-		'action_hooks' => 'hooks',
-		'action_js' => 'js',
-		'action_css' => 'css',
-		'please_wait' => 'Loading. Please wait ..',
-	),
-	'rest' => array(
-		'tab' => 'Rest',
-		'label_plugin' => 'View Plugin %s Rest',
-		'label_base' => 'View %s Rest',
-		'param_must_be_set_within_action' => 'must be set within action',
-		'param_optional' => 'optional',
-		'param_form_field' => 'form field',
-		'param_required' => 'required form field',
-		'param_validator' => 'validator',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..'
-	),
-	'api' => array(
-		'tab' => 'Api',
-		'label_plugin' => 'View Plugin %s Api',
-		'label_base' => 'View %s Api',
-		'param_must_be_set_within_action' => 'must be set within action',
-		'param_optional' => 'optional',
-		'param_form_field' => 'form field',
-		'param_required' => 'required form field',
-		'param_validator' => 'validator',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..'
-	),
-	'template' => array(
-		'tab' => 'Template',
-		'label_plugin' => 'View Plugin %s Templates',
-		'label_base' => 'View %s Templates',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..'
-	),
-	'lang' => array(
-		'tab' => 'Translation',
-		'label_plugin' => 'View Plugin %s Translation',
-		'label_base' => 'View %s Translation',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..'
-	),
-	'docblock' => array(
-		'tab' => 'Docblock',
-		'label_plugin' => 'View Plugin %s Docblock',
-		'label_base' => 'View %s Docblock',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..'
-	),
-	'hooks' => array(
-		'tab' => 'Hooks',
-		'label_plugin' => 'View Plugin %s Hooks',
-		'label_base' => 'View %s Hooks',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-		'appliance-hook' => 'The appliance-hook allows plugins to run custom action during start, stop and update of a server.',
-		'appliance-edit-hook' => 'The appliance-edit hook provides plugins the capability to add an action item in the server edit section.',
-		'appliance-link-hook' => 'The appliance-edit hook provides plugins the capability to add an action item in the server overview section.',
-		'billing-hook' => 'The billing-hook allows to plugin custom external billing systems for the Cloud deployments.',
-		'cloud-hook' => 'The cloud-hook let the virtualization plugins define the way how specific VMs are created and removed.',
-		'dashboard-quicklink-hook' => 'The dashboard-quicklink-hook provides an option for plugins to add a icon and URL to the Quicklink setion on the openQRM dashboard.',
-		'deployment-auth-hook/auth-hook' => 'The deployment-auth-hook provides the storage plugins which is responsible for the specific image deployment types of the server image to run custom action on the storage object to authenticate/de-authenticate the image volume.',
-		'deployment-cloud-hook' => 'The deployment-cloud-hook let the storage plugins define a the way how the image volumes are created/removed/resized/privatized for the automated Cloud deployment.',
-		'event-hook' => 'The event-hook is triggered when a specific event arrives in openQRM and allows plugins to run custom actions.',
-		'external-dns-hook' => 'The external-dns-hook provides a way to interact with remote DNS services.',
-		'ha-cmd-hook' => 'The ha-cmd-hook let the virtualization plugins define the way how specific VMs are created and fenced in case of a highavailability fail-over.',
-		'monitor-hook' => 'The monitor-hook provides an option for plugins to run frequent repeated commands e.g. for status updates.',
-		'remote-console-hook' => 'The remote-console-hook allows plugins to embed a remote console for specific Virtualization technologies.',
-		'resource-hook' => 'The resource-hook allows plugins to run custom action during start, stop and restart of a server.',
-		'resource-fence-hook' => 'The resource-fence-hook defines how resources are fenced (STONITH) during highavailability fail-over.',
-		'resource-virtual-command-hook' => 'The resource-virtual-command-hook let the virtualization plugins define the way how specific VMs and Hosts are started and stopped through the Virtualization Host API.',
-		'role-hook' => 'The role-hook provides plugins the capability to define custom role-based permissions for every action in openQRM.',
-	),
-	'js' => array(
-		'tab' => 'JS',
-		'label_plugin' => 'View Plugin %s JS',
-		'label_base' => 'View %s JS',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..'
-	),
-	'css' => array(
-		'tab' => 'CSS',
-		'label_plugin' => 'View Plugin %s CSS',
-		'label_base' => 'View %s CSS',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..'
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/development/lang", 'development.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/development/tpl';
-		if($this->response->html->request()->get('debug') !== '' ) {
-			$this->response->add('debug', $this->response->html->request()->get('debug'));
-		}
-		$alter_error_handler = set_error_handler("myErrorHandler");
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = 'select';
-		}
-
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			default:
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'rest':
-				$content[] = $this->select(false);
-				$content[] = $this->rest(true);
-			break;
-			case 'api':
-				$content[] = $this->select(false);
-				$content[] = $this->api(true);
-			break;
-			case 'docblock':
-				$content[] = $this->select(false);
-				$content[] = $this->docblock(true);
-			break;
-			case 'lang':
-				$content[] = $this->select(false);
-				$content[] = $this->lang(true);
-			break;
-			case 'template':
-				$content[] = $this->select(false);
-				$content[] = $this->template(true);
-			break;
-			case 'hooks':
-				$content[] = $this->select(false);
-				$content[] = $this->hooks(true);
-			break;
-			case 'js':
-				$content[] = $this->select(false);
-				$content[] = $this->js(true);
-			break;
-			case 'css':
-				$content[] = $this->select(false);
-				$content[] = $this->css(true);
-			break;
-			case 'download':
-				$this->__download();
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/development/class/development.select.class.php');
-			$controller = new development_select($this->openqrm, $this->response);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Rest
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function rest( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/development/class/development.rest.class.php');
-			$controller = new development_rest($this->openqrm, $this->response, $this);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['rest'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['rest']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'rest' );
-		$content['onclick'] = false;
-		if($this->action === 'rest'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function api( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/development/class/development.api.class.php');
-			$controller = new development_api($this->openqrm, $this->response, $this);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['api'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['api']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'api' );
-		$content['onclick'] = false;
-		if($this->action === 'api'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Template
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function template( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/development/class/development.template.class.php');
-			$controller = new development_template($this->openqrm, $this->response, $this);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['template'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['template']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'template' );
-		$content['onclick'] = false;
-		if($this->action === 'template'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Lang
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function lang( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/development/class/development.lang.class.php');
-			$controller = new development_lang($this->openqrm, $this->response, $this);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['lang'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['lang']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'lang' );
-		$content['onclick'] = false;
-		if($this->action === 'lang'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Docblock
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function docblock( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/development/class/development.docblock.class.php');
-			$controller = new development_docblock($this->openqrm, $this->response, $this);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['docblock'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['docblock']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'docblock' );
-		$content['onclick'] = false;
-		if($this->action === 'docblock'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Hooks
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function hooks( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/development/class/development.hooks.class.php');
-			$controller = new development_hooks($this->openqrm, $this->response, $this);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['hooks'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['hooks']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'hooks' );
-		$content['onclick'] = false;
-		if($this->action === 'hooks'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * JS
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function js( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/development/class/development.js.class.php');
-			$controller = new development_js($this->openqrm, $this->response, $this);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['js'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['js']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'js' );
-		$content['onclick'] = false;
-		if($this->action === 'js'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * CSS
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function css( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/development/class/development.css.class.php');
-			$controller = new development_css($this->openqrm, $this->response, $this);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['css'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['css']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'css' );
-		$content['onclick'] = false;
-		if($this->action === 'css'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Download File
-	 *
-	 * @access public
-	 * @param string $target
-	 * @param string $mime
-	 */
-	//--------------------------------------------
-	function __download() {
-		$file = $this->response->html->request()->get('file');
-		$file = str_replace('../', '', $file);
-
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$dir  = $this->response->html->request()->get('plugin_name');
-			$path = $this->openqrm->get('basedir').'/plugins/'.$dir.'/web/'.$file;
-			$mime = $this->response->html->request()->get('mime');
-		}
-		else if($this->response->html->request()->get('base_name') !== '') {
-			if($this->response->html->request()->get('base_name') !== 'plugins') {
-				$dir  = $this->response->html->request()->get('base_name');
-				$path = $this->openqrm->get('basedir').'/web/base/server/'.$dir.'/'.$file;
-				$mime = $this->response->html->request()->get('mime');
-			}
-			elseif ($this->response->html->request()->get('base_name') === 'plugins') {
-				$dir  = 'aa_plugins';
-				$path = $this->openqrm->get('basedir').'/web/base/plugins/aa_plugins/'.$file;
-				$mime = $this->response->html->request()->get('mime');
-			}
-		}
-
-		if (!headers_sent()) {
-			$filename = str_replace(' ', '_', $file);
-			ini_set('zlib.output_compression','Off');
-			header("Pragma: public");
-			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-			header("Cache-Control: must-revalidate");
-			header("Content-type: ".$mime."");
-			header("Content-Length: ".filesize($path));
-			header("Content-disposition: inline; filename=$filename");
-			header("Accept-Ranges: ".filesize($path)); 
-			readfile($path);
-			exit();
-		} else {
-			echo $path;
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Previous and next
-	 *
-	 * @access private
-	 * @param object $template
-	 * @param string $mode
-	 * @return object
-	 */
-	//--------------------------------------------
-	function __get_navi($template, $mode) {
-		$response = $this->response;
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$plugin = new plugin();
-			$plugins = $plugin->available();
-			$key = array_keys($plugins, $this->response->html->request()->get('plugin_name'));
-			$key = $key[0];
-			$param = 'plugin_name';
-		}
-		if($this->response->html->request()->get('base_name') !== '') {
-			$plugins = array('aa_server', 'appliance', 'event', 'image','kernel', 'plugins', 'resource','storage');
-			$key = array_keys($plugins, $this->response->html->request()->get('base_name'));
-			$key = $key[0];
-			$param = 'base_name';
-		}
-		$prev = '&#160';
-		$next = '&#160';
-		if($key === 0) {
-			$next = $response->html->a();
-			$next->label = $plugins[1].' &gt;&gt;';
-			$next->href = $this->response->get_url($this->actions_name, $mode ).'&'.$param.'='.$plugins[1];
-			$next->handler = 'onclick="wait();"';
-		}		
-		else if($key !== 0 && $key < count($plugins)-1) {
-			$prev = $response->html->a();
-			$prev->label = '&lt;&lt; '.$plugins[$key-1];
-			$prev->href = $this->response->get_url($this->actions_name, $mode ).'&'.$param.'='.$plugins[$key-1];
-			$prev->handler = 'onclick="wait();"';
-			$next = $response->html->a();
-			$next->label = $plugins[$key+1].' &gt;&gt;';
-			$next->href = $this->response->get_url($this->actions_name, $mode ).'&'.$param.'='.$plugins[$key+1];
-			$next->handler = 'onclick="wait();"';
-		}
-		else if($key === count($plugins)-1) {
-			$prev = $response->html->a();
-			$prev->label =  '&lt;&lt; '.$plugins[$key-1];
-			$prev->href = $this->response->get_url($this->actions_name, $mode ).'&'.$param.'='.$plugins[$key-1];
-			$prev->style = "text-decoration: none;";
-			$prev->handler = 'onclick="wait();"';
-		}
-		$switch = '';
-		if($mode !== 'docblock') {
-			$a = $response->html->a();
-			$a->label = 'docblock';
-			$a->href = $this->response->get_url($this->actions_name, 'docblock' );
-			$a->handler = 'onclick="wait();"';
-			$switch .= $a->get_string();
-		}
-		if($mode !== 'lang') {
-			$a = $response->html->a();
-			$a->label = 'lang';
-			$a->href = $this->response->get_url($this->actions_name, 'lang' );
-			$a->handler = 'onclick="wait();"';
-			$switch .= $a->get_string();
-		}	
-		if($mode !== 'rest') {
-			$a = $response->html->a();
-			$a->label = 'rest';
-			$a->href = $this->response->get_url($this->actions_name, 'rest' );
-			$a->handler = 'onclick="wait();"';
-			$switch .= $a->get_string();
-		}
-		if($mode !== 'api') {
-			$a = $response->html->a();
-			$a->label = 'api';
-			$a->href = $this->response->get_url($this->actions_name, 'api' );
-			$a->handler = 'onclick="wait();"';
-			$switch .= $a->get_string();
-		}
-		if($mode !== 'template') {
-			$a = $response->html->a();
-			$a->label = 'templates';
-			$a->href = $this->response->get_url($this->actions_name, 'template' );
-			$a->handler = 'onclick="wait();"';
-			$switch .= $a->get_string();
-		}
-		if($mode !== 'hooks') {
-			$a = $response->html->a();
-			$a->label = 'hooks';
-			$a->href = $this->response->get_url($this->actions_name, 'hooks' );
-			$a->handler = 'onclick="wait();"';
-			$switch .= $a->get_string();
-		}
-		if($mode !== 'js') {
-			$a = $response->html->a();
-			$a->label = 'js';
-			$a->href = $this->response->get_url($this->actions_name, 'js' );
-			$a->handler = 'onclick="wait();"';
-			$switch .= $a->get_string();
-		}
-		if($mode !== 'css') {
-			$a = $response->html->a();
-			$a->label = 'css';
-			$a->href = $this->response->get_url($this->actions_name, 'css' );
-			$a->handler = 'onclick="wait();"';
-			$switch .= $a->get_string();
-		}
-
-		$template->add($switch, 'switch');
-		$template->add($prev, 'previous');
-		$template->add($next, 'next');
-		return $template;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.css.class.php b/openQRM-5.3.50-CE/src/plugins/development/web/class/development.css.class.php
deleted file mode 100644
index be16059..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.css.class.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/**
- * Development CSS
- *
-	openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-	All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-	This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-	The latest version of this license can be found here: src/doc/LICENSE.txt
-
-	By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-				http://openqrm-enterprise.com
-
-	Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class development_css
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'development_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "development_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'development_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'development_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-
-		$this->openqrm  = $openqrm;
-		$this->controller = $controller;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('basedir');
-		$this->tpldir   = $this->rootdir.'/plugins/development/tpl';
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-
-		$plugin = $this->response->html->request()->get('plugin_name');
-		$this->response->add('plugin_name', $plugin);
-		$base = $this->response->html->request()->get('base_name');
-		$this->response->add('base_name', $base);
-		$this->methods = array('api', 'action');
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$name = $this->response->html->request()->get('plugin_name');
-			$data['label'] = sprintf($this->lang['label_plugin'], $name);
-		}
-		else if ($this->response->html->request()->get('base_name') !== '') {
-			$name = $this->response->html->request()->get('base_name');
-			$data['label'] = sprintf($this->lang['label_base'], $name);
-		}
-		$vars = array_merge(
-			$data, 
-			array(
-				'thisfile' => $this->response->html->thisfile,
-		));
-		$t = $this->response->html->template($this->tpldir.'/development-css.tpl.php');
-		$t->add($vars);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-
-		return $this->edit($t);
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function edit($template) {
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$path = $this->rootdir.'/plugins/'.$this->response->html->request()->get('plugin_name').'/web/css/';
-		}
-		if($this->response->html->request()->get('base_name') !== '') {
-			if($this->response->html->request()->get('base_name') !== 'plugins') {
-				$path = $this->rootdir.'/web/base/server/'.$this->response->html->request()->get('base_name').'/css/';
-			}
-			elseif ($this->response->html->request()->get('base_name') === 'plugins') {
-				$path = $this->rootdir.'/web/base/plugins/aa_plugins/css/';
-			}
-		}
-
-		$files = $this->file->get_files($path, '', '*.css');
-		$names = array();
-		if(is_array($files)) {
-			foreach($files as $file) {
-				if(strripos($file['name'], '.css') !== false) {
-					$names[] = $file['path'];
-				}
-			}
-			$links = '';
-			foreach($names as $path) {
-				$links .= '<h3>'.basename($path).'</h3>';
-				$links .= '<pre>'.$this->file->get_contents($path).'</pre>';
-			}
-			if($links === '') {
-				$links = '<div>Plugin has no css</div>';
-			}
-			$template->add($links, 'links');
-		} 
-		$template = $this->controller->__get_navi($template, 'css');
-		return $template;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.docblock.class.php b/openQRM-5.3.50-CE/src/plugins/development/web/class/development.docblock.class.php
deleted file mode 100644
index eafd846..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.docblock.class.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-/**
- * Development Docblock
- *
-	openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-	All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-	This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-	The latest version of this license can be found here: src/doc/LICENSE.txt
-
-	By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-				http://openqrm-enterprise.com
-
-	Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class development_docblock
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'development_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "development_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'development_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'development_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-
-		$this->openqrm  = $openqrm;
-		$this->controller = $controller;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('basedir');
-		$this->tpldir   = $this->rootdir.'/plugins/development/tpl';
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-
-		$plugin = $this->response->html->request()->get('plugin_name');
-		$this->response->add('plugin_name', $plugin);
-		$base = $this->response->html->request()->get('base_name');
-		$this->response->add('base_name', $base);
-		$this->methods = array('api', 'action');
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$name = $this->response->html->request()->get('plugin_name');
-			$data['label'] = sprintf($this->lang['label_plugin'], $name);
-		}
-		else if ($this->response->html->request()->get('base_name') !== '') {
-			$name = $this->response->html->request()->get('base_name');
-			$data['label'] = sprintf($this->lang['label_base'], $name);
-		}
-		$vars = array_merge(
-			$data, 
-			array(
-				'thisfile' => $this->response->html->thisfile,
-		));
-		$t = $this->response->html->template($this->tpldir.'/development-docblock.tpl.php');
-		$t->add($vars);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-
-		return $this->edit($t);
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function edit($template) {
-
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$path = $this->rootdir.'/plugins/'.$this->response->html->request()->get('plugin_name').'/web/class/';
-		}
-		if($this->response->html->request()->get('base_name') !== '') {
-			if($this->response->html->request()->get('base_name') !== 'plugins') {
-				$path = $this->rootdir.'/web/base/server/'.$this->response->html->request()->get('base_name').'/class/';
-			}
-			elseif ($this->response->html->request()->get('base_name') === 'plugins') {
-				$path = $this->rootdir.'/web/base/plugins/aa_plugins/class/';
-			}
-		}
-
-		$files = $this->file->get_files($path);
-		$names = array();
-		if(is_array($files)) {
-			foreach($files as $file) {
-				if(strripos($file['name'], 'controller') !== false && strripos($file['name'], 'about') === false) {
-					$names[] = $file['path'];
-				}
-			}
-			$string = '';
-			$links  = '<a name="topofpage" style="line-height:0px;font-size: 0px;">&#160;</a>';
-			$i = 0;
-			foreach($names as $path) {
-				$class = basename($path);
-				$class = str_replace('.class.php', '', $class);
-				$class = str_replace('.', '_', $class);
-				$class = str_replace('-', '_', $class);
-
-				$a = $this->response->html->a();
-				$a->label = $class;
-				$a->href = "#".$class;
-				$a->style = "text-decoration: none;";
-				$links .= '<li>'.$a->get_string().'</li>';
-
-				if($i !== 0) {
-					$a = $this->response->html->a();
-					$a->label = 'top';
-					$a->href = "#topofpage";
-					$a->css = "toplink";
-					$string .= $a->get_string();
-				}
-
-				$t = $this->__template($path);
-				$string .= $t->get_string();
-
-				$i++;
-			}
-			$template->add($links, 'links');
-			$template->add($string, 'controllers');
-		} 
-		$template = $this->controller->__get_navi($template, 'docblock');
-		return $template;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Get Classreader Template
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function __template($path) {
-
-		require_once($this->rootdir.'/plugins/development/web/class/docblock.class.php');
-		$reader = new docblock($path);
-
-		$template = $this->response->html->template($this->rootdir.'/plugins/development/web/tpl/docblock.tpl.php');
-
-		$ar = $reader->get();
-		$out = array();
-		$out['class'] = $ar['classname'];
-		foreach($ar as $key => $value) {
-		
-			if($value !== '') {
-				$out[$key] = '<b>'.$key.':</b> '.$value;
-			} else {
-				$out[$key] = '';
-			}
-			if($key === 'docblock') {
-				$out['docblock'] = implode('<br>', $ar['docblock']);
-			}
-			if($key === 'attribs') {
-				if(is_array($ar['attribs'])) {
-					$out['attribs']    = '';
-					$out['attribs-ul'] = '<ul>';
-					foreach($ar['attribs'] as $k => $attrib) {
-						$out['attribs'] .= '<a name="'.$ar['classname'].'-attrib-'.$k.'" href="#'.$ar['classname'].'">top</a>';
-						$out['attribs'] .= '<div><b>attribute:</b> '. $k;
-						$out['attribs'] .= '<br>';
-						$out['attribs'] .= '<b>access:</b> '. $attrib['access'].'<br>';
-						$out['attribs'] .= '<b>default:</b><div class="indent"><pre>'. $attrib['default'].'</pre></div><br>';
-						$out['attribs'] .= '<pre>'.implode("\n", $attrib['docblock']).'</pre></div>';
-
-						$out['attribs-ul'] .= '<li><a href="#'.$ar['classname'].'-attrib-'.trim($k).'">'.$k.'</a></li>';
-					}
-					$out['attribs-ul'] .= '</ul>';
-				} else {
-					$out['attribs']    = '';
-					$out['attribs-ul'] = '';
-				}
-			}
-			if($key === 'methods') {
-				if(is_array($ar['methods'])) {
-					$out['methods'] = '';
-					$out['methods-ul'] = '<ul>';
-					foreach($ar['methods'] as $k => $attrib) {
-						$out['methods'] .= '<a name="'.$ar['classname'].'-method-'.$k.'" href="#'.$ar['classname'].'">top</a>';
-						$out['methods'] .= '<div><b>function:</b> '. $k;
-						$out['methods'] .= '<br>';
-						if($attrib['params'] !== '') {
-							$out['methods'] .= '<b>params:</b><div class="indent"><pre>';
-							$out['methods'] .= str_replace(array(', ',','), "\n", $attrib['params']);
-							$out['methods'] .= '</pre></div><br>';
-						} else {
-							$out['methods'] .= '<br>';
-						}
-						$out['methods'] .= '<pre>'.implode("\n", $attrib['docblock']).'</pre></div>';
-
-						$out['methods-ul'] .= '<li><a href="#'.$ar['classname'].'-method-'.trim($k).'">'.$k.'</a></li>';
-					}
-					$out['methods-ul'] .= '</ul>';
-				} else {
-					$out['methods']    = '';
-					$out['methods-ul'] = '';
-				}
-			}	
-
-		}
-		$template->add($out);
-		return $template;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.hooks.class.php b/openQRM-5.3.50-CE/src/plugins/development/web/class/development.hooks.class.php
deleted file mode 100644
index e80ab23..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.hooks.class.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/**
- * Development Hooks
- *
-	openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-	All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-	This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-	The latest version of this license can be found here: src/doc/LICENSE.txt
-
-	By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-				http://openqrm-enterprise.com
-
-	Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class development_hooks
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'development_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "development_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'development_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'development_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-
-		$this->openqrm  = $openqrm;
-		$this->controller = $controller;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('basedir');
-		$this->tpldir   = $this->rootdir.'/plugins/development/tpl';
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-
-		$plugin = $this->response->html->request()->get('plugin_name');
-		$this->response->add('plugin_name', $plugin);
-		$base = $this->response->html->request()->get('base_name');
-		$this->response->add('base_name', $base);
-		$this->methods = array('api', 'action');
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$name = $this->response->html->request()->get('plugin_name');
-			$data['label'] = sprintf($this->lang['label_plugin'], $name);
-		}
-		else if ($this->response->html->request()->get('base_name') !== '') {
-			$name = $this->response->html->request()->get('base_name');
-			$data['label'] = sprintf($this->lang['label_base'], $name);
-		}
-		$vars = array_merge(
-			$data, 
-			array(
-				'thisfile' => $this->response->html->thisfile,
-		));
-		$t = $this->response->html->template($this->tpldir.'/development-hooks.tpl.php');
-		$t->add($vars);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-
-		return $this->edit($t);
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function edit($template) {
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$plugin_name = $this->response->html->request()->get('plugin_name');
-			$path = $this->rootdir.'/plugins/'.$plugin_name.'/web/';
-		}
-		if($this->response->html->request()->get('base_name') !== '') {
-			$plugin_name = $this->response->html->request()->get('base_name');
-			if($plugin_name !== 'plugins') {
-				$path = $this->rootdir.'/web/base/server/'.$plugin_name;
-			}
-			elseif ($plugin_name === 'plugins') {
-				$path = $this->rootdir.'/web/base/plugins/aa_plugins/';
-			}
-		}
-
-		$files = $this->file->get_files($path);
-		$names = array();
-		if(is_array($files)) {
-			foreach($files as $file) {
-				if(strripos($file['name'], 'hook') !== false) {
-					$names[] = $file['path'];
-				}
-			}
-			$i = 0;
-			$available = array();
-			if(count($names) > 0) {
-				$table = $this->response->html->table();
-				$table->css = 'hooktable';
-				foreach($names as $path) {
-					$a = $this->response->html->a();
-					$a->label = 'download';
-					$a->href = $this->response->get_url($this->actions_name, 'download').'&file='.basename($path).'&mime=text/plain';
-					$a->style = "text-decoration: none;";
-					$a->target = '_blank';
-
-					$tr = $this->response->html->tr();
-
-					$plugin_name = str_replace('-storage', '', $plugin_name);
-					$name = basename($path);
-					$name = preg_replace('~(openqrm-'.$plugin_name.'-)(.*?)(.php)~is', '$1<b>$2</b>$3', $name);
-					$available[] = preg_replace('~(openqrm-'.$plugin_name.'-<b>)(.*?)(</b>.php)~is', '$2', $name);
-					$td = $this->response->html->td();
-					$td->add($name);
-					$tr->add($td);
-
-					$td = $this->response->html->td();
-					$td->add($a);
-					$tr->add($td);
-
-					$table->add($tr);
-					$i++;
-				}
-			}
-			if(!isset($table)) {
-				$table = '<div>Plugin has no hooks</div>';
-			}
-			$template->add($table, 'table');
-			// Legend
-			$hidden = array('tab','label_plugin','label_base','please_wait','canceled');
-			asort($this->lang);
-			$legend = '';
-			foreach($this->lang as $k => $v) {
-				if(!in_array($k, $hidden)) {
-					$css = '';
-					if(in_array($k, $available)) { $css = 'class="available"'; }
-					$legend .= '<div '.$css.'>';
-					$legend .= '<h4 '.$css.'>'.$k.'</h4>';
-					$legend .= '<div class="hookexplain">'.$v.'</div>';
-					$legend .= '</div>';
-				}
-			}
-			$template->add($legend, 'legend');
-
-		} 
-		$template = $this->controller->__get_navi($template, 'hooks');
-		return $template;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.js.class.php b/openQRM-5.3.50-CE/src/plugins/development/web/class/development.js.class.php
deleted file mode 100644
index 31d12a6..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.js.class.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/**
- * Development Hooks
- *
-	openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-	All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-	This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-	The latest version of this license can be found here: src/doc/LICENSE.txt
-
-	By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-				http://openqrm-enterprise.com
-
-	Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class development_js
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'development_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "development_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'development_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'development_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-
-		$this->openqrm  = $openqrm;
-		$this->controller = $controller;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('basedir');
-		$this->tpldir   = $this->rootdir.'/plugins/development/tpl';
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-
-		$plugin = $this->response->html->request()->get('plugin_name');
-		$this->response->add('plugin_name', $plugin);
-		$base = $this->response->html->request()->get('base_name');
-		$this->response->add('base_name', $base);
-		$this->methods = array('api', 'action');
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$name = $this->response->html->request()->get('plugin_name');
-			$data['label'] = sprintf($this->lang['label_plugin'], $name);
-		}
-		else if ($this->response->html->request()->get('base_name') !== '') {
-			$name = $this->response->html->request()->get('base_name');
-			$data['label'] = sprintf($this->lang['label_base'], $name);
-		}
-		$vars = array_merge(
-			$data, 
-			array(
-				'thisfile' => $this->response->html->thisfile,
-		));
-		$t = $this->response->html->template($this->tpldir.'/development-js.tpl.php');
-		$t->add($vars);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-
-		return $this->edit($t);
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function edit($template) {
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$path = $this->rootdir.'/plugins/'.$this->response->html->request()->get('plugin_name').'/web/js/';
-		}
-		if($this->response->html->request()->get('base_name') !== '') {
-			if($this->response->html->request()->get('base_name') !== 'plugins') {
-				$path = $this->rootdir.'/web/base/server/'.$this->response->html->request()->get('base_name').'/js/';
-			}
-			elseif ($this->response->html->request()->get('base_name') === 'plugins') {
-				$path = $this->rootdir.'/web/base/plugins/aa_plugins/js/';
-			}
-		}
-
-		$files = $this->file->get_files($path, '', '*.js');
-		$names = array();
-		if(is_array($files)) {
-			foreach($files as $file) {
-				if(strripos($file['name'], '.js') !== false) {
-					$names[] = $file['path'];
-				}
-			}
-			$links = '';
-			foreach($names as $path) {
-				$links .= '<h3>'.basename($path).'</h3>';
-				$links .= '<pre>'.$this->file->get_contents($path).'</pre>';
-			}
-			if($links === '') {
-				$links = '<div>Plugin has no js</div>';
-			}
-			$template->add($links, 'links');
-		} 
-		$template = $this->controller->__get_navi($template, 'js');
-		return $template;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.lang.class.php b/openQRM-5.3.50-CE/src/plugins/development/web/class/development.lang.class.php
deleted file mode 100644
index df2eea5..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.lang.class.php
+++ /dev/null
@@ -1,338 +0,0 @@
-<?php
-/**
- * Development Lang
- *
-	openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-	All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-	This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-	The latest version of this license can be found here: src/doc/LICENSE.txt
-
-	By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-				http://openqrm-enterprise.com
-
-	Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class development_lang
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'development_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "development_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'development_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'development_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-		$this->openqrm  = $openqrm;
-		$this->controller = $controller;
-		$this->user  = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('basedir');
-		$this->tpldir   = $this->rootdir.'/plugins/development/tpl';
-		$this->response = $response;
-		$this->file  = $this->openqrm->file();
-
-		$plugin = $this->response->html->request()->get('plugin_name');
-		$this->response->add('plugin_name', $plugin);
-		$base = $this->response->html->request()->get('base_name');
-		$this->response->add('base_name', $base);
-		$this->methods = array('api', 'action');
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$name = $this->response->html->request()->get('plugin_name');
-			$data['label'] = sprintf($this->lang['label_plugin'], $name);
-		}
-		else if ($this->response->html->request()->get('base_name') !== '') {
-			$name = $this->response->html->request()->get('base_name');
-			$data['label'] = sprintf($this->lang['label_base'], $name);
-		}
-		$vars = array_merge(
-			$data, 
-			array(
-				'thisfile' => $this->response->html->thisfile,
-		));
-		$t = $this->response->html->template($this->tpldir.'/development-lang.tpl.php');
-		$t->add($vars);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-
-		return $this->edit($t);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function edit($template) {
-
-		require_once($this->openqrm->get('webdir').'/class/htmlobjects/htmlobject.response.class.php');
-		$response = new htmlobject_response($this->response->html, $this->response->id);
-		$response->html->debug();
-
-		require_once($this->openqrm->get('basedir').'/plugins/development/web/class/dummyuser.class.php');
-		$dummy = new dummyuser('xxx');
-
-		require_once($this->openqrm->get('basedir').'/web/base/class/openqrm.class.php');
-		$oq = new openqrm($this->file, $dummy, $response);
-
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$path = $this->rootdir.'/plugins/'.$this->response->html->request()->get('plugin_name').'/web';
-		}
-
-		if($this->response->html->request()->get('base_name') !== '') {
-			if($this->response->html->request()->get('base_name') !== 'plugins') {
-				$path = $this->rootdir.'/web/base/server/'.$this->response->html->request()->get('base_name');
-			}
-			elseif ($this->response->html->request()->get('base_name') === 'plugins') {
-				$path = $this->rootdir.'/web/base/plugins/aa_plugins';
-			}
-		}
-
-		$files = $this->file->get_files($path.'/class/');
-		$name = array();
-		$objs = array();
-		if(is_array($files)) {
-			foreach($files as $file) {
-				if(strripos($file['name'], 'controller') !== false && strripos($file['name'], 'about') === false) {
-					require_once($file['path']);
-					$class = str_replace('.class.php', '', $file['name']);
-					$class = str_replace('.', '_', $class);
-					$class = str_replace('-', '_', $class);
-					$class = new $class($oq, $response->response());
-					$objs[] = $class;
-					$name[] = str_replace('.controller.class.php','',  $file['name']);
-				}
-			}
-		}
-
-		$content = array();
-		$i = 0;
-		foreach($objs as $obj) {
-				$content[$i]['name'] = $name[$i];
-				$content[$i]['object'] = $obj;
-				$content[$i]['class'] = get_class($obj);
-				if(get_class_methods($obj)) {
-						$content[$i]['methods'] = get_class_methods($obj);
-				} else {
-						$content[$i]['methods'] = '';
-				}
-				$content[$i]['vars'] = get_class_vars(get_class($obj));
-				$i++;
-		}
-
-		$controller = '';
-		if(count($content) > 0) {
-			$files = $this->file->get_files($path.'/lang');
-			foreach($content as $con) {
-				if(isset($con['object']->lang)) {
-					$controller .= '<div class="name"><b>Controller:</b> '.$con['class'].'</div>';
-					$lfiles = array();
-					foreach($files as $file) {
-						if(strpos($file['name'], '.'.$con['name'].'.') !== false) {
-							$lang = substr($file['name'], 0, strpos($file['name'], '.'));
-							$lfiles[$lang] = $file['path'];
-						}
-					}
-					$msg = array();
-					foreach($lfiles as $lang => $file) {
-						$error = array();
-						$ini = $this->file->get_ini($file);
-						foreach($con['object']->lang as $k => $v) {
-							if(is_array($v)) {
-								foreach($v as $key => $value) {
-									if(isset($ini[$k]) && !array_key_exists($key, $ini[$k])) {
-										$error['file'] = basename($file);
-										$error['missing'][$k][$key] = '';
-									} 
-									else if(!isset($ini[$k])) {
-										$error['file'] = basename($file);
-										$error['missing'][$k][$key] = '';
-									} else {
-										unset($ini[$k][$key]);
-									}
-								}
-							} else {
-								if(!array_key_exists($k, $ini)) {
-									$error['file'] = basename($file);
-									$error['missing'][$k] = '';
-								} else {
-									unset($ini[$k]);
-								}
-							}
-							if(isset($ini[$k]) && count($ini[$k]) < 1) {
-								unset($ini[$k]);
-							}
-						}
-						if(count($ini) < 1) {
-							unset($ini);
-						} else {
-							foreach($ini as $i => $x) {
-								$error['file'] = basename($file);
-								if(!is_array($x)) {
-									$error['supernumerous'][$i] = '';
-								} else {
-									if(count($x) > 0) {
-										foreach($x as $xx => $vv) {
-											$error['supernumerous'][$i][$xx] = '';
-										}
-									} else {
-										$error['supernumerous'][$i] = '';
-									}
-								}
-							}
-						}
-
-						$download = $this->response->html->a();
-						$download->label  = 'download';
-						$download->href   = $this->response->get_url($this->actions_name, 'download').'&file=lang/'.basename($file).'&mime=text/plain';
-						$download->target = '_blank';
-						$download->style  = 'vertical-align:top;text-decoration:none;';
-
-						// check errors
-						if(count($error) < 1) {
-							$msg[] = '<div><b>'.$lang.'</b> <span style="color:green;vertical-align:top;">passed</span> '.$download->get_string().'</div>';
-						} else {
-							// cache output
-							ob_start();
-							$response->html->help($error);
-							$messages = trim(ob_get_contents());
-							// end cache
-							ob_end_clean();
-							if($messages !== '') {
-								$txt  = '<div style="margin: 0 0 5px 0;"><b>'.$lang.'</b> <span style="color:red;vertical-align:top;">failed</span> '.$download->get_string().'</div>';
-								$txt .= '<div style="height: 200px; border: 1px solid #91A7B4; overflow: auto; margin: 0 10px 10px 0;"><pre>';
-								$txt .= $messages;
-								$txt .= '</pre></div>';
-								$msg[] = $txt;
-							}
-						}
-					}
-
-					// handle message
-					if(count($msg) > 0) {
-						$controller .= '<div style="margin: 0 0 0 30px;">';
-						$controller .= implode('', $msg);
-						$controller .= '</div>';
-					}
-				}
-			}
-		} else {
-			$oop = false;
-			foreach($files as $file) {
-				if(strripos($file['name'], 'controller') !== false && strripos($file['name'], 'about') !== false) {
-					$oop = true;
-					$controller = '<div>Plugin '.$this->response->html->request()->get('plugin_name').' is about controller only</div>';
-					break;
-				}
-			}
-			if($oop === false) {
-				$controller = '<div>Plugin '.$this->response->html->request()->get('plugin_name').' is not OOP</div>';
-			}
-		}
-
-		$template->add($controller, 'controllers');
-
-		// handle php errors
-		$phpinfo = '';
-		if($this->response->html->request()->get('debug') !== '' ) {
-			if(isset($GLOBALS['error_php']) && count($GLOBALS['error_php']) > 0) {
-				$phpinfo .= implode('', $GLOBALS['error_php']);
-			}
-		}
-		if($phpinfo !== '') {
-			$phpinfo = '<div class="phpinfobox">'.$phpinfo.'</div>';
-		} else {
-			$phpinfo = '&#160;';
-		}
-		$template->add($phpinfo, 'phpinfo');
-		$template = $this->controller->__get_navi($template, 'lang');
-		return $template;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Translate
-	 *
-	 * @access public
-	 * @param array $text_array array to translate
-	 * @param string $dir dir of translation files
-	 * @param string $file translation file
-	 * @return array
-	 */
-	//--------------------------------------------
-	function translate( $text_array, $dir, $file ) {
-		$user_language = $this->lang;
-		$path = $dir.'/'.$user_language.'.'.$file;
-		if(file_exists($path)) {
-			$tmp = parse_ini_file( $path, true );
-			foreach($tmp as $k => $v) {
-				if(is_array($v)) {
-					foreach($v as $k2 => $v2) {
-						$text_array[$k][$k2] = $v2;
-					}
-				} else {
-					$text_array[$k] = $v;
-				}
-			}
-		}
-		return $text_array;
-	}
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.rest.class.php b/openQRM-5.3.50-CE/src/plugins/development/web/class/development.rest.class.php
deleted file mode 100644
index f2ebbd1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.rest.class.php
+++ /dev/null
@@ -1,463 +0,0 @@
-<?php
-/**
- * Development Rest
- *
-	openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-	All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-	This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-	The latest version of this license can be found here: src/doc/LICENSE.txt
-
-	By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-				http://openqrm-enterprise.com
-
-	Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class development_rest
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'development_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "development_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'development_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'development_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-
-		$this->openqrm    = $openqrm;
-		$this->controller = $controller;
-		$this->user       = $this->openqrm->user();
-		$this->rootdir    = $this->openqrm->get('basedir');
-		$this->tpldir     = $this->rootdir.'/plugins/development/tpl';
-		$this->response   = $response;
-		$this->file       = $this->openqrm->file();
-
-		$plugin = $this->response->html->request()->get('plugin_name');
-		$this->response->add('plugin_name', $plugin);
-		$base = $this->response->html->request()->get('base_name');
-		$this->response->add('base_name', $base);
-		$this->methods = array('api', 'action');
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$name = $this->response->html->request()->get('plugin_name');
-			$data['label'] = sprintf($this->lang['label_plugin'], $name);
-		}
-		else if ($this->response->html->request()->get('base_name') !== '') {
-			$name = $this->response->html->request()->get('base_name');
-			$data['label'] = sprintf($this->lang['label_base'], $name);
-		}
-		$vars = array_merge(
-			$data, 
-			array(
-				'thisfile' => $this->response->html->thisfile,
-		));
-		$t = $this->response->html->template($this->tpldir.'/development-rest.tpl.php');
-		$t->add($vars);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-
-		return $this->edit($t);
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function edit($template) {
-
-		// cache output
-		ob_start();
-
-		require_once($this->openqrm->get('webdir').'/class/htmlobjects/htmlobject.response.class.php');
-		$response = new htmlobject_response($this->response->html, $this->response->id);
-		$response->html->debug();
-
-		require_once($this->openqrm->get('basedir').'/plugins/development/web/class/dummyuser.class.php');
-		$dummy = new dummyuser('xxx');
-
-		require_once($this->openqrm->get('basedir').'/web/base/class/openqrm.class.php');
-		$oq = new openqrm($this->file, $dummy, $response);
-
-
-
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$path = $this->rootdir.'/plugins/'.$this->response->html->request()->get('plugin_name').'/web/class/';
-		}
-		if($this->response->html->request()->get('base_name') !== '') {
-			if($this->response->html->request()->get('base_name') !== 'plugins') {
-				$path = $this->rootdir.'/web/base/server/'.$this->response->html->request()->get('base_name').'/class/';
-			}
-			elseif ($this->response->html->request()->get('base_name') === 'plugins') {
-				$path = $this->rootdir.'/web/base/plugins/aa_plugins/class/';
-			}
-		}
-
-		$files = $this->file->get_files($path);
-		$name = array();
-		$objs = array();
-		if(is_array($files)) {
-			foreach($files as $file) {
-				if(strripos($file['name'], 'controller') !== false && strripos($file['name'], 'about') === false) {
-					require_once($file['path']);
-					$class = str_replace('.class.php', '', $file['name']);
-					$class = str_replace('.', '_', $class);
-					$class = str_replace('-', '_', $class);
-					$class = new $class($oq, $response->response());
-					$objs[] = $class;
-					$name[] = str_replace('.controller.class.php','',  $file['name']);
-				}
-			}
-		}
-
-		$content = array();
-		$i = 0;
-		foreach($objs as $obj) {
-				$content[$i]['name'] = $name[$i];
-				$content[$i]['object'] = $obj;
-				$content[$i]['class'] = get_class($obj);
-				if(get_class_methods($obj)) {
-						$content[$i]['methods'] = get_class_methods($obj);
-				} else {
-						$content[$i]['methods'] = '';
-				}
-				$content[$i]['vars'] = get_class_vars(get_class($obj));
-				$i++;
-		}
-
-		$legend = '';
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$controllers = '<div class="plugin"><div class="name">plugin='.$this->response->html->request()->get('plugin_name').'</div>';
-		}
-		else if($this->response->html->request()->get('base_name') !== '') {
-			$controllers = '<div class="plugin"><div class="name">base='.$this->response->html->request()->get('base_name').'</div>';
-		}
-		if(count($content) > 0) {
-
-			$legend  = '<div class="legend">';
-			$legend .= '<div><div class="plugin" style="display: inline;padding: 5px;line-height:0px;margin:0px;font-size:0px;">&#160;</div> = Plugin</div>';
-			$legend .= '<div><div class="controller" style="display: inline;padding: 5px;line-height:0px;margin:0px;font-size:0px;">&#160;</div> = Controller</div>';
-			$legend .= '<div><div class="action" style="display: inline;padding: 5px;line-height:0px;margin:0px;font-size:0px;">&#160;</div> = Action</div>';
-			$legend .= '<fieldset style="margin: 5px 0 5px 0;">';
-			$legend .= '<legend>Params</legend>';
-			$legend .= '<div><strong>param</strong> = '.$this->lang['param_must_be_set_within_action'].'</div>';
-			$legend .= '<div><i>param</i> = '.$this->lang['param_optional'].'</div>';
-			$legend .= '<div>param = '.$this->lang['param_form_field'].'</div>';
-			$legend .= '<div>param * = '.$this->lang['param_required'].'</div>';
-			$legend .= '<div>param (...) = '.$this->lang['param_validator'].'</div>';
-			$legend .= '</fieldset>';
-			$legend .= '</div>';
-
-			foreach($content as $con) {
-				$controllers .= '<div class="controller">';
-				foreach($con as $k => $v) {
-					if($k === 'name') {
-						$controllers .= '<div class="name">controller='.$v.'</div>';
-						// check vars
-						$this->__check_controller_vars($con);
-					}
-					if($k === 'methods') {
-						if(is_array($v)) {
-							$controllers .= '<div class="methods">';
-							$i = 0;
-							foreach($v as $value) {
-								$css = '';
-								if(!in_array($value, $this->methods) && strpos($value, '__') === false && stripos($value, 'reload') === false) {
-								// handle duplicate
-									if($value === 'duplicate') { $value = 'clone'; }
-									$file = $con['name'].'.'.str_replace('_', '-', $value).'.class.php';
-									if($this->file->exists($path.$file)) {
-$url = array();
-										$css = 'action';
-										if($i === 0) { $i++; $css = 'action first'; }
-										$controllers .= '<div class="'.$css.'"><span>'.$con['vars']['actions_name'].'='. $value.'</span>';
-
-$url[] = $con['vars']['actions_name'].'='. $value;
-
-										require_once($path.$file);
-										$class = str_replace('.class.php', '', $file);
-										$class = str_replace('.', '_', $class);
-										$class = str_replace('-', '_', $class);
-										$class = new $class($oq, $con['object']->response->response(), $con['object']);
-										// check vars
-										$this->__check_action_vars($class, $con, $value);
-										// check lang
-										if(isset($con['object']->lang[$value])) {
-											$class->lang = $con['object']->lang[$value];
-										} else {
-											$class->lang = $con['object']->lang;
-										}
-										$x = new ReflectionObject($class);
-										if($x->hasMethod('get_response')) {
-											$params = $x->getMethod('get_response')->getParameters();
-											$res = $class->get_response();
-											if(isset($res->form)) {
-												$str = '';
-												$elem = $res->form->get_elements();
-												if(is_array($elem) && count($elem) > 0) {
-													foreach($elem as $key => $e) {
-														if($e instanceof htmlobject_box) {
-															// check elements name
-															if(isset($e->__elements[0]->name) && $e->__elements[0]->name !== '') {
-																$required = '';
-																if(isset($res->form->__data[$key]['required'])) {
-																	$required = ' *';
-																}
-																$regex = '';
-																if(isset($res->form->__data[$key]['validate']['regex'])) {
-																	$regex = ' ('.$res->form->__data[$key]['validate']['regex'].')';
-																}
-																$str .= '<span>'.$e->__elements[0]->name.$required.$regex.'</span>';
-																$url[] = $e->__elements[0]->name.'=..';
-															}
-														} else {
-															if(isset($e->name) && $e->name !== $con['vars']['actions_name']) {
-																if($key !== 'submit' && $key !== 'cancel') {
-																	$str .= '<span><strong>'.$e->name.'</strong></span>';
-																	$url[] = $e->name.'=..';
-																} else {
-																	$str .= '<span><i>'.$e->name.'</i></span>';
-																	if($key !== 'cancel') {
-																		$url[] = $e->name.'=submit';
-																	}
-																}
-															}
-														}
-													}
-													if($str !== '') {
-														$controllers .= '<div class="params"><b>Params</b>';
-														$controllers .= $str;
-														$controllers .= '</div>';
-														if($this->response->html->request()->get('plugin_name') !== '') {
-															$p = $this->response->html->request()->get('plugin_name');
-															$tag = 'plugin';
-														}
-														else if($this->response->html->request()->get('base_name') !== '') {
-															$p = $this->response->html->request()->get('base_name');
-															$tag = 'base';
-														}
-														$controllers .= '<div class="link"><b>Link:</b> ?'.$tag.'='.$p.'&amp;controller='.$con['name'].'&amp'.implode('&amp;', $url).'</div>';
-													}
-												}
-											}
-										} else {
-											$elem = '';
-											if(isset($class->response->params)) {
-												$elem = $class->response->params;
-											}
-											if(is_array($elem) && count($elem) > 0) {
-												$str = '';
-												foreach($elem as $key => $e) {
-													$str .= '<span><strong>'.$key.'</strong></span>';
-												}
-												if($str !== '') {
-													$controllers .= '<div class="params"><b>Params</b>';
-													$controllers .= $str;
-													$controllers .= '</div>';
-												}
-											}
-										}
-										$controllers .= '</div>';
-									} else {
-										$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missing file <b>'.$file.'</b> for action '.$value.'</div>';
-									}
-								}
-								
-							}
-							$controllers .= '</div>';
-						}
-					}
-				}
-				$controllers .= '</div>';
-			}
-			$controllers .= '</div>';
-		} else {
-			$oop = false;
-			foreach($files as $file) {
-				if(strripos($file['name'], 'controller') !== false && strripos($file['name'], 'about') !== false) {
-					$oop = true;
-					$controllers = '<div>Plugin '.$this->response->html->request()->get('plugin_name').' is about controller only</div>';
-					break;
-				}
-			}
-			if($oop === false) {
-				$controllers = '<div>Plugin '.$this->response->html->request()->get('plugin_name').' is not OOP</div>';
-			}
-		}
-
-
-		$template->add($controllers, 'controllers');
-		$template->add($legend, 'legend');
-
-		// handle errors
-		$phpinfo = '';
-		if($this->response->html->request()->get('debug') !== '' ) {
-			if(isset($GLOBALS['error_controller']) && count($GLOBALS['error_controller']) > 0) {
-				$phpinfo .= implode('', $GLOBALS['error_controller']);
-			}
-			if(isset($GLOBALS['error_action']) && count($GLOBALS['error_action']) > 0) {
-				$phpinfo .= implode('', $GLOBALS['error_action']);
-			}
-			if(isset($GLOBALS['error_php']) && count($GLOBALS['error_php']) > 0) {
-				$phpinfo .= implode('', $GLOBALS['error_php']);
-			}
-			$messages = trim(ob_get_contents());
-			if($messages !== '') {
-				$phpinfo .= '<b>HTMLOBJECTS DEBUG:</b><br>'.$messages;
-			}
-		}
-
-		// end cache
-		ob_end_clean();
-
-		if($phpinfo !== '') {
-			$phpinfo = '<div class="phpinfobox">'.$phpinfo.'</div>';
-		} else {
-			$phpinfo = '&#160;';
-		}
-		$template->add($phpinfo, 'phpinfo');
-		$template = $this->controller->__get_navi($template, 'rest');
-
-
-		// event cleanup, some methods creating events if constructed without parameters
-		$event = new event();
-		$event->remove_by_description('Could not create instance of');
-		return $template;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Check vars for controller
-	 *
-	 * @access private
-	 * @param object $con (controller)
-	 */
-	//--------------------------------------------
-	function __check_controller_vars($con) {
-		$text = '<b class="error">CONTROLLER_ERROR:</b> missing property ';
-		// actions_name
-		if(!array_key_exists('actions_name', $con['vars'])) {
-			$GLOBALS['error_controller'][] = '<div>'.$text.'<b>actions_name</b> for '.$con['class'].'</div>';
-		}
-		// message_param
-		if(!array_key_exists('message_param', $con['vars'])) {
-			$GLOBALS['error_controller'][] = '<div>'.$text.'<b>message_param</b> for '.$con['class'].'</div>';
-		}
-		// prefix_tab
-		if(!array_key_exists('prefix_tab', $con['vars'])) {
-			$GLOBALS['error_controller'][] = '<div>'.$text.'<b>prefix_tab</b> for '.$con['class'].'</div>';
-		}
-		// identifier_name
-		if(!array_key_exists('identifier_name', $con['vars'])) {
-			$GLOBALS['error_controller'][] = '<div>'.$text.' <b>identifier_name</b> for '.$con['class'].'</div>';
-		}
-		// lang
-		if(!array_key_exists('lang', $con['vars'])) {
-			$GLOBALS['error_controller'][] = '<div>'.$text.'<b>lang</b> for '.$con['class'].'</div>';
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Check vars for action
-	 *
-	 * @access private
-	 * @param object $class (current class)
-	 * @param object $con (controller)
-	 * @param string $value (action)
-	 */
-	//--------------------------------------------
-	function __check_action_vars($class, $con, $value) {
-		// actions_name
-		if(!property_exists($class, 'actions_name')) {
-			$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missing property <b>actions_name</b> for action '.$value.' in class '.get_class($class).'</div>';
-		} else {
-			if(isset($class->actions_name) && $class->actions_name !== $con['object']->actions_name) {
-				$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missmatching property <b>actions_name</b> for action '.$value.' (action:'.$class->actions_name.' -> controller:'.$con['object']->actions_name.')</div>';
-			}
-		}
-		// message_param
-		if(!property_exists($class, 'message_param')) {
-			$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missing property <b>message_param</b> for action '.$value.' in class '.get_class($class).'</div>';
-		} else {
-			if(isset($class->message_param) && $class->message_param !== $con['object']->message_param) {
-				$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missmatching property <b>message_param</b> for action '.$value.' (action:'.$class->message_param.' -> controller:'.$con['object']->message_param.')</div>';
-			}
-		}
-		// prefix_tab
-		if(!property_exists($class, 'prefix_tab')) {
-			$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missing property <b>prefix_tab</b> for action '.$value.' in class '.get_class($class).'</div>';
-		} else {
-			if(isset($class->prefix_tab) && $class->prefix_tab !== $con['object']->prefix_tab) {
-				$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missmatching property <b>prefix_tab</b> for action '.$value.' (action:'.$class->prefix_tab.' -> controller:'.$con['object']->prefix_tab.')</div>';
-			}
-		}
-		// identifier_name
-		if(!property_exists($class, 'identifier_name')) {
-			$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missing property <b>identifier_name</b> for action '.$value.' in class '.get_class($class).'</div>';
-		} else {
-			if(isset($class->identifier_name) && $class->identifier_name !== $con['object']->identifier_name) {
-				$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missmatching property <b>identifier_name</b> for action '.$value.' (action:'.$class->identifier_name.' -> controller:'.$con['object']->identifier_name.')</div>';
-			}
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.select.class.php b/openQRM-5.3.50-CE/src/plugins/development/web/class/development.select.class.php
deleted file mode 100644
index e734ac4..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.select.class.php
+++ /dev/null
@@ -1,349 +0,0 @@
-<?php
-/**
- * Development select
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class development_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'development_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "development_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'development_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'development_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->tpldir   = $this->rootdir.'/plugins/development/tpl';
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$response = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/development-select.tpl.php');
-		$t->add($response->table_plugins, 'table_plugins');
-		$t->add($response->table_base, 'table_base');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function select() {
-		$response = $this->response;
-
-		$h['plugin']['title']    = $this->lang['id'];
-		$h['plugin']['sortable'] = true;
-
-		$h['docblock']['title']    = '&#160;';
-		$h['docblock']['sortable'] = false;
-
-		$h['lang']['title']    = '&#160;';
-		$h['lang']['sortable'] = false;
-
-		$h['edit']['title']    = '&#160;';
-		$h['edit']['sortable'] = false;
-
-		$h['api']['title']    = '&#160;';
-		$h['api']['sortable'] = false;
-
-		$h['hooks']['title']    = '&#160;';
-		$h['hooks']['sortable'] = false;
-
-		$h['template']['title']    = '&#160;';
-		$h['template']['sortable'] = false;
-
-		$h['css']['title']    = '&#160;';
-		$h['css']['sortable'] = false;
-
-		$h['js']['title']    = '&#160;';
-		$h['js']['sortable'] = false;
-
-		// plugins
-		$plugin = new plugin();
-		$result = $plugin->available();
-		$b = array();
-		if(is_array($result)) {
-			foreach($result as $v) {
-				$tmp['plugin'] = $v;
-				$tmp['docblock'] = '&#160;';
-				$tmp['edit'] = '&#160;';
-				$tmp['api'] = '&#160;';
-				$tmp['lang'] = '&#160;';
-				$tmp['template'] = '&#160;';
-				$tmp['hooks'] = '&#160;';
-				$path = $this->openqrm->get('basedir').'/plugins/'.$v.'/web/class/';
-				$files = $this->file->get_files($path);
-				$oop = false;
-				foreach($files as $file) {
-					if(strripos($file['name'], 'controller') !== false && strripos($file['name'], 'about') === false) {
-						$oop = true;
-						break;
-					}
-				}
-				if($oop === true) {
-					$a           = $response->html->a();
-					$a->href     = $response->get_url($this->actions_name, 'docblock' ).'&plugin_name='.$v;
-					$a->label    = $this->lang['action_docblock'];
-					$a->title    = $this->lang['action_docblock'];
-					$a->handler  = 'onclick="wait();"';
-					$tmp['docblock'] = $a->get_string();
-
-					$a           = $response->html->a();
-					$a->href     = $response->get_url($this->actions_name, 'lang' ).'&plugin_name='.$v;
-					$a->label    = $this->lang['action_lang'];
-					$a->title    = $this->lang['action_lang'];
-					$a->handler  = 'onclick="wait();"';
-					$tmp['lang'] = $a->get_string();
-
-					$a           = $response->html->a();
-					$a->href     = $response->get_url($this->actions_name, 'rest' ).'&plugin_name='.$v;
-					$a->label    = $this->lang['action_rest'];
-					$a->title    = $this->lang['action_rest'];
-					$a->handler  = 'onclick="wait();"';
-					$tmp['edit'] = $a->get_string();
-
-					$a           = $response->html->a();
-					$a->href     = $response->get_url($this->actions_name, 'api' ).'&plugin_name='.$v;
-					$a->label    = $this->lang['action_api'];
-					$a->title    = $this->lang['action_api'];
-					$a->handler  = 'onclick="wait();"';
-					$tmp['api'] = $a->get_string();
-
-					$a           = $response->html->a();
-					$a->href     = $response->get_url($this->actions_name, 'template' ).'&plugin_name='.$v;
-					$a->label    = $this->lang['action_template'];
-					$a->title    = $this->lang['action_template'];
-					$a->handler  = 'onclick="wait();"';
-					$tmp['template'] = $a->get_string();
-
-					$a           = $response->html->a();
-					$a->href     = $response->get_url($this->actions_name, 'hooks' ).'&plugin_name='.$v;
-					$a->label    = $this->lang['action_hooks'];
-					$a->title    = $this->lang['action_hooks'];
-					$a->handler  = 'onclick="wait();"';
-					$tmp['hooks'] = $a->get_string();
-
-					$a           = $response->html->a();
-					$a->href     = $response->get_url($this->actions_name, 'js' ).'&plugin_name='.$v;
-					$a->label    = $this->lang['action_js'];
-					$a->title    = $this->lang['action_js'];
-					$a->handler  = 'onclick="wait();"';
-					$tmp['js'] = $a->get_string();
-
-					$a           = $response->html->a();
-					$a->href     = $response->get_url($this->actions_name, 'css' ).'&plugin_name='.$v;
-					$a->label    = $this->lang['action_css'];
-					$a->title    = $this->lang['action_css'];
-					$a->handler  = 'onclick="wait();"';
-					$tmp['css'] = $a->get_string();
-				}
-				$b[] = $tmp;
-			}
-		}
-
-
-		$table = $this->response->html->tablebuilder('plugins', $this->response->get_array($this->actions_name, 'select'));
-		$table->offset       = 0;
-		$table->sort         = 'plugin';
-		$table->limit        = 0;
-		$table->order        = 'ASC';
-		$table->max          = count($b);
-		$table->css          = 'htmlobject_table';
-		$table->border       = 0;
-		$table->id           = 'Tabelle_1';
-		$table->form_action  = $this->response->html->thisfile;
-		$table->head         = $h;
-		$table->body         = $b;
-		$table->sort_params  = $response->get_string( $this->actions_name, 'select' );
-		$table->sort_form    = false;
-		$table->sort_link    = false;
-		$table->autosort     = true;
-
-		$response->table_plugins = $table;
-
-		// base
-		$result = array('aa_server','appliance', 'event', 'image','kernel','resource','storage', 'plugins');
-		$b = array();
-		if(is_array($result)) {
-			foreach($result as $v) {
-				$tmp['plugin'] = $v;
-				$tmp['docblock'] = '&#160;';
-				$tmp['edit'] = '&#160;';
-				$tmp['api'] = '&#160;';
-				$tmp['lang'] = '&#160;';
-				$tmp['template'] = '&#160;';
-				$tmp['hooks'] = '&#160;';
-				if($v !== 'plugins') {
-					$path = $this->openqrm->get('basedir').'/web/base/server/'.$v.'/class/';
-				}
-				elseif ($v === 'plugins') {
-					$path = $this->openqrm->get('basedir').'/web/base/plugins/aa_plugins/class/';
-				}
-				$files = $this->file->get_files($path);
-				$oop = false;
-				foreach($files as $file) {
-					if(strripos($file['name'], 'controller') !== false && strripos($file['name'], 'about') === false) {
-						$oop = true;
-						break;
-					}
-				}
-				if($oop === true) {
-					$a           = $response->html->a();
-					$a->href     = $response->get_url($this->actions_name, 'docblock' ).'&base_name='.$v;
-					$a->label    = $this->lang['action_docblock'];
-					$a->title    = $this->lang['action_docblock'];
-					$a->handler  = 'onclick="wait();"';
-					$tmp['docblock'] = $a->get_string();
-
-					$a           = $response->html->a();
-					$a->href     = $response->get_url($this->actions_name, 'lang' ).'&base_name='.$v;
-					$a->label    = $this->lang['action_lang'];
-					$a->title    = $this->lang['action_lang'];
-					$a->handler  = 'onclick="wait();"';
-					$tmp['lang'] = $a->get_string();
-
-					$a           = $response->html->a();
-					$a->href     = $response->get_url($this->actions_name, 'rest' ).'&base_name='.$v;
-					$a->label    = $this->lang['action_rest'];
-					$a->title    = $this->lang['action_rest'];
-					$a->handler  = 'onclick="wait();"';
-					$tmp['edit'] = $a->get_string();
-
-					$a           = $response->html->a();
-					$a->href     = $response->get_url($this->actions_name, 'api' ).'&base_name='.$v;
-					$a->label    = $this->lang['action_api'];
-					$a->title    = $this->lang['action_api'];
-					$a->handler  = 'onclick="wait();"';
-					$tmp['api'] = $a->get_string();
-
-					$a           = $response->html->a();
-					$a->href     = $response->get_url($this->actions_name, 'template' ).'&base_name='.$v;
-					$a->label    = $this->lang['action_template'];
-					$a->title    = $this->lang['action_template'];
-					$a->handler  = 'onclick="wait();"';
-					$tmp['template'] = $a->get_string();
-
-					$a           = $response->html->a();
-					$a->href     = $response->get_url($this->actions_name, 'hooks' ).'&base_name='.$v;
-					$a->label    = $this->lang['action_hooks'];
-					$a->title    = $this->lang['action_hooks'];
-					$a->handler  = 'onclick="wait();"';
-					$tmp['hooks'] = $a->get_string();
-
-					$a           = $response->html->a();
-					$a->href     = $response->get_url($this->actions_name, 'js' ).'&base_name='.$v;
-					$a->label    = $this->lang['action_js'];
-					$a->title    = $this->lang['action_js'];
-					$a->handler  = 'onclick="wait();"';
-					$tmp['js'] = $a->get_string();
-
-					$a           = $response->html->a();
-					$a->href     = $response->get_url($this->actions_name, 'css' ).'&base_name='.$v;
-					$a->label    = $this->lang['action_css'];
-					$a->title    = $this->lang['action_css'];
-					$a->handler  = 'onclick="wait();"';
-					$tmp['css'] = $a->get_string();
-				}
-				$b[] = $tmp;
-			}
-		}
-
-		$table = $this->response->html->tablebuilder('base', $this->response->get_array($this->actions_name, 'select'));
-		$table->offset       = 0;
-		$table->sort         = 'plugin';
-		$table->limit        = 0;
-		$table->order        = 'ASC';
-		$table->max          = count($b);
-		$table->css          = 'htmlobject_table';
-		$table->border       = 0;
-		$table->id           = 'Tabelle_2';
-		$table->form_action  = $this->response->html->thisfile;
-		$table->head         = $h;
-		$table->body         = $b;
-		$table->sort_params  = $response->get_string( $this->actions_name, 'select' );
-		$table->sort_form    = false;
-		$table->sort_link    = false;
-		$table->autosort     = true;
-
-		$response->table_base = $table;
-
-
-		return $response;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.template.class.php b/openQRM-5.3.50-CE/src/plugins/development/web/class/development.template.class.php
deleted file mode 100644
index c5a1be8..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/class/development.template.class.php
+++ /dev/null
@@ -1,509 +0,0 @@
-<?php
-/**
- * Development Templates
- *
-	openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-	All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-	This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-	The latest version of this license can be found here: src/doc/LICENSE.txt
-
-	By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-				http://openqrm-enterprise.com
-
-	Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class development_template
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'development_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "development_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'development_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'development_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-
-		$this->openqrm    = $openqrm;
-		$this->controller = $controller;
-		$this->user       = $this->openqrm->user();
-		$this->rootdir    = $this->openqrm->get('basedir');
-		$this->tpldir     = $this->rootdir.'/plugins/development/tpl';
-		$this->response   = $response;
-		$this->file       = $this->openqrm->file();
-
-		$plugin = $this->response->html->request()->get('plugin_name');
-		$this->response->add('plugin_name', $plugin);
-		$base = $this->response->html->request()->get('base_name');
-		$this->response->add('base_name', $base);
-		$this->methods = array('api', 'action');
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$name = $this->response->html->request()->get('plugin_name');
-			$data['label'] = sprintf($this->lang['label_plugin'], $name);
-		}
-		else if ($this->response->html->request()->get('base_name') !== '') {
-			$name = $this->response->html->request()->get('base_name');
-			$data['label'] = sprintf($this->lang['label_base'], $name);
-		}
-		$vars = array_merge(
-			$data, 
-			array(
-				'thisfile' => $this->response->html->thisfile,
-		));
-		$t = $this->response->html->template($this->tpldir.'/development-template.tpl.php');
-		$t->add($vars);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-
-		return $this->edit($t);
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function edit($template) {
-
-		// cache output
-		ob_start();
-
-		require_once($this->openqrm->get('webdir').'/class/htmlobjects/htmlobject.response.class.php');
-		$response = new htmlobject_response($this->response->html, $this->response->id);
-		$response->html->debug();
-
-		require_once($this->openqrm->get('basedir').'/plugins/development/web/class/dummyuser.class.php');
-		$dummy = new dummyuser('xxx');
-
-		require_once($this->openqrm->get('basedir').'/web/base/class/openqrm.class.php');
-		$oq = new openqrm($this->file, $dummy, $response);
-
-
-
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$path = $this->rootdir.'/plugins/'.$this->response->html->request()->get('plugin_name').'/web/class/';
-		}
-		if($this->response->html->request()->get('base_name') !== '') {
-			if($this->response->html->request()->get('base_name') !== 'plugins') {
-				$path = $this->rootdir.'/web/base/server/'.$this->response->html->request()->get('base_name').'/class/';
-			}
-			elseif ($this->response->html->request()->get('base_name') === 'plugins') {
-				$path = $this->rootdir.'/web/base/plugins/aa_plugins/class/';
-			}
-		}
-
-		$files = $this->file->get_files($path);
-		$name = array();
-		$objs = array();
-		if(is_array($files)) {
-			foreach($files as $file) {
-				if(strripos($file['name'], 'controller') !== false && strripos($file['name'], 'about') === false) {
-					require_once($file['path']);
-					$class = str_replace('.class.php', '', $file['name']);
-					$class = str_replace('.', '_', $class);
-					$class = str_replace('-', '_', $class);
-					$class = new $class($oq, $response->response());
-					$objs[] = $class;
-					$name[] = str_replace('.controller.class.php','',  $file['name']);
-				}
-			}
-		}
-
-		$content = array();
-		$i = 0;
-		foreach($objs as $obj) {
-				$content[$i]['name'] = $name[$i];
-				$content[$i]['object'] = $obj;
-				$content[$i]['class'] = get_class($obj);
-				if(get_class_methods($obj)) {
-						$content[$i]['methods'] = get_class_methods($obj);
-				} else {
-						$content[$i]['methods'] = '';
-				}
-				$content[$i]['vars'] = get_class_vars(get_class($obj));
-				$i++;
-		}
-
-		if($this->response->html->request()->get('plugin_name') !== '') {
-			$controllers = '<div class="plugin"><div class="name">plugin='.$this->response->html->request()->get('plugin_name').'</div>';
-		}
-		else if($this->response->html->request()->get('base_name') !== '') {
-			$controllers = '<div class="plugin"><div class="name">base='.$this->response->html->request()->get('base_name').'</div>';
-		}
-
-		$legend = '';
-		if(count($content) > 0) {
-
-			$tpldir = dirname($path).'/tpl/';
-			$files = $this->file->get_files($tpldir);
-
-			$legend  = '<div class="legend">';
-			$legend .= '<div><div class="plugin" style="display: inline;padding: 5px;line-height:0px;margin:0px;font-size:0px;">&#160;</div> = Plugin</div>';
-			$legend .= '<div><div class="controller" style="display: inline;padding: 5px;line-height:0px;margin:0px;font-size:0px;">&#160;</div> = Controller</div>';
-			$legend .= '<div><div class="action" style="display: inline;padding: 5px;line-height:0px;margin:0px;font-size:0px;">&#160;</div> = Action</div>';
-			$legend .= '</div>';
-
-			foreach($content as $con) {
-				$controllers .= '<div class="controller">';
-				foreach($con as $k => $v) {
-					if($k === 'name') {
-						$controllers .= '<div class="name">controller='.$v.'</div>';
-					}
-					if($k === 'methods') {
-						if(is_array($v)) {
-							$controllers .= '<div class="methods">';
-							$i = 0;
-							foreach($v as $value) {
-								$css = '';
-								if(!in_array($value, $this->methods) && strpos($value, '__') === false && stripos($value, 'reload') === false) {
-								// handle duplicate
-									if($value === 'duplicate') { $value = 'clone'; }
-									$file = $con['name'].'.'.str_replace('_', '-', $value).'.class.php';
-									if($this->file->exists($path.$file)) {
-
-										$css = 'action';
-										if($i === 0) { $i++; $css = 'action first'; }
-										$controllers .= '<div class="'.$css.'"><span>'. $value.'</span><br>';
-
-										require_once($path.$file);
-										$class = str_replace('.class.php', '', $file);
-										$class = str_replace('.', '_', $class);
-										$class = str_replace('-', '_', $class);
-
-$tpl = str_replace('_', '-', $class).'.tpl.php';
-if(!$this->file->exists($tpldir.$tpl)) {
-	$tpl = '<div><b class="error">ERROR:</b> missing template '.$tpl.'</div>';
-} else {
-	foreach($files as $key => $file) {
-		if($file['name'] === $tpl) {
-			unset($files[$key]);
-		}
-	}
-	$tpl = '<div><b class="success">PASSED:</b> found template '.$tpl.'</div>';
-}
-$controllers .= $tpl;
-
-
-
-/*
-
-										$class = new $class($oq, $con['object']->response->response(), $con['object']);
-										$class->tpldir = dirname($path).'/tpl/';
-										// check vars
-										#$this->__check_action_vars($class, $con, $value);
-										// check lang
-										if(isset($con['object']->lang[$value])) {
-											$class->lang = $con['object']->lang[$value];
-										} else {
-											$class->lang = $con['object']->lang;
-										}
-
-										$x = new ReflectionObject($class);
-										if($x->hasMethod('action')) {
-
-
-											$controllers .= $class->action()->get_string();
-
-
-
-											if($str !== '') {
-												$controllers .= '<div class="params"><b>Params</b>';
-												$controllers .= $str;
-												$controllers .= '</div>';
-												if($this->response->html->request()->get('plugin_name') !== '') {
-													$p = $this->response->html->request()->get('plugin_name');
-													$tag = 'plugin';
-												}
-												else if($this->response->html->request()->get('base_name') !== '') {
-													$p = $this->response->html->request()->get('base_name');
-													$tag = 'base';
-												}
-												$controllers .= '<div class="link"><b>Link:</b> ?'.$tag.'='.$p.'&amp;controller='.$con['name'].'&amp'.implode('&amp;', $url).'</div>';
-											}
-
-
-											$params = $x->getMethod('get_response')->getParameters();
-											$res = $class->get_response();
-											if(isset($res->form)) {
-												$str = '';
-												$elem = $res->form->get_elements();
-												if(is_array($elem) && count($elem) > 0) {
-													foreach($elem as $key => $e) {
-														if($e instanceof htmlobject_box) {
-															// check elements name
-															if(isset($e->__elements[0]->name) && $e->__elements[0]->name !== '') {
-																$required = '';
-																if(isset($res->form->__data[$key]['required'])) {
-																	$required = ' *';
-																}
-																$regex = '';
-																if(isset($res->form->__data[$key]['validate']['regex'])) {
-																	$regex = ' ('.$res->form->__data[$key]['validate']['regex'].')';
-																}
-																$str .= '<span>'.$e->__elements[0]->name.$required.$regex.'</span>';
-																$url[] = $e->__elements[0]->name.'=..';
-															}
-														} else {
-															if(isset($e->name) && $e->name !== $con['vars']['actions_name']) {
-																if($key !== 'submit' && $key !== 'cancel') {
-																	$str .= '<span><strong>'.$e->name.'</strong></span>';
-																	$url[] = $e->name.'=..';
-																} else {
-																	$str .= '<span><i>'.$e->name.'</i></span>';
-																	if($key !== 'cancel') {
-																		$url[] = $e->name.'=submit';
-																	}
-																}
-															}
-														}
-													}
-													if($str !== '') {
-														$controllers .= '<div class="params"><b>Params</b>';
-														$controllers .= $str;
-														$controllers .= '</div>';
-														if($this->response->html->request()->get('plugin_name') !== '') {
-															$p = $this->response->html->request()->get('plugin_name');
-															$tag = 'plugin';
-														}
-														else if($this->response->html->request()->get('base_name') !== '') {
-															$p = $this->response->html->request()->get('base_name');
-															$tag = 'base';
-														}
-														$controllers .= '<div class="link"><b>Link:</b> ?'.$tag.'='.$p.'&amp;controller='.$con['name'].'&amp'.implode('&amp;', $url).'</div>';
-													}
-												}
-											}
-										} else {
-											$elem = $class->response->params;
-											if(is_array($elem) && count($elem) > 0) {
-												$str = '';
-												foreach($elem as $key => $e) {
-													$str .= '<span><strong>'.$key.'</strong></span>';
-												}
-												if($str !== '') {
-													$controllers .= '<div class="params"><b>Params</b>';
-													$controllers .= $str;
-													$controllers .= '</div>';
-												}
-											}
-										}
-*/
-
-
-										$controllers .= '</div>';
-									} else {
-										$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missing file <b>'.$file.'</b> for action '.$value.'</div>';
-									}
-								}
-								
-							}
-							$controllers .= '</div>';
-						}
-					}
-				}
-				$controllers .= '</div>';
-			}
-
-// supernumerous files
-foreach($files as $file) {
-	if(strripos($file['name'], 'about') === false) {
-		$GLOBALS['error_action'][] = '<div><b class="error">TEMPLATE_NOTICE: </b> Found supernumerous file '. $file['name'].'</div>';
-	}
-}
-
-
-			$controllers .= '</div>';
-		} else {
-			$oop = false;
-			foreach($files as $file) {
-				if(strripos($file['name'], 'controller') !== false && strripos($file['name'], 'about') !== false) {
-					$oop = true;
-					$controllers = '<div>Plugin '.$this->response->html->request()->get('plugin_name').' is about controller only</div>';
-					break;
-				}
-			}
-			if($oop === false) {
-				$controllers = '<div>Plugin '.$this->response->html->request()->get('plugin_name').' is not OOP</div>';
-			}
-		}
-
-
-		$template->add($controllers, 'controllers');
-		$template->add($legend, 'legend');
-
-		// handle errors
-		$phpinfo = '';
-
-
-		if($this->response->html->request()->get('debug') !== '' ) {
-			if(isset($GLOBALS['error_controller']) && count($GLOBALS['error_controller']) > 0) {
-				$phpinfo .= implode('', $GLOBALS['error_controller']);
-			}
-			if(isset($GLOBALS['error_action']) && count($GLOBALS['error_action']) > 0) {
-				$phpinfo .= implode('', $GLOBALS['error_action']);
-			}
-			if(isset($GLOBALS['error_php']) && count($GLOBALS['error_php']) > 0) {
-				$phpinfo .= implode('', $GLOBALS['error_php']);
-			}
-			$messages = trim(ob_get_contents());
-			if($messages !== '') {
-				$phpinfo .= '<b>HTMLOBJECTS DEBUG:</b><br>'.$messages;
-			}
-		}
-
-
-		// end cache
-		ob_end_clean();
-
-		if($phpinfo !== '') {
-			$phpinfo = '<div class="phpinfobox">'.$phpinfo.'</div>';
-		} else {
-			$phpinfo = '&#160;';
-		}
-		$template->add($phpinfo, 'phpinfo');
-		$template = $this->controller->__get_navi($template, 'template');
-
-
-		// event cleanup, some methods creating events if constructed without parameters
-		$event = new event();
-		$event->remove_by_description('Could not create instance of');
-		return $template;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Check vars for controller
-	 *
-	 * @access private
-	 * @param object $con (controller)
-	 */
-	//--------------------------------------------
-	function __check_controller_vars($con) {
-		$text = '<b class="error">CONTROLLER_ERROR:</b> missing property ';
-		// actions_name
-		if(!array_key_exists('actions_name', $con['vars'])) {
-			$GLOBALS['error_controller'][] = '<div>'.$text.'<b>actions_name</b> for '.$con['class'].'</div>';
-		}
-		// message_param
-		if(!array_key_exists('message_param', $con['vars'])) {
-			$GLOBALS['error_controller'][] = '<div>'.$text.'<b>message_param</b> for '.$con['class'].'</div>';
-		}
-		// prefix_tab
-		if(!array_key_exists('prefix_tab', $con['vars'])) {
-			$GLOBALS['error_controller'][] = '<div>'.$text.'<b>prefix_tab</b> for '.$con['class'].'</div>';
-		}
-		// identifier_name
-		if(!array_key_exists('identifier_name', $con['vars'])) {
-			$GLOBALS['error_controller'][] = '<div>'.$text.' <b>identifier_name</b> for '.$con['class'].'</div>';
-		}
-		// lang
-		if(!array_key_exists('lang', $con['vars'])) {
-			$GLOBALS['error_controller'][] = '<div>'.$text.'<b>lang</b> for '.$con['class'].'</div>';
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Check vars for action
-	 *
-	 * @access private
-	 * @param object $class (current class)
-	 * @param object $con (controller)
-	 * @param string $value (action)
-	 */
-	//--------------------------------------------
-	function __check_action_vars($class, $con, $value) {
-		// actions_name
-		if(!property_exists($class, 'actions_name')) {
-			$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missing property <b>actions_name</b> for action '.$value.' in class '.get_class($class).'</div>';
-		} else {
-			if(isset($class->actions_name) && $class->actions_name !== $con['object']->actions_name) {
-				$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missmatching property <b>actions_name</b> for action '.$value.' (action:'.$class->actions_name.' -> controller:'.$con['object']->actions_name.')</div>';
-			}
-		}
-		// message_param
-		if(!property_exists($class, 'message_param')) {
-			$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missing property <b>message_param</b> for action '.$value.' in class '.get_class($class).'</div>';
-		} else {
-			if(isset($class->message_param) && $class->message_param !== $con['object']->message_param) {
-				$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missmatching property <b>message_param</b> for action '.$value.' (action:'.$class->message_param.' -> controller:'.$con['object']->message_param.')</div>';
-			}
-		}
-		// prefix_tab
-		if(!property_exists($class, 'prefix_tab')) {
-			$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missing property <b>prefix_tab</b> for action '.$value.' in class '.get_class($class).'</div>';
-		} else {
-			if(isset($class->prefix_tab) && $class->prefix_tab !== $con['object']->prefix_tab) {
-				$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missmatching property <b>prefix_tab</b> for action '.$value.' (action:'.$class->prefix_tab.' -> controller:'.$con['object']->prefix_tab.')</div>';
-			}
-		}
-		// identifier_name
-		if(!property_exists($class, 'identifier_name')) {
-			$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missing property <b>identifier_name</b> for action '.$value.' in class '.get_class($class).'</div>';
-		} else {
-			if(isset($class->identifier_name) && $class->identifier_name !== $con['object']->identifier_name) {
-				$GLOBALS['error_action'][] = '<div><b class="error">ACTION_ERROR:</b> missmatching property <b>identifier_name</b> for action '.$value.' (action:'.$class->identifier_name.' -> controller:'.$con['object']->identifier_name.')</div>';
-			}
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/class/docblock.class.php b/openQRM-5.3.50-CE/src/plugins/development/web/class/docblock.class.php
deleted file mode 100644
index 9b4c0b6..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/class/docblock.class.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
- * Docblock
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class docblock
-{
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param file $classfile
-	 */
-	//--------------------------------------------
-	function __construct($classfile) {
-		$this->path    = realpath($classfile);
-		$content       = file_get_contents($this->path);
-		$content       = str_replace("\r\n", "\n", $content);
-		$this->content = $content;
-		ini_set('pcre.backtrack_limit', 10000000);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get content
-	 *
-	 * @access public
-	 * @return array
-	 */
-	//--------------------------------------------
-	function get() {
-		$ar               = array();
-		$ar['filename']   = basename($this->path);
-		$ar['classname']  = $this->__regex('~[\\n| |\\t]+class[ ]+([^ |\\n]*)~i', false);
-		$ar['extends']    = $this->__regex('~extends ([^\\n{ ]*)~i', false);
-		$ar['implements'] = $this->__regex('~implements ([^\\n{]*)~i', false);
-		$ar['docblock']   = $this->__docblock('class[ ]+'.$ar['classname'], false);
-		$ar['attribs']    = $this->__attribs();
-		$ar['methods']    = $this->__regex('~[\\n| |\\t]+function[ ]+([^\(| ]*).*~i');
-
-		if(is_array($ar['methods'])) {
-			foreach($ar['methods'] as $key => $value) {
-				$params = $this->__regex('~function[ ]+'.$key.'[ ]*\((.+)\)~i', false);
-				$ar['methods'][$key]['params']   = trim(htmlentities($params));
-				$ar['methods'][$key]['docblock'] = $this->__docblock('function[ ]+'.$key.'[ ]*\(');
-			}
-		}
-
-		return $ar;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Docblock
-	 *
-	 * @access private
-	 * @param integer $offset
-	 * @return array
-	 */
-	//--------------------------------------------
-	function __docblock( $offset ) {
-		$res = $this->__regex('~/\*\*\\n(.+)\*/.+'.$offset.'~s', false);
-		$res = preg_replace('~.+/\*\*\\n~is', '', $res);
-		$res = str_replace(array("\t","* ","*"), '', $res);
-		$res = htmlentities($res);
-		$res = str_replace('&lt;code&gt;', '<code>', $res);
-		$res = str_replace('&lt;/code&gt;', '</code>', $res);
-		$res = explode("\n", $res);
-		unset($res[count($res)-1]);
-		return $res;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get attribs
-	 *
-	 * @access private
-	 * @return string|array
-	 */
-	//--------------------------------------------
-	function __attribs() {
-		$regex = '~[\\n| |\\t]+(var|private|protected|public|static)[ ]+\$([^ |=|;]*).*[\\n]~i';
-		preg_match_all($regex, $this->content, $matches);
-		if(isset($matches[2][0])) {
-			$m = array();
-			foreach($matches[2] as $key => $value) {
-				$default = $this->__regex('~'.$matches[1][$key].'.+\$'.$value.'.*=([^;]*).*\\n~im', false);
-				$default = trim(htmlentities($default));
-				switch($default) {
-					case "''": $default = 'empty';  break;
-					case ""  : $default = 'null';	break;
-				}
-				if(strpos($default, 'array') === false) {
-					$default = str_replace(array("\t",'"',"'","&quot;"), '', $default);
-				}
-				$m[$value]['access']   = ($matches[1][$key] === 'var')? 'public' : $matches[1][$key];
-				$m[$value]['default']  = $default;
-				$m[$value]['docblock'] = $this->__docblock($matches[1][$key].'[ ]+\$'.$value.'[ |=|;]+');
-			}
-			return $m;
-		} else {
-			return '';
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Regex
-	 *
-	 * @access private
-	 * @param string $regex
-	 * @param bool $all
-	 * @param bool $key
-	 * @return string|array
-	 */
-	//--------------------------------------------
-	function __regex($regex, $all = true, $key = true) {
-		if($all === true) {
-			preg_match_all($regex, $this->content, $matches);
-			if(isset($matches[1][0])) {
-				if(count($matches[1]) < 2) {
-					return array($matches[1][0] => '');
-				} else {
-					if($key === true) {
-						$m = array();
-						foreach($matches[1] as $value) {
-							$m[$value] = '';
-						}
-						return $m;
-					} else {
-						return $matches[1];
-					}
-				}
-			} else {
-				return '';
-			}
-		} else {
-			preg_match($regex, $this->content, $matches);
-			if(isset($matches[1])) {
-				return $matches[1];
-			} else {
-				return '';
-			}
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/class/dummyuser.class.php b/openQRM-5.3.50-CE/src/plugins/development/web/class/dummyuser.class.php
deleted file mode 100644
index a4bd77f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/class/dummyuser.class.php
+++ /dev/null
@@ -1,595 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-
-
-class dummyuser
-{
-/**
-* Id
-* @access public
-* @var int
-*/
-var $id;
-/**
-* Nickname
-* @access public
-* @var string
-*/
-var $name = '';
-/**
-* Password
-* @access public
-* @var string
-*/
-var $password = '';
-/**
-* Gender
-* @access public
-* @var string
-*/
-var $gender = '';
-/**
-* Firstname
-* @access public
-* @var string
-*/
-var $first_name = '';
-/**
-* Lastname
-* @access public
-* @var string
-*/
-var $last_name = '';
-/**
-* Department
-* @access public
-* @var string
-*/
-var $department = '';
-/**
-* Office
-* @access public
-* @var string
-*/
-var $office = '';
-/**
-* Role (Group)
-* @access public
-* @var string
-*/
-var $role = '';
-/**
- *
-* Lang (language)
-* @access public
-* @var string
-*/
-var $lang = '';
-/**
-* Last update
-* @access public
-* @var string
-*/
-var $last_update_time = '';
-/**
-* Description
-* @access public
-* @var string
-*/
-var $description = '';
-/**
-* Capabilities
-* @access public
-* @var string
-*/
-var $capabilities = '';
-/**
-* wizard_name
-* @access public
-* @var string
-*/
-var $wizard_name = '';
-/**
-* wizard_step
-* @access public
-* @var string
-*/
-var $wizard_step = '';
-/**
-* wizard_id
-* @access public
-* @var string
-*/
-var $wizard_id = '';
-/**
-* State
-* @access public
-* @var string
-*/
-var $state = '';
-
-/**
-* Internal use only
-* @access private
-* @var string
-*/
-var $_user_table = '';
-/**
-* Internal use only
-* @access private
-* @var string
-*/
-var $_role_table = '';
-
-
-	//-----------------------------------------------------------------------------------
-	function user($name) {
-		global $USER_INFO_TABLE;
-		$this->name = $name;
-		$this->get_instance_by_name($name);
-		$this->_role_table = 'role_info';
-		$this->_user_table = $USER_INFO_TABLE;
-	}
-
-
-
-
-	// returns a user from the db selected by id, mac or ip
-	function get_instance($id, $name) {
-		global $USER_INFO_TABLE;
-		$event = new event();
-		$db=openqrm_get_db_connection();
-		if ($id != "") {
-			$user_array = $db->GetAll("select * from ".$this->_user_table." where user_id=$id");
-		} else if ($name != "") {
-			$user_array = $db->GetAll("select * from ".$USER_INFO_TABLE." where user_name='$name'");
-		} else {
-			$event->log("get_instance", $_SERVER['REQUEST_TIME'], 2, "user.class.php", "Could not create instance of user without data", "", "", 0, 0, 0);
-			return;
-		}
-		foreach ($user_array as $index => $user) {
-			$this->id = $user["user_id"];
-			$this->name = $user["user_name"];
-			$this->password = $user["user_password"];
-			$this->gender = $user["user_gender"];
-			$this->first_name = $user["user_first_name"];
-			$this->last_name = $user["user_last_name"];
-			$this->department = $user["user_department"];
-			$this->office = $user["user_office"];
-			$this->role = $user["user_role"];
-			$this->lang = $user["user_lang"];
-			$this->last_update_time = $user["user_last_update_time"];
-			$this->description = $user["user_description"];
-			$this->capabilities = $user["user_capabilities"];
-			$this->wizard_name = $user["user_wizard_name"];
-			$this->wizard_step = $user["user_wizard_step"];
-			$this->wizard_id = $user["user_wizard_id"];
-			$this->state = $user["user_state"];
-		}
-		return $this;
-	}
-
-	// returns a user from the db selected by id
-	function get_instance_by_id($id) {
-		$this->get_instance($id, "");
-		return $this;
-	}
-
-
-	// returns a user from the db selected by id
-	function get_instance_by_name($name) {
-		$this->get_instance("", $name);
-		return $this;
-	}
-
-
-
-	// for the ldap integration
-
-	// adds user just to the database
-	function add($user_fields) {
-		global $event;
-		if (!is_array($user_fields)) {
-			$event->log("add", $_SERVER['REQUEST_TIME'], 2, "user.class.php", "user_fields not well defined", "", "", 0, 0, 0);
-			return 1;
-		}
-		$db=openqrm_get_db_connection();
-		$result = $db->AutoExecute($this->_user_table, $user_fields, 'INSERT');
-		if (! $result) {
-			$event->log("add", $_SERVER['REQUEST_TIME'], 2, "user.class.php", "Failed adding new user to database", "", "", 0, 0, 0);
-		}
-	}
-
-	function get_name_list() {
-		$user_array = array();
-		$query = "select user_name from $this->_user_table";
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute($query);
-		if (!$rs)
-			$event->log("get_name_list", $_SERVER['REQUEST_TIME'], 2, "user.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		else
-		while (!$rs->EOF) {
-			$user_array[] = $rs->fields;
-			$rs->MoveNext();
-		}
-		return $user_array;
-	}
-
-	function remove_by_name($user_name) {
-		// remove from db
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from $this->_user_table where user_name='$user_name'");
-		return $rs;
-	}
-
-	// end of ldap integration
-
-
-	//--------------------------------------------
-	/**
-	 * Find out user is admin
-	 *
-	 * @access public
-	 * @return bool
-	 */
-	//--------------------------------------------
-	function isAdmin() {
-		if(strtolower($this->role) === 'administrator' || $this->role === 0) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-
-	//-----------------------------------------------------------------------------------
-	function set_user_form() {
-
-		$query = $this->query_select();
-		$result = openqrm_db_get_result($query);
-
-		$this->name 			= array('value'=>$this->name, 'label'=>'Login');
-		$this->id 				= $result[0][0];
-		$this->gender 			= $result[0][1];
-		$this->first_name 		= $result[0][2];
-		$this->last_name 		= $result[0][3];
-		$this->description 		= $result[0][4];
-		$this->department 		= $result[0][5];
-		$this->office 			= $result[0][6];
-		$this->capabilities		= $result[0][7];
-		$this->state 			= $result[0][8];
-		$this->role 			= $result[0][9];
-		$this->last_update_time	= $result[0][10];
-		$this->password	= array('value'=>'', 'label'=>$result[0][11]['label']);
-	}
-	//-----------------------------------------------------------------------------------
-	function set_user() {
-
-		$query = $this->query_select();
-		$result = openqrm_db_get_result($query);
-
-		$this->id 				= $result[0][0]['value'];
-		$this->gender 			= $result[0][1]['value'];
-		$this->first_name 		= $result[0][2]['value'];
-		$this->last_name 		= $result[0][3]['value'];
-		$this->description 		= $result[0][4]['value'];
-		$this->department 		= $result[0][5]['value'];
-		$this->office 			= $result[0][6]['value'];
-		$this->capabilities		= $result[0][7]['value'];
-		$this->state 			= $result[0][8]['value'];
-		$this->role 			= $result[0][9]['value'];
-		$this->last_update_time	= $result[0][10]['value'];
-		$this->password			= $result[0][11]['value'];
-
-		$this->get_role_name();
-		$this->role = $this->role['label'];
-	}
-	//-----------------------------------------------------------------------------------
-	function set_user_from_request() {
-
-		$this->id	 			= $this->http_request('id');
-		$this->password 		= $this->http_request('password');
-		$this->gender 			= $this->http_request('gender');
-		$this->first_name 		= $this->http_request('first_name');
-		$this->last_name 		= $this->http_request('last_name');
-		$this->department 		= $this->http_request('department');
-		$this->office 			= $this->http_request('office');
-		$this->role 			= $this->http_request('role');
-		$this->last_update_time = $this->http_request('last_update_time');
-		$this->description 		= $this->http_request('description');
-		$this->capabilities 	= $this->http_request('capabilities');
-		$this->state 			= $this->http_request('state');
-
-	}
-	//-----------------------------------------------------------------------------------
-	function query_select(){
-		$query = "
-			SELECT
-				user_id,
-				user_gender,
-				user_first_name,
-				user_last_name,
-				user_description,
-				user_department,
-				user_office,
-				user_capabilities,
-				user_state,
-				user_role,
-				user_last_update_time,
-				user_password
-				user_lang
-			FROM $this->_user_table
-			WHERE user_name = '$this->name'
-		";
-		return $query;
-	}
-	//-----------------------------------------------------------------------------------
-	function query_insert(){
-		global $USER_INFO_TABLE;
-		$this->id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-		$query = "
-			INSERT INTO
-				$USER_INFO_TABLE (
-					user_id,
-					user_name,
-					user_password,
-					user_gender,
-					user_first_name,
-					user_last_name,
-					user_department,
-					user_office,
-					user_role,
-					user_last_update_time,
-					user_description,
-					user_capabilities,
-					user_state,
-					user_lang
-				)
-			VALUES (
-					'$this->id',
-					'$this->name',
-					'$this->password',
-					'$this->gender',
-					'$this->first_name',
-					'$this->last_name',
-					'$this->department',
-					'$this->office',
-					'$this->role',
-					'$this->last_update_time',
-					'$this->description',
-					'$this->capabilities',
-					'$this->state.',
-					'$this->lang.'
-				)
-		";
-
-		$this->change_htpasswd('insert');
-		return openqrm_db_get_result($query);
-	}
-	//-----------------------------------------------------------------------------------
-	function query_update(){
-		global $USER_INFO_TABLE;
-		$user_fields = array();
-		if($this->password != '') {
-			$user_fields['user_password']=$this->password;
-			$this->change_htpasswd('update');
-		}
-		$user_fields['user_gender']=$this->gender;
-		$user_fields['user_first_name']=$this->first_name;
-		$user_fields['user_last_name']=$this->last_name;
-		$user_fields['user_department']=$this->department;
-		$user_fields['user_office']=$this->office;
-		$user_fields['user_role']=$this->role;
-		$user_fields['user_last_update_time']=$this->last_update_time;
-		$user_fields['user_description']=$this->description;
-		$user_fields['user_capabilities']=$this->capabilities;
-		$user_fields['user_state']=$this->state;
-		$user_fields['user_lang']=$this->lang;
-		$db=openqrm_get_db_connection();
-		$result = $db->AutoExecute($USER_INFO_TABLE, $user_fields, 'UPDATE', "user_name = '$this->name'");
-		if (! $result) {
-			$event->log("query_update", $_SERVER['REQUEST_TIME'], 2, "user.class.php", "Failed updating user", "", "", 0, 0, 0);
-		}
-	}
-	//-----------------------------------------------------------------------------------
-	function query_delete(){
-		$query = "
-			DELETE FROM $this->_user_table
-			WHERE user_name = '".$this->name."'
-		";
-		$this->change_htpasswd('delete');
-		return openqrm_db_get_result($query);
-	}
-	//-----------------------------------------------------------------------------------
-	function check_user_exists() {
-		$query = "
-			SELECT user_name
-			FROM $this->_user_table
-			WHERE user_name = '".$this->name."'
-		";
-		$result = openqrm_db_get_result_single($query);
-
-		if($result['value'] != '') { return true; }
-		else { return false; }
-
-	}
-	//-----------------------------------------------------------------------------------
-	function get_gender_list() {
-		$ar_Return = array();
-		$ar_Return[] = array("value"=>'', "label"=>'',);
-		$ar_Return[] = array("value"=>'f', "label"=>'female',);
-		$ar_Return[] = array("value"=>'m', "label"=>'male',);
-		return $ar_Return;
-	}
-	//-----------------------------------------------------------------------------------
-	function get_role_name() {
-		$query = "
-			SELECT user_role, role_name
-			FROM $this->_user_table, $this->_role_table
-			WHERE user_name = '".$this->name."'
-				AND user_role = role_id
-		";
-		$result = openqrm_db_get_result_double($query);
-		$this->role = $result[0];
-	}
-	//-----------------------------------------------------------------------------------
-	function get_role_list() {
-		$query = "
-			SELECT role_id, role_name
-			FROM $this->_role_table
-		";
-		$result = openqrm_db_get_result_double($query);
-		return $result;
-	}
-	//-----------------------------------------------------------------------------------
-	function check_string_name($name) {
-
-		if (!preg_match('#^[A-Za-z0-9]*$#', $name)) {
-			return '[A-Za-z0-9]';
-		} else {
-			return '';
-		}
-	}
-	//-----------------------------------------------------------------------------------
-	function check_string_password($pass) {
-		if (!preg_match('#^[A-Za-z0-9]*$#', $pass)) {
-			return '[A-Za-z0-9_-]';
-		} else {
-			return '';
-		}
-	}
-	//-----------------------------------------------------------------------------------
-	/**
-	* Change htpassswd
-	* @access private
-	* @param $mode [update, delete, insert]
-	*/
-	function change_htpasswd($mode = 'update') {
-	global $RootDir;
-
-		$ar_values = array();
-
-		$handle = fopen ($RootDir.'/.htpasswd', "r");
-		while (!feof($handle)) {
-			$tmp = explode(':', fgets($handle, 4096));
-			if($tmp[0] != '') {
-				$ar_values[$tmp[0]] = $tmp[1];
-			}
-		}
-		fclose ($handle);
-
-		$handle = fopen ($RootDir.'/.htpasswd', "w+");
-
-		if($mode == 'insert') {
-			foreach($ar_values as $key => $value) {
-				fputs($handle, "$key:$value");
-			}
-			fputs($handle, $this->name.':'.crypt($this->password)."\n");
-		}
-		if($mode == 'update') {
-			foreach($ar_values as $key => $value) {
-				if($key == $this->name) {
-					fputs($handle, $this->name.':'.crypt($this->password)."\n");
-				} else {
-					fputs($handle, "$key:$value");
-				}
-			}
-		}
-		if($mode == 'delete') {
-			foreach($ar_values as $key => $value) {
-				if($key != $this->name) {
-					fputs($handle, "$key:$value");
-				}
-			}
-		}
-		fclose ($handle);
-	}
-	//-----------------------------------------------------------------------------------
-	function get_users() {
-		$query = '
-			SELECT
-				user_name,
-				user_id,
-				user_first_name,
-				user_last_name,
-				role_name
-			FROM '.$this->_user_table.', '.$this->_role_table.'
-			WHERE user_role = role_id
-			ORDER BY user_name
-		';
-		$ar_db = openqrm_db_get_result($query);
-		$ar_headline = array();
-		$ar_headline[] = array('Login', 'ID', 'First Name', 'Last Name', 'Role');
-		$result = array_merge($ar_headline, $ar_db);
-
-		return $result;
-	}
-	//-----------------------------------------------------------------------------------
-	function http_request($arg)
-	{
-		global $_REQUEST;
-		if (isset($_REQUEST[$arg]))
-			return $_REQUEST[$arg];
-		else
-			return '';
-	}
-
-
-
-	// set users lang
-	function set_user_language($name, $lang) {
-		$db=openqrm_get_db_connection();
-		$sql = "update ".$this->_user_table." set user_lang='".$lang."' where user_name='".$name."'";
-		$rs = $db->Execute($sql);
-	}
-
-
-	// set wizard fields
-	function set_wizard($username, $wizardname, $step, $id) {
-		$db=openqrm_get_db_connection();
-		$sql = "update ".$this->_user_table." set user_wizard_name='".$wizardname."',  user_wizard_step=".$step.",user_wizard_id=".$id." where user_name='".$username."'";
-		$rs = $db->Execute($sql);
-		return $rs;
-	}
-
-
-
-	//--------------------------------------------
-	/**
-	 * Translate
-	 *
-	 * @access public
-	 * @param array $text_array array to translate
-	 * @param string $dir dir of translation files
-	 * @param string $file translation file
-	 * @return array
-	 */
-	//--------------------------------------------
-	function translate( $text_array, $dir, $file ) {
-		return $text_array;
-	}
-
-
-
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/css/development.css b/openQRM-5.3.50-CE/src/plugins/development/web/css/development.css
deleted file mode 100644
index 7696086..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/css/development.css
+++ /dev/null
@@ -1,274 +0,0 @@
-.htmlobject_td.edit,
-.htmlobject_td.lang,
-.htmlobject_td.docblock,
-.htmlobject_td.template,
-.htmlobject_td.api,
-.htmlobject_td.hooks,
-.htmlobject_td.js,
-.htmlobject_td.css {
-	text-align: center;
-	vertical-align: top;
-	width: 30px;
-}
-
-#form .legend {
-	float: right;
-	margin: 0px 16px 0 0;
-	box-shadow: 3px 3px 8px rgba(0, 0, 0, 0.3);
-	border: 1px solid #ccc;
-	padding: 8px 10px 5px 10px;
-	background: white;
-}
-#form .legend.hooks h4 {
-	margin: 0 0 5px 0;
-}
-#form .legend.hooks {
-	width: 500px;
-}
-#form .legend.hooks .available {
-	background: #eee;
-	padding: 5px;
-	border: 1px solid #bbb;
-	margin: 0 0 5px 0;
-}
-#form .legend.hooks .available h4 {
-	margin: 0 0 5px 0;
-	border: 0px none;
-	font-weight: bold;
-}
-
-
-#form .legend.hooks .hookexplain {
-	margin: 0 0 10px 5px;
-}
-
-#form .phpinfobox {
-	height: 180px;
-	overflow: scroll;
-	white-space: nowrap;
-	border: 1px solid #91A7B4;
-	padding: 2px 5px 5px 5px;
-	margin: 0 0 15px 0;
-}
-#form .plugininfo fieldset {
-	background: #fff;
-}
-#form div.plugin {
-	margin: 0 0 10px 0;
-	padding: 15px;
-	background: #E4EEFF;
-	border: 1px solid #ccc;
-}
-#form .controller {
-	border: 1px solid #ccc;
-	margin: 0 0 10px 0;
-	padding: 15px;
-	background: #FFFFE0;
-}
-#form div.plugin b,
-#form .controller b {
-	text-decoration: underline;
-	padding: 0 0 0 0;
-	margin: 0 0 5px 0;
-}
-#form div.plugin b.error,
-#form .controller b.error {
-	text-decoration: none;
-	padding: 0 0 0 0;
-	margin: 0 0 5px 0;
-	color: red;
-}
-#form div.plugin b.succes,
-#form .controller b.success {
-	text-decoration: none;
-	padding: 0 0 0 0;
-	margin: 0 0 5px 0;
-	color: green;
-}
-#form div.name {
-	margin: 0;
-	padding: 5px 5px 25px 0;
-}
-#form .methods {
-	margin: 0;
-	padding: 0;
-}
-
-#form .methods span {
-	display: block;
-}
-#form .methods span.action {
-	color: green;
-}
-#form .vars div,
-#form .vars span {
-	display: block;
-	margin: 0 0 0 10px;
-}
-#form .action{
-	margin: 0 0 10px 0px;
-	border: 1px solid #CCCCCC;
-	padding: 15px 0 15px 15px;
-	background: white;
-}
-#form .action .params {
-	margin: 0 0 20px 250px;
-	padding: 0 0 0 0;
-}
-#form .action .params b{
-	text-decoration: underline;
-}
-#form .action .params span{
-	display: block;
-}
-#form .link {
-	margin: 10px 50px 10px 0;
-	padding: 0;
-}
-
-
-
-.htmlobject_tabs_box h1.apih1 {
-	margin: 0 0 15px 0;
-}
-#form .paginator {
-	border-bottom: 1px solid #91A7B4;
-	padding: 0 5px 15px 5px;
-	margin: 0 0 20px 0;
-}
-#form .paginator a{
-	text-decoration: none;
-}
-#form .paginator .switch {
-	margin: 0 auto;
-	width: 580px;
-	text-align: center;
-}
-#form .paginator .switch a {
-	border: 1px solid;
-	display: block;
-	float: left;
-	width: 70px;
-	text-align: center;
-	margin: 2px;
-	padding: 3px;
-}
-
-
-
-#documentation_content {
-	left: 0px;
-	padding: 0 5px !important;
-	position: relative;
-	top: 0px;
-	width: 750px;
-}
-
-#plugin_content {
-	left: 0px;
-	padding: 0 5px !important;
-	position: relative;
-	top: 0px;
-	width: 255px;
-}
-
-#form .toplink {
-	display: block;
-	text-align:right;
-	margin: 0 0 0 0;
-	padding:15px;
-	font-size:12px;
-	color:black;
-	text-decoration:none;
-}
-#form .apidoc {
-	padding: 15px;
-	border: 1px solid #ccc;
-	background: #eee;
-	margin: 0 0 10px 0;
-	color: black;
-}
-#form .apidoc h1 {
-	font-size: 18px;
-}
-#form .apidoc h3 {
-	background: transparent;
-	font-size: 14px;
-	border: 0px none;
-	font-weight: bold;
-}
-#form .apidoc code {
-	border:1px dotted #ccc;
-	display:block;
-	padding:10px;
-	margin: 10px 0 0 0;
-	background:#eee;
-	overflow: auto;
-	font-family: inherit;
-}
-#form .apidoc pre {
-	overflow: auto;
-	font-family: inherit;
-	background: white;
-	padding: 5px;
-}
-#form .apidoc pre.head {
-	border:1px solid #ccc;
-	padding: 10px;
-}
-#form .apidoc .links {
-	margin: 20px 0 40px 10px;
-}
-#form .apidoc .attribs {
-	background: #FFFFE0;
-	padding: 15px;
-	border: 1px solid #ccc;
-}
-#form .apidoc .methods {
-	background: #E4EEFF;
-	padding: 15px;
-	border: 1px solid #ccc;
-	margin: 20px 0 0 0;
-}
-#form .apidoc .attribs a,
-#form  .apidoc .methods a {
-	display:block;
-	text-align:right;
-	margin: 10px 0 0 0;
-	padding:10px;
-	font-size:12px;
-	color:black;
-	text-decoration:none;
-}
-#form .apidoc .attribs div,
-#form .apidoc .methods div {
-	background: white;
-	border:1px solid #ccc;
-	margin: 0 0 0 0;
-	padding:10px;
-}
-#form .apidoc .attribs pre,
-#form .apidoc .methods pre {
-	border: 0px none;
-	display: block;
-	font-size: 13px;
-	line-height: 15px;
-	margin: 0;
-	padding: 0;
-}
-#form .apidoc .attribs .indent,
-#form .apidoc .methods .indent {
-	margin: 0;
-	border: none 0px;
-	padding: 15px 10px 0px 35px;
-	font-size:15px;
-}
-
-
-/* HOOKS */
-.hooktable td {
-	padding: 2px 20px 2px 0;
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/development/web/img/plugin.png
deleted file mode 100644
index e952cbc..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/development/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/lang/de.development-about.ini b/openQRM-5.3.50-CE/src/plugins/development/web/lang/de.development-about.ini
deleted file mode 100644
index a8c188c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/lang/de.development-about.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[documentation]
-tab = "Über Development"
-label = "Über Development"
-introduction_title = "Einleitung"
-introduction_content = "Das Development Plugin bietet Entwickler Informationen wie Übersetzung und Rest Api von Plugins."
-requirements_title = "Anforderungen"
-requirements_list = "keine"
-tested_title = "Getestet mit"
-tested_content = "Diese Plugin ist getestet mit Debian, Ubuntu und CentOS Linux Distributionen ."
-type_title = "Plugin Typ"
-type_content = "Misc"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/lang/de.development.ini b/openQRM-5.3.50-CE/src/plugins/development/web/lang/de.development.ini
deleted file mode 100644
index 7c37854..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/lang/de.development.ini
+++ /dev/null
@@ -1,62 +0,0 @@
-[select]
-tab = "Development"
-label = "Development"
-id = "Name"
-action_rest = "rest"
-action_lang = "lang"
-action_docblock = "docblock"
-action_template = "template"
-please_wait = "Lade. Bitte warten .."
-[rest]
-tab = "Rest"
-label_plugin = "Zeige Plugin %s Rest"
-label_base = "Zeige %s Rest"
-param_must_be_set_within_action = "muss innerhalb der Aktion gesetzt sein"
-param_optional = "optional"
-param_form_field = "Formular Feld"
-param_required = "Pflichtfeld"
-param_validator = "Validator"
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[lang]
-tab = "Übersetzung"
-label_plugin = "Zeige Plugin %s Übersetzung"
-label_base = "Zeige %s Übersetzung"
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[docblock]
-tab = "Docblock"
-label_plugin = "Zeige Plugin %s Docblock"
-label_base = "Zeige %s Docblock"
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[template]
-tab = "Template"
-label_plugin = "Zeige Plugin %s Templates"
-label_base = "Zeige %s Templates"
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[hooks]
-tab = "Hooks"
-label_plugin = "Plugin %s Hooks"
-label_base = "%s Hooks"
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-appliance-hook = "Der appliance-hook ermöglicht Plugins eigens definierte Kommandos während des Server Start/Stop-Vorgangs oder während eines Server-Updates auszuführen."
-appliance-edit-hook = "Der appliance-edit hook erlaubt es Plugins einen Aktion-Item im Server Edit Formular hinzuzufügen."
-appliance-link-hook = "Der appliance-edit hook erlaubt es Plugins einen Aktion-Item im Server Übersicht hinzuzufügen."
-billing-hook = "Der billing-hook ermöglicht die Anbindung an externe Gebührenabrechnungssysteme."
-cloud-hook = "Der cloud-hook lässt Virtualization Plugins selbst definieren wie Virtuelle Maschinene erstellt und entfernt werden."
-dashboard-quicklink-hook = "Der dashboard-quicklink-hook erlaubt es Plugins einen Aktion-Item im openQRM Dashboard hinzuzufügen."
-deployment-auth-hook/auth-hook = "Der deployment-auth-hook ermöglicht es dem Storage Plugins, das für den Image Deployment Typ des im Server konfigurierten Image verantwortlich ist, Kommandos zur Authentisierung des Volumes auf dem Storage Server auszuführen."
-deployment-cloud-hook = "Der deployment-cloud-hook überlässt Storage Plugins die Aktionen Image Volumes für das automatisierte Cloud Deployment zu erstellen, zu entfernen, die Grösse zu verändern und zu Privatisieren."
-event-hook = "Der event-hook ermöglicht es Plugins auf spezifische Events in openQRM zu reagieren."
-external-dns-hook = "Der external-dns-hook erlaubt die Anbindung externer DNS Provider."
-ha-cmd-hook = "Der ha-cmd-hook überlässt den Virtualizations Plugins zu definieren wie spezifische Virtuelle Maschinene  im Falle eines Hochverfügbarkeits Fail-Over erstellt und abgeschaltet werden."
-monitor-hook = "Der monitor-hook erlaubt es Plugins sich wiederholende Kommandos abzusetzen (z.b. für Status Updates)."
-remote-console-hook = "Der remote-console-hook ermölicht Plugins die Einbindung einer VM-Konsole für spezifische Virtualizations Technologien."
-resource-hook = "Der resource-hook erlaubt es Plugins zum Start, Stop oder Re-Start eines Servers selbstdefinierte Kommandos auszuführen."
-resource-fence-hook = "Der resource-fence-hook definiert wie Ressourcen in openQRM im Falle eines Hochverfügbarkeits Fail-Over hart ausgeschaltet werden."
-resource-virtual-command-hook = "Der resource-virtual-command-hook ermöglich es den Virtualizations Plugins eigene Kommandos zu definieren wie spezifische Virtuelle Machinen Typen gestartet und gestoppt werden."
-role-hook = "Der role-hook erlaubt es Plugins Rollen-basierte Berechtigungen für jede einzel Aktion in openQRM zu vergeben."
-
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/lang/en.development-about.ini b/openQRM-5.3.50-CE/src/plugins/development/web/lang/en.development-about.ini
deleted file mode 100644
index 7d3affe..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/lang/en.development-about.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[documentation]
-tab = "About Development"
-label = "About Development"
-introduction_title = "Introduction"
-introduction_content = "The Development plugin provides developer informations like translation and rest api for base and plugins."
-requirements_title = "Requirements"
-requirements_list = "none"
-tested_title = "Tested with"
-tested_content = "This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions."
-type_title = "Plugin Type"
-type_content = "Misc"
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/lang/en.development.ini b/openQRM-5.3.50-CE/src/plugins/development/web/lang/en.development.ini
deleted file mode 100644
index f7cb5b9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/lang/en.development.ini
+++ /dev/null
@@ -1,64 +0,0 @@
-[select]
-tab = "Development"
-label = "Development"
-id = "Name"
-action_rest = "rest"
-action_lang = "lang"
-action_docblock = "docblock"
-action_template = "template"
-please_wait = "Loading. Please wait .."
-[rest]
-tab = "Rest"
-label_plugin = "View Plugin %s Rest"
-label_base = "View %s Rest"
-param_must_be_set_within_action = "must be set within action"
-param_optional = "optional"
-param_form_field = "form field"
-param_required = "required form field"
-param_validator = "validator"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[lang]
-tab = "Translation"
-label_plugin = "View Plugin %s translation"
-label_base = "View %s translation"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[docblock]
-tab = "Docblock"
-label_plugin = "View Plugin %s Docblock"
-label_base = "View %s Docblock"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[template]
-tab = "Template"
-label_plugin = "View Plugin %s Templates"
-label_base = "View %s Templates"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[hooks]
-tab = "Hooks"
-label_plugin = "View Plugin %s Hooks"
-label_base = "View %s Hooks"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-appliance-hook = "The appliance-hook allows plugins to run custom action during start, stop and update of a server."
-appliance-edit-hook = "The appliance-edit hook provides plugins the capability to add an action item in the server edit section."
-appliance-link-hook = "The appliance-edit hook provides plugins the capability to add an action item in the server overview section."
-billing-hook = "The billing-hook allows to plugin custom external billing systems for the Cloud deployments."
-cloud-hook = "The cloud-hook let the virtualization plugins define the way how specific VMs are created and removed."
-dashboard-quicklink-hook = "The dashboard-quicklink-hook provides an option for plugins to add a icon and URL to the Quicklink setion on the openQRM dashboard."
-deployment-auth-hook/auth-hook = "The deployment-auth-hook provides the storage plugins which is responsible for the specific image deployment types of the server image to run custom action on the storage object to authenticate/de-authenticate the image volume."
-deployment-cloud-hook = "The deployment-cloud-hook let the storage plugins define a the way how the image volumes are created/removed/resized/privatized for the automated Cloud deployment."
-event-hook = "The event-hook is triggered when a specific event arrives in openQRM and allows plugins to run custom actions."
-external-dns-hook = "The external-dns-hook provides a way to interact with remote DNS services."
-ha-cmd-hook = "The ha-cmd-hook let the virtualization plugins define the way how specific VMs are created and fenced in case of a highavailability fail-over."
-monitor-hook = "The monitor-hook provides an option for plugins to run frequent repeated commands e.g. for status updates."
-remote-console-hook = "The remote-console-hook allows plugins to embed a remote console for specific Virtualization technologies."
-resource-hook = "The resource-hook allows plugins to run custom action during start, stop and restart of a server."
-resource-fence-hook = "The resource-fence-hook defines how resources are fenced (STONITH) during highavailability fail-over."
-resource-virtual-command-hook = "The resource-virtual-command-hook let the virtualization plugins define the way how specific VMs and Hosts are started and stopped through the Virtualization Host API."
-role-hook = "The role-hook provides plugins the capability to define custom role-based permissions for every action in openQRM."
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/development/web/menu.txt
deleted file mode 100644
index 3b46830..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/menu.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|Development
-...|API|index.php?plugin=development|Development
-...|About|index.php?plugin=development&controller=development-about|How to use
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-about-documentation.tpl.php
deleted file mode 100644
index 9b046ec..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-about-documentation.tpl.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{introduction_title}</h3>
-		{introduction_content}
-
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-	</div>
-
-	<div class="span2 offset1">
-		<h3>{type_title}</h3>
-		<span class="pill">{type_content}</span>
-
-		<h3>{tested_title}</h3>
-		{tested_content}
-
-	</div>
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-css.tpl.php b/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-css.tpl.php
deleted file mode 100644
index 9c98f23..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-css.tpl.php
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<h1 class="apih1">{label}</h1>
-
-<div id="form">
-
-	<div class="paginator">
-		<div style="float:left;">{previous}</div>
-		<div style="float:right;">{next}</div>
-		<div class="switch">
-			{switch}
-			<div style="clear:both;line-height:0px;" class="floarbreaker">&#160;</div>
-		</div>
-		<div style="clear:both;line-height:0px;" class="floarbreaker">&#160;</div>
-	</div>
-
-	<div>
-		{links}	
-		<div style="clear:both;line-height:0px;" class="floarbreaker">&#160;</div>
-	</div>
-
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-docblock.tpl.php b/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-docblock.tpl.php
deleted file mode 100644
index eb688ef..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-docblock.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-
-<h1 class="apih1">{label}</h1>
-
-<div id="form">
-
-	<div class="paginator">
-		<div style="float:left;">{previous}</div>
-		<div style="float:right;">{next}</div>
-		<div class="switch">
-			{switch}
-			<div style="clear:both;line-height:0px;" class="floarbreaker">&#160;</div>
-		</div>
-		<div style="clear:both;line-height:0px;" class="floarbreaker">&#160;</div>
-	</div>
-
-	<div>
-		<ul style="margin: 0 0 30px 0;">{links}</ul>
-
-		{controllers}
-	
-		<div style="clear:both;line-height:0px;">&#160;</div>
-	</div>
-
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-hooks.tpl.php b/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-hooks.tpl.php
deleted file mode 100644
index b51a40a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-hooks.tpl.php
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<h1 class="apih1">{label}</h1>
-
-<div id="form">
-
-	<div class="paginator">
-		<div style="float:left;">{previous}</div>
-		<div style="float:right;">{next}</div>
-		<div class="switch">
-			{switch}
-			<div style="clear:both;line-height:0px;" class="floarbreaker">&#160;</div>
-		</div>
-		<div style="clear:both;line-height:0px;" class="floarbreaker">&#160;</div>
-	</div>
-
-	<div>		
-		<div style="float:left;">{table}</div>
-		<div class="legend hooks">{legend}</div>	
-		<div style="clear:both;line-height:0px;" class="floarbreaker">&#160;</div>
-	</div>
-
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-js.tpl.php b/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-js.tpl.php
deleted file mode 100644
index 9c98f23..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-js.tpl.php
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<h1 class="apih1">{label}</h1>
-
-<div id="form">
-
-	<div class="paginator">
-		<div style="float:left;">{previous}</div>
-		<div style="float:right;">{next}</div>
-		<div class="switch">
-			{switch}
-			<div style="clear:both;line-height:0px;" class="floarbreaker">&#160;</div>
-		</div>
-		<div style="clear:both;line-height:0px;" class="floarbreaker">&#160;</div>
-	</div>
-
-	<div>
-		{links}	
-		<div style="clear:both;line-height:0px;" class="floarbreaker">&#160;</div>
-	</div>
-
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-lang.tpl.php b/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-lang.tpl.php
deleted file mode 100644
index bdee009..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-lang.tpl.php
+++ /dev/null
@@ -1,26 +0,0 @@
-
-<h1 class="apih1">{label}</h1>
-
-<div id="form">
-
-	<div class="paginator">
-		<div style="float:left;">{previous}</div>
-		<div style="float:right;">{next}</div>
-		<div class="switch">
-			{switch}
-			<div style="clear:both;line-height:0px;" class="floarbreaker">&#160;</div>
-		</div>
-		<div style="clear:both;line-height:0px;" class="floarbreaker">&#160;</div>
-	</div>
-
-	<div class="phpinfo">
-		{phpinfo}
-		<div style="clear:both;line-height:0px;">&#160;</div>
-	</div>
-
-	<div class="plugininfo">
-		{controllers}
-		<div style="clear:both;line-height:0px;">&#160;</div>
-	</div>
-
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-rest.tpl.php b/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-rest.tpl.php
deleted file mode 100644
index 8d13f06..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-rest.tpl.php
+++ /dev/null
@@ -1,27 +0,0 @@
-
-<h1 class="apih1">{label}</h1>
-
-<div id="form">
-
-	<div class="paginator">
-		<div style="float:left;">{previous}</div>
-		<div style="float:right;">{next}</div>
-		<div class="switch">
-			{switch}
-			<div style="clear:both;line-height:0px;" class="floarbreaker">&#160;</div>
-		</div>
-		<div style="clear:both;line-height:0px;" class="floarbreaker">&#160;</div>
-	</div>
-
-	<div class="phpinfo">
-		{phpinfo}
-		<div style="clear:both;line-height:0px;">&#160;</div>
-	</div>
-
-	<div class="plugininfo">
-		{legend}
-		{controllers}
-		<div style="clear:both;line-height:0px;">&#160;</div>
-	</div>
-
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-select.tpl.php b/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-select.tpl.php
deleted file mode 100644
index b6ff959..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-select.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h1>{label}</h1>
-
-<div id="form">
-	<h3>Base</h3>
-	{table_base}
-	<br><br>
-	<h3>Plugins</h3>
-	{table_plugins}
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-template.tpl.php b/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-template.tpl.php
deleted file mode 100644
index 8d13f06..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/development-template.tpl.php
+++ /dev/null
@@ -1,27 +0,0 @@
-
-<h1 class="apih1">{label}</h1>
-
-<div id="form">
-
-	<div class="paginator">
-		<div style="float:left;">{previous}</div>
-		<div style="float:right;">{next}</div>
-		<div class="switch">
-			{switch}
-			<div style="clear:both;line-height:0px;" class="floarbreaker">&#160;</div>
-		</div>
-		<div style="clear:both;line-height:0px;" class="floarbreaker">&#160;</div>
-	</div>
-
-	<div class="phpinfo">
-		{phpinfo}
-		<div style="clear:both;line-height:0px;">&#160;</div>
-	</div>
-
-	<div class="plugininfo">
-		{legend}
-		{controllers}
-		<div style="clear:both;line-height:0px;">&#160;</div>
-	</div>
-
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/docblock.tpl.php b/openQRM-5.3.50-CE/src/plugins/development/web/tpl/docblock.tpl.php
deleted file mode 100644
index 38da5ef..0000000
--- a/openQRM-5.3.50-CE/src/plugins/development/web/tpl/docblock.tpl.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="apidoc">
-	<a name="{class}" style="line-height:0px;height:0px;display:block;width:0px">&#160;</a>
-	<h1>{classname}</h1>
-	{filename}<br>
-	{extends}<br>
-	{implements}<br>
-	<pre class="head">{docblock}</pre>
-
-	<div class="links">
-	<div style="float:left; width:250px;"><h3>Attributes</h3>{attribs-ul}</div>
-	<div style="float:left; width:250px;"><h3>Methods</h3>{methods-ul}</div>
-	<div style="clear:both" class="floatbreaker">&#160;</div>
-	</div>
-
-	<div class="attribs">
-	<h3>Attributes</h3>
-	{attribs}</div>
-
-	<div class="methods">
-	<h3>Methods</h3>
-	{methods}</div>
-
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/Makefile b/openQRM-5.3.50-CE/src/plugins/device-manager/Makefile
deleted file mode 100644
index c37e757..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# this is the openQRM device-manager-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/device-manager* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/img
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && chmod 777 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/lang/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/bin
-	. $(OPENQRM_SERVER_CONF) && cp bin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/bin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/bin/openqrm*
-	. $(OPENQRM_SERVER_CONF) && tar -C $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager -czvf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/boot-service-device-manager.tgz include/ bin/ etc/init.d/device-manager
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/device-manager
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/device-manager/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/bin/openqrm-device-manager b/openQRM-5.3.50-CE/src/plugins/device-manager/bin/openqrm-device-manager
deleted file mode 100644
index 081ec7f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/bin/openqrm-device-manager
+++ /dev/null
@@ -1,350 +0,0 @@
-#!/bin/bash
-# this script automatically manages device-manager
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/include/openqrm-plugin-device-manager-functions
-OPENQRM_POSTENCODE="$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-postencode"
-if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-	OPENQRM_SERVER_IP=$resource_openqrmserver
-	OPENQRM_EXEC_PORT=$resource_execdport
-elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-	openqrm_server_get_config
-	OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-	resource_id=0
-	resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-	openqrm_web_protocol=$OPENQRM_WEB_PROTOCOL
-fi
-export LANG=C
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-# let only root run this script
-WHOAMI=`whoami`
-if [ "$WHOAMI" != "root" ]; then
-	echo "ERROR: Please run this script as root!"
-	exit 6
-fi
-
-# lvm installed ?
-if ! openqrm_full_fill_os_dependency lvm lvm2; then
-	if [ "$NON_BLOCKING" != "true" ]; then
-		openqrm_unblock_starting_queue $@
-	fi
-	exit 1
-fi
-# procmail for lockfile
-if ! openqrm_full_fill_os_dependency lockfile procmail; then
-	if [ "$NON_BLOCKING" != "true" ]; then
-		openqrm_unblock_starting_queue $@
-	fi
-	exit 1
-fi
-# blkid
-if ! openqrm_full_fill_os_dependency blkid util-linux; then
-	if [ "$NON_BLOCKING" != "true" ]; then
-		openqrm_unblock_starting_queue $@
-	fi
-	exit 1
-fi
-
-## for development !!!! ##################################
-# avoiding using a real partition or disk for now ########
-#DD_FILE="/tmp/device-manager.lvm.img"
-#if [ ! -f $DD_FILE ]; then
-#	dd if=/dev/zero of=$DD_FILE bs=1M seek=5000 count=0
-#fi
-#if ! losetup -a | grep $DD_FILE 1>/dev/null; then
-#	losetup -d /dev/loop0 2>/dev/null
-#	losetup -f -v $DD_FILE
-#fi
-#
-#DD_FILE1="/tmp/device-manager1.lvm.img"
-#if [ ! -f $DD_FILE1 ]; then
-#	dd if=/dev/zero of=$DD_FILE1 bs=1M seek=5000 count=0
-#fi
-#if ! losetup -a | grep $DD_FILE1 1>/dev/null; then
-#	losetup -d /dev/loop1 2>/dev/null
-#	losetup -f -v $DD_FILE1
-#fi
-#
-
-####################################################################
-
-
-
-function device_manager_usage() {
-	echo "Usage : $0 list <-u username> <-p password>"
-	echo "        $0 add_vg <-d device-name> <-v volume-group-name> <-u username> <-p password>"
-	echo "        $0 remove_vg <-v volume-group-name> <-u username> <-p password>"
-	echo ""
-	echo "Optional parameters:"
-	echo "             [--openqrm-ui-user <username>]"
-	echo "             [--openqrm-internal-cmd <true/false>]"
-	echo "             [--openqrm-cmd-mode <regular/background/fork>]"
-	exit 1
-}
-
-FULL_COMMANDLINE="$0 $@"
-DEVICE_MANAGER_MANAGER_COMMAND=$1
-shift
-
-while [ $# -ne 0 ]; do
-	case "$1" in
-		-d)
-			DEVICE_MANAGER_DEVICE_NAME=$2
-			shift
-			;;
-		-v)
-			DEVICE_MANAGER_VG_NAME=$2
-			shift
-			;;
-		-a)
-			DEVICE_MANAGER_ADD_DEV_TO_VG=$2
-			shift
-			;;
-		-u)
-			DEVICE_MANAGER_OPENQRM_USERNAME=$2
-			shift
-			;;
-		-p)
-			DEVICE_MANAGER_OPENQRM_PASSWORD=$2
-			shift
-			;;
-		--openqrm-ui-user)
-			OPENQRM_UI_USER=$2
-			shift
-			;;
-		--openqrm-internal-cmd)
-			OPENQRM_INTERNAL_CMD=$2
-			shift
-			;;
-		--openqrm-cmd-mode)
-			OPENQRM_CMD_MODE=$2
-			shift
-			;;
-		*)
-			if [ "$NON_BLOCKING" != "true" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			fi
-			echo "ERROR: Free commandline arguments are not allowed"
-			device_manager_manager_usage
-			exit 6
-			;;
-	esac
-	shift
-done
-
-if [ "$OPENQRM_UI_USER" != "" ]; then
-	OPENQRM_UI_USER_PARAMETER=" --openqrm-ui-user $OPENQRM_UI_USER"
-fi
-
-# main
-case "$DEVICE_MANAGER_MANAGER_COMMAND" in 
-
-	list)
-		TMP_CONFIG_MOUNTED_BASE_DEV=`mktemp /tmp/device-manager-mounted.XXXXXX`
-		TMP_CONFIG_PVS_BASE_DEV=`mktemp /tmp/device-manager-pvs.XXXXXX`
-		TMP_CONFIG_MOUNTED_FULL_DEV=`mktemp /tmp/device-manager-mounted.XXXXXX`
-		TMP_CONFIG_PVS_FULL_DEV=`mktemp /tmp/device-manager-pvs.XXXXXX`
-		STORAGE_STATUS_TMP=$resource_id.device.stat
-
-		LOCK_TIME=`openqrm_lock_queue aquire device-manager`
-		trap "openqrm_lock_queue release device-manager $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		> $STORAGE_STATUS_TMP
-		df | awk {' print $1  '} | grep ^/dev | grep -v "/dev/mapper/" | sed -e "s#[0-9].*##g" > $TMP_CONFIG_MOUNTED_BASE_DEV
-		pvs | awk {' print $1  '} | tail -n+2 | grep ^/dev | sed -e "s#[0-9].*##g" > $TMP_CONFIG_PVS_BASE_DEV
-		df | awk {' print $1  '} | grep ^/dev | grep -v "/dev/mapper/" > $TMP_CONFIG_MOUNTED_FULL_DEV
-		pvs | awk {' print $1  '} | tail -n+2 | grep ^/dev > $TMP_CONFIG_PVS_FULL_DEV
-		for PDEV in `cat /proc/partitions | grep -v ^major | awk {' print "/dev/"$4  '} | grep -v -w /dev/ | grep -v "dm-[0-9]" | grep -v "sr[0-9]"`; do
-			PDEV_MAIN_DISK=`echo $PDEV | sed -e "s#[0-9].*##g"`
-			if [ "$PDEV" == "$PDEV_MAIN_DISK" ]; then
-				continue
-			fi
-			echo "$PDEV" >> $STORAGE_STATUS_TMP
-
-			#unset UUID
-			#eval `blkid $PDEV | awk '{ print $2 }'`
-			#if [ "$UUID" == "" ]; then
-			#	if echo $PDEV | grep "/dev/loop" 1>/dev/null; then
-			#		if ! grep -w $PDEV $TMP_CONFIG_MOUNTED_FULL_DEV 1>/dev/null; then
-			#			if ! grep -w $PDEV $TMP_CONFIG_PVS_FULL_DEV 1>/dev/null; then
-			#				echo "$PDEV" >> $STORAGE_STATUS_TMP
-			#			fi
-			#		fi
-			#	else
-			#		if ! grep -w $PDEV $TMP_CONFIG_MOUNTED_BASE_DEV 1>/dev/null; then
-			#			if ! grep -w $PDEV $TMP_CONFIG_PVS_BASE_DEV 1>/dev/null; then
-			#				echo "$PDEV" >> $STORAGE_STATUS_TMP
-			#			fi
-			#		fi
-			#	fi
-			#fi
-
-		done
-		rm -f $TMP_CONFIG_MOUNTED_BASE_DEV $TMP_CONFIG_PVS_BASE_DEV $TMP_CONFIG_MOUNTED_FULL_DEV $TMP_CONFIG_PVS_FULL_DEV
-		sed -i -e "s/ \{1,\}/@/g" $STORAGE_STATUS_TMP
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$DEVICE_MANAGER_OPENQRM_USERNAME --http-password=$DEVICE_MANAGER_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/device-manager/device-manager-action.php?device_manager_command=get_device_list; then
-			openqrm_post_event 0 "post_vg" 2 "openqrm-device-manager" "Could not post the device list to the openQRM-server at $OPENQRM_SERVER_IP!"
-		fi
-		rm -f $STORAGE_STATUS_TMP $STORAGE_STATUS_TMP.post
-
-		openqrm_lock_queue release device-manager $LOCK_TIME
-		trap '' EXIT
-		;;
-
-	add_vg)
-		RETURN_CODE=0
-		RETURN_MSG=""
-		openqrm_post_event 0 "start" 5 "openqrm-device-manager" "Starting lvm on resource $resource_id."
-		if [ "$DEVICE_MANAGER_VG_NAME" == "" ] || [ "$DEVICE_MANAGER_DEVICE_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			device_manager_usage
-		fi
-		if [ ! -e "$DEVICE_MANAGER_DEVICE_NAME" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			RETURN_CODE=1
-			RETURN_MSG="Device $DEVICE_MANAGER_DEVICE_NAME is not existing on resource resource $resource_id."
-			openqrm_post_event 0 "add_vg" 3 "openqrm-device-manager" "$RETURN_MSG"
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire device-manager`
-		trap "openqrm_lock_queue release device-manager $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		if [ "$RETURN_CODE" == 0 ]; then
-			openqrm_post_event 0 "start" 5 "openqrm-device-manager" "Resource $resource_id is preparing $DEVICE_MANAGER_DEVICE_NAME for LVM Volume Group $DEVICE_MANAGER_VG_NAME."
-			if ! pvcreate -ff -y $DEVICE_MANAGER_DEVICE_NAME; then
-				RETURN_CODE=1
-				RETURN_MSG="Could not init device $DEVICE_MANAGER_DEVICE_NAME for LVM on resource resource $resource_id."
-				openqrm_post_event 0 "add_vg" 3 "openqrm-device-manager" "$RETURN_MSG"
-			fi
-		fi
-		# new vg or extent existing vg
-		if [ "$RETURN_CODE" == 0 ]; then
-			if [ "$DEVICE_MANAGER_ADD_DEV_TO_VG" == "true" ]; then
-				if ! vgextend $DEVICE_MANAGER_VG_NAME $DEVICE_MANAGER_DEVICE_NAME; then
-					RETURN_CODE=1
-					RETURN_MSG="Could not extent existing LVM Volume Group $DEVICE_MANAGER_VG_NAME with $DEVICE_MANAGER_DEVICE_NAME."
-					openqrm_post_event 0 "add_vg" 3 "openqrm-device-manager" "$RETURN_MSG"
-				fi
-			else
-				if ! vgcreate $DEVICE_MANAGER_VG_NAME $DEVICE_MANAGER_DEVICE_NAME; then
-					RETURN_CODE=1
-					RETURN_MSG="Could not create new LVM Volume Group $DEVICE_MANAGER_VG_NAME from $DEVICE_MANAGER_DEVICE_NAME."
-					openqrm_post_event 0 "add_vg" 3 "openqrm-device-manager" "$RETURN_MSG"
-				fi
-			fi
-		fi
-		if [ "$RETURN_CODE" == 0 ]; then
-			RETURN_MSG="ok"
-		fi
-		# Send message
-		STORAGE_STATUS_TMP=$resource_id.device.stat
-		> $STORAGE_STATUS_TMP
-		echo $RETURN_MSG > $STORAGE_STATUS_TMP
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$DEVICE_MANAGER_OPENQRM_USERNAME --http-password=$DEVICE_MANAGER_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/device-manager/device-manager-action.php?device_manager_command=get_device_list; then
-			openqrm_post_event 0 "lvm" 2 "openqrm-device-manager" "Could not post the device list to the openQRM-server at $OPENQRM_SERVER_IP!"
-		fi
-		rm -f $STORAGE_STATUS_TMP
-
-		openqrm_lock_queue release device-manager $LOCK_TIME
-		trap '' EXIT
-
-		exit $RETURN_CODE
-		;;
-
-
-	remove_vg)
-		RETURN_CODE=0
-		RETURN_MSG=""
-		openqrm_post_event 0 "start" 5 "openqrm-device-manager" "Removing volume group on resource $resource_id."
-		if [ "$DEVICE_MANAGER_VG_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			device_manager_usage
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire device-manager`
-		trap "openqrm_lock_queue release device-manager $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# check that the vg does not contain any lvols
-		if lvs | grep -w $DEVICE_MANAGER_VG_NAME 1>/dev/null; then
-			RETURN_CODE=1
-			RETURN_MSG="LVM Volume Group $DEVICE_MANAGER_VG_NAME on resource $resource_id still contains logical Volumes."
-			openqrm_post_event 0 "remove_vg" 3 "openqrm-device-manager" "$RETURN_MSG"
-		fi
-		# check which pvs are going to be free when removing the vg
-		for FREE_PVS in `pvs | grep -w $DEVICE_MANAGER_VG_NAME | awk {' print $1  '}`; do
-			FREE_PVS_LIST="$FREE_PVS_LIST $FREE_PVS"
-		done
-		# remove vg
-		if [ "$RETURN_CODE" == 0 ]; then
-			if ! vgremove -f $DEVICE_MANAGER_VG_NAME; then
-				RETURN_CODE=1
-				RETURN_MSG="Could not remove LVM Volume Group $DEVICE_MANAGER_VG_NAME on resource $resource_id."
-				openqrm_post_event 0 "remove_vg" 3 "openqrm-device-manager" "$RETURN_MSG"
-			fi
-		fi
-		# remove freed pvs
-		if [ "$RETURN_CODE" == 0 ]; then
-			for FREE_PVS_DEV in $FREE_PVS_LIST; do
-				if ! pvremove -f -y $FREE_PVS_DEV; then
-					openqrm_post_event 0 "remove_vg" 3 "openqrm-device-manager" "Could not free physical Device $FREE_PVS_DEV on resource $resource_id."
-				fi
-			done
-		fi
-		if [ "$RETURN_CODE" == 0 ]; then
-			RETURN_MSG="ok"
-			openqrm_post_event 0 "remove_vg" 5 "openqrm-device-manager" "Resource $resource_id removed LVM Volume Group $DEVICE_MANAGER_VG_NAME."
-		fi
-		# Send message
-		STORAGE_STATUS_TMP=$resource_id.device.stat
-		> $STORAGE_STATUS_TMP
-		echo $RETURN_MSG > $STORAGE_STATUS_TMP
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$DEVICE_MANAGER_OPENQRM_USERNAME --http-password=$DEVICE_MANAGER_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/device-manager/device-manager-action.php?device_manager_command=get_device_list; then
-			openqrm_post_event 0 "lvm" 2 "openqrm-device-manager" "Could not post the device list to the openQRM-server at $OPENQRM_SERVER_IP!"
-		fi
-		rm -f $STORAGE_STATUS_TMP
-
-		openqrm_lock_queue release device-manager $LOCK_TIME
-		trap '' EXIT
-
-		exit $RETURN_CODE
-		;;
-
-
-
-
-
-	*)
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		echo "ERROR: Free commandline arguments are not allowed!"
-		device_manager_usage
-		exit 6
-		;;
-esac
-
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/etc/init.d/device-manager b/openQRM-5.3.50-CE/src/plugins/device-manager/etc/init.d/device-manager
deleted file mode 100644
index 3f7e1e4..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/etc/init.d/device-manager
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-# this is the boot-service init script for the device-manager resources
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-# for including the package functions
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/include/openqrm-plugin-device-manager-functions
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-OPENQRM_SERVER_IP=$resource_openqrmserver
-
-# do not run on idle resources
-if [ "$resource_image" == "idle" ]; then
-	exit 0
-fi
-
-# also do not run before the real init of the rootfs
-# if we have this file /etc/initrd-devices.conf we are still in the initrd
-if [ -f /etc/initrd-devices.conf ]; then
-
-	# TODO: add your commands to run in the initrd-stage on a managed system (network-deployment only)
-
-	exit 0
-fi
-
-
-function device_manager_start() {
-	echo "Starting the openQRM device-manager-plugin"
-	device_manager_stop 1>/dev/null 2>&1
-}
-
-
-function device_manager_stop() {
-	echo "Stopping the openQRM device-manager-plugin"
-}
-
-
-
-
-
-case "$1" in
-	start)
-		device_manager_start
-		;;
-	stop)
-		device_manager_stop
-		;;
-	restart)
-		device_manager_stop
-		sleep 1
-		device_manager_start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/etc/init.d/openqrm-plugin-device-manager b/openQRM-5.3.50-CE/src/plugins/device-manager/etc/init.d/openqrm-plugin-device-manager
deleted file mode 100644
index d0e1746..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/etc/init.d/openqrm-plugin-device-manager
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/bash
-# init script for the openQRM device-manager-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/include/openqrm-plugin-device-manager-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/etc/openqrm-plugin-device-manager.conf
-openqrm_server_get_config
-export LANG=C
-# define wget to use with https
-if [ "$OPENQRM_WEB_PROTOCOL" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-
-function openqrm_plugin_device_manager_start() {
-	echo "Starting the openQRM device-manager-plugin"
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/device-manager/.running
-}
-
-
-function openqrm_plugin_device_manager_stop() {
-	echo "Stopping the openQRM device-manager-plugin"
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/device-manager/.running
-}
-
-function openqrm_plugin_device_manager_uninstall() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "device-manager: Please give a username to uninstall the plugin : "
-		read USERNAME
-		echo
-		echo -n "device-manager: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Uninstalling the openQRM device-manager-plugin"
-	openqrm_plugin_device_manager_stop
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-device-manager.tgz
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/device-manager
-}
-
-function openqrm_plugin_device_manager_init() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "device-manager: Please give a username to init the plugin : "
-		read USERNAME
-		echo
-		echo -n "device-manager: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-
-	echo "Initializing the openQRM device-manager-plugin"
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/device-manager
-	# link the boot-service
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/boot-service-device-manager.tgz $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-device-manager.tgz
-	# create storage dir for stat files
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/storage
-	chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/storage
-	echo "Order deny,allow" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/storage/.htaccess
-	echo "Deny from all" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/device-manager/web/storage/.htaccess
-
-}
-
-
-
-
-
-
-
-USER=$2
-PASS=$3
-
-case "$1" in
-	start)
-		openqrm_plugin_device_manager_start
-		;;
-	stop)
-		openqrm_plugin_device_manager_stop
-		;;
-	restart)
-		openqrm_plugin_device_manager_stop
-		sleep 1
-		openqrm_plugin_device_manager_start
-		;;
-	init)
-		openqrm_plugin_device_manager_init $USER $PASS
-		;;
-	uninstall)
-		openqrm_plugin_device_manager_uninstall $USER $PASS
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/etc/init.d/openqrm-plugin-device-manager.postinstall b/openQRM-5.3.50-CE/src/plugins/device-manager/etc/init.d/openqrm-plugin-device-manager.postinstall
deleted file mode 100644
index c9ebdb0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/etc/init.d/openqrm-plugin-device-manager.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-device-manager postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/etc/init.d/openqrm-plugin-device-manager.preremove b/openQRM-5.3.50-CE/src/plugins/device-manager/etc/init.d/openqrm-plugin-device-manager.preremove
deleted file mode 100644
index 6363422..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/etc/init.d/openqrm-plugin-device-manager.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-device-manager preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-device-manager stop
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/etc/openqrm-plugin-device-manager.conf b/openQRM-5.3.50-CE/src/plugins/device-manager/etc/openqrm-plugin-device-manager.conf
deleted file mode 100644
index b759caf..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/etc/openqrm-plugin-device-manager.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-# this is the openQRM-plugin-device-manager info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="A Device-manager to preconfigure LVM."
-OPENQRM_PLUGIN_TYPE="management"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES=""
-
-# list of storage types supported by this plugin
-OPENQRM_DEVICE_MANAGER_STORAGE_TYPES="kvm-lvm-deployment, lvm-aoe-deployment, lvm-iscsi-deployment, lvm-nfs-deployment, aoe-san-deployment, iscsi-san-deployment, xen-lvm-deployment, clonezilla-deployment, openvz-deployment, lxc-lvm-deployment"
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES=""
-# dirs which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_DIRS="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/web/device-manager/ $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/etc/"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/include/openqrm-plugin-device-manager-functions b/openQRM-5.3.50-CE/src/plugins/device-manager/include/openqrm-plugin-device-manager-functions
deleted file mode 100644
index 59f283f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/include/openqrm-plugin-device-manager-functions
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-# this is the functions file for the device-manager-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-################ common device-manager functions
-
-
-
-################ device-manager functions
-
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/web/class/device-manager-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/device-manager/web/class/device-manager-about.controller.class.php
deleted file mode 100644
index a85c20c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/web/class/device-manager-about.controller.class.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/**
- * Device-manager Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class device_manager_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'device_manager_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'device_manager_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'device_manager_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'device_manager_about_identifier';
-/**
-* path to device-managers
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About Device-manager',
-		'label' => 'About Device-manager',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The Device-manager plugin provides an easy way to add or remove LVM Volume Groups. It is usefull to prepare system to be used as LVM based storages. If enabled, it is available for LVM based storage plugins.',
-		'requirements_title' => 'Requirements',
-		'requirements_list' => 'none',
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Deployment',
-		'documentation_title' => 'Documentation',
-	),
-);
-
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/device-manager/lang", 'device-manager-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/device-manager/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About Device-manager
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/device-manager/class/device-manager-about.documentation.class.php');
-			$controller = new device_manager_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/web/class/device-manager-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/device-manager/web/class/device-manager-about.documentation.class.php
deleted file mode 100644
index 2b92b6f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/web/class/device-manager-about.documentation.class.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * device-manager-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class device_manager_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'device_manager_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'device_manager_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'device_manager_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'device_manager_about_identifier';
-/**
-* path to device-managers
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-		$this->basedir    = $this->openqrm->get('basedir');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_device-manager
-	 */
-	//--------------------------------------------
-	function action() {
-		$svn_co_command = "";
-		$t = $this->response->html->template($this->tpldir.'/device-manager-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/web/class/device-manager.addvg.class.php b/openQRM-5.3.50-CE/src/plugins/device-manager/web/class/device-manager.addvg.class.php
deleted file mode 100644
index 11ab3f3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/web/class/device-manager.addvg.class.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-/**
- * device-manager Add LVM Volume Group
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class device_manager_addvg
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name;
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab;
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name;
-/**
-* path to device-managers
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-		'label' => 'Add Volume Group to storage %s',
-		'partition' => 'Partition',
-		'name' => 'Name',
-		'extend' => 'extend partition',
-		'confirm_text' => 'All Data on %s will be erased.<br>Are you sure to continue?',
-		'msg_added' => 'Successfully added Volume Group %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-		'error_name' => 'Name must be %s only'
-	);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->tpldir   = $this->rootdir.'/plugins/device-manager/tpl';
-
-		$id = $this->response->html->request()->get('storage_id');
-		$this->response->add('storage_id', $id);
-
-		$storage = $this->openqrm->storage();
-		$this->storage = $storage->get_instance_by_id($id);
-
-		$resource = $this->openqrm->resource();
-		$this->resource = $resource->get_instance_by_id($this->storage->resource_id);
-		
-		$this->statfile = $this->openqrm->get('basedir').'/plugins/device-manager/web/storage/'.$this->resource->id.'.device.stat';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->addvg();
-		$deployment = new deployment();
-		$deployment->get_instance_by_id($this->storage->type);
-
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-			);
-		}
-
-		$data['plugin'] = $deployment->storagetype;
-		$data['label'] = sprintf($this->lang['label'], $this->storage->name);
-		$data['baseurl'] = $this->openqrm->get('baseurl');
-		$data['thisfile']    = $response->html->thisfile;
-		$t = $response->html->template($this->tpldir.'/device-manager-addvg.tpl.php');
-		$t->add($response->form);
-		$t->add($data);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Ad Volume Group
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function addvg() {
-		// load partition file
-		$file = $this->statfile;
-		$command = $this->openqrm->get('basedir').'/plugins/device-manager/bin/openqrm-device-manager list';
-		$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-		if($this->file->exists($file)) {
-			$this->file->remove($file);
-		}
-		$this->resource->send_command($this->resource->ip, $command);
-		while (!$this->file->exists($file)) // check if the data file has been modified
-		{
-			usleep(10000); // sleep 10ms to unload the CPU
-			clearstatcache();
-		}
-		// get response
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $response->submit()) {
-			if($response->html->request()->get('confirm') !== '') {
-				$file = $this->statfile;
-				$command  = $this->openqrm->get('basedir').'/plugins/device-manager/bin/openqrm-device-manager add_vg';
-				$command .= ' -d '.$form->get_request('device');
-				$command .= ' -v '.$form->get_request('name');
-				$command .= ' -u '.$this->openqrm->admin()->name;
-				$command .= ' -p '.$this->openqrm->admin()->password;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode regular';
-				if($response->html->request()->get('extend') !== '') {
-					$command .= ' -a true';
-				}
-				if($this->file->exists($file)) {
-					$this->file->remove($file);
-				}
-				$this->resource->send_command($this->resource->ip, $command);
-				while (!$this->file->exists($file)) // check if the data file has been modified
-				{
-					usleep(10000); // sleep 10ms to unload the CPU
-					clearstatcache();
-				}
-				$result = trim($this->file->get_contents($file));
-				if($result === 'ok') {
-					echo $command;
-					$response->msg = sprintf($this->lang['msg_added'], $form->get_request('name'));
-				}
-				else if($result !== 'ok') {
-					$response->error = $result;
-				}
-			} else {
-				$response = $this->get_response('confirm');
-			}
-		} else {
-			if($form->get_errors()) {
-				$_REQUEST[$this->message_param] = implode("<br>", $form->get_errors());
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param enum $mode [confirm]
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response($mode = '') {
-		$response = $this->response;
-		$form     = $response->get_form($this->actions_name, 'addvg');
-
-		if($mode !== 'confirm') {
-			$result   = array();
-			if($this->file->exists($this->statfile)) {
-				$result = trim($this->file->get_contents($this->statfile));
-				$result = explode("\n", $result);
-			}
-			$select = array();
-			foreach($result as $v) {
-				$select[] = array($v);
-			}
-			$d['select']['label']                       = $this->lang['partition'];
-			$d['select']['required']                    = true;
-			$d['select']['object']['type']              = 'htmlobject_select';
-			$d['select']['object']['attrib']['name']    = 'device';
-			$d['select']['object']['attrib']['index']   = array(0,0);
-			$d['select']['object']['attrib']['options'] = $select;
-
-			$d['name']['label']                    = $this->lang['name'];
-			$d['name']['required']                 = true;
-			$d['name']['validate']['regex']        = '/^[a-z0-9_-]+$/i';
-			// TODO translation in kvm, .., etc
-			$d['name']['validate']['errormsg']     = sprintf('Name must be %s only', 'a-z0-9_-');
-			$d['name']['object']['type']           = 'htmlobject_input';
-			$d['name']['object']['attrib']['name'] = 'name';
-
-			$d['extend']['label']                    =  $this->lang['extend'];
-			$d['extend']['object']['type']           = 'htmlobject_input';
-			$d['extend']['object']['attrib']['type'] = 'checkbox';
-			$d['extend']['object']['attrib']['name'] = 'extend';
-
-			$d['confirm']['object']['type']            = 'htmlobject_input';
-			$d['confirm']['object']['attrib']['type']  = 'hidden';
-			$d['confirm']['object']['attrib']['name']  = 'confirm';
-			$d['confirm']['object']['attrib']['value'] = '';
-
-			$d['confirm_text'] = '';
-		}
-
-		if($mode === 'confirm') {
-			$d['select']['object']['type']            = 'htmlobject_input';
-			$d['select']['object']['attrib']['type']  = 'hidden';
-			$d['select']['object']['attrib']['name']  = 'device';
-			$d['select']['object']['attrib']['value'] = $response->html->request()->get('device');
-
-			$d['name']['object']['type']           = 'htmlobject_input';
-			$d['name']['object']['attrib']['type']  = 'hidden';
-			$d['name']['object']['attrib']['name'] = 'name';
-			$d['name']['object']['attrib']['value'] = $response->html->request()->get('name');
-
-			$d['extend'] = '';
-			if($response->html->request()->get('extend') !== '') {
-				$d['extend']['static']                    = true;
-				$d['extend']['object']['type']            = 'htmlobject_input';
-				$d['extend']['object']['attrib']['type']  = 'hidden';
-				$d['extend']['object']['attrib']['name']  = 'extend';
-				$d['extend']['object']['attrib']['value'] = 'true';
-			}
-
-			$d['confirm']['static']                    = true;
-			$d['confirm']['object']['type']            = 'htmlobject_input';
-			$d['confirm']['object']['attrib']['type']  = 'hidden';
-			$d['confirm']['object']['attrib']['name']  = 'confirm';
-			$d['confirm']['object']['attrib']['value'] = 'true';
-
-			$div = $response->html->div();
-			$div->name = 'xxx';
-			$div->style = 'margin: 0 0 20px 0;';
-			$div->add(sprintf($this->lang['confirm_text'], $response->html->request()->get('device')));
-			$form->add($div, 'confirm_text');
-		}
-
-		$form->add($d);
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$cancel = $form->get_elements('cancel');
-		$cancel->handler = 'onclick="cancel();"';
-		$form->add($cancel, 'cancel');
-
-		$form->display_errors = false;
-
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/web/class/device-manager.removevg.class.php b/openQRM-5.3.50-CE/src/plugins/device-manager/web/class/device-manager.removevg.class.php
deleted file mode 100644
index 26153ed..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/web/class/device-manager.removevg.class.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * device-manager Remove LVM Volume Group
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class device_manager_removevg
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name;
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab;
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name;
-/**
-* path to device-managers
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-		'label' => 'Remove Volume Group on storage %s',
-		'confirm_text' => 'Do you realy want to remove Volume Group %s?',
-		'msg_removed' => 'Successfully removed Volume Group %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..'
-	);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->tpldir   = $this->rootdir.'/plugins/device-manager/tpl';
-
-		$id = $this->response->html->request()->get('storage_id');
-		$this->response->add('storage_id', $id);
-		$this->response->add('volgroup', $this->response->html->request()->get('volgroup'));
-
-		$storage = new storage();
-		$this->storage = $storage->get_instance_by_id($id);
-
-		$resource = new resource();
-		$this->resource = $resource->get_instance_by_id($this->storage->resource_id);
-		
-		$this->statfile = $this->openqrm->get('basedir').'/plugins/device-manager/web/storage/'.$this->resource->id.'.device.stat';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->removevg();
-		$deployment = new deployment();
-		$deployment->get_instance_by_id($this->storage->type);
-
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-			);
-		}
-
-		$data['confirm_text'] = sprintf($this->lang['confirm_text'], $this->response->html->request()->get('volgroup'));
-		$data['plugin'] = $deployment->storagetype;
-		$data['label'] = sprintf($this->lang['label'], $this->storage->name);
-		$data['baseurl'] = $this->openqrm->get('baseurl');
-		$data['thisfile']    = $response->html->thisfile;
-		$t = $response->html->template($this->tpldir.'/device-manager-removevg.tpl.php');
-		$t->add($response->form);
-		$t->add($data);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove Volume Group
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function removevg() {
-		// get response
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $response->submit()) {
-			$command  = $this->openqrm->get('basedir').'/plugins/device-manager/bin/openqrm-device-manager remove_vg';
-			$command .= ' -v '.$this->response->html->request()->get('volgroup');
-			$command .= ' -u '.$this->openqrm->admin()->name;
-			$command .= ' -p '.$this->openqrm->admin()->password;
-			$command .= ' --openqrm-ui-user '.$this->user->name;
-			$command .= ' --openqrm-cmd-mode regular';
-			if($this->file->exists($this->statfile)) {
-				$this->file->remove($this->statfile);
-			}
-			$this->resource->send_command($this->resource->ip, $command);
-			while (!$this->file->exists($this->statfile)) // check if the data file has been modified
-			{
-				usleep(10000); // sleep 10ms to unload the CPU
-				clearstatcache();
-			}
-			$result = trim($this->file->get_contents($this->statfile));
-			if($result === 'ok') {
-				$response->msg = sprintf($this->lang['msg_removed'], $this->response->html->request()->get('volgroup'));
-			}
-			else if($result !== 'ok') {
-				$response->error = $result;
-			}
-		} else {
-			if($form->get_errors()) {
-				$_REQUEST[$this->message_param] = implode("<br>", $form->get_errors());
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form     = $response->get_form($this->actions_name, 'removevg');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$cancel = $form->get_elements('cancel');
-		$cancel->handler = 'onclick="cancel();"';
-		$form->add($cancel, 'cancel');
-
-		$form->display_errors = false;
-
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/web/css/device-manager.css b/openQRM-5.3.50-CE/src/plugins/device-manager/web/css/device-manager.css
deleted file mode 100644
index e69de29..0000000
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/web/device-manager-action.php b/openQRM-5.3.50-CE/src/plugins/device-manager/web/device-manager-action.php
deleted file mode 100644
index 0f5a005..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/web/device-manager-action.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-$thisfile = basename($_SERVER['PHP_SELF']);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-$BaseDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-// filter inputs
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-$device_manager_command = $request->get('device_manager_command');
-
-global $OPENQRM_SERVER_BASE_DIR;
-
-$event = new event();
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $event;
-
-// place for the storage stat files
-$device_statdir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/device-manager/storage';
-
-
-// user/role authentication
-if ($OPENQRM_USER->role != "administrator") {
-	$event->log("authorization", $_SERVER['REQUEST_TIME'], 1, "device-manager-action", "Un-Authorized access to device-manager-actions from $OPENQRM_USER->name", "", "", 0, 0, 0);
-	exit();
-}
-
-
-// main
-$event->log("$device_manager_command", $_SERVER['REQUEST_TIME'], 5, "device-manager-action", "Processing device-manager command $device_manager_command", "", "", 0, 0, 0);
-
-	switch ($device_manager_command) {
-
-		case 'get_device_list':
-			if (!file_exists($device_statdir)) {
-				mkdir($device_statdir);
-			}
-			$filename = $device_statdir."/".$_POST['filename'];
-			$filedata = base64_decode($_POST['filedata']);
-			echo "<h1>$filename</h1>";
-			$fout = fopen($filename,"wb");
-			fwrite($fout, $filedata);
-			fclose($fout);
-			break;
-
-
-
-		default:
-			$event->log("$device_manager_command", $_SERVER['REQUEST_TIME'], 3, "device-manager-action", "No such event command ($device_manager_command)", "", "", 0, 0, 0);
-			break;
-
-
-	}
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/device-manager/web/img/plugin.png
deleted file mode 100644
index e952cbc..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/device-manager/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/web/lang/de.device-manager-about.ini b/openQRM-5.3.50-CE/src/plugins/device-manager/web/lang/de.device-manager-about.ini
deleted file mode 100644
index 44b32fb..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/web/lang/de.device-manager-about.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[documentation]
-tab = "Über Device-Manager"
-label = "Über Device-Manager"
-
-introduction_title = "Einführung"
-introduction_content = "Das Device-Manager plugin bietet einen einfachen Weg LVM-Volume-Groups anzulegen oder zu löschen. Wenn das Plugin aktiviert ist, stehen die Funktionen allen LVM basierten Storage-Plugins zur Verfügung."
-
-requirements_title = "Vorausetzungen"
-requirements_list = "keine"
-
-tested_title = "Getestet mit"
-tested_content = "Das Plugin wurde mit Debian, Ubuntu und CentOS Linux."
-
-type_title = "Plugin Typ"
-type_content = "<span class=\"pill\">Deployment</span>"
-
-documentation_title = "Dokumentation"
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/web/lang/en.device-manager-about.ini b/openQRM-5.3.50-CE/src/plugins/device-manager/web/lang/en.device-manager-about.ini
deleted file mode 100644
index 6d3f8dd..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/web/lang/en.device-manager-about.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[documentation]
-tab = "About Device manager"
-label = "About Device manager"
-
-introduction_title = "Introduction"
-introduction_content = "<p>The Device manager plugin provides an easy way to add or remove LVM Volume Groups. It is usefull to prepare system to be used as LVM based storages. If enabled, it is available for LVM based storage plugins.</p>"
-
-requirements_title = "Requirements"
-requirements_list = "none"
-
-tested_title = "Tested with"
-tested_content = "This plugin is tested with Debian, Ubuntu and CentOS."
-
-type_title = "Plugin Type"
-type_content = "<span class=\"pill\">Deployment</span>"
-
-documentation_title = "Documentation"
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/device-manager/web/menu.txt
deleted file mode 100644
index 5f2916c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/web/menu.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|Device-manager|index.php?plugin=device-manager&controller=device-manager-about|How to use
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/web/tpl/device-manager-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/device-manager/web/tpl/device-manager-about-documentation.tpl.php
deleted file mode 100644
index 3f35d82..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/web/tpl/device-manager-about-documentation.tpl.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{introduction_title}</h3>
-		{introduction_content}
-		
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-
-	</div>
-	<div class="span2 offset1">
-			
-		<h3>{type_title}</h3>
-		{type_content}
-	
-		<h3>{tested_title}</h3>
-		{tested_content}
-
-	</div>
-</div>
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/web/tpl/device-manager-addvg.tpl.php b/openQRM-5.3.50-CE/src/plugins/device-manager/web/tpl/device-manager-addvg.tpl.php
deleted file mode 100644
index 6342051..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/web/tpl/device-manager-addvg.tpl.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-	<div id="form">
-		<form action="{thisfile}">
-		{form}
-		{name}
-		{select}
-		{extend}
-		{confirm}
-		{confirm_text}
-		<div>{submit}&#160;{cancel}</div>
-		</form>
-	</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/device-manager/web/tpl/device-manager-removevg.tpl.php b/openQRM-5.3.50-CE/src/plugins/device-manager/web/tpl/device-manager-removevg.tpl.php
deleted file mode 100644
index 3eab1f3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/device-manager/web/tpl/device-manager-removevg.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-	<div id="form">
-		<form action="{thisfile}">
-		{form}
-		{confirm_text}
-		<div style="margin: 20px 0 0 0;">{submit}&#160;{cancel}</div>
-		</form>
-	</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/Makefile b/openQRM-5.3.50-CE/src/plugins/dhcpd/Makefile
deleted file mode 100644
index 71f2f6b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# this is the openQRM dhcpd-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/bin
-	. $(OPENQRM_SERVER_CONF) && cp bin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/bin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/bin/openqrm*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/
-	. $(OPENQRM_SERVER_CONF) && cp etc/dhcpd-interfaces.conf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/templates
-	. $(OPENQRM_SERVER_CONF) && cp etc/templates/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/templates/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/web/img
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/web/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/web/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/web/lang/
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/dhcpd
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/dhcpd/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/bin/openqrm-dhcpd-appliance b/openQRM-5.3.50-CE/src/plugins/dhcpd/bin/openqrm-dhcpd-appliance
deleted file mode 100644
index c74daa0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/bin/openqrm-dhcpd-appliance
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/bin/bash
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/include/openqrm-plugin-dhcpd-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-openqrm_server_get_config
-OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-resource_id=0
-resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-openqrm_web_protocol=$OPENQRM_WEB_PROTOCOL
-
-DHCPD_HOST_TEMPLATE="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/templates/openqrm-plugin-dhcpd-host.template"
-
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-function dhcpd_usage() {
-	echo "Usage: $0 add_hostname/remove_hostname -m <resource-mac> -n <resource-name>"
-	exit 1
-}
-
-DHCPD_COMMAND=$1
-shift
-
-while [ $# -ne 0 ]; do
-	case "$1" in
-		-m)
-			PARAM_RESOURCE_MAC=$2
-			shift
-			;;
-		-n)
-			PARAM_APPLIANCE_NAME=$2
-			shift
-			;;
-		--openqrm-ui-user)
-			OPENQRM_UI_USER=$2
-			shift
-			;;
-		--openqrm-internal-cmd)
-			OPENQRM_INTERNAL_CMD=$2
-			shift
-			;;
-		--openqrm-cmd-mode)
-			OPENQRM_CMD_MODE=$2
-			shift
-			;;
-		*)
-			openqrm_unblock_starting_queue $@
-			echo "ERROR: Free commandline arguments are not allowed"
-			dhcpd_usage
-			exit 6
-			;;
-	esac
-	shift
-done
-
-# checks
-if [ "$DHCPD_COMMAND" == "" ]; then
-	openqrm_unblock_starting_queue $@
-	dhcpd_usage
-fi
-
-
-DHCPD_CONF=`grep -wr $PARAM_RESOURCE_MAC $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/dhcpd.conf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks/* | grep -v openqrm-dhcpd-appliance | awk '{ print $1 }' | cut -d':' -f 1`
-if [ "$DHCPD_CONF" == "" ]; then
-	dhcpd_log openqrm-dhcpd-manager "Resource $RESOURCE_MAC does not exist in the dhcpd-server!"
-	exit 0
-fi
-
-
-
-# main
-case "$DHCPD_COMMAND" in
-
-	add_hostname)
-		if [ "$PARAM_APPLIANCE_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $@
-			dhcpd_usage
-		fi
-		if [ "$PARAM_RESOURCE_MAC" == "" ]; then
-			openqrm_unblock_starting_queue $@
-			dhcpd_usage
-		fi
-		LOCK_TIME=`openqrm_lock_queue aquire dhcpd`
-		trap "openqrm_lock_queue release dhcpd $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $@
-
-		cp -f $DHCPD_CONF $DHCPD_CONF.openqrm-dhcpd-appliance
-		sed -i -e "s/hardware ethernet $PARAM_RESOURCE_MAC;/hardware ethernet $PARAM_RESOURCE_MAC; option host-name \"$PARAM_APPLIANCE_NAME\";/g" $DHCPD_CONF
-		;;
-
-	remove_hostname)
-		if [ "$PARAM_APPLIANCE_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $@
-			dhcpd_usage
-		fi
-		if [ "$PARAM_RESOURCE_MAC" == "" ]; then
-			openqrm_unblock_starting_queue $@
-			dhcpd_usage
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire dhcpd`
-		trap "openqrm_lock_queue release dhcpd $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $@
-
-		cp -f $DHCPD_CONF $DHCPD_CONF.openqrm-dhcpd-appliance
-		sed -i -e "s/option host-name \"$PARAM_APPLIANCE_NAME\";//g" $DHCPD_CONF
-		;;
-
-	*)
-		openqrm_unblock_starting_queue $@
-		dhcpd_usage
-		;;
-
-
-esac
-
-
-
-# is dhcpd running ? do we have to restart ?
-if [ -e $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/dhcpd/.running ]; then
-        $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/init.d/openqrm-plugin-dhcpd stop
-        if ! $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/init.d/openqrm-plugin-dhcpd start; then
-                dhcpd_log openqrm-dhcpd-manager "Adding Hostname for resource $PARAM_APPLIANCE_NAME - $PARAM_RESOURCE_MAC failed. Reverting dhcpd-configuration."
-                # restore previous version, better not to add it than to corrupt the config
-                cp -f $DHCPD_CONF.openqrm-dhcpd-appliance $DHCPD_CONF
-                $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/init.d/openqrm-plugin-dhcpd start
-        fi
-fi
-
-rm -f $DHCPD_CONF.openqrm-dhcpd-appliance
-
-openqrm_lock_queue release dhcpd $LOCK_TIME
-trap '' EXIT
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/bin/openqrm-dhcpd-manager b/openQRM-5.3.50-CE/src/plugins/dhcpd/bin/openqrm-dhcpd-manager
deleted file mode 100644
index a6fe598..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/bin/openqrm-dhcpd-manager
+++ /dev/null
@@ -1,484 +0,0 @@
-#!/bin/bash
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/include/openqrm-plugin-dhcpd-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-openqrm_server_get_config
-OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-resource_id=0
-resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-openqrm_web_protocol=$OPENQRM_WEB_PROTOCOL
-DHCPD_CONF="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/dhcpd.conf"
-DHCPD_HOST_TEMPLATE="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/templates/openqrm-plugin-dhcpd-host.template"
-export LANG=C
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-function dhcpd_usage() {
-	echo "Usage: $0 add/remove -d [resource-id] -m [resource-mac] -s [resource-subnet] -i [resource-ip] -u [admin-user] -p [admin-password]"
-	echo "       $0 remove_by_mac -m [resource_mac]"
-	echo "       $0 add_network/remove_network -l [openqrm-server-interface]"
-	echo "       $0 add_listen/remove_listen -l [openqrm-server-interface]"
-	exit 1
-}
-
-FULL_COMMANDLINE="$0 $@"
-DHCPD_CMD=$1
-shift
-
-while [ $# -ne 0 ]; do
-	case "$1" in
-		-d)
-			RESOURCE_ID=$2
-			HOSTNAME="resource$RESOURCE_ID"
-			shift
-			;;
-		-m)
-			RESOURCE_MAC=$2
-			shift
-			;;
-		-i)
-			RESOURCE_IP=$2
-			shift
-			;;
-		-s)
-			RESOURCE_SUBNET=$2
-			shift
-			;;
-		-l)
-			LISTEN_INTERFACE=$2
-			shift
-			;;
-		-q)
-			RESOURCE_DOMAIN=$2
-			shift
-			;;
-		-u)
-			OPENQRM_USERNAME=$2
-			shift
-			;;
-		-p)
-			OPENQRM_PASSWORD=$2
-			shift
-			;;
-		--openqrm-ui-user)
-			OPENQRM_UI_USER=$2
-			shift
-			;;
-		--openqrm-internal-cmd)
-			OPENQRM_INTERNAL_CMD=$2
-			shift
-			;;
-		--openqrm-cmd-mode)
-			OPENQRM_CMD_MODE=$2
-			shift
-			;;
-		*)
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			echo "ERROR: Free commandline arguments are not allowed"
-			dhcpd_usage
-			exit 6
-			;;
-	esac
-	shift
-done
-
-# checks
-if [ "$DHCPD_CMD" == "" ]; then
-	openqrm_unblock_starting_queue $FULL_COMMANDLINE
-	dhcpd_usage
-fi
-
-
-function guess_next_ip() {
-	OPENQRM_DHCPD_NETWORK=`grep subnet $DHCPD_CONF | grep netmask | awk '{ print $2 }'`
-	OPENQRM_DHCPD_SUBNETMASK=`grep subnet $DHCPD_CONF | grep netmask | awk '{ print $4 }'`
-	OPENQRM_DHCPD_FIRSTIP=`grep -w range $DHCPD_CONF | grep -v '#' | awk '{ print $2 }'`
-	if [ "$OPENQRM_DHCPD_FIRSTIP" == "" ]; then
-		OPENQRM_DHCPD_FIRSTIP=`openqrm_plugin_dhcpd_range_calculator $OPENQRM_DHCPD_NETWORK $OPENQRM_DHCPD_SUBNETMASK first`
-	fi
-	OPENQRM_DHCPD_LASTIP=`grep -w range $DHCPD_CONF | grep -v '#' | awk '{ print $3 }' | sed -e "s/;//g"`
-	if [ "$OPENQRM_DHCPD_LASTIP" == "" ]; then
-		OPENQRM_DHCPD_LASTIP=`openqrm_plugin_dhcpd_range_calculator $OPENQRM_DHCPD_NETWORK $OPENQRM_DHCPD_SUBNETMASK last`
-	fi
-	OPENQRM_DHCPD_LOOP=0
-	while (true); do
-			if [ "$GUESSED_NEW_IP" == "$OPENQRM_DHCPD_FIRSTIP" ]; then
-					dhcpd_log openqrm-dhcpd-manager "WARNING: Reached start of available ip-range! No free ips available any more"
-					return
-			fi
-			GUESSED_NEW_IP=`openqrm_plugin_dhcpd_range_calculator $OPENQRM_DHCPD_NETWORK $OPENQRM_DHCPD_SUBNETMASK next $OPENQRM_DHCPD_LOOP`
-			IPCHECK_GUESSED=`echo $GUESSED_NEW_IP | sed -e "s/\.//g"`
-			IPCHECK_FIRST=`echo $OPENQRM_DHCPD_FIRSTIP | sed -e "s/\.//g"`
-			IPCHECK_LAST=`echo $OPENQRM_DHCPD_LASTIP | sed -e "s/\.//g"`
-			if [ "$IPCHECK_GUESSED" -gt "$IPCHECK_LAST" ]; then
-				OPENQRM_DHCPD_LOOP=$(( OPENQRM_DHCPD_LOOP + 1 ))
-				continue
-			fi
-			if [ "$IPCHECK_FIRST" -gt "$IPCHECK_GUESSED" ]; then
-				OPENQRM_DHCPD_LOOP=$(( OPENQRM_DHCPD_LOOP + 1 ))
-				continue
-			fi
-			if ! grep $GUESSED_NEW_IP $DHCPD_CONF | grep fixed-address 1>/dev/null; then
-				if ! ping -c 1 -i 1 -w 1 $GUESSED_NEW_IP 1>/dev/null; then
-						dhcpd_log openqrm-dhcpd-manager "NOTICE: Found $GUESSED_NEW_IP free and not pingable"
-						break
-				fi
-			fi
-			OPENQRM_DHCPD_LOOP=$(( OPENQRM_DHCPD_LOOP + 1 ))
-	done
-	echo "$GUESSED_NEW_IP"
-}
-
-
-
-function restart_dhcpd() {
-	local DHCPD_PART=$1
-	local DHCPD_RESOURCE_ID=$2
-	local DHCPD_RESOURCE_MAC=$3
-	# is dhcpd running ? do we have to restart ?
-	if [ -e $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/dhcpd/.running ]; then
-		$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/init.d/openqrm-plugin-dhcpd stop
-		if ! $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/init.d/openqrm-plugin-dhcpd start; then
-			dhcpd_log openqrm-dhcpd-manager "Adding Resource $DHCPD_RESOURCE_ID / $DHCPD_RESOURCE_MAC failed! Reverting dhcpd-configuration."
-			# restore previous version, better not to add it than to corrupt the config
-			case "$DHCPD_PART" in
-				main)
-					cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/backup/dhcpd.conf $DHCPD_CONF
-					;;
-				subnet)
-					rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks
-					cp -aRf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/backup/networks $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/
-					;;
-			esac
-			$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/init.d/openqrm-plugin-dhcpd start
-		fi
-	fi
-}
-
-
-
-
-case "$DHCPD_CMD" in
-	add)
-		LOCK_TIME=`openqrm_lock_queue aquire dhcpd`
-		trap "openqrm_lock_queue release dhcpd $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		if [ "$RESOURCE_SUBNET" == "" ]; then
-			RESOURCE_SUBNET=`grep subnet $DHCPD_CONF | grep netmask | awk '{ print $4 }'`
-		fi
-
-		# new VM without any ip yet ?
-		if [ "$RESOURCE_IP" == "0.0.0.0" ]; then
-			# this is when a new virtual machine is added
-			# running via the new-resource hook
-			# resource will be added to the default management network / set subnetmask to default network if empty
-			if [ "$RESOURCE_SUBNET" == "0.0.0.0" ]; then
-				RESOURCE_SUBNET=`grep subnet $DHCPD_CONF | grep netmask | awk '{ print $4 }'`
-			fi
-			NEXT_RESOURCE_IP=`guess_next_ip`
-			if [ "$NEXT_RESOURCE_IP" == "" ]; then
-				dhcpd_log openqrm-dhcpd-manager "Failed to guess the next ip address for Resource $HOSTNAME $RESOURCE_ID $RESOURCE_MAC. Not adding it."
-
-				openqrm_lock_queue release dhcpd $LOCK_TIME
-				trap '' EXIT
-
-				exit 0
-			else
-				RESOURCE_IP=$NEXT_RESOURCE_IP
-				dhcpd_log openqrm-dhcpd-manager "Guessed next ip address $RESOURCE_IP for Resource $HOSTNAME $RESOURCE_ID $RESOURCE_MAC."
-			fi
-		fi
-		# decide to which network the resource should be added
-		NEW_RESOURCE_NETWORK=`openqrm_plugin_dhcpd_range_calculator $RESOURCE_IP $RESOURCE_SUBNET net`
-		if grep "subnet $NEW_RESOURCE_NETWORK netmask $RESOURCE_SUBNET" $DHCPD_CONF 1>/dev/null; then
-			# openQRM default Management network
-			if grep $RESOURCE_MAC $DHCPD_CONF | grep -v "^#" 1>/dev/null; then
-				dhcpd_log openqrm-dhcpd-manager "Resource  $HOSTNAME $RESOURCE_ID $RESOURCE_MAC $RESOURCE_IP already existing in the dhcpd-server. Not adding it."
-
-				openqrm_lock_queue release dhcpd $LOCK_TIME
-				trap '' EXIT
-
-				exit 0
-			fi
-			dhcpd_log openqrm-dhcpd-manager "adding $HOSTNAME $RESOURCE_ID $RESOURCE_MAC $RESOURCE_IP to default network"
-			TIMESTAMP=`date +%s`
-			mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/backup/
-			cp -f $DHCPD_CONF $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/backup/dhcpd.conf
-			cp -f $DHCPD_CONF $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/backup/dhcpd.conf.$TIMESTAMP
-			grep -B 1000000 "^# end_static_ips" $DHCPD_CONF | sed -e "s/^# end_static_ips.*//g" > $DHCPD_CONF.first_part
-			grep -A 1000000 "^# end_static_ips" $DHCPD_CONF > $DHCPD_CONF.last_part
-			cat $DHCPD_HOST_TEMPLATE | \
-				sed -e "s/DHCPD_RESOURCE_HOSTNAME/$HOSTNAME/g" |	\
-				sed -e "s/DHCPD_RESOURCE_MAC/$RESOURCE_MAC/g" |	\
-				sed -e "s/DHCPD_RESOURCE_IP/$RESOURCE_IP/g" > $DHCPD_CONF.host_part
-			cat $DHCPD_CONF.first_part $DHCPD_CONF.host_part $DHCPD_CONF.last_part > $DHCPD_CONF
-			sed -i -e '/^$/d' $DHCPD_CONF
-			rm -f $DHCPD_CONF.first_part $DHCPD_CONF.host_part $DHCPD_CONF.last_part
-			restart_dhcpd main $RESOURCE_IP $RESOURCE_MAC
-
-		else
-
-			# resource will be added to an additional managed network
-			if [ -d "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks" ]; then
-				for ADDITIONAL_DHCPD_CONF in `ls $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks/*.conf 2>/dev/null`; do
-					if grep "subnet $NEW_RESOURCE_NETWORK netmask $RESOURCE_SUBNET" $ADDITIONAL_DHCPD_CONF 1>/dev/null; then
-						if grep -i $RESOURCE_MAC $ADDITIONAL_DHCPD_CONF | grep -v "^#" 1>/dev/null; then
-							dhcpd_log openqrm-dhcpd-manager "Resource  $HOSTNAME $RESOURCE_ID $RESOURCE_MAC $RESOURCE_IP already existing in $ADDITIONAL_DHCPD_CONF. Not adding it."
-
-							openqrm_lock_queue release dhcpd $LOCK_TIME
-							trap '' EXIT
-
-							exit 0
-						fi
-						dhcpd_log openqrm-dhcpd-manager "adding $HOSTNAME $RESOURCE_ID $RESOURCE_MAC $RESOURCE_IP to $ADDITIONAL_DHCPD_CONF"
-						TIMESTAMP=`date +%s`
-						mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/backup/networks.$TIMESTAMP
-						cp -aRf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/backup/
-						cp -aRf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks/* $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/backup/networks.$TIMESTAMP/
-						grep -B 1000000 "^# end_static_ips" $ADDITIONAL_DHCPD_CONF | sed -e "s/^# end_static_ips.*//g" > $ADDITIONAL_DHCPD_CONF.first_part
-						grep -A 1000000 "^# end_static_ips" $ADDITIONAL_DHCPD_CONF > $ADDITIONAL_DHCPD_CONF.last_part
-						cat $DHCPD_HOST_TEMPLATE | \
-							sed -e "s/DHCPD_RESOURCE_HOSTNAME/$HOSTNAME/g" |	\
-							sed -e "s/DHCPD_RESOURCE_MAC/$RESOURCE_MAC/g" |	\
-							sed -e "s/DHCPD_RESOURCE_IP/$RESOURCE_IP/g" > $ADDITIONAL_DHCPD_CONF.host_part
-						cat $ADDITIONAL_DHCPD_CONF.first_part $ADDITIONAL_DHCPD_CONF.host_part $ADDITIONAL_DHCPD_CONF.last_part > $ADDITIONAL_DHCPD_CONF
-						sed -i -e '/^$/d' $ADDITIONAL_DHCPD_CONF
-						rm -f $ADDITIONAL_DHCPD_CONF.first_part $ADDITIONAL_DHCPD_CONF.last_part $ADDITIONAL_DHCPD_CONF.host_part
-						restart_dhcpd subnet $RESOURCE_IP $RESOURCE_MAC
-					fi
-				done
-			fi
-		fi
-		# if we have a username + pass we send back the eventual new generated ip to update the resource_ip in the db
-		if [ "$OPENQRM_USERNAME" != "" ] && [ "$OPENQRM_PASSWORD" != "" ]; then
-			if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$OPENQRM_USERNAME --http-password=$OPENQRM_PASSWORD "$openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/dhcpd/dhcpd-action.php?dhcpd_command=post_ip&resource_id=$RESOURCE_ID&resource_ip=$RESOURCE_IP"; then
-				dhcpd_log openqrm-dhcpd-manager "ERROR: Could not post resource ip $RESOURCE_IP to the openQRM-server at $resource_openqrmserver!"
-			fi
-		fi
-
-		openqrm_lock_queue release dhcpd $LOCK_TIME
-		trap '' EXIT
-		;;
-	remove)
-		LOCK_TIME=`openqrm_lock_queue aquire dhcpd`
-		trap "openqrm_lock_queue release dhcpd $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# default openQRM Management network
-		if grep -w $HOSTNAME $DHCPD_CONF 1>/dev/null; then
-			dhcpd_log openqrm-dhcpd-manager "removing $HOSTNAME $RESOURCE_ID $RESOURCE_MAC $RESOURCE_IP from default network"
-			TIMESTAMP=`date +%s`
-			mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/backup/
-			cp -f $DHCPD_CONF $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/backup/dhcpd.conf
-			cp -f $DHCPD_CONF $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/backup/dhcpd.conf.$TIMESTAMP
-			# first - resource
-			grep -B 10000 -A 4 "^host $HOSTNAME {" $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/dhcpd.conf | sed -e :a -e '$d;N;2,5ba' -e 'P;D' > $DHCPD_CONF.first_part
-			# after resource
-			grep -A 10000 "^host $HOSTNAME {" $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/dhcpd.conf | sed '1,5d' > $DHCPD_CONF.last_part
-			cat $DHCPD_CONF.first_part $DHCPD_CONF.last_part > $DHCPD_CONF
-			sed -i -e '/^$/d' $DHCPD_CONF
-			rm -f $DHCPD_CONF.first_part $DHCPD_CONF.host_part $DHCPD_CONF.last_part
-			restart_dhcpd main $RESOURCE_IP $RESOURCE_MAC
-
-		else
-			# additional managed networks
-			for ADDITIONAL_DHCPD_CONF in `ls $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks/*.conf 2>/dev/null`; do
-				if grep -w $HOSTNAME $ADDITIONAL_DHCPD_CONF 1>/dev/null; then
-					dhcpd_log openqrm-dhcpd-manager "removing $HOSTNAME $RESOURCE_ID $RESOURCE_MAC $RESOURCE_IP from $ADDITIONAL_DHCPD_CONF"
-					TIMESTAMP=`date +%s`
-					mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/backup/networks.$TIMESTAMP
-					cp -aRf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/backup/
-					cp -aRf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks/* $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/backup/networks.$TIMESTAMP/
-					# first - resource
-					grep -B 10000 -A 4 "^host $HOSTNAME {" $ADDITIONAL_DHCPD_CONF | sed -e :a -e '$d;N;2,5ba' -e 'P;D' > $ADDITIONAL_DHCPD_CONF.first_part
-					# after resource
-					grep -A 10000 "^host $HOSTNAME {" $ADDITIONAL_DHCPD_CONF | sed '1,5d' > $ADDITIONAL_DHCPD_CONF.last_part
-					cat $ADDITIONAL_DHCPD_CONF.first_part $ADDITIONAL_DHCPD_CONF.last_part > $ADDITIONAL_DHCPD_CONF
-					sed -i -e '/^$/d' $ADDITIONAL_DHCPD_CONF
-					rm -f $ADDITIONAL_DHCPD_CONF.first_part $ADDITIONAL_DHCPD_CONF.last_part
-					restart_dhcpd subnet $RESOURCE_IP $RESOURCE_MAC
-				fi
-			done
-		fi
-
-		openqrm_lock_queue release dhcpd $LOCK_TIME
-		trap '' EXIT
-		;;
-
-
-	remove_by_mac)
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# default openQRM Management network
-		if grep -i $RESOURCE_MAC $DHCPD_CONF 1>/dev/null; then
-			dhcpd_log openqrm-dhcpd-manager "removing $HOSTNAME $RESOURCE_ID $RESOURCE_MAC $RESOURCE_IP from default network"
-			RES_ID=`grep -B1 -i $RESOURCE_MAC $DHCPD_CONF | grep "^host resource" | sed -e "s/.*resource//g" | awk '{ print $1 }'`
-			RES_IP=`grep -A1 -i $RESOURCE_MAC $DHCPD_CONF | grep "fixed-address" | awk '{ print $2 }' | sed -e "s/;//g"`
-			RES_SUBNET=`grep -w subnet.*netmask $DHCPD_CONF | awk '{ print $4 }'`
-			if $0 remove -d $RES_ID -m $RESOURCE_MAC -i $RES_IP -s $RES_SUBNET; then
-				dhcpd_log openqrm-dhcpd-manager "Successfully removed $RES_ID $RESOURCE_MAC $RES_IP from $DHCPD_CONF"
-			else
-				dhcpd_log openqrm-dhcpd-manager "Failed removing $RES_ID $RESOURCE_MAC $RES_IP from $DHCPD_CONF"
-			fi
-		else
-			# additional managed networks
-			for ADDITIONAL_DHCPD_CONF in `ls $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks/*.conf 2>/dev/null`; do
-				if grep -i $RESOURCE_MAC $ADDITIONAL_DHCPD_CONF 1>/dev/null; then
-					dhcpd_log openqrm-dhcpd-manager "removing $HOSTNAME $RESOURCE_ID $RESOURCE_MAC $RESOURCE_IP from $ADDITIONAL_DHCPD_CONF"
-					RES_ID=`grep -B1 -i $RESOURCE_MAC $ADDITIONAL_DHCPD_CONF | grep "^host resource" | sed -e "s/.*resource//g" | awk '{ print $1 }'`
-					RES_IP=`grep -A1 -i $RESOURCE_MAC $ADDITIONAL_DHCPD_CONF | grep "fixed-address" | awk '{ print $2 }' | sed -e "s/;//g"`
-					RES_SUBNET=`grep -w subnet.*netmask $ADDITIONAL_DHCPD_CONF | awk '{ print $4 }'`
-					if $0 remove -d $RES_ID -m $RESOURCE_MAC -i $RES_IP -s $RES_SUBNET; then
-						dhcpd_log openqrm-dhcpd-manager "Successfully removed $RES_ID $RESOURCE_MAC $RES_IP from $ADDITIONAL_DHCPD_CONF"
-					else
-						dhcpd_log openqrm-dhcpd-manager "Failed removing $RES_ID $RESOURCE_MAC $RES_IP from $ADDITIONAL_DHCPD_CONF"
-					fi
-				fi
-			done
-		fi
-		;;
-
-
-
-
-
-
-
-
-
-	add_network)
-		LOCK_TIME=`openqrm_lock_queue aquire dhcpd`
-		trap "openqrm_lock_queue release dhcpd $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		ORIGIN_LISTEN_INTERFACE=$LISTEN_INTERFACE
-		if [ -e /etc/openqrm/openvswitch-manager/nat/$LISTEN_INTERFACE ]; then
-			. /etc/openqrm/openvswitch-manager/nat/$LISTEN_INTERFACE
-			if [ "$OVS_VLAN" != "" ] &&  [ "$OVS_VLAN" != 0 ]; then
-			    LISTEN_INTERFACE=$LISTEN_INTERFACE"."$OVS_VLAN
-			fi
-		fi
-
-
-		OPENQRM_DHCPD_NETWORK_IP_ADDRESS=`ip a s $LISTEN_INTERFACE | grep -w $LISTEN_INTERFACE$ | grep -w inet | awk '{ print $2 }' | cut -d'/' -f1`
-
-		echo "- configuring additional network for $LISTEN_INTERFACE - $OPENQRM_DHCPD_NETWORK_IP_ADDRESS"
-		mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks
-		OPENQRM_DHCPD_NETWORK_BROADCAST_ADDRESS=`ip a s $LISTEN_INTERFACE | grep -w $LISTEN_INTERFACE$ | grep -w inet | awk '{ print $4 }' | cut -d'/' -f1`
-		OPENQRM_DHCPD_NETWORK_CIDR=`ip a s $LISTEN_INTERFACE | grep -w $LISTEN_INTERFACE$ | grep -w inet | awk '{ print $2 }' | cut -d'/' -f2`
-		OPENQRM_DHCPD_NETWORK_SUBNET_MASK=`cidr2subnet $OPENQRM_DHCPD_NETWORK_CIDR`
-		OPENQRM_DHCPD_NETWORK=`openqrm_plugin_dhcpd_range_calculator $OPENQRM_DHCPD_NETWORK_IP_ADDRESS $OPENQRM_DHCPD_NETWORK_SUBNET_MASK net`
-		OPENQRM_DHCPD_NETWORK_IP_RANGE_FIRST=`openqrm_plugin_dhcpd_range_calculator $OPENQRM_DHCPD_NETWORK_IP_ADDRESS $OPENQRM_DHCPD_NETWORK_SUBNET_MASK first`
-		OPENQRM_DHCPD_NETWORK_IP_RANGE_LAST=`openqrm_plugin_dhcpd_range_calculator $OPENQRM_DHCPD_NETWORK_IP_ADDRESS $OPENQRM_DHCPD_NETWORK_SUBNET_MASK last`
-
-		cat $OPENQRM_PLUGIN_DHCPD_NETWORK_TEMPLATE |	\
-			sed -e "s/OPENQRM_DHCPD_NETWORK/$OPENQRM_DHCPD_NETWORK/g" |	\
-			sed -e "s/OPENQRM_DHCPD_SUBNET_MASK/$OPENQRM_DHCPD_NETWORK_SUBNET_MASK/g" |	\
-			sed -e "s/OPENQRM_DHCPD_RANGE_FIRST/$OPENQRM_DHCPD_NETWORK_IP_RANGE_FIRST/g" |	\
-			sed -e "s/OPENQRM_DHCPD_RANGE_LAST/$OPENQRM_DHCPD_NETWORK_IP_RANGE_LAST/g" |	\
-			sed -e "s/OPENQRM_DHCPD_DOMAIN/$RESOURCE_DOMAIN/g" \
-			> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks/$ORIGIN_LISTEN_INTERFACE.conf
-
-		# add as include to dhcpd.conf
-		sed -i -e "s#^}#include \"$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks/$ORIGIN_LISTEN_INTERFACE.conf\";\n}#" $OPENQRM_PLUGIN_DHCPD_CONF
-
-		restart_dhcpd subnet
-
-		openqrm_lock_queue release dhcpd $LOCK_TIME
-		trap '' EXIT
-		;;
-
-	remove_network)
-		LOCK_TIME=`openqrm_lock_queue aquire dhcpd`
-		trap "openqrm_lock_queue release dhcpd $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks/$LISTEN_INTERFACE.conf
-		# remove as include to dhcpd.conf
-		sed -i -e "s#include \"$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks/$LISTEN_INTERFACE.conf\";##" $OPENQRM_PLUGIN_DHCPD_CONF
-
-		restart_dhcpd subnet
-
-		openqrm_lock_queue release dhcpd $LOCK_TIME
-		trap '' EXIT
-		;;
-
-
-	add_listen)
-		LOCK_TIME=`openqrm_lock_queue aquire dhcpd`
-		trap "openqrm_lock_queue release dhcpd $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		ORIGIN_LISTEN_INTERFACE=$LISTEN_INTERFACE
-		if [ -e /etc/openqrm/openvswitch-manager/nat/$LISTEN_INTERFACE ]; then
-			. /etc/openqrm/openvswitch-manager/nat/$LISTEN_INTERFACE
-			if [ "$OVS_VLAN" != "" ] &&  [ "$OVS_VLAN" != 0 ]; then
-			    LISTEN_INTERFACE=$LISTEN_INTERFACE"."$OVS_VLAN
-			fi
-		fi
-
-
-		. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/dhcpd-interfaces.conf
-
-		sed -i -e "s/DHCPD_LISTEN_INTERFACES=.*/DHCPD_LISTEN_INTERFACES=\"$DHCPD_LISTEN_INTERFACES $LISTEN_INTERFACE\"/g" $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/dhcpd-interfaces.conf
-
-		restart_dhcpd main
-
-		openqrm_lock_queue release dhcpd $LOCK_TIME
-		trap '' EXIT
-		;;
-
-	remove_listen)
-		LOCK_TIME=`openqrm_lock_queue aquire dhcpd`
-		trap "openqrm_lock_queue release dhcpd $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		ORIGIN_LISTEN_INTERFACE=$LISTEN_INTERFACE
-		if [ -e /etc/openqrm/openvswitch-manager/nat/$LISTEN_INTERFACE ]; then
-			. /etc/openqrm/openvswitch-manager/nat/$LISTEN_INTERFACE
-			if [ "$OVS_VLAN" != "" ] &&  [ "$OVS_VLAN" != 0 ]; then
-			    LISTEN_INTERFACE=$LISTEN_INTERFACE"."$OVS_VLAN
-			fi
-		fi
-
-		sed -i -e "s/ $LISTEN_INTERFACE//g" $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/dhcpd-interfaces.conf
-
-		restart_dhcpd main
-
-		openqrm_lock_queue release dhcpd $LOCK_TIME
-		trap '' EXIT
-		;;
-
-
-
-
-
-
-
-	*)
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		dhcpd_log openqrm-dhcpd-manager "Usage: $0 {add|remove} <resource-id> <resource_mac> [resource_ip]"
-		exit 1
-		;;
-esac
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/dhcpd-interfaces.conf b/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/dhcpd-interfaces.conf
deleted file mode 100644
index 38aec89..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/dhcpd-interfaces.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# this is the openQRM-plugin-dhcpd info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-DHCPD_LISTEN_INTERFACES=""
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/init.d/openqrm-plugin-dhcpd b/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/init.d/openqrm-plugin-dhcpd
deleted file mode 100644
index cebc75f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/init.d/openqrm-plugin-dhcpd
+++ /dev/null
@@ -1,233 +0,0 @@
-#!/bin/bash
-# init script for the openQRM dhcpd plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/include/openqrm-plugin-dhcpd-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/openqrm-plugin-dhcpd.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/dhcpd-interfaces.conf
-
-function openqrm_plugin_dhcpd_start() {
-	echo "Starting the openQRM dhcpd-plugin"
-	openqrm_plugin_dhcpd_stop 1>/dev/null 2>&1
-	# on debian/ubuntu dhcpd ver.3 is named dhcpd3
-	if [ -x /usr/sbin/dhcpd3 ]; then
-		# fix for ubuntu jaunty which does not like the lease file in the plugin dir
-		if ! /usr/sbin/dhcpd3 -cf $OPENQRM_PLUGIN_DHCPD_CONF -lf $OPENQRM_PLUGIN_DHCPD_LEASE_DIR/dhcpd.leases $OPENQRM_SERVER_INTERFACE $DHCPD_LISTEN_INTERFACES 2>&1; then
-			/usr/sbin/dhcpd3 -cf $OPENQRM_PLUGIN_DHCPD_CONF $OPENQRM_SERVER_INTERFACE $DHCPD_LISTEN_INTERFACES 2>&1
-			RET=$?
-		else
-			RET=0
-		fi
-	elif [ -x /usr/sbin/dhcpd ]; then
-		/usr/sbin/dhcpd -cf $OPENQRM_PLUGIN_DHCPD_CONF -lf $OPENQRM_PLUGIN_DHCPD_LEASE_DIR/dhcpd.leases $OPENQRM_SERVER_INTERFACE $DHCPD_LISTEN_INTERFACES 2>&1
-		RET=$?
-	else
-		echo "ERROR: Could not find the dhcpd (ver.3) binary"
-		exit 1
-	fi
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/dhcpd/.running
-	return $RET
-
-}
-
-
-function openqrm_plugin_dhcpd_stop() {
-	echo "Stopping the openQRM dhcpd-plugin"
-	killall dhcpd 1>/dev/null 2>&1
-	killall dhcpd3 1>/dev/null 2>&1
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/dhcpd/.running
-	return 0
-}
-
-
-function openqrm_plugin_dhcpd_init() {
-	echo "Initializing the openQRM dhcpd-plugin"
-	openqrm_server_get_config
-	# create leases dir
-	mkdir -p $OPENQRM_PLUGIN_DHCPD_LEASE_DIR
-	touch $OPENQRM_PLUGIN_DHCPD_LEASE_DIR/dhcpd.leases
-	chmod -R 777 $OPENQRM_PLUGIN_DHCPD_LEASE_DIR
-
-
-	# openQRM Management network
-
-	# calculate the defaults
-	OPENQRM_SERVER_NETWORK=`openqrm_plugin_dhcpd_range_calculator $OPENQRM_SERVER_IP_ADDRESS $OPENQRM_SERVER_SUBNET_MASK net`
-	OPENQRM_PLUGIN_DHCPD_IP_RANGE_FIRST=`openqrm_plugin_dhcpd_range_calculator $OPENQRM_SERVER_IP_ADDRESS $OPENQRM_SERVER_SUBNET_MASK first`
-	OPENQRM_PLUGIN_DHCPD_IP_RANGE_LAST=`openqrm_plugin_dhcpd_range_calculator $OPENQRM_SERVER_IP_ADDRESS $OPENQRM_SERVER_SUBNET_MASK last`
-
-	OPENQRM_SERVER_DNS=`cat /etc/resolv.conf | grep -m 1 "nameserver" | awk {' print $2 '} | head -n1 2>/dev/null`
-	OPENQRM_SERVER_DEFAULT_GATEWAY=`route -n | grep '^0.0.0.0'  | grep $OPENQRM_SERVER_INTERFACE  | awk {' print $2 '} | head -n1 2>/dev/null`
-	OPENQRM_SERVER_DOMAIN=`cat /etc/resolv.conf | grep -m 1 "search" | awk '{print $2'} | head -n1 2>/dev/null`
-
-	# make sure we have got values to put in the dhcpd.conf
-	if [ "$OPENQRM_SERVER_DEFAULT_GATEWAY" == "" ]; then
-		OPENQRM_SERVER_DEFAULT_GATEWAY=$OPENQRM_SERVER_IP_ADDRESS
-		if ! openqrm_validate_ip $OPENQRM_SERVER_DEFAULT_GATEWAY; then
-			OPENQRM_SERVER_DEFAULT_GATEWAY=$OPENQRM_SERVER_IP_ADDRESS
-		fi
-	fi
-	if [ "$OPENQRM_SERVER_DNS" == "" ]; then
-		OPENQRM_SERVER_DNS=$OPENQRM_SERVER_IP_ADDRESS
-		if ! openqrm_validate_ip $OPENQRM_SERVER_DNS; then
-			OPENQRM_SERVER_DNS=$OPENQRM_SERVER_IP_ADDRESS
-		fi
-	fi
-	if [ "$OPENQRM_SERVER_DOMAIN" == "" ]; then
-		OPENQRM_SERVER_DOMAIN=$OPENQRM_SERVER_DEFAULT_DOMAIN
-	fi
-
-	# create default dhcpd configuration
-	cat $OPENQRM_PLUGIN_DHCPD_CONF_TEMPLATE |	\
-		sed -e "s/OPENQRM_SERVER_SUBNET_MASK/$OPENQRM_SERVER_SUBNET_MASK/g" |	\
-		sed -e "s/OPENQRM_SERVER_BROADCAST_ADDRESS/$OPENQRM_SERVER_BROADCAST_ADDRESS/g" |	\
-		sed -e "s/OPENQRM_SERVER_DEFAULT_GATEWAY/$OPENQRM_SERVER_DEFAULT_GATEWAY/g" |	\
-		sed -e "s/OPENQRM_SERVER_DOMAIN/$OPENQRM_SERVER_DOMAIN/g" |	\
-		sed -e "s/OPENQRM_SERVER_DNS/$OPENQRM_SERVER_DNS/g" |	\
-		sed -e "s/OPENQRM_SERVER_IP_ADDRESS/$OPENQRM_SERVER_IP_ADDRESS/g" |	\
-		sed -e "s/OPENQRM_SERVER_NETWORK/$OPENQRM_SERVER_NETWORK/g" |	\
-		sed -e "s/OPENQRM_PLUGIN_DHCPD_IP_RANGE_FIRST/$OPENQRM_PLUGIN_DHCPD_IP_RANGE_FIRST/g" |	\
-		sed -e "s/OPENQRM_PLUGIN_DHCPD_IP_RANGE_LAST/$OPENQRM_PLUGIN_DHCPD_IP_RANGE_LAST/g"	\
-		> $OPENQRM_PLUGIN_DHCPD_CONF
-
-	# additional networks to configure
-	if [ "$OPENQRM_PLUGIN_DHCPD_INTERFACES" != "" ]; then
-		for OPENQRM_PLUGIN_DHCPD_INTERFACE in `echo $OPENQRM_PLUGIN_DHCPD_INTERFACES | sed -e "s/,/ /g"`; do
-			OPENQRM_DHCPD_NETWORK_IP_ADDRESS=`ip a s $OPENQRM_PLUGIN_DHCPD_INTERFACE | grep -w $OPENQRM_PLUGIN_DHCPD_INTERFACE$ | grep -w inet | awk '{ print $2 }' | cut -d'/' -f1`
-			# if it has an ip address we create the dhcpd subnet delcaration for it
-			if [ "$OPENQRM_DHCPD_NETWORK_IP_ADDRESS" != "" ]; then
-				echo "- configuring additional network for $OPENQRM_PLUGIN_DHCPD_INTERFACE"
-				mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks
-				OPENQRM_DHCPD_NETWORK_BROADCAST_ADDRESS=`ip a s $OPENQRM_PLUGIN_DHCPD_INTERFACE | grep -w $OPENQRM_PLUGIN_DHCPD_INTERFACE$ | grep -w inet | awk '{ print $4 }' | cut -d'/' -f1`
-				OPENQRM_DHCPD_NETWORK_CIDR=`ip a s $OPENQRM_PLUGIN_DHCPD_INTERFACE | grep -w $OPENQRM_PLUGIN_DHCPD_INTERFACE$ | grep -w inet | awk '{ print $2 }' | cut -d'/' -f2`
-				OPENQRM_DHCPD_NETWORK_SUBNET_MASK=`cidr2subnet $OPENQRM_DHCPD_NETWORK_CIDR`
-				OPENQRM_DHCPD_NETWORK=`openqrm_plugin_dhcpd_range_calculator $OPENQRM_DHCPD_NETWORK_IP_ADDRESS $OPENQRM_DHCPD_NETWORK_SUBNET_MASK net`
-				OPENQRM_DHCPD_NETWORK_IP_RANGE_FIRST=`openqrm_plugin_dhcpd_range_calculator $OPENQRM_DHCPD_NETWORK_IP_ADDRESS $OPENQRM_DHCPD_NETWORK_SUBNET_MASK first`
-				OPENQRM_DHCPD_NETWORK_IP_RANGE_LAST=`openqrm_plugin_dhcpd_range_calculator $OPENQRM_DHCPD_NETWORK_IP_ADDRESS $OPENQRM_DHCPD_NETWORK_SUBNET_MASK last`
-
-				cat $OPENQRM_PLUGIN_DHCPD_NETWORK_TEMPLATE |	\
-					sed -e "s/OPENQRM_DHCPD_NETWORK/$OPENQRM_DHCPD_NETWORK/g" |	\
-					sed -e "s/OPENQRM_DHCPD_SUBNET_MASK/$OPENQRM_DHCPD_NETWORK_SUBNET_MASK/g" |	\
-					sed -e "s/OPENQRM_DHCPD_RANGE_FIRST/$OPENQRM_DHCPD_NETWORK_IP_RANGE_FIRST/g" |	\
-					sed -e "s/OPENQRM_DHCPD_RANGE_LAST/$OPENQRM_DHCPD_NETWORK_IP_RANGE_LAST/g" \
-					> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks/$OPENQRM_PLUGIN_DHCPD_INTERFACE.conf
-
-				# add as include to dhcpd.conf
-				sed -i -e "s#^}#include \"$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks/$OPENQRM_PLUGIN_DHCPD_INTERFACE.conf\";\n}#" $OPENQRM_PLUGIN_DHCPD_CONF
-
-			fi
-		done
-	fi
-
-	# enable apparmor if needed
-	APPARMOR_DHCPD=""
-	if [ -f /etc/apparmor.d/usr.sbin.dhcpd3 ]; then
-		APPARMOR_DHCPD="/etc/apparmor.d/usr.sbin.dhcpd3"
-	elif [ -f /etc/apparmor.d/usr.sbin.dhcpd ]; then
-		APPARMOR_DHCPD="/etc/apparmor.d/usr.sbin.dhcpd"
-	fi
-	if [ "$APPARMOR_DHCPD" != "" ]; then
-		if ! grep openQRM $APPARMOR_DHCPD 1>/dev/null; then
-			sed -i -e "s#^}##g" $APPARMOR_DHCPD
-			echo "  # openQRM" >> $APPARMOR_DHCPD
-			echo "  $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/** rw," >> $APPARMOR_DHCPD
-			if [ -d /etc/openqrm/plugins/dhcpd/ ]; then
-				echo "  /etc/openqrm/plugins/dhcpd/** rw," >> $APPARMOR_DHCPD
-			fi
-			echo "  /var/run/dhcpd.pid rw," >> $APPARMOR_DHCPD
-			echo "  $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/var/state/dhcp/** lrw," >> $APPARMOR_DHCPD
-			echo "}" >> $APPARMOR_DHCPD
-			echo >> $APPARMOR_DHCPD
-			if [ -x "/etc/init.d/apparmor" ]; then
-				if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-					invoke-rc.d apparmor reload
-				else
-					/etc/init.d/apparmor reload
-				fi
-			fi
-			# create pid file
-			touch /var/run/dhcpd.pid
-			chown dhcpd:dhcpd /var/run/dhcpd.pid
-		fi
-	fi
-
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/dhcpd
-
-	return 0
-}
-
-
-function openqrm_plugin_dhcpd_uninstall() {
-	echo "Uninstalling the openQRM dhcpd-plugin"
-	openqrm_plugin_dhcpd_stop
-	/bin/rm -f $OPENQRM_PLUGIN_DHCPD_CONF
-	/bin/rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/networks
-
-	# remove apparmor setup
-	APPARMOR_DHCPD=""
-	if [ -f /etc/apparmor.d/usr.sbin.dhcpd3 ]; then
-		APPARMOR_DHCPD="/etc/apparmor.d/usr.sbin.dhcpd3"
-	elif [ -f /etc/apparmor.d/usr.sbin.dhcpd ]; then
-		APPARMOR_DHCPD="/etc/apparmor.d/usr.sbin.dhcpd"
-	fi
-	if [ "$APPARMOR_DHCPD" != "" ]; then
-		sed -i -e "s#.*openQRM.*##g" $APPARMOR_DHCPD
-		sed -i -e "s#.*openqrm.*##g" $APPARMOR_DHCPD
-		sed -i -e "s#/var/run/dhcpd.pid rw,##g" $APPARMOR_DHCPD
-		if [ -x "/etc/init.d/apparmor" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d apparmor reload
-			else
-				/etc/init.d/apparmor reload
-			fi
-		fi
-	fi
-	# unlinking the web dir
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/dhcpd
-}
-
-
-
-case "$1" in
-	start)
-		openqrm_plugin_dhcpd_start
-		;;
-	stop)
-		openqrm_plugin_dhcpd_stop
-		;;
-	restart)
-		openqrm_plugin_dhcpd_stop
-		sleep 1
-		openqrm_plugin_dhcpd_start
-		;;
-	init)
-		openqrm_plugin_dhcpd_init
-		;;
-	uninstall)
-		openqrm_plugin_dhcpd_uninstall
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/init.d/openqrm-plugin-dhcpd.postinstall b/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/init.d/openqrm-plugin-dhcpd.postinstall
deleted file mode 100644
index d677ee8..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/init.d/openqrm-plugin-dhcpd.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-dhcpd postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/init.d/openqrm-plugin-dhcpd.preremove b/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/init.d/openqrm-plugin-dhcpd.preremove
deleted file mode 100644
index f55468a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/init.d/openqrm-plugin-dhcpd.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-dhcpd preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-dhcpd stop
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/openqrm-plugin-dhcpd.conf b/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/openqrm-plugin-dhcpd.conf
deleted file mode 100644
index 0b216f9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/openqrm-plugin-dhcpd.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-# this is the openQRM-plugin-dhcpd info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="isc-dhcp-server, openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="dhcp, openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="dhcp-server, openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="Automatically manages IP-Addresses for the openQRM managed network."
-OPENQRM_PLUGIN_TYPE="network"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES=""
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/openqrm-plugin-dhcpd.conf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/dhcpd.conf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/var/state/dhcp/dhcpd.leases"
-# dirs which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_DIRS=""
-
-# additional interface to listen on, comma separated, eg. OPENQRM_PLUGIN_DHCPD_INTERFACES="eth1,eth2"
-OPENQRM_PLUGIN_DHCPD_INTERFACES=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/templates/openqrm-plugin-dhcpd-configuration.template b/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/templates/openqrm-plugin-dhcpd-configuration.template
deleted file mode 100644
index 0b1b726..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/templates/openqrm-plugin-dhcpd-configuration.template
+++ /dev/null
@@ -1,57 +0,0 @@
-# openQRM dhcpd-plugin default dhcpd.conf
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-allow booting;
-allow bootp;
-
-# Standard configuration directives...
-option subnet-mask OPENQRM_SERVER_SUBNET_MASK;
-option broadcast-address OPENQRM_SERVER_BROADCAST_ADDRESS;
-option routers OPENQRM_SERVER_DEFAULT_GATEWAY;
-option domain-name "OPENQRM_SERVER_DOMAIN";
-option domain-name-servers OPENQRM_SERVER_DNS;
-next-server OPENQRM_SERVER_IP_ADDRESS;
-
-# Group the PXE bootable hosts together
-group {
-	# PXE-specific configuration directives...
-	option vendor-encapsulated-options 09:0f:80:00:0c:4e:65:74:77:6f:72:6b:20:62:6f:6f:74:0a:07:00:50:72:6f:6d:70:74:06:01:02:08:03:80:00:00:47:04:80:00:00:00:ff;
-
-	subnet OPENQRM_SERVER_NETWORK netmask OPENQRM_SERVER_SUBNET_MASK {
-		default-lease-time 21600;
-		max-lease-time 43200;
-		
-		# the ip range to serve
-		range OPENQRM_PLUGIN_DHCPD_IP_RANGE_FIRST OPENQRM_PLUGIN_DHCPD_IP_RANGE_LAST;
-		filename "/pxelinux.0";
-
-
-# ! Please do NOT remove these lines ################
-# start_static_ips ##################################
-
-
-
-
-
-
-
-# end_static_ips ####################################
-
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/templates/openqrm-plugin-dhcpd-host.template b/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/templates/openqrm-plugin-dhcpd-host.template
deleted file mode 100644
index b84ce9e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/templates/openqrm-plugin-dhcpd-host.template
+++ /dev/null
@@ -1,5 +0,0 @@
-host DHCPD_RESOURCE_HOSTNAME {
-	hardware ethernet DHCPD_RESOURCE_MAC;
-	fixed-address DHCPD_RESOURCE_IP;
-	filename "/pxelinux.0";
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/templates/openqrm-plugin-dhcpd-network.template b/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/templates/openqrm-plugin-dhcpd-network.template
deleted file mode 100644
index 54f59f2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/etc/templates/openqrm-plugin-dhcpd-network.template
+++ /dev/null
@@ -1,26 +0,0 @@
-	option domain-name "OPENQRM_DHCPD_DOMAIN";
-	subnet OPENQRM_DHCPD_NETWORK netmask OPENQRM_DHCPD_SUBNET_MASK {
-		default-lease-time 21600;
-		max-lease-time 43200;
-		
-		# the ip range to serve
-		range OPENQRM_DHCPD_RANGE_FIRST OPENQRM_DHCPD_RANGE_LAST;
-		filename "/pxelinux.0";
-
-
-# ! Please do NOT remove these lines ################
-# start_static_ips ##################################
-
-
-
-
-
-
-
-# end_static_ips ####################################
-
-	}
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/include/openqrm-plugin-dhcpd-functions b/openQRM-5.3.50-CE/src/plugins/dhcpd/include/openqrm-plugin-dhcpd-functions
deleted file mode 100644
index eea3a6c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/include/openqrm-plugin-dhcpd-functions
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-# this is the functions file for the dhcpd-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_DEFAULT_DOMAIN="openqrm"
-OPENQRM_PLUGIN_DHCPD_CONF_TEMPLATE="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/templates/openqrm-plugin-dhcpd-configuration.template"
-OPENQRM_PLUGIN_DHCPD_CONF="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/dhcpd.conf"
-OPENQRM_PLUGIN_DHCPD_NETWORK_TEMPLATE="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/etc/templates/openqrm-plugin-dhcpd-network.template"
-OPENQRM_PLUGIN_DHCPD_LEASE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/var/state/dhcp"
-
-# logs for dhcpd
-function dhcpd_log() {
-	local COMPONENT=$1
-	shift
-	local MESSAGE=$@
-	logger -i -t "dhcpd plug-in" "$COMPONENT : $MESSAGE"
-}
-
-
-#
-# $1:  ip address
-# $2:  subnet mask
-# $3: [first/last/net] or  $3 [next] [offset]
-# out: net, first-ip, last-ip or next-ip
-#
-function openqrm_plugin_dhcpd_range_calculator() {
-        perl - $1 $2 $3 $4<<'EOF'
-ipp($ARGV[0],$ARGV[1])."\n";
-
-sub ipp
-{
-
-my $ipaddr=$ARGV[0];
-my $nmask=$ARGV[1];
-my $type=$ARGV[2];
-my $offset=$ARGV[3];
-
-my @addrarr=split(/\./,$ipaddr);
-my ( $ipaddress ) = unpack( "N", pack( "C4",@addrarr ) );
-
-my @maskarr=split(/\./,$nmask);
-my ( $netmask ) = unpack( "N", pack( "C4",@maskarr ) );
-
-my $netadd = ( $ipaddress & $netmask );
-my @netarr=unpack( "C4", pack( "N",$netadd ) );
-my $netaddress=join(".",@netarr);
-
-if ($type eq 'last') {
-        my $bcast = ( $ipaddress & $netmask ) + ( ~ $netmask ) -1;
-        my @bcastarr=unpack( "C4", pack( "N",$bcast ) ) ;
-        my $lastaddress=join(".",@bcastarr);
-        print "$lastaddress \n";
-} elsif ($type eq 'net') {
-        my $netadd = ( $ipaddress & $netmask );
-        my @netarr=unpack( "C4", pack( "N",$netadd ) );
-        my $netaddress=join(".",@netarr);
-        print "$netaddress\n";
-} elsif ($type eq 'next') {
-
-        my $bcast = ( $ipaddress & $netmask ) + ( ~ $netmask ) -1 - $offset;
-        my @bcastarr=unpack( "C4", pack( "N",$bcast ) ) ;
-        my $nextaddress=join(".",@bcastarr);
-        print "$nextaddress\n";
-} else {
-        my $firstadd = ( $ipaddress & $netmask ) + 1;
-        my @netarr=unpack( "C4", pack( "N",$firstadd ) );
-        my $firstaddress=join(".",@netarr);
-        print "$firstaddress\n";
-}
-}
-EOF
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/class/dhcpd-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/dhcpd/web/class/dhcpd-about.controller.class.php
deleted file mode 100644
index 90f5d60..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/class/dhcpd-about.controller.class.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-/**
- * dhcpd-about Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class dhcpd_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'dhcpd_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'dhcpd_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'dhcpd_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'dhcpd_about_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About Dhcpd',
-		'label' => 'About Dhcpd',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The dhcpd plugin automatically manages your ip-address assignment and network-boot environment for the rapid-deployment features of openQRM.
-			Since some of the dynamic deployment methods in openQRM are based on network-booting (PXE) a dhcpd-server is a fundamental service to assign ip-addresses to booting resources.
-			An automatic configured Dhcpd-server is provided by this plugin.
-			No manual configuration is needed. The dhcpd plugin configures a dhcpd.conf file during initialization.<br><br>
-			The main configuration file (dhcpd.conf) of the dhcpd server provided by this plugin you can find at:',
-
-		'requirements_title' => 'Requirements',
-		'requirements_list' => '<li>none</li>',
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-		'provides_title' => 'Provides',
-		'provides_list' => '<li>Automatically manages ip-address of the openQRM Management network</li>',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Network',
-		'documentation_title' => 'Documentation',
-		'use_case_title' => 'Use-Case',
-	),
-	'usage' => array (
-		'tab' => 'About Dhcpd',
-		'label' => 'Dhcpd Use-Cases',
-	),
-
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/dhcpd/lang", 'dhcpd-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/dhcpd/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "documentation";
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-			case 'bootservice':
-				$content[] = $this->bootservice(true);
-			break;
-			case 'vms':
-				$content[] = $this->vms(true);
-			break;
-			case 'usage':
-				$content[] = $this->usage(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About Dhcpd
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/dhcpd/class/dhcpd-about.documentation.class.php');
-			$controller = new dhcpd_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Boot-Service
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function bootservice( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/dhcpd/class/dhcpd-about.bootservice.class.php');
-			$controller = new dhcpd_about_bootservice($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['bootservice'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['bootservice']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'bootservice' );
-		$content['onclick'] = false;
-		if($this->action === 'bootservice'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-
-	//--------------------------------------------
-	/**
-	 * About Dhcpd VM management
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function vms( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/dhcpd/class/dhcpd-about.vms.class.php');
-			$controller = new dhcpd_about_vms($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['vms'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['vms']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'vms' );
-		$content['onclick'] = false;
-		if($this->action === 'vms'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-	//--------------------------------------------
-	/**
-	 * About Dhcpd Use-Cases
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function usage( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/dhcpd/class/dhcpd-about.usage.class.php');
-			$controller = new dhcpd_about_usage($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['usage'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['usage']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'usage' );
-		$content['onclick'] = false;
-		if($this->action === 'usage'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/class/dhcpd-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/dhcpd/web/class/dhcpd-about.documentation.class.php
deleted file mode 100644
index 503ef98..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/class/dhcpd-about.documentation.class.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * dhcpd-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class dhcpd_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'dhcpd_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "dhcpd_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-
-		$this->basedir    = $this->openqrm->get('basedir');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/dhcpd-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['provides_title'], 'provides_title');
-		$t->add($this->lang['provides_list'], 'provides_list');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->basedir."/plugins/dhcpd/etc/dhcpd.conf", 'config_file');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/class/dhcpd.controller.class.php b/openQRM-5.3.50-CE/src/plugins/dhcpd/web/class/dhcpd.controller.class.php
deleted file mode 100644
index 1f50ca3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/class/dhcpd.controller.class.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * DHCP Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class dhcpd_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'dhcpd_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "dhcpd_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'dhcpd_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'dhcpd_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array(
-		'tab' => 'Dhcpd',
-		'label' => 'dhcpd.conf',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/dhcpd/lang", 'dhcpd.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/dhcpd/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = 'select';
-		}
-
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			default:
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/dhcpd/class/dhcpd.select.class.php');
-			$controller = new dhcpd_select($this->openqrm, $this->response);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/class/dhcpd.select.class.php b/openQRM-5.3.50-CE/src/plugins/dhcpd/web/class/dhcpd.select.class.php
deleted file mode 100644
index bdd839c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/class/dhcpd.select.class.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * DHCP select
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class dhcpd_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'dhcpd_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "dhcpd_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'dhcpd_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'dhcpd_identifier';
-/**
-* path to dhcps
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->tpldir   = $this->rootdir.'/plugins/dhcpd/tpl';
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$response = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/dhcpd-select.tpl.php');
-		$t->add($this->lang['label'], 'label');
-		$t->add($response, 'content');
-		return $t;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function select() {
-
-		$resource = $this->openqrm->resource();
-
-		$file = $this->openqrm->file();
-		$content = $file->get_contents($this->openqrm->get('basedir').'/plugins/dhcpd/etc/dhcpd.conf');
-
-		$list = $resource->display_overview(0, 10000, 'resource_id', 'ASC');
-		foreach($list as $v) {
-			if(isset($v['resource_id']) && $v['resource_id'] !== '0') {
-				$content = str_replace('resource'.$v['resource_id'], 'resource<a href="?base=resource&resource_filter='.$v['resource_mac'].'">'.$v['resource_id'].'</a>', $content);
-			}
-		}
-		$content = str_replace("\t", '<span style="padding: 0 10px;">&#160;</span>', $content);
-		$content = str_replace("\n", '<br>', $content);
-		return $content;	
-
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/css/dhcpd.css b/openQRM-5.3.50-CE/src/plugins/dhcpd/web/css/dhcpd.css
deleted file mode 100644
index 0475a3e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/css/dhcpd.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/*-Icon classes ----- */
-a.graphs {
-	padding: 0;
-	border: 0px none;
-	width: 32px;
-	height: 32px;
-	display:block;
-	text-align: center;
-	text-decoration: none;
-	line-height: 0px;
-	overflow: hidden;
-	color: transparent;
-}
-a.graphs {
-	background: url('/openqrm/base/plugins/dhcpd/img/plugin.png') no-repeat center top;
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/dhcpd-action.php b/openQRM-5.3.50-CE/src/plugins/dhcpd/web/dhcpd-action.php
deleted file mode 100644
index 3ca5560..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/dhcpd-action.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/authblocker.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-// filter inputs
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-global $IMAGE_INFO_TABLE;
-global $DEPLOYMENT_INFO_TABLE;
-global $OPENQRM_SERVER_BASE_DIR;
-
-// get params
-$dhcpd_command = $request->get('dhcpd_command');
-$dhcpd_resource_id = $request->get('resource_id');
-$dhcpd_resource_ip = $request->get('resource_ip');
-
-// get event + openQRM server
-$event = new event();
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $event;
-
-// user/role authentication
-if ($OPENQRM_USER->role != "administrator") {
-	$event->log("authorization", $_SERVER['REQUEST_TIME'], 1, "dhcpd-action", "Un-Authorized access to dhcpd-actions from $OPENQRM_USER->name", "", "", 0, 0, 0);
-	exit();
-}
-
-
-$event->log("$dhcpd_command", $_SERVER['REQUEST_TIME'], 5, "dhcpd-action", "Processing dhcpd command $dhcpd_command", "", "", 0, 0, 0);
-switch ($dhcpd_command) {
-	case 'post_ip':
-		$event->log("$dhcpd_command", $_SERVER['REQUEST_TIME'], 5, "dhcpd-action", "Updateing resource $dhcpd_resource_id with ip $dhcpd_resource_ip", "", "", 0, 0, 0);
-		$dhcpd_resource = new resource();
-		$dhcpd_resource->get_instance_by_id($dhcpd_resource_id);
-		$dhcpd_resource_fields["resource_ip"] = $dhcpd_resource_ip;
-		$dhcpd_resource->update_info($dhcpd_resource_id, $dhcpd_resource_fields);
-		break;
-
-	default:
-		$event->log("$dhcpd_command", $_SERVER['REQUEST_TIME'], 3, "dhcpd-action", "No such dhcpd command ($dhcpd_command)", "", "", 0, 0, 0);
-		break;
-
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/dhcpd/web/img/plugin.png
deleted file mode 100644
index dc584e9..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/lang/de.dhcpd-about.ini b/openQRM-5.3.50-CE/src/plugins/dhcpd/web/lang/de.dhcpd-about.ini
deleted file mode 100644
index c14440a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/lang/de.dhcpd-about.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[documentation]
-tab = "Über Dhcpd"
-label = "Über Dhcpd"
-introduction_title = "Einleitung"
-introduction_content = "<p>Das 'Dhcpd'-Plugin vergibt automatisch IP-Adressen im openQRM-Verwaltungsnetzwerk und stellt eine Netzwerk-Boot Umgebung für die 'Rapid-Deployment'-Funktionalitäten von openQRM bereit. Da einige Deployment-Methoden von openQRM mittels Netzwerk-Boot (PXE) arbeiten ist ein dhcpd-Server ein fundamentaler Dienst um IP-Adressen an startende System zu vergeben.</p>
-	<p>Ein automatisch konfigurierter Dhcpd Server wird von diesem Plugin bereitgestellt. Manuelle Konfiguration ist nicht nötig. Das Plugin erzeugt automatisch eine valide dhcpd.conf Konfigurations Datei während der Initialisierung.	Die Konfigurationsdatei des im Plugin beinhalteten Dhcpd Servers finde Sie unter:</p>"
-
-requirements_title = "Anforderungen"
-requirements_list = "keine"
-tested_title = "Getestet mit"
-tested_content = "Dieses Plugin ist getestet mit Debian, Ubuntu und CentOS"
-
-provides_title = "Bietet"
-provides_list = "Automatische IP-Adress-Vergabe für das openQRM-Verwaltungsnetzwerk"
-
-type_title = "Plugin-Typ"
-type_content = "<span class=\"pill\">Netzwerk</span>"
-
-documentation_title = "Dokumentation"
-use_case_title = "Anwendungsfall"
-
-
-[usage]
-tab = "Über Dhcpd"
-label = "Dhcpd-Anwendungsfälle"
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/lang/en.dhcpd-about.ini b/openQRM-5.3.50-CE/src/plugins/dhcpd/web/lang/en.dhcpd-about.ini
deleted file mode 100644
index c20b657..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/lang/en.dhcpd-about.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[documentation]
-tab = "About Dhcpd"
-label = "About Dhcpd"
-introduction_title = "Introduction"
-introduction_content = "<p>The dhcpd plugin automatically manages your ip address assignment and network boot environment for the rapid deployment features of openQRM. Since some of the dynamic deployment methods in openQRM are based on network-booting (PXE) a dhcpd server is a fundamental service to assign ip addresses to booting resources. An automatic configured dhcpd server is provided by this plugin.</p>
-			<p>No manual configuration is needed. The dhcpd plugin configures a <code>dhcpd.conf</code> file during initialization. The main configuration file (dhcpd.conf) of the dhcpd server provided by this plugin you can find at:"</p>
-
-requirements_title = "Requirements"
-requirements_list = "none"
-tested_title = "Tested with"
-tested_content = "This plugin is tested with the Debian, Ubuntu and CentOS."
-provides_title = "Provides"
-provides_list = "Automatically manages ip addresses in the openQRM management network."
-type_title = "Plugin type"
-type_content = "<span class=\"pill\">Network</span>"
-documentation_title = "Documentation"
-use_case_title = "Use case"
-
-
-[usage]
-tab = "About dhcpd"
-label = "Dhcpd use cases"
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/dhcpd/web/menu.txt
deleted file mode 100644
index 62e55d3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/menu.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|Dhcpd
-...|Overview|index.php?plugin=dhcpd|Overview
-...|About|index.php?plugin=dhcpd&controller=dhcpd-about|How to use
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/openqrm-dhcpd-appliance-hook.php b/openQRM-5.3.50-CE/src/plugins/dhcpd/web/openqrm-dhcpd-appliance-hook.php
deleted file mode 100644
index 064f1ae..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/openqrm-dhcpd-appliance-hook.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-
-
-function openqrm_dhcpd_appliance($cmd, $appliance_fields) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_EXEC_PORT;
-	$openqrm_server = new openqrm_server();
-	$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-	$event = new event();
-	$appliance_id=$appliance_fields["appliance_id"];
-	$appliance_name=$appliance_fields["appliance_name"];
-	$resource = new resource();
-	$resource->get_instance_by_id($appliance_fields["appliance_resources"]);
-	$resource_mac=$resource->mac;
-	$resource_ip=$resource->ip;
-	$appliance = new appliance();
-	$appliance->get_instance_by_id($appliance_id);
-	if (($resource->id == "-1") || ($resource->id == "")) {
-		return;
-	}
-
-	$event->log("openqrm_dhcpd_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-dhcpd-appliance-hook.php", "Handling $cmd event $appliance_id/$appliance_name/$resource_ip/$resource_mac", "", "", 0, 0, $resource->id);
-	switch($cmd) {
-		case "start":
-		    $event->log("openqrm_dhcpd_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-dhcpd-appliance-hook.php", "Adding hostname ".$appliance->name." from resource ".$resource->id.".", "", "", 0, 0, $resource->id);
-		    $dhcpd_command = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/dhcpd/bin/openqrm-dhcpd-appliance add_hostname -m ".$resource_mac." -n ".$appliance->name." --openqrm-cmd-mode background";
-		    $openqrm_server->send_command($dhcpd_command);
-			break;
-
-		case "stop":
-		    $event->log("openqrm_dhcpd_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-dhcpd-appliance-hook.php", "Removing hostname ".$appliance->name." from resource ".$resource->id.".", "", "", 0, 0, $resource->id);
-		    $dhcpd_command = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/dhcpd/bin/openqrm-dhcpd-appliance remove_hostname -m ".$resource_mac." -n ".$appliance->name." --openqrm-cmd-mode background";
-		    $openqrm_server->send_command($dhcpd_command);
-		    break;
-	}
-
-
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/openqrm-dhcpd-resource-hook.php b/openQRM-5.3.50-CE/src/plugins/dhcpd/web/openqrm-dhcpd-resource-hook.php
deleted file mode 100644
index d1f367d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/openqrm-dhcpd-resource-hook.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-
-
-function openqrm_dhcpd_resource($cmd, $resource_fields) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	$resource_id=$resource_fields["resource_id"];
-	$resource_ip=$resource_fields["resource_ip"];
-	$resource_mac=$resource_fields["resource_mac"];
-	if (isset($resource_fields["resource_subnet"])) {
-		$resource_subnet=$resource_fields["resource_subnet"];
-	} else {
-		$resource_subnet="0.0.0.0";
-	}
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-	$openqrm_server = new openqrm_server();
-	$event->log("openqrm_new_resource", $_SERVER['REQUEST_TIME'], 5, "openqrm-dhcpd-resource-hook.php", "Handling $cmd event $resource_id/$resource_ip/$resource_subnet/$resource_mac", "", "", 0, 0, $resource_id);
-	switch($cmd) {
-		case "add":
-			$openqrm_server->send_command($OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/dhcpd/bin/openqrm-dhcpd-manager add -d ".$resource_id." -m ".$resource_mac." -i ".$resource_ip." -s ".$resource_subnet." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background");
-			break;
-		case "remove":
-			$openqrm_server->send_command("$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dhcpd/bin/openqrm-dhcpd-manager remove -d ".$resource_id." -m ".$resource_mac." -i ".$resource_ip." -s ".$resource_subnet." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background");
-			break;
-
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/tpl/dhcpd-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/dhcpd/web/tpl/dhcpd-about-documentation.tpl.php
deleted file mode 100644
index c45377c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/tpl/dhcpd-about-documentation.tpl.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{introduction_title}</h3>
-		{introduction_content}
-		<pre>{config_file}</pre>
-	
-		<h3>{provides_title}</h3>
-		{provides_list}
-	
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-	</div>
-	
-	<div class="span2 offset1">
-	
-		<h3>{type_title}</h3>
-		{type_content}
-
-		<h3>{tested_title}</h3>
-		{tested_content}
-	</div>
-</div>
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/tpl/dhcpd-select.tpl.php b/openQRM-5.3.50-CE/src/plugins/dhcpd/web/tpl/dhcpd-select.tpl.php
deleted file mode 100644
index 92f8288..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dhcpd/web/tpl/dhcpd-select.tpl.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div style="overflow:auto;">
-{content}
-</div>
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/Makefile b/openQRM-5.3.50-CE/src/plugins/dns/Makefile
deleted file mode 100644
index 2e82c1d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# this is the openQRM dns-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/bin
-	. $(OPENQRM_SERVER_CONF) && cp bin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/bin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/bin/openqrm*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/templates
-	. $(OPENQRM_SERVER_CONF) && cp etc/templates/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/templates/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/web/img
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/web/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/web/lang/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/web/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/web/tpl/
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/dns
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/dns/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/bin/openqrm-dns-domain-manager b/openQRM-5.3.50-CE/src/plugins/dns/bin/openqrm-dns-domain-manager
deleted file mode 100644
index 684e43e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/bin/openqrm-dns-domain-manager
+++ /dev/null
@@ -1,246 +0,0 @@
-#!/bin/bash
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/include/openqrm-plugin-dns-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/openqrm-plugin-dns.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-openqrm_server_get_config
-
-export LANG=C
-BIND_BACKUP_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/bind/backup"
-
-
-function dns_domain_usage() {
-	echo "Usage: $0 add_domain/remove_domain -n [dns-domain-name] -i [dns-name-server_ip] -u [admin-user] -p [admin-password]"
-	echo "       $0 add_host/remove_host -n [dns-domain-name] -i [dns-ip] -q [dns-hostname] -u [admin-user] -p [admin-password]"
-	exit 1
-}
-
-FULL_COMMANDLINE="$0 $@"
-DNS_CMD=$1
-shift
-
-while [ $# -ne 0 ]; do
-	case "$1" in
-		-n)
-			DNS_DOMAIN_NAME=$2
-			shift
-			;;
-		-i)
-			DNS_HOST_IP=$2
-			shift
-			;;
-		-q)
-			DNS_HOST_NAME=$2
-			shift
-			;;
-		-u)
-			OPENQRM_USERNAME=$2
-			shift
-			;;
-		-p)
-			OPENQRM_PASSWORD=$2
-			shift
-			;;
-		--openqrm-ui-user)
-			OPENQRM_UI_USER=$2
-			shift
-			;;
-		--openqrm-internal-cmd)
-			OPENQRM_INTERNAL_CMD=$2
-			shift
-			;;
-		--openqrm-cmd-mode)
-			OPENQRM_CMD_MODE=$2
-			shift
-			;;
-		*)
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			echo "ERROR: Free commandline arguments are not allowed"
-			dns_domain_usage
-			exit 6
-			;;
-	esac
-	shift
-done
-
-# checks
-if [ "$DNS_CMD" == "" ]; then
-	openqrm_unblock_starting_queue $FULL_COMMANDLINE
-	dns_domain_usage
-fi
-
-
-
-
-
-
-case "$DNS_CMD" in
-
-	add_domain)
-		if [ "$DNS_DOMAIN_NAME" == "" ] || [ "$DNS_HOST_IP" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			dns_domain_usage
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire dns`
-		trap "openqrm_lock_queue release dns $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		LAST_GOOD_ZONES_BACKUP=`dns_zone_backup`
-
-		dns_create_domain $DNS_DOMAIN_NAME $DNS_HOST_IP
-
-		if ! dns_reload $LAST_GOOD_ZONES_BACKUP; then
-			openqrm_post_event 0 "add_domain" 3 "openqrm-dns-domain-manager" "Failed adding custom domain $DNS_DOMAIN_NAME. Trying to revert custom zones"
-
-			openqrm_lock_queue release dns $LOCK_TIME
-			trap '' EXIT
-
-			exit 0
-		fi
-
-		dns_remove_zone_backup $LAST_GOOD_ZONES_BACKUP
-		openqrm_post_event 0 "add_domain" 5 "openqrm-dns-domain-manager" "Added custom domain $DNS_DOMAIN_NAME"
-
-		openqrm_lock_queue release dns $LOCK_TIME
-		trap '' EXIT
-		;;
-
-
-	remove_domain)
-		if [ "$DNS_DOMAIN_NAME" == "" ] || [ "$DNS_HOST_IP" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			dns_domain_usage
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire dns`
-		trap "openqrm_lock_queue release dns $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		LAST_GOOD_ZONES_BACKUP=`dns_zone_backup`
-
-		dns_remove_domain $DNS_DOMAIN_NAME $DNS_HOST_IP
-
-		if ! dns_reload $LAST_GOOD_ZONES_BACKUP; then
-			openqrm_post_event 0 "add_domain" 3 "openqrm-dns-domain-manager" "Failed removing custom domain $DNS_DOMAIN_NAME. Trying to revert custom zones"
-
-			openqrm_lock_queue release dns $LOCK_TIME
-			trap '' EXIT
-
-			exit 0
-		fi
-
-		dns_remove_zone_backup $LAST_GOOD_ZONES_BACKUP
-		openqrm_post_event 0 "add_domain" 5 "openqrm-dns-domain-manager" "Removed custom domain $DNS_DOMAIN_NAME"
-
-		openqrm_lock_queue release dns $LOCK_TIME
-		trap '' EXIT
-		;;
-
-
-
-
-
-	add_host)
-
-		if [ "$DNS_DOMAIN_NAME" == "" ] || [ "$DNS_HOST_IP" == "" ] || [ "$DNS_HOST_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			dns_domain_usage
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire dns`
-		trap "openqrm_lock_queue release dns $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		LAST_GOOD_ZONES_BACKUP=`dns_zone_backup`
-
-		if ! dns_domain_manage_host add $DNS_DOMAIN_NAME $DNS_HOST_IP $DNS_HOST_NAME; then
-			openqrm_post_event 0 "add_host" 3 "openqrm-dns-domain-manager" "Failed adding $DNS_HOST_NAME to custom domain $DNS_DOMAIN_NAME."
-		fi
-
-		if ! dns_reload $LAST_GOOD_ZONES_BACKUP; then
-			openqrm_post_event 0 "add_host" 3 "openqrm-dns-domain-manager" "Failed adding $DNS_HOST_NAME to custom domain $DNS_DOMAIN_NAME. Trying to revert custom zones"
-
-			openqrm_lock_queue release dns $LOCK_TIME
-			trap '' EXIT
-
-			exit 0
-		fi
-
-		dns_remove_zone_backup $LAST_GOOD_ZONES_BACKUP
-
-		openqrm_lock_queue release dns $LOCK_TIME
-		trap '' EXIT
-		;;
-
-
-
-
-	remove_host)
-		if [ "$DNS_DOMAIN_NAME" == "" ] || [ "$DNS_HOST_IP" == "" ] || [ "$DNS_HOST_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			dns_domain_usage
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire dns`
-		trap "openqrm_lock_queue release dns $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		LAST_GOOD_ZONES_BACKUP=`dns_zone_backup`
-
-		if ! dns_domain_manage_host remove $DNS_DOMAIN_NAME $DNS_HOST_IP $DNS_HOST_NAME; then
-			openqrm_post_event 0 "remove_host" 3 "openqrm-dns-domain-manager" "Failed removing $DNS_HOST_NAME from custom domain $DNS_DOMAIN_NAME."
-			echo
-		fi
-
-		if ! dns_reload $LAST_GOOD_ZONES_BACKUP; then
-			openqrm_post_event 0 "remove_host" 3 "openqrm-dns-domain-manager" "Failed removing $DNS_HOST_NAME from custom domain $DNS_DOMAIN_NAME. Trying to revert custom zones"
-
-			openqrm_lock_queue release dns $LOCK_TIME
-			trap '' EXIT
-
-			exit 0
-		fi
-
-		dns_remove_zone_backup $LAST_GOOD_ZONES_BACKUP
-
-		openqrm_lock_queue release dns $LOCK_TIME
-		trap '' EXIT
-		;;
-
-
-
-
-
-
-
-
-
-	*)
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		dns_log openqrm-dns-manager "Usage: $0 {start|stop|init} "
-		exit 1
-		;;
-esac
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/bin/openqrm-dns-manager b/openQRM-5.3.50-CE/src/plugins/dns/bin/openqrm-dns-manager
deleted file mode 100644
index e582387..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/bin/openqrm-dns-manager
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/bin/bash
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/include/openqrm-plugin-dns-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/openqrm-plugin-dns.conf
-export LANG=C
-BIND_BACKUP_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/bind/backup"
-DNS_INDB_FILE=`basename $DNS_INDB`
-DNS_REVDB_FILE=`basename $DNS_REVDB`
-
-
-FULL_COMMANDLINE="$0 $@"
-DNS_CMD=$1
-case "$DNS_CMD" in
-	start|stop)
-		APPLIANCE_ID=$2
-		APPLIANCE_NAME=$3
-		APPLIANCE_IP=$4
-		if [ "$APPLIANCE_ID" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "start/stop" 3 "openqrm-dns-manager" "Missing Appliance ID in start/stop hook"
-			# exit good to avoid re-run
-			exit 0
-		fi
-		if [ "$APPLIANCE_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "start/stop" 3 "openqrm-dns-manager" "Missing Name in start/stop hook for Appliance $APPLIANCE_ID"
-			# exit good to avoid re-run
-			exit 0
-		fi
-		if [ "$APPLIANCE_IP" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "start/stop" 5 "openqrm-dns-manager" "Skipping start hook/stop for Appliance $APPLIANCE_ID. Missing IP."
-			# exit good to avoid re-run
-			exit 0
-		fi
-		# get the last byte from the ip for the reverse entry
-		APPLIANCE_LAST_IP_BYTE=`echo $APPLIANCE_IP | cut -d'.' -f 4`
-		if [ "$APPLIANCE_LAST_IP_BYTE" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "start/stop" 3 "openqrm-dns-manager" "Failed to get reverse DNS entry for Appliance $APPLIANCE_ID"
-			# exit good to avoid re-run
-			exit 0
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire dns`
-		trap "openqrm_lock_queue release dns $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		dns_log openqrm-dns-manager "Appliance $APPLIANCE_NAME id $APPLIANCE_ID ip-address $APPLIANCE_IP"
-		# back lastgood state of the zone files
-		TIMESTAMP=`date +%s`
-		mkdir -p $BIND_BACKUP_DIR/$TIMESTAMP
-		cp -a $DNS_INDB $BIND_BACKUP_DIR/$TIMESTAMP/
-		cp -a $DNS_REVDB $BIND_BACKUP_DIR/$TIMESTAMP/
-
-		# stop / remove in any case
-		cat $DNS_INDB | grep -v -w $APPLIANCE_IP > $DNS_INDB.tmp
-		mv -f $DNS_INDB.tmp $DNS_INDB
-		cat $DNS_REVDB | grep -v -w ^$APPLIANCE_LAST_IP_BYTE > $DNS_REVDB.tmp
-		mv -f $DNS_REVDB.tmp $DNS_REVDB
-
-		# start
-		if [ "$DNS_CMD" == "start" ]; then
-			echo "$APPLIANCE_NAME	IN	A	$APPLIANCE_IP" >> $DNS_INDB
-			echo "$APPLIANCE_LAST_IP_BYTE	IN	PTR	$APPLIANCE_NAME.$OPENQRM_SERVER_DOMAIN." >> $DNS_REVDB
-		fi
-
-		# update serial no / regular
-		SERIAL_INDB="`cat $DNS_INDB | grep -i ';.*erial' | awk '{print $1}'`"
-		if [ "$SERIAL_INDB" == "" ]; then
-			openqrm_post_event 0 "start/stop" 3 "openqrm-dns-manager" "Failed to get serial number (regular). Restoring Zones files ($TIMESTAMP)"
-			# restore
-			cp -a $BIND_BACKUP_DIR/$TIMESTAMP/$DNS_INDB_FILE $DNS_INDB
-			cp -a $BIND_BACKUP_DIR/$TIMESTAMP/$DNS_REVDB_FILE $DNS_REVDB
-
-			openqrm_lock_queue release dns $LOCK_TIME
-			trap '' EXIT
-			# exit good to avoid re-run
-			exit 0
-		elif [ "$SERIAL_INDB" -ge 0 ]; then
-			SERIAL_INDB_NEW=$((SERIAL_INDB+1))
-			sed -i -e "s/$SERIAL_INDB.*;.*erial/$SERIAL_INDB_NEW ; Serial/g" $DNS_INDB
-		fi
-		# update serial no / reverse
-		SERIAL_REVDB="`cat $DNS_REVDB | grep -i ';.*erial' | awk '{print $1}'`"
-		if [ "$SERIAL_REVDB" == "" ]; then
-			openqrm_post_event 0 "start/stop" 3 "openqrm-dns-manager" "Failed to get serial number (reverse). Restoring Zones files ($TIMESTAMP)"
-			# restore
-			cp -a $BIND_BACKUP_DIR/$TIMESTAMP/$DNS_INDB_FILE $DNS_INDB
-			cp -a $BIND_BACKUP_DIR/$TIMESTAMP/$DNS_REVDB_FILE $DNS_REVDB
-
-			openqrm_lock_queue release dns $LOCK_TIME
-			trap '' EXIT
-			# exit good to avoid re-run
-			exit 0
-		elif [ "$SERIAL_REVDB" -ge 0 ]; then
-			SERIAL_REVDB_NEW=$((SERIAL_REVDB+1))
-			sed -i -e "s/$SERIAL_REVDB.*;.*erial/$SERIAL_REVDB_NEW ; Serial/g" $DNS_REVDB
-		fi
-
-		# reload dns
-		if ! $DNS_INIT reload; then
-			openqrm_post_event 0 "start/stop" 3 "openqrm-dns-manager" "DNS reload failed. Restoring Zones files ($TIMESTAMP)"
-			# restore
-			cp -a $BIND_BACKUP_DIR/$TIMESTAMP/$DNS_INDB_FILE $DNS_INDB
-			cp -a $BIND_BACKUP_DIR/$TIMESTAMP/$DNS_REVDB_FILE $DNS_REVDB
-			# retry restart again
-			$DNS_INIT stop
-			if ! $DNS_INIT start; then
-				openqrm_post_event 0 "start/stop" 3 "openqrm-dns-manager" "Failed to start DNS! Please recheck the DNS configuration!"
-
-				openqrm_lock_queue release dns $LOCK_TIME
-				trap '' EXIT
-			fi
-
-			openqrm_lock_queue release dns $LOCK_TIME
-			trap '' EXIT
-		fi
-		# restart name service cache daemon if installed
-		if [ -x /etc/init.d/nscd ]; then
-			/etc/init.d/nscd restart
-		fi
-		openqrm_lock_queue release dns $LOCK_TIME
-		trap '' EXIT
-		;;
-	init)
-		LOCK_TIME=`openqrm_lock_queue aquire dns`
-		trap "openqrm_lock_queue release dns $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		dns_log openqrm-dns-manager "Initialysing bind (dns) configuration."
-		$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/init.d/openqrm-plugin-dns init
-
-		openqrm_lock_queue release dns $LOCK_TIME
-		trap '' EXIT
-		;;
-	restart)
-		LOCK_TIME=`openqrm_lock_queue aquire dns`
-		trap "openqrm_lock_queue release dns $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		if ! $DNS_INIT restart; then
-			openqrm_post_event 0 "restart" 3 "openqrm-dns-manager" "Failed to restart DNS! Please recheck the DNS configuration!"
-		fi
-		# restart name service cache daemon if installed
-		if [ -x /etc/init.d/nscd ]; then
-			/etc/init.d/nscd restart
-		fi
-		openqrm_lock_queue release dns $LOCK_TIME
-		trap '' EXIT
-		;;
-	*)
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		dns_log openqrm-dns-manager "Usage: $0 {start|stop|init} "
-		exit 1
-		;;
-esac
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/etc/init.d/openqrm-plugin-dns b/openQRM-5.3.50-CE/src/plugins/dns/etc/init.d/openqrm-plugin-dns
deleted file mode 100644
index b72c401..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/etc/init.d/openqrm-plugin-dns
+++ /dev/null
@@ -1,261 +0,0 @@
-#!/bin/bash
-# init script for the openQRM dns plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/include/openqrm-plugin-dns-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/openqrm-plugin-dns.conf
-
-function openqrm_plugin_dns_start() {
-	echo "Starting the openQRM dns-plugin"
-	openqrm_server_get_config
-	openqrm_plugin_dns_stop 1>/dev/null 2>&1
-	if $DNS_INIT start; then
-		# do we want to adjust the resolv.conf ?
-		if [ "$OPENQRM_SERVER_ADJUST_RESOLV_CONF" == "yes" ]; then
-			# backup
-			if [ ! -f /etc/resolv.conf.openqrm-dns-plugin.backup ]; then
-				cp -f /etc/resolv.conf /etc/resolv.conf.openqrm-dns-plugin.backup
-			fi
-			# create new resolv.conf
-			echo "domain $OPENQRM_SERVER_DOMAIN" > /etc/resolv.conf
-			echo "search $OPENQRM_SERVER_DOMAIN $OPENQRM_SERVER_SEARCH_DOMAIN" >> /etc/resolv.conf
-			echo "nameserver $OPENQRM_SERVER_IP_ADDRESS" >> /etc/resolv.conf
-		fi
-	else
-		openqrm_post_event 0 "start" 3 "openqrm-plugin-dns" "Failed to start DNS! Please recheck the DNS configuration!"
-		return 1
-	fi
-
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/dns/.running
-	return $RET
-
-}
-
-
-function openqrm_plugin_dns_stop() {
-	echo "Stopping the openQRM dns-plugin"
-	$DNS_INIT stop
-	# do we want to adjust the resolv.conf ?
-	if [ "$OPENQRM_SERVER_ADJUST_RESOLV_CONF" == "yes" ]; then
-			# restore
-			if [ -f /etc/resolv.conf.openqrm-dns-plugin.backup ]; then
-				cp -f /etc/resolv.conf.openqrm-dns-plugin.backup /etc/resolv.conf
-			fi
-	fi
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/dns/.running
-	return 0
-}
-
-
-function openqrm_plugin_dns_init() {
-	echo "Initializing the openQRM dns-plugin"
-	openqrm_server_get_config
-	OPENQRM_SERVER_IP_LAST_BYTE=`echo $OPENQRM_SERVER_IP_ADDRESS | cut -d'.' -f 4`
-	OPENQRM_SERVER_IP_FIRST_BYTE=`echo $OPENQRM_SERVER_IP_ADDRESS | cut -d'.' -f1`
-	OPENQRM_SERVER_IP_SECOND_BYTE=`echo $OPENQRM_SERVER_IP_ADDRESS | cut -d'.' -f2`
-	OPENQRM_SERVER_IP_THIRD_BYTE=`echo $OPENQRM_SERVER_IP_ADDRESS | cut -d'.' -f3`
-	OPENQRM_SERVER_IP_FIRSTS_BYTES_REV="$OPENQRM_SERVER_IP_THIRD_BYTE.$OPENQRM_SERVER_IP_SECOND_BYTE.$OPENQRM_SERVER_IP_FIRST_BYTE"
-
-	# take backups of an eventual existing config
-	if [ -f /etc/bind/named.conf.local ] && [ ! -f /etc/bind/named.conf.local.openqrm-dns-plugin.backup ]; then
-		cp -f /etc/bind/named.conf.local /etc/bind/named.conf.local.openqrm-dns-plugin.backup
-	fi
-
-	# preparing bind config
-	mkdir -p /etc/bind/zones/
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/bind/zones
-
-	# named.conf local
-	cat $DNS_NAMED_LOCAL_TEMPLATE |	\
-		sed -e "s/@@OPENQRM_SERVER_IP_FIRSTS_BYTES_REV@@/$OPENQRM_SERVER_IP_FIRSTS_BYTES_REV/g" |	\
-			sed -e "s/@@OPENQRM_SERVER_DOMAIN@@/$OPENQRM_SERVER_DOMAIN/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/bind/named.conf.local
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/bind/named.conf.local /etc/bind/named.conf.local
-
-	# in db
-	cat $DNS_INDB_TEMPLATE |	\
-		sed -e "s/@@OPENQRM_SERVER_DOMAIN@@/$OPENQRM_SERVER_DOMAIN/g" |	\
-		sed -e "s/@@OPENQRM_SERVER_IP_ADDRESS@@/$OPENQRM_SERVER_IP_ADDRESS/g" |	\
-		sed -e "s/@@OPENQRM_SERVER_IP_LAST_BYTE@@/$OPENQRM_SERVER_IP_LAST_BYTE/g" > $DNS_INDB
-	DNS_INDB_FSNAME=`basename $DNS_INDB`
-	ln -sf $DNS_INDB /etc/bind/zones/$DNS_INDB_FSNAME
-
-	# rev db
-	cat $DNS_REVDB_TEMPLATE |	\
-		sed -e "s/@@OPENQRM_SERVER_DOMAIN@@/$OPENQRM_SERVER_DOMAIN/g" |	\
-		sed -e "s/@@OPENQRM_SERVER_IP_ADDRESS@@/$OPENQRM_SERVER_IP_ADDRESS/g" |	\
-		sed -e "s/@@OPENQRM_SERVER_IP_LAST_BYTE@@/$OPENQRM_SERVER_IP_LAST_BYTE/g" > $DNS_REVDB
-	DNS_REVDB_FSNAME=`basename $DNS_REVDB`
-	ln -sf $DNS_REVDB /etc/bind/zones/$DNS_REVDB_FSNAME
-
-	# check if we have forwarders already
-	NAMED_OPTIONS_EXIST=true
-	if [ -f /etc/redhat-release ]; then
-		touch /etc/bind/named.conf.options
-		NAMED_OPTIONS_EXIST=false
-	fi
-	CONFIGURED_DNS_FORWARDERS=`cat /etc/bind/named.conf.options | grep -v "//" | grep -A2 forwarders | grep -v forwarders | grep -v "}" | head -n1 | awk {' print $1 '} | sed -e "s/;//g"`
-	if [ "$CONFIGURED_DNS_FORWARDERS" != "" ] && openqrm_validate_ip $CONFIGURED_DNS_FORWARDERS; then
-		echo "NOTICE: Found already configured dns-forwarders $CONFIGURED_DNS_FORWARDERS"
-	else
-		if [ -f /etc/resolv.conf.openqrm-dns-plugin.backup ]; then
-			CHECK_FOR_FORWARDERS="/etc/resolv.conf.openqrm-dns-plugin.backup"
-		else
-			CHECK_FOR_FORWARDERS="/etc/resolv.conf"
-		fi
-		DNS_FORWARDER=`cat $CHECK_FOR_FORWARDERS | grep -v ^# | grep nameserver | head -n1 | awk {' print $2 '}`
-		if [ "$DNS_FORWARDER" != "" ]  && openqrm_validate_ip $DNS_FORWARDER; then
-			echo "NOTICE: Configuring dns-forwarder to $DNS_FORWARDER"
-			if [ ! -f /etc/bind/named.conf.options.openqrm-dns-plugin.backup ]; then
-				cp -f /etc/bind/named.conf.options /etc/bind/named.conf.options.openqrm-dns-plugin.backup
-			fi
-			rm -f /etc/bind/named.conf.options.new
-			if [ "$NAMED_OPTIONS_EXIST" == "false" ]; then
-				echo "options {" >> /etc/bind/named.conf.options.new
-			fi
-			cat /etc/bind/named.conf.options | grep -v "^};" >> /etc/bind/named.conf.options.new
-			echo "		forwarders {" >> /etc/bind/named.conf.options.new
-			echo "			$DNS_FORWARDER;" >> /etc/bind/named.conf.options.new
-			echo "		};" >> /etc/bind/named.conf.options.new
-			echo "};" >> /etc/bind/named.conf.options.new
-			mv -f /etc/bind/named.conf.options.new /etc/bind/named.conf.options
-		else
-			openqrm_post_event 0 "init" 3 "openqrm-plugin-dns" "Could not find out any dns-forwarders! Please configure manually in /etc/bind/named.conf.options"
-		fi
-	fi
-	# link the named.conf file to /etc on redhat based systems
-	if [ -f /etc/redhat-release ]; then
-		if [ -f /etc/named.conf ]; then
-			mv -f /etc/named.conf /etc/named.conf.openqrm-backup
-		fi
-		ln -sf /etc/bind/named.conf.local /etc/named.conf
-		# include options
-		echo 'include "/etc/bind/named.conf.options";' >> /etc/bind/named.conf.local
-	elif [ -f /etc/SuSE-release ]; then
-		# chroot is not supported yet
-		sed -i -e 's/NAMED_RUN_CHROOTED.*/NAMED_RUN_CHROOTED="no"/g' /etc/sysconfig/named
-		if [ -f /etc/named.conf.include ]; then
-			/bin/cp -f /etc/named.conf.include /etc/named.conf.include.openqrm-backup
-		fi
-cat >> /etc/named.conf.include << EOF
-include "/etc/bind/named.conf.local";
-EOF
-	fi
-
-	# enable apparmor if needed
-	if [ -f /etc/apparmor.d/usr.sbin.named ]; then
-		if ! grep openQRM /etc/apparmor.d/usr.sbin.named 1>/dev/null; then
-			sed -i -e "s#^}##g" /etc/apparmor.d/usr.sbin.named
-			echo "  # openQRM" >> /etc/apparmor.d/usr.sbin.named
-			echo "  $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/** rw," >> /etc/apparmor.d/usr.sbin.named
-			if [ -d /etc/openqrm/plugins/dhcpd/ ]; then
-				echo "  /etc/openqrm/plugins/dns/** rw," >> /etc/apparmor.d/usr.sbin.named
-			fi
-			echo "}" >> /etc/apparmor.d/usr.sbin.named
-			echo >> /etc/apparmor.d/usr.sbin.named
-			if [ -x "/etc/init.d/apparmor" ]; then
-				if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-					invoke-rc.d apparmor reload
-				else
-					/etc/init.d/apparmor reload
-				fi
-			fi
-		fi
-	fi
-
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/dns
-
-	return 0
-}
-
-
-function openqrm_plugin_dns_uninstall() {
-	echo "Uninstalling the openQRM dns-plugin"
-	openqrm_plugin_dns_stop
-
-	# cleaning up + restore bind config
-	rm -f /etc/bind/zones/$OPENQRM_SERVER_DOMAIN.*.db
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/dns/etc/bind/zones/$OPENQRM_SERVER_DOMAIN-*.db
-
-	# restore eventual existing config
-	if [ -f /etc/bind/named.conf.local.openqrm-dns-plugin.backup ]; then
-		rm -f /etc/bind/named.conf.local
-		cp -f /etc/bind/named.conf.local.openqrm-dns-plugin.backup /etc/bind/named.conf.local
-	fi
-	if [ -f /etc/bind/named.conf.options.openqrm-dns-plugin.backup ]; then
-		cp -f /etc/bind/named.conf.options.openqrm-dns-plugin.backup /etc/bind/named.conf.options
-	fi
-
-	# unlink the named.conf file to /etc on redhat based systems
-	if [ -f /etc/redhat-release ]; then
-		if [ -f /etc/named.conf.openqrm-backup ]; then
-			mv -f /etc/named.conf.openqrm-backup /etc/named.conf
-		fi
-		rm -f /etc/bind/named.conf.options
-	elif [ -f /etc/SuSE-release ]; then
-		if [ -f /etc/named.conf.include.openqrm-backup ]; then
-			/bin/cp -f /etc/named.conf.include.openqrm-backup /etc/named.conf.include
-		fi
-	fi
-
-	# remove apparmor setup
-	if [ -f /etc/apparmor.d/usr.sbin.named ]; then
-		sed -i -e "s#.*openQRM.*##g" /etc/apparmor.d/usr.sbin.named
-		sed -i -e "s#.*openqrm.*##g" /etc/apparmor.d/usr.sbin.named
-		if [ -x "/etc/init.d/apparmor" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d apparmor reload
-			else
-				/etc/init.d/apparmor reload
-			fi
-		fi
-	fi
-
-	# unlinking the web dir
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/dns
-}
-
-
-
-case "$1" in
-	start)
-		openqrm_plugin_dns_start
-		;;
-	stop)
-		openqrm_plugin_dns_stop
-		;;
-	restart)
-		openqrm_plugin_dns_stop
-		sleep 1
-		openqrm_plugin_dns_start
-		;;
-	init)
-		openqrm_plugin_dns_init
-		;;
-	uninstall)
-		openqrm_plugin_dns_uninstall
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/etc/init.d/openqrm-plugin-dns.postinstall b/openQRM-5.3.50-CE/src/plugins/dns/etc/init.d/openqrm-plugin-dns.postinstall
deleted file mode 100644
index d16cd53..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/etc/init.d/openqrm-plugin-dns.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-dns postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/etc/init.d/openqrm-plugin-dns.preremove b/openQRM-5.3.50-CE/src/plugins/dns/etc/init.d/openqrm-plugin-dns.preremove
deleted file mode 100644
index 428377a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/etc/init.d/openqrm-plugin-dns.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-dns preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-dns stop
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/etc/openqrm-plugin-dns.conf b/openQRM-5.3.50-CE/src/plugins/dns/etc/openqrm-plugin-dns.conf
deleted file mode 100644
index 8f29211..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/etc/openqrm-plugin-dns.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# this is the openQRM-plugin-dns info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="bind9, openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="bind, openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="bind, openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="Automatically manage the DNS Service for the openQRM managed network."
-OPENQRM_PLUGIN_TYPE="network"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES=""
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/bind/named.conf.local $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/openqrm-plugin-dns.conf"
-# dirs which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_DIRS="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/bind/zones"
-
-# please configure your domain name for the openQRM network here !
-OPENQRM_SERVER_DOMAIN="oqnet.org"
-
-# plese configure your domain search path for the openQRM network here !
-OPENQRM_SERVER_SEARCH_DOMAIN=""
-
-# please configure if the plugin should automatically adjust the /etc/resolv.conf of this server
-OPENQRM_SERVER_ADJUST_RESOLV_CONF="yes"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/etc/templates/openqrm-plugin-dns-custom-indb.template b/openQRM-5.3.50-CE/src/plugins/dns/etc/templates/openqrm-plugin-dns-custom-indb.template
deleted file mode 100644
index f53b92c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/etc/templates/openqrm-plugin-dns-custom-indb.template
+++ /dev/null
@@ -1,17 +0,0 @@
-;
-; BIND data file 
-;
-$TTL	604800
-@	IN	SOA	ns.@@OPENQRM_SERVER_DOMAIN@@. root.@@OPENQRM_SERVER_DOMAIN@@. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
-;
-
-@@OPENQRM_SERVER_DOMAIN@@.	IN	NS	ns.@@OPENQRM_SERVER_DOMAIN@@.
-@@OPENQRM_SERVER_DOMAIN@@. IN      MX	10      ns.@@OPENQRM_SERVER_DOMAIN@@.
-
-ns				IN	A	@@OPENQRM_SERVER_IP_ADDRESS@@
-openqrm			IN	A	@@OPENQRM_SERVER_IP_ADDRESS@@
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/etc/templates/openqrm-plugin-dns-custom-revdb.template b/openQRM-5.3.50-CE/src/plugins/dns/etc/templates/openqrm-plugin-dns-custom-revdb.template
deleted file mode 100644
index 1bd98f5..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/etc/templates/openqrm-plugin-dns-custom-revdb.template
+++ /dev/null
@@ -1,16 +0,0 @@
-;
-; BIND reverse data file 
-;
-$TTL	604800
-@	IN	SOA	ns.@@OPENQRM_SERVER_DOMAIN@@. root.@@OPENQRM_SERVER_DOMAIN@@. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
-;
-
-	IN	NS	ns.@@OPENQRM_SERVER_DOMAIN@@.
-
-@@OPENQRM_SERVER_IP_LAST_BYTE@@			IN	PTR	ns
-@@OPENQRM_SERVER_IP_LAST_BYTE@@			IN	PTR	openqrm
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/etc/templates/openqrm-plugin-dns-indb.template b/openQRM-5.3.50-CE/src/plugins/dns/etc/templates/openqrm-plugin-dns-indb.template
deleted file mode 100644
index 43c24e7..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/etc/templates/openqrm-plugin-dns-indb.template
+++ /dev/null
@@ -1,18 +0,0 @@
-;
-; BIND data file 
-;
-$TTL	604800
-@	IN	SOA	ns.@@OPENQRM_SERVER_DOMAIN@@. root.@@OPENQRM_SERVER_DOMAIN@@. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
-;
-
-@@OPENQRM_SERVER_DOMAIN@@.	IN	NS	ns.@@OPENQRM_SERVER_DOMAIN@@.
-@@OPENQRM_SERVER_DOMAIN@@. IN      MX	10      ns.@@OPENQRM_SERVER_DOMAIN@@.
-
-ns				IN	A	@@OPENQRM_SERVER_IP_ADDRESS@@
-openqrm			IN	A	@@OPENQRM_SERVER_IP_ADDRESS@@
-puppet			CNAME	openqrm
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/etc/templates/openqrm-plugin-dns-named-local.template b/openQRM-5.3.50-CE/src/plugins/dns/etc/templates/openqrm-plugin-dns-named-local.template
deleted file mode 100644
index 7b38352..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/etc/templates/openqrm-plugin-dns-named-local.template
+++ /dev/null
@@ -1,10 +0,0 @@
-
-zone "@@OPENQRM_SERVER_DOMAIN@@" IN {
-        type master;
-        file "/etc/bind/zones/@@OPENQRM_SERVER_DOMAIN@@.in.db";
-};
-
-zone "@@OPENQRM_SERVER_IP_FIRSTS_BYTES_REV@@.in-addr.arpa" {
-        type master;
-        file "/etc/bind/zones/@@OPENQRM_SERVER_DOMAIN@@.rev.db";
-};
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/etc/templates/openqrm-plugin-dns-revdb.template b/openQRM-5.3.50-CE/src/plugins/dns/etc/templates/openqrm-plugin-dns-revdb.template
deleted file mode 100644
index 1bd98f5..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/etc/templates/openqrm-plugin-dns-revdb.template
+++ /dev/null
@@ -1,16 +0,0 @@
-;
-; BIND reverse data file 
-;
-$TTL	604800
-@	IN	SOA	ns.@@OPENQRM_SERVER_DOMAIN@@. root.@@OPENQRM_SERVER_DOMAIN@@. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
-;
-
-	IN	NS	ns.@@OPENQRM_SERVER_DOMAIN@@.
-
-@@OPENQRM_SERVER_IP_LAST_BYTE@@			IN	PTR	ns
-@@OPENQRM_SERVER_IP_LAST_BYTE@@			IN	PTR	openqrm
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/include/openqrm-plugin-dns-functions b/openQRM-5.3.50-CE/src/plugins/dns/include/openqrm-plugin-dns-functions
deleted file mode 100644
index 595b1b3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/include/openqrm-plugin-dns-functions
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/bash
-# this is the functions file for the dns-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# where is the init script ?
-if [ -f /etc/debian_version ]; then
-	DNS_INIT="/etc/init.d/bind9"
-elif [ -f /etc/redhat-release ]; then
-	DNS_INIT="/etc/init.d/named"
-elif [ -f /etc/SuSE-release ]; then
-	DNS_INIT="/etc/init.d/named"
-fi
-# source the config to get the domain name for the openQRM-network
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/openqrm-plugin-dns.conf
-export OPENQRM_SERVER_DOMAIN
-# the location of the tempaltes and db files
-DNS_NAMED_LOCAL_TEMPLATE="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/templates/openqrm-plugin-dns-named-local.template"
-DNS_INDB_TEMPLATE="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/templates/openqrm-plugin-dns-indb.template"
-DNS_REVDB_TEMPLATE="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/templates/openqrm-plugin-dns-revdb.template"
-DNS_INDB="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/bind/zones/$OPENQRM_SERVER_DOMAIN.in.db"
-DNS_REVDB="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/bind/zones/$OPENQRM_SERVER_DOMAIN.rev.db"
-
-DNS_NAMED_CONF_LOCAL="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/bind/named.conf.local"
-
-DNS_CUSTOM_ZONES_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/bind/zones/custom"
-DNS_CUSTOM_INDB_TEMPLATE="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/templates/openqrm-plugin-dns-custom-indb.template"
-DNS_CUSTOM_REVDB_TEMPLATE="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/templates/openqrm-plugin-dns-custom-revdb.template"
-
-if [ ! -d $DNS_CUSTOM_ZONES_DIR ]; then
-	mkdir -p $DNS_CUSTOM_ZONES_DIR
-fi
-if [ ! -d /etc/bind/zones/custom ]; then
-	mkdir -p /etc/bind/zones/custom
-fi
-
-
-# logs for dns
-function dns_log() {
-	local COMPONENT=$1
-	shift
-	local MESSAGE=$@
-	logger -i -t "dns plug-in" "$COMPONENT : $MESSAGE"
-}
-
-
-
-
-# functions for custom networks #
-
-
-function dns_create_domain() {
-	local DOMAIN_NAME=$1
-	local NS_IP=$2
-	local NS_IP_LAST_BYTE=`echo $NS_IP | cut -d'.' -f 4`
-	local NS_IP_FIRST_BYTE=`echo $NS_IP | cut -d'.' -f1`
-	local NS_IP_SECOND_BYTE=`echo $NS_IP | cut -d'.' -f2`
-	local NS_IP_THIRD_BYTE=`echo $NS_IP | cut -d'.' -f3`
-	local NS_IP_FIRSTS_BYTES_REV="$NS_IP_THIRD_BYTE.$NS_IP_SECOND_BYTE.$NS_IP_FIRST_BYTE"
-
-	# indb
-	CUSTOM_INDB_FULL_PATH="$DNS_CUSTOM_ZONES_DIR/$DOMAIN_NAME.in.db"
-	cat $DNS_CUSTOM_INDB_TEMPLATE |	\
-		sed -e "s/@@OPENQRM_SERVER_DOMAIN@@/$DOMAIN_NAME/g" |	\
-		sed -e "s/@@OPENQRM_SERVER_IP_ADDRESS@@/$NS_IP/g" |	\
-		sed -e "s/@@OPENQRM_SERVER_IP_LAST_BYTE@@/$NS_IP_LAST_BYTE/g" > $CUSTOM_INDB_FULL_PATH
-
-	CUSTOM_INDB_FILE=`basename $CUSTOM_INDB_FULL_PATH`
-	ln -sf $CUSTOM_INDB_FULL_PATH /etc/bind/zones/custom/$CUSTOM_INDB_FILE
-
-	# revdb
-	CUSTOM_REVDB_FULL_PATH="$DNS_CUSTOM_ZONES_DIR/$DOMAIN_NAME.rev.db"
-	cat $DNS_CUSTOM_REVDB_TEMPLATE |	\
-		sed -e "s/@@OPENQRM_SERVER_DOMAIN@@/$DOMAIN_NAME/g" |	\
-		sed -e "s/@@OPENQRM_SERVER_IP_ADDRESS@@/$NS_IP/g" |	\
-		sed -e "s/@@OPENQRM_SERVER_IP_LAST_BYTE@@/$NS_IP_LAST_BYTE/g" > $CUSTOM_REVDB_FULL_PATH
-
-	CUSTOM_REVDB_FILE=`basename $CUSTOM_REVDB_FULL_PATH`
-	ln -sf $CUSTOM_REVDB_FULL_PATH /etc/bind/zones/custom/$CUSTOM_REVDB_FILE
-
-	# add to named.conf.local
-	echo "zone \"$DOMAIN_NAME\" IN {" >> $DNS_NAMED_CONF_LOCAL
-	echo "	type master;" >> $DNS_NAMED_CONF_LOCAL
-	echo "	file \"/etc/bind/zones/custom/$CUSTOM_INDB_FILE\";" >> $DNS_NAMED_CONF_LOCAL
-	echo "};" >> $DNS_NAMED_CONF_LOCAL
-	echo "zone \"$NS_IP_FIRSTS_BYTES_REV.in-addr.arpa\" {" >> $DNS_NAMED_CONF_LOCAL
-	echo "	type master;" >> $DNS_NAMED_CONF_LOCAL
-	echo "	file \"/etc/bind/zones/custom/$CUSTOM_REVDB_FILE\";" >> $DNS_NAMED_CONF_LOCAL
-	echo "};" >> $DNS_NAMED_CONF_LOCAL
-
-}
-
-
-
-
-function dns_remove_domain() {
-	local DOMAIN_NAME=$1
-	local NS_IP=$2
-	local NS_IP_LAST_BYTE=`echo $NS_IP | cut -d'.' -f 4`
-	local NS_IP_FIRST_BYTE=`echo $NS_IP | cut -d'.' -f1`
-	local NS_IP_SECOND_BYTE=`echo $NS_IP | cut -d'.' -f2`
-	local NS_IP_THIRD_BYTE=`echo $NS_IP | cut -d'.' -f3`
-	local NS_IP_FIRSTS_BYTES_REV="$NS_IP_THIRD_BYTE.$NS_IP_SECOND_BYTE.$NS_IP_FIRST_BYTE"
-
-	# remove from named.conf.local
-	sed -i -e "/\"$DOMAIN_NAME\" IN/,+3d" $DNS_NAMED_CONF_LOCAL
-	sed -i -e "/\"$NS_IP_FIRSTS_BYTES_REV.in-addr.arpa\"/,+3d" $DNS_NAMED_CONF_LOCAL
-
-	# indb
-	CUSTOM_INDB_FULL_PATH="$DNS_CUSTOM_ZONES_DIR/$DOMAIN_NAME.in.db"
-	CUSTOM_INDB_FILE=`basename $CUSTOM_INDB_FULL_PATH`
-	rm -f $CUSTOM_INDB_FULL_PATH /etc/bind/zones/custom/$CUSTOM_INDB_FILE
-
-	# revdb
-	CUSTOM_REVDB_FULL_PATH="$DNS_CUSTOM_ZONES_DIR/$DOMAIN_NAME.rev.db"
-	CUSTOM_REVDB_FILE=`basename $CUSTOM_REVDB_FULL_PATH`
-	rm -f $CUSTOM_REVDB_FULL_PATH /etc/bind/zones/custom/$CUSTOM_REVDB_FILE
-
-}
-
-
-
-
-function dns_domain_manage_host() {
-	local MANAGE_CMD=$1
-	local DOMAIN_NAME=$2
-	local HOST_IP=$3
-	local HOST_NAME=$4
-	local HOST_IP_LAST_BYTE=`echo $HOST_IP | cut -d'.' -f 4`
-	local HOST_IP_FIRST_BYTE=`echo $HOST_IP | cut -d'.' -f1`
-	local HOST_IP_SECOND_BYTE=`echo $HOST_IP | cut -d'.' -f2`
-	local HOST_IP_THIRD_BYTE=`echo $HOST_IP | cut -d'.' -f3`
-	local HOST_IP_FIRSTS_BYTES_REV="$HOST_IP_THIRD_BYTE.$HOST_IP_SECOND_BYTE.$HOST_IP_FIRST_BYTE"
-
-	# indb
-	CUSTOM_INDB_FULL_PATH="$DNS_CUSTOM_ZONES_DIR/$DOMAIN_NAME.in.db"
-	cat $CUSTOM_INDB_FULL_PATH | grep -v -w $HOST_IP > $CUSTOM_INDB_FULL_PATH.tmp
-	mv -f $CUSTOM_INDB_FULL_PATH.tmp $CUSTOM_INDB_FULL_PATH
-
-	# revdb
-	CUSTOM_REVDB_FULL_PATH="$DNS_CUSTOM_ZONES_DIR/$DOMAIN_NAME.rev.db"
-	cat $CUSTOM_REVDB_FULL_PATH | grep -v -w ^$HOST_IP_LAST_BYTE > $CUSTOM_REVDB_FULL_PATH.tmp
-	mv -f $CUSTOM_REVDB_FULL_PATH.tmp $CUSTOM_REVDB_FULL_PATH
-
-	if [ "$MANAGE_CMD" == "add" ]; then
-		echo "$HOST_NAME	IN	A	$HOST_IP" >> $CUSTOM_INDB_FULL_PATH
-		echo "$HOST_IP_LAST_BYTE	IN	PTR	$HOST_NAME.$DOMAIN_NAME." >> $CUSTOM_REVDB_FULL_PATH
-	fi
-
-	if ! dns_update_serial $CUSTOM_INDB_FULL_PATH; then
-		return 1
-	fi
-	if ! dns_update_serial $CUSTOM_REVDB_FULL_PATH; then
-		return 1
-	fi
-
-}
-
-
-
-
-
-
-
-
-function dns_reload() {
-	local LAST_BACKUP_TIMESTAMP=$1
-	if ! $DNS_INIT reload; then
-		# restore
-		dns_zone_restore $LAST_BACKUP_TIMESTAMP
-		# retry restart again
-		$DNS_INIT stop
-		if ! $DNS_INIT start; then
-		    return 1
-		fi
-	fi
-	# restart name service cache daemon if installed
-	if [ -x /etc/init.d/nscd ]; then
-		/etc/init.d/nscd restart
-	fi
-	return 0
-}
-
-
-function dns_zone_backup() {
-	TIMESTAMP=`date +%s`
-	mkdir -p $BIND_BACKUP_DIR/$TIMESTAMP
-	cp -a $DNS_CUSTOM_ZONES_DIR/* $BIND_BACKUP_DIR/$TIMESTAMP/ 2>/dev/null
-	echo $TIMESTAMP
-}
-
-
-function dns_remove_zone_backup() {
-	local LAST_BACKUP_TIMESTAMP=$1
-	if [ "$LAST_BACKUP_TIMESTAMP" == ""  ]; then
-	    return
-	fi
-	if [ -d $BIND_BACKUP_DIR/$LAST_BACKUP_TIMESTAMP ]; then
-		rm -f $BIND_BACKUP_DIR/$LAST_BACKUP_TIMESTAMP/*
-		rmdir $BIND_BACKUP_DIR/$LAST_BACKUP_TIMESTAMP
-	fi
-}
-
-
-function dns_zone_restore() {
-	local LAST_BACKUP_TIMESTAMP=$1
-	if [ "$LAST_BACKUP_TIMESTAMP" == ""  ]; then
-	    return
-	fi
-	cp -a $BIND_BACKUP_DIR/$LAST_BACKUP_TIMESTAMP/* $DNS_CUSTOM_ZONES_DIR/
-}
-
-
-
-function dns_update_serial() {
-	local ZONE_FILE=$1
-	if [ ! -e $ZONE_FILE ]; then
-		return 1
-	fi
-	SERIAL_NO="`cat $ZONE_FILE | grep -i ';.*erial' | awk '{print $1}'`"
-	if [ "$SERIAL_NO" == "" ]; then
-		return 1
-	elif [ "$SERIAL_NO" -ge 0 ]; then
-		SERIAL_NO_NEW=$((SERIAL_NO+1))
-		sed -i -e "s/$SERIAL_NO.*;.*erial/$SERIAL_NO_NEW ; Serial/g" $ZONE_FILE
-		return 0
-	fi
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/web/class/dns-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/dns/web/class/dns-about.controller.class.php
deleted file mode 100644
index ea018a9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/web/class/dns-about.controller.class.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-/**
- * dns-about Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class dns_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'dns_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'dns_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'dns_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'dns_about_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About DNS',
-		'label' => 'About DNS',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The dns-plugin automatically manages ip-address to hostname resolving via bind/named for the entire openQRM network.
-			It configures the hostname/ip entries for the dns database and reloads the name-sever during start/stop of an appliance.
-			The hostnames are automatically set to the appliance name with the ip address of the appliance-resource.
-			An automatic configured DNS-server is provided by this plugin.
-			No manual configuration is needed. It automatically configures a DNS server during initialization with the domain name configured in:',
-
-		'requirements_title' => 'Requirements',
-		'requirements_list' => '<li>none</li>',
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-		'provides_title' => 'Provides',
-		'provides_list' => '<li>Automatically manages ip-address to hostname resolving in the openQRM Management network</li>',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Network',
-		'documentation_title' => 'Documentation',
-		'use_case_title' => 'Use-Case',
-	),
-	'usage' => array (
-		'tab' => 'About DNS',
-		'label' => 'DNS Use-Cases',
-	),
-
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/dns/lang", 'dns-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/dns/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "documentation";
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-			case 'bootservice':
-				$content[] = $this->bootservice(true);
-			break;
-			case 'vms':
-				$content[] = $this->vms(true);
-			break;
-			case 'usage':
-				$content[] = $this->usage(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About DNS
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/dns/class/dns-about.documentation.class.php');
-			$controller = new dns_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Boot-Service
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function bootservice( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/dns/class/dns-about.bootservice.class.php');
-			$controller = new dns_about_bootservice($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['bootservice'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['bootservice']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'bootservice' );
-		$content['onclick'] = false;
-		if($this->action === 'bootservice'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-
-	//--------------------------------------------
-	/**
-	 * About DNS VM management
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function vms( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/dns/class/dns-about.vms.class.php');
-			$controller = new dns_about_vms($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['vms'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['vms']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'vms' );
-		$content['onclick'] = false;
-		if($this->action === 'vms'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-	//--------------------------------------------
-	/**
-	 * About DNS Use-Cases
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function usage( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/dns/class/dns-about.usage.class.php');
-			$controller = new dns_about_usage($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['usage'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['usage']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'usage' );
-		$content['onclick'] = false;
-		if($this->action === 'usage'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/web/class/dns-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/dns/web/class/dns-about.documentation.class.php
deleted file mode 100644
index d066b35..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/web/class/dns-about.documentation.class.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * dns-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class dns_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'dns_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "dns_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-
-		$this->basedir    = $this->openqrm->get('basedir');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/dns-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['provides_title'], 'provides_title');
-		$t->add($this->lang['provides_list'], 'provides_list');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->basedir."/plugins/dns/etc/openqrm-plugin-dns.conf", 'config_file');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/web/css/dns.css b/openQRM-5.3.50-CE/src/plugins/dns/web/css/dns.css
deleted file mode 100644
index 5cedb54..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/web/css/dns.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/*-Icon classes ----- */
-a.graphs {
-	padding: 0;
-	border: 0px none;
-	width: 32px;
-	height: 32px;
-	display:block;
-	text-align: center;
-	text-decoration: none;
-	line-height: 0px;
-	overflow: hidden;
-	color: transparent;
-}
-a.graphs {
-	background: url('/openqrm/base/plugins/dns/img/plugin.png') no-repeat center top;
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/dns/web/img/plugin.png
deleted file mode 100644
index d1c5696..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/dns/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/web/lang/de.dns-about.ini b/openQRM-5.3.50-CE/src/plugins/dns/web/lang/de.dns-about.ini
deleted file mode 100644
index 6eafa95..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/web/lang/de.dns-about.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[documentation]
-tab = "Über DNS"
-label = "Über DNS"
-introduction_title = "Einleitung"
-introduction_content = "<p>Das 'DNS'-Plugin verwaltet automtisch die IP-Adressen und Hostname-Zuordnung im openQRM-Verwaltungsnetzwerk.
-	Es konfiguriert die Hostnamen und IP-Adressn der DNS-Datenbank automatisch mittels des Appliance-Start/Stop-Hooks. Die Hostnamen werden dabei auf den Server Namen gesetzt und mit der IP-Addresse der jeweiligen Resource verbunden. Ein automatisch konfigurierter DNS Server wird von diesem Plugin bereitgestellt.</p>
-		<p>Manuelle Konfiguration ist nicht nötig. Das Plugin erzeugt automatisch eine valide DNS-Konfiguration für die Domain die in der Konfigurationsdatei des Plugin konfiguriert ist. Die Konfigurationsdatei des DNS-Plugins finden Sie unter:</p>"
-
-requirements_title = "Anforderungen"
-requirements_list = "keine"
-tested_title = "getestet mit"
-tested_content = "Dieses Plugin ist getestet mit Debian, Ubuntu und CentOS"
-
-provides_title = "Bietet"
-provides_list = "Automatische Vergabe von IP-Adressen sowie Hostname-Zuordnung für das openQRM-Verwaltungsnetzwerk"
-
-type_title = "Plugin Typ"
-type_content = "<span class=\"pill\">Netzwerk</span>"
-
-documentation_title = "Dokumentation"
-use_case_title = "Anwendungsfall"
-
-
-[usage]
-tab = "Über DNS"
-label = "DNS-Anwendungsfälle"
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/web/lang/en.dns-about.ini b/openQRM-5.3.50-CE/src/plugins/dns/web/lang/en.dns-about.ini
deleted file mode 100644
index e872b93..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/web/lang/en.dns-about.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[documentation]
-tab = "About DNS"
-label = "About DNS"
-introduction_title = "Introduction"
-introduction_content = "<p>The dns plugin automatically manages ip address to hostname resolving via <code>bind/named</code> for the entire openQRM network. It configures the <code>hostname/ip</code> entries for the dns database and reloads the name sever during start/stop of a server. The hostnames are automatically set to the server name with the ip address of the server resource. An automatic configured dns Server is provided by this plugin.</p>
-		<p>No manual configuration is needed. It automatically configures a DNS Server during initialization with the domain name configured in:</p>"
-
-requirements_title = "Requirements"
-requirements_list = "none"
-tested_title = "Tested with"
-tested_content = "This plugin is tested with the Debian, Ubuntu and CentOS."
-provides_title = "Provides"
-provides_list = "Automatically manages ip address to hostname resolving in the openQRM management network"
-type_title = "Plugin type"
-type_content = "<span class=\"pill\">Network</span>"
-documentation_title = "Documentation"
-use_case_title = "Use case"
-
-[usage]
-tab = "About DNS"
-label = "DNS use cases"
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/dns/web/menu.txt
deleted file mode 100644
index 636feee..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/web/menu.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|DNS|index.php?plugin=dns&controller=dns-about|How to use
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/web/openqrm-dns-appliance-hook.php b/openQRM-5.3.50-CE/src/plugins/dns/web/openqrm-dns-appliance-hook.php
deleted file mode 100644
index 84a984b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/web/openqrm-dns-appliance-hook.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-
-
-function openqrm_dns_appliance($cmd, $appliance_fields) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	$appliance_id=$appliance_fields["appliance_id"];
-	$appliance_name=$appliance_fields["appliance_name"];
-	$resource = new resource();
-	$resource->get_instance_by_id($appliance_fields["appliance_resources"]);
-	$appliance_ip=$resource->ip;
-	if (($resource->id == "-1") || ($resource->id == "")) {
-		return;
-	}
-
-
-	$event->log("openqrm_new_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-dns-appliance-hook.php", "Handling $cmd event $appliance_id/$appliance_name/$appliance_ip", "", "", 0, 0, $appliance_id);
-	switch($cmd) {
-		case "start":
-			$openqrm_server = new openqrm_server();
-			$openqrm_server->send_command("$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/bin/openqrm-dns-manager start ".$appliance_id." ".$appliance_name." ".$appliance_ip." --openqrm-cmd-mode background");
-			break;
-		case "stop":
-			$openqrm_server = new openqrm_server();
-			$openqrm_server->send_command("$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/bin/openqrm-dns-manager stop ".$appliance_id." ".$appliance_name." ".$appliance_ip." --openqrm-cmd-mode background");
-			break;
-
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/dns/web/tpl/dns-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/dns/web/tpl/dns-about-documentation.tpl.php
deleted file mode 100644
index eae8bb2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/dns/web/tpl/dns-about-documentation.tpl.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{introduction_title}</h3>
-		{introduction_content}
-		<pre>{config_file}</pre>
-	
-		<h3>{provides_title}</h3>
-		{provides_list}
-	
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-	</div>
-	
-	
-	<div class="span2 offset1">
-		<h3>{type_title}</h3>
-		{type_content}
-	
-		<h3>{tested_title}</h3>
-		{tested_content}
-	</div>
-</div>
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/docker/Makefile b/openQRM-5.3.50-CE/src/plugins/docker/Makefile
deleted file mode 100644
index 492b1bd..0000000
--- a/openQRM-5.3.50-CE/src/plugins/docker/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/docker/etc
-	cp etc/openqrm-plugin-docker.conf /usr/share/openqrm/plugins/docker/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/docker/etc/openqrm-plugin-docker.conf b/openQRM-5.3.50-CE/src/plugins/docker/etc/openqrm-plugin-docker.conf
deleted file mode 100644
index 8665c75..0000000
--- a/openQRM-5.3.50-CE/src/plugins/docker/etc/openqrm-plugin-docker.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Adminstration Web UI to manage Docker container. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="virtualization"
diff --git a/openQRM-5.3.50-CE/src/plugins/esxinstall/Makefile b/openQRM-5.3.50-CE/src/plugins/esxinstall/Makefile
deleted file mode 100644
index 33ca121..0000000
--- a/openQRM-5.3.50-CE/src/plugins/esxinstall/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/esxinstall/etc
-	cp etc/openqrm-plugin-esxinstall.conf /usr/share/openqrm/plugins/esxinstall/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/esxinstall/etc/openqrm-plugin-esxinstall.conf b/openQRM-5.3.50-CE/src/plugins/esxinstall/etc/openqrm-plugin-esxinstall.conf
deleted file mode 100644
index c8e7f2b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/esxinstall/etc/openqrm-plugin-esxinstall.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Fully automated VMWare ESX installations for bare-metal systems. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="deployment"
diff --git a/openQRM-5.3.50-CE/src/plugins/event-mailer/Makefile b/openQRM-5.3.50-CE/src/plugins/event-mailer/Makefile
deleted file mode 100644
index d62a755..0000000
--- a/openQRM-5.3.50-CE/src/plugins/event-mailer/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/event-mailer/etc
-	cp etc/openqrm-plugin-event-mailer.conf /usr/share/openqrm/plugins/event-mailer/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/event-mailer/etc/openqrm-plugin-event-mailer.conf b/openQRM-5.3.50-CE/src/plugins/event-mailer/etc/openqrm-plugin-event-mailer.conf
deleted file mode 100644
index e97e352..0000000
--- a/openQRM-5.3.50-CE/src/plugins/event-mailer/etc/openqrm-plugin-event-mailer.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Configure Event mails. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="management"
diff --git a/openQRM-5.3.50-CE/src/plugins/fai/Makefile b/openQRM-5.3.50-CE/src/plugins/fai/Makefile
deleted file mode 100644
index 972f424..0000000
--- a/openQRM-5.3.50-CE/src/plugins/fai/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/fai/etc
-	cp etc/openqrm-plugin-fai.conf /usr/share/openqrm/plugins/fai/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/fai/etc/openqrm-plugin-fai.conf b/openQRM-5.3.50-CE/src/plugins/fai/etc/openqrm-plugin-fai.conf
deleted file mode 100644
index 6509714..0000000
--- a/openQRM-5.3.50-CE/src/plugins/fai/etc/openqrm-plugin-fai.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Integrates <a href='http://fai-project.org/' target='_BLANK'>FAI</a> Install Server for automatic Linux deployments (local-deployment). <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="deployment"
diff --git a/openQRM-5.3.50-CE/src/plugins/highavailability/Makefile b/openQRM-5.3.50-CE/src/plugins/highavailability/Makefile
deleted file mode 100644
index b241d12..0000000
--- a/openQRM-5.3.50-CE/src/plugins/highavailability/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/highavailability/etc
-	cp etc/openqrm-plugin-highavailability.conf /usr/share/openqrm/plugins/highavailability/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/highavailability/etc/openqrm-plugin-highavailability.conf b/openQRM-5.3.50-CE/src/plugins/highavailability/etc/openqrm-plugin-highavailability.conf
deleted file mode 100644
index dca5f63..0000000
--- a/openQRM-5.3.50-CE/src/plugins/highavailability/etc/openqrm-plugin-highavailability.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Automatic Highavailability for Appliances. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="HA"
diff --git a/openQRM-5.3.50-CE/src/plugins/hybrid-cloud/Makefile b/openQRM-5.3.50-CE/src/plugins/hybrid-cloud/Makefile
deleted file mode 100644
index 9ba9235..0000000
--- a/openQRM-5.3.50-CE/src/plugins/hybrid-cloud/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/hybrid-cloud/etc
-	cp etc/openqrm-plugin-hybrid-cloud.conf /usr/share/openqrm/plugins/hybrid-cloud/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/hybrid-cloud/etc/openqrm-plugin-hybrid-cloud.conf b/openQRM-5.3.50-CE/src/plugins/hybrid-cloud/etc/openqrm-plugin-hybrid-cloud.conf
deleted file mode 100644
index 837102c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/hybrid-cloud/etc/openqrm-plugin-hybrid-cloud.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Hybrid Cloud Computing with <a href='http://aws.amazon.com/ec2/' target='_BLANK'>Amazon Public Cloud</a>, <a href='http://www.ubuntu.com/business/cloud/overview' target='_BLANK'>Ubuntu Enterprise Cloud</a> and <a href='http://www.eucalyptus.com/' target='_BLANK'>Eucalyptus</a>. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="cloud"
diff --git a/openQRM-5.3.50-CE/src/plugins/hyperv/Makefile b/openQRM-5.3.50-CE/src/plugins/hyperv/Makefile
deleted file mode 100644
index f13412f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/hyperv/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/hyperv/etc
-	cp etc/openqrm-plugin-hyperv.conf /usr/share/openqrm/plugins/hyperv/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/hyperv/etc/openqrm-plugin-hyperv.conf b/openQRM-5.3.50-CE/src/plugins/hyperv/etc/openqrm-plugin-hyperv.conf
deleted file mode 100644
index 5ebc652..0000000
--- a/openQRM-5.3.50-CE/src/plugins/hyperv/etc/openqrm-plugin-hyperv.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Integrates the <a href='http://www.microsoft.com/' target='_BLANK'>Hyper-V</a> Virtualization Technology. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="virtualization"
diff --git a/openQRM-5.3.50-CE/src/plugins/idoit/Makefile b/openQRM-5.3.50-CE/src/plugins/idoit/Makefile
deleted file mode 100644
index eb328ce..0000000
--- a/openQRM-5.3.50-CE/src/plugins/idoit/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/idoit/etc
-	cp etc/openqrm-plugin-idoit.conf /usr/share/openqrm/plugins/idoit/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/idoit/etc/openqrm-plugin-idoit.conf b/openQRM-5.3.50-CE/src/plugins/idoit/etc/openqrm-plugin-idoit.conf
deleted file mode 100644
index d52072d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/idoit/etc/openqrm-plugin-idoit.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Automatic System Documentation (CMDB) with <a href='http://www.i-doit.org/' target='_BLANK'>I-doit</a>. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="management"
diff --git a/openQRM-5.3.50-CE/src/plugins/image-shelf/Makefile b/openQRM-5.3.50-CE/src/plugins/image-shelf/Makefile
deleted file mode 100644
index 9445027..0000000
--- a/openQRM-5.3.50-CE/src/plugins/image-shelf/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/image-shelf/etc
-	cp etc/openqrm-plugin-image-shelf.conf /usr/share/openqrm/plugins/image-shelf/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/image-shelf/etc/openqrm-plugin-image-shelf.conf b/openQRM-5.3.50-CE/src/plugins/image-shelf/etc/openqrm-plugin-image-shelf.conf
deleted file mode 100644
index 80328d2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/image-shelf/etc/openqrm-plugin-image-shelf.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Pre-made Server Templates for network-deployment. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="deployment"
diff --git a/openQRM-5.3.50-CE/src/plugins/ip-mgmt/Makefile b/openQRM-5.3.50-CE/src/plugins/ip-mgmt/Makefile
deleted file mode 100644
index dcbce4e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ip-mgmt/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/ip-mgmt/etc
-	cp etc/openqrm-plugin-ip-mgmt.conf /usr/share/openqrm/plugins/ip-mgmt/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/ip-mgmt/etc/openqrm-plugin-ip-mgmt.conf b/openQRM-5.3.50-CE/src/plugins/ip-mgmt/etc/openqrm-plugin-ip-mgmt.conf
deleted file mode 100644
index 2469a38..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ip-mgmt/etc/openqrm-plugin-ip-mgmt.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Network-mangement for the Appliances public IP-addresses. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="network"
diff --git a/openQRM-5.3.50-CE/src/plugins/ipmi/Makefile b/openQRM-5.3.50-CE/src/plugins/ipmi/Makefile
deleted file mode 100644
index 5d2f323..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ipmi/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/ipmi/etc
-	cp etc/openqrm-plugin-ipmi.conf /usr/share/openqrm/plugins/ipmi/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/ipmi/etc/openqrm-plugin-ipmi.conf b/openQRM-5.3.50-CE/src/plugins/ipmi/etc/openqrm-plugin-ipmi.conf
deleted file mode 100644
index 3fade9f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ipmi/etc/openqrm-plugin-ipmi.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Automatically controls the power status of physical systems via the <a href='http://en.wikipedia.org/wiki/Intelligent_Platform_Management_Interface' target='_BLANK'>IPMI</a> technology. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="network"
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/Makefile b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/Makefile
deleted file mode 100644
index 68d91c3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# this is the openQRM iscsi-storage-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/iscsi-storage $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.iscsi-deployment $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/img
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/lang/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/class/
-	. $(OPENQRM_SERVER_CONF) && chmod 777 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/bin
-	. $(OPENQRM_SERVER_CONF) && cp bin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/bin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/bin/openqrm*
-	. $(OPENQRM_SERVER_CONF) && tar -C $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage -czvf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/boot-service-iscsi-storage.tgz include/ bin/ etc/init.d/iscsi-storage etc/openqrm-plugin-iscsi-storage.conf
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/iscsi-storage
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/iscsi-storage/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/bin/openqrm-iscsi-storage b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/bin/openqrm-iscsi-storage
deleted file mode 100644
index fd908dd..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/bin/openqrm-iscsi-storage
+++ /dev/null
@@ -1,543 +0,0 @@
-#!/bin/bash
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# this script automatically manages iscsi
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-# unblock starting command queue early for non-blocking + ui commands
-ISCSI_COMMAND=$1
-if [ "$ISCSI_COMMAND" == "post_luns" ] || [ "$ISCSI_COMMAND" == "post_identifier" ] || [ "$ISCSI_COMMAND" == "list" ] || [ "$ISCSI_COMMAND" == "auth" ] || [ "$ISCSI_COMMAND" == "post_sync_progress" ] || [ "$ISCSI_COMMAND" == "post_sync_finished" ]; then
-	openqrm_unblock_starting_queue $@
-	NON_BLOCKING=true
-fi
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/include/openqrm-plugin-iscsi-storage-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/etc/openqrm-plugin-iscsi-storage.conf
-OPENQRM_POSTENCODE="$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-postencode"
-if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-	OPENQRM_SERVER_IP=$resource_openqrmserver
-	OPENQRM_EXEC_PORT=$resource_execdport
-elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-	openqrm_server_get_config
-	OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-	resource_id=0
-	resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-	openqrm_web_protocol=$OPENQRM_WEB_PROTOCOL
-fi
-export LANG=C
-# how long to wait for the volume authentication, each loop is 5 secs
-MAX_VOLUME_AUTHENTICATION_LOOP=30
-export MAX_VOLUME_AUTHENTICATION_LOOP
-
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-# let only root run this script
-WHOAMI=`whoami`
-if [ "$WHOAMI" != "root" ]; then
-	echo "ERROR: Please run this script as root!"
-	exit 6
-fi
-
-if [ ! -d "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY" ]; then
-	mkdir -p $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY
-fi
-
-# make sure required deps are installed
-if ! check_iscsi_storage_deps; then
-	if [ "$NON_BLOCKING" != "true" ]; then
-		openqrm_unblock_starting_queue $@
-	fi
-	exit 1
-fi
-
-function iscsi_storage_usage() {
-	echo "Usage : $0 add/remove/clone|snap/list <-n image-name> <-i image-password>"
-	echo "             [-m size in MB]"
-	echo "             [-s image-snapshot-name]"
-	echo "        $0 auth <-r image-rootdevice> <-i image-password>"
-	echo "        $0 adapt <-n image-name> <-u username> <-p password> [-i image-password]"
-	echo "        $0 post_luns <-u username> <-p password>"
-	echo "        $0 post_identifier <-u username> <-p password>"
-	echo "        $0 post_sync_progress <-n image-name> <-s image-snapshot-name> <-u username> <-p password>"
-	echo "        $0 post_sync_finished <-n image-name> <-u username> <-p password>"
-	echo ""
-	echo "Optional parameters:"
-	echo "             [--openqrm-ui-user <username>]"
-	echo "             [--openqrm-internal-cmd <true/false>]"
-	echo "             [--openqrm-cmd-mode <regular/background/fork>]"
-	exit 1
-}
-
-
-FULL_COMMANDLINE="$0 $@"
-ISCSI_COMMAND=$1
-shift
-
-while [ $# -ne 0 ]; do
-	case "$1" in
-		-n)
-			ISCSI_IMAGE_NAME=$2
-			shift
-			;;
-		-s)
-			ISCSI_IMAGE_SNAPSHOT_NAME=$2
-			shift
-			;;
-		-m)
-			ISCSI_IMAGE_SIZE=$2
-			shift
-			;;
-		-i)
-			ISCSI_IMAGE_PASSWORD=$2
-			shift
-			;;
-		-r)
-			ISCSI_IMAGE_ROOTDEVICE=$2
-			shift
-			;;
-		-u)
-			ISCSI_OPENQRM_USERNAME=$2
-			shift
-			;;
-		-p)
-			ISCSI_OPENQRM_PASSWORD=$2
-			shift
-			;;
-		--openqrm-ui-user)
-			OPENQRM_UI_USER=$2
-			shift
-			;;
-		--openqrm-internal-cmd)
-			OPENQRM_INTERNAL_CMD=$2
-			shift
-			;;
-		--openqrm-cmd-mode)
-			OPENQRM_CMD_MODE=$2
-			shift
-			;;
-
-		*)
-			if [ "$NON_BLOCKING" != "true" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			fi
-			echo "ERROR: Free commandline arguments are not allowed"
-			iscsi_storage_usage
-			exit 6
-			;;
-	esac
-	shift
-done
-
-
-
-
-# main
-if [ "$ISCSI_COMMAND" == "" ]; then
-	openqrm_unblock_starting_queue $FULL_COMMANDLINE
-	iscsi_storage_usage
-fi
-
-if [ "$ISCSI_COMMAND" == "post_luns" ] || [ "$ISCSI_COMMAND" == "post_identifier" ]; then
-	if [ "$ISCSI_OPENQRM_USERNAME" == "" ]; then
-		iscsi_storage_usage
-	fi
-	if [ "$ISCSI_OPENQRM_PASSWORD" == "" ]; then
-		iscsi_storage_usage
-	fi
-else
-	if [ "$ISCSI_COMMAND" != "list" ] && [ "$ISCSI_COMMAND" != "auth" ]; then
-		if [ "$ISCSI_IMAGE_NAME" == "" ]; then
-			if [ "$NON_BLOCKING" != "true" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			fi
-			iscsi_storage_usage
-		fi
-	fi
-fi
-
-case "$ISCSI_COMMAND" in 
-
-	add)
-		if [ "$ISCSI_IMAGE_SIZE" == "" ]; then
-			ISCSI_IMAGE_SIZE=$DEFAULT_IMAGE_SIZE
-		fi
-
-		if [ -f "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME" ]; then
-			openqrm_post_event 0 "add" 3 "iscsi-storage" "Volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME already exist."
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire iscsi-storage`
-		trap "openqrm_lock_queue release iscsi-storage $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# add as target
-		export ISCSI_IMAGE_SIZE
-		echo -n "Creating ISCSI Lun for image $ISCSI_IMAGE_NAME"
-		manage_iscsi add regular $ISCSI_IMAGE_PASSWORD
-
-		openqrm_lock_queue release iscsi-storage $LOCK_TIME
-		trap '' EXIT
-
-		# in case we have a username + password post the updated list to the openQRM-server
-		if [ "$ISCSI_OPENQRM_USERNAME" != "" ] && [ "$ISCSI_OPENQRM_PASSWORD" != "" ]; then
-			$0 post_luns -u $ISCSI_OPENQRM_USERNAME -p $ISCSI_OPENQRM_PASSWORD --openqrm-internal-cmd true
-		fi
-		;;
-
-	remove)
-		# check that source fs-images exist
-		if [ ! -f "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME" ]; then
-			openqrm_post_event 0 "remove" 3 "iscsi-storage" "Volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME does not exists!"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-		# check that it is not in use by a syncing action
-		if ls $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME.sync_in_progress.* 1>/dev/null 2>&1; then
-			openqrm_post_event 0 "remove" 3 "iscsi-storage" "Volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME is currently in use by a sync action!"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-		if [ -f "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME.clone_in_progress" ]; then
-			openqrm_post_event 0 "remove" 3 "iscsi-storage" "Volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME is currently in use by a clone action!"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire iscsi-storage`
-		trap "openqrm_lock_queue release iscsi-storage $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		echo -n "Removing ISCSI export for image $ISCSI_IMAGE_NAME"
-		manage_iscsi remove
-		# physical remove
-		rm -f $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME.*
-
-		openqrm_lock_queue release iscsi-storage $LOCK_TIME
-		trap '' EXIT
-
-		# in case we have a username + password post the updated list to the openQRM-server
-		if [ "$ISCSI_OPENQRM_USERNAME" != "" ] && [ "$ISCSI_OPENQRM_PASSWORD" != "" ]; then
-			$0 post_luns -u $ISCSI_OPENQRM_USERNAME -p $ISCSI_OPENQRM_PASSWORD --openqrm-internal-cmd true
-		fi
-		;;
-
-	clone|snap)
-		if [ "$ISCSI_IMAGE_SNAPSHOT_NAME" == "" ]; then
-			openqrm_post_event 0 "snap" 3 "iscsi-storage" "No snapshot name given. Please use the -s cmdline parameter."
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			iscsi_storage_usage
-		fi
-
-		# check that source fs-images exist
-		if [ ! -f $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME ]; then
-			openqrm_post_event 0 "snap" 3 "iscsi-storage" "Could not find source volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME."
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-		if [ -f "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_SNAPSHOT_NAME.clone_in_progress" ]; then
-			openqrm_post_event 0 "clone" 3 "iscsi-storage" "There is already an active cloning action running for Volume $ISCSI_IMAGE_SNAPSHOT_NAME!"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-		if [ -f "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_SNAPSHOT_NAME" ]; then
-			openqrm_post_event 0 "clone" 3 "iscsi-storage" "Snapshot $ISCSI_IMAGE_SNAPSHOT_NAME already exists!"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-		if [ ! -f $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME.conf ]; then
-			openqrm_post_event 0 "clone" 3 "iscsi-storage" "Could not find source volume config $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME.conf."
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		else
-			. $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME.conf
-			ISCSI_ORIGINAL_IMAGE_SIZE=$LUN_SIZE
-			if [ "$ISCSI_ORIGINAL_IMAGE_SIZE" == "" ]; then
-				openqrm_post_event 0 "snap" 3 "iscsi-storage" "Could not find out original image size of $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME."
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-				exit 1
-			fi
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire iscsi-storage`
-		trap "openqrm_lock_queue release iscsi-storage $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		echo -n "Creating snapshot from image $ISCSI_IMAGE_NAME -> $ISCSI_IMAGE_SNAPSHOT_NAME size $ISCSI_ORIGINAL_IMAGE_SIZE"
-
-		# create lock in the origin for clone so remove is not able to remove the origin while syncing
-		touch "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME.sync_in_progress.$ISCSI_IMAGE_SNAPSHOT_NAME"
-		# create long-term-action start event
-		openqrm_post_event 0 "$ISCSI_IMAGE_SNAPSHOT_NAME" 9 "iscsi-storage" "Started to clone $ISCSI_IMAGE_SNAPSHOT_NAME from $ISCSI_IMAGE_NAME"
-		export ORG_IMAGE_NAME=$ISCSI_IMAGE_NAME
-		export ISCSI_IMAGE_NAME=$ISCSI_IMAGE_SNAPSHOT_NAME
-		export ISCSI_IMAGE_SIZE=$ISCSI_ORIGINAL_IMAGE_SIZE
-		# create a lock in the new created dir for post_exports + identifier
-		touch "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-		# create an empty small file to be added as volume to iscsi first, we later overwrite this while syncing
-		touch $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_SNAPSHOT_NAME
-		manage_iscsi add snap $ISCSI_IMAGE_PASSWORD
-		# touch the snapshot as a file for post_luns
-		touch "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_SNAPSHOT_NAME"
-
-		openqrm_lock_queue release iscsi-storage $LOCK_TIME
-		trap '' EXIT
-
-		# in case we have a username + password post the updated list to the openQRM-server
-		# if we have a user + password we start sync-progress monitor
-		if [ "$ISCSI_OPENQRM_USERNAME" != "" ] && [ "$ISCSI_OPENQRM_PASSWORD" != "" ]; then
-			$0 post_sync_progress -n $ORG_IMAGE_NAME -s $ISCSI_IMAGE_SNAPSHOT_NAME -u $ISCSI_OPENQRM_USERNAME -p $ISCSI_OPENQRM_PASSWORD --openqrm-internal-cmd true &
-		fi
-		sleep 10
-		# start to sync
-		if ! nice --20 cp -af $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ORG_IMAGE_NAME $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_SNAPSHOT_NAME; then
-			openqrm_post_event 0 "snap" 3 "iscsi-storage" "Error during cloning $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ORG_IMAGE_NAME to $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_SNAPSHOT_NAME."
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire iscsi-storage`
-		trap "openqrm_lock_queue release iscsi-storage $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# we now remove + re-add the volume to the iscsi-target
-		manage_iscsi remove
-		manage_iscsi add snap $ISCSI_IMAGE_PASSWORD
-
-		# remove lock from the origin + snapshot
-		rm -f "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ORG_IMAGE_NAME.sync_in_progress.$ISCSI_IMAGE_SNAPSHOT_NAME"
-		rm -f "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-
-		openqrm_lock_queue release iscsi-storage $LOCK_TIME
-		trap '' EXIT
-
-		# stop sync-progress monitor and send sync-finished to openQRM
-		$0 post_sync_finished -n $ISCSI_IMAGE_SNAPSHOT_NAME -u $ISCSI_OPENQRM_USERNAME -p $ISCSI_OPENQRM_PASSWORD --openqrm-internal-cmd true
-		# create long-term-action finished event
-		openqrm_post_event 0 "$ISCSI_IMAGE_SNAPSHOT_NAME" 10 "iscsi-storage" "Finished to clone $ISCSI_IMAGE_SNAPSHOT_NAME"
-		;;
-
-	auth)
-		if [ "$ISCSI_IMAGE_ROOTDEVICE" == "" ]; then
-			ISCSI_IMAGE_ROOTDEVICE="$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME"
-		fi
-		if [ "$ISCSI_IMAGE_NAME" == "" ]; then
-			ISCSI_IMAGE_NAME=`basename $ISCSI_IMAGE_ROOTDEVICE`
-		fi
-		echo -n "Authenticating ISCSI Lun for image rootdevice $ISCSI_IMAGE_ROOTDEVICE"
-		# this is just for starting auth, make sure the device is there, otherwise wait
-		if [ "$ISCSI_OPENQRM_USERNAME" != "" ] && [ "$ISCSI_OPENQRM_PASSWORD" != "" ] && [ "$ISCSI_IMAGE_NAME" != "" ]; then
-			MAX_AUTH_LOOP=0
-			while (true); do
-				if [ -f "$ISCSI_IMAGE_ROOTDEVICE" ] && [ ! -f "$ISCSI_IMAGE_ROOTDEVICE.clone_in_progress" ]; then
-					break
-				fi
-				sleep 5
-				if [ "$MAX_AUTH_LOOP" == "$MAX_VOLUME_AUTHENTICATION_LOOP" ]; then
-					openqrm_post_event 0 "auth" 3 "iscsi-storage" "Volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME does not exist. Cannot auth."
-					exit 1
-				fi
-				MAX_AUTH_LOOP=$(( MAX_AUTH_LOOP + 1 ))
-			done
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire iscsi-storage`
-		trap "openqrm_lock_queue release iscsi-storage $LOCK_TIME" EXIT
-
-		manage_iscsi auth $ISCSI_IMAGE_PASSWORD
-
-		openqrm_lock_queue release iscsi-storage $LOCK_TIME
-		trap '' EXIT
-
-		# in case we have a username + password post the updated list to the openQRM-server
-		if [ "$ISCSI_OPENQRM_USERNAME" != "" ] && [ "$ISCSI_OPENQRM_PASSWORD" != "" ] && [ "$ISCSI_IMAGE_NAME" != "" ]; then
-			if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$ISCSI_OPENQRM_USERNAME --http-password=$ISCSI_OPENQRM_PASSWORD "$openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/iscsi-storage/iscsi-storage-action.php?iscsi_storage_command=auth_finished&iscsi_image_name=$ISCSI_IMAGE_NAME"; then
-				openqrm_post_event 0 "auth" 3 "iscsi-storage" "Could not remove the storage-auth-blocker for volume Volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME."
-			fi
-			$0 post_luns -u $ISCSI_OPENQRM_USERNAME -p $ISCSI_OPENQRM_PASSWORD --openqrm-internal-cmd true
-		fi
-		;;
-
-	adapt)
-		# adapts an existing blockfile volume to iscsi-deployment
-		if [ ! -f "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME" ]; then
-			openqrm_post_event 0 "adapt" 3 "iscsi-storage" "iSCSI volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME does not exists."
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-		# make sure it is not still used by another storage type
-		# check for aoe
-		if [ "$VBLADECONF" != "" ]; then
-			if grep -w "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME" $VBLADECONF | grep -v '^#'; then
-				if `which vblade 1>/dev/null`; then
-					for VBLADE_PID in `ps ax | grep vblade | grep -w $ISCSI_IMAGE_NAME | awk {' print $1 '}`; do
-						kill $VBLADE_PID
-					done
-					sync
-					grep -w -v "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME" $VBLADECONF > $VBLADECONF.new
-					mv -f $VBLADECONF.new $VBLADECONF
-					sed -i '/^$/d' $VBLADECONF
-				fi
-			fi
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire iscsi-storage`
-		trap "openqrm_lock_queue release iscsi-storage $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# add to ietd
-		manage_iscsi adapt $ISCSI_IMAGE_PASSWORD
-
-		openqrm_lock_queue release iscsi-storage $LOCK_TIME
-		trap '' EXIT
-
-		# posting volume and storage infos to openQRM
-		STORAGE_STATUS_TMP=$resource_id.iscsi.$ISCSI_IMAGE_NAME.adapt
-		> $STORAGE_STATUS_TMP
-		echo "$ISCSI_IMAGE_NAME,/dev/$ISCSI_IMAGE_NAME/$IMAGE_LUN" >> $STORAGE_STATUS_TMP
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$ISCSI_OPENQRM_USERNAME --http-password=$ISCSI_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/iscsi-storage/iscsi-storage-action.php?iscsi_storage_command=get_ident; then
-			openqrm_post_event 0 "adapt" 3 "iscsi-storage" "Could not post the iscsi target identifier to openQRM at $OPENQRM_SERVER_IP."
-		fi
-		rm -f $STORAGE_STATUS_TMP
-		rm -f $STORAGE_STATUS_TMP.post
-		;;
-
-	list)
-		ls $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY
-		;;
-	post_luns)
-		echo "Posting current iscsi-luns to the openQRM-server"
-		# get avail + used space
-		BACKEND_DIR_AVAIL_SPACE=`df --block-size MB $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY | grep -v Used | awk '{ print $2 }' | sed -e "s/MB//g"`
-		BACKEND_DIR_FREE_SPACE=`df --block-size MB $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY | grep -v Used | awk '{ print $4 }' | sed -e "s/MB//g"`
-		STORAGE_STATUS_TMP=$resource_id.iscsi.stat
-		echo "$BACKEND_DIR_AVAIL_SPACE""@""$BACKEND_DIR_FREE_SPACE""@""$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY" > $STORAGE_STATUS_TMP
-		for VOLUME in `ls  $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY | grep -v sync_in_progress | grep -v clone_in_progress | grep -v ".conf"`; do
-			if grep -w $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$VOLUME $IETDCONF | grep -v '^#' | grep Lun 1>/dev/null; then
-				LUN_STR=`grep -w $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$VOLUME $IETDCONF | grep -v '^#' | grep Lun`
-				# get the size from the config file
-				if [ -f $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$VOLUME.conf ]; then
-					. $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$VOLUME.conf
-					IMAGE_SIZE=$LUN_SIZE
-				fi
-				if [ "$IMAGE_SIZE" == "" ]; then
-					IMAGE_SIZE=`ls --block-size=M -l $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$VOLUME | awk '{ print $5 }' | sed -e "s/M//g"`
-				fi
-				# get password
-				IMAGE_USERNAME=$VOLUME
-				IMAGE_PASSWORD=`grep -A1 ^"Target $VOLUME$" $IETDCONF | grep IncomingUser | awk '{ print $3 }'`
-				# check for clone-in-progress
-				if [ -f "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$VOLUME.clone_in_progress" ]; then
-					V_ALLOWED_MAC="-"
-					IMAGE_SIZE="clone_in_progress"
-				fi
-				echo "iscsi-deployment""@""$LUN""@""$VOLUME""@""$IMAGE_USERNAME""@""$IMAGE_PASSWORD""@""$IMAGE_SIZE" >> $STORAGE_STATUS_TMP
-			else
-				echo "@@""$VOLUME""@@@" >> $STORAGE_STATUS_TMP
-			fi
-		done
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$ISCSI_OPENQRM_USERNAME --http-password=$ISCSI_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/iscsi-storage/iscsi-storage-action.php?iscsi_storage_command=get_storage; then
-			openqrm_post_event 0 "post_luns" 3 "iscsi-storage" "Could not post the iscsi target status to openQRM at $OPENQRM_SERVER_IP."
-		fi
-		rm -f $STORAGE_STATUS_TMP
-		rm -f $STORAGE_STATUS_TMP.post
-		;;
-
-	post_identifier)
-		echo "Posting current iscsi-identifier to the openQRM-server"
-		STORAGE_STATUS_TMP=$resource_id.iscsi.ident
-		> $STORAGE_STATUS_TMP
-		OLD_IFS=$IFS
-IFS='
-'
-		for LUN_STR in `cat $IETDCONF | grep -v "#" | grep Lun | grep $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY`; do
-			LUN=`echo $LUN_STR | awk {'print $2 '}`
-			IMAGE_NAME=`echo $LUN_STR | awk {'print $3 '}`
-			IMAGE_NAME=`basename $IMAGE_NAME | cut -d',' -f1`
-			echo "$IMAGE_NAME,/dev/$IMAGE_NAME/$LUN"
-			echo "$IMAGE_NAME,/dev/$IMAGE_NAME/$LUN" >> $STORAGE_STATUS_TMP
-		done
-		IFS=$OLD_IFS
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$ISCSI_OPENQRM_USERNAME --http-password=$ISCSI_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/iscsi-storage/iscsi-storage-action.php?iscsi_storage_command=get_ident; then
-			openqrm_post_event 0 "post_identifier" 3 "iscsi-storage" "Could not post the iscsi target identifier to openQRM at $OPENQRM_SERVER_IP."
-		fi
-		rm -f $STORAGE_STATUS_TMP
-		rm -f $STORAGE_STATUS_TMP.post
-		;;
-
-	post_sync_progress)
-		echo "Posting progress of the sync action for volume $ISCSI_IMAGE_SNAPSHOT_NAME syncing from $ISCSI_IMAGE_NAME to the openQRM-server"
-		STORAGE_STATUS_TMP=$resource_id.iscsi.$ISCSI_IMAGE_SNAPSHOT_NAME.sync_progress
-
-		while (true); do
-			# if this is a snapshot volume we have to wait until the sync is ready
-			if [ -f "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_SNAPSHOT_NAME" ] && [ ! -f "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_SNAPSHOT_NAME.clone_in_progress" ]; then
-				# sync is ready
-				break
-			else
-				if [ ! -f "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_SNAPSHOT_NAME" ]; then
-				    # cloning not started yet, waiting for the snapshot to appear
-				    echo "0" > $STORAGE_STATUS_TMP
-				else
-				    SOURCE_VOLUME_SIZE=`ls -l --block-size=M $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME | awk '{ print $5 }' | cut -d'M' -f1`
-				    DESTINATION_VOLUME_SIZE=`ls -l --block-size=M $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_SNAPSHOT_NAME | awk '{ print $5 }' | cut -d'M' -f1`
-				    if [ "$DESTINATION_VOLUME_SIZE" == 0 ]; then
-					    DESTINATION_VOLUME_SIZE=1
-				    fi
-				    CURRENT_SYNC_PROGRESS_IN_PERCENT=$(( SOURCE_VOLUME_SIZE / DESTINATION_VOLUME_SIZE ))
-				    CURRENT_SYNC_PROGRESS_IN_PERCENT=$(( 100 / CURRENT_SYNC_PROGRESS_IN_PERCENT ))
-				    # make sure to not send 100%, this is send by clone finished
-				    CURRENT_SYNC_PROGRESS_IN_PERCENT=$(( CURRENT_SYNC_PROGRESS_IN_PERCENT - 1 ))
-					if (( $CURRENT_SYNC_PROGRESS_IN_PERCENT < 0 )); then
-						CURRENT_SYNC_PROGRESS_IN_PERCENT=0
-					fi
-				    echo "$CURRENT_SYNC_PROGRESS_IN_PERCENT" > $STORAGE_STATUS_TMP
-				fi
-				if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$ISCSI_OPENQRM_USERNAME --http-password=$ISCSI_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/iscsi-storage/iscsi-storage-action.php?iscsi_storage_command=get_sync_progress; then
-					iscsi_storage_log "post_sync_progress" "Could not post the sync progress for volume $ISCSI_IMAGE_SNAPSHOT_NAME to openQRM at $OPENQRM_SERVER_IP."
-				fi
-				rm -f $STORAGE_STATUS_TMP $STORAGE_STATUS_TMP.post
-			fi
-			sleep 2
-		done
-		;;
-
-
-	post_sync_finished)
-		echo "Posting finished for volume $ISCSI_IMAGE_NAME to the openQRM-server"
-		STORAGE_STATUS_TMP=$resource_id.iscsi.$ISCSI_IMAGE_NAME.sync_progress
-		echo "100" > $STORAGE_STATUS_TMP
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$ISCSI_OPENQRM_USERNAME --http-password=$ISCSI_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/iscsi-storage/iscsi-storage-action.php?iscsi_storage_command=get_sync_finished; then
-			iscsi_storage_log "post_sync_finished" "Could not post the sync progress for volume $ISCSI_IMAGE_NAME to openQRM at $OPENQRM_SERVER_IP."
-		fi
-		rm -f $STORAGE_STATUS_TMP $STORAGE_STATUS_TMP.post
-		;;
-
-
-	*)
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		iscsi_storage_usage
-		;;
-
-
-esac
-
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/etc/init.d/iscsi-storage b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/etc/init.d/iscsi-storage
deleted file mode 100644
index a78e874..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/etc/init.d/iscsi-storage
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/bash
-# this is the boot-service init script for the iSCSI-Storage-hosts
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/include/openqrm-plugin-iscsi-storage-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/etc/openqrm-plugin-iscsi-storage.conf
-LINE_IFS='
-'
-
-# do not start on the intitrd
-if [ -f /etc/initrd-devices.conf ]; then
-	exit 0
-fi
-
-function iscsi_storage_start() {
-	echo "Starting the openQRM iscsi-storage-plugin"
-	if [ "$ISCSI_STORAGE_AUTO_START" == "yes" ]; then
-		if [ -x "/etc/init.d/iscsi-target" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d iscsi-target start
-			else
-				/etc/init.d/iscsi-target start
-			fi
-		elif [ -x /etc/init.d/iscsitarget ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d iscsitarget start
-			else
-				/etc/init.d/iscsitarget start
-			fi
-		fi
-	fi
-}
-
-
-function iscsi_storage_stop() {
-	echo "Stopping the openQRM iscsi-storage-plugin"
-	if [ "$ISCSI_STORAGE_AUTO_START" == "yes" ]; then
-		if [ -x "/etc/init.d/iscsi-target" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d iscsi-target stop
-			else
-				/etc/init.d/iscsi-target stop
-			fi
-		elif [ -x /etc/init.d/iscsitarget ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d iscsitarget stop
-			else
-				/etc/init.d/iscsitarget stop
-			fi
-		fi
-	fi
-}
-
-
-
-
-
-case "$1" in
-	start)
-		iscsi_storage_start
-		;;
-	stop)
-		iscsi_storage_stop
-		;;
-	restart)
-		iscsi_storage_stop
-		sleep 1
-		iscsi_storage_start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-
-esac
-exit $?
-
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/etc/init.d/openqrm-plugin-iscsi-storage b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/etc/init.d/openqrm-plugin-iscsi-storage
deleted file mode 100644
index 91a87e2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/etc/init.d/openqrm-plugin-iscsi-storage
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/bin/bash
-# init script for the openQRM iscsi-storage-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/include/openqrm-plugin-iscsi-storage-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/etc/openqrm-plugin-iscsi-storage.conf
-
-
-
-function openqrm_plugin_iscsi_storage_start() {
-	openqrm_plugin_iscsi_storage_stop 1>/dev/null 2>&1
-	echo "Starting the openQRM iscsi-storage-plugin"
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/iscsi-storage/.running
-	if [ "$ISCSI_STORAGE_AUTO_START" == "yes" ]; then
-		if [ -x "/etc/init.d/iscsi-target" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d iscsi-target start
-			else
-				/etc/init.d/iscsi-target start
-			fi
-		elif [ -x /etc/init.d/iscsitarget ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d iscsitarget start
-			else
-				/etc/init.d/iscsitarget start
-			fi
-		fi
-	fi
-}
-
-
-function openqrm_plugin_iscsi_storage_stop() {
-	echo "Stopping the openQRM iscsi-storage-plugin"
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/iscsi-storage/.running
-	if [ "$ISCSI_STORAGE_AUTO_START" == "yes" ]; then
-		if [ -x "/etc/init.d/iscsi-target" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d iscsi-target stop
-			else
-				/etc/init.d/iscsi-target stop
-			fi
-		elif [ -x /etc/init.d/iscsitarget ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d iscsitarget stop
-			else
-				/etc/init.d/iscsitarget stop
-			fi
-		fi
-	fi
-}
-
-function openqrm_plugin_iscsi_storage_uninstall() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "iscsi-storage: Please give a username to uninstall the plugin : "
-		read USERNAME
-		echo
-		echo -n "iscsi-storage: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Uninstalling the openQRM iscsi-storage-plugin"
-	openqrm_plugin_iscsi_storage_stop
-	openqrm_server_remove_deployment_type $USERNAME $PASSWORD iscsi-deployment
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/iscsi-storage
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.iscsi-deployment
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.iscsi-deployment.php
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-iscsi-storage.tgz
-
-	# remove only if lvm-storage is not enabled
-	if ! ls $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins | grep lvm-storage 1>/dev/null 2>&1; then
-		if ! ls $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins | grep netapp-storage 1>/dev/null 2>&1; then
-			rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/iscsid
-			rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/iscsiadm
-		fi
-	fi
-}
-
-function openqrm_plugin_iscsi_storage_init() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "iscsi-storage: Please give a username to init the plugin : "
-		read USERNAME
-		echo
-		echo -n "iscsi-storage: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Initializing the openQRM iscsi-storage-plugin"
-	openqrm_server_add_deployment_type $USERNAME $PASSWORD iscsi-deployment iscsi-deployment "Iscsi-root deployment" iscsi-storage "Iscsi Enterprise Target Storage"
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/iscsi-storage
-	# linking the boot-service
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/boot-service-iscsi-storage.tgz $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-iscsi-storage.tgz
-	# linking the root mount hook
-	chmod +x $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/root-mount.iscsi-deployment
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/root-mount.iscsi-deployment $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.iscsi-deployment
-	# linking the default image-parameters
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/image.iscsi-deployment.php $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.iscsi-deployment.php
-
-	# copying iscsid to boot-service dir
-	if [ ! -x $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/iscsid ]; then
-		cp -f `which iscsid` $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/
-	fi
-	# copying iscsiadm to boot-service dir
-	if [ ! -x $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/iscsiadm ]; then
-		cp -f `which iscsiadm` $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/
-	fi
-	# create storage dir for stat files
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/storage
-	chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/storage
-	echo "Order deny,allow" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/storage/.htaccess
-	echo "Deny from all" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/web/storage/.htaccess
-
-}
-
-USER=$2
-PASS=$3
-
-case "$1" in
-	start)
-		openqrm_plugin_iscsi_storage_start
-		;;
-	stop)
-		openqrm_plugin_iscsi_storage_stop
-		;;
-	restart)
-		openqrm_plugin_iscsi_storage_stop
-		sleep 1
-		openqrm_plugin_iscsi_storage_start
-		;;
-	init)
-		openqrm_plugin_iscsi_storage_init $USER $PASS
-		;;
-	uninstall)
-		openqrm_plugin_iscsi_storage_uninstall $USER $PASS
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/etc/init.d/openqrm-plugin-iscsi-storage.postinstall b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/etc/init.d/openqrm-plugin-iscsi-storage.postinstall
deleted file mode 100644
index 574fc00..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/etc/init.d/openqrm-plugin-iscsi-storage.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-iscsi-storage postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/etc/init.d/openqrm-plugin-iscsi-storage.preremove b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/etc/init.d/openqrm-plugin-iscsi-storage.preremove
deleted file mode 100644
index fcf2ed1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/etc/init.d/openqrm-plugin-iscsi-storage.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-iscsi-storage preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-iscsi-storage stop
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/etc/openqrm-plugin-iscsi-storage.conf b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/etc/openqrm-plugin-iscsi-storage.conf
deleted file mode 100644
index 79bddf7..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/etc/openqrm-plugin-iscsi-storage.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-# this is the openQRM-plugin-iscsi-storage info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, open-iscsi"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, iscsi-initiator-utils"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, open-iscsi"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="Integrates <a href='http://iscsitarget.sourceforge.net/' target='_BLANK'>iSCSI Enterprise Target</a> as Storage technology (network-deployment)."
-OPENQRM_PLUGIN_TYPE="storage"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES=""
-
-# The directory for the iSCSI-Deployment blockfiles
-OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY="/storage"
-
-OPENQRM_PLUGIN_STATE_FILES="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/iscsi-storage/etc/openqrm-plugin-iscsi-storage.conf"
-
-# if openQRM should start/stop the storage component (yes/no), default no
-ISCSI_STORAGE_AUTO_START=no
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/include/openqrm-plugin-iscsi-storage-functions b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/include/openqrm-plugin-iscsi-storage-functions
deleted file mode 100644
index 5f9b161..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/include/openqrm-plugin-iscsi-storage-functions
+++ /dev/null
@@ -1,250 +0,0 @@
-#!/bin/bash
-# this is the functions file for the iscsi-storage-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-
-# iscsi-target config file
-IETDCONF=`find /etc/ -name ietd.conf -type f | head -n1`
-if [ "$IETDCONF" == "" ]; then
-	IETDCONF="/etc/ietd.conf"
-fi
-VBLADECONF=/etc/vblade.conf
-
-# some definitions
-DEFAULT_IMAGE_SIZE=5000
-ISCSI_TARGET_URL=http://iscsitarget.sourceforge.net/
-IMAGE_LUN=1
-
-################ common iscsi-storage functions
-
-# logs for iscsi_storage
-function iscsi_storage_log() {
-	local COMPONENT=$1
-	shift
-	local MESSAGE=$@
-	logger -i -t "iscsi-storage plug-in" "$COMPONENT : $MESSAGE"
-}
-
-################ iscsi-storage functions
-
-# deps function
-function check_iscsi_storage_deps() {
-	# check and fullfill dependencies
-	# screen
-	if ! openqrm_full_fill_os_dependency screen screen; then
-		return 1
-	fi
-	if [ -x /usr/bin/screen.real ]; then
-		export RUNSCREEN="/usr/bin/screen.real"
-	else
-		export RUNSCREEN=`which screen`
-	fi
-	# wget
-	if ! openqrm_full_fill_os_dependency wget wget; then
-		return 1
-	fi
-	# procmail for lockfile
-	if ! openqrm_full_fill_os_dependency lockfile procmail; then
-		return 1
-	fi
-	if [ -f /etc/debian_version ]; then
-		# open-iscsi
-		if ! openqrm_full_fill_os_dependency iscsid open-iscsi; then
-			return 1
-		fi
-		# open-iscsi-utils
-		if ! openqrm_full_fill_os_dependency iscsiadm open-iscsi-utils; then
-			return 1
-		fi
-		# ietd - needs dkms package on debian/ubuntu
-		if ! openqrm_full_fill_os_dependency ietd iscsitarget-dkms; then
-			return 1
-		fi
-		if ! openqrm_full_fill_os_dependency ietd iscsitarget; then
-			return 1
-		fi
-	elif [ -f /etc/redhat-release ]; then
-		# iscsi-initiator-utils
-		if ! openqrm_full_fill_os_dependency iscsid iscsi-initiator-utils; then
-			return 1
-		fi
-		# ietd
-		if ! openqrm_full_fill_os_dependency ietd iscsitarget; then
-			return 1
-		fi
-	elif [ -f /etc/SuSE-release ]; then
-		# open-iscsi
-		if ! openqrm_full_fill_os_dependency iscsid open-iscsi; then
-			return 1
-		fi
-		# ietd
-		if ! openqrm_full_fill_os_dependency ietd iscsitarget; then
-			return 1
-		fi
-	fi
-
-}
-
-
-
-function manage_iscsi() {
-
-	case "$1" in
-		add)
-			IMAGE_PASS=$3
-			# if password is empty we generate one
-			if [ "$IMAGE_PASS" == "" ]; then
-			    IMAGE_PASS=`cat /dev/urandom|tr -dc "a-zA-Z0-9-_\$\?"|fold -w 9|head -n1`
-			fi
-			# create the image file
-			if [ "$2" != "snap" ]; then
-				if ! dd if=/dev/zero of=$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME bs=1M seek=$ISCSI_IMAGE_SIZE count=1; then
-					openqrm_post_event 0 "add" 3 "iscsi-storage" "Could not create volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME."
-					return 1
-				else
-					# create fs, currently static all ext3
-					if ! mkfs.ext3 -F $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME; then
-						openqrm_post_event 0 "add" 3 "iscsi-storage" "Could not create filesystem on volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME."
-						return 1
-					fi
-
-				fi
-			fi
-			echo "Target $ISCSI_IMAGE_NAME" >> $IETDCONF
-			echo "	IncomingUser $ISCSI_IMAGE_NAME $IMAGE_PASS" >> $IETDCONF
-			echo "	Lun $IMAGE_LUN Path=$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME,Type=fileio" >> $IETDCONF
-			echo "	MaxConnections 1   # $ISCSI_IMAGE_NAME" >> $IETDCONF
-			echo "	MaxSessions 1    # $ISCSI_IMAGE_NAME" >> $IETDCONF
-			echo "	NOPInterval 3    # $ISCSI_IMAGE_NAME" >> $IETDCONF
-			echo "	NOPTimeout  3    # $ISCSI_IMAGE_NAME" >> $IETDCONF
-			# create config for keeping the size
-			echo "LUN_SIZE=$ISCSI_IMAGE_SIZE" > $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME.conf
-			LAST_TID=`grep tid: /proc/net/iet/volume | cut -d':' -f2 | awk {' print $1 '} | sort -g | tail -n1`
-			NEW_TID=$(( $LAST_TID + 1 ))
-			# dynamically add new target
-			if ! ietadm --op new --tid=$NEW_TID --params Name=$ISCSI_IMAGE_NAME; then
-				openqrm_post_event 0 "add" 3 "iscsi-storage" "Could not create target for volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME."
-				return 1
-			fi
-			# set path to iscsi device in the new target
-			if ! ietadm --op new --tid=$NEW_TID --lun=$IMAGE_LUN --params Path=$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME; then
-				openqrm_post_event 0 "add" 3 "iscsi-storage" "Could not set target path for volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME."
-				return 1
-			fi
-			# auth target
-			if ! ietadm --op new --tid=$NEW_TID --user --params IncomingUser=$ISCSI_IMAGE_NAME,Password=$IMAGE_PASS; then
-				openqrm_post_event 0 "add" 3 "iscsi-storage" "Could not set authentication for volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME."
-				return 1
-			fi
-			;;
-		auth)
-			IMAGE_PASS=$2
-			# if password is empty we generate one
-			if [ "$IMAGE_PASS" == "" ]; then
-			    IMAGE_PASS=`cat /dev/urandom|tr -dc "a-zA-Z0-9-_\$\?"|fold -w 9|head -n1`
-			fi
-			IMAGE_AUTHNAME=`basename $ISCSI_IMAGE_ROOTDEVICE`
-			sed -i -e "s#IncomingUser $IMAGE_AUTHNAME .*#IncomingUser $IMAGE_AUTHNAME $IMAGE_PASS#g" $IETDCONF
-			sed -i '/^$/d' $IETDCONF
-			TID_TO_AUTH=`cat /proc/net/iet/volume | grep "name:$IMAGE_AUTHNAME$" | cut -d':' -f2 | awk {' print $1 '}`
-			if [ "$TID_TO_AUTH" == "" ]; then
-				openqrm_post_event 0 "auth" 3 "iscsi-storage" "Could not find target for volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$IMAGE_AUTHNAME."
-				return 1
-			fi
-			if ! ietadm --op new --tid=$TID_TO_AUTH --user --params IncomingUser=$IMAGE_AUTHNAME,Password=$IMAGE_PASS; then
-				openqrm_post_event 0 "auth" 3 "iscsi-storage" "Could not set authentication for volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$IMAGE_AUTHNAME."
-				return 1
-			fi
-			;;
-		adapt)
-			IMAGE_PASS=$2
-			# if password is empty we generate one
-			if [ "$IMAGE_PASS" == "" ]; then
-			    IMAGE_PASS=`cat /dev/urandom|tr -dc "a-zA-Z0-9-_\$\?"|fold -w 9|head -n1`
-			fi
-			if ! grep -w "$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME" $IETDCONF | grep Lun | grep -v '^#' 1>/dev/null; then
-				echo "Target $ISCSI_IMAGE_NAME" >> $IETDCONF
-				echo "	IncomingUser $ISCSI_IMAGE_NAME $IMAGE_PASS" >> $IETDCONF
-				echo "	Lun $IMAGE_LUN Path=$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME,Type=fileio" >> $IETDCONF
-				echo "	MaxConnections 1   # $ISCSI_IMAGE_NAME" >> $IETDCONF
-				echo "	MaxSessions 1    # $ISCSI_IMAGE_NAME" >> $IETDCONF
-				echo "	NOPInterval 3    # $ISCSI_IMAGE_NAME" >> $IETDCONF
-				echo "	NOPTimeout  3    # $ISCSI_IMAGE_NAME" >> $IETDCONF
-				# create config for keeping the size
-				ISCSI_IMAGE_SIZE=`ls --block-size=M -l $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME | awk '{ print $5 }' | sed -e "s/M//g"`
-				echo "LUN_SIZE=$ISCSI_IMAGE_SIZE" > $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME.conf
-				LAST_TID=`grep tid: /proc/net/iet/volume | cut -d':' -f2 | awk {' print $1 '} | sort -g | tail -n1`
-				NEW_TID=$(( $LAST_TID + 1 ))
-				# dynamically add new target
-				if ! ietadm --op new --tid=$NEW_TID --params Name=$ISCSI_IMAGE_NAME; then
-					openqrm_post_event 0 "adapt" 3 "iscsi-storage" "Could not create target for volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME."
-					return 1
-				fi
-				# set path to iscsi device in the new target
-				if ! ietadm --op new --tid=$NEW_TID --lun=$IMAGE_LUN --params Path=$OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME; then
-					openqrm_post_event 0 "adapt" 3 "iscsi-storage" "Could not set target path for volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME."
-					return 1
-				fi
-				# auth target
-				if ! ietadm --op new --tid=$NEW_TID --user --params IncomingUser=$ISCSI_IMAGE_NAME,Password=$IMAGE_PASS; then
-					openqrm_post_event 0 "adapt" 3 "iscsi-storage" "Could not set authentication for volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME."
-					return 1
-				fi
-			fi
-			;;
-		remove)
-			# remove from config file
-			cat $IETDCONF | grep -v -w $ISCSI_IMAGE_NAME > $IETDCONF.tmp
-			mv -f $IETDCONF.tmp $IETDCONF
-			sed -i '/^$/d' $IETDCONF
-			TID_TO_REMOVE=`cat /proc/net/iet/volume | grep "name:$ISCSI_IMAGE_NAME$" | cut -d':' -f2 | awk {' print $1 '}`
-			OPEN_SESSION=`cat /proc/net/iet/session | grep -w ^tid:$TID_TO_REMOVE -A1 | grep sid: | cut -d':' -f2 | awk {' print $1 '}`
-			if [ "$OPEN_SESSION" != "" ]; then
-				# first remove active session
-				if ! ietadm --op delete --tid=$TID_TO_REMOVE --sid=$OPEN_SESSION --cid=0; then
-					openqrm_post_event 0 "remove" 3 "iscsi-storage" "Could not remove active session for volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME."
-					return 1
-				fi
-			fi
-			# remove lun
-			if ! ietadm --op delete --tid=$TID_TO_REMOVE --lun=$IMAGE_LUN; then
-				openqrm_post_event 0 "remove" 3 "iscsi-storage" "Could not remove the lun for volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME."
-				return 1
-			fi
-			# remove target dynamically
-			if ! ietadm --op delete --tid=$TID_TO_REMOVE; then
-				openqrm_post_event 0 "remove" 3 "iscsi-storage" "Could not remove the target for volume $OPENQRM_ISCSI_STORAGE_SERVER_IMAGE_DIRECTORY/$ISCSI_IMAGE_NAME."
-				return 1
-			fi
-			;;
-	esac
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/include/openqrm-plugin-iscsi-storage-kernel-hook b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/include/openqrm-plugin-iscsi-storage-kernel-hook
deleted file mode 100644
index ddae709..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/include/openqrm-plugin-iscsi-storage-kernel-hook
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-# this is a hook function for the kernel-creation phase
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-function iscsi_storage_kernel_hook() {
-
-	local KERNEL_NAME=$1
-	local KERNEL_VERSION=$2
-	local KERNEL_LOCATION=$3
-	local KERNEL_TYPE=$4
-
-	echo "iscsi-storage-plugin: Running iscsi_storage_kernel_hook $KERNEL_NAME $KERNEL_VERSION $KERNEL_LOCATION $KERNEL_TYPE"
-	echo "iscsi-storage-plugin: Running iscsi_storage_kernel_hook $KERNEL_NAME $KERNEL_VERSION $KERNEL_LOCATION $KERNEL_TYPE" | logger
-
-	# try to find the iscsid + iscsiadm util fitting to the created kernel
-	if [ -x "$KERNEL_LOCATION/sbin/iscsid" ]; then
-		cp -a $KERNEL_LOCATION/sbin/iscsid $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsid.$KERNEL_NAME
-		echo "iscsi-storage-plugin: Found iscsid at $KERNEL_LOCATION/sbin/iscsid. Coping to $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsid.$KERNEL_NAME"
-		echo "iscsi-storage-plugin: Found iscsid at $KERNEL_LOCATION/sbin/iscsid. Coping to $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsid.$KERNEL_NAME" | logger
-	fi
-	if [ -x "$KERNEL_LOCATION/usr/sbin/iscsid" ]; then
-		cp -a $KERNEL_LOCATION/usr/sbin/iscsid $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsid.$KERNEL_NAME
-		echo "iscsi-storage-plugin: Found iscsid at $KERNEL_LOCATION/usr/sbin/iscsid. Coping to $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsid.$KERNEL_NAME"
-		echo "iscsi-storage-plugin: Found iscsid at $KERNEL_LOCATION/usr/sbin/iscsid. Coping to $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsid.$KERNEL_NAME" | logger
-	fi
-	if [ -x "$KERNEL_LOCATION/sbin/iscsiadm" ]; then
-		cp -a $KERNEL_LOCATION/sbin/iscsiadm $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsiadm.$KERNEL_NAME
-		echo "iscsi-storage-plugin: Found iscsiadm at $KERNEL_LOCATION/sbin/iscsiadm. Coping to $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsiadm.$KERNEL_NAME"
-		echo "iscsi-storage-plugin: Found iscsiadm at $KERNEL_LOCATION/sbin/iscsiadm. Coping to $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsiadm.$KERNEL_NAME" | logger
-	fi
-	if [ -x "$KERNEL_LOCATION/usr/bin/iscsiadm" ]; then
-		cp -a $KERNEL_LOCATION/usr/bin/iscsiadm $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsiadm.$KERNEL_NAME
-		echo "iscsi-storage-plugin: Found iscsiadm at $KERNEL_LOCATION/usr/bin/iscsiadm. Coping to $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsiadm.$KERNEL_NAME"
-		echo "iscsi-storage-plugin: Found iscsiadm at $KERNEL_LOCATION/usr/bin/iscsiadm. Coping to $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsiadm.$KERNEL_NAME" | logger
-	fi
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage-about.bootservice.class.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage-about.bootservice.class.php
deleted file mode 100644
index 9615865..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage-about.bootservice.class.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * iscsi-storage-about Boot-Service
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class iscsi_storage_about_bootservice
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'iscsi_storage_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "iscsi_storage_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/iscsi-storage-about-bootservice.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['boot_service_title'], 'boot_service_title');
-		$t->add($this->lang['boot_service_content'], 'boot_service_content');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage-about.controller.class.php
deleted file mode 100644
index 500cda3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage-about.controller.class.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-/**
- * iscsi-about Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class iscsi_storage_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'iscsi_storage_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'iscsi_storage_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'iscsi_storage_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'iscsi_storage_about_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About iSCSI-Storage',
-		'label' => 'About iSCSI-Storage',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The "iSCSI-Storage" plugin manages iSCSI-Server in openQRM.
-					   ',
-		'requirements_title' => 'Requirements',
-		'requirements_list' => 'A resource for the iSCSI-Storage Storage (this can be a remote system integrated into openQRM e.g. via the "local-server" plugin or the openQRM server itself)',
-
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-
-		'provides_title' => 'Provides',
-		'provides_list' => '<ul><li>Storage type: "iSCSI Enterprise Target Storage"</li>
-					<li>Deployment types: "iSCSI-deployment"</li></ul>',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Storage',
-
-		'deployment_title' => 'Deployment Type',
-		'deployment_content' => 'Network-Deployment',
-
-		'documentation_title' => 'Documentation',
-		'use_case_title' => 'Use-Case',
-		'network_deploymet' => 'Network-Deployment',
-		'doc1' => '',
-	),
-	'bootservice' => array (
-		'tab' => 'Boot-Service',
-		'label' => 'iSCSI-Storage Boot-Service',
-		'boot_service_title' => 'iSCSI-Storage Host Boot-Service',
-		'boot_service_content' => 'The iSCSI-Storage Plugin provides an openQRM Boot-Service.
-			This "iSCSI-Storage Boot-Service" is automatically downloaded and executed by the openQRM-Client on all integrated Systems.
-			The Boot-Service is located at:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/iscsi-storage/web/boot-service-iscsi-storage.tgz</b></i>
-			<br>
-			<br>
-			The "iSCSI-Storage Boot-Service contains the Client files of the iSCSI-Storage Plugin.<br>
-			Also a configuration file for the iSCSI-Storage server is included in this Boot-Service.<br>
-			<br>
-			The Boot-Service configuration can be viewed and administrated by the "openqrm" utility.<br>
-			To view the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n iscsi-storage -a default</b></i>
-			<br>
-			<br>
-			To view a Boot-Service configuration of a specific appliance run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n iscsi-storage -a [appliance-name]</b></i>
-			<br>
-			<br>
-			To adapt a parameter in the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n iscsi-storage -a default -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			To adapt a paramter in the Boot-Service configuration of a specific appliance run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n iscsi-storage -a [appliance-name] -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			In case the openmQRM Server itself is used as the iSCSI-Storage Storage please edit:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/iscsi-storage/etc/openqrm-plugin-iscsi-storage.conf</b></i>
-			<br>
-			<br>
-			and set the configuration keys.<br>
-			<br>
-			',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/iscsi-storage/lang", 'iscsi-storage-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/iscsi-storage/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "documentation";
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-			case 'bootservice':
-				$content[] = $this->bootservice(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About iSCSI-Storage
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/iscsi-storage/class/iscsi-storage-about.documentation.class.php');
-			$controller = new iscsi_storage_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Boot-Service
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function bootservice( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/iscsi-storage/class/iscsi-storage-about.bootservice.class.php');
-			$controller = new iscsi_storage_about_bootservice($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['bootservice'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['bootservice']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'bootservice' );
-		$content['onclick'] = false;
-		if($this->action === 'bootservice'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage-about.documentation.class.php
deleted file mode 100644
index d694f4b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage-about.documentation.class.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * iscsi-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class iscsi_storage_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'iscsi_storage_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "iscsi_storage_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/iscsi-storage-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['deployment_title'], 'deployment_title');
-		$t->add($this->lang['deployment_content'], 'deployment_content');
-		$t->add($this->lang['provides_title'], 'provides_title');
-		$t->add($this->lang['provides_list'], 'provides_list');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.add.class.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.add.class.php
deleted file mode 100644
index 98f1c97..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.add.class.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-/**
- * iSCSI-Storage Add new Volume
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class iscsi_storage_add
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'iscsi_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "iscsi_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'iscsi_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'iscsi_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-		$this->controller = $controller;
-		$this->response   = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-		$this->user = $openqrm->user();
-		$storage_id       = $this->response->html->request()->get('storage_id');
-		$storage          = $this->openqrm->storage();
-		$resource         = $this->openqrm->resource();
-		$deployment       = $this->openqrm->deployment();
-		$this->response->params['storage_id'] = $this->response->html->request()->get('storage_id');
-		$this->storage    = $storage->get_instance_by_id($storage_id);
-		$this->resource   = $resource->get_instance_by_id($storage->resource_id);
-		$this->deployment = $deployment->get_instance_by_id($storage->type);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$this->set_max();
-		$response = $this->add();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 3) {
-				$this->controller->reload();
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&image_id='.$response->image_id
-				);
-			} else {
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/iscsi-storage-add.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function add() {
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			if($form->get_request('size') > $this->max) {
-				$form->set_error('size', sprintf($this->lang['error_size_exeeded'], number_format($this->max, 0, '', '').' MB'));
-			}
-			if(!$form->get_errors()) {	
-				$name        = $form->get_request('name');
-				$size        = $form->get_request('size');
-				$command     = $this->openqrm->get('basedir')."/plugins/iscsi-storage/bin/openqrm-iscsi-storage add -n ".$name." -m ".$size;
-				$command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-				$command	.= ' --openqrm-ui-user '.$this->user->name;
-				$command	.= ' --openqrm-cmd-mode background';
-				$storage_id  = $this->response->html->request()->get('storage_id');
-				$storage     = $this->storage;
-				$resource    = $this->resource;
-				$storage->get_instance_by_id($storage_id);
-				$resource->get_instance_by_id($storage->resource_id);
-				$statfile = $this->openqrm->get('basedir').'/plugins/iscsi-storage/web/storage/'.$storage->resource_id.'.iscsi.stat';
-				if (file_exists($statfile)) {
-					$lines = explode("\n", file_get_contents($statfile));
-					if(count($lines) >= 1) {
-						foreach($lines as $line) {
-							if($line !== '') {
-								$line = explode('@', $line);
-								$check = $line[2];
-								if($name === $check) {
-									$error = sprintf($this->lang['error_exists'], $name);
-								}
-							}
-						}
-					}
-				}
-				if(isset($error)) {
-					$response->error = $error;
-				} else {
-					if($this->file->exists($statfile)) {
-						$this->file->remove($statfile);
-					}
-					$resource->send_command($resource->ip, $command);
-					while (!$this->file->exists($statfile)) {
-						usleep(10000); // sleep 10ms to unload the CPU
-						clearstatcache();
-					}
-					// add check that volume $name is now in the statfile
-					$created = false;
-					$volume_path = "";
-					$lines = explode("\n", $this->file->get_contents($statfile));
-					if(count($lines) >= 1) {
-						foreach($lines as $line) {
-							if($line !== '') {
-								$line = explode('@', $line);
-								$check = $line[2];
-								if($name === $check) {
-									$created = true;
-									$volume_path = '/dev/'.$name.'/1';
-									break;
-								}
-							}
-						}
-					}
-
-					if ($created) {
-						$tables = $this->openqrm->get('table');
-					    $image_fields = array();
-					    $image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					    $image_fields['image_name'] = $name;
-					    $image_fields['image_type'] = $this->deployment->type;
-					    $image_fields['image_rootfstype'] = 'ext3';
-					    $image_fields['image_storageid'] = $this->storage->id;
-					    $image_fields['image_comment'] = "Image Object for volume $name";
-						$image_fields['image_rootdevice'] = $volume_path;
-						$image_fields['image_size']=$size;
-					    $image = new image();
-					    $image->add($image_fields);
-						$response->msg = sprintf($this->lang['msg_added'], $name);
-						// save image id in response for the wizard
-						$response->image_id = $image_fields["image_id"];
-
-					} else {
-					    $response->msg = sprintf($this->lang['msg_add_failed'], $name);
-					}
-				}
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'add');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$d['name']['label']                             = $this->lang['form_name'];
-		$d['name']['required']                          = true;
-		$d['name']['validate']['regex']                 = '/^[a-z0-9._]+$/i';
-		$d['name']['validate']['errormsg']              = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                    = 'htmlobject_input';
-		$d['name']['object']['attrib']['id']            = 'name';
-		$d['name']['object']['attrib']['name']          = 'name';
-		$d['name']['object']['attrib']['type']          = 'text';
-		$d['name']['object']['attrib']['css']           = 'namegen';
-		$d['name']['object']['attrib']['customattribs'] = 'data-prefix="iscsi" data-length="6"';
-		$d['name']['object']['attrib']['value']         = '';
-		$d['name']['object']['attrib']['maxlength']     = 50;
-
-		$d['size']['label']                         = sprintf($this->lang['form_size'], number_format($this->max, 0, '', '').' MB');
-		$d['size']['required']                      = true;
-		$d['size']['validate']['regex']             = '/^[0-9]+$/i';
-		$d['size']['validate']['errormsg']          = sprintf($this->lang['error_size'], '0-9');
-		$d['size']['object']['type']                = 'htmlobject_input';
-		$d['size']['object']['attrib']['name']      = 'size';
-		$d['size']['object']['attrib']['type']      = 'text';
-		$d['size']['object']['attrib']['value']     = '';
-		$d['size']['object']['attrib']['maxlength'] = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Set max
-	 *
-	 * @access protected
-	 * @return bool
-	 */
-	//--------------------------------------------
-	function set_max() {
-		$statfile = $this->openqrm->get('basedir').'/plugins/iscsi-storage/web/storage/'.$this->resource->id.'.iscsi.stat';
-		if (file_exists($statfile)) {
-			$lines = explode("\n", file_get_contents($statfile));
-			if(count($lines) >= 1) {
-				foreach($lines as $line) {
-					if($line !== '') {
-						$line = explode('@', $line);
-						$max = $line[1];
-						$max = (int)$max;
-						$this->max = $max;
-						return true;
-						break;
-					}
-				}
-			} else {
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.api.class.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.api.class.php
deleted file mode 100644
index 9711613..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.api.class.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * iSCSI-Storage Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class iscsi_storage_api
-{
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param object $iscsi_storage_controller
-	 */
-	//--------------------------------------------
-	function __construct($iscsi_storage_controller) {
-		$this->controller = $iscsi_storage_controller;
-		$this->user       = $this->controller->user;
-		$this->html       = $this->controller->response->html;
-		$this->response   = $this->html->response();
-		$this->file       = $this->controller->file;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function action() {
-		$action = $this->html->request()->get($this->controller->actions_name);
-		switch( $action ) {
-			case 'monitor':
-				$this->monitor();
-			break;
-			case 'progress':
-				$this->progress();
-			break;
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Monitor
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function monitor() {
-		$filename     = '/etc/ietd.conf';
-		$lastmodif    = isset($_GET['timestamp']) ? $_GET['timestamp'] : 0;
-		$currentmodif = filemtime($filename);
-		while ($currentmodif <= $lastmodif) // check if the data file has been modified
-		{
-		  usleep(10000); // sleep 10ms to unload the CPU
-		  clearstatcache();
-		  $currentmodif = filemtime($filename);
-		}
-		echo 'changed';
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get progress
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function progress() {
-		$name = basename($this->response->html->request()->get('name'));
-		$file = $this->controller->openqrm->get('basedir').'/plugins/iscsi-storage/web/storage/'.$name;
-		if($this->file->exists($file)) {
-			echo $this->file->get_contents($file);
-		} else {
-			header("HTTP/1.0 404 Not Found");
-		}
-	}
-
-
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.auth.class.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.auth.class.php
deleted file mode 100644
index b066968..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.auth.class.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
- * iSCSI-Storage Auth Volume(s)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class iscsi_storage_auth
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'iscsi_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "iscsi_storage_msg";
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'iscsi_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'iscsi_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->openqrm = $openqrm;
-		$this->user = $openqrm->user();
-		$this->file = $this->openqrm->file();
-		$this->volume = $this->response->html->request()->get('volume');
-		$this->response->params['volume'] = $this->volume;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->auth();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/iscsi-storage-auth.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add(sprintf($this->lang['label'], $this->volume), 'label');
-		// explanation for auth
-		$t->add($this->lang['auth_explanation'], 'auth_explanation');
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Auth
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function auth() {
-		$response = $this->get_response();
-		$export   = $response->html->request()->get('volume');
-		$form     = $response->form;
-		if( $export !== '' ) {
-			if(!$form->get_errors() && $response->submit()) {
-				// set ENV
-				$storage_id = $this->response->html->request()->get('storage_id');
-				$storage    = new storage();
-				$resource   = new resource();
-				$storage->get_instance_by_id($storage_id);
-				$resource->get_instance_by_id($storage->resource_id);
-
-				$errors  = array();
-				$message = array();
-				$auths   = $form->get_request('pass');
-				$statfile = $this->openqrm->get('basedir').'/plugins/iscsi-storage/web/storage/'.$resource->id.'.iscsi.stat';
-
-				$error = '';
-				$command  = $this->openqrm->get('basedir').'/plugins/iscsi-storage/bin/openqrm-iscsi-storage auth';
-				$command .= ' -n '.$export.' -i '.$auths;
-				$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode background';
-				if($this->file->exists($statfile)) {
-					$this->file->remove($statfile);
-				}
-				$resource->send_command($resource->ip, $command);
-				while (!$this->file->exists($statfile)) {
-	  				usleep(10000); // sleep 10ms to unload the CPU
-	  				clearstatcache();
-				}
-				$message[] = sprintf($this->lang['msg_authd'], $export, $auths);
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'auth');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$d['pass']['label']                         = $this->lang['form_pass'];
-		$d['pass']['required']                      = true;
-		$d['pass']['object']['type']                = 'htmlobject_input';
-		$d['pass']['object']['attrib']['name']      = 'pass';
-		$d['pass']['object']['attrib']['type']      = 'password';
-		$d['pass']['object']['attrib']['value']     = '';
-		$d['pass']['object']['attrib']['maxlength'] = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.clone.class.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.clone.class.php
deleted file mode 100644
index c8b59ba..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.clone.class.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-/**
- * iSCSI-Storage Snap Volume(s)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class iscsi_storage_clone
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'iscsi_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "iscsi_storage_msg";
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'iscsi_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'iscsi_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-		$this->user = $openqrm->user();
-		$this->volume = $this->response->html->request()->get('volume');
-		$this->response->params['volume'] = $this->volume;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->duplicate();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 3) {
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&image_id='.$response->image_id
-				);
-			} else {
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/iscsi-storage-clone.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add(sprintf($this->lang['label'], $this->volume), 'label');
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Snap
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function duplicate() {
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-
-			$storage_id = $this->response->html->request()->get('storage_id');
-			$storage    = new storage();
-			$resource   = new resource();
-			$deployment = new deployment();
-			$storage->get_instance_by_id($storage_id);
-			$resource->get_instance_by_id($storage->resource_id);
-			$deployment->get_instance_by_id($storage->type);
-
-			$name        = $form->get_request('name');
-			$command     = $this->openqrm->get('basedir').'/plugins/iscsi-storage/bin/openqrm-iscsi-storage clone';
-			$command    .= ' -n '.$this->volume;
-			$command    .= ' -s '.$name;
-			$command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-			$command	.= ' --openqrm-ui-user '.$this->user->name;
-			$command	.= ' --openqrm-cmd-mode background';
-
-			$statfile = $this->openqrm->get('basedir').'/plugins/iscsi-storage/web/storage/'.$storage->resource_id.'.iscsi.stat';
-			if (file_exists($statfile)) {
-				$lines = explode("\n", file_get_contents($statfile));
-				if(count($lines) >= 1) {
-					foreach($lines as $line) {
-						if($line !== '') {
-							$line = explode('@', $line);
-							$check = $line[2];
-							if($name === $check) {
-								$error = sprintf($this->lang['error_exists'], $name);
-							}
-						}
-					}
-				}
-			}
-			if(isset($error)) {
-				$response->error = $error;
-			} else {
-				$file = $this->openqrm->get('basedir').'/plugins/iscsi-storage/web/storage/'.$resource->id.'.iscsi.'.$name.'.sync_progress';
-				if($this->file->exists($file)) {
-					$this->file->remove($file);
-				}
-				$resource->send_command($resource->ip, $command);
-				while (!$this->file->exists($file)) {
-		  			usleep(10000); // sleep 10ms to unload the CPU
-		  			clearstatcache();
-				}
-
-				$volume_path = '/dev/'.$name.'/1';
-				$orgigin_image = new image();
-				$orgigin_image->get_instance_by_name($this->volume);
-
-				$tables = $this->openqrm->get('table');
-				$image_fields = array();
-				$image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$image_fields['image_name'] = $name;
-				$image_fields['image_type'] = $deployment->type;
-				$image_fields['image_rootfstype'] = 'ext3';
-				$image_fields['image_storageid'] = $storage->id;
-				$image_fields['image_comment'] = "Image Object for volume $name";
-				$image_fields['image_rootdevice'] = $volume_path;
-				$image_fields['image_size'] = $orgigin_image->size;
-				$image = new image();
-				$image->add($image_fields);
-
-				$response->msg = sprintf($this->lang['msg_cloned'], $this->volume, $name);
-				// save image id in response for the wizard
-				$response->image_id = $image_fields["image_id"];
-			}
-
-		}
-		return $response;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'clone');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$d['name']['label']                             = $this->lang['form_name'];
-		$d['name']['required']                          = true;
-		$d['name']['validate']['regex']                 = '/^[a-z0-9._]+$/i';
-		$d['name']['validate']['errormsg']              = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                    = 'htmlobject_input';
-		$d['name']['object']['attrib']['name']          = 'name';
-		$d['name']['object']['attrib']['id']            = 'name';
-		$d['name']['object']['attrib']['type']          = 'text';
-		$d['name']['object']['attrib']['css']           = 'namegen';
-		$d['name']['object']['attrib']['customattribs'] = 'data-prefix="iscsi" data-length="6"';
-		$d['name']['object']['attrib']['value']         = $this->volume.'c';
-		$d['name']['object']['attrib']['maxlength']     = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.controller.class.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.controller.class.php
deleted file mode 100644
index ac0af38..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.controller.class.php
+++ /dev/null
@@ -1,528 +0,0 @@
-<?php
-/**
- * iSCSI-Storage Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class iscsi_storage_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'iscsi_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "iscsi_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'iscsi_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'iscsi_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array (
-		'tab' => 'Select iSCSI-storage',
-		'label' => 'Select iSCSI-storage',
-		'action_edit' => 'edit',
-		'table_name' => 'Name',
-		'table_id' => 'Id',
-		'table_recource' => 'Resource',
-		'table_type' => 'Type',
-		'table_deployment' => 'Deployment',
-		'error_no_storage' => '<b>No storage configured yet!</b><br><br>Please create a iSCSI Storage first!',
-		'new_storage' => 'New Storage',
-		'please_wait' => 'Loading Storage. Please wait ..',
-	), 
-	'edit' => array (
-		'tab' => 'Edit iSCSI-storage',
-		'label' => 'iSCSI Volumes on storage %s',
-		'lang_id' => 'ID',
-		'lang_name' => 'Name',
-		'lang_resource' => 'Resource',
-		'lang_state' => 'State',
-		'lang_vfree' => 'Free',
-		'lang_vsize' => 'Total',
-		'action_add' => 'Add new Volume',
-		'action_refresh' => 'Reload Page',
-		'action_auth' => 'auth',
-		'action_clone' => 'clone',
-		'action_remove' => 'remove',
-		'action_add_image' => 'Add Image',
-		'action_remove_image' => 'Remove Image',
-		'action_clone_in_progress' => 'Synchronisation in progress - Please wait',
-		'action_clone_finished' => 'Syncronisation finished!',
-		'table_name' => 'Name',
-		'table_size' => 'Size',
-		'table_username' => 'Username',
-		'table_password' => 'Password',
-		'error_no_iscsi' => 'Storage %s is not of type iscsi-deployment',
-		'please_wait' => 'Loading Volumes. Please wait ..',
-		'manual_configured' => 'Storage is manually configured and can not be be edited by openQRM',
-	),
-	'add' => array (
-		'tab' => 'Add iSCSI Volume',
-		'label' => 'Add new Volume',
-		'form_name' => 'Name',
-		'form_size' => 'Size (max. %s)',
-		'msg_added' => 'Added Volume %s',
-		'msg_add_failed' => 'Failed to add Volume %s',
-		'error_exists' => 'Volume %s allready exists',
-		'error_name' => 'Name must be %s',
-		'error_size' => 'Size must be %s',
-		'error_size_exeeded' => 'Size exeeds %s',
-		'please_wait' => 'Adding Volume. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'image' => array (
-		'label' => 'Add/Remove Image for Volume %s',
-		'tab' => 'Add/Remove Image',
-		'error_exists' => 'Image %s allready exists',
-		'error_image_still_in_use' => 'Image id %s is still in use by Server(s) %s',
-		'msg_added_image' => 'Added Image %s',
-		'msg_removed_image' => 'Removed Image id %s',
-		'please_wait' => 'Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'clone' => array (
-		'tab' => 'Clone iSCSI Volume',
-		'label' => 'Clone Volume %s',
-		'msg_cloned' => 'Cloned %s as %s',
-		'msg_clone_failed' => 'Failed to clone Volume %s',
-		'form_name' => 'Name',
-		'error_exists' => 'Volume %s allready exists',
-		'error_name' => 'Name must be %s',
-		'please_wait' => 'Cloning Volume(s). Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'remove' => array (
-		'label' => 'Remove Volume(s)',
-		'msg_removed' => 'Removed Volume %s',
-		'msg_image_still_in_use' => 'Volume %s of Image id %s is still in use by appliance(s) %s',
-		'please_wait' => 'Removing Volume(s). Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'auth' => array (
-		'tab' => 'Authenticate Volume',
-		'label' => 'Authenticate Volume %s',
-		'form_pass' => 'Password',
-		'msg_authd' => 'Authenticated volume %s to %s',
-		'auth_explanation' => 'Please notice: Volumes which are deployed as an Image via an Appliance are authenticated automatically!',
-		'please_wait' => 'Authenticating Volume(s). Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/iscsi-storage/lang", 'iscsi-storage.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/iscsi-storage/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "edit";
-		}
-		if($this->action !== 'select') {
-			$this->response->params['storage_id'] = $this->response->html->request()->get('storage_id');
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'edit':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-			break;
-			case 'reload':
-				$this->action = 'edit';
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-				$this->reload();
-			break;
-			case 'add':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->add(true);
-			break;
-			case 'image':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->image(true);
-			break;
-			case 'remove':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->remove(true);
-			break;
-			case 'clone':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->duplicate(true);
-			break;
-			case $this->lang['edit']['action_auth']:
-			case 'auth':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->auth(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->rootdir.'/plugins/iscsi-storage/class/iscsi-storage.api.class.php');
-		$controller = new iscsi_storage_api($this);
-		$controller->action();
-	}
-
-	
-	//--------------------------------------------
-	/**
-	 * Select Storages of type iscsi
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/iscsi-storage/class/iscsi-storage.select.class.php');
-			$controller = new iscsi_storage_select($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Edit iscsi-storage
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function edit( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			if($this->reload()) {
-				require_once($this->rootdir.'/plugins/iscsi-storage/class/iscsi-storage.edit.class.php');
-				$controller                  = new iscsi_storage_edit($this->openqrm, $this->response);
-				$controller->actions_name    = $this->actions_name;
-				$controller->tpldir          = $this->tpldir;
-				$controller->message_param   = $this->message_param;
-				$controller->identifier_name = $this->identifier_name;
-				$controller->prefix_tab      = $this->prefix_tab;
-				$controller->lang            = $this->lang['edit'];
-				$data = $controller->action();
-			}
-		}
-		$content['label']   = $this->lang['edit']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'edit' );
-		$content['onclick'] = false;
-		if($this->action === 'edit'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Add new Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function add( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/iscsi-storage/class/iscsi-storage.add.class.php');
-			$controller                = new iscsi_storage_add($this->openqrm, $this->response, $this);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['add'];
-			$controller->rootdir       = $this->rootdir;
-			$controller->prefix_tab    = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['add']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'add' );
-		$content['onclick'] = false;
-		if($this->action === 'add'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add/Remvoe Image object
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function image( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/iscsi-storage/class/iscsi-storage.image.class.php');
-			$controller                  = new iscsi_storage_image($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['image'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['image']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'image' );
-		$content['onclick'] = false;
-		if($this->action === 'image'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Remove Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function remove( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/iscsi-storage/class/iscsi-storage.remove.class.php');
-			$controller                  = new iscsi_storage_remove($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['remove'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Remove';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'remove' );
-		$content['onclick'] = false;
-		if($this->action === 'remove' || $this->action === $this->lang['edit']['action_remove']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Clone Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function duplicate( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/iscsi-storage/class/iscsi-storage.clone.class.php');
-			$controller                  = new iscsi_storage_clone($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['clone'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['clone']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'clone' );
-		$content['onclick'] = false;
-		if($this->action === 'clone' || $this->action === $this->lang['edit']['action_clone']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Auth Volume
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function auth( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/iscsi-storage/class/iscsi-storage.auth.class.php');
-			$controller                  = new iscsi_storage_auth($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['auth'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['auth']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'auth' );
-		$content['onclick'] = false;
-		if($this->action === 'auth' || $this->action === $this->lang['edit']['action_auth']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Reload Exports
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function reload() {
-		$OPENQRM_SERVER_BASE_DIR = $this->openqrm->get('basedir');
-		$command  = $OPENQRM_SERVER_BASE_DIR."/plugins/iscsi-storage/bin/openqrm-iscsi-storage post_luns";
-		$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-		$command .= ' --openqrm-ui-user '.$this->user->name;
-		$command .= ' --openqrm-cmd-mode background';
-		$storage_id = $this->response->html->request()->get('storage_id');
-		$storage = new storage();
-		$storage->get_instance_by_id($storage_id);
-		$resource = new resource();
-		$resource->get_instance_by_id($storage->resource_id);
-		$file = $this->openqrm->get('basedir').'/plugins/iscsi-storage/web/storage/'.$resource->id.'.iscsi.stat';
-		if($this->file->exists($file)) {
-			$this->file->remove($file);
-		}
-		$resource->send_command($resource->ip, $command);
-		while (!$this->file->exists($file))
-		{
-		  usleep(10000); // sleep 10ms to unload the CPU
-		  clearstatcache();
-		}
-		return true;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.edit.class.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.edit.class.php
deleted file mode 100644
index 93a9556..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.edit.class.php
+++ /dev/null
@@ -1,329 +0,0 @@
-<?php
-/**
- * iSCSI-Storage Edit Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class iscsi_storage_edit
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'iscsi_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "iscsi_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'iscsi_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'iscsi_identifier';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Init
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function init() {
-		$storage_id = $this->response->html->request()->get('storage_id');
-		if($storage_id === '') {
-			return false;
-		}
-		// set ENV
-		$deployment = new deployment();
-		$storage    = new storage();
-		$resource   = new resource();
-
-		$storage->get_instance_by_id($storage_id);
-		$resource->get_instance_by_id($storage->resource_id);
-		$deployment->get_instance_by_id($storage->type);
-
-		$this->resource   = $resource;
-		$this->storage    = $storage;
-		$this->deployment = $deployment;
-
-		$this->statfile = $this->openqrm->get('basedir').'/plugins/iscsi-storage/web/storage/'.$resource->id.'.iscsi.stat';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$this->init();
-		$data = $this->edit();
-		if($data !== false) {
-			$t = $this->response->html->template($this->tpldir.'/iscsi-storage-edit.tpl.php');
-			$t->add($this->response->html->thisfile, "thisfile");
-			$t->add($data);
-			$t->add($this->lang['lang_id'], 'lang_id');
-			$t->add($this->lang['lang_name'], 'lang_name');
-			$t->add($this->lang['lang_resource'], 'lang_resource');
-			$t->add($this->lang['lang_state'], 'lang_state');
-			$t->add($this->lang['lang_vfree'], 'lang_vfree');
-			$t->add($this->lang['lang_vsize'], 'lang_vsize');
-			$t->add(sprintf($this->lang['label'], $data['name']), 'label');
-			$t->add($this->openqrm->get('baseurl'), 'baseurl');
-			return $t;
-		} else {
-			$msg = sprintf($this->lang['error_no_iscsi'], $this->response->html->request()->get('storage_id'));
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $msg)
-			);
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return array|false
-	 */
-	//--------------------------------------------
-	function edit() {
-
-
-		if($this->deployment->type === 'iscsi-deployment') {
-			$resource_icon_default="/img/resource.png";
-			$storage_icon="/plugins/iscsi-storage/img/plugin.png";
-			$state_icon = $this->openqrm->get('baseurl')."/img/".$this->resource->state.".png";
-			if ($this->file->exists($this->openqrm->get('webdir').$storage_icon)) {
-				$resource_icon_default=$storage_icon;
-			}
-			$resource_icon_default = $this->openqrm->get('baseurl').$resource_icon_default;
-
-			$d['state'] = "<img width=24 height=24 src=$state_icon>";
-			$d['icon'] = "<img width=24 height=24 src=$resource_icon_default>";
-			$d['resource'] = $this->resource->id.' / '.$this->resource->ip;
-			$d['name'] = $this->storage->name;
-			$d['id'] = $this->storage->id;
-
-			$a = $this->response->html->a();
-			$a->label = $this->lang['action_add'];
-			$a->css   = 'add';
-			$a->handler = 'onclick="wait();"';
-			$a->href  = $this->response->get_url($this->actions_name, "add");
-			$d['add'] = $a->get_string();
-
-			$body = array();
-			$identifier_disabled = array();
-			$file = $this->statfile;
-			if(file_exists($file)) {
-				$lines = explode("\n", file_get_contents($file));
-				if(count($lines) >= 1) {
-					$i = 0;
-					$t = $this->response->html->template($this->openqrm->get('webdir').'/js/openqrm-progressbar.js');
-					foreach($lines as $line) {
-						if($line !== '') {
-							$line = explode('@', $line);
-							if($i === 0) {
-								$d['vsize'] = number_format($line[0], 0, '', '').' MB';
-								$d['vfree'] = number_format($line[1], 0, '', '').' MB';
-							} else {
-								$name = $line[2];
-								$volume_size = $line[5];
-								$auth_link = '&#160;';
-								$clone_link = '&#160;';
-								// create/remove image object, check if image exists
-								$image_add_remove = '';
-								$deployment_type = '';
-								$image = new image();
-								$image->get_instance_by_name($name);
-								if (strlen($image->id)) {
-									if( $image->type == $this->deployment->type ) {
-										if( $line[0] === $this->deployment->type ) {
-											if($d['vfree'] !== '0 MB' ) {
-												$a = $this->response->html->a();
-												$a->title   = $this->lang['action_clone'];
-												$a->label   = $this->lang['action_clone'];
-												$a->handler = 'onclick="wait();"';
-												$a->css     = 'clone';
-												$a->href    = $this->response->get_url($this->actions_name, "clone").'&volume='.$name;
-												$clone_link = $a->get_string();
-											}
-											$a = $this->response->html->a();
-											$a->title   = $this->lang['action_auth'];
-											$a->label   = $this->lang['action_auth'];
-											$a->handler = 'onclick="wait();"';
-											$a->css     = 'edit';
-											$a->href    = $this->response->get_url($this->actions_name, "auth").'&volume='.$name;
-											$auth_link = $a->get_string();
-										} else {
-											$identifier_disabled[] = $name;
-										}
-									}
-								}
-
-								// create/remove image object, check if image exists
-								$deployment_type = $this->deployment->type;
-								if (strlen($image->id)) {
-									if( $image->type != $this->deployment->type ) {
-										$deployment_type = $image->type;
-										$identifier_disabled[] = $name;
-									} else {
-										$i = $this->response->html->a();
-										$i->title   = $this->lang['action_remove_image'];
-										$i->label   = $this->lang['action_remove_image'];
-										$i->handler = 'onclick="wait();"';
-										$i->css     = 'edit';
-										$i->href    = $this->response->get_url($this->actions_name, "image").'&image_id='.$image->id.'&image_command=remove';
-										$image_add_remove = $i;
-									}
-								} else {
-									$i = $this->response->html->a();
-									$i->title   = $this->lang['action_add_image'];
-									$i->label   = $this->lang['action_add_image'];
-									$i->handler = 'onclick="wait();"';
-									$i->css     = 'edit';
-									if($this->deployment->type === 'iscsi-deployment') {
-										$image_root_device = '/dev/'.$name.'/1';
-										$i->href    = $this->response->get_url($this->actions_name, "image").'&root_device='.$image_root_device.'&image_name='.$name.'&image_command=add';
-									}
-									$identifier_disabled[] = $name;
-									$image_add_remove = $i;
-								}
-								if ($volume_size == "clone_in_progress") {
-									// add to disabled identifier
-									$identifier_disabled[] = $name;
-									$auth_link = "&#160;";
-									$clone_link = "&#160;";
-									$image_add_remove = "&#160;";
-									// progressbar
-									$t->add(uniqid('b'), 'id');
-									$t->add($this->openqrm->get('baseurl').'/api.php?action=plugin&plugin=iscsi-storage&iscsi_storage_action=progress&name='.$this->resource->id.'.iscsi.'.$name.'.sync_progress', 'url');
-									$t->add($this->lang['action_clone_in_progress'], 'lang_in_progress');
-									$t->add($this->lang['action_clone_finished'], 'lang_finished');
-									$volume_size = $t->get_string();
-
-								} else {
-									if (is_numeric($volume_size)) {
-										$volume_size = number_format($line[5], 0, '', '').' MB';
-									} else {
-										$volume_size = '';
-									}
-								}
-								$body[] = array(
-									'icon' => $d['icon'],
-									'name'   => $name,
-									'username'   => $line[3],
-									'password'   => $line[4],
-									'size' => $volume_size,
-									'image' => $image_add_remove,
-									'auth' => $auth_link,
-									'clone' => $clone_link,
-								);
-							}
-						}
-						$i++;
-					}
-				}
-			}
-
-			$h['icon'] = array();
-			$h['icon']['title'] = '&#160;';
-			$h['icon']['sortable'] = false;
-			$h['name'] = array();
-			$h['name']['title'] = $this->lang['table_name'];
-			$h['username'] = array();
-			$h['username']['title'] = $this->lang['table_username'];
-			$h['password'] = array();
-			$h['password']['title'] = $this->lang['table_password'];
-			$h['size'] = array();
-			$h['size']['title'] = $this->lang['table_size'];
-			$h['image'] = array();
-			$h['image']['title'] = '&#160;';
-			$h['image']['sortable'] = false;
-			$h['auth'] = array();
-			$h['auth']['title'] = '&#160;';
-			$h['auth']['sortable'] = false;
-			$h['clone']['title'] = '&#160;';
-			$h['clone']['sortable'] = false;
-
-			$table = $this->response->html->tablebuilder('iscsi_edit', $this->response->get_array($this->actions_name, 'edit'));
-			$table->sort            = 'name';
-			$table->limit           = 10;
-			$table->offset          = 0;
-			$table->order           = 'ASC';
-			$table->max             = count($body);
-			$table->autosort        = true;
-			$table->sort_link       = false;
-			$table->id              = 'Tabelle';
-			$table->css             = 'htmlobject_table';
-			$table->border          = 1;
-			$table->cellspacing     = 0;
-			$table->cellpadding     = 3;
-			$table->form_action	    = $this->response->html->thisfile;
-			$table->head            = $h;
-			$table->body            = $body;
-			$table->identifier      = 'name';
-			$table->identifier_name = $this->identifier_name;
-			$table->identifier_disabled = $identifier_disabled;
-			$table->actions_name    = $this->actions_name;
-			$table->actions         = array(array('remove' => $this->lang['action_remove']));
-
-			$d['table'] = $table->get_string();
-			return $d;
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.image.class.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.image.class.php
deleted file mode 100644
index 805ff8f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.image.class.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/**
- * ISCSI-Storage add/remove Images
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class iscsi_storage_image
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'iscsi_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "iscsi_storage_msg";
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'iscsi_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'iscsi_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-		$this->openqrm    = $openqrm;
-		$this->user       = $openqrm->user();
-		$storage_id       = $this->response->html->request()->get('storage_id');
-		$storage          = new storage();
-		$resource         = new resource();
-		$deployment       = new deployment();
-		$this->storage    = $storage->get_instance_by_id($storage_id);
-		$this->resource   = $resource->get_instance_by_id($storage->resource_id);
-		$this->deployment = $deployment->get_instance_by_id($storage->type);
-		$this->response->add('storage_id', $storage_id);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->image();
-		$this->response->params['reload'] = 'false';
-		$this->response->redirect(
-			$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response)
-		);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add/Remove image object
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function image() {
-		$response = '';
-		$errors       = array();
-		$message      = array();
-		$image_command = $this->response->html->request()->get('image_command');
-
-		if( $image_command !== '' ) {
-			switch ($image_command) {
-				case 'add':
-					$root_device = $this->response->html->request()->get('root_device');
-					$image_name = $this->response->html->request()->get('image_name');
-					// check if image name is not in use yet
-					$image = new image();
-					$image->get_instance_by_name($image_name);
-					if (strlen($image->id)) {
-						$errors[] = sprintf($this->lang['error_exists'], $image_name);
-					} else {
-						$ident_file = $this->openqrm->get('basedir').'/plugins/iscsi-storage/web/storage/'.$this->resource->id.'.iscsi.'.$image_name.'.adapt';
-						$get_ident_command  = $this->openqrm->get('basedir').'/plugins/iscsi-storage/bin/openqrm-iscsi-storage adapt';
-						$get_ident_command    .= ' -n '.$image_name;
-						$get_ident_command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-						$get_ident_command    .= ' --openqrm-ui-user '.$this->user->name;
-						$get_ident_command    .= ' --openqrm-cmd-mode background';
-						if(file_exists($ident_file)) {
-							unlink($ident_file);
-						}
-						$this->resource->send_command($this->resource->ip, $get_ident_command);
-						while (!file_exists($ident_file)) {
-							usleep(10000); // sleep 10ms to unload the CPU
-							clearstatcache();
-						}
-						unlink($ident_file);
-						$tables = $this->openqrm->get('table');
-						$image_fields = array();
-						$image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-						$image_fields['image_name'] = $image_name;
-						$image_fields['image_type'] = $this->deployment->type;
-						$image_fields['image_rootfstype'] = 'ext3';
-						$image_fields['image_storageid'] = $this->storage->id;
-						$image_fields['image_comment'] = "Image Object for volume $image_name";
-						$image_fields['image_rootdevice'] = $root_device;
-						$image = new image();
-						$image->add($image_fields);
-						$message[] = sprintf($this->lang['msg_added_image'], $image_name);
-					}
-					break;
-
-				case 'remove':
-					$image_id = $this->response->html->request()->get('image_id');
-					// check if image is not in use any more before removing
-					$remove_error = 0;
-					$appliance = new appliance();
-					$appliance_id_list = $appliance->get_all_ids();
-					foreach($appliance_id_list as $appliance_list) {
-						$appliance_id = $appliance_list['appliance_id'];
-						$app_image_remove_check = new appliance();
-						$app_image_remove_check->get_instance_by_id($appliance_id);
-						if ($app_image_remove_check->imageid == $image_id) {
-							$image_is_used_by_appliance .= $appliance_id." ";
-							$remove_error = 1;
-						}
-					}
-					if ($remove_error == 1) {
-						$errors[] = sprintf($this->lang['error_image_still_in_use'], $image_id, $image_is_used_by_appliance);
-					} else {
-						$image_remove = new image();
-						$image_remove->remove($image_id);
-						$message[] = sprintf($this->lang['msg_removed_image'], $image_id);
-					}
-					break;
-			}
-			if(count($errors) === 0) {
-				$response = join('<br>', $message);
-			} else {
-				$msg = array_merge($errors, $message);
-				$response = join('<br>', $msg);
-			}
-		} else {
-			$response = '';
-		}
-		return $response;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.remove.class.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.remove.class.php
deleted file mode 100644
index 3b08f1e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.remove.class.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/**
- * iSCSI-Storage Remove Volume(s)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class iscsi_storage_remove
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'iscsi_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "iscsi_storage_msg";
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'iscsi_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'iscsi_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->user = $openqrm->user();
-		$this->file = $this->openqrm->file();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->remove();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/iscsi-storage-remove.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function remove() {
-		$response = $this->get_response();
-		$exports  = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		if( $exports !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($exports as $ex) {
-				$d['param_f'.$i]['label']                       = $ex;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $ex;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;		
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$storage_id = $this->response->html->request()->get('storage_id');
-				$name       = $this->openqrm->admin()->name;
-				$pass       = $this->openqrm->admin()->password;
-				$storage    = new storage();
-				$resource   = new resource();
-				$errors     = array();
-				$message    = array();
-				foreach($exports as $key => $export) {
-					// check if an appliance is still using the volume as an image
-					$image = new image();
-					$image->get_instance_by_name($export);
-
-					// check if it is still in use
-					$appliance = new appliance();
-					$appliances_using_resource = $appliance->get_ids_per_image($image->id);
-					if (count($appliances_using_resource) > 0) {
-						$appliances_using_resource_str = implode(",", $appliances_using_resource[0]);
-						$errors[] = sprintf($this->lang['msg_image_still_in_use'], $export, $image->id, $appliances_using_resource_str);
-					} else {
-						$storage->get_instance_by_id($storage_id);
-						$resource->get_instance_by_id($storage->resource_id);
-						$command  = $this->openqrm->get('basedir').'/plugins/iscsi-storage/bin/openqrm-iscsi-storage remove -n '.$export;
-						$command .= ' -u '.$name.' -p '.$pass;
-						$command .= ' --openqrm-ui-user '.$this->user->name;
-						$command .= ' --openqrm-cmd-mode background';
-
-						$file = $this->openqrm->get('basedir').'/plugins/iscsi-storage/web/storage/'.$resource->id.'.iscsi.stat';
-						if($this->file->exists($file)) {
-							$this->file->remove($file);
-						}
-						$resource->send_command($resource->ip, $command);
-						while (!$this->file->exists($file)) {
-							usleep(10000); // sleep 10ms to unload the CPU
-							clearstatcache();
-						}
-
-						#$error = $resource->send_command($resource->ip, $command);
-						#if($error !== '' ) {
-						#	$errors[] = $error;
-						#} else {
-						$form->remove($this->identifier_name.'['.$key.']');
-						$message[] = sprintf($this->lang['msg_removed'], $export);
-						#}
-						// remove the image of the volume
-						$image->remove_by_name($export);
-					}
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'remove');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.select.class.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.select.class.php
deleted file mode 100644
index 299743a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/class/iscsi-storage.select.class.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-/**
- * iSCSI-Storage Select Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class iscsi_storage_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'iscsi_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "iscsi_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'iscsi_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'iscsi_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$table = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/iscsi-storage-select.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($table, 'table');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return htmlobject_tablebulider | htmlobject_div
-	 */
-	//--------------------------------------------
-	function select() {
-		// set ENV
-		$deployment = new deployment();
-		$storage    = new storage();
-		$resource   = new resource();
-
-		$deployment->get_instance_by_type("iscsi-deployment");
-		$table = $this->response->html->tablebuilder('iscsi', $this->response->get_array($this->actions_name, 'select'));
-		$table->sort      = 'storage_id';
-		$table->limit     = 10;
-		$table->offset    = 0;
-		$table->order     = 'ASC';
-		$table->max       = $storage->get_count_per_type($deployment->id);
-		$table->autosort  = false;
-		$table->sort_link = false;
-		$table->init();
-		$storages = $storage->display_overview_per_type($deployment->id, $table->offset, $table->limit, $table->sort, $table->order);
-
-		if(count($storages) >= 1) {
-			foreach($storages as $k => $v) {
-				$storage->get_instance_by_id($v["storage_id"]);
-				$resource->get_instance_by_id($storage->resource_id);
-				$deployment->get_instance_by_id($storage->type);
-				$resource_icon_default="/img/resource.png";
-				$storage_icon="/plugins/iscsi-storage/img/plugin.png";
-				$state_icon = '<span class="pill">'.$resource->state.'</span>';
-				
-				if ($this->file->exists($this->openqrm->get('webdir').$storage_icon)) {
-					$resource_icon_default=$storage_icon;
-				}
-				$resource_icon_default = $this->openqrm->get('baseurl').$resource_icon_default;
-
-				$a = $this->response->html->a();
-				$a->title   = $this->lang['action_edit'];
-				$a->label   = $this->lang['action_edit'];
-				$a->handler = 'onclick="wait();"';
-				$a->css     = 'edit';
-				$a->href    = $this->response->get_url($this->actions_name, "edit").'&storage_id='.$storage->id;
-
-				$data  = '<strong>'.$this->lang['table_recource'].':</strong> '.$resource->id.' / '.$resource->ip.'<br>';
-				$data .= '<strong>'.$this->lang['table_type'].':</strong> <span class="pill">'.$deployment->type.'</span><br>';
-				$data .= '<strong>'.$this->lang['table_deployment'].':</strong> '.$deployment->storagedescription.'<br>';
-
-				$b[] = array(
-					'state' => $state_icon,
-//					'icon' => '<img width="24" height="24" src="'.$resource_icon_default.'" alt="Icon">',
-					'storage_id' => $storage->id,
-					'storage_name' => $storage->name,
-					'storage_resource_id' => $storage->resource_id,
-					'storage_data' => $data,
-					'storage_comment' => '',
-					'storage_edit' => $a->get_string(),
-				);
-			}
-
-			$h = array();
-			$h['state'] = array();
-			$h['state']['title'] ='&#160;';
-			$h['state']['sortable'] = false;
-/*
-			$h['icon'] = array();
-			$h['icon']['title'] ='&#160;';
-			$h['icon']['sortable'] = false;
-*/
-			$h['storage_id'] = array();
-			$h['storage_id']['title'] = $this->lang['table_id'];
-			$h['storage_name'] = array();
-			$h['storage_name']['title'] = $this->lang['table_name'];
-			$h['storage_resource_id'] = array();
-			$h['storage_resource_id']['title'] = $this->lang['table_recource'];
-			$h['storage_resource_id']['hidden'] = true;
-			$h['storage_data'] = array();
-			$h['storage_data']['title'] = '&#160;';
-			$h['storage_data']['sortable'] = false;
-			$h['storage_comment'] = array();
-			$h['storage_comment']['title'] ='&#160;';
-			$h['storage_comment']['sortable'] = false;
-			$h['storage_edit'] = array();
-			$h['storage_edit']['title'] = '&#160;';
-			$h['storage_edit']['sortable'] = false;
-
-			$table->id = 'Tabelle';
-			$table->css = 'htmlobject_table';
-			$table->border = 1;
-			$table->cellspacing = 0;
-			$table->cellpadding = 3;
-			$table->form_action	= $this->response->html->thisfile;
-			$table->head = $h;
-			$table->body = $b;
-			$table->limit_select = array(
-				array("value" => 10, "text" => 10),
-				array("value" => 20, "text" => 20),
-				array("value" => 30, "text" => 30),
-				array("value" => 40, "text" => 40),
-				array("value" => 50, "text" => 50),
-			);
-			return $table->get_string();
-		} else {
-			$a = $this->response->html->a();
-			$a->title   = $this->lang['new_storage'];
-			$a->label   = $this->lang['new_storage'];
-			$a->handler = 'onclick="wait();"';
-			$a->css     = 'add';
-			$a->href    = $this->response->html->thisfile.'?base=storage&storage_action=add';
-
-			$box = $this->response->html->div();
-			$box->id = 'Tabelle';
-			$box->css = 'htmlobject_box';
-			$content  = $this->lang['error_no_storage'].'<br><br>';
-			$content .= $a->get_string();
-			$box->add($content);
-			return $box->get_string();
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/css/iscsi-storage.css b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/css/iscsi-storage.css
deleted file mode 100644
index e69de29..0000000
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/image.iscsi-deployment.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/image.iscsi-deployment.php
deleted file mode 100644
index f2e913c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/image.iscsi-deployment.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-
-// global event for logging
-$event = new event();
-global $event;
-
-
-function iscsi_deployment_wait_for_identfile($sfile) {
-	$refresh_delay=1;
-	$refresh_loop_max=20;
-	$refresh_loop=0;
-	while (!file_exists($sfile)) {
-		sleep($refresh_delay);
-		$refresh_loop++;
-		flush();
-		if ($refresh_loop > $refresh_loop_max)  {
-			return false;
-		}
-	}
-	return true;
-}
-
-
-function get_iscsi_deployment_image_rootdevice_identifier($iscsi_storage_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_ADMIN;
-	global $event;
-
-	// place for the storage stat files
-	$StorageDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/iscsi-storage/storage';
-	$rootdevice_identifier_array = array();
-	$storage = new storage();
-	$storage->get_instance_by_id($iscsi_storage_id);
-	$storage_resource = new resource();
-	$storage_resource->get_instance_by_id($storage->resource_id);
-	$storage_resource_id = $storage_resource->id;
-	$ident_file = "$StorageDir/$storage_resource_id.iscsi.ident";
-	if (file_exists($ident_file)) {
-		unlink($ident_file);
-	}
-	// send command
-	$resource_command=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/iscsi-storage/bin/openqrm-iscsi-storage post_identifier -u ".$OPENQRM_ADMIN->name." -p ".$OPENQRM_ADMIN->password." --openqrm-cmd-mode background";
-	$storage_resource->send_command($storage_resource->ip, $resource_command);
-	if (!iscsi_deployment_wait_for_identfile($ident_file)) {
-		$event->log("get_image_rootdevice_identifier", $_SERVER['REQUEST_TIME'], 2, "image.iscsi-deployment", "Timeout while requesting image identifier from storage id $storage->id", "", "", 0, 0, 0);
-		return;
-	}
-	$fcontent = file($ident_file);
-	foreach($fcontent as $lun_info) {
-		$tpos = strpos($lun_info, ",");
-		$timage_name = trim(substr($lun_info, 0, $tpos));
-		$troot_device = trim(substr($lun_info, $tpos+1));
-		$rootdevice_identifier_array[] = array("value" => "$troot_device", "label" => "$timage_name");
-	}
-	return $rootdevice_identifier_array;
-
-}
-
-function get_iscsi_deployment_image_default_rootfs() {
-	return "ext3";
-}
-
-function get_iscsi_deployment_rootfs_transfer_methods() {
-	return true;
-}
-
-function get_iscsi_deployment_rootfs_set_password_method() {
-	return true;
-}
-
-function get_iscsi_deployment_is_network_deployment() {
-	return true;
-}
-
-function get_iscsi_deployment_local_deployment_enabled() {
-	return false;
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/img/plugin.png
deleted file mode 100644
index bdd9f5e..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/iscsi-storage-action.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/iscsi-storage-action.php
deleted file mode 100644
index ffb7cee..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/iscsi-storage-action.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/authblocker.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-// filter inputs
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-global $IMAGE_INFO_TABLE;
-global $DEPLOYMENT_INFO_TABLE;
-global $OPENQRM_SERVER_BASE_DIR;
-
-$iscsi_storage_command = $request->get('iscsi_storage_command');
-$iscsi_image_name = $request->get('iscsi_image_name');
-
-// place for the storage stat files
-$StorageDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/iscsi-storage/storage';
-// global event for logging
-$event = new event();
-
-// user/role authentication
-if ($OPENQRM_USER->role != "administrator") {
-	$event->log("authorization", $_SERVER['REQUEST_TIME'], 1, "iscsi-action", "Un-Authorized access to iscsi-actions from $OPENQRM_USER->name", "", "", 0, 0, 0);
-	exit();
-}
-
-
-$event->log("$iscsi_storage_command", $_SERVER['REQUEST_TIME'], 5, "iscsi-storage-action", "Processing iscsi-storage command $iscsi_storage_command", "", "", 0, 0, 0);
-switch ($iscsi_storage_command) {
-	case 'get_storage':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	case 'get_ident':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	case 'get_sync_progress':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	case 'get_sync_finished':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		sleep(5);
-		unlink($filename);
-		break;
-
-	case 'auth_finished':
-		// remove storage-auth-blocker if existing
-		$authblocker = new authblocker();
-		$authblocker->get_instance_by_image_name($iscsi_image_name);
-		if (strlen($authblocker->id)) {
-			$event->log('auth_finished', $_SERVER['REQUEST_TIME'], 5, "iscsi-storage-action", "Removing authblocker for image $iscsi_image_name", "", "", 0, 0, 0);
-			$authblocker->remove($authblocker->id);
-		}
-		break;
-
-	default:
-		$event->log("$iscsi_storage_command", $_SERVER['REQUEST_TIME'], 3, "iscsi-storage-action", "No such iscsi-storage command ($iscsi_storage_command)", "", "", 0, 0, 0);
-		break;
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/lang/de.iscsi-storage-about.ini b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/lang/de.iscsi-storage-about.ini
deleted file mode 100644
index f3e56b7..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/lang/de.iscsi-storage-about.ini
+++ /dev/null
@@ -1,66 +0,0 @@
-[documentation]
-tab = "Über iSCSI-Storage"
-label = "Über iSCSI-Storage"
-introduction_title = "Einleitung"
-introduction_content = "Das 'iSCSI-Storage' Plugin verwaltet iSCSI Target Server."
-requirements_title = "Anforderungen"
-requirements_list = "Eine 'Resource' für die iSCSI-Storage Storage<br>(dies kann ein System sein das mittels des "local-server" Plugin in openQRM eingebunden ist oder der openQRM Server selber)"
-
-tested_title = "Testet mit"
-tested_content = "Diese Plugin ist getestet mit Debian, Ubuntu und CentOS Linux Distributionen"
-
-provides_title = "Bietet"
-provides_list = "<ul><li>Storage Typen: 'iSCSI Enterprise Target Storage'</li>
-				   <li>Deployment types: 'iSCSI-deployment'</li></ul>"
-type_title = "Plugin Typ"
-type_content = "Storage"
-
-deployment_title = "Deployment Typ"
-deployment_content = "Netzwerk-Deployment"
-
-documentation_title = "Dokumentation"
-use_case_title = "Anwendungsfall"
-network_deploymet = "Netzwerk-Deployment"
-doc1 = ""
-
-
-[bootservice]
-tab = "Boot-Service"
-label = "iSCSI-Storage Boot-Service"
-boot_service_title = "iSCSI-Storage Boot-Service"
-boot_service_content = "Das iSCSI-Storage Plugin beinhaltet einen openQRM Boot-Service.
-			Dieser 'iSCSI-Storage Boot-Service' wird automatisch von allen in openQRM integrierten Systeme heruntergeladen und ausgeführt.
-			Der Boot-Service befindet sich unter:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/iscsi-storage/web/boot-service-iscsi-storage.tgz</b></i>
-			<br>
-			<br>
-			Der 'iSCSI-Storage Boot-Service' beinhaltet die 'Client' Dateien des iSCSI-Storage Plugin.<br>
-			Eine Konfigurationsdatei für den iSCSI-Storage Server ist ebenfalls enhalten.<br>
-			<br>
-			Die Boot-Service konfiguration wird mittels des 'openqrm' Kommandozeilenwerkzeugs verwaltet.<br>
-			Der folgende Befehl zeigt die die momentane 'default' Boot-Service Konfiguration an:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n iscsi-storage -a default</b></i>
-			<br>
-			<br>
-			Die Boot-Service Konfiguration eines speziellen Server zeigt der folgende Befehl an:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n iscsi-storage -a [Server-name]</b></i>
-			<br>
-			<br>
-			Der folgende Befehl passt einen Konfigurationparameter des 'default' Boot-Service an:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n iscsi-storage -a default -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			Die Boot-Service Konfigurarationsparameter eines speziellen Server passt der folgende Befehl an:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n iscsi-storage -a [Server-name] -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			Im Falle das der openmQRM Server selber als iSCSI-Storage genutzt wird werden die Konfigurationsparameter in der folgenden Datei manuell angeepasst:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/iscsi-storage/etc/openqrm-plugin-iscsi-storage.conf</b></i>
-			<br><br>"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/lang/de.iscsi-storage.ini b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/lang/de.iscsi-storage.ini
deleted file mode 100644
index 115b47a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/lang/de.iscsi-storage.ini
+++ /dev/null
@@ -1,85 +0,0 @@
-[select]
-tab = "iSCSI-storage auswählen"
-label = "iSCSI-storage auswählen"
-action_edit = "bearbeiten"
-table_name = "Name"
-table_id = "Id"
-table_recource = "Resource"
-table_type = "Type"
-table_deployment = "Deployment"
-error_no_storage = "<b>Keine Storage angelegt!</b><br><br>Bitte legen Sie erst eine iSCSI Storage an!"
-new_storage = "Neue Storage"
-please_wait = "Lade Storage. Bitte warten .."
-[edit]
-tab = "iSCSI-storage bearbeiten"
-label = "iSCSI Volumes auf Storage %s"
-lang_id = "ID"
-lang_name = "Name"
-lang_resource = "Resource"
-lang_state = "Status"
-lang_vfree = "Frei"
-lang_vsize = "Gesamt"
-action_add = "Neues Volume anlegen"
-action_refresh = "Reload Page"
-action_remove = "löschen"
-action_auth = "auth"
-action_clone = "klonen"
-action_add_image = "Image hinzufügen"
-action_remove_image = "Image entfernen"
-action_clone_in_progress = "Syncronisation in Bearbeitung - Bitte warten"
-action_clone_finished = "Syncronisation beendet!"
-table_name = "Name"
-table_size = "Grösse"
-table_username = "Benutzer"
-table_password = "Passwort"
-error_no_iscsi = "Storage %s ist nicht vom nfs-deployment"
-please_wait = "Lade Volumes. Bitte warten .."
-manual_configured = "Storage ist manuell konfiguriert und kann nicht von openQRM verwaltet werden!"
-[add]
-tab = "Neues iSCSI Volume"
-label = "Neues iSCSI Volume anlegen"
-form_name = "Name"
-form_size = "Size"
-msg_added = "Volume %s angelegt"
-msg_add_failed = "Fehler beim anlegen des Volumes %s"
-error_exists = "Volume %s besteht bereits"
-error_name = "Name darf nur %s beinhalten"
-error_size = "Größe darf nur %s beinhalten"
-error_size_exeeded = "Größe von %s überschritten"
-please_wait = "Erstelle Volume. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-lang_name_generate = "Name generieren"
-[image]
-label = "Image für Volume %s hinzufügen/entfernen"
-tab = "Image hinzufügen/entfernen"
-error_exists = "Image %s existiert bereits"
-error_image_still_in_use = "Image ID %s ist noch in benutztung von Server %s"
-msg_added_image = "Image %s hinzugefügt"
-msg_removed_image = "Image id %s entfernt"
-please_wait = "Bitt warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[clone]
-tab = "Klone iSCSI Volume"
-label = "Klone Volume %s"
-msg_cloned = "%s als %s geklont"
-msg_clone_failed = "Volume %s konnte nicht geklont werden"
-form_name = "Name"
-lang_name_generate = "Name generieren"
-error_exists = "Volume %s besteht bereits"
-error_name = "Name darf nur %s beinhalten"
-please_wait = "Klone Volume. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[remove]
-label = "Volume(s) löschen"
-msg_removed = "Volume %s gelöscht"
-msg_image_still_in_use = "Das Volume %s des Image ID %s ist noch in benutztung von Server %s"
-please_wait = "Lösche Volume(s). Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[auth]
-tab = "Volume authentisieren"
-label = "Volume %s authentisieren"
-form_pass = "Passwort"
-msg_authd = "Authentisiere volume %s"
-auth_explanation = "Bitte beachten: Volumes die als Image eines Server eingestellt wurden, werden automatisch authentisiert!"
-please_wait = "Authentisiere Volume. Please wait .."
-canceled = "Operation abgebrochen. Bitte warten .."
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/lang/en.iscsi-storage-about.ini b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/lang/en.iscsi-storage-about.ini
deleted file mode 100644
index 5a36e71..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/lang/en.iscsi-storage-about.ini
+++ /dev/null
@@ -1,69 +0,0 @@
-[documentation]
-tab = "About iSCSI-Storage"
-label = "About iSCSI-Storage"
-introduction_title = "Introduction"
-introduction_content = "The 'iSCSI-Storage' plugin manages iSCSI-Server in openQRM.
-					   "
-requirements_title = "Requirements"
-requirements_list = "A resource for the iSCSI-Storage Storage (this can be a remote system integrated into openQRM e.g. via the 'local-server' plugin or the openQRM server itself)"
-
-tested_title = "Tested with"
-tested_content = "This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions."
-
-provides_title = "Provides"
-provides_list = "<ul><li>Storage type: 'iSCSI Enterprise Target Storage'</li>
-					<li>Deployment types: 'iSCSI-deployment'</li></ul>"
-type_title = "Plugin Type"
-type_content = "Storage"
-
-deployment_title = "Deployment Type"
-deployment_content = "Network-Deployment"
-
-documentation_title = "Documentation"
-use_case_title = "Use-Case"
-network_deploymet = "Network-Deployment"
-doc1 = ""
-
-
-[bootservice]
-tab = "Boot-Service"
-label = "iSCSI-Storage Boot-Service"
-boot_service_title = "iSCSI-Storage Host Boot-Service"
-boot_service_content = "The iSCSI-Storage Plugin provides an openQRM Boot-Service.
-			This 'iSCSI-Storage Boot-Service' is automatically downloaded and executed by the openQRM-Client on all integrated Systems.
-			The Boot-Service is located at:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/iscsi-storage/web/boot-service-iscsi-storage.tgz</b></i>
-			<br>
-			<br>
-			The 'iSCSI-Storage Boot-Service contains the Client files of the iSCSI-Storage Plugin.<br>
-			Also a configuration file for the iSCSI-Storage server is included in this Boot-Service.<br>
-			<br>
-			The Boot-Service configuration can be viewed and administrated by the 'openqrm' utility.<br>
-			To view the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n iscsi-storage -a default</b></i>
-			<br>
-			<br>
-			To view a Boot-Service configuration of a specific Server run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n iscsi-storage -a [Server-name]</b></i>
-			<br>
-			<br>
-			To adapt a parameter in the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n iscsi-storage -a default -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			To adapt a paramter in the Boot-Service configuration of a specific Server run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n iscsi-storage -a [Server-name] -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			In case the openmQRM Server itself is used as the iSCSI-Storage Storage please edit:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/iscsi-storage/etc/openqrm-plugin-iscsi-storage.conf</b></i>
-			<br>
-			<br>
-			and set the configuration keys.<br>
-			<br>"
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/lang/en.iscsi-storage.ini b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/lang/en.iscsi-storage.ini
deleted file mode 100644
index a8c983b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/lang/en.iscsi-storage.ini
+++ /dev/null
@@ -1,85 +0,0 @@
-[select]
-tab = "Select iSCSI-storage"
-label = "Select iSCSI-storage"
-action_edit = "edit"
-table_name = "Name"
-table_id = "Id"
-table_recource = "Resource"
-table_type = "Type"
-table_deployment = "Deployment"
-error_no_storage = "<b>No storage configured yet!</b><br><br>Please create a iSCSI Storage first!"
-new_storage = "New Storage"
-please_wait = "Loading Storage. Please wait .."
-[edit]
-tab = "Edit iSCSI-storage"
-label = "iSCSI Volumes on storage %s"
-lang_id = "ID"
-lang_name = "Name"
-lang_resource = "Resource"
-lang_state = "State"
-lang_vfree = "Free"
-lang_vsize = "Total"
-action_add = "Add new Volume"
-action_refresh = "Reload Page"
-action_auth = "auth"
-action_clone = "clone"
-action_remove = "remove"
-action_add_image = "Add Image"
-action_remove_image = "Remove Image"
-action_clone_in_progress = "Synchronisation in progress - Please wait"
-action_clone_finished = "Syncronisation finished!"
-table_name = "Name"
-table_size = "Size"
-table_username = "Username"
-table_password = "Password"
-error_no_iscsi = "Storage %s is not of type iscsi-deployment"
-please_wait = "Loading Volumes. Please wait .."
-manual_configured = "Storage is manually configured and can not be be edited by openQRM"
-[add]
-tab = "Add iSCSI Volume"
-label = "Add new Volume"
-form_name = "Name"
-form_size = "Size (max. %s)"
-msg_added = "Added Volume %s"
-msg_add_failed = "Failed to add Volume %s"
-error_exists = "Volume %s allready exists"
-error_name = "Name must be %s"
-error_size = "Size must be %s"
-error_size_exeeded = "Size exeeds %s"
-please_wait = "Adding Volume. Please wait .."
-canceled = "Operation canceled. Please wait .."
-lang_name_generate = "generate name"
-[image]
-label = "Add/Remove Image for Volume %s"
-tab = "Add/Remove Image"
-error_exists = "Image %s allready exists"
-error_image_still_in_use = "Image id %s is still in use by Server(s) %s"
-msg_added_image = "Added Image %s"
-msg_removed_image = "Removed Image id %s"
-please_wait = "Please wait .."
-canceled = "Operation canceled. Please wait .."
-[clone]
-tab = "Clone iSCSI Volume"
-label = "Clone Volume %s"
-msg_cloned = "Cloned %s as %s"
-msg_clone_failed = "Failed to clone Volume %s"
-form_name = "Name"
-lang_name_generate = "generate name"
-error_exists = "Volume %s allready exists"
-error_name = "Name must be %s"
-please_wait = "Cloning Volume(s). Please wait .."
-canceled = "Operation canceled. Please wait .."
-[remove]
-label = "Remove Volume(s)"
-msg_removed = "Removed Volume %s"
-msg_image_still_in_use = "Volume %s of Image id %s is still in use by Server %s"
-please_wait = "Removing Volume(s). Please wait .."
-canceled = "Operation canceled. Please wait .."
-[auth]
-tab = "Authenticate Volume"
-label = "Authenticate Volume %s"
-form_pass = "Password"
-msg_authd = "Authenticated volume %s to %s"
-auth_explanation = "Please notice: Volumes which are deployed as an Image via an Server are authenticated automatically!"
-please_wait = "Authenticating Volume(s). Please wait .."
-canceled = "Operation canceled. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/menu.txt
deleted file mode 100644
index d797c26..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/menu.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|Iscsi-Storage
-...|Volume Admin|index.php?plugin=iscsi-storage|iSCSI Storage Manager
-...|About|index.php?plugin=iscsi-storage&controller=iscsi-storage-about|How to use
-...|Config|index.php?plugin=iscsi-storage&controller=iscsi-storage-about&iscsi_storage_about_action=bootservice|iSCSI Storage Boot-Service
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/openqrm-iscsi-deployment-auth-hook.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/openqrm-iscsi-deployment-auth-hook.php
deleted file mode 100644
index 73c5977..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/openqrm-iscsi-deployment-auth-hook.php
+++ /dev/null
@@ -1,331 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/image_authentication.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-
-/**
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- */
-
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $IMAGE_AUTHENTICATION_TABLE;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $openqrm_server;
-$event = new event();
-global $event;
-
-
-
-	//--------------------------------------------------
-	/**
-	* authenticates the storage volume for the appliance resource
-	* <code>
-	* storage_auth_function("start", 2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_function($cmd, $appliance_id) {
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-		global $IMAGE_AUTHENTICATION_TABLE;
-		global $openqrm_server;
-
-		$appliance = new appliance();
-		$appliance->get_instance_by_id($appliance_id);
-
-		$image = new image();
-		$image->get_instance_by_id($appliance->imageid);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		$resource = new resource();
-		$resource->get_instance_by_id($appliance->resources);
-		$resource_mac=$resource->mac;
-		$resource_ip=$resource->ip;
-
-		switch($cmd) {
-			case "start":
-				// authenticate the rootfs / needs openqrm user + pass
-				$openqrm_admin_user = new user("openqrm");
-				$openqrm_admin_user->set_user();
-
-				// generate a password for the image
-				$image_password = $image->generatePassword(12);
-				$image_deployment_parameter = $image->deployment_parameter;
-				$image->set_deployment_parameters("IMAGE_ISCSI_AUTH", $image_password);
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-iscsi-deployment-auth-hook.php", "Authenticating $image_name / $image_rootdevice to resource $resource_mac with password $image_password", "", "", 0, 0, $appliance_id);
-				$auth_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$deployment_plugin_name."/bin/openqrm-".$deployment_plugin_name." auth -n ".$image_name." -r ".$image_rootdevice." -i ".$image_password." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-				$resource->send_command($storage_ip, $auth_start_cmd);
-
-					// authenticate the install-from-nfs export
-				$run_disable_deployment_export=0;
-				$install_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_INSTALL_FROM_NFS"));
-				if (strlen($install_from_nfs_param)) {
-
-					// storage -> resource -> auth
-					$ip_storage_id=$deployment->parse_deployment_parameter("id", $install_from_nfs_param);
-					$ip_storage_ip=$deployment->parse_deployment_parameter("ip", $install_from_nfs_param);
-					$ip_image_rootdevice=$deployment->parse_deployment_parameter("path", $install_from_nfs_param);
-
-					$ip_storage = new storage();
-					$ip_storage->get_instance_by_id($ip_storage_id);
-					$ip_storage_resource = new resource();
-					$ip_storage_resource->get_instance_by_id($ip_storage->resource_id);
-					$op_storage_ip = $ip_storage_resource->ip;
-
-					$ip_deployment = new deployment();
-					$ip_deployment->get_instance_by_id($ip_storage->type);
-					$ip_deployment_type = $ip_deployment->type;
-					$ip_deployment_plugin_name = $ip_deployment->storagetype;
-
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-iscsi-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $ip_storage_id:$ip_storage_ip:$ip_image_rootdevice", "", "", 0, 0, $appliance_id);
-					$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$ip_deployment_plugin_name."/bin/openqrm-".$ip_deployment_plugin_name." auth -r ".$ip_image_rootdevice." -i ".$resource_ip." -t ".$ip_deployment_type." --openqrm-cmd-mode background";
-					$resource->send_command($ip_storage_ip, $auth_install_from_nfs_start_cmd);
-
-					$run_disable_deployment_export=1;
-				}
-
-				// authenticate the transfer-to-nfs export
-				$transfer_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_TRANSFER_TO_NFS"));
-				if (strlen($transfer_from_nfs_param)) {
-					// storage -> resource -> auth
-					$tp_storage_id=$deployment->parse_deployment_parameter("id", $transfer_from_nfs_param);
-					$tp_storage_ip=$deployment->parse_deployment_parameter("ip", $transfer_from_nfs_param);
-					$tp_image_rootdevice=$deployment->parse_deployment_parameter("path", $transfer_from_nfs_param);
-
-					$tp_storage = new storage();
-					$tp_storage->get_instance_by_id($tp_storage_id);
-					$tp_storage_resource = new resource();
-					$tp_storage_resource->get_instance_by_id($tp_storage->resource_id);
-					$op_storage_ip = $tp_storage_resource->ip;
-
-					$tp_deployment = new deployment();
-					$tp_deployment->get_instance_by_id($tp_storage->type);
-					$tp_deployment_type = $tp_deployment->type;
-					$tp_deployment_plugin_name = $tp_deployment->storagetype;
-
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-iscsi-deployment-auth-hook.php", "Transfer-to-NFS: Authenticating $resource_ip on storage id $tp_storage_id:$tp_storage_ip:$tp_image_rootdevice", "", "", 0, 0, $appliance_id);
-					$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$tp_deployment_plugin_name."/bin/openqrm-".$tp_deployment_plugin_name." auth -r ".$tp_image_rootdevice." -i ".$resource_ip." -t ".$tp_deployment_type." --openqrm-cmd-mode background";
-					$resource->send_command($tp_storage_ip, $auth_install_from_nfs_start_cmd);
-
-					$run_disable_deployment_export=1;
-				}
-
-				// do we need to disable the install-from/transfer-to-nfs exports ?
-				if ($run_disable_deployment_export == 1) {
-					$image_authentication = new image_authentication();
-					$ia_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$image_auth_ar = array(
-						'ia_id' => $ia_id,
-						'ia_image_id' => $appliance->imageid,
-						'ia_resource_id' => $appliance->resources,
-						'ia_auth_type' => 1,
-					);
-					$image_authentication->add($image_auth_ar);
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-iscsi-deployment-auth-hook.php", "Registered image $appliance->imageid for de-authentication the deployment exports when resource $appliance->resources is fully up.", "", "", 0, 0, $appliance_id);
-				}
-
-				break;
-
-			case "stop":
-				$image_authentication = new image_authentication();
-				$ia_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$image_auth_ar = array(
-					'ia_id' => $ia_id,
-					'ia_image_id' => $appliance->imageid,
-					'ia_resource_id' => $appliance->resources,
-					'ia_auth_type' => 0,
-				);
-				$image_authentication->add($image_auth_ar);
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-iscsi-deployment-auth-hook.php", "Registered image $appliance->imageid for de-authentication the root-fs exports when resource $appliance->resources is idle again.", "", "", 0, 0, $appliance_id);
-				break;
-
-		}
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage volume for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-		// generate a password for the image
-		$image_password = $image->generatePassword(12);
-		$image_deployment_parameter = $image->deployment_parameter;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		$event->log("storage_auth_stop_in_background", $_SERVER['REQUEST_TIME'], 5, "openqrm-iscsi-deployment-auth-hook.php", "Authenticating $image_name / $image_rootdevice with password $image_password", "", "", 0, 0, $appliance_id);
-		$auth_stop_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$deployment_plugin_name."/bin/openqrm-".$deployment_plugin_name." auth -r ".$image_rootdevice." -i ".$image_password." --openqrm-cmd-mode background";
-		$resource = new resource();
-		$resource->send_command($storage_ip, $auth_stop_cmd);
-		// and update the image params
-		$image->set_deployment_parameters("IMAGE_ISCSI_AUTH", $image_password);
-
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage deployment volumes for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_deployment_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_deployment_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		// just for sending the commands
-		$resource = new resource();
-
-		// get install deployment params
-		$install_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_INSTALL_FROM_NFS"));
-		if (strlen($install_from_nfs_param)) {
-			// storage -> resource -> auth
-			$ip_storage_id=$deployment->parse_deployment_parameter("id", $install_from_nfs_param);
-			$ip_storage_ip=$deployment->parse_deployment_parameter("ip", $install_from_nfs_param);
-			$ip_image_rootdevice=$deployment->parse_deployment_parameter("path", $install_from_nfs_param);
-
-			$ip_storage = new storage();
-			$ip_storage->get_instance_by_id($ip_storage_id);
-			$ip_storage_resource = new resource();
-			$ip_storage_resource->get_instance_by_id($ip_storage->resource_id);
-			$op_storage_ip = $ip_storage_resource->ip;
-
-			$ip_deployment = new deployment();
-			$ip_deployment->get_instance_by_id($ip_storage->type);
-			$ip_deployment_type = $ip_deployment->type;
-			$ip_deployment_plugin_name = $ip_deployment->storagetype;
-
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-iscsi-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $ip_storage_id:$ip_storage_ip:$ip_image_rootdevice", "", "", 0, 0, $appliance_id);
-			$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$ip_deployment_plugin_name."/bin/openqrm-".$ip_deployment_plugin_name." auth -r ".$ip_image_rootdevice." -i ".$OPENQRM_SERVER_IP_ADDRESS." -t ".$ip_deployment_type." --openqrm-cmd-mode background";
-			$resource->send_command($ip_storage_ip, $auth_install_from_nfs_start_cmd);
-		}
-
-		// get transfer deployment params
-		$transfer_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_TRANSFER_TO_NFS"));
-		if (strlen($transfer_from_nfs_param)) {
-			// storage -> resource -> auth
-			$tp_storage_id=$deployment->parse_deployment_parameter("id", $transfer_from_nfs_param);
-			$tp_storage_ip=$deployment->parse_deployment_parameter("ip", $transfer_from_nfs_param);
-			$tp_image_rootdevice=$deployment->parse_deployment_parameter("path", $transfer_from_nfs_param);
-
-			$tp_storage = new storage();
-			$tp_storage->get_instance_by_id($tp_storage_id);
-			$tp_storage_resource = new resource();
-			$tp_storage_resource->get_instance_by_id($tp_storage->resource_id);
-			$op_storage_ip = $tp_storage_resource->ip;
-
-			$tp_deployment = new deployment();
-			$tp_deployment->get_instance_by_id($tp_storage->type);
-			$tp_deployment_type = $tp_deployment->type;
-			$tp_deployment_plugin_name = $tp_deployment->storagetype;
-
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-iscsi-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $tp_storage_id:$tp_storage_ip:$tp_image_rootdevice", "", "", 0, 0, $appliance_id);
-			$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$tp_deployment_plugin_name."/bin/openqrm-".$tp_deployment_plugin_name." auth -r ".$tp_image_rootdevice." -i ".$OPENQRM_SERVER_IP_ADDRESS." -t ".$tp_deployment_type." --openqrm-cmd-mode background";
-			$resource->send_command($tp_storage_ip, $auth_install_from_nfs_start_cmd);
-		}
-
-	}
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/openqrm-iscsi-deployment-cloud-hook.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/openqrm-iscsi-deployment-cloud-hook.php
deleted file mode 100644
index 55aacf9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/openqrm-iscsi-deployment-cloud-hook.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This file implements the cloud storage methods
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-// special cloud classes
-require_once "$RootDir/plugins/cloud/class/cloudimage.class.php";
-
-$event = new event();
-global $event;
-
-global $OPENQRM_SERVER_BASE_DIR;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $RESOURCE_INFO_TABLE;
-
-
-// ---------------------------------------------------------------------------------
-// general cloudstorage methods
-// ---------------------------------------------------------------------------------
-
-
-// clones the volume of an image
-function create_clone_iscsi_deployment($cloud_image_id, $image_clone_name, $disk_size) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("create_clone", $_SERVER['REQUEST_TIME'], 5, "iscsi-deployment-cloud-hook", "Creating clone of image on storage", "", "", 0, 0, 0);
-
-	// we got the cloudimage id here, get the image out of it
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image, this is already the new logical clone
-	// we just need to physical snapshot it and update the rootdevice
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-
-	// generate a new image password for the clone
-	$image->get_instance_by_id($image_id);
-	$image_password = $image->generatePassword(12);
-	$image->set_deployment_parameters("IMAGE_ISCSI_AUTH", $image_password);
-	$image_location=dirname($image_rootdevice);
-	$image_location_name=basename($image_location);
-	// update the image rootdevice parameter
-	$ar_image_update = array(
-		'image_rootdevice' => "/dev/$image_clone_name/1",
-	);
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "iscsi-deployment-cloud-hook", "Updating rootdevice of image $image_id / $image_name with /dev/$image_clone_name/1", "", "", 0, 0, 0);
-	$image->update($image_id, $ar_image_update);
-	$image_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/iscsi-storage/bin/openqrm-iscsi-storage snap -n ".$image_location_name." -s ".$image_clone_name." -i ".$image_password." --openqrm-cmd-mode background";
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "iscsi-deployment-cloud-hook", "Running : $image_clone_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_clone_cmd);
-}
-
-
-
-// removes the volume of an image
-function remove_iscsi_deployment($cloud_image_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("remove_iscsi_deployment", $_SERVER['REQUEST_TIME'], 5, "iscsi-deployment-cloud-hook", "Removing image on storage", "", "", 0, 0, 0);
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-
-	$image_location=dirname($image_rootdevice);
-	$image_location_name=basename($image_location);
-	$image_remove_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/iscsi-storage/bin/openqrm-iscsi-storage remove -n ".$image_location_name." --openqrm-cmd-mode background";
-	$event->log("remove_iscsi_deployment", $_SERVER['REQUEST_TIME'], 5, "iscsi-deployment-cloud-hook", "Running : $image_remove_clone_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_remove_clone_cmd);
-}
-
-
-// resizes the volume of an image
-function resize_iscsi_deployment($cloud_image_id, $resize_value) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("resize_iscsi_deployment", $_SERVER['REQUEST_TIME'], 2, "iscsi-deployment-cloud-hook", "Resize image is not supported for iscsi-storage!", "", "", 0, 0, 0);
-}
-
-
-
-// creates a private copy of the volume of an image
-function create_private_iscsi_deployment($cloud_image_id, $private_disk, $private_image_name) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("create_private_iscsi_deployment", $_SERVER['REQUEST_TIME'], 2, "iscsi-deployment-cloud-hook", "Creating private image is not supported for iscsi-storage!", "", "", 0, 0, 0);
-}
-
-
-
-// ---------------------------------------------------------------------------------
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/root-mount.iscsi-deployment b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/root-mount.iscsi-deployment
deleted file mode 100644
index 6259587..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/root-mount.iscsi-deployment
+++ /dev/null
@@ -1,356 +0,0 @@
-#!/bin/bash
-# this is the root-mount initrd-service
-# which proivdes function to mount/remount the remote
-# iscsi-rootfs according to the image_deployment_parameters at /mnt
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# iscsi-storage
-# Required defines in the image_deploy_paramters
-#
-#
-# Optional parameters 
-#
-# IMAGE_INSTALL_FROM_NFS			- can be set to an (nfs) location from
-#									  which the image will be installed at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_TRANSFER_TO_NFS				- can be set to an (nfs) location from
-#									  which the image will be transfered to at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_INSTALL_FROM_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this
-#									  option will install the iscsi-storage image on 
-#									  boot-time from the local-device
-#
-# IMAGE_TRANSFER_TO_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this option will transfrom
-#									  the iscsi-storage image on boot-time to the local-device
-#
-#
-#
-# IMAGE_INSTALL_FROM_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_TRANSFER_TO_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_NFS_MOUNT_OPTIONS			- can be e.g. set to proto=tcp for the install/transform phase
-#
-
-# get the deployment parameters from openqrm.conf
-OPENQRM_RESOURCE_PARAMETER_FILE="/var/openqrm/openqrm-resource.conf"
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-eval $image_deployment_parameter
-export OPENQRM_SERVER_BASE_DIR=$resource_basedir
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-
-# nfs-options for the install+transform phase
-if [ "$IMAGE_NFS_MOUNT_OPTIONS" != "" ]; then
-	IMAGE_NFS_MOUNT_OPTIONS=",$IMAGE_NFS_MOUNT_OPTIONS"
-fi
-# default to ext3
-if [ "$IMAGE_INSTALL_FROM_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_INSTALL_FROM_LOCAL_FS_TYPE="ext3"
-fi
-if [ "$IMAGE_TRANSFER_TO_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_TRANSFER_TO_LOCAL_FS_TYPE="ext3"
-fi
-
-# here we gather the target name + lun from the image_rootdevice
-IMAGE_TARGET=`echo $image_rootdevice | cut -d'/' -f3`
-IMAGE_LUN=`echo $image_rootdevice | cut -d'/' -f4`
-
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	export WGET="wget --no-check-certificate -q"
-else
-	export WGET="wget -q"
-fi
-#######################################################################
-# required functions ##################################################
-#######################################################################
-
-function mount_rootfs() {
-
-	# check to find the right binaries fitting to kernel + rootfs
-	if [ "$kernel_name" == "default" ]; then
-		# we get the default binaries
-		# get iscsid via wget from the openQRM-servers boot-service dir
-		$WGET -O /sbin/iscsid $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsid
-		$WGET -O /sbin/iscsiadm $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsiadm
-	else
-		# we try to get the binaries fitting to the kernel name
-		# -> if a special version is not available we go with the default
-		if ! $WGET -O /sbin/iscsid $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsid.$kernel_name; then
-			$WGET -O /sbin/iscsid $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsid
-		fi
-		if ! $WGET -O /sbin/iscsiadm $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsiadm.$kernel_name; then
-			$WGET -O /sbin/iscsiadm $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsiadm
-		fi
-
-	fi
-	chmod +x /sbin/iscsi*
-	mkdir -p /tmp
-
-	# load iscsi related modules
-	modprobe iscsi_tcp
-	modprobe libiscsi
-	modprobe scsi_transport_iscsi
-	modprobe scsi_mod
-	modprobe sg
-	modprobe sd_mod
-	modprobe ib_iser
-
-	# create config /etc/iscsi/iscsid.conf
-	mkdir -p /etc/iscsi/
-	cat >> /etc/iscsi/iscsid.conf << EOF
-node.startup = manual
-node.session.timeo.replacement_timeout = 120
-node.conn[0].timeo.login_timeout = 15
-node.conn[0].timeo.logout_timeout = 15
-node.conn[0].timeo.noop_out_interval = 10
-node.conn[0].timeo.noop_out_timeout = 15
-node.session.iscsi.InitialR2T = No
-node.session.iscsi.ImmediateData = Yes
-node.session.iscsi.FirstBurstLength = 262144
-node.session.iscsi.MaxBurstLength = 16776192
-node.conn[0].iscsi.MaxRecvDataSegmentLength = 65536
-
-node.session.auth.authmethod = CHAP
-node.session.auth.username = $IMAGE_TARGET
-node.session.auth.password = $IMAGE_ISCSI_AUTH
-
-EOF
-
-	# create /etc/iscsi/initiatorname.iscsi
-	cat >> /etc/iscsi/initiatorname.iscsi << EOF
-InitiatorName=iqn.1993-08.org.debian:01:31721e7e6b8f
-EOF
-	# also create /etc/initiatorname.iscsi, some open-iscsi version looking for that
-	cp /etc/iscsi/initiatorname.iscsi /etc/initiatorname.iscsi
-
-	# start syslog + klogd
-	syslogd &
-	klogd&
-
-	# start iscsid
-	/sbin/iscsid &
-	sleep 2
-
-	#
-
-	# discover
-	echo "iscsi-storage: Discoverying Iscsi-target $image_storage_server_ip:3260"
-	iscsiadm -m discovery -t sendtargets -p $image_storage_server_ip:3260
-
-	# login
-	iscsiadm -m node -T $IMAGE_TARGET -p $image_storage_server_ip:3260 --login
-
-	# let udev settle
-	sleep 4
-
-	# check that udev found the new device
-	FIND_ISCSI_BLOCK_DEVICE=`find /sys/class/iscsi_session/session*/device/target*/*/ -name block | head -n1`
-	if [ "$FIND_ISCSI_BLOCK_DEVICE" == "" ]; then
-		FIND_ISCSI_BLOCK_DEVICE=`find /sys/class/iscsi_session/session*/device/target*/*/ -name block:s* | head -n1`
-		if [ "$FIND_ISCSI_BLOCK_DEVICE" == "" ]; then
-			echo "ERROR: Udev did not detect the new device"
-			echo "ERROR: Could not look-up the Iscsi device in the sys-fs dir"
-			# give a shell for the admin
-			/bin/bash
-		fi
-	fi
-	# check for different sysfs styles
-	if [ -h $FIND_ISCSI_BLOCK_DEVICE ]; then
-		ISCSI_BLOCK_DEVICE_NAME=`readlink $FIND_ISCSI_BLOCK_DEVICE`
-		ISCSI_BLOCK_DEVICE_NAME=`basename $ISCSI_BLOCK_DEVICE_NAME`
-		echo "SUCCESS: Found $ISCSI_BLOCK_DEVICE_NAME in sys-fs (as symlink)"
-	elif [ -d $FIND_ISCSI_BLOCK_DEVICE ]; then
-		ISCSI_BLOCK_DEVICE_NAME=`ls $FIND_ISCSI_BLOCK_DEVICE`
-		echo "SUCCESS: Found $ISCSI_BLOCK_DEVICE_NAME in sys-fs (as dir)"
-	else
-		echo "ERROR: Udev did not detect the new device"
-		echo "ERROR: Could not look-up the Iscsi device in the sys-fs dir"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	# export the blockdevice name for the further functions
-	export ISCSI_BLOCK_DEVICE="/dev/$ISCSI_BLOCK_DEVICE_NAME"
-
-	# finallly mount
-	if ! mount -t $image_rootfstype $ISCSI_BLOCK_DEVICE /mnt; then
-		# in case we install from nfs we create a fs since this should be a new lun
-		if  [ "$IMAGE_INSTALL_FROM_NFS" != "" ]; then
-			echo "NOTICE: Found install-from-nfs enabled but failed mounting the rootdevice"
-			echo "NOTICE: Assuming a new (unformatted) Lun -> creating $image_rootfstype filesystem on $ISCSI_BLOCK_DEVICE"
-			mke2fs -F -j $ISCSI_BLOCK_DEVICE
-			if ! mount -t $image_rootfstype $ISCSI_BLOCK_DEVICE /mnt; then
-				echo "ERROR: Could not mount $ISCSI_BLOCK_DEVICE via iscsi"
-				# give a shell for the admin
-				/bin/bash
-			else
-				echo "iscsi-storage: Mounted $ISCSI_BLOCK_DEVICE rw"
-			fi
-		else
-			echo "ERROR: Could not mount $ISCSI_BLOCK_DEVICE via iscsi"
-			# give a shell for the admin
-			/bin/bash
-		fi
-	else
-		echo "iscsi-storage: Mounted $ISCSI_BLOCK_DEVICE rw"
-	fi
-
-	if  [ "$IMAGE_INSTALL_FROM_NFS" != "" ]; then
-		install_rootfs_from_nfs
-	else
-		echo "iscsi-storage: Skipping install phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_NFS" != "" ]; then
-		transfer_rootfs_to_nfs
-	else
-		echo "iscsi-storage: Skipping transfer-to-nfs phase"
-	fi
-	if  [ "$IMAGE_INSTALL_FROM_LOCAL" != "" ]; then
-		install_rootfs_from_local
-	else
-		echo "iscsi-storage: Skipping install-from-local phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_LOCAL" != "" ]; then
-		transfer_rootfs_to_local
-	else
-		echo "iscsi-storage: Skipping transfer-to-local phase"
-	fi
-}
-
-
-function remount_rootfs() {
-
-	# Debian/Ubuntu Systems want their nfs-rootfs in rw mode
-	if [ -f /mnt/etc/apt/sources.list ]; then
-		if grep ubuntu /mnt/etc/apt/sources.list >/remountlog; then
-			echo "iscsi-storage: Skipping Re-mount $ISCSI_BLOCK_DEVICE ro"
-			rm -f /remountlog
-			return
-		fi
-	fi
-	REMOUNT_LOOP=0
-	# remont /mnt ro
-	while ! mount -t $image_rootfstype -o ro,remount $ISCSI_BLOCK_DEVICE /mnt; do
-		echo -n "."
-		sleep 1
-		REMOUNT_LOOP=$[ REMOUNT_LOOP + 1 ]
-		if [ "$REMOUNT_LOOP" == "10" ]; then
-			echo "ERROR: iscsi-storage could not remount /mnt "
-			/bin/bash
-		fi
-	done
-	echo "iscsi-storage: Re-mounted $ISCSI_BLOCK_DEVICE ro"
-
-}
-
-
-function create_fstab() {
-	rm -f $IMAGE_FSTAB
-	echo "$ISCSI_BLOCK_DEVICE   /     $image_rootfstype  defaults   0 0" >> $IMAGE_FSTAB
-}
-
-
-#######################################################################
-# optional functions ##################################################
-#######################################################################
-
-function install_rootfs_from_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f1`
-	IMAGE_INSTALL_FROM_NFS=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f2-`
-	echo "iscsi-storage: Installing $resource_image from $IMAGE_INSTALL_FROM_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o ro$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_INSTALL_FROM_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "iscsi-storage: Starting install-from-nfs phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "iscsi-storage: Install-from-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-function transfer_rootfs_to_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f1`
-	IMAGE_TRANSFER_TO_NFS=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f2-`
-	echo "iscsi-storage: Transfering $resource_image to $IMAGE_TRANSFER_TO_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o rw$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_TRANSFER_TO_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "iscsi-storage: Starting transfer-to-nfs phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "iscsi-storage: Transfer-to-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-function install_rootfs_from_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE -o ro $IMAGE_INSTALL_FROM_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_LOCAL / $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "iscsi-storage: Starting install-to-local phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "iscsi-storage: Install-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-function transfer_rootfs_to_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE -o rw $IMAGE_TRANSFER_TO_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_LOCAL / $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "iscsi-storage: Starting transfer-to-local phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "iscsi-storage: Transfer-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-about-bootservice.tpl.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-about-bootservice.tpl.php
deleted file mode 100644
index 96fac92..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-about-bootservice.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{boot_service_title}</h3>
-		{boot_service_content}
-	</div>
-</div>
-
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-about-documentation.tpl.php
deleted file mode 100644
index 9ebab02..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-about-documentation.tpl.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{introduction_title}</h3>
-		{introduction_content}
-	
-		<h3>{provides_title}</h3>
-		{provides_list}
-	
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-
-	
-	</div>
-	<div class="span2 offset1">
-		<h3>{type_title}</h3>
-		<span class="pill">{type_content}</span>
-	
-		<h3>{deployment_title}</h3>
-		{deployment_content}
-	
-		<h3>{tested_title}</h3>
-		{tested_content}
-
-	</div>
-</div>
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-add.tpl.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-add.tpl.php
deleted file mode 100644
index d80ea69..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-add.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}" method="GET">
-{form}
-<div id="form">
-	{name}
-	{size}
-	<div id="buttons">{submit}&#160;{cancel}</div>
-</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-auth.tpl.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-auth.tpl.php
deleted file mode 100644
index 8c635b8..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-auth.tpl.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-
-<form action="{thisfile}">
-	<div id="form">
-		<b>{auth_explanation}</b>
-		<br><br>
-		{form}
-		{pass}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-clone.tpl.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-clone.tpl.php
deleted file mode 100644
index b25b437..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-clone.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-<form action="{thisfile}">
-{form}
-	<div id="form">
-		{name}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-edit.tpl.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-edit.tpl.php
deleted file mode 100644
index 4208c3b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-edit.tpl.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-
-<div id="form">
-	<div style="width:250px;float:left;">
-		<div><b>{lang_id}</b>: {id}</div>
-		<div><b>{lang_name}</b>: {name}</div>
-		<div><b>{lang_resource}</b>: {resource}</div>
-		<div><b>{lang_state}</b>: {state}</div>
-	</div>
-
-	<div style="width:300px;float:left;">
-		<div><b>{lang_vsize} / {lang_vfree}</b>: {vsize} / {vfree}</div>
-	</div>
-
-	<div style="width:180px;float:left;">
-		<div>{add}</div>
-	</div>
-	<div style="clear:both;" class="floatbreaker">&#160;</div>
-	{table}
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-remove.tpl.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-remove.tpl.php
deleted file mode 100644
index cafa6a6..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-remove.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-
-<form action="{thisfile}">
-	<div id="form">
-		{form}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-select.tpl.php b/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-select.tpl.php
deleted file mode 100644
index 111f228..0000000
--- a/openQRM-5.3.50-CE/src/plugins/iscsi-storage/web/tpl/iscsi-storage-select.tpl.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-{table}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/Makefile b/openQRM-5.3.50-CE/src/plugins/kvm/Makefile
deleted file mode 100644
index 661e971..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# this is the openQRM kvm-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/kvm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates
-	. $(OPENQRM_SERVER_CONF) && cp etc/templates/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-vm
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/js/
-	. $(OPENQRM_SERVER_CONF) && cp web/js/*.js $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/js/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/image* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/img/
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/img/
-	. $(OPENQRM_SERVER_CONF) && chmod 777 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/class/
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/css/
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/lang/
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/lang/
-	. $(OPENQRM_SERVER_CONF) && chmod 777 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin
-	. $(OPENQRM_SERVER_CONF) && cp bin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/sbin
-	. $(OPENQRM_SERVER_CONF) && cp sbin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/sbin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/sbin/openqrm*
-	. $(OPENQRM_SERVER_CONF) && tar -C $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm -czf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/boot-service-kvm.tgz include/ bin/ etc/init.d/kvm etc/templates/ etc/openqrm-plugin-kvm.conf sbin/
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/kvm
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/kvm/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/bin/openqrm-kvm b/openQRM-5.3.50-CE/src/plugins/kvm/bin/openqrm-kvm
deleted file mode 100644
index 2e095a3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/bin/openqrm-kvm
+++ /dev/null
@@ -1,1651 +0,0 @@
-#!/bin/bash
-# this script automatically manages the lvm volumes for the kvm virtual machines
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-# unblock starting command queue early for non-blocking + ui commands
-KVM_COMMAND=$1
-if [ "$KVM_COMMAND" == "post_lv" ] || [ "$KVM_COMMAND" == "post_vg" ] || [ "$KVM_COMMAND" == "post_identifier" ] || [ "$KVM_COMMAND" == "list" ] || [ "$KVM_COMMAND" == "auth" ] || [ "$KVM_COMMAND" == "post_sync_progress" ] || [ "$KVM_COMMAND" == "post_sync_finished" ]; then
-	openqrm_unblock_starting_queue $@
-	NON_BLOCKING=true
-fi
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/include/openqrm-plugin-kvm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/openqrm-plugin-kvm.conf
-OPENQRM_POSTENCODE="$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-postencode"
-if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-	OPENQRM_SERVER_IP=$resource_openqrmserver
-	OPENQRM_EXEC_PORT=$resource_execdport
-elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-	openqrm_server_get_config
-	OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-	resource_ip=$OPENQRM_SERVER_IP_ADDRESS
-	resource_id=0
-	resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-	openqrm_web_protocol=$OPENQRM_WEB_PROTOCOL
-fi
-export LANG=C
-LINEBR='
-'
-# how long to wait for the volume authentication, each loop is 5 secs
-MAX_VOLUME_AUTHENTICATION_LOOP=1500
-export MAX_VOLUME_AUTHENTICATION_LOOP
-# set default deployment type to lvm
-OPENQRM_PLUGIN_KVM_FILE_BACKEND="false"
-# dir for progress stats
-SYNC_PROGRESS_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/lock"
-if [ ! -d "$SYNC_PROGRESS_DIR" ]; then
-	mkdir -p $SYNC_PROGRESS_DIR
-fi
-
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-# let only root run this script
-WHOAMI=`whoami`
-if [ "$WHOAMI" != "root" ]; then
-	echo "ERROR: Please run this script as root!"
-	exit 6
-fi
-
-# make sure required deps are installed
-if ! check_kvm_deps; then
-	if [ "$NON_BLOCKING" != "true" ]; then
-		openqrm_unblock_starting_queue $@
-	fi
-	exit 1
-fi
-# in packages from newer distros qemu-img is named kvm-img
-KVM_QEMU_IMG=`which qemu-img`
-if [ "$KVM_QEMU_IMG" == "" ]; then
-	KVM_QEMU_IMG=`which kvm-img`
-	if [ "$KVM_QEMU_IMG" == "" ]; then
-		if [ "$NON_BLOCKING" != "true" ]; then
-			openqrm_unblock_starting_queue $@
-		fi
-		openqrm_post_event 0 "dependencies" 2 "openqrm-kvm" "qemu-img utility missing. Please install qemu-img on resource $resource_id!"
-		exit 1
-	fi
-fi
-
-
-function kvm_usage() {
-	echo "Usage : $0 add/remove/snap/list/resize/clone <-n image-name> <-v volume-group> [-t <kvm-bf-deployment/kvm-lvm-deployment>]"
-	echo "             [-m size in MB]"
-	echo "             [-s image-snapshot-name]"
-	echo "             [-o image-type e.g. raw, qcow2]"
-	echo "        $0 auth <-r image-rootdevice> <-i authidentifier> [-t <kvm-bf-deployment/kvm-lvm-deployment>]"
-	echo "        $0 post_vg <-u username> <-p password> [-t <kvm-bf-deployment/kvm-lvm-deployment>]"
-	echo "        $0 post_lv <-u username> <-p password> <-v volume-group> [-t <kvm-bf-deployment/kvm-lvm-deployment>]"
-	echo "        $0 post_identifier <-u username> <-p password> [-t <kvm-bf-deployment/kvm-lvm-deployment>]"
-	echo "        $0 post_sync_progress <-n image-name> <-s image-snapshot-name> <-v volume-group> <-t kvm-bf-deployment/kvm-lvm-deployment> <-u username> <-p password>"
-	echo "        $0 post_sync_finished <-n image-name> <-v volume-group> <-t kvm-bf-deployment/kvm-lvm-deployment> <-u username> <-p password>"
-	echo "        $0 purge_cache <-n image-name/all>"
-	echo "        $0 list_cache"
-	echo ""
-	echo "Optional parameters:"
-	echo "             [--openqrm-ui-user <username>]"
-	echo "             [--openqrm-internal-cmd <true/false>]"
-	echo "             [--openqrm-cmd-mode <regular/background/fork>]"
-	exit 1
-}
-
-
-
-
-FULL_COMMANDLINE="$0 $@"
-KVM_COMMAND=$1
-shift
-
-while [ $# -ne 0 ]; do
-	case "$1" in
-		-n)
-			KVM_IMAGE_NAME=$2
-			shift
-			;;
-		-m)
-			KVM_IMAGE_SIZE=$2
-			shift
-			;;
-		-s)
-			KVM_IMAGE_SNAPSHOT_NAME=$2
-			shift
-			;;
-		-i)
-			KVM_IMAGE_AUTH=$2
-			shift
-			;;
-		-r)
-			KVM_IMAGE_ROOTDEVICE=$2
-			shift
-			;;
-		-u)
-			KVM_OPENQRM_USERNAME=$2
-			shift
-			;;
-		-p)
-			KVM_OPENQRM_PASSWORD=$2
-			shift
-			;;
-		-v)
-			KVM_VOLUME_LOCATION=$2
-			shift
-			;;
-		-t)
-			KVM_DEPLOYMENT_TYPE=$2
-			shift
-			;;
-		-o)
-			KVM_IMAGE_TYPE=$2
-			shift
-			;;
-		--caching)
-			KVM_IMAGE_CACHE=$2
-			shift
-			;;
-		--openqrm-ui-user)
-			OPENQRM_UI_USER=$2
-			shift
-			;;
-		--openqrm-internal-cmd)
-			OPENQRM_INTERNAL_CMD=$2
-			shift
-			;;
-		--openqrm-cmd-mode)
-			OPENQRM_CMD_MODE=$2
-			shift
-			;;
-
-		*)
-			if [ "$NON_BLOCKING" != "true" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			fi
-			echo "ERROR: Free commandline arguments are not allowed"
-			kvm_usage
-			exit 6
-			;;
-	esac
-	shift
-done
-
-
-
-
-# main
-if [ "$KVM_COMMAND" == "" ]; then
-	openqrm_unblock_starting_queue $FULL_COMMANDLINE
-	kvm_usage
-fi
-if [ "$KVM_COMMAND" == "post_lv" ] || [ "$KVM_COMMAND" == "post_vg" ] || [ "$KVM_COMMAND" == "post_identifier" ]; then
-		if [ "$KVM_OPENQRM_USERNAME" == "" ]; then
-			kvm_usage
-		fi
-		if [ "$KVM_OPENQRM_PASSWORD" == "" ]; then
-			kvm_usage
-		fi
-		if [ "$KVM_COMMAND" == "post_lv" ]; then
-			if [ "$KVM_VOLUME_LOCATION" == "" ]; then
-				kvm_usage
-			fi
-		fi
-else
-	if [ "$KVM_COMMAND" != "list" ] && [ "$KVM_COMMAND" != "auth" ] && [ "$KVM_COMMAND" != "list_cache" ]; then
-		if [ "$KVM_IMAGE_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-
-		if [ "$KVM_COMMAND" != "purge_cache" ]; then
-			if [ "$KVM_VOLUME_LOCATION" == "" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-				kvm_usage
-			fi
-		fi
-	fi
-fi
-if [ "$KVM_DEPLOYMENT_TYPE" == "" ]; then
-	if [ "$KVM_COMMAND" != "purge_cache" ] && [ "$KVM_COMMAND" != "list_cache" ]; then
-		if [ "$NON_BLOCKING" != "true" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		fi
-		kvm_usage
-	fi
-elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-gluster-deployment" ]; then
-	if ! which gluster 1>/dev/null 2>&1; then
-		if [ "$NON_BLOCKING" != "true" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		fi
-		openqrm_post_event 0 "check" 2 "openqrm-kvm" "Gluster/Glusterfs is not installed on resource id $resource_id!"
-		exit 1
-	fi
-elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-ceph-deployment" ]; then
-	if ! which rbd 1>/dev/null 2>&1; then
-		if [ "$NON_BLOCKING" != "true" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		fi
-		openqrm_post_event 0 "check" 2 "openqrm-kvm" "Ceph (rbd) is not installed on resource id $resource_id!"
-		exit 1
-	fi
-fi
-
-if [ "$KVM_DEPLOYMENT_TYPE" == "kvm-lvm-deployment" ]; then
-	# load required lvm modules if needed
-	if ! grep dm_mod /proc/modules 1>/dev/null; then
-		modprobe dm-mod 1>/dev/null 2>&1
-		modprobe dm-snapshot 1>/dev/null 2>&1
-	fi
-	# check if volume group exists
-	if ! vgs --unbuffered $KVM_VOLUME_LOCATION 1>/dev/null 2>&1; then
-		openqrm_post_event 0 "check" 2 "openqrm-kvm" "Could not find volume group $KVM_VOLUME_LOCATION on the storage-server!"
-		echo "ERROR: Could not find volume-group $KVM_VOLUME_LOCATION on the storage-server!"
-		if [ "$NON_BLOCKING" != "true" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		fi
-		exit 1
-	fi
-fi
-# set some default if not given by cmdline params
-if [ "$KVM_IMAGE_TYPE" == "" ]; then
-	KVM_IMAGE_TYPE=$OPENQRM_PLUGIN_KVM_DEFAULT_IMAGE_TYPE
-fi
-if [ "$OPENQRM_UI_USER" != "" ]; then
-	OPENQRM_UI_USER_PARAMETER=" --openqrm-ui-user $OPENQRM_UI_USER"
-fi
-if [ "$KVM_IMAGE_CACHE" == "" ]; then
-	KVM_IMAGE_CACHE=true
-fi
-
-
-case "$KVM_COMMAND" in
-
-	add)
-		if [ "$KVM_DEPLOYMENT_TYPE" == "kvm-bf-deployment" ]; then
-			# check if already exists
-			FILE_BACKEND_DIR=`kvm_get_backend_dir $KVM_VOLUME_LOCATION`
-			if [ -e "$FILE_BACKEND_DIR/$KVM_IMAGE_NAME" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-				openqrm_post_event 0 "add" 3 "openqrm-kvm" "Volume $KVM_IMAGE_NAME already exists"
-				exit 1
-			fi
-			echo "Creating local blockfile $KVM_IMAGE_NAME size $KVM_IMAGE_SIZE MB using location $KVM_VOLUME_LOCATION"
-			if [ ! -d "$FILE_BACKEND_DIR" ]; then
-				mkdir -p $FILE_BACKEND_DIR
-			fi
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			# Convert MB to Bytes
-			IMGSIZE=$(( $KVM_IMAGE_SIZE * 1000 * 1000 ))
-
-			CMD_ERR=`$KVM_QEMU_IMG create -f $KVM_IMAGE_TYPE $FILE_BACKEND_DIR/$KVM_IMAGE_NAME $IMGSIZE 2>&1`
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "add" 3 "openqrm-kvm" "Error creating volume $KVM_IMAGE_NAME! $CMD_ERR"
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-lvm-deployment" ]; then
-			# check if already exists
-			if [ -e /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-				openqrm_post_event 0 "add" 3 "openqrm-kvm" "Volume $KVM_IMAGE_NAME already exists"
-				exit 1
-			fi
-			echo "Creating logical volume $KVM_IMAGE_NAME size $KVM_IMAGE_SIZE MB using volume group $KVM_VOLUME_LOCATION"
-
-			# aquire lock for kvm
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			# aquire global lock for lvm operations
-			if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-				if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-					openqrm_global_lock aquire lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD $LOCK_TIME "Creating volume $KVM_IMAGE_NAME"
-				fi
-			fi
-
-			kvm_refresh_lvm
-			CMD_ERR=`lvcreate $OPENQRM_PLUGIN_KVM_LVCREATE_CUSTOM_PARAM -L$KVM_IMAGE_SIZE"M" -n$KVM_IMAGE_NAME $KVM_VOLUME_LOCATION 2>&1`
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "add" 3 "openqrm-kvm" "Error creating volume $KVM_IMAGE_NAME! $CMD_ERR"
-
-				if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-					if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-						openqrm_global_lock release lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD
-					fi
-				fi
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-
-			# release global lock
-			if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-				if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-					openqrm_global_lock release lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD
-				fi
-			fi
-			# release lock for kvm
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-gluster-deployment" ]; then
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			CMD_ERR=`$KVM_QEMU_IMG create -f $KVM_IMAGE_TYPE gluster://$resource_ip/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME $KVM_IMAGE_SIZE"M" 2>&1`
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "add" 3 "openqrm-kvm" "Error creating volume $KVM_IMAGE_NAME! $CMD_ERR"
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-ceph-deployment" ]; then
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			CMD_ERR=`rbd create $KVM_IMAGE_NAME --size $KVM_IMAGE_SIZE --pool $KVM_VOLUME_LOCATION --image-format 2 $OPENQRM_PLUGIN_KVM_CEPH_IMAGE_FEATURE 2>&1`
-#			CMD_ERR=`$KVM_QEMU_IMG create -f $KVM_IMAGE_TYPE rbd:$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME $KVM_IMAGE_SIZE"M" 2>&1`
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "add" 3 "openqrm-kvm" "Error creating volume $KVM_IMAGE_NAME! $CMD_ERR"
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-
-		fi
-		# if we have an image name send size back to openQRM
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD "$openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?lvm_command=set_image_size&kvm_image_name=$KVM_IMAGE_NAME&kvm_image_size=$KVM_IMAGE_SIZE"; then
-			openqrm_post_event 0 "add" 2 "openqrm-kvm" "Could post size of volume $KVM_IMAGE_NAME!"
-		fi
-		# in case we have a username + password post the updated list to the openQRM-server
-		if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-			$0 post_lv -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD -v $KVM_VOLUME_LOCATION -t $KVM_DEPLOYMENT_TYPE $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true
-		fi
-		openqrm_post_event 0 "add" 5 "openqrm-kvm" "Created volume $KVM_IMAGE_NAME at $KVM_VOLUME_LOCATION."
-		;;
-
-	remove)
-		if [ "$KVM_DEPLOYMENT_TYPE" == "kvm-bf-deployment" ]; then
-			FILE_BACKEND_DIR=`kvm_get_backend_dir $KVM_VOLUME_LOCATION`
-			if [ ! -e "$FILE_BACKEND_DIR/$KVM_IMAGE_NAME" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-				openqrm_post_event 0 "remove" 5 "openqrm-kvm" "Volume $FILE_BACKEND_DIR/$KVM_IMAGE_NAME does not exists!"
-				exit 1
-			fi
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			CMD_ERR=`/bin/rm -f $FILE_BACKEND_DIR/$KVM_IMAGE_NAME 2>&1`
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "add" 3 "openqrm-kvm" "Error removing volume $KVM_IMAGE_NAME! $CMD_ERR"
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-lvm-deployment" ]; then
-			# check that no snapshots existing with this volume as the origin
-			if lvs | awk '{ print $5 }' | grep -w $KVM_IMAGE_NAME 1>/dev/null; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-				openqrm_post_event 0 "remove" 3 "openqrm-kvm" "Snapshot exist from volume /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME. Not removing!"
-				exit 1
-			fi
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			# aquire global lock for lvm operations
-			if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-				if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-					openqrm_global_lock aquire lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD $LOCK_TIME "Removing volume $KVM_IMAGE_NAME"
-				fi
-			fi
-			kvm_refresh_lvm
-			# make sure no dev mappings keeping the volume busy
-			kvm_clean_dev_maps $KVM_IMAGE_NAME $KVM_VOLUME_LOCATION
-			lvchange -a n -y /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME
-			CMD_ERR=`lvremove -f /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME 2>&1`
-			if [ "$?" != 0 ]; then
-				# try again, lvm sometimes is fancy
-				sleep 2
-				CMD_ERR=`lvremove -f /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME 2>&1`
-				if [ "$?" != 0 ]; then
-					sleep 2
-					if [ -e /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME ]; then
-						CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-						VOL_STATUS=`lvs /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME | tail -n1`
-						openqrm_post_event 0 "add" 3 "openqrm-kvm" "Error removing volume $KVM_IMAGE_NAME! $CMD_ERR"
-						openqrm_post_event 0 "add" 3 "openqrm-kvm" "Volume status $KVM_IMAGE_NAME: $VOL_STATUS"
-
-						# release global lock
-						if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-							if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-								openqrm_global_lock release lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD
-							fi
-						fi
-						openqrm_lock_queue release kvm $LOCK_TIME
-						trap '' EXIT
-
-						exit 1
-					fi
-				fi
-			fi
-
-			# release global lock
-			if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-				if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-					openqrm_global_lock release lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD
-				fi
-			fi
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-gluster-deployment" ]; then
-			# remove needs to be done through a glusterfs client, mount via nfs
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			GLUSTER_VOL_TMP_DIR="/tmp/kvm-gluster.$KVM_IMAGE_NAME"
-			mkdir -p $GLUSTER_VOL_TMP_DIR
-
-			# mount
-			CMD_ERR=`mount -t nfs $resource_ip:$KVM_VOLUME_LOCATION $GLUSTER_VOL_TMP_DIR 2>&1`
-			if [ "$?" != 0 ]; then
-				rmdir $GLUSTER_VOL_TMP_DIR
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "add" 3 "openqrm-kvm" "Error mounting Gluster $resource_ip:$KVM_VOLUME_LOCATION! $CMD_ERR"
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-
-			# remove
-			CMD_ERR=`rm -f $GLUSTER_VOL_TMP_DIR/$KVM_IMAGE_NAME 2>&1`
-			if [ "$?" != 0 ]; then
-				rmdir $GLUSTER_VOL_TMP_DIR
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "add" 3 "openqrm-kvm" "Error removing volume $KVM_IMAGE_NAME! $CMD_ERR"
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-
-			# umount
-			CMD_ERR=`umount $GLUSTER_VOL_TMP_DIR 2>&1`
-			if [ "$?" != 0 ]; then
-				rmdir $GLUSTER_VOL_TMP_DIR
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "add" 3 "openqrm-kvm" "Error umounting Gluster $resource_ip:$KVM_VOLUME_LOCATION! $CMD_ERR"
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-			rmdir $GLUSTER_VOL_TMP_DIR
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-ceph-deployment" ]; then
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-
-			# remove - snap or origin?
-			if echo $KVM_IMAGE_NAME | grep '@' 1>/dev/null; then
-				CMD_ERR=`rbd snap rm $KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME 2>&1`
-			else
-				CMD_ERR=`rbd rm $KVM_IMAGE_NAME -p $KVM_VOLUME_LOCATION 2>&1`
-			fi
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "add" 3 "openqrm-kvm" "Error removing volume $KVM_IMAGE_NAME from pool $KVM_VOLUME_LOCATION! $CMD_ERR"
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-		fi
-		# in case we have a username + password post the updated list to the openQRM-server
-		if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-			$0 post_lv -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD -v $KVM_VOLUME_LOCATION -t $KVM_DEPLOYMENT_TYPE $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true
-		fi
-		openqrm_post_event 0 "remove" 5 "openqrm-kvm" "Removed volume $KVM_IMAGE_NAME from $KVM_VOLUME_LOCATION."
-		;;
-
-	snap)
-		if [ "$KVM_IMAGE_SNAPSHOT_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ "$KVM_DEPLOYMENT_TYPE" == "kvm-bf-deployment" ]; then
-			# check that source fs-images exist
-			# notice : here the kvm-volume-location comes from the cloud-hook and uses the dirname of the rootfs-ident
-			FILE_BACKEND_DIR=`kvm_get_backend_dir $KVM_VOLUME_LOCATION`
-			if [ ! -e "$FILE_BACKEND_DIR/$KVM_IMAGE_NAME" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-				openqrm_post_event 0 "snap" 2 "openqrm-kvm" "Could not find $FILE_BACKEND_DIR/$KVM_IMAGE_NAME on the storage-server!"
-				exit 1
-			fi
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			touch $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-
-			CMD_ERR=`$KVM_QEMU_IMG create -f qcow2 -b $FILE_BACKEND_DIR/$KVM_IMAGE_NAME $FILE_BACKEND_DIR/$KVM_IMAGE_SNAPSHOT_NAME 2>&1`
-			if [ "$?" != 0 ]; then
-				rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "snap" 3 "openqrm-kvm" "Error creating snapshot $FILE_BACKEND_DIR/$KVM_IMAGE_SNAPSHOT_NAME! $CMD_ERR"
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-			rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-			# Get size of snaped image
-			KVM_IMAGE_SIZE=$($KVM_QEMU_IMG info $FILE_BACKEND_DIR/$KVM_IMAGE_SNAPSHOT_NAME | grep ^"virtual size" | awk {' print $4 '} | sed -e s/\(//)
-			KVM_IMAGE_SIZE=$(( $KVM_IMAGE_SIZE / 1000 / 1000 ))
-
-
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-lvm-deployment" ]; then
-			# check that source fs-images exist
-			if ! `lvdisplay /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME 1>/dev/null`; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-				openqrm_post_event 0 "snap" 2 "openqrm-kvm" "Could not find /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME on the storage-server!"
-				exit 1
-			fi
-			RESIZE_FILESYSTEM=false
-			ORIGIN_SIZE=`lvs --noheadings -o lv_size --units m --nosuffix /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME | awk '{ print $1 }' | cut -d'.' -f1`
-			if [ "$ORIGIN_SIZE" == "" ]; then
-			    openqrm_post_event 0 "snap" 2 "openqrm-kvm" "Could not find out origin volume size of /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME!"
-    			exit 1
-			fi
-			if [ "$KVM_IMAGE_SIZE" != "" ]; then
-				if (( $KVM_IMAGE_SIZE > $ORIGIN_SIZE )); then
-					openqrm_post_event 0 "snap" 2 "openqrm-kvm" "Snapshot size must not be bigger than the origin volume size! ( $KVM_IMAGE_SIZE > $ORIGIN_SIZE )"
-					exit 1
-				elif [ "$KVM_IMAGE_SIZE" == "$ORIGIN_SIZE" ]; then
-					RESIZE_FILESYSTEM=false
-				else
-					ORIGIN_SIZE=$KVM_IMAGE_SIZE
-					RESIZE_FILESYSTEM=true
-				fi
-			fi
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			# aquire global lock for lvm operations
-			if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-				if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-					openqrm_global_lock aquire lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD $LOCK_TIME "Snapshot volume $KVM_IMAGE_NAME tp $KVM_IMAGE_SNAPSHOT_NAME"
-				fi
-			fi
-			kvm_refresh_lvm
-			touch $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-			lvchange -ay -y /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME
-			CMD_ERR=`lvcreate $OPENQRM_PLUGIN_KVM_LVCREATE_CUSTOM_PARAM --size $ORIGIN_SIZE"M" --snapshot --name $KVM_IMAGE_SNAPSHOT_NAME /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME 2>&1`
-			if [ "$?" != 0 ]; then
-				rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "snap" 3 "openqrm-kvm" "Error creating snapshot $KVM_IMAGE_SNAPSHOT_NAME! $CMD_ERR"
-
-				# release global lock
-				if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-					if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-						openqrm_global_lock release lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD
-					fi
-				fi
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-
-			# release global lock
-			if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-				if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-					openqrm_global_lock release lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD
-				fi
-			fi
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-			if [ "$OPENQRM_PLUGIN_KVM_RESIZE_SNAPSHOTS_FILESYSTEM" == "true" ] && [ "$RESIZE_FILESYSTEM" == "true" ]; then
-				# find the rootfs and resize it
-				if ! kvm_resize_fs /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_SNAPSHOT_NAME; then
-					openqrm_post_event 0 "snap" 2 "openqrm-kvm" "Failed resizing volume /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_SNAPSHOT_NAME!"
-				fi
-			fi
-			rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-gluster-deployment" ]; then
-			FILE_BACKEND_DIR=`kvm_get_gluster_backend_dir $KVM_VOLUME_LOCATION`
-			if [ ! -e "$FILE_BACKEND_DIR/$KVM_IMAGE_NAME" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-				openqrm_post_event 0 "snap" 2 "openqrm-kvm" "Could not find $FILE_BACKEND_DIR/$KVM_IMAGE_NAME on the storage-server!"
-				exit 1
-			fi
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			touch $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-
-			CMD_ERR=`$KVM_QEMU_IMG create -f qcow2 -b $FILE_BACKEND_DIR/$KVM_IMAGE_NAME $FILE_BACKEND_DIR/$KVM_IMAGE_SNAPSHOT_NAME 2>&1`
-			if [ "$?" != 0 ]; then
-				rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "snap" 3 "openqrm-kvm" "Error creating snapshot gluster:$resource_ip://$FILE_BACKEND_DIR/$KVM_IMAGE_SNAPSHOT_NAME! $CMD_ERR"
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-			if ! `kvm_trigger_gluster_replication $KVM_VOLUME_LOCATION $KVM_IMAGE_SNAPSHOT_NAME`; then
-				rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-				rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-				openqrm_post_event 0 "snap" 3 "openqrm-kvm" "Error triggering replication for gluster:$resource_ip://$FILE_BACKEND_DIR/$KVM_IMAGE_SNAPSHOT_NAME!"
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-			rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-ceph-deployment" ]; then
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			CMD_ERR=`rbd snap create $KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME@$KVM_IMAGE_SNAPSHOT_NAME 2>&1`
-			if [ "$?" != 0 ]; then
-				rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "snap" 3 "openqrm-kvm" "Error creating rbd snapshot $KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME@$KVM_IMAGE_SNAPSHOT_NAME! $CMD_ERR"
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-		fi
-		# in case we have a username + password post the updated list to the openQRM-server
-		if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-			# if we have an image name send size back to openQRM
-			if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD "$openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?lvm_command=set_image_size&kvm_image_name=$KVM_IMAGE_SNAPSHOT_NAME&kvm_image_size=$KVM_IMAGE_SIZE"; then
-				openqrm_post_event 0 "add" 2 "openqrm-kvm" "Could post size of volume $KVM_IMAGE_SNAPSHOT_NAME!"
-			fi
-			$0 post_lv -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD -v $KVM_VOLUME_LOCATION -t $KVM_DEPLOYMENT_TYPE $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true
-		fi
-		openqrm_post_event 0 "snap" 5 "openqrm-kvm" "Created snapshot from volume $KVM_IMAGE_NAME -> $KVM_IMAGE_SNAPSHOT_NAME."
-		;;
-
-	auth)
-		# this is just for starting auth, make sure the device is there, otherwise wait
-		if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ] && [ "$KVM_IMAGE_NAME" != "" ]; then
-			MAX_AUTH_LOOP=0
-			while (true); do
-
-# commented out, this is running during resize and changes the lvol meta data
-#				if [ "$KVM_DEPLOYMENT_TYPE" == "kvm-lvm-deployment" ]; then
-#					# aquire global lock for lvm operations
-#					if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-#						if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-#							openqrm_global_lock aquire lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD auth "Auth for volume $KVM_IMAGE_NAME"
-#						fi
-#					fi
-#					lvchange -ay -y $KVM_IMAGE_ROOTDEVICE
-#
-#					# release global lock
-#					if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-#						if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-#							openqrm_global_lock release lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD
-#						fi
-#					fi
-#				fi
-
-				if [ "$KVM_DEPLOYMENT_TYPE" == "kvm-lvm-deployment" ] || [ "$KVM_DEPLOYMENT_TYPE" == "kvm-bf-deployment" ]; then
-					if [ -e "$KVM_IMAGE_ROOTDEVICE" ]; then
-						# fs resize active ?
-						if [ ! -f "$SYNC_PROGRESS_DIR/$KVM_IMAGE_NAME" ]; then
-							break
-						fi
-					fi
-				elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-gluster-deployment" ]; then
-					# get the volume location from the image-root-devicev since it is not posted
-					VOLUME_LOCATION=`echo $KVM_IMAGE_ROOTDEVICE | cut -d':' -f3 | cut -d'/' -f3`
-					FILE_BACKEND_DIR=`kvm_get_gluster_backend_dir $VOLUME_LOCATION`
-					if [ -e "$FILE_BACKEND_DIR/$KVM_IMAGE_NAME" ]; then
-						# fs resize active ?
-						if [ ! -f "$SYNC_PROGRESS_DIR/$KVM_IMAGE_NAME" ]; then
-							break
-						fi
-					fi
-				elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-ceph-deployment" ]; then
-					VOLUME_LOCATION=`echo $KVM_IMAGE_ROOTDEVICE | cut -d':' -f2 | cut -d'/' -f1`
-					if rbd --image $KVM_IMAGE_NAME -p $VOLUME_LOCATION info 2>/dev/null 1>/dev/null; then
-						# fs resize active ?
-						if [ ! -f "$SYNC_PROGRESS_DIR/$KVM_IMAGE_NAME" ]; then
-							break
-						fi
-					fi
-				fi
-				sleep 5
-				if [ "$MAX_AUTH_LOOP" == "$MAX_VOLUME_AUTHENTICATION_LOOP" ]; then
-					openqrm_post_event 0 "auth" 2 "openqrm-kvm" "Volume volume $KVM_IMAGE_ROOTDEVICE does not exist! Auth to $KVM_IMAGE_AUTH failed!"
-					exit 1
-				fi
-				MAX_AUTH_LOOP=$(( MAX_AUTH_LOOP + 1 ))
-			done
-			# if we have an image name send back to openQRM that storage auth finished to remvoe the storage-auth-blocker
-			if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD "$openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?lvm_command=auth_finished&kvm_image_name=$KVM_IMAGE_NAME"; then
-				openqrm_post_event 0 "auth" 2 "openqrm-kvm" "Could not remove auth-blocker for volume $KVM_IMAGE_NAME!"
-			fi
-		fi
-		;;
-
-	list)
-		lvm lvs
-		;;
-	post_vg)
-		STORAGE_STATUS_TMP=$resource_id.vg.stat
-		#> $STORAGE_STATUS_TMP
-		if [ "$KVM_DEPLOYMENT_TYPE" == "kvm-bf-deployment" ]; then
-			for FILE_BACKEND in `echo $OPENQRM_PLUGIN_KVM_FILE_BACKEND_DIRECTORIES`; do
-				BACKEND_LOCATION_NAME=`echo $FILE_BACKEND | cut -d':' -f1`
-				FILE_BACKEND_DIR=`echo $FILE_BACKEND | cut -d':' -f2`
-				if [ ! -d "$FILE_BACKEND_DIR" ]; then
-					mkdir -p $FILE_BACKEND_DIR
-				fi
-				BACKEN_DIR_AVAIL_SPACE=`df --block-size MB -P $FILE_BACKEND_DIR | grep -v Used | awk '{ print $2 }'`
-				BACKEN_DIR_FREE_SPACE=`df --block-size MB -P $FILE_BACKEND_DIR | grep -v Used | awk '{ print $4 }'`
-				echo "$BACKEND_LOCATION_NAME@$FILE_BACKEND_DIR@-@-@-@"$BACKEN_DIR_AVAIL_SPACE"@"$BACKEN_DIR_FREE_SPACE"" >> $STORAGE_STATUS_TMP
-			done
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-lvm-deployment" ]; then
-			vgs --units m | grep -v VFree | sed -e "s/ \{1,\}//" > $STORAGE_STATUS_TMP
-			sed -i -e "s/ \{1,\}/@/g" $STORAGE_STATUS_TMP
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-gluster-deployment" ]; then
-			VOL_LOOP=0
-			for GLUSTER_VOL in `gluster volume list`; do
-				GLUSTER_VOL_TMP=`mktemp /tmp/kvm-gluster.XXXXXX`
-				gluster volume info $GLUSTER_VOL > $GLUSTER_VOL_TMP
-				G_TYPE=`grep -w ^Type $GLUSTER_VOL_TMP | awk '{ print $2 }'`
-				G_STATUS=`grep -w ^Status $GLUSTER_VOL_TMP | awk '{ print $2 }'`
-				G_BRICK_COUNT=`grep -w ^Number $GLUSTER_VOL_TMP | cut -d':' -f2 | sed -e "s/ \{1,\}//g"`
-				G_TRANSPORT=`grep ^Transport-type $GLUSTER_VOL_TMP | awk '{ print $2 }'`
-				for GLUSTER_BRICK in `grep -w "^Brick[0-9].*" $GLUSTER_VOL_TMP | awk '{ print $2 }'`; do
-					if [ "$VOL_LOOP" == 0 ]; then
-						G_BRICKS="$GLUSTER_BRICK"
-						# get size/free
-						GLUSTER_BRICK_BACKEND_DIR=`echo $GLUSTER_BRICK | cut -d':' -f2`
-						GLUSTER_BRICK_BACKEND_DIR=`dirname $GLUSTER_BRICK_BACKEND_DIR`
-						BACKEN_DIR_AVAIL_SPACE=`df --block-size MB -P $GLUSTER_BRICK_BACKEND_DIR | grep -v Used | awk '{ print $2 }'`
-						BACKEN_DIR_FREE_SPACE=`df --block-size MB -P $GLUSTER_BRICK_BACKEND_DIR | grep -v Used | awk '{ print $4 }'`
-					else
-						G_BRICKS="$G_BRICKS"",""$GLUSTER_BRICK"
-					fi
-					VOL_LOOP=$(( VOL_LOOP + 1 ))
-				done
-				echo $GLUSTER_VOL"@"$G_TYPE"@"$G_STATUS"@"$G_BRICK_COUNT"@"$G_TRANSPORT"@"$BACKEN_DIR_AVAIL_SPACE"@"$BACKEN_DIR_FREE_SPACE"@"$G_BRICKS"" >> $STORAGE_STATUS_TMP
-				rm -f $GLUSTER_VOL_TMP
-			done
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-ceph-deployment" ]; then
-			for CEPH_POOL in `rados lspools`; do
-				BACKEND_SUMMARY=`ceph df | grep ^" " | awk '{ print $1","$2","$3","$4","$5","$6 }' | grep -A 1000 -w ^NAME | grep -w ^$CEPH_POOL`
-				BACKEND_USED_SPACE_PERCENT=`echo $BACKEND_SUMMARY | cut -d',' -f4`
-				BACKEND_ID=`echo $BACKEND_SUMMARY | cut -d',' -f2`
-				BACKEND_OBJECTS=`echo $BACKEND_SUMMARY | cut -d',' -f6`
-				BACKEND_USED_SPACE=`echo $BACKEND_SUMMARY | cut -d',' -f3`
-				BACKEND_USED_SPACE=`ceph_inmb $BACKEND_USED_SPACE`
-				BACKEND_AVAIL_SPACE=`echo $BACKEND_SUMMARY | cut -d',' -f5`
-				BACKEND_AVAIL_SPACE=`ceph_inmb $BACKEND_AVAIL_SPACE`
-				echo "$CEPH_POOL@"$BACKEND_ID"@"$BACKEND_OBJECTS"@"$BACKEND_USED_SPACE_PERCENT"@"$BACKEND_USED_SPACE"@-@"$BACKEND_AVAIL_SPACE"" >> $STORAGE_STATUS_TMP
-			done
-		fi
-
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?lvm_command=get; then
-			openqrm_post_event 0 "post_vg" 2 "openqrm-kvm" "Could not post the volume group status to the openQRM-server at $OPENQRM_SERVER_IP!"
-		fi
-		rm -f $STORAGE_STATUS_TMP $STORAGE_STATUS_TMP.post
-		;;
-	post_lv)
-		STORAGE_STATUS_TMP=$resource_id.$KVM_VOLUME_LOCATION.lv.stat
-		> $STORAGE_STATUS_TMP
-		if [ "$KVM_DEPLOYMENT_TYPE" == "kvm-bf-deployment" ]; then
-			FILE_BACKEND_DIR=`kvm_get_backend_dir $KVM_VOLUME_LOCATION`
-			if [ -d "$FILE_BACKEND_DIR" ]; then
-				for FILE_BACKEND in `ls $FILE_BACKEND_DIR/*`; do
-					VOLUME_FILENAME=`basename $FILE_BACKEND`
-					VOLUME_FILE_SIZE=$($KVM_QEMU_IMG info $FILE_BACKEND_DIR/$VOLUME_FILENAME | grep ^"virtual size" | awk {' print $4 '} | sed -e s/\(//)
-					VOLUME_ORIGIN="x"
-					if [ -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$VOLUME_FILENAME.clone_in_progress" ]; then
-						echo "kvm-bf-deployment@$VOLUME_FILENAME@$FILE_BACKEND@file@clone_in_progress@x@x@" >> $STORAGE_STATUS_TMP
-					else
-						FT=`kvm_get_image_type $FILE_BACKEND`
-						if [ "$FT" == "snapshot" ]; then
-							VOLUME_ORIGIN=`file $FILE_BACKEND | sed -e "s/.*(path //g" | cut -d')' -f1`
-						fi
-						echo "kvm-bf-deployment@$VOLUME_FILENAME@$FILE_BACKEND@$FT@$VOLUME_FILE_SIZE@$VOLUME_ORIGIN@x@" >> $STORAGE_STATUS_TMP
-					fi
-				done
-			fi
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-lvm-deployment" ]; then
-			lvs $KVM_VOLUME_LOCATION --noheadings --units m -o lv_name,vg_name,lv_attr,lv_size,origin | sed -e "s/ \{1,\}//" > $STORAGE_STATUS_TMP.tmp
-			for LVOL in `cat $STORAGE_STATUS_TMP.tmp | awk {' print $1 '}`; do
-				# check for clone-in-progress
-				if [ -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$LVOL.clone_in_progress" ]; then
-				    echo "kvm-lvm-deployment@$LVOL@$KVM_VOLUME_LOCATION@-@clone_in_progress@@@" >> $STORAGE_STATUS_TMP
-				else
-				    echo -n "kvm-lvm-deployment " >> $STORAGE_STATUS_TMP
-					grep -w ^$LVOL $STORAGE_STATUS_TMP.tmp >> $STORAGE_STATUS_TMP
-				fi
-			done
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-gluster-deployment" ]; then
-			FILE_BACKEND_DIR=`kvm_get_gluster_backend_dir $KVM_VOLUME_LOCATION`
-			if [ -d "$FILE_BACKEND_DIR" ]; then
-				for FILE_BACKEND in `ls $FILE_BACKEND_DIR/*`; do
-					VOLUME_FILENAME=`basename $FILE_BACKEND`
-					VOLUME_FILE_SIZE=`ls -l $FILE_BACKEND | awk '{ print $5 }'`
-					VOLUME_ORIGIN="x"
-					if [ -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$VOLUME_FILENAME.clone_in_progress" ]; then
-					    echo "kvm-gluster-deployment@$VOLUME_FILENAME@$FILE_BACKEND@file@clone_in_progress@x@x@" >> $STORAGE_STATUS_TMP
-					else
-						FT=`kvm_get_image_type $FILE_BACKEND`
-						if [ "$FT" == "snapshot" ]; then
-							VOLUME_ORIGIN=`file $FILE_BACKEND | sed -e "s/.*(path //g" | cut -d')' -f1`
-							VOLUME_ORIGIN=`basename $VOLUME_ORIGIN`
-						fi
-					    echo "kvm-gluster-deployment@$VOLUME_FILENAME@$FILE_BACKEND@$FT@$VOLUME_FILE_SIZE@$VOLUME_ORIGIN@x@" >> $STORAGE_STATUS_TMP
-					fi
-				done
-			fi
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-ceph-deployment" ]; then
-
-			for CVOLUME in `rbd ls -l $KVM_VOLUME_LOCATION | sed '1d' | awk '{ print $1 }'`; do
-				# origin or snap
-				if echo $CVOLUME | grep '@' 1>/dev/null; then
-					CORIGIN=`echo $CVOLUME | cut -d'@' -f1`
-				else
-					CORIGIN=""
-				fi
-
-				CVOLINFO=`rbd info $KVM_VOLUME_LOCATION/$CVOLUME`
-				CVOLSIZE=`echo $CVOLINFO | sed -e "s#.*size ##" | awk '{ print $1 }'`
-				CVOLSIZETYPE=`echo $CVOLINFO | sed -e "s#.*size ##" | awk '{ print $2 }'`
-				case "$CVOLSIZETYPE" in
-					MiB)
-						CVOLSIZE=$CVOLSIZE"M"
-						;;
-					GiB)
-						CVOLSIZE=$CVOLSIZE"G"
-						;;
-					TiB)
-						CVOLSIZE=$CVOLSIZE"T"
-						;;
-				esac
-				CVOLSIZE=`ceph_inmb $CVOLSIZE`
-				CVOLORDER=`echo $CVOLINFO | sed -e "s#.*order ##" | awk '{ print $1 }'`
-				CVOLUME=`echo $CVOLUME | sed -e "s/@/%/g"`
-				CVOLROOT="rbd:$KVM_VOLUME_LOCATION/$CVOLUME"
-				echo "kvm-ceph-deployment@$CVOLUME@$CVOLROOT@@$CVOLSIZE@$CORIGIN@x@" >> $STORAGE_STATUS_TMP
-
-			done
-
-		fi
-		sed -i -e "s/ \{1,\}/@/g" $STORAGE_STATUS_TMP
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?lvm_command=get; then
-			openqrm_post_event 0 "post_lv" 2 "openqrm-kvm" "Could not post the volume status to the openQRM-server at $OPENQRM_SERVER_IP!"
-		fi
-		rm -f $STORAGE_STATUS_TMP $STORAGE_STATUS_TMP.post $STORAGE_STATUS_TMP.tmp
-		;;
-	post_identifier)
-		if [ "$KVM_DEPLOYMENT_TYPE" == "kvm-bf-deployment" ]; then
-			STORAGE_STATUS_TMP=$resource_id.lv.kvm-bf-deployment.ident
-			> $STORAGE_STATUS_TMP
-			for FILE_BACKEND in `echo $OPENQRM_PLUGIN_KVM_FILE_BACKEND_DIRECTORIES`; do
-				BACKEND_LOCATION_NAME=`echo $FILE_BACKEND | cut -d':' -f1`
-				FILE_BACKEND_DIR=`echo $FILE_BACKEND | cut -d':' -f2`
-				if [ -d "$FILE_BACKEND_DIR" ]; then
-					for FILE_BACKEND in `ls $FILE_BACKEND_DIR/*`; do
-						BACKEND_FILENAME=`basename $FILE_BACKEND`
-						echo "$BACKEND_LOCATION_NAME - $BACKEND_FILENAME:$FILE_BACKEND" >> $STORAGE_STATUS_TMP
-					done
-				fi
-			done
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-lvm-deployment" ]; then
-			STORAGE_STATUS_TMP=$resource_id.lv.kvm-lvm-deployment.ident
-			> $STORAGE_STATUS_TMP
-			for LVOL in `openqrm_get_lvm_volume_paths`; do
-				LVOL_SHORT=`basename $LVOL`
-				IMAGE_NAME=$LVOL_SHORT
-				VOLUME_GROUP=`echo $LVOL | cut -d'/' -f3`
-				echo "$IMAGE_NAME:/dev/$VOLUME_GROUP/$IMAGE_NAME" >> $STORAGE_STATUS_TMP
-
-			done
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-gluster-deployment" ]; then
-			STORAGE_STATUS_TMP=$resource_id.lv.kvm-gluster-deployment.ident
-			> $STORAGE_STATUS_TMP
-			for GLUSTER_VOL in `gluster volume list`; do
-				FILE_BACKEND_DIR=`kvm_get_gluster_backend_dir $GLUSTER_VOL`
-				if [ -d "$FILE_BACKEND_DIR" ]; then
-					for FILE_BACKEND in `ls $FILE_BACKEND_DIR/*`; do
-						VOLUME_FILENAME=`basename $FILE_BACKEND`
-						echo "$VOLUME_FILENAME:gluster:$resource_ip://$GLUSTER_VOL/$VOLUME_FILENAME" >> $STORAGE_STATUS_TMP
-					done
-				fi
-			done
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-ceph-deployment" ]; then
-			STORAGE_STATUS_TMP=$resource_id.lv.kvm-ceph-deployment.ident
-			> $STORAGE_STATUS_TMP
-			for CEPH_POOL in `ceph osd lspools`; do
-				for IMAGE_NAME in `rbd ls $CEPH_POOL`; do
-					echo "rbd:$CEPH_POOL/$IMAGE_NAME" >> $STORAGE_STATUS_TMP
-				done
-			done
-		fi
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?lvm_command=get_ident; then
-			openqrm_post_event 0 "post_identifier" 2 "openqrm-kvm" "Could not post the volume identifier to the openQRM-server at $OPENQRM_SERVER_IP!"
-		fi
-		rm -f $STORAGE_STATUS_TMP $STORAGE_STATUS_TMP.post
-		;;
-
-
-	resize)
-		if [ "$KVM_DEPLOYMENT_TYPE" == "kvm-bf-deployment" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "resize" 2 "openqrm-kvm" "Resize is not supported for local blockfile backends!"
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-lvm-deployment" ]; then
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			# aquire global lock for lvm operations
-			if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-				if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-					openqrm_global_lock aquire lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD $LOCK_TIME "Resize volume $KVM_IMAGE_NAME"
-				fi
-			fi
-			kvm_refresh_lvm
-			touch $SYNC_PROGRESS_DIR/$KVM_IMAGE_NAME
-			lvchange -ay -y /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME
-			CMD_ERR=`lvresize -L $KVM_IMAGE_SIZE /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME 2>&1`
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "add" 3 "openqrm-kvm" "Error lvm resisiging volume /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME! $CMD_ERR"
-
-				# release global lock
-				if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-					if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-						openqrm_global_lock release lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD
-					fi
-				fi
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-
-			# release global lock
-			if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-				if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-					openqrm_global_lock release lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD
-				fi
-			fi
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-			if [ "$OPENQRM_PLUGIN_KVM_RESIZE_SNAPSHOTS_FILESYSTEM" == "true" ]; then
-				# resize partition and rootfs
-				if kvm_resize_fs /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME; then
-					openqrm_post_event 0 "resize" 5 "openqrm-kvm" "Resized logical volume $KVM_IMAGE_NAME on volume group $KVM_VOLUME_LOCATION."
-				else
-					openqrm_post_event 0 "resize" 2 "openqrm-kvm" "Failed resizing logical volume $KVM_IMAGE_NAME on volume group $KVM_VOLUME_LOCATION."
-				fi
-			fi
-			rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_NAME
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-gluster-deployment" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "resize" 2 "openqrm-kvm" "Resize is not supported for Gluster backends!"
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-ceph-deployment" ]; then
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			touch $SYNC_PROGRESS_DIR/$KVM_IMAGE_NAME
-
-			CMD_ERR=`rbd resize -p $KVM_VOLUME_LOCATION --image $KVM_IMAGE_NAME --size $KVM_IMAGE_SIZE --allow-shrink 2>&1`
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "add" 3 "openqrm-kvm" "Error resizing rbd volume rbd:$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME! $CMD_ERR"
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-			if [ "$OPENQRM_PLUGIN_KVM_RESIZE_SNAPSHOTS_FILESYSTEM" == "true" ]; then
-				kvm_resize_ceph_fs $KVM_IMAGE_NAME $KVM_VOLUME_LOCATION
-			fi
-			rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_NAME
-		fi
-		# in case we have a username + password post the updated list to the openQRM-server
-		if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-			# if we have an image name send size back to openQRM
-			if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD "$openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?lvm_command=set_image_size&kvm_image_name=$KVM_IMAGE_NAME&kvm_image_size=$KVM_IMAGE_SIZE"; then
-				openqrm_post_event 0 "add" 2 "openqrm-kvm" "Could post size of volume $KVM_IMAGE_NAME!"
-			fi
-			$0 post_lv -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD -v $KVM_VOLUME_LOCATION -t $KVM_DEPLOYMENT_TYPE $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true
-		fi
-		;;
-
-
-	clone)
-		# cloning is similar to snapshots but since lvm cannot (yet) create snapshots
-		# from snapshots we have to dd the origin (which may be a snapshot) to a
-		# new lvol.
-		if [ "$KVM_IMAGE_SNAPSHOT_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ "$KVM_DEPLOYMENT_TYPE" == "kvm-bf-deployment" ]; then
-			# check that source fs-images exist
-			# notice : here the kvm-volume-location comes from the cloud-hook and uses the dirname of the rootfs-ident
-			FILE_BACKEND_DIR=`kvm_get_backend_dir $KVM_VOLUME_LOCATION`
-			if [ ! -e "$FILE_BACKEND_DIR/$KVM_IMAGE_NAME" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-				openqrm_post_event 0 "snap" 2 "openqrm-kvm" "Could not find $FILE_BACKEND_DIR/$KVM_IMAGE_NAME on the storage-server!"
-				exit 1
-			fi
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			# create locks for origin + snapshot
-			touch "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-			touch "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-			touch $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-			# no plugin lock for copying
-			# we copy to a tmp name first, then move
-			# copying will take some time, as soon as we moved the auth-hook will succeed
-			# but not before copying has finished
-			# create long-term-action start event
-			openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 9 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-			# post exports early, we show the progress in the ui
-			if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-			    $0 post_sync_progress -n $KVM_IMAGE_SNAPSHOT_NAME -v $FILE_BACKEND_DIR -t kvm-bf-deployment -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true &
-			fi
-			# delay start sync
-			sleep 10
-
-			CMD_ERR=`/bin/cp -f $FILE_BACKEND_DIR/$KVM_IMAGE_NAME $FILE_BACKEND_DIR/$KVM_IMAGE_SNAPSHOT_NAME 2>&1`
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-			    openqrm_post_event 0 "clone" 2 "openqrm-kvm" "Could not copy target logical volume $KVM_IMAGE_NAME! $CMD_ERR"
-			    rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-			    rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-				openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 10 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-			    exit 1
-			fi
-			rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-			rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-			rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-			# stop sync-progress monitor and send sync-finished to openQRM
-			$0 post_sync_finished -n $KVM_IMAGE_SNAPSHOT_NAME -v $FILE_BACKEND_DIR -t kvm-bf-deployment -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true
-			# Get size of cloned image
-			ORIGIN_SIZE=$($KVM_QEMU_IMG info $FILE_BACKEND_DIR/$KVM_IMAGE_SNAPSHOT_NAME | grep ^"virtual size" | awk {' print $4 '} | sed -e s/\(//)
-			ORIGIN_SIZE=$(( $ORIGIN_SIZE / 1000 / 1000 ))
-
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-lvm-deployment" ]; then
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			RESIZE_FILESYSTEM=false
-			ORIGIN_SIZE=""
-			ORIGIN_VOLUME="/dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME"
-			# if source volume is a snapshot find out the size of the origin
-			VOLUME_IS_SNAPSHOT=`lvs --noheadings -o origin $ORIGIN_VOLUME | awk '{ print $1 }'`
-			if [ "$VOLUME_IS_SNAPSHOT" != "" ]; then
-				ORIGIN_VOLUME="/dev/$KVM_VOLUME_LOCATION/$VOLUME_IS_SNAPSHOT"
-			fi
-			ORIGIN_SIZE=`lvs --noheadings -o lv_size --units m --nosuffix $ORIGIN_VOLUME | awk '{ print $1 }' | cut -d'.' -f1`
-			if [ "$ORIGIN_SIZE" == "" ]; then
-			    openqrm_post_event 0 "clone" 2 "openqrm-kvm" "Could not find out origin volume size!"
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-    			exit 1
-			fi
-
-			# if the image size is set we clone and resize to the bigger image size
-			if [ "$KVM_IMAGE_SIZE" != "" ]; then
-				if (( $KVM_IMAGE_SIZE < $ORIGIN_SIZE )); then
-					openqrm_post_event 0 "clone" 2 "openqrm-kvm" "Clone size must not be smaller than the origin volume size! ( $KVM_IMAGE_SIZE > $ORIGIN_SIZE )"
-
-					openqrm_lock_queue release kvm $LOCK_TIME
-					trap '' EXIT
-
-					exit 1
-				elif [ "$KVM_IMAGE_SIZE" == "$ORIGIN_SIZE" ]; then
-					RESIZE_FILESYSTEM=false
-				else
-					ORIGIN_SIZE=$KVM_IMAGE_SIZE
-					RESIZE_FILESYSTEM=true
-				fi
-			fi
-
-			# create locks for origin + snapshot
-			touch "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-			touch "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-			touch $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-			# create long-term-action start event
-			openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 9 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-
-			# aquire global lock for lvm operations
-			if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-				if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-					openqrm_global_lock aquire lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD $LOCK_TIME "Cloning volume $KVM_IMAGE_NAME to $KVM_IMAGE_SNAPSHOT_NAME"
-				fi
-			fi
-			kvm_refresh_lvm
-			CMD_ERR=`lvcreate $OPENQRM_PLUGIN_KVM_LVCREATE_CUSTOM_PARAM -L$ORIGIN_SIZE""M -n$KVM_IMAGE_SNAPSHOT_NAME $KVM_VOLUME_LOCATION 2>&1`
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-
-				rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-				openqrm_post_event 0 "clone" 2 "openqrm-kvm" "Could not create volume $KVM_IMAGE_SNAPSHOT_NAME! $CMD_ERR"
-				rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-				rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-				openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 10 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-
-				# release global lock
-				if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-					if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-						openqrm_global_lock release lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD
-					fi
-				fi
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-    			exit 1
-			fi
-			lvchange -ay -y /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME
-			lvchange -ay -y /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_SNAPSHOT_NAME
-
-			# release global lock
-			if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-				if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-					openqrm_global_lock release lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD
-				fi
-			fi
-
-			# post exports early, we show the progress in the ui
-			if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-				$0 post_sync_progress -n $KVM_IMAGE_SNAPSHOT_NAME -v $KVM_VOLUME_LOCATION -t kvm-lvm-deployment -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true &
-			fi
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-###### Caching start
-
-			IMAGE_CLONE_EXISTS=false
-			# check for the local cache dir
-			if [ "$OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE" != "" ] && [ "$KVM_IMAGE_CACHE" == "true" ]; then
-				if [ ! -d "$OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE" ]; then
-					mkdir -p "$OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE"
-				fi
-				# here we create a local zipped copy of the master image in the cache dir
-				if [ ! -f "$OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE/$KVM_IMAGE_NAME.gz" ]; then
-					openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 9 "kvm" "Caching volume $KVM_IMAGE_NAME on resource $resource_id"
-					CMD_ERR=`dd if=/dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME bs=64K | gzip -c  > $OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE/$KVM_IMAGE_NAME.gz`
-					if [ "$?" == 0 ] && [ -f "$OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE/$KVM_IMAGE_NAME.gz" ]; then
-						# copy from the local cloned master image
-						IMAGE_CLONE_EXISTS=true
-					else
-						CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-						# log error and copy directly from the master image
-						openqrm_post_event 0 "clone" 2 "openqrm-kvm" "Error caching volume $KVM_IMAGE_NAME! $CMD_ERR"
-						openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 10 "Caching volume $KVM_IMAGE_NAME on resource $resource_id"
-					fi
-					openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 10 "Caching volume $KVM_IMAGE_NAME on resource $resource_id"
-				else
-					# copy from the local cloned master image
-					GZ_SIZE=$(ls -l $OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE/$KVM_IMAGE_NAME.gz | awk '{ print $5 }')
-					sleep 2
-					while [ true ] ; do
-						CURRENT_SIZE=$(ls -l $OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE/$KVM_IMAGE_NAME.gz | awk '{ print $5 }')
-						if [ $CURRENT_SIZE == $GZ_SIZE ]; then
-							IMAGE_CLONE_EXISTS=true
-							break
-						else
-							GZ_SIZE=$CURRENT_SIZE
-							sleep 2
-						fi
-					done
-				fi
-			fi
-
-			sleep 2
-			if [ "$IMAGE_CLONE_EXISTS" == "true" ]; then
-				# copy content from cloned master
-				CMD_ERR=`nice --20 gunzip -c $OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE/$KVM_IMAGE_NAME.gz | dd of=/dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_SNAPSHOT_NAME bs=64K 2>&1`
-				if [ "$?" != 0 ]; then
-					CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-					rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-					openqrm_post_event 0 "clone" 2 "openqrm-kvm" "Error copying content for volume $KVM_IMAGE_SNAPSHOT_NAME! $CMD_ERR"
-					rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-					rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-					openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 10 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-					exit 1
-				fi
-			else
-				# copy content directly from master
-				CMD_ERR=`nice --20 dd if=/dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME of=/dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_SNAPSHOT_NAME bs=64K 2>&1`
-				if [ "$?" != 0 ]; then
-					CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-					rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-					openqrm_post_event 0 "clone" 2 "openqrm-kvm" "Error cloning volume $KVM_IMAGE_SNAPSHOT_NAME! $CMD_ERR"
-					rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-					rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-					openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 10 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-					exit 1
-				fi
-			fi
-
-###### Resize
-
-			if [ "$OPENQRM_PLUGIN_KVM_RESIZE_SNAPSHOTS_FILESYSTEM" == "true" ] && [ "$RESIZE_FILESYSTEM" == "true" ]; then
-				# resize partition and rootfs
-				if ! kvm_resize_fs /dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_SNAPSHOT_NAME; then
-					rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-					rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-					rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-					openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 10 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-				fi
-			fi
-
-			rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-			rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-			rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-			# stop sync-progress monitor and send sync-finished to openQRM
-			$0 post_sync_finished -n $KVM_IMAGE_SNAPSHOT_NAME -v $KVM_VOLUME_LOCATION -t kvm-lvm-deployment -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true
-
-
-
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-gluster-deployment" ]; then
-			FILE_BACKEND_DIR=`kvm_get_gluster_backend_dir $KVM_VOLUME_LOCATION`
-			if [ ! -e "$FILE_BACKEND_DIR/$KVM_IMAGE_NAME" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-				openqrm_post_event 0 "clone" 2 "openqrm-kvm" "Could not find $FILE_BACKEND_DIR/$KVM_IMAGE_NAME on the storage-server!"
-				exit 1
-			fi
-			# create locks for origin + snapshot
-			touch $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			touch "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-			touch "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-			# post exports early, we show the progress in the ui
-			openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 9 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-			if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-				$0 post_sync_progress -n $KVM_IMAGE_SNAPSHOT_NAME -v $KVM_VOLUME_LOCATION -t kvm-gluster-deployment -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true &
-			fi
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-			CMD_ERR=`cp -af $FILE_BACKEND_DIR/$KVM_IMAGE_NAME $FILE_BACKEND_DIR/$KVM_IMAGE_SNAPSHOT_NAME 2>&1`
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-				openqrm_post_event 0 "clone" 3 "openqrm-kvm" "Error cloning volume $FILE_BACKEND_DIR/$KVM_IMAGE_SNAPSHOT_NAME! $CMD_ERR"
-				openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 10 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-				exit 1
-			fi
-			if ! `kvm_trigger_gluster_replication $KVM_VOLUME_LOCATION $KVM_IMAGE_SNAPSHOT_NAME`; then
-				rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-				openqrm_post_event 0 "clone" 3 "openqrm-kvm" "Error triggering replication for gluster:$resource_ip://$FILE_BACKEND_DIR/$KVM_IMAGE_SNAPSHOT_NAME!"
-				openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 10 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-				exit 1
-			fi
-			rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-			rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-
-			rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-			# stop sync-progress monitor and send sync-finished to openQRM
-			$0 post_sync_finished -n $KVM_IMAGE_SNAPSHOT_NAME -v $FILE_BACKEND_DIR -t kvm-gluster-deployment -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true
-
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-ceph-deployment" ]; then
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			# create locks for origin + snapshot
-			touch $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-			touch "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-			touch "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-			# post exports early, we show the progress in the ui
-			openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 9 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-			if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-				$0 post_sync_progress -n $KVM_IMAGE_SNAPSHOT_NAME -v $KVM_VOLUME_LOCATION -t kvm-ceph-deployment -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true &
-			fi
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-			# get volume size
-			CVOLINFO=`rbd info $KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME`
-			ORIGIN_SIZE=`echo $CVOLINFO | sed -e "s#.*size ##" | awk '{ print $1 }'`
-
-			CMD_ERR=`rbd snap create $KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME@$KVM_IMAGE_SNAPSHOT_NAME 2>&1`
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-				rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-				rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-				$0 post_sync_finished -n $KVM_IMAGE_SNAPSHOT_NAME -v $KVM_VOLUME_LOCATION -t kvm-ceph-deployment -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true
-				openqrm_post_event 0 "clone" 3 "openqrm-kvm" "Error creating snapshot for cloning volume $KVM_VOLUME_LOCATION/$KVM_IMAGE_SNAPSHOT_NAME! $CMD_ERR"
-				openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 10 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-				exit 1
-			fi
-
-			CMD_ERR=`rbd snap protect $KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME@$KVM_IMAGE_SNAPSHOT_NAME 2>&1`
-			if [ "$?" != 0 ]; then
-				# try to cleanup first
-				rbd snap rm $KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME@$KVM_IMAGE_SNAPSHOT_NAME 2>&1
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-				rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-				rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-				$0 post_sync_finished -n $KVM_IMAGE_SNAPSHOT_NAME -v $KVM_VOLUME_LOCATION -t kvm-ceph-deployment -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true
-				openqrm_post_event 0 "clone" 3 "openqrm-kvm" "Error protecting snapshot volume $KVM_VOLUME_LOCATION/$KVM_IMAGE_SNAPSHOT_NAME! $CMD_ERR"
-				openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 10 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-				exit 1
-			fi
-
-			CMD_ERR=`rbd clone $OPENQRM_PLUGIN_CEPH_IMAGE_FEATURE $KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME@$KVM_IMAGE_SNAPSHOT_NAME $KVM_VOLUME_LOCATION/$KVM_IMAGE_SNAPSHOT_NAME 2>&1`
-			if [ "$?" != 0 ]; then
-				# try to cleanup first
-				rbd snap unprotect $KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME@$KVM_IMAGE_SNAPSHOT_NAME 2>&1
-				rbd snap rm $KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME@$KVM_IMAGE_SNAPSHOT_NAME 2>&1
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-				rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-				rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-				$0 post_sync_finished -n $KVM_IMAGE_SNAPSHOT_NAME -v $KVM_VOLUME_LOCATION -t kvm-ceph-deployment -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true
-				openqrm_post_event 0 "clone" 3 "openqrm-kvm" "Error cloning volume $KVM_VOLUME_LOCATION/$KVM_IMAGE_SNAPSHOT_NAME! $CMD_ERR"
-				openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 10 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-				exit 1
-			fi
-
-			CMD_ERR=`rbd flatten $KVM_VOLUME_LOCATION/$KVM_IMAGE_SNAPSHOT_NAME 2>&1`
-			if [ "$?" != 0 ]; then
-				# try to cleanup first
-				rbd snap unprotect $KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME@$KVM_IMAGE_SNAPSHOT_NAME 2>&1
-				rbd snap rm $KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME@$KVM_IMAGE_SNAPSHOT_NAME 2>&1
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-				rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-				rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-				$0 post_sync_finished -n $KVM_IMAGE_SNAPSHOT_NAME -v $KVM_VOLUME_LOCATION -t kvm-ceph-deployment -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true
-				openqrm_post_event 0 "clone" 3 "openqrm-kvm" "Error syncing/flatten volume $KVM_VOLUME_LOCATION/$KVM_IMAGE_SNAPSHOT_NAME! $CMD_ERR"
-				openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 10 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-				exit 1
-			fi
-
-			CMD_ERR=`rbd snap unprotect $KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME@$KVM_IMAGE_SNAPSHOT_NAME 2>&1`
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-				rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-				rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-				$0 post_sync_finished -n $KVM_IMAGE_SNAPSHOT_NAME -v $KVM_VOLUME_LOCATION -t kvm-ceph-deployment -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true
-				openqrm_post_event 0 "clone" 3 "openqrm-kvm" "Error unprotecting snapshot $KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME@$KVM_IMAGE_SNAPSHOT_NAME! $CMD_ERR"
-				openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 10 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-				exit 1
-			fi
-
-
-			CMD_ERR=`rbd snap rm $KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME@$KVM_IMAGE_SNAPSHOT_NAME 2>&1`
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-				rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-				rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-				$0 post_sync_finished -n $KVM_IMAGE_SNAPSHOT_NAME -v $KVM_VOLUME_LOCATION -t kvm-ceph-deployment -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true
-				openqrm_post_event 0 "clone" 3 "openqrm-kvm" "Error removing snapshot $KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME@$KVM_IMAGE_SNAPSHOT_NAME! $CMD_ERR"
-				openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 10 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-				exit 1
-			fi
-
-
-			rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_NAME.sync_in_progress.$KVM_IMAGE_SNAPSHOT_NAME"
-			rm -f "$SYNC_PROGRESS_DIR/$KVM_VOLUME_LOCATION-$KVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-			rm -f $SYNC_PROGRESS_DIR/$KVM_IMAGE_SNAPSHOT_NAME
-			# stop sync-progress monitor and send sync-finished to openQRM
-			$0 post_sync_finished -n $KVM_IMAGE_SNAPSHOT_NAME -v $KVM_VOLUME_LOCATION -t kvm-ceph-deployment -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD $OPENQRM_UI_USER_PARAMETER --openqrm-internal-cmd true
-		fi
-
-		# create long-term-action finished event
-		openqrm_post_event 0 "$KVM_IMAGE_SNAPSHOT_NAME" 10 "kvm" "Started to clone $KVM_IMAGE_SNAPSHOT_NAME from $KVM_IMAGE_NAME"
-
-		# here we notify openQRM that cloning has finished
-		# in case we have a username + password post the updated list to the openQRM-server
-		# and notify openQRM that cloning has finished
-		if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-			CLONE_FINISHED="$KVM_IMAGE_SNAPSHOT_NAME.clone"
-			touch $CLONE_FINISHED
-			if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $CLONE_FINISHED` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?lvm_command=clone_finished; then
-				openqrm_post_event 0 "clone" 2 "openqrm-kvm" "Could not post clone-finished status to the openQRM-server at $OPENQRM_SERVER_IP!"
-			fi
-			# if we have an image name send size back to openQRM
-			if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD "$openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?lvm_command=set_image_size&kvm_image_name=$KVM_IMAGE_SNAPSHOT_NAME&kvm_image_size=$ORIGIN_SIZE"; then
-				openqrm_post_event 0 "add" 2 "openqrm-kvm" "Could post size of volume $KVM_IMAGE_SNAPSHOT_NAME!"
-			fi
-			rm -f $CLONE_FINISHED $CLONE_FINISHED.post
-		fi
-		openqrm_post_event 0 "clone" 5 "openqrm-kvm" "Cloned volume $KVM_IMAGE_NAME to $KVM_IMAGE_SNAPSHOT_NAME on volume group $KVM_VOLUME_LOCATION"
-		;;
-
-
-	post_sync_progress)
-		echo "Posting progress of the sync action for volume $KVM_IMAGE_NAME to the openQRM-server"
-		STORAGE_STATUS_TMP=$resource_id.lvm.$KVM_IMAGE_NAME.sync_progress
-		# posting also the root-device identifier once
-		VOLUME_ROOT_DEVICE_IDENTIFIER=$resource_id.$KVM_IMAGE_NAME.root_device
-		if [ "$KVM_DEPLOYMENT_TYPE" == "kvm-bf-deployment" ]; then
-			FILE_BACKEND_DIR=`kvm_get_backend_dir $KVM_VOLUME_LOCATION`
-			echo "$FILE_BACKEND_DIR/$KVM_IMAGE_NAME" > $VOLUME_ROOT_DEVICE_IDENTIFIER
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-lvm-deployment" ]; then
-			echo "/dev/$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME" > $VOLUME_ROOT_DEVICE_IDENTIFIER
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-gluster-deployment" ]; then
-			echo "gluster:$resource_ip://$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME" > $VOLUME_ROOT_DEVICE_IDENTIFIER
-		elif [ "$KVM_DEPLOYMENT_TYPE" == "kvm-ceph-deployment" ]; then
-			echo "rbd:$KVM_VOLUME_LOCATION/$KVM_IMAGE_NAME" > $VOLUME_ROOT_DEVICE_IDENTIFIER
-		fi
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD --post-file=`$OPENQRM_POSTENCODE $VOLUME_ROOT_DEVICE_IDENTIFIER` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?lvm_command=get_sync_progress; then
-			kvm_log "post_sync_progress" "Could not post the root-device ident for volume $KVM_IMAGE_NAME to openQRM at $OPENQRM_SERVER_IP."
-		fi
-		rm -f $VOLUME_ROOT_DEVICE_IDENTIFIER $VOLUME_ROOT_DEVICE_IDENTIFIER.post
-		# sync in progress
-		for SEQ in `seq 0 99`; do
-		    # check if we are finished already
-		    if [ -f "$STORAGE_STATUS_TMP" ]; then
-			CURRENT_PROGRESS=`cat $STORAGE_STATUS_TMP`
-			if [ "$CURRENT_PROGRESS" == "100" ]; then
-			    exit 0
-			fi
-		    fi
-		    echo "$SEQ" > $STORAGE_STATUS_TMP
-		    if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?lvm_command=get_sync_progress; then
-			    kvm_log "post_sync_progress" "Could not post the sync progress for volume $KVM_IMAGE_NAME to openQRM at $OPENQRM_SERVER_IP."
-		    fi
-		    rm -f $STORAGE_STATUS_TMP $STORAGE_STATUS_TMP.post
-		    sleep 2
-		done
-		;;
-
-
-	post_sync_finished)
-		echo "Posting finished for volume $KVM_IMAGE_NAME to the openQRM-server"
-		STORAGE_STATUS_TMP=$resource_id.lvm.$KVM_IMAGE_NAME.sync_progress
-		echo "100" > $STORAGE_STATUS_TMP
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?lvm_command=get_sync_finished; then
-			kvm_log "post_sync_finished" "Could not post the sync progress for volume $KVM_IMAGE_NAME to openQRM at $OPENQRM_SERVER_IP."
-		fi
-		rm -f $STORAGE_STATUS_TMP $STORAGE_STATUS_TMP.post
-		;;
-
-
-	purge_cache)
-		if [ "$KVM_IMAGE_NAME" == "" ]; then
-			kvm_usage
-		fi
-		if [ "$OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE" == "" ]; then
-			echo "No LVM image cache configured"
-			exit 1
-		fi
-		if [ ! -d "$OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE" ]; then
-			echo "No LVM image cache existing"
-			exit 1
-		fi
-		if [ "$KVM_IMAGE_NAME" == "all" ]; then
-			rm -f $OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE/*.gz
-			echo "Purged LVM image cache"
-		else
-			if [ -e "$OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE/$KVM_IMAGE_NAME.gz" ]; then
-				rm -f $OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE/$KVM_IMAGE_NAME.gz
-				echo "Purged LVM volume $KVM_IMAGE_NAME from image cache"
-			else
-				echo "Volume $KVM_IMAGE_NAME does not exists in the image cache"
-			fi
-		fi
-		;;
-
-	list_cache)
-		if [ "$OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE" == "" ]; then
-			echo "No LVM image cache configured"
-			exit 1
-		fi
-		if [ ! -d "$OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE" ]; then
-			echo "No LVM image cache existing"
-			exit 1
-		fi
-		basename `ls $OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE/*.gz 2>/dev/null | sed -e "s/\.gz//g"` 2>/dev/null
-		;;
-
-
-
-	*)
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		kvm_usage
-		;;
-
-
-esac
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/bin/openqrm-kvm-sysinfo b/openQRM-5.3.50-CE/src/plugins/kvm/bin/openqrm-kvm-sysinfo
deleted file mode 100644
index 0be885a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/bin/openqrm-kvm-sysinfo
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-# this script provides sys information
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/include/openqrm-plugin-kvm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/openqrm-plugin-kvm.conf
-OPENQRM_POSTENCODE="$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-postencode"
-if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-	OPENQRM_SERVER_IP=$resource_openqrmserver
-	OPENQRM_EXEC_PORT=$resource_execdport
-elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-	openqrm_server_get_config
-	OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-	resource_ip=$OPENQRM_SERVER_IP_ADDRESS
-	resource_id=0
-	resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-	openqrm_web_protocol=$OPENQRM_WEB_PROTOCOL
-fi
-export LANG=C
-FULL_COMMANDLINE="$0 $@"
-KVM_COMMAND=$1
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-while [ $# -ne 0 ]; do
-	case "$1" in
-		-u)
-			KVM_OPENQRM_USERNAME=$2
-			shift
-			;;
-		-p)
-			KVM_OPENQRM_PASSWORD=$2
-			shift
-			;;
-		--file-name)
-			KVM_STATS_FILE_NAME=$2
-			shift
-			;;
-	esac
-	shift
-done
-
-# Set defaults
-if [ "$KVM_STATS_FILE_NAME" == "" ]; then
-	KVM_STATS_FILE_NAME='test.html'
-fi
-TMP=$KVM_STATS_FILE_NAME
-if [ -f $KVM_STATS_FILE_NAME ]; then
-	rm $KVM_STATS_FILE_NAME
-fi
-
-# Commands
-PS=$( ps ax | grep -v openqrm-kvm-stats | grep -v openqrm-kvm-sysinfo | grep [k]vm )
-NET=$( ifconfig )
-CACHE=$( ls -l $OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE )
-#KVMLOCK=$( ls -l $OPENQRM_SERVER_BASE_DIR"/openqrm/plugins/kvm/lock" )
-VMS=$( ls -l $OPENQRM_PLUGIN_STATE_DIRS )
-PVSCAN=$( pvscan )
-PVDISP=$( pvdisplay )
-VGSCAN=$( vgscan )
-VGDISP=$( vgdisplay )
-LVSCAN=$( lvscan )
-LVDISP=$( lvdisplay )
-
-# Format Message
-echo -e "<h3>SYSTEM</h3>\n" > $TMP
-echo -e "<b>ps ax | grep kvm</b>" >> $TMP
-echo -e "<pre>$PS</pre>" >> $TMP
-echo -e "<b>ifconfig</b>" >> $TMP
-echo -e "<pre>$NET</pre>" >> $TMP
-echo -e "<b>VMs: <small>$OPENQRM_PLUGIN_STATE_DIRS</small></b>" >> $TMP
-echo -e "<pre>$VMS\n</pre>" >> $TMP
-echo -e "<b>Cache: <small>$OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE</small></b>" >> $TMP
-echo -e "<pre>$CACHE</pre>" >> $TMP
-#echo -e "<b>KVM Lock: <small>OPENQRM_SERVER_BASE_DIR"/openqrm/plugins/kvm/lock</small></b>" >> $TMP
-#echo -e "<pre>$KVMLOCK</pre>" >> $TMP
-echo -e "<h3>LVM</h3>\n" >> $TMP
-echo -e "<b>pvscan</b><pre>$PVSCAN</pre>" >> $TMP
-echo -e "<b>pvdisplay</b><pre>$PVDISP</pre>" >> $TMP
-echo -e "<b>vgscan</b><pre>$VGSCAN</pre>" >> $TMP
-echo -e "<b>vgdisplay</b><pre>$VGDISP</pre>" >> $TMP
-echo -e "<b>lvscan</b><pre>$LVSCAN</pre>" >> $TMP
-echo -e "<b>lvdisplay</b><pre>$LVDISP</pre>" >> $TMP
-
-# Post Message
-if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?kvm_server_command=put_stats; then
-	openqrm_post_event 0 "create" 2 "openqrm-kvm-vm" "Could not post stats to the openQRM-server at $OPENQRM_SERVER_IP!"
-fi
-
-# Clean up
-if [ -f $KVM_STATS_FILE_NAME ]; then
-	rm $KVM_STATS_FILE_NAME
-fi
-if [ -f $KVM_STATS_FILE_NAME.post ]; then
-	rm $KVM_STATS_FILE_NAME.post
-fi
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/bin/openqrm-kvm-vm b/openQRM-5.3.50-CE/src/plugins/kvm/bin/openqrm-kvm-vm
deleted file mode 100644
index f18904e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/bin/openqrm-kvm-vm
+++ /dev/null
@@ -1,2464 +0,0 @@
-#!/bin/bash
-# this script automatically manages kvm
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2012, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2012, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-# unblock starting command queue early for non-blocking + ui commands
-KVM_COMMAND=$1
-if [ "$KVM_COMMAND" == "update" ] || [ "$KVM_COMMAND" == "clone" ] || [ "$KVM_COMMAND" == "post_vm_list" ] || [ "$KVM_COMMAND" == "post_vm_config" ] || [ "$KVM_COMMAND" == "list" ] || [ "$KVM_COMMAND" == "post_bridge_config" ] || [ "$KVM_COMMAND" == "iso" ] || [ "$KVM_COMMAND" == "monitor_migration" ]; then
-	openqrm_unblock_starting_queue $@
-	NON_BLOCKING=true
-fi
-
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/include/openqrm-plugin-kvm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/openqrm-plugin-kvm.conf
-if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-	OPENQRM_SERVER_IP=$resource_openqrmserver
-	OPENQRM_EXEC_PORT=$resource_execdport
-elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-	openqrm_server_get_config
-	OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-	resource_id=0
-	resource_ip=$OPENQRM_SERVER_IP_ADDRESS
-	resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-	openqrm_web_protocol=$OPENQRM_WEB_PROTOCOL
-fi
-OPENQRM_POSTENCODE="$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-postencode"
-OPENQRM_KVM_VM_TEMPLATE="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-vm"
-OPENQRM_VM_DIR="/var/lib/kvm/openqrm/"
-OPENQRM_VM_MIGRATION_PORT_RANGE_START="7500"
-OPENQRM_VM_MONITOR_DIR="/var/run/openqrm/kvm"
-KVM_MIGRATION_MAX_WAIT=360
-KVM_REMOVE_MAX_WAIT=30
-KVM_VM_SHUTDOWN_DELAY=90
-OPENQRM_FIRST_VNC_ID=50
-export LANG=C
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-# let only root run this script
-WHOAMI=`whoami`
-if [ "$WHOAMI" != "root" ]; then
-	echo "ERROR: Please run this script as root!"
-	exit 6
-fi
-
-# make sure required deps are installed
-if ! check_kvm_deps; then
-	if [ "$NON_BLOCKING" != "true" ]; then
-		openqrm_unblock_starting_queue $@
-	fi
-	exit 1
-fi
-
-# which screen binary to use
-if [ -x /usr/bin/screen.real ]; then
-	RUNSCREEN="/usr/bin/screen.real"
-else
-	RUNSCREEN=`which screen`
-fi
-
-
-
-function kvm_usage() {
-	echo "Usage : $0 start/stop/reboot/delete/list <-n vm-name>"
-	echo "        $0 restart_by_mac/start_by_mac <-m vm-mac> <-d root-disk>"
-	echo "        $0 setboot <-m mac-address> <-b local/net>"
-	echo "        $0 create/update <-n vm-name> <-m mac-address> <-r memory> [-c cpus ] [-o disk-interface(ide/virtio) ] [-b local/net/cdrom/iso] [-i iso-boot-image] [-v vncpassword ] [-l vnckeymap ]"
-	echo "        $0 clone <-n vm-name> <-w vm-clone-name> <-m vm-clone-mac>"
-	echo "        $0 post_vm_list <-u username> <-p password>"
-	echo "        $0 post_vm_config <-n vm-name> <-u username> <-p password>"
-	echo "        $0 post_bridge_config <-u username> <-p password>"
-	echo "        $0 update_vm_ram <-r memory> <-n vm-name>"
-	echo "        $0 update_vm_vnc <-v vncpassword> <-n vm-name>"
-	echo "        $0 add_vm_nic <-s nic-number> <-m mac-address> <-n vm-name>"
-	echo "        $0 remove_vm_nic <-s nic-number> <-n vm-name>"
-	echo "        $0 fence <-m mac-address>"
-	echo "        $0 start_as_incoming <-n vm-name> <-j migration-port>"
-	echo "        $0 migrate <-n vm-name> <-k destination-host-ip> <-j migration-port>"
-	echo "        $0 transfer_vm_config <-n vm-name> <-k destination-host-ip> <-k1 source-host-ip>"
-	echo "        $0 monitor_migrate <-n vm-name> <-j migration-port>"
-	echo "        $0 reset_vlans_by_mac <-m mac-address> <-b start/stop>"
-	echo "        $0 iso <-q path> <-u username> <-p password>"
-	exit 1
-}
-
-
-
-function kvm_gen_mac() {
-    CMAC=`dd if=/dev/urandom bs=1 count=5 2>/dev/null | od -tx1 | head -1 | cut -d' ' -f2- | awk '{ print $1":"$2":"$3":"$4":"$5 }' | tr "[:upper:]" "[:lower:]"`
-    CMAC="00:"$CMAC
-    echo $CMAC
-}
-
-function get_vm_type() {
-	local VM=$1
-	if [ "$KVM_VM_TYPE" == "" ]; then
-		if [ -f "$OPENQRM_VM_DIR/$VM/vm-type" ]; then
-			. $OPENQRM_VM_DIR/$VM/vm-type
-		else
-			KVM_VM_TYPE="kvm-vm-local"
-		fi
-	fi
-	echo "$KVM_VM_TYPE"
-}
-
-
-FULL_COMMANDLINE="$0 $@"
-KVM_COMMAND=$1
-shift
-
-while [ $# -ne 0 ]; do
-	case "$1" in
-		-n)
-			KVM_VM_NAME=$2
-			shift
-			;;
-		-m)
-			KVM_VM_MAC=$2
-			shift
-			;;
-		-m1)
-			KVM_VM_MAC2=$2
-			shift
-			;;
-		-m2)
-			KVM_VM_MAC3=$2
-			shift
-			;;
-		-m3)
-			KVM_VM_MAC4=$2
-			shift
-			;;
-		-m4)
-			KVM_VM_MAC5=$2
-			shift
-			;;
-		-r)
-			KVM_VM_RAM=$2
-			shift
-			;;
-		-d)
-			KVM_VM_DISK=$2
-			shift
-			;;
-		-s)
-			KVM_VM_SWAP=$2
-			shift
-			;;
-		-x)
-			KVM_VM_COMPONENT_NUMBER=$2
-			shift
-			;;
-		-u)
-			KVM_OPENQRM_USERNAME=$2
-			shift
-			;;
-		-p)
-			KVM_OPENQRM_PASSWORD=$2
-			shift
-			;;
-		-b)
-			KVM_VM_BOOT=$2
-			shift
-			;;
-		-i)
-			KVM_VM_BOOT_ISO=$2
-			shift
-			;;
-		-t)
-			KVM_VM_NIC_TYPE=$2
-			shift
-			;;
-		-t1)
-			KVM_VM_NIC_TYPE2=$2
-			shift
-			;;
-		-t2)
-			KVM_VM_NIC_TYPE3=$2
-			shift
-			;;
-		-t3)
-			KVM_VM_NIC_TYPE4=$2
-			shift
-			;;
-		-t4)
-			KVM_VM_NIC_TYPE5=$2
-			shift
-			;;
-		-z)
-			KVM_VM_MAC_BRIDGE=$2
-			shift
-			;;
-		-z1)
-			KVM_VM_MAC_BRIDGE2=$2
-			shift
-			;;
-		-z2)
-			KVM_VM_MAC_BRIDGE3=$2
-			shift
-			;;
-		-z3)
-			KVM_VM_MAC_BRIDGE4=$2
-			shift
-			;;
-		-z4)
-			KVM_VM_MAC_BRIDGE5=$2
-			shift
-			;;
-		-c)
-			KVM_VM_CPUS=$2
-			shift
-			;;
-		-o)
-			KVM_VM_DISK_INTERFACE=$2
-			shift
-			;;
-		-k)
-			KVM_MIGRATION_DESTINATION_HOST=$2
-			shift
-			;;
-		-k1)
-			KVM_MIGRATION_SOURCE_HOST=$2
-			shift
-			;;
-		-j)
-			KVM_MIGRATION_PORT=$2
-			shift
-			;;
-		-v)
-			KVM_VM_VNCPASSWORD=$2
-			shift
-			;;
-		-l)
-			KVM_VM_VNCKEYMAP=$2
-			shift
-			;;
-		-w)
-			KVM_VM_CLONE_NAME=$2
-			shift
-			;;
-		-q)
-			KVM_HOST_PATH=$2
-			shift
-			;;
-		-y)
-			KVM_VM_TYPE=$2
-			shift
-			;;
-		-cdrom)
-			KVM_VM_CDROM2=$2
-			shift
-			;;
-		--openqrm-ui-user)
-			OPENQRM_UI_USER=$2
-			shift
-			;;
-		--openqrm-internal-cmd)
-			OPENQRM_INTERNAL_CMD=$2
-			shift
-			;;
-		--openqrm-cmd-mode)
-			OPENQRM_CMD_MODE=$2
-			shift
-			;;
-
-		*)
-			if [ "$NON_BLOCKING" != "true" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			fi
-			echo "ERROR: Free commandline arguments are not allowed: $@"
-			kvm_usage
-			exit 6
-			;;
-	esac
-	shift
-done
-
-
-
-
-# main
-if [ "$KVM_COMMAND" == "" ]; then
-	openqrm_unblock_starting_queue $FULL_COMMANDLINE
-	kvm_usage
-fi
-
-if [ "$KVM_COMMAND" == "post_vm_list" ] || [ "$KVM_COMMAND" == "post_vm_config" ]; then
-		if [ "$KVM_OPENQRM_USERNAME" == "" ]; then
-			kvm_usage
-		fi
-		if [ "$KVM_OPENQRM_PASSWORD" == "" ]; then
-			kvm_usage
-		fi
-else
-
-	if [ "$KVM_COMMAND" != "list" ] && [ "$KVM_COMMAND" != "setboot" ] && [ "$KVM_COMMAND" != "start_by_mac" ] && [ "$KVM_COMMAND" != "restart_by_mac" ]  && [ "$KVM_COMMAND" != "post_bridge_config" ]  && [ "$KVM_COMMAND" != "stop_by_mac" ] && [ "$KVM_COMMAND" != "fence" ] && [ "$KVM_COMMAND" != "iso" ] && [ "$KVM_COMMAND" != "reset_vlans_by_mac" ]; then
-		if [ "$KVM_VM_NAME" == "" ]; then
-			if [ "$NON_BLOCKING" != "true" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			fi
-			kvm_usage
-		fi
-	fi
-fi
-
-# set defaults from the config
-if [ "$KVM_VM_NIC_TYPE" == "" ]; then
-	KVM_VM_NIC_TYPE=$OPENQRM_PLUGIN_KVM_PRIMARY_NIC_TYPE
-fi
-if [ "$KVM_VM_NIC_TYPE2" == "" ]; then
-	KVM_VM_NIC_TYPE2=$OPENQRM_PLUGIN_KVM_ADDITIONAL_NIC_TYPE
-fi
-if [ "$KVM_VM_NIC_TYPE3" == "" ]; then
-	KVM_VM_NIC_TYPE3=$OPENQRM_PLUGIN_KVM_ADDITIONAL_NIC_TYPE
-fi
-if [ "$KVM_VM_NIC_TYPE4" == "" ]; then
-	KVM_VM_NIC_TYPE4=$OPENQRM_PLUGIN_KVM_ADDITIONAL_NIC_TYPE
-fi
-if [ "$KVM_VM_NIC_TYPE5" == "" ]; then
-	KVM_VM_NIC_TYPE5=$OPENQRM_PLUGIN_KVM_ADDITIONAL_NIC_TYPE
-fi
-if [ "$KVM_VM_MAC_BRIDGE" == "" ]; then
-	KVM_VM_MAC_BRIDGE=$OPENQRM_PLUGIN_KVM_BRIDGE_NET1
-fi
-if [ "$KVM_VM_MAC_BRIDGE2" == "" ]; then
-	KVM_VM_MAC_BRIDGE2=$OPENQRM_PLUGIN_KVM_BRIDGE_NET2
-fi
-if [ "$KVM_VM_MAC_BRIDGE3" == "" ]; then
-	KVM_VM_MAC_BRIDGE3=$OPENQRM_PLUGIN_KVM_BRIDGE_NET3
-fi
-if [ "$KVM_VM_MAC_BRIDGE4" == "" ]; then
-	KVM_VM_MAC_BRIDGE4=$OPENQRM_PLUGIN_KVM_BRIDGE_NET4
-fi
-if [ "$KVM_VM_MAC_BRIDGE5" == "" ]; then
-	KVM_VM_MAC_BRIDGE5=OPENQRM_PLUGIN_KVM_BRIDGE_NET5
-fi
-if [ "$KVM_VM_VNCKEYMAP" == "" ]; then
-	KVM_VM_VNCKEYMAP=$OPENQRM_PLUGIN_KVM_DEFAULT_VNC_KEYMAP
-fi
-
-
-# calculate migration port
-if [ "$KVM_MIGRATION_PORT" == "" ]; then
-	KVM_MIGRATION_PORT=$OPENQRM_VM_MIGRATION_PORT_RANGE_START
-else
-	KVM_MIGRATION_PORT=$(( OPENQRM_VM_MIGRATION_PORT_RANGE_START + KVM_MIGRATION_PORT ))
-fi
-
-case "$KVM_COMMAND" in 
-
-	create)
-		if [ "$KVM_VM_MAC" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ "$KVM_VM_RAM" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ "$KVM_VM_CPUS" == "" ]; then
-			KVM_VM_CPUS=1
-		fi
-		if [ "$KVM_VM_BOOT" == "" ]; then
-			KVM_VM_BOOT=net
-		fi
-		# default vm type
-		if [ "$KVM_VM_TYPE" == "" ]; then
-			KVM_VM_TYPE="kvm-vm-local"
-		fi
-		# default disk interface ide
-		if [ "$KVM_VM_DISK_INTERFACE" == "" ]; then
-			KVM_VM_DISK_INTERFACE="virtio"
-		fi
-		# already existing ?
-		if [ -f $OPENQRM_VM_DIR/$KVM_VM_NAME/$KVM_VM_NAME.kvm ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "create" 2 "openqrm-kvm" "KVM VM $KVM_VM_NAME already exist on this Host. Not creating new VM!"
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# creating the kvm start script
-		mkdir -p $OPENQRM_VM_DIR/$KVM_VM_NAME/
-		cp -f $OPENQRM_KVM_VM_TEMPLATE $OPENQRM_VM_DIR/$KVM_VM_NAME/$KVM_VM_NAME.kvm
-		cp -f $OPENQRM_KVM_VM_TEMPLATE.incoming $OPENQRM_VM_DIR/$KVM_VM_NAME/$KVM_VM_NAME.kvm.incoming
-		# cpus
-		echo "KVM_VM_CPUS=\"$KVM_VM_CPUS\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/cpus
-		# ram
-		echo "KVM_VM_RAM=\"$KVM_VM_RAM\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/ram
-		# disk interface
-		echo "KVM_VM_DISK_INTERFACE=\"$KVM_VM_DISK_INTERFACE\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/disk-interface
-		# vm type
-		echo "KVM_VM_TYPE=\"$KVM_VM_TYPE\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/vm-type
-
-		# network
-		case "$OPENQRM_PLUGIN_KVM_BRIDGE_TYPE" in
-			bridge)
-				# regular bridging
-				# nic1
-				echo "KVM_VM_MAC_1=\"$KVM_VM_MAC\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-				echo "KVM_VM_NET_1=\"-net nic,vlan=1,macaddr=$KVM_VM_MAC,model=$KVM_VM_NIC_TYPE -net tap,vlan=1,script=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifup-net-$KVM_VM_MAC_BRIDGE,downscript=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-				echo "KVM_VM_NIC_TYPE_1=\"$KVM_VM_NIC_TYPE\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-				echo "KVM_VM_MAC_BRIDGE_1=\"$KVM_VM_MAC_BRIDGE\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-				echo "KVM_VM_DETACH_MANAGEMENT_NIC=\"$OPENQRM_PLUGIN_VM_DETACH_MANAGEMENT_NIC\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-				cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE/g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifup-net-$KVM_VM_MAC_BRIDGE
-				sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifup-net-$KVM_VM_MAC_BRIDGE
-				cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE/g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE
-				sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE
-				# nic2 - 5
-				if [ "$KVM_VM_MAC2" != "" ]; then
-					echo "KVM_VM_NET_2=\"-net nic,vlan=2,macaddr=$KVM_VM_MAC2,model=$KVM_VM_NIC_TYPE2 -net tap,vlan=2,script=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifup-net-$KVM_VM_MAC_BRIDGE2,downscript=no\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_MAC_2=\"$KVM_VM_MAC2\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_NIC_TYPE_2=\"$KVM_VM_NIC_TYPE2\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_MAC_BRIDGE_2=\"$KVM_VM_MAC_BRIDGE2\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE2/g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifup-net-$KVM_VM_MAC_BRIDGE2
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifup-net-$KVM_VM_MAC_BRIDGE2
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE2/g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE2
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE2
-				else
-					echo "KVM_VM_NET_2=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_MAC_2=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_NIC_TYPE_2=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_MAC_BRIDGE_2=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-				fi
-				if [ "$KVM_VM_MAC3" != "" ]; then
-					echo "KVM_VM_NET_3=\"-net nic,vlan=3,macaddr=$KVM_VM_MAC3,model=$KVM_VM_NIC_TYPE3 -net tap,vlan=3,script=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifup-net-$KVM_VM_MAC_BRIDGE3,downscript=no\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_MAC_3=\"$KVM_VM_MAC3\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_NIC_TYPE_3=\"$KVM_VM_NIC_TYPE3\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_MAC_BRIDGE_3=\"$KVM_VM_MAC_BRIDGE3\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE3/g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifup-net-$KVM_VM_MAC_BRIDGE3
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifup-net-$KVM_VM_MAC_BRIDGE3
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE3/g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE3
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifup-down-$KVM_VM_MAC_BRIDGE3
-				else
-					echo "KVM_VM_NET_3=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_MAC_3=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_NIC_TYPE_3=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_MAC_BRIDGE_3=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-				fi
-				if [ "$KVM_VM_MAC4" != "" ]; then
-					echo "KVM_VM_NET_4=\"-net nic,vlan=4,macaddr=$KVM_VM_MAC4,model=$KVM_VM_NIC_TYPE4 -net tap,vlan=4,script=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifup-net-$KVM_VM_MAC_BRIDGE4,downscript=no\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_MAC_4=\"$KVM_VM_MAC4\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_NIC_TYPE_4=\"$KVM_VM_NIC_TYPE4\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_MAC_BRIDGE_4=\"$KVM_VM_MAC_BRIDGE4\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE4/g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifup-net-$KVM_VM_MAC_BRIDGE4
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifup-net-$KVM_VM_MAC_BRIDGE4
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE4/g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE4
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE4
-				else
-					echo "KVM_VM_NET_4=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_MAC_4=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_NIC_TYPE_4=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_MAC_BRIDGE_4=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-				fi
-				if [ "$KVM_VM_MAC5" != "" ]; then
-					echo "KVM_VM_NET_5=\"-net nic,vlan=5,macaddr=$KVM_VM_MAC5,model=$KVM_VM_NIC_TYPE5 -net tap,vlan=5,script=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifup-net-$KVM_VM_MAC_BRIDGE5,downscript=no\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_MAC_5=\"$KVM_VM_MAC5\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_NIC_TYPE_5=\"$KVM_VM_NIC_TYPE5\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_MAC_BRIDGE_5=\"$KVM_VM_MAC_BRIDGE5\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE5/g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifup-net-$KVM_VM_MAC_BRIDGE5
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifup-net-$KVM_VM_MAC_BRIDGE5
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE5/g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE5
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE5
-				else
-					echo "KVM_VM_NET_5=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_MAC_5=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_NIC_TYPE_5=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_MAC_BRIDGE_5=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-				fi
-				chmod +x $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-kvm-ifup-net*
-				;;
-
-			openvswitch)
-				# openvswitch
-				# setup the nics
-				echo "KVM_VM_NET_1=\"-net nic,vlan=1,macaddr=$KVM_VM_MAC,model=$KVM_VM_NIC_TYPE -net tap,vlan=1,script=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup-$KVM_VM_MAC_BRIDGE,downscript=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-				echo "KVM_VM_MAC_1=\"$KVM_VM_MAC\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-				echo "KVM_VM_NIC_TYPE_1=\"$KVM_VM_NIC_TYPE\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-				echo "KVM_VM_MAC_BRIDGE_1=\"$KVM_VM_MAC_BRIDGE\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-				echo "KVM_VM_DETACH_MANAGEMENT_NIC=\"$OPENQRM_PLUGIN_VM_DETACH_MANAGEMENT_NIC\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-				cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#1#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup-$KVM_VM_MAC_BRIDGE
-				sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup-$KVM_VM_MAC_BRIDGE
-				cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#1#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifdown-$KVM_VM_MAC_BRIDGE
-				sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifdown-$KVM_VM_MAC_BRIDGE
-				if [ "$KVM_VM_MAC2" != "" ]; then
-					echo "KVM_VM_NET_2=\"-net nic,vlan=2,macaddr=$KVM_VM_MAC2,model=$KVM_VM_NIC_TYPE2 -net tap,vlan=2,script=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup-$KVM_VM_MAC_BRIDGE2,downscript=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE2\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_MAC_2=\"$KVM_VM_MAC2\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_NIC_TYPE_2=\"$KVM_VM_NIC_TYPE2\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_MAC_BRIDGE_2=\"$KVM_VM_MAC_BRIDGE2\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE2/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#2#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup-$KVM_VM_MAC_BRIDGE2
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup-$KVM_VM_MAC_BRIDGE2
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE2/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#2#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifdown-$KVM_VM_MAC_BRIDGE2
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup-$KVM_VM_MAC_BRIDGE2
-				else
-					echo "KVM_VM_NET_2=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_MAC_2=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_NIC_TYPE_2=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_MAC_BRIDGE_2=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-				fi
-				if [ "$KVM_VM_MAC3" != "" ]; then
-					echo "KVM_VM_NET_3=\"-net nic,vlan=3,macaddr=$KVM_VM_MAC3,model=$KVM_VM_NIC_TYPE3 -net tap,vlan=3,script=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup-$KVM_VM_MAC_BRIDGE3,downscript=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE3\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_MAC_3=\"$KVM_VM_MAC3\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_NIC_TYPE_3=\"$KVM_VM_NIC_TYPE3\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_MAC_BRIDGE_3=\"$KVM_VM_MAC_BRIDGE3\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE3/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#3#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup-$KVM_VM_MAC_BRIDGE3
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup-$KVM_VM_MAC_BRIDGE3
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE3/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#3#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifdown-$KVM_VM_MAC_BRIDGE3
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifdown-$KVM_VM_MAC_BRIDGE3
-				else
-					echo "KVM_VM_NET_3=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_MAC_3=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_NIC_TYPE_3=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_MAC_BRIDGE_3=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-				fi
-				if [ "$KVM_VM_MAC4" != "" ]; then
-					echo "KVM_VM_NET_4=\"-net nic,vlan=4,macaddr=$KVM_VM_MAC4,model=$KVM_VM_NIC_TYPE4 -net tap,vlan=4,script=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup-$KVM_VM_MAC_BRIDGE4,downscript=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE4\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_MAC_4=\"$KVM_VM_MAC4\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_NIC_TYPE_4=\"$KVM_VM_NIC_TYPE4\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_MAC_BRIDGE_4=\"$KVM_VM_MAC_BRIDGE4\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE4/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#4#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup-$KVM_VM_MAC_BRIDGE4
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup-$KVM_VM_MAC_BRIDGE4
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE4/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#4#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifdown-$KVM_VM_MAC_BRIDGE4
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifdown-$KVM_VM_MAC_BRIDGE4
-				else
-					echo "KVM_VM_NET_4=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_MAC_4=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_NIC_TYPE_4=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_MAC_BRIDGE_4=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-				fi
-				if [ "$KVM_VM_MAC5" != "" ]; then
-					echo "KVM_VM_NET_5=\"-net nic,vlan=5,macaddr=$KVM_VM_MAC5,model=$KVM_VM_NIC_TYPE5 -net tap,vlan=5,script=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup-$KVM_VM_MAC_BRIDGE5,downscript=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE5\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_MAC_5=\"$KVM_VM_MAC5\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_NIC_TYPE_5=\"$KVM_VM_NIC_TYPE5\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_MAC_BRIDGE_5=\"$KVM_VM_MAC_BRIDGE5\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE5/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#5#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup-$KVM_VM_MAC_BRIDGE5
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup-$KVM_VM_MAC_BRIDGE5
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE5/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#5#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifdown-$KVM_VM_MAC_BRIDGE5
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifdown-$KVM_VM_MAC_BRIDGE5
-				else
-					echo "KVM_VM_NET_5=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_MAC_5=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_NIC_TYPE_5=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_MAC_BRIDGE_5=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-				fi
-				chmod +x $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-*
-				;;
-
-
-			vlanbridge)
-				# bridged vlans
-				modprobe 8021q
-				# setup the nics
-				echo "KVM_VM_NET_1=\"-net nic,vlan=1,macaddr=$KVM_VM_MAC,model=$KVM_VM_NIC_TYPE -net tap,vlan=1,script=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifup-net-$KVM_VM_MAC_BRIDGE,downscript=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-				echo "KVM_VM_MAC_1=\"$KVM_VM_MAC\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-				echo "KVM_VM_NIC_TYPE_1=\"$KVM_VM_NIC_TYPE\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-				echo "KVM_VM_MAC_BRIDGE_1=\"$KVM_VM_MAC_BRIDGE\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-				echo "KVM_VM_DETACH_MANAGEMENT_NIC=\"$OPENQRM_PLUGIN_VM_DETACH_MANAGEMENT_NIC\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-				cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#0#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifup-net-$KVM_VM_MAC_BRIDGE
-				sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifup-net-$KVM_VM_MAC_BRIDGE
-				cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#0#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE
-				sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE
-				if [ "$KVM_VM_MAC2" != "" ]; then
-					echo "KVM_VM_NET_2=\"-net nic,vlan=2,macaddr=$KVM_VM_MAC2,model=$KVM_VM_NIC_TYPE2 -net tap,vlan=2,script=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifup-net-$KVM_VM_MAC_BRIDGE2,downscript=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE2\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_MAC_2=\"$KVM_VM_MAC2\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_NIC_TYPE_2=\"$KVM_VM_NIC_TYPE2\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_MAC_BRIDGE_2=\"$KVM_VM_MAC_BRIDGE2\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE2/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#1#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifup-net-$KVM_VM_MAC_BRIDGE2
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifup-net-$KVM_VM_MAC_BRIDGE2
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE2/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#1#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE2
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE2
-				else
-					echo "KVM_VM_NET_2=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_MAC_2=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_NIC_TYPE_2=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-					echo "KVM_VM_MAC_BRIDGE_2=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-				fi
-				if [ "$KVM_VM_MAC3" != "" ]; then
-					echo "KVM_VM_NET_3=\"-net nic,vlan=3,macaddr=$KVM_VM_MAC3,model=$KVM_VM_NIC_TYPE3 -net tap,vlan=3,script=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifup-net-$KVM_VM_MAC_BRIDGE3,downscript=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE3\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_MAC_3=\"$KVM_VM_MAC3\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_NIC_TYPE_3=\"$KVM_VM_NIC_TYPE3\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_MAC_BRIDGE_3=\"$KVM_VM_MAC_BRIDGE3\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE3/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#2#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifup-net-$KVM_VM_MAC_BRIDGE3
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifup-net-$KVM_VM_MAC_BRIDGE3
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE3/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#2#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE3
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE3
-				else
-					echo "KVM_VM_NET_3=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_MAC_3=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_NIC_TYPE_3=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-					echo "KVM_VM_MAC_BRIDGE_3=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-				fi
-				if [ "$KVM_VM_MAC4" != "" ]; then
-					echo "KVM_VM_NET_4=\"-net nic,vlan=4,macaddr=$KVM_VM_MAC4,model=$KVM_VM_NIC_TYPE4 -net tap,vlan=4,script=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifup-net-$KVM_VM_MAC_BRIDGE4,downscript=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE4\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_MAC_4=\"$KVM_VM_MAC4\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_NIC_TYPE_4=\"$KVM_VM_NIC_TYPE4\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_MAC_BRIDGE_4=\"$KVM_VM_MAC_BRIDGE4\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE4/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#3#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifup-net-$KVM_VM_MAC_BRIDGE4
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifup-net-$KVM_VM_MAC_BRIDGE4
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE4/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#3#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE4
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE4
-				else
-					echo "KVM_VM_NET_4=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_MAC_4=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_NIC_TYPE_4=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-					echo "KVM_VM_MAC_BRIDGE_4=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-				fi
-				if [ "$KVM_VM_MAC5" != "" ]; then
-					echo "KVM_VM_NET_5=\"-net nic,vlan=5,macaddr=$KVM_VM_MAC5,model=$KVM_VM_NIC_TYPE5 -net tap,vlan=5,script=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifup-net-$KVM_VM_MAC_BRIDGE5,downscript=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE5\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_MAC_5=\"$KVM_VM_MAC5\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_NIC_TYPE_5=\"$KVM_VM_NIC_TYPE5\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_MAC_BRIDGE_5=\"$KVM_VM_MAC_BRIDGE5\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE5/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#4#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifup-net-$KVM_VM_MAC_BRIDGE5
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifup-net-$KVM_VM_MAC_BRIDGE5
-					cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_VM_MAC_BRIDGE5/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#4#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE5
-					sed -i -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifdown-net-$KVM_VM_MAC_BRIDGE5
-				else
-					echo "KVM_VM_NET_5=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_MAC_5=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_NIC_TYPE_5=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-					echo "KVM_VM_MAC_BRIDGE_5=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-				fi
-				chmod +x $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-*
-				;;
-
-		esac
-
-		# disk
-		# add empty disk disk parameter
-		echo "KVM_VM_DISK_1=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/disk1
-		echo "KVM_VM_DISK_SIZE_1=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/disk1
-		# empty 2. and 3. disk
-		echo "KVM_VM_DISK_2=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/disk2
-		echo "KVM_VM_DISK_SIZE_2=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/disk2
-		echo "KVM_VM_DISK_3=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/disk3
-		echo "KVM_VM_DISK_SIZE_3=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/disk3
-		# add empty disk disk parameter
-		echo "KVM_VM_DISK_4=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/disk4
-		echo "KVM_VM_DISK_SIZE_4=\"\"" >> $OPENQRM_VM_DIR/$KVM_VM_NAME/disk4
-
-		# CDROM
-		if [ "$KVM_VM_CDROM2" == "" ]; then
-			echo "KVM_VM_CDROM2=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom2
-		else
-			echo "KVM_VM_CDROM2=\"-drive file=$KVM_VM_CDROM2,media=cdrom\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom2
-		fi
-
-		# kvm-vm-local or kvm-vm-net
-		if [ "$KVM_VM_TYPE" == "kvm-vm-local" ]; then
-			# a cdrom/iso
-			if [ "$KVM_VM_BOOT_ISO" == "" ]; then
-				echo "KVM_VM_CDROM=\"\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom
-			else
-				echo "KVM_VM_CDROM=\"-cdrom $KVM_VM_BOOT_ISO\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom
-			fi
-			# boot from
-			case "$KVM_VM_BOOT" in
-				local)
-					echo "KVM_VM_BOOT=\"-boot cn\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-					;;
-				net)
-					echo "KVM_VM_BOOT=\"-boot n\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-					;;
-				network)
-					echo "KVM_VM_BOOT=\"-boot n\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-					;;
-				cdrom)
-					echo "KVM_VM_BOOT=\"-boot d\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-					echo "KVM_VM_CDROM=\"-cdrom /dev/cdrom\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom
-					;;
-				iso)
-					echo "KVM_VM_BOOT=\"-boot d\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-					echo "KVM_VM_CDROM=\"-cdrom $KVM_VM_BOOT_ISO\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom
-					;;
-			esac
-
-		elif [ "$KVM_VM_TYPE" == "kvm-vm-net" ]; then
-			echo "KVM_VM_BOOT=\"-boot n\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-			echo "" > $OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom
-		fi
-
-		# vnc : check on which vnc display which can run it
-		ALREADY_USED_VNC_IDS=""
-		for VNC_CONF in `find $OPENQRM_VM_DIR/* -name vnc`; do
-			unset KVM_VM_VNC
-			. $VNC_CONF
-			USED_VNC_ID=`echo $KVM_VM_VNC | cut -d':' -f2`
-			ALREADY_USED_VNC_IDS="$USED_VNC_ID $ALREADY_USED_VNC_IDS"
-		done
-		NEW_VNC_ID=$OPENQRM_FIRST_VNC_ID
-		while (true); do
-			FOUND_VNC_ID="false"
-			for VNC_ID in $ALREADY_USED_VNC_IDS; do
-				if [ "$VNC_ID" == "$NEW_VNC_ID" ]; then
-					FOUND_VNC_ID="true"
-					continue
-				fi
-			done
-			if [ "$FOUND_VNC_ID" == "false" ]; then
-				break
-			else
-				NEW_VNC_ID=$(( NEW_VNC_ID + 1 ))
-			fi
-		done
-		# on which network to listen ?
-		if [ "$OPENQRM_PLUGIN_VM_VNC_LISTEN" == "all" ]; then
-			echo "KVM_VM_VNC=\"0.0.0.0:$NEW_VNC_ID\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/vnc
-			# prepare a list of all configured interfaces for the cloud vnc access
-			CLOUD_VNC_LISTEN=""
-			for LISTEN_IP in `ip a s | grep -w inet | awk '{ print $2 }' | cut -d'/' -f1 | grep -v 127.0.0.1`; do
-				CLOUD_VNC_LISTEN="$CLOUD_VNC_LISTEN, $LISTEN_IP:$NEW_VNC_ID"
-			done
-			CLOUD_VNC_LISTEN=`echo $CLOUD_VNC_LISTEN | sed -e "s/,//"`
-		else
-			echo "KVM_VM_VNC=\"$resource_ip:$NEW_VNC_ID\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/vnc
-			CLOUD_VNC_LISTEN="$resource_ip:$NEW_VNC_ID"
-		fi
-		# store the vnc infos for the cloud
-		echo "$CLOUD_VNC_LISTEN" > $KVM_VM_MAC.vnc
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $KVM_VM_MAC.vnc` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?kvm_server_command=put_vnc; then
-			openqrm_post_event 0 "create" 2 "openqrm-kvm-vm" "Could not post VM VNC access data to the openQRM-server at $OPENQRM_SERVER_IP!"
-		fi
-		rm -f $KVM_VM_MAC.vnc $KVM_VM_MAC.vnc.post
-		if [ "$KVM_VM_VNCPASSWORD" == "" ]; then
-			KVM_VM_VNCPASSWORD=`</dev/urandom tr -dc A-Za-z0-9 | head -c8`
-		fi
-		echo "KVM_VM_VNCPASSWORD=\"$KVM_VM_VNCPASSWORD\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/vncpassword
-		# vnc keymap
-		echo "KVM_VM_VNCKEYMAP=\"$KVM_VM_VNCKEYMAP\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/vnckeymap
-		# prepare directory for monitor sockets
-		mkdir -p $OPENQRM_VM_MONITOR_DIR
-		# do not start but fake as idle :)
-		chmod +x $OPENQRM_VM_DIR/$KVM_VM_NAME/$KVM_VM_NAME.kvm $OPENQRM_VM_DIR/$KVM_VM_NAME/$KVM_VM_NAME.kvm.incoming
-		# kvm-vm-local or kvm-vm-net
-		if [ "$KVM_VM_TYPE" == "kvm-vm-local" ]; then
-			# start monitor for the fake idle resource
-			kill `ps ax | grep openqrm-kvm-monitord | grep -v grep | grep -i $KVM_VM_MAC | awk {' print $1 '}` 2>/dev/null
-			$RUNSCREEN -dmS $KVM_VM_MAC $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/sbin/openqrm-kvm-monitord $KVM_VM_MAC
-		elif [ "$KVM_VM_TYPE" == "kvm-vm-net" ]; then
-
-			CMD_ERR=`$OPENQRM_VM_DIR/$KVM_VM_NAME/$KVM_VM_NAME.kvm 2>&1`
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "create" 3 "openqrm-kvm-vm" "Error starting KVM VM $KVM_VM_NAME! $CMD_ERR"
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-		fi
-		touch $OPENQRM_VM_DIR/$KVM_VM_NAME/autostart.$resource_id
-
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-
-		openqrm_post_event 0 "create" 5 "openqrm-kvm-vm" "Created KVM VM $KVM_VM_NAME."
-		;;
-
-	update)
-		if [ "$KVM_VM_MAC" == "" ]; then
-			kvm_usage
-		fi
-		if [ "$KVM_VM_RAM" == "" ]; then
-			kvm_usage
-		fi
-		if [ "$KVM_VM_CPUS" == "" ]; then
-			KVM_VM_CPUS=1
-		fi
-		if [ "$KVM_VM_BOOT" == "" ]; then
-			KVM_VM_BOOT=net
-		fi
-		# get vm type
-		KVM_VM_TYPE=`get_vm_type $KVM_VM_NAME`
-		# already existing ?
-		if [ ! -f $OPENQRM_VM_DIR/$KVM_VM_NAME/$KVM_VM_NAME.kvm ]; then
-			openqrm_post_event 0 "update" 2 "openqrm-kvm" "KVM VM $KVM_VM_NAME does not exist on this Host. Not updating the VM!"
-			exit 1
-		fi
-		# prepare possible additional network cards
-		if [ "$KVM_VM_MAC2" != "" ]; then
-		    KVM_VM_NET_CONFIG2=" -m1 $KVM_VM_MAC2 -t1 $KVM_VM_NIC_TYPE2 -z1 $KVM_VM_MAC_BRIDGE2"
-		fi
-		if [ "$KVM_VM_MAC3" != "" ]; then
-		    KVM_VM_NET_CONFIG3=" -m2 $KVM_VM_MAC3 -t2 $KVM_VM_NIC_TYPE3 -z2 $KVM_VM_MAC_BRIDGE3"
-		fi
-		if [ "$KVM_VM_MAC4" != "" ]; then
-		    KVM_VM_NET_CONFIG4=" -m3 $KVM_VM_MAC4 -t3 $KVM_VM_NIC_TYPE4 -z3 $KVM_VM_MAC_BRIDGE4"
-		fi
-		if [ "$KVM_VM_MAC5" != "" ]; then
-		    KVM_VM_NET_CONFIG5=" -m4 $KVM_VM_MAC5 -t4 $KVM_VM_NIC_TYPE5 -z4 $KVM_VM_MAC_BRIDGE5"
-		fi
-		KVM_VM_NET_CONFIG="$KVM_VM_NET_CONFIG2 $KVM_VM_NET_CONFIG3 $KVM_VM_NET_CONFIG4 $KVM_VM_NET_CONFIG5"
-		# disk interface
-		if [ "$KVM_VM_DISK_INTERFACE" == "" ]; then
-			if [ -f "$OPENQRM_VM_DIR/$KVM_VM_NAME/disk-interface" ]; then
-				. $OPENQRM_VM_DIR/$KVM_VM_NAME/disk-interface
-			else
-				KVM_VM_DISK_INTERFACE="ide"
-			fi
-		fi
-		# CDROM
-		if [ "$KVM_VM_CDROM2" != "" ]; then
-			KVM_VM_CDROM2="-cdrom $KVM_VM_CDROM2"
-		else
-			KVM_VM_CDROM2=""
-		fi
-
-		# kvm-vm-local or kvm-vm-net
-		if [ "$KVM_VM_TYPE" == "kvm-vm-local" ]; then
-			# boot ?
-			KVM_VM_BOOT_DEV_PARAM="local"
-			if [ "$KVM_VM_BOOT" != "" ]; then
-				case "$KVM_VM_BOOT" in
-					local)
-						KVM_VM_BOOT_DEV_PARAM="local"
-						;;
-					network)
-						KVM_VM_BOOT_DEV_PARAM="net"
-						;;
-					iso)
-						KVM_VM_BOOT_DEV_PARAM="iso"
-						;;
-					cdrom)
-						KVM_VM_BOOT_DEV_PARAM="cdrom"
-						;;
-				esac
-			fi
-			# iso ?
-			if [ "$KVM_VM_BOOT_ISO" != "" ]; then
-				KVM_VM_ISO_CONFIG="-i $KVM_VM_BOOT_ISO"
-			fi
-		elif [ "$KVM_VM_TYPE" == "kvm-vm-net" ]; then
-			KVM_VM_BOOT_DEV_PARAM="net"
-		fi
-
-		# vnc keymap
-		if [ "$KVM_VM_VNCKEYMAP" != "" ]; then
-			VNCKEYMAP_PARAMETER="-l $KVM_VM_VNCKEYMAP"
-		fi
-		# no lock for update since remove + create are locking
-		# save the disk files, we want to update everything else
-		KVM_VM_DISK_TMP_DIR=`mktemp -d /tmp/kvm-vm-disk-$KVM_VM_NAME.XXXXXX`
-		cp -f $OPENQRM_VM_DIR/$KVM_VM_NAME/disk[0-9] $KVM_VM_DISK_TMP_DIR/
-		# delete
-		$0 delete -n $KVM_VM_NAME
-		# re-create
-		$0 create -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD -n $KVM_VM_NAME -y $KVM_VM_TYPE -c $KVM_VM_CPUS -r $KVM_VM_RAM -o $KVM_VM_DISK_INTERFACE $KVM_VM_CDROM2 -b $KVM_VM_BOOT_DEV_PARAM $KVM_VM_ISO_CONFIG -m $KVM_VM_MAC -t $KVM_VM_NIC_TYPE -z $KVM_VM_MAC_BRIDGE $KVM_VM_NET_CONFIG -v $KVM_VM_VNCPASSWORD $VNCKEYMAP_PARAMETER
-		cp -f $KVM_VM_DISK_TMP_DIR/disk[0-9] $OPENQRM_VM_DIR/$KVM_VM_NAME/
-		rm -f $KVM_VM_DISK_TMP_DIR/disk*
-		rmdir $KVM_VM_DISK_TMP_DIR
-		openqrm_post_event 0 "update" 5 "openqrm-kvm-vm" "Updated KVM VM $KVM_VM_NAME."
-		;;
-
-
-
-	clone)
-		# new mac address
-		if [ "$KVM_VM_MAC" == "" ]; then
-			kvm_usage
-		fi
-		# origin existing ?
-		if [ ! -f $OPENQRM_VM_DIR/$KVM_VM_NAME/$KVM_VM_NAME.kvm ]; then
-			openqrm_post_event 0 "clone" 2 "openqrm-kvm" "KVM VM $KVM_VM_NAME does not exist on this Host. Not cloning the VM $KVM_VM_NAME!"
-			exit 1
-		fi
-		# clone name already existing ?
-		if [ -f $OPENQRM_VM_DIR/$KVM_VM_CLONE_NAME/$KVM_VM_CLONE_NAME.kvm ]; then
-			openqrm_post_event 0 "clone" 2 "openqrm-kvm" "KVM VM $KVM_VM_CLONE_NAME already exist on this Host. Not cloning the VM $KVM_VM_NAME!"
-			exit 1
-		fi
-		# read origin VM config
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/cpus
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/ram
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/disk1
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/disk2
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/disk3
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/disk4
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/vnc
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-
-		if [ -f "$OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom2" ]; then
-			. $OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom2
-		fi
-		if [ -f "$OPENQRM_VM_DIR/$KVM_VM_NAME/vncpassword" ]; then
-			. $OPENQRM_VM_DIR/$KVM_VM_NAME/vncpassword
-		fi
-		if [ -f "$OPENQRM_VM_DIR/$KVM_VM_NAME/vnckeymap" ]; then
-			. $OPENQRM_VM_DIR/$KVM_VM_NAME/vnckeymap
-		fi
-		# disk interface
-		if [ "$KVM_VM_DISK_INTERFACE" == "" ]; then
-			if [ -f "$OPENQRM_VM_DIR/$KVM_VM_NAME/disk-interface" ]; then
-				. $OPENQRM_VM_DIR/$KVM_VM_NAME/disk-interface
-			else
-				KVM_VM_DISK_INTERFACE="ide"
-			fi
-		fi
-		# CDROM
-		if [ -f "$OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom2" ]; then
-			. $OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom2
-			if [ "$KVM_VM_CDROM2" != "" ]; then
-				KVM_VM_CDROM2=$(echo "$KVM_VM_CDROM2" | sed -e 's/-drive file=//' | sed -e 's/,media=cdrom//')
-				KVM_VM_CDROM2="-cdrom $KVM_VM_CDROM2"
-			else
-				KVM_VM_CDROM2=""
-			fi
-		else
-			KVM_VM_CDROM2=""
-		fi
-		# get vm type
-		KVM_VM_TYPE=`get_vm_type $KVM_VM_NAME`
-		# prepare possible additional network cards
-		if [ "$KVM_VM_MAC_2" != "" ]; then
-		    # generate new mac
-		    KVM_VM_MAC_2=`kvm_gen_mac`
-		    KVM_VM_NET_CONFIG_2=" -m1 $KVM_VM_MAC_2 -t1 $KVM_VM_NIC_TYPE_2 -z1 $KVM_VM_MAC_BRIDGE_2"
-		fi
-		if [ "$KVM_VM_MAC_3" != "" ]; then
-		    KVM_VM_MAC_3=`kvm_gen_mac`
-		    KVM_VM_NET_CONFIG_3=" -m2 $KVM_VM_MAC_3 -t2 $KVM_VM_NIC_TYPE_3 -z2 $KVM_VM_MAC_BRIDGE_3"
-		fi
-		if [ "$KVM_VM_MAC_4" != "" ]; then
-		    KVM_VM_MAC_4=`kvm_gen_mac`
-		    KVM_VM_NET_CONFIG_4=" -m3 $KVM_VM_MAC_4 -t3 $KVM_VM_NIC_TYPE_4 -z3 $KVM_VM_MAC_BRIDGE_4"
-		fi
-		if [ "$KVM_VM_MAC_5" != "" ]; then
-		    KVM_VM_MAC_5=`kvm_gen_mac`
-		    KVM_VM_NET_CONFIG_5=" -m4 $KVM_VM_MAC_5 -t4 $KVM_VM_NIC_TYPE_5 -z4 $KVM_VM_MAC_BRIDGE_5"
-		fi
-		KVM_VM_NET_CONFIG="$KVM_VM_NET_CONFIG_2 $KVM_VM_NET_CONFIG_3 $KVM_VM_NET_CONFIG_4 $KVM_VM_NET_CONFIG_5"
-		# kvm-vm-local or kvm-vm-net
-		if [ "$KVM_VM_TYPE" == "kvm-vm-local" ]; then
-			# boot ?
-			KVM_VM_BOOT_DEV_PARAM="local"
-			if [ "$KVM_VM_BOOT" != "" ]; then
-				KVM_VM_BOOT_DEV=`echo $KVM_VM_BOOT | awk '{ print $2 }'`
-				case "$KVM_VM_BOOT_DEV" in
-					c)
-						KVM_VM_BOOT_DEV_PARAM="local"
-						;;
-					n)
-						KVM_VM_BOOT_DEV_PARAM="net"
-						;;
-					d)
-						KVM_VM_BOOT_DEV_PARAM="iso"
-						;;
-				esac
-			fi
-			# iso ?
-			if [ "$KVM_VM_BOOT_ISO" != "" ]; then
-				KVM_VM_BOOT_ISO_DEV=`echo $KVM_VM_BOOT_ISO | awk '{ print $2 }'`
-				KVM_VM_ISO_CONFIG="-i $KVM_VM_BOOT_ISO_DEV"
-			fi
-		elif [ "$KVM_VM_TYPE" == "kvm-vm-net" ]; then
-			KVM_VM_BOOT_DEV_PARAM="net"
-		fi
-		# vnc
-		if [ "$KVM_VM_VNCPASSWORD" != "" ]; then
-			KVM_VM_VNCPASSWORD_CONFIG=" -v $KVM_VM_VNCPASSWORD"
-		fi
-		# vnc keymap
-		if [ "$KVM_VM_VNCKEYMAP" != "" ]; then
-			VNCKEYMAP_PARAMETER="-l $KVM_VM_VNCKEYMAP"
-		fi
-
-		$0 create -n $KVM_VM_CLONE_NAME -y $KVM_VM_TYPE -c $KVM_VM_CPUS -r $KVM_VM_RAM -o $KVM_VM_DISK_INTERFACE $KVM_VM_CDROM2 -b $KVM_VM_BOOT_DEV_PARAM $KVM_VM_ISO_CONFIG -m $KVM_VM_MAC -t $KVM_VM_NIC_TYPE_1 -z $KVM_VM_MAC_BRIDGE_1 $KVM_VM_NET_CONFIG $KVM_VM_VNCPASSWORD_CONFIG $VNCKEYMAP_PARAMETER $KVM_CDROM2
-		openqrm_post_event 0 "clone" 5 "openqrm-kvm-vm" "Cloned KVM VM $KVM_VM_NAME to $KVM_VM_CLONE_NAME."
-		;;
-
-
-	start)
-		# get vm type
-		KVM_VM_TYPE=`get_vm_type $KVM_VM_NAME`
-
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# kvm-vm-local or kvm-vm-net
-		if [ "$KVM_VM_TYPE" == "kvm-vm-local" ]; then
-			. $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-			# start only if we have a root-disk
-			. $OPENQRM_VM_DIR/$KVM_VM_NAME/disk1
-			if [ "$KVM_VM_DISK_1" != "" ]; then
-				# lvol or blockfile ?
-				if echo $KVM_VM_DISK_1 | grep ^/dev 1>/dev/null; then
-					# aquire global lock for lvm operations
-					if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-						if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-							openqrm_global_lock aquire lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD $LOCK_TIME "Start of VM $KVM_VM_NAME on volume $KVM_VM_DISK_1"
-						fi
-					fi
-					if [ ! -e "$KVM_VM_DISK_1" ]; then
-						# activate the lvol
-						kvm_refresh_lvm
-						lvchange -ay -y $KVM_VM_DISK_1
-						if [ ! -e "$KVM_VM_DISK_1" ]; then
-							lvchange -ay -y $KVM_VM_DISK_1
-						fi
-					fi
-					lvchange -ay -y $KVM_VM_DISK_1
-					# release global lock
-					if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-						if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-							openqrm_global_lock release lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD
-						fi
-					fi
-				fi
-				# start the vm
-				CMD_ERR=`$OPENQRM_VM_DIR/$KVM_VM_NAME/$KVM_VM_NAME.kvm 2>&1`
-				if [ "$?" != 0 ]; then
-					CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-					openqrm_post_event 0 "start" 3 "openqrm-kvm-vm" "Error starting KVM VM $KVM_VM_NAME! $CMD_ERR"
-
-					openqrm_lock_queue release kvm $LOCK_TIME
-					trap '' EXIT
-
-					exit 1
-				fi
-
-				# monitoring on the host or vm ?
-				if [ "$OPENQRM_PLUGIN_KVM_VM_MONITORING_ON_HOST" != "false" ]; then
-					kill `ps ax | grep openqrm-kvm-monitord | grep -v grep | grep -i $KVM_VM_MAC_1 | awk {' print $1 '}` 2>/dev/null
-					$RUNSCREEN -dmS $KVM_VM_MAC_1 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/sbin/openqrm-kvm-monitord $KVM_VM_MAC_1
-				fi
-			else
-				# idle, start the vm monitord / make sure it is stopped before
-				kill `ps ax | grep openqrm-kvm-monitord | grep -v grep | grep -i $KVM_VM_MAC_1 | awk {' print $1 '}` 2>/dev/null
-				$RUNSCREEN -dmS $KVM_VM_MAC_1 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/sbin/openqrm-kvm-monitord $KVM_VM_MAC_1
-			fi
-		elif [ "$KVM_VM_TYPE" == "kvm-vm-net" ]; then
-
-			CMD_ERR=`$OPENQRM_VM_DIR/$KVM_VM_NAME/$KVM_VM_NAME.kvm 2>&1`
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "start" 3 "openqrm-kvm-vm" "Error starting KVM VM $KVM_VM_NAME! $CMD_ERR"
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-		fi
-		touch $OPENQRM_VM_DIR/$KVM_VM_NAME/autostart.$resource_id
-
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-
-		openqrm_post_event 0 "start" 5 "openqrm-kvm-vm" "Started KVM VM $KVM_VM_NAME."
-		;;
-	start_by_mac)
-		KVM_VM_NAME=`grep -rHi $KVM_VM_MAC $OPENQRM_VM_DIR/*/net1 2>/dev/null | grep KVM_VM_MAC | cut -d':' -f1 2>/dev/null` 2>/dev/null
-		KVM_VM_NAME=`dirname $KVM_VM_NAME` 2>/dev/null
-		KVM_VM_NAME=`basename $KVM_VM_NAME` 2>/dev/null
-		if [ "$KVM_VM_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "start_by_mac" 2 "openqrm-kvm-vm" "Could not find KVM VM $KVM_VM_MAC on host."
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# get vm type
-		KVM_VM_TYPE=`get_vm_type $KVM_VM_NAME`
-		# kvm-vm-local or kvm-vm-net
-		if [ "$KVM_VM_TYPE" == "kvm-vm-local" ]; then
-			echo "KVM_VM_DISK_1=\"$KVM_VM_DISK\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/disk1
-			. $OPENQRM_VM_DIR/$KVM_VM_NAME/disk1
-			# start only if we have a root-disk
-			if [ "$KVM_VM_DISK_1" != "" ]; then
-				# lvol or blockfile ?
-				if echo $KVM_VM_DISK_1 | grep ^/dev 1>/dev/null; then
-					# aquire global lock for lvm operations
-					if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-						if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-							openqrm_global_lock aquire lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD $LOCK_TIME "Start-by-mac of VM $KVM_VM_NAME on volume $KVM_VM_DISK_1"
-						fi
-					fi
-					if [ ! -e "$KVM_VM_DISK_1" ]; then
-						# activate the lvol
-						kvm_refresh_lvm
-						lvchange -ay -y $KVM_VM_DISK_1
-						if [ ! -e "$KVM_VM_DISK_1" ]; then
-							lvchange -ay -y $KVM_VM_DISK_1
-						fi
-					fi
-					# always activate the lvol
-					lvchange -ay -y $KVM_VM_DISK_1
-					# release global lock
-					if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-						if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-							openqrm_global_lock release lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD
-						fi
-					fi
-
-					# ! We do not start here since this is done by the restart_by_mac function
-						# start + boot local
-						# $OPENQRM_VM_DIR/$KVM_VM_NAME/$KVM_VM_NAME.kvm
-				fi
-			fi
-			# ! We do not start here since this is done by the restart_by_mac function
-			#	# start the vm monitord / make sure it is stopped before
-			#	kill `ps ax | grep openqrm-kvm-monitord | grep -v grep | grep -i $KVM_VM_MAC | awk {' print $1 '}` 2>/dev/null
-			#	$RUNSCREEN -dmS $KVM_VM_MAC $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/sbin/openqrm-kvm-monitord $KVM_VM_MAC
-			#	touch $OPENQRM_VM_DIR/$KVM_VM_NAME/autostart.$resource_id
-		elif [ "$KVM_VM_TYPE" == "kvm-vm-net" ]; then
-			CMD_ERR=`$OPENQRM_VM_DIR/$KVM_VM_NAME/$KVM_VM_NAME.kvm 2>&1`
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "start_by_mac" 2 "openqrm-kvm-vm" "Error starting KVM VM $KVM_VM_NAME! $CMD_ERR"
-
-				openqrm_lock_queue release kvm $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-			fi
-		fi
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-
-		openqrm_post_event 0 "start_by_mac" 5 "openqrm-kvm-vm" "Started KVM VM $KVM_VM_NAME."
-		;;
-	stop)
-		if [ ! -e "$OPENQRM_VM_DIR/$KVM_VM_NAME/net1" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "stop" 2 "openqrm-kvm-vm" "Network configuration of KVM VM $KVM_VM_NAME does not exists!"
-			exit 1
-		fi
-		# get mac
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-		if [ "$KVM_VM_MAC_1" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "stop" 2 "openqrm-kvm-vm" "Could not find mac address of KVM VM $KVM_VM_NAME!"
-			exit 1
-		fi
-		# get vm type
-		KVM_VM_TYPE=`get_vm_type $KVM_VM_NAME`
-
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# send powerdown
-		if [ -e "$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon" ]; then
-			echo "system_powerdown" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-		fi
-		# wait until shutdown-delay, if VM is not down then stop hard
-		KVM_VM_SHUTDOWN_LOOP=0
-		while ps ax | grep -i "macaddr=$KVM_VM_MAC_1" | grep kvm | grep -i screen | grep -v grep 1>/dev/null; do
-			sleep 1
-			KVM_VM_SHUTDOWN_LOOP=$(( KVM_VM_SHUTDOWN_LOOP + 1 ))
-			if [ "$KVM_VM_SHUTDOWN_LOOP" == "$KVM_VM_SHUTDOWN_DELAY" ]; then
-				break
-			fi
-			# send powerdown again
-			echo "system_powerdown" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-		done
-
-		# quit via the monitor socket does not run ifdown-net-script
-		VM_PID=`ps ax | grep -i "macaddr=$KVM_VM_MAC_1" | grep kvm | grep -i screen | grep -v grep | awk {' print $1 '}`
-		if [ "$VM_PID" != "" ]; then
-			if [ "$KVM_VM_TYPE" == "kvm-vm-local" ]; then
-				openqrm_post_event 0 "stop" 5 "openqrm-kvm-vm" "Force stopping KVM VM $KVM_VM_NAME! Stopping PID $VM_PID"
-			fi
-			kill $VM_PID
-		fi
-		# kill the status monitor
-		kill `ps ax | grep openqrm-kvm-monitord | grep -v grep | grep -i $KVM_VM_MAC_1 | awk {' print $1 '}` 2>/dev/null
-		rm -f $OPENQRM_VM_DIR/$KVM_VM_NAME/autostart.$resource_id
-
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-
-		openqrm_post_event 0 "stop" 5 "openqrm-kvm-vm" "Stopped KVM VM $KVM_VM_NAME."
-		;;
-
-	stop_by_mac)
-		KVM_VM_NAME=`grep -rHi $KVM_VM_MAC $OPENQRM_VM_DIR/*/net1 2>/dev/null | grep KVM_VM_MAC | cut -d':' -f1 2>/dev/null` 2>/dev/null
-		KVM_VM_NAME=`dirname $KVM_VM_NAME` 2>/dev/null
-		KVM_VM_NAME=`basename $KVM_VM_NAME` 2>/dev/null
-		if [ "$KVM_VM_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "stop_by_mac" 2 "openqrm-kvm-vm" "Could not find KVM VM $KVM_VM_MAC on host."
-			exit 1
-		fi
-		if [ ! -e "$OPENQRM_VM_DIR/$KVM_VM_NAME/net1" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "stop_by_mac" 2 "openqrm-kvm-vm" "Network configuration of KVM VM $KVM_VM_NAME does not exists!"
-			exit 1
-		fi
-		# refresh mac
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-		if [ "$KVM_VM_MAC_1" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "stop_by_mac" 2 "openqrm-kvm-vm" "Could not find mac address of KVM VM $KVM_VM_NAME!"
-			exit 1
-		fi
-		if [ "$KVM_VM_MAC" != "$KVM_VM_MAC_1" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "stop_by_mac" 2 "openqrm-kvm-vm" "Mac address mismatch on KVM VM $KVM_VM_NAME!"
-			exit 1
-		fi
-
-		# get vm type
-		KVM_VM_TYPE=`get_vm_type $KVM_VM_NAME`
-
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# send powerdown
-		if [ -e "$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon" ]; then
-			echo "system_powerdown" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-		fi
-		# wait until shutdown-delay, if VM is not down then stop hard
-		KVM_VM_SHUTDOWN_LOOP=0
-		while ps ax | grep -i "macaddr=$KVM_VM_MAC_1" | grep kvm | grep -i screen | grep -v grep 1>/dev/null; do
-			sleep 1
-			KVM_VM_SHUTDOWN_LOOP=$(( KVM_VM_SHUTDOWN_LOOP + 1 ))
-			if [ "$KVM_VM_SHUTDOWN_LOOP" == "$KVM_VM_SHUTDOWN_DELAY" ]; then
-				break
-			fi
-			# send powerdown again
-			echo "system_powerdown" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-		done
-
-		VM_PID=`ps ax | grep -i "macaddr=$KVM_VM_MAC_1" | grep kvm | grep -i screen | grep -v grep | awk {' print $1 '}`
-		if [ "$VM_PID" != "" ]; then
-			if [ "$KVM_VM_TYPE" == "kvm-vm-local" ]; then
-				openqrm_post_event 0 "stop_by_mac" 5 "openqrm-kvm-vm" "Force stopping KVM VM $KVM_VM_NAME."
-			fi
-			kill $VM_PID
-		fi
-		#echo "quit" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-		# kill the status monitor
-		kill `ps ax | grep openqrm-kvm-monitord | grep -v grep | grep -i $KVM_VM_MAC_1 | awk {' print $1 '}` 2>/dev/null
-		rm -f $OPENQRM_VM_DIR/$KVM_VM_NAME/autostart.$resource_id
-
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-
-		openqrm_post_event 0 "stop_by_mac" 5 "openqrm-kvm-vm" "Stopped KVM VM $KVM_VM_NAME."
-		;;
-
-	restart_by_mac)
-		KVM_VM_NAME=`grep -rHi $KVM_VM_MAC $OPENQRM_VM_DIR/*/net1 2>/dev/null | grep KVM_VM_MAC | cut -d':' -f1 2>/dev/null` 2>/dev/null
-		KVM_VM_NAME=`dirname $KVM_VM_NAME` 2>/dev/null
-		KVM_VM_NAME=`basename $KVM_VM_NAME` 2>/dev/null
-		if [ "$KVM_VM_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "restart_by_mac" 2 "openqrm-kvm-vm" "Could not find KVM VM $KVM_VM_MAC on host."
-			exit 1
-		fi
-		if [ ! -e "$OPENQRM_VM_DIR/$KVM_VM_NAME/net1" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "stop_by_mac" 2 "openqrm-kvm-vm" "Network configuration of KVM VM $KVM_VM_NAME does not exists!"
-			exit 1
-		fi
-		# refresh mac
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-		if [ "$KVM_VM_MAC_1" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "restart_by_mac" 2 "openqrm-kvm-vm" "Could not find mac address of KVM VM $KVM_VM_NAME!"
-			exit 1
-		fi
-		if [ "$KVM_VM_MAC" != "$KVM_VM_MAC_1" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "restart_by_mac" 2 "openqrm-kvm-vm" "Mac address mismatch on KVM VM $KVM_VM_NAME!"
-			exit 1
-		fi
-
-		# get vm type
-		KVM_VM_TYPE=`get_vm_type $KVM_VM_NAME`
-
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# kvm-vm-local or kvm-vm-net
-		if [ "$KVM_VM_TYPE" == "kvm-vm-local" ]; then
-			# send powerdown
-			if [ -e "$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon" ]; then
-				echo "system_powerdown" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-			fi
-			# vm is not running, we can skip waiting for shutdown
-			# wait until shutdown-delay, if VM is not down then stop hard
-			KVM_VM_SHUTDOWN_LOOP=0
-			while ps ax | grep -i "macaddr=$KVM_VM_MAC_1" | grep kvm | grep -i screen | grep -v grep 1>/dev/null; do
-				sleep 1
-				KVM_VM_SHUTDOWN_LOOP=$(( KVM_VM_SHUTDOWN_LOOP + 1 ))
-				if [ "$KVM_VM_SHUTDOWN_LOOP" == "$KVM_VM_SHUTDOWN_DELAY" ]; then
-					break
-				fi
-				# send powerdown again
-				echo "system_powerdown" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-			done
-			VM_PID=`ps ax | grep -i "macaddr=$KVM_VM_MAC_1" | grep kvm | grep -i screen | grep -v grep | awk {' print $1 '}`
-			if [ "$VM_PID" != "" ]; then
-				openqrm_post_event 0 "restart_by_mac" 5 "openqrm-kvm-vm" "Force stopping KVM VM $KVM_VM_NAME $VM_PID."
-				kill $VM_PID
-			fi
-			# add disk disk parameter if disk param is not set to noop
-			if [ "$KVM_VM_DISK" != "noop" ]; then
-				echo "KVM_VM_DISK_1=\"$KVM_VM_DISK\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/disk1
-			fi
-			. $OPENQRM_VM_DIR/$KVM_VM_NAME/disk1
-			if [ "$KVM_VM_DISK_1" != "" ]; then
-				# lvol or blockfile ?
-				if echo $KVM_VM_DISK_1 | grep ^/dev 1>/dev/null; then
-					# aquire global lock for lvm operations
-					if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-						if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-							openqrm_global_lock aquire lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD $LOCK_TIME "Restart-by-mac of VM $KVM_VM_NAME on volume $KVM_VM_DISK_1"
-						fi
-					fi
-					if [ ! -e "$KVM_VM_DISK_1" ]; then
-						# activate the lvol
-						kvm_refresh_lvm
-						lvchange -ay -y $KVM_VM_DISK_1
-						if [ ! -e "$KVM_VM_DISK_1" ]; then
-							lvchange -ay -y $KVM_VM_DISK_1
-						fi
-					fi
-					# activate the lvol
-					lvchange -ay -y $KVM_VM_DISK_1
-					# release global lock
-					if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-						if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-							openqrm_global_lock release lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD
-						fi
-					fi
-				fi
-			fi
-			# stop the vm monitor
-			kill `ps ax | grep openqrm-kvm-monitord | grep -v grep | grep -i $KVM_VM_MAC | awk {' print $1 '}` 2>/dev/null
-
-			# start only if we have a root-disk
-			if [ "$KVM_VM_DISK_1" != "" ]; then
-
-				if [ "$OPENQRM_PLUGIN_KVM_E2FSCK_AFTER_CLONE" == "true" ]; then
-					# filesystem resize e2fsck
-					FIRST_PARTITION=`kpartx -av $KVM_VM_DISK_1 | awk '{ print $3 }' | head -n1`
-					if [ "$?" != 0 ]; then
-						openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm-vm" "Adding device maps for volume $KVM_VM_DISK_1 failed!"
-						return
-					fi
-					sleep 2
-					# wait until the device link is created
-					DEVICE_MAPPER_TIMEOUT=30
-					if [ "$FIRST_PARTITION" != "" ]; then
-						while (:); do
-							if [ -e "/dev/mapper/$FIRST_PARTITION" ]; then
-								break
-							fi
-							sleep 1
-							DLT=$(( $DLT + 1 ))
-							if [ "$DLT" == $DEVICE_MAPPER_TIMEOUT ]; then
-								openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm-vm" "Adding device maps for volume /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME timed out! Not resizsing!"
-								break
-							fi
-						done
-						FSCKERROR=$(e2fsck -fy /dev/mapper/$FIRST_PARTITION 2>&1)
-						if [ $? != 0 ] ; then
-							openqrm_post_event 0 "kvm_resize_fs" 5 "openqrm-kvm-vm" "e2fsck -fy /dev/mapper/$FIRST_PARTITION: $? $FSCKERROR"
-						fi
-					fi
-					kpartx -d $KVM_VM_DISK_1
-				fi
-
-				# :) start + boot local
-				CMD_ERR=`$OPENQRM_VM_DIR/$KVM_VM_NAME/$KVM_VM_NAME.kvm 2>&1`
-				if [ "$?" != 0 ]; then
-					CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-					openqrm_post_event 0 "restart_by_mac" 2 "openqrm-kvm-vm" "Error restarting KVM VM $KVM_VM_NAME! $CMD_ERR"
-
-					openqrm_lock_queue release kvm $LOCK_TIME
-					trap '' EXIT
-
-					exit 1
-				fi
-				# monitoring on the host or vm ?
-				if [ "$OPENQRM_PLUGIN_KVM_VM_MONITORING_ON_HOST" != "false" ]; then
-					kill `ps ax | grep openqrm-kvm-monitord | grep -v grep | grep -i $KVM_VM_MAC | awk {' print $1 '}` 2>/dev/null
-					$RUNSCREEN -dmS $KVM_VM_MAC $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/sbin/openqrm-kvm-monitord $KVM_VM_MAC
-				fi
-			else
-				# start the vm monitord
-				kill `ps ax | grep openqrm-kvm-monitord | grep -v grep | grep -i $KVM_VM_MAC | awk {' print $1 '}` 2>/dev/null
-				$RUNSCREEN -dmS $KVM_VM_MAC $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/sbin/openqrm-kvm-monitord $KVM_VM_MAC
-			fi
-			touch $OPENQRM_VM_DIR/$KVM_VM_NAME/autostart.$resource_id
-			openqrm_post_event 0 "restart_by_mac" 5 "openqrm-kvm-vm" "Restarted KVM VM $KVM_VM_NAME."
-		fi
-
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-		;;
-	reboot)
-		if [ ! -e "$OPENQRM_VM_DIR/$KVM_VM_NAME/net1" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "stop_by_mac" 2 "openqrm-kvm-vm" "Network configuration of KVM VM $KVM_VM_NAME does not exists!"
-			exit 1
-		fi
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-		if [ "$KVM_VM_MAC_1" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "restart_by_mac" 2 "openqrm-kvm-vm" "Could not find mac address of KVM VM $KVM_VM_NAME!"
-			exit 1
-		fi
-		# get vm type
-		KVM_VM_TYPE=`get_vm_type $KVM_VM_NAME`
-		# kvm-vm-local or kvm-vm-net
-		if [ "$KVM_VM_TYPE" == "kvm-vm-local" ]; then
-
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			# send powerdown
-			if [ -e "$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon" ]; then
-				echo "system_powerdown" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-			fi
-			# wait until shutdown-delay, if VM is not down then stop hard
-			KVM_VM_SHUTDOWN_LOOP=0
-			while ps ax | grep -i "macaddr=$KVM_VM_MAC_1" | grep kvm | grep -i screen | grep -v grep 1>/dev/null; do
-				sleep 1
-				KVM_VM_SHUTDOWN_LOOP=$(( KVM_VM_SHUTDOWN_LOOP + 1 ))
-				if [ "$KVM_VM_SHUTDOWN_LOOP" == "$KVM_VM_SHUTDOWN_DELAY" ]; then
-					break
-				fi
-				# send powerdown again
-				echo "system_powerdown" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-			done
-			VM_PID=`ps ax | grep -i "macaddr=$KVM_VM_MAC_1" | grep kvm | grep -i screen | grep -v grep | awk {' print $1 '}`
-			if [ "$VM_PID" != "" ]; then
-				openqrm_post_event 0 "reboot" 5 "openqrm-kvm-vm" "Force stopping KVM VM $KVM_VM_NAME! $VM_PID"
-				kill $VM_PID
-			fi
-
-			# start only if we have a root-disk
-			. $OPENQRM_VM_DIR/$KVM_VM_NAME/disk1
-			if [ "$KVM_VM_DISK_1" != "" ]; then
-				CMD_ERR=`$OPENQRM_VM_DIR/$KVM_VM_NAME/$KVM_VM_NAME.kvm 2>&1`
-				if [ "$?" != 0 ]; then
-					CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-					openqrm_post_event 0 "reboot" 2 "openqrm-kvm-vm" "Error rebooting KVM VM $KVM_VM_NAME! $CMD_ERR"
-
-					openqrm_lock_queue release kvm $LOCK_TIME
-					trap '' EXIT
-
-					exit 1
-				fi
-				
-				# monitoring on the host or vm ?
-				if [ "$OPENQRM_PLUGIN_KVM_VM_MONITORING_ON_HOST" != "false" ]; then
-					kill `ps ax | grep openqrm-kvm-monitord | grep -v grep | grep -i $KVM_VM_MAC_1 | awk {' print $1 '}` 2>/dev/null
-					$RUNSCREEN -dmS $KVM_VM_MAC_1 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/sbin/openqrm-kvm-monitord $KVM_VM_MAC_1
-				fi
-			else
-				# restart the vm monitord
-				kill `ps ax | grep openqrm-kvm-monitord | grep -v grep | grep -i $KVM_VM_MAC_1 | awk {' print $1 '}` 2>/dev/null
-				$RUNSCREEN -dmS $KVM_VM_MAC_1 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/sbin/openqrm-kvm-monitord $KVM_VM_MAC_1
-			fi
-			touch $OPENQRM_VM_DIR/$KVM_VM_NAME/autostart.$resource_id
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-		elif [ "$KVM_VM_TYPE" == "kvm-vm-net" ]; then
-			LOCK_TIME=`openqrm_lock_queue aquire kvm`
-			trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-			echo "system_reset" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-			touch $OPENQRM_VM_DIR/$KVM_VM_NAME/autostart.$resource_id
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-		fi
-		openqrm_post_event 0 "reboot" 5 "openqrm-kvm-vm" "Rebooted KVM VM $KVM_VM_NAME."
-		;;
-	delete)
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		if [ -e "$OPENQRM_VM_DIR/$KVM_VM_NAME/net1" ]; then
-			# be sure it is stopped
-			. $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-			if [ "$KVM_VM_MAC_1" != "" ]; then
-				# wait until shutdown-delay, if VM is not down then stop hard
-				KVM_VM_SHUTDOWN_LOOP=0
-				while ps ax | grep -i "macaddr=$KVM_VM_MAC_1" | grep kvm | grep -i screen | grep -v grep 1>/dev/null; do
-					sleep 1
-					KVM_VM_SHUTDOWN_LOOP=$(( KVM_VM_SHUTDOWN_LOOP + 1 ))
-					if [ "$KVM_VM_SHUTDOWN_LOOP" == "$KVM_VM_SHUTDOWN_DELAY" ]; then
-						break
-					fi
-					# send powerdown again
-					echo "system_powerdown" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-				done
-				# still running, force stop
-				VM_PID=`ps ax | grep -i "macaddr=$KVM_VM_MAC_1" | grep kvm | grep -i screen | grep -v grep | awk {' print $1 '}`
-				if [ "$VM_PID" != "" ]; then
-					openqrm_post_event 0 "delete" 5 "openqrm-kvm-vm" "KVM VM $KVM_VM_NAME still running in delete! Stopping $VM_PID"
-					kill $VM_PID
-				fi
-			fi
-		fi
-		#echo "quit" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-		sleep 2
-
-		rm -rf $OPENQRM_VM_DIR/$KVM_VM_NAME
-		rm -f $OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-		# we have to wait here because when having a shared config dir
-		# nfs can still have files in use/lock
-		KVM_REMOVE_WAIT=0
-		while (:); do
-			if [ -d "$OPENQRM_VM_DIR/$KVM_VM_NAME" ]; then
-				openqrm_post_event 0 "delete" 5 "openqrm-kvm-vm" "Delete KVM VM $KVM_VM_NAME failed, retrying."
-			else
-				openqrm_post_event 0 "delete" 5 "openqrm-kvm-vm" "Delete KVM VM $KVM_VM_NAME success."
-				break
-			fi
-			if [ "$KVM_REMOVE_WAIT" == "$KVM_REMOVE_MAX_WAIT" ]; then
-				openqrm_post_event 0 "delete" 3 "openqrm-kvm-vm" "Delete KVM VM $KVM_VM_NAME failed, giving up!"
-				break
-			fi
-			KVM_REMOVE_WAIT=$(( KVM_REMOVE_WAIT + 1 ))
-			rm -rf $OPENQRM_VM_DIR/$KVM_VM_NAME
-			sleep 1
-		done
-		openqrm_post_event 0 "delete" 5 "openqrm-kvm-vm" "Deleted KVM VM $KVM_VM_NAME."
-
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-		;;
-	list)
-		ls $OPENQRM_VM_DIR/
-		;;
-	post_vm_list)
-		VM_LIST_TMP=$resource_id.vm_list
-		> $VM_LIST_TMP
-		if [ ! -d $OPENQRM_VM_DIR ]; then
-			mkdir -p $OPENQRM_VM_DIR
-		fi
-		# create processlist
-		ps ax > $resource_id.process_list
-		for kvmvm in `ls $OPENQRM_VM_DIR/`; do
-			if [ ! -f "$OPENQRM_VM_DIR/$kvmvm/cpus" ]; then
-				continue
-			fi
-			# get mac address
-			. $OPENQRM_VM_DIR/$kvmvm/cpus
-			. $OPENQRM_VM_DIR/$kvmvm/ram
-			. $OPENQRM_VM_DIR/$kvmvm/net1
-			. $OPENQRM_VM_DIR/$kvmvm/net2
-			. $OPENQRM_VM_DIR/$kvmvm/net3
-			. $OPENQRM_VM_DIR/$kvmvm/net4
-			. $OPENQRM_VM_DIR/$kvmvm/net5
-			. $OPENQRM_VM_DIR/$kvmvm/vnc
-			. $OPENQRM_VM_DIR/$kvmvm/vncpassword
-
-			# check if active
-			if grep -i "macaddr=$KVM_VM_MAC_1" $resource_id.process_list | grep -i screen 1>/dev/null; then
-			    if [ -f "$OPENQRM_VM_DIR/$kvmvm/migration_in_progress" ]; then
-				# migration active !
-				VM_ACTIVE=2
-			    else
-				VM_ACTIVE=1
-			    fi
-			else
-				VM_ACTIVE=0
-			fi
-			echo "$VM_ACTIVE""@""$kvmvm""@""$KVM_VM_MAC_1""@""$KVM_VM_CPUS""@""$KVM_VM_RAM""@""$KVM_VM_VNC""@""$KVM_VM_VNCPASSWORD""@""$KVM_VM_MAC_2,$KVM_VM_MAC_3,$KVM_VM_MAC_4,$KVM_VM_MAC_5""@" >> $VM_LIST_TMP
-		done
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $VM_LIST_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?kvm_server_command=get_kvm_server; then
-			openqrm_post_event 0 "post_vm_list" 2 "openqrm-kvm-vm" "Could not post VM list to the openQRM-server at $OPENQRM_SERVER_IP!"
-		fi
-		rm -f $resource_id.process_list
-		rm -f $VM_LIST_TMP
-		rm -f $VM_LIST_TMP.post
-		;;
-	post_vm_config)
-		if [ "$KVM_VM_NAME" == "" ]; then
-			kvm_usage
-		fi
-		VM_CONFIG_TMP=$resource_id.$KVM_VM_NAME.vm_config
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/cpus
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/ram
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/disk1
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/disk2
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/disk3
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/disk4
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/vnc
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-		if [ -f "$OPENQRM_VM_DIR/$KVM_VM_NAME/vncpassword" ]; then
-			. $OPENQRM_VM_DIR/$KVM_VM_NAME/vncpassword
-		fi
-		if [ -f "$OPENQRM_VM_DIR/$KVM_VM_NAME/vnckeymap" ]; then
-			. $OPENQRM_VM_DIR/$KVM_VM_NAME/vnckeymap
-		fi
-		# disk interface
-		if [ -f "$OPENQRM_VM_DIR/$KVM_VM_NAME/disk-interface" ]; then
-			. $OPENQRM_VM_DIR/$KVM_VM_NAME/disk-interface
-		else
-			KVM_VM_DISK_INTERFACE="ide"
-		fi
-		# CDROM
-		if [ -f "$OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom2" ]; then
-			. $OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom2
-		else
-			KVM_VM_CDROM2=""
-		fi
-		# get vm type
-		KVM_VM_TYPE=`get_vm_type $KVM_VM_NAME`
-		# made the boot device readable
-		KVM_VM_BOOT_STR="local"
-		KVM_VM_BOOT=`echo $KVM_VM_BOOT | awk {' print $2 '}`
-		case "$KVM_VM_BOOT" in
-			d*)
-				if echo $KVM_VM_CDROM | grep /dev/cdrom &>/dev/null; then
-					KVM_VM_BOOT_STR="cdrom"
-				else
-					KVM_VM_ISO=`echo $KVM_VM_CDROM | awk '{ print $2 }'`
-					KVM_VM_BOOT_STR="iso:$KVM_VM_ISO"
-				fi
-				;;
-			c*)
-				KVM_VM_BOOT_STR="local"
-				;;
-			n*)
-				KVM_VM_BOOT_STR="network"
-				;;
-		esac
-
-		echo "OPENQRM_KVM_VM_CPUS=\"$KVM_VM_CPUS\"" > $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_RAM=\"$KVM_VM_RAM\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_NET_1=\"$KVM_VM_NET_1\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_MAC_1=\"$KVM_VM_MAC_1\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_BRIDGE_1=\"$KVM_VM_MAC_BRIDGE_1\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_NIC_TYPE_1=\"$KVM_VM_NIC_TYPE_1\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_NET_2=\"$KVM_VM_NET_2\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_MAC_2=\"$KVM_VM_MAC_2\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_BRIDGE_2=\"$KVM_VM_MAC_BRIDGE_2\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_NIC_TYPE_2=\"$KVM_VM_NIC_TYPE_2\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_NET_3=\"$KVM_VM_NET_3\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_MAC_3=\"$KVM_VM_MAC_3\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_BRIDGE_3=\"$KVM_VM_MAC_BRIDGE_3\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_NIC_TYPE_3=\"$KVM_VM_NIC_TYPE_3\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_NET_4=\"$KVM_VM_NET_4\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_MAC_4=\"$KVM_VM_MAC_4\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_BRIDGE_4=\"$KVM_VM_MAC_BRIDGE_4\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_NIC_TYPE_4=\"$KVM_VM_NIC_TYPE_4\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_NET_5=\"$KVM_VM_NET_5\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_MAC_5=\"$KVM_VM_MAC_5\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_BRIDGE_5=\"$KVM_VM_MAC_BRIDGE_5\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_NIC_TYPE_5=\"$KVM_VM_NIC_TYPE_5\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_DISK_1=\"$KVM_VM_DISK_1\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_DISK_SIZE_1=\"$KVM_VM_DISK_SIZE_1\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_DISK_2=\"$KVM_VM_DISK_2\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_DISK_SIZE_2=\"$KVM_VM_DISK_SIZE_2\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_DISK_3=\"$KVM_VM_DISK_3\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_DISK_SIZE_3=\"$KVM_VM_DISK_SIZE_3\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_DISK_4=\"$KVM_VM_DISK_4\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_DISK_SIZE_4=\"$KVM_VM_DISK_SIZE_4\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_DISK_INTERFACE=\"$KVM_VM_DISK_INTERFACE\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_CDROM=\"$KVM_VM_CDROM\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_CDROM2=\"$KVM_VM_CDROM2\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_VNC=\"$KVM_VM_VNC\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_VNCPASSWORD=\"$KVM_VM_VNCPASSWORD\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_VNCKEYMAP=\"$KVM_VM_VNCKEYMAP\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_BOOT=\"$KVM_VM_BOOT_STR\"" >> $VM_CONFIG_TMP
-		echo "OPENQRM_KVM_VM_TYPE=\"$KVM_VM_TYPE\"" >> $VM_CONFIG_TMP
-		# and the host bridge config to avoid a second script run
-		echo -n "OPENQRM_KVM_BRIDGES=\"" >> $VM_CONFIG_TMP
-		for BRIDGE in `brctl show | tail -n+2 | awk '{ print $1 }'`; do
-			echo -n "$BRIDGE"":" >> $VM_CONFIG_TMP
-		done
-                if which ovs-vsctl 1>/dev/null; then
-                        for OVS in `ovs-vsctl show | grep -w Bridge | awk '{ print $2 }' | sed -e 's/\"//g'`; do
-                                echo -n "$OVS"":" >> $VM_CONFIG_TMP
-                        done
-
-                fi
-		echo -n "\"" >> $VM_CONFIG_TMP
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $VM_CONFIG_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?kvm_server_command=get_kvm_config; then
-			openqrm_post_event 0 "post_vm_config" 2 "openqrm-kvm-vm" "Could not post VM $KVM_VM_NAME config to the openQRM-server at $OPENQRM_SERVER_IP!"
-		fi
-		rm -f $VM_CONFIG_TMP
-		rm -f $VM_CONFIG_TMP.post
-		;;
-
-	post_bridge_config)
-		BRIDGE_CONFIG_TMP=$resource_id.bridge_config
-		echo -n "OPENQRM_KVM_BRIDGES=\"" > $BRIDGE_CONFIG_TMP
-		for BRIDGE in `brctl show | tail -n+2 | awk '{ print $1 }'`; do
-			echo -n "$BRIDGE"":" >> $BRIDGE_CONFIG_TMP
-		done
-		if which ovs-vsctl 1>/dev/null; then
-			for OVS in `ovs-vsctl show | grep -w Bridge | awk '{ print $2 }' | sed -e 's/\"//g'`; do
-				echo -n "$OVS"":" >> $BRIDGE_CONFIG_TMP
-			done
-
-		fi
-		echo -n "\"" >> $BRIDGE_CONFIG_TMP
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $BRIDGE_CONFIG_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?kvm_server_command=get_bridge_config; then
-			openqrm_post_event 0 "post_bridge_config" 2 "openqrm-kvm-vm" "Could not post bridge config to the openQRM-server at $OPENQRM_SERVER_IP!"
-		fi
-		rm -f $BRIDGE_CONFIG_TMP
-		rm -f $BRIDGE_CONFIG_TMP.post
-		;;
-
-
-	update_vm_cpus)
-		if [ "$KVM_VM_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ "$KVM_VM_CPUS" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		sed -i -e s"#KVM_VM_CPUS=.*#KVM_VM_CPUS=\"$KVM_VM_CPUS\"#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/cpus
-
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-		;;
-
-
-	update_vm_ram)
-		if [ "$KVM_VM_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ "$KVM_VM_RAM" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		sed -i -e s"#KVM_VM_RAM=.*#KVM_VM_RAM=\"$KVM_VM_RAM\"#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/ram
-
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-		;;
-
-
-	update_vm_vnc)
-		if [ "$KVM_VM_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ "$KVM_VM_VNCPASSWORD" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		sed -i -e s"#KVM_VM_VNCPASSWORD=.*#KVM_VM_VNCPASSWORD=\"$KVM_VM_VNCPASSWORD\"#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/vncpassword
-		# change it directly if the vm is running
-		echo "change vnc password $KVM_VM_VNCPASSWORD" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-		;;
-
-	add_vm_nic)
-		if [ "$KVM_VM_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ "$KVM_VM_MAC" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ "$KVM_VM_COMPONENT_NUMBER" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		OPENQRM_APP_NIC=$(( $KVM_VM_COMPONENT_NUMBER - 1 ))
-		case "$KVM_VM_MAC_BRIDGE" in
-			1)
-				KVM_BRIDGE_NAME=$OPENQRM_PLUGIN_KVM_BRIDGE_NET1
-				;;
-			2)
-				KVM_BRIDGE_NAME=$OPENQRM_PLUGIN_KVM_BRIDGE_NET2
-				;;
-			3)
-				KVM_BRIDGE_NAME=$OPENQRM_PLUGIN_KVM_BRIDGE_NET3
-				;;
-			4)
-				KVM_BRIDGE_NAME=$OPENQRM_PLUGIN_KVM_BRIDGE_NET4
-				;;
-			5)
-				KVM_BRIDGE_NAME=$OPENQRM_PLUGIN_KVM_BRIDGE_NET5
-				;;
-		esac
-
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		# network
-		case "$OPENQRM_PLUGIN_KVM_BRIDGE_TYPE" in
-			bridge)
-				# regular bridging
-				sed -i -e s"#KVM_VM_NET_$KVM_VM_COMPONENT_NUMBER=.*#KVM_VM_NET_$KVM_VM_COMPONENT_NUMBER=\"-net nic,vlan=$KVM_VM_COMPONENT_NUMBER,macaddr=$KVM_VM_MAC,model=$KVM_VM_NIC_TYPE -net tap,vlan=$KVM_VM_COMPONENT_NUMBER,script=$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifup-net$KVM_VM_MAC_BRIDGE,downscript=$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifdown-net$KVM_VM_MAC_BRIDGE\"#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/net""$KVM_VM_COMPONENT_NUMBER
-				;;
-			openvswitch)
-				# ovs
-				cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_BRIDGE_NAME/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#$OPENQRM_APP_NIC#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup""$KVM_VM_MAC_BRIDGE.$KVM_VM_COMPONENT_NUMBER
-				cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_BRIDGE_NAME/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#$OPENQRM_APP_NIC#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifdown-net""$KVM_VM_MAC_BRIDGE.$KVM_VM_COMPONENT_NUMBER
-				chmod +x $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm*
-				sed -i -e s"#KVM_VM_NET_$KVM_VM_COMPONENT_NUMBER=.*#KVM_VM_NET_$KVM_VM_COMPONENT_NUMBER=\"-net nic,vlan=$KVM_VM_COMPONENT_NUMBER,macaddr=$KVM_VM_MAC,model=$KVM_VM_NIC_TYPE -net tap,vlan=$KVM_VM_COMPONENT_NUMBER,script=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifup$KVM_VM_MAC_BRIDGE.$KVM_VM_COMPONENT_NUMBER,downscript=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-ovs-kvm-ifdown-net$KVM_VM_MAC_BRIDGE.$KVM_VM_COMPONENT_NUMBER\"#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/net""$KVM_VM_COMPONENT_NUMBER
-				;;
-			vlanbridge)
-				# bridged vlans
-				# here we need to create a new ifup/down script with the right app_nic number in it
-				cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_BRIDGE_NAME/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#$OPENQRM_APP_NIC#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifup-net""$KVM_VM_MAC_BRIDGE.$KVM_VM_COMPONENT_NUMBER
-				cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$KVM_BRIDGE_NAME/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#$OPENQRM_APP_NIC#g" > $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifdown-net""$KVM_VM_MAC_BRIDGE.$KVM_VM_COMPONENT_NUMBER
-				chmod +x $OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm*
-				sed -i -e s"#KVM_VM_NET_$KVM_VM_COMPONENT_NUMBER=.*#KVM_VM_NET_$KVM_VM_COMPONENT_NUMBER=\"-net nic,vlan=$KVM_VM_COMPONENT_NUMBER,macaddr=$KVM_VM_MAC,model=$KVM_VM_NIC_TYPE -net tap,vlan=$KVM_VM_COMPONENT_NUMBER,script=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifup-net$KVM_VM_MAC_BRIDGE.$KVM_VM_COMPONENT_NUMBER,downscript=$OPENQRM_VM_DIR/$KVM_VM_NAME/openqrm-vlan-kvm-ifdown-net$KVM_VM_MAC_BRIDGE.$KVM_VM_COMPONENT_NUMBER\"#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/net""$KVM_VM_COMPONENT_NUMBER
-				;;
-
-		esac
-		sed -i -e s"#KVM_VM_MAC_$KVM_VM_COMPONENT_NUMBER=.*#KVM_VM_MAC_$KVM_VM_COMPONENT_NUMBER=\"$KVM_VM_MAC\"#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/net""$KVM_VM_COMPONENT_NUMBER
-
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-		;;
-	remove_vm_nic)
-		if [ "$KVM_VM_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ "$KVM_VM_COMPONENT_NUMBER" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		sed -i -e s"#KVM_VM_NET_$KVM_VM_COMPONENT_NUMBER=.*#KVM_VM_NET_$KVM_VM_COMPONENT_NUMBER=\"\"#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/net""$KVM_VM_COMPONENT_NUMBER
-		sed -i -e s"#KVM_VM_MAC_$KVM_VM_COMPONENT_NUMBER=.*#KVM_VM_MAC_$KVM_VM_COMPONENT_NUMBER=\"\"#g" $OPENQRM_VM_DIR/$KVM_VM_NAME/net""$KVM_VM_COMPONENT_NUMBER
-
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-		;;
-
-	setboot)
-		unset KVM_VM_NAME
-		if [ "$KVM_VM_MAC" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ "$KVM_VM_BOOT" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# this command is is running from the openQRM engine which does
-		# not know about the kvm-name
-		KVM_VM_NAME=`grep -rHi $KVM_VM_MAC $OPENQRM_VM_DIR/*/net1 2>/dev/null | grep KVM_VM_MAC | cut -d':' -f1 2>/dev/null` 2>/dev/null
-		KVM_VM_NAME=`dirname $KVM_VM_NAME` 2>/dev/null
-		KVM_VM_NAME=`basename $KVM_VM_NAME` 2>/dev/null
-		if [ "$KVM_VM_NAME" == "" ]; then
-			openqrm_post_event 0 "setboot" 2 "openqrm-kvm-vm" "Could not find KVM VM $KVM_VM_MAC on host."
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-			exit 1
-		fi
-		case "$KVM_VM_BOOT" in
-			local)
-				echo "KVM_VM_BOOT=\"-boot cn\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-				echo "boot_set c" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-				;;
-			net)
-				echo "KVM_VM_BOOT=\"-boot n\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-				echo "boot_set n" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-				;;
-			network)
-				echo "KVM_VM_BOOT=\"-boot n\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-				echo "boot_set n" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-				;;
-			cdrom)
-				echo "KVM_VM_BOOT=\"-boot d\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-				echo "KVM_VM_CDROM=\"-cdrom /dev/cdrom\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom
-				echo "boot_set d" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-				;;
-			iso)
-				echo "KVM_VM_BOOT=\"-boot d\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-				echo "KVM_VM_CDROM=\"-cdrom $KVM_VM_BOOT_ISO\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom
-				echo "boot_set d" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-				;;
-		esac
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-		;;
-
-
-	setboot_by_name)
-		if [ "$KVM_VM_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ "$KVM_VM_BOOT" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		case "$KVM_VM_BOOT" in
-			local)
-				echo "KVM_VM_BOOT=\"-boot c\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-				;;
-			net)
-				echo "KVM_VM_BOOT=\"-boot n\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-				;;
-			network)
-				echo "KVM_VM_BOOT=\"-boot n\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-				;;
-			cdrom)
-				echo "KVM_VM_BOOT=\"-boot d\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-				echo "KVM_VM_CDROM=\"-cdrom /dev/cdrom\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom
-				;;
-			iso)
-				echo "KVM_VM_BOOT=\"-boot d\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/boot
-				echo "KVM_VM_CDROM=\"-cdrom $KVM_VM_BOOT_ISO\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/cdrom
-				;;
-		esac
-		# no restart here, this is from the vm config
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-		;;
-
-
-	fence)
-		unset KVM_VM_NAME
-		if [ "$KVM_VM_MAC" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		# this command is is running from the openQRM engine which does
-		# not know about the kvm-name
-		KVM_VM_NAME=`grep -rHi $KVM_VM_MAC $OPENQRM_VM_DIR/*/net1 2>/dev/null | grep KVM_VM_MAC | cut -d':' -f1 2>/dev/null` 2>/dev/null
-		KVM_VM_NAME=`dirname $KVM_VM_NAME` 2>/dev/null
-		KVM_VM_NAME=`basename $KVM_VM_NAME` 2>/dev/null
-		if [ "$KVM_VM_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "fence" 2 "openqrm-kvm-vm" "Could not find KVM VM $KVM_VM_MAC on host."
-			exit 1
-		fi
-		if [ ! -e "$OPENQRM_VM_DIR/$KVM_VM_NAME/net1" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "fence" 2 "openqrm-kvm-vm" "Network configuration of KVM VM $KVM_VM_NAME does not exists!"
-			exit 1
-		fi
-		# refresh mac
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-		if [ "$KVM_VM_MAC_1" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "fence" 2 "openqrm-kvm-vm" "Could not find mac address of KVM VM $KVM_VM_NAME!"
-			exit 1
-		fi
-		if [ "$KVM_VM_MAC" != "$KVM_VM_MAC_1" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "fence" 2 "openqrm-kvm-vm" "Mac address mismatch on KVM VM $KVM_VM_NAME!"
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# stop it hard
-		VM_PID=`ps ax | grep -i "macaddr=$KVM_VM_MAC_1" | grep kvm | grep -i screen | grep -v grep | awk {' print $1 '}`
-		if [ "$VM_PID" != "" ]; then
-			kill $VM_PID
-			openqrm_post_event 0 "fence" 5 "openqrm-kvm-vm" "Fenced KVM VM $KVM_VM_MAC! $VM_PID"
-		fi
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-		;;
-
-
-	transfer_vm_config)
-		# this is running on the openQRM server to transfer a VM config from one host to another
-		if [ "$KVM_VM_NAME" == "" ] || [ "$KVM_MIGRATION_DESTINATION_HOST" == "" ] || [ "$KVM_MIGRATION_SOURCE_HOST" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ "$KVM_MIGRATION_DESTINATION_HOST" == "$KVM_MIGRATION_SOURCE_HOST" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/tmp/
-		KVM_VM_TRANSFER_TMP_DIR=`mktemp -d $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/tmp/kvm-transfer-$KVM_VM_NAME.XXXXXX`
-
-		CMD_ERR=`rsync -a -e "dbclient -K 10 -y -i $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear/dropbear_rsa_host_key -p $OPENQRM_EXEC_PORT" $KVM_MIGRATION_SOURCE_HOST:$OPENQRM_VM_DIR/$KVM_VM_NAME $KVM_VM_TRANSFER_TMP_DIR/ 2>&1`
-		if [ "$?" != 0 ]; then
-			CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-			openqrm_post_event 0 "transfer_vm_config" 2 "openqrm-kvm-vm" "Error get KVM VM $KVM_VM_NAME from $KVM_MIGRATION_SOURCE_HOST! $CMD_ERR"
-			rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/tmp/kvm-transfer-$KVM_VM_NAME.*
-
-			echo "Failed to get the configuration for VM $KVM_VM_NAME from Host $KVM_MIGRATION_SOURCE_HOST" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/kvm-stat/$KVM_VM_NAME.transfer_status_tmp
-			chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/kvm-stat/$KVM_VM_NAME.transfer_status_tmp
-			mv $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/kvm-stat/$KVM_VM_NAME.transfer_status_tmp $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/kvm-stat/$KVM_VM_NAME.transfer_status
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-			exit 1
-		fi
-
-		CMD_ERR=`rsync -a -e "dbclient -K 10 -y -i $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear/dropbear_rsa_host_key -p $OPENQRM_EXEC_PORT" $KVM_VM_TRANSFER_TMP_DIR/$KVM_VM_NAME $KVM_MIGRATION_DESTINATION_HOST:$OPENQRM_VM_DIR/ 2>&1`
-		if [ "$?" != 0 ]; then
-			CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-			openqrm_post_event 0 "transfer_vm_config" 2 "openqrm-kvm-vm" "Error transfering KVM VM $KVM_VM_NAME to $KVM_MIGRATION_DESTINATION_HOST! $CMD_ERR"
-			rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/tmp/kvm-transfer-$KVM_VM_NAME.*
-
-			echo "Failed to transfer configuration for the VM $KVM_VM_NAME to Host $KVM_MIGRATION_DESTINATION_HOST" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/kvm-stat/$KVM_VM_NAME.transfer_status_tmp
-			chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/kvm-stat/$KVM_VM_NAME.transfer_status_tmp
-			mv $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/kvm-stat/$KVM_VM_NAME.transfer_status_tmp $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/kvm-stat/$KVM_VM_NAME.transfer_status
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-			exit 1
-		fi
-
-		rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/tmp/kvm-transfer-$KVM_VM_NAME.*
-		echo "ok" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/kvm-stat/$KVM_VM_NAME.transfer_status_tmp
-		chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/kvm-stat/$KVM_VM_NAME.transfer_status_tmp
-		mv $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/kvm-stat/$KVM_VM_NAME.transfer_status_tmp $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/kvm-stat/$KVM_VM_NAME.transfer_status
-
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-		;;
-
-
-	start_as_incoming)
-		if [ "$KVM_VM_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ "$KVM_MIGRATION_PORT" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ ! -e "$OPENQRM_VM_DIR/$KVM_VM_NAME/net1" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "start_as_incoming" 2 "openqrm-kvm-vm" "Network configuration of KVM VM $KVM_VM_NAME does not exists!"
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# make sure it is stopped before
-		if [ -e "$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon" ]; then
-			echo "quit" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-		fi
-		# if we have a disk make sure it is activated
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/disk1
-		if [ "$KVM_VM_DISK_1" != "" ]; then
-			# lvol or blockfile ?
-			if echo $KVM_VM_DISK_1 | grep ^/dev 1>/dev/null; then
-				# aquire global lock for lvm operations
-				if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-					if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-						openqrm_global_lock aquire lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD $LOCK_TIME "Start_as_incoming of VM $KVM_VM_NAME on volume $KVM_VM_DISK_1"
-					fi
-				fi
-				if [ ! -e "$KVM_VM_DISK_1" ]; then
-					# activate the lvol
-					kvm_refresh_lvm
-					lvchange -ay -y $KVM_VM_DISK_1
-					if [ ! -e "$KVM_VM_DISK_1" ]; then
-						lvchange -ay -y $KVM_VM_DISK_1
-					fi
-				fi
-				lvchange -ay -y $KVM_VM_DISK_1
-				# release global lock
-				if [ "$OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK" == "true" ]; then
-					if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-						openqrm_global_lock release lvm $KVM_OPENQRM_USERNAME $KVM_OPENQRM_PASSWORD
-					fi
-				fi
-			fi
-		fi
-		# before we start as incoming we have to adjust the vnc server ip in the vm config
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/vnc
-		VM_VNC_ID=`echo $KVM_VM_VNC | cut -d':' -f2`
-		if [ "$OPENQRM_PLUGIN_VM_VNC_LISTEN" == "all" ]; then
-			echo "KVM_VM_VNC=\"0.0.0.0:$VM_VNC_ID\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/vnc
-		else
-			echo "KVM_VM_VNC=\"$resource_ip:$VM_VNC_ID\"" > $OPENQRM_VM_DIR/$KVM_VM_NAME/vnc
-		fi
-		# and remove the source host autostart file
-		rm -f $OPENQRM_VM_DIR/$KVM_VM_NAME/autostart.*
-		# create long-term-action start event
-		openqrm_post_event 0 "$KVM_VM_NAME" 9 "kvm" "Started migration of KVM VM $KVM_VM_NAME"
-		#touch $OPENQRM_VM_DIR/$KVM_VM_NAME/migration_in_progress
-		rm -f $OPENQRM_VM_DIR/$KVM_VM_NAME/migration_in_progress
-
-		# posting migration progress 0 to openQRM
-		if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-			# post 0%
-			KVM_VM_MIGRATION_PROGRESS=0
-			echo "$KVM_VM_MIGRATION_PROGRESS" > $KVM_VM_NAME.vm_migration_progress
-			if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD --post-file=`$OPENQRM_POSTENCODE $KVM_VM_NAME.vm_migration_progress` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?kvm_server_command=get_vm_migration; then
-				openqrm_post_event 0 "start_as_incoming" 2 "openqrm-kvm-vm" "Could not post KVM VM $KVM_VM_NAME migration progress the openQRM-server at $OPENQRM_SERVER_IP!"
-			fi
-			rm -f $KVM_VM_NAME.vm_migration_progress
-			rm -f $KVM_VM_NAME.vm_migration_progress.post
-		fi
-
-		# now start as incoming migration
-		CMD_ERR=`$OPENQRM_VM_DIR/$KVM_VM_NAME/$KVM_VM_NAME.kvm.incoming $KVM_MIGRATION_PORT 2>&1`
-		if [ "$?" != 0 ]; then
-			CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-			openqrm_post_event 0 "start_as_incoming" 2 "openqrm-kvm-vm" "Error starting KVM VM $KVM_VM_NAME! $CMD_ERR"
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-			exit 1
-		fi
-		# restart the vm monitord
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-		# monitoring on the host or vm ?
-		if [ "$OPENQRM_PLUGIN_KVM_VM_MONITORING_ON_HOST" != "false" ]; then
-			kill `ps ax | grep openqrm-kvm-monitord | grep -v grep | grep -i $KVM_VM_MAC_1 | awk {' print $1 '}` 2>/dev/null
-			$RUNSCREEN -dmS $KVM_VM_MAC_1 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/sbin/openqrm-kvm-monitord $KVM_VM_MAC_1
-		fi
-		touch $OPENQRM_VM_DIR/$KVM_VM_NAME/autostart.$resource_id
-		openqrm_post_event 0 "start_as_incoming" 5 "openqrm-kvm-vm" "Started KVM VM $KVM_VM_NAME as incoming migration."
-
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-		;;
-
-	migrate)
-		if [ "$KVM_VM_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ "$KVM_MIGRATION_PORT" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ "$KVM_MIGRATION_DESTINATION_HOST" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ ! -e "$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon" ]; then
-			# end long term event
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "$KVM_VM_NAME" 10 "kvm" "Stopped migration of VM $KVM_VM_NAME"
-			openqrm_post_event 0 "migrate" 3 "openqrm-kvm-vm" "Migrating KVM VM $KVM_VM_NAME failed. VM is not running!"
-			rm -f $OPENQRM_VM_DIR/$KVM_VM_NAME/migration_in_progress
-			exit 1
-		fi
-		# migrate runs after start_as_incoming so we delay the trigger for the migrate action a bit
-		sleep 10
-
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		echo "migrate -d tcp:$KVM_MIGRATION_DESTINATION_HOST:$KVM_MIGRATION_PORT" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-		# release the lock early
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-
-		# start to monitor the migration, this stop the source vm when migration completed
-		$RUNSCREEN -dmS migration_monitor.$KVM_VM_NAME $0 monitor_migration -n $KVM_VM_NAME -j $KVM_MIGRATION_PORT -u $KVM_OPENQRM_USERNAME -p $KVM_OPENQRM_PASSWORD --openqrm-internal-cmd true
-		openqrm_post_event 0 "migrate" 5 "openqrm-kvm-vm" "Migrating KVM VM $KVM_VM_MAC to $KVM_MIGRATION_DESTINATION_HOST."
-		;;
-
-
-	monitor_migration)
-		if [ "$KVM_VM_NAME" == "" ]; then
-			kvm_usage
-		fi
-		if [ "$KVM_MIGRATION_PORT" == "" ]; then
-			kvm_usage
-		fi
-		# no need to lock
-		# monitor migration and stop the vm on the source host after the transfer is complete
-		KVM_MIGRATION_LOG="/tmp/kvm-migration.$KVM_VM_NAME.log"
-		KVM_MIGRATION_LOOP=0
-		. $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-		while (true); do
-			if ! echo "info migrate" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon > $KVM_MIGRATION_LOG; then
-				# socket is gone, migration finished
-				# posting migration success to openQRM
-				if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-					echo "success" > $KVM_VM_NAME.vm_migrated_successfully
-					if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD --post-file=`$OPENQRM_POSTENCODE $KVM_VM_NAME.vm_migrated_successfully` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?kvm_server_command=get_vm_migration; then
-						openqrm_post_event 0 "migrate" 2 "openqrm-kvm-vm" "Could not post KVM VM $KVM_VM_NAME migration status the openQRM-server at $OPENQRM_SERVER_IP!"
-					fi
-					rm -f $KVM_VM_NAME.vm_migrated_successfully
-					rm -f $KVM_VM_NAME.vm_migrated_successfully.post
-					# post 100%
-					KVM_VM_MIGRATION_PROGRESS=100
-					echo "$KVM_VM_MIGRATION_PROGRESS" > $KVM_VM_NAME.vm_migration_progress
-					if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD --post-file=`$OPENQRM_POSTENCODE $KVM_VM_NAME.vm_migration_progress` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?kvm_server_command=get_vm_migration; then
-						openqrm_post_event 0 "migrate" 2 "openqrm-kvm-vm" "Could not post KVM VM $KVM_VM_NAME migration progress the openQRM-server at $OPENQRM_SERVER_IP!"
-					fi
-					rm -f $KVM_VM_NAME.vm_migration_progress
-					rm -f $KVM_VM_NAME.vm_migration_progress.post
-				fi
-				rm -f $OPENQRM_VM_DIR/$KVM_VM_NAME/migration_in_progress
-				# end long term event
-				openqrm_post_event 0 "$KVM_VM_NAME" 10 "kvm" "Finished migration of VM $KVM_VM_NAME"
-				break
-
-			fi
-
-			if grep completed $KVM_MIGRATION_LOG 1>/dev/null; then
-				# quit via the monitor socket does not run ifdown-net-script
-				VM_PID=`ps ax | grep $KVM_VM_MAC_1 | grep kvm | grep -v monitor_migration | grep -i screen | grep -v grep | awk {' print $1 '}`
-				if [ "$VM_PID" != "" ]; then
-					kill $VM_PID
-				fi
-				#echo "quit" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-				# posting migration success to openQRM
-				if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-					echo "success" > $KVM_VM_NAME.vm_migrated_successfully
-					if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD --post-file=`$OPENQRM_POSTENCODE $KVM_VM_NAME.vm_migrated_successfully` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?kvm_server_command=get_vm_migration; then
-						openqrm_post_event 0 "migrate" 2 "openqrm-kvm-vm" "Could not post KVM VM $KVM_VM_NAME migration status the openQRM-server at $OPENQRM_SERVER_IP!"
-					fi
-					rm -f $KVM_VM_NAME.vm_migrated_successfully
-					rm -f $KVM_VM_NAME.vm_migrated_successfully.post
-					# post 100%
-					KVM_VM_MIGRATION_PROGRESS=100
-					echo "$KVM_VM_MIGRATION_PROGRESS" > $KVM_VM_NAME.vm_migration_progress
-					if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD --post-file=`$OPENQRM_POSTENCODE $KVM_VM_NAME.vm_migration_progress` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?kvm_server_command=get_vm_migration; then
-						openqrm_post_event 0 "migrate" 2 "openqrm-kvm-vm" "Could not post KVM VM $KVM_VM_NAME migration progress the openQRM-server at $OPENQRM_SERVER_IP!"
-					fi
-					rm -f $KVM_VM_NAME.vm_migration_progress
-					rm -f $KVM_VM_NAME.vm_migration_progress.post
-				fi
-				rm -f $OPENQRM_VM_DIR/$KVM_VM_NAME/migration_in_progress
-				# end long term event
-				openqrm_post_event 0 "$KVM_VM_NAME" 10 "kvm" "Finished migration of VM $KVM_VM_NAME"
-				break
-			fi
-			if grep failed $KVM_MIGRATION_LOG 1>/dev/null; then
-				# end long term event
-				openqrm_post_event 0 "$KVM_VM_NAME" 10 "kvm" "Stopped migration of VM $KVM_VM_NAME"
-				# post error
-				openqrm_post_event 0 "migrate" 2 "openqrm-kvm-vm" "Migration of KVM VM $KVM_VM_NAME failed!"
-				rm -f $OPENQRM_VM_DIR/$KVM_VM_NAME/migration_in_progress
-				break
-			fi
-			KVM_MIGRATION_LOOP=$(( KVM_MIGRATION_LOOP + 1 ))
-			if [ "$KVM_MIGRATION_LOOP" == "$KVM_MIGRATION_MAX_WAIT" ]; then
-				# end long term event
-				openqrm_post_event 0 "$KVM_VM_NAME" 10 "kvm" "Stopped migration of VM $KVM_VM_NAME"
-				# post error
-				openqrm_post_event 0 "migrate" 2 "openqrm-kvm-vm" "Migration of KVM VM $KVM_VM_NAME timed out!"
-				rm -f $OPENQRM_VM_DIR/$KVM_VM_NAME/migration_in_progress
-				break
-			fi
-
-			# posting migration progress to openQRM - this is for the progressbar
-			if [ "$KVM_OPENQRM_USERNAME" != "" ] && [ "$KVM_OPENQRM_PASSWORD" != "" ]; then
-				# do not post more than 99%
-				KVM_VM_MIGRATION_PROGRESS=$KVM_MIGRATION_LOOP
-				if [ $KVM_VM_MIGRATION_PROGRESS -ge 100 ]; then
-				    KVM_VM_MIGRATION_PROGRESS=99
-				fi
-				echo "$KVM_VM_MIGRATION_PROGRESS" > $KVM_VM_NAME.vm_migration_progress
-				if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD --post-file=`$OPENQRM_POSTENCODE $KVM_VM_NAME.vm_migration_progress` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?kvm_server_command=get_vm_migration; then
-					openqrm_post_event 0 "migrate" 2 "openqrm-kvm-vm" "Could not post KVM VM $KVM_VM_NAME migration progress the openQRM-server at $OPENQRM_SERVER_IP!"
-				fi
-				rm -f $KVM_VM_NAME.vm_migration_progress
-				rm -f $KVM_VM_NAME.vm_migration_progress.post
-			fi
-
-			sleep 1
-		done
-
-		# here we remove the VM configuration from the source host
-		VM_PID=`ps ax | grep $KVM_VM_MAC_1 | grep kvm | grep -v monitor_migration | grep -i screen | grep -v grep | awk {' print $1 '}`
-		if [ "$VM_PID" != "" ]; then
-			openqrm_post_event 0 "migrate" 5 "openqrm-kvm-vm" "Force stopping KVM VM $KVM_VM_NAME on source Host!"
-			kill $VM_PID
-		fi
-		rm -f $OPENQRM_VM_DIR/$KVM_VM_NAME/*
-		rmdir $OPENQRM_VM_DIR/$KVM_VM_NAME
-		rm -f $KVM_MIGRATION_LOG
-		;;
-
-		# this is used to re-attach the virtual network devices to the configured vlans
-	reset_vlans_by_mac)
-		if [ "$KVM_VM_MAC" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		if [ "$KVM_VM_BOOT" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			kvm_usage
-		fi
-		# find vm-name according its mac
-		KVM_VM_NAME=`grep -rHi $KVM_VM_MAC $OPENQRM_VM_DIR/*/net1 2>/dev/null | grep KVM_VM_MAC | cut -d':' -f1 2>/dev/null` 2>/dev/null
-		KVM_VM_NAME=`dirname $KVM_VM_NAME` 2>/dev/null
-		KVM_VM_NAME=`basename $KVM_VM_NAME` 2>/dev/null
-		if [ "$KVM_VM_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "reset_vlans_by_mac" 2 "openqrm-kvm-vm" "Could not find KVM VM $KVM_VM_MAC on host!"
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire kvm`
-		trap "openqrm_lock_queue release kvm $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		if [ "$KVM_VM_BOOT" == "stop" ]; then
-			# send powerdown
-			if [ -e "$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon" ]; then
-				echo "system_powerdown" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-			fi
-			# vm is not running, we can skip waiting for shutdown
-			# wait until shutdown-delay, if VM is not down then stop hard
-			KVM_VM_SHUTDOWN_LOOP=0
-			while ps ax | grep -i "macaddr=$KVM_VM_MAC_1" | grep kvm | grep -i screen | grep -v grep 1>/dev/null; do
-				sleep 1
-				KVM_VM_SHUTDOWN_LOOP=$(( KVM_VM_SHUTDOWN_LOOP + 1 ))
-				if [ "$KVM_VM_SHUTDOWN_LOOP" == "$KVM_VM_SHUTDOWN_DELAY" ]; then
-					break
-				fi
-				# send powerdown again
-				echo "system_powerdown" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-			done
-		fi
-		# stop hard, this will make the vm re-attach the network devices
-		VM_PID=`ps ax | grep $KVM_VM_MAC | grep kvm | grep -v reset_vlans_by_mac | grep -i screen | grep -v grep | awk {' print $1 '}`
-		if [ "$VM_PID" != "" ]; then
-			openqrm_post_event 0 "reset_vlans_by_mac" 3 "openqrm-kvm-vm" "KVM VM $KVM_VM_NAME still running in reset_vlans_by_mac! Stopping $VM_PID"
-			kill $VM_PID
-		fi
-		# echo "quit" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$KVM_VM_NAME.mon
-		rm -f $OPENQRM_VM_DIR/$KVM_VM_NAME/autostart.$resource_id
-		# delay startup to make sure the old taps are gone
-		sleep 4
-		CMD_ERR=`$OPENQRM_VM_DIR/$KVM_VM_NAME/$KVM_VM_NAME.kvm 2>&1`
-		if [ "$?" != 0 ]; then
-			CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-			openqrm_post_event 0 "reset_vlans_by_mac" 3 "openqrm-kvm-vm" "Error starting KVM VM $KVM_VM_NAME! $CMD_ERR"
-
-			openqrm_lock_queue release kvm $LOCK_TIME
-			trap '' EXIT
-
-			exit 1
-		fi
-
-		touch $OPENQRM_VM_DIR/$KVM_VM_NAME/autostart.$resource_id
-
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-		;;
-
-
-	iso)
-		if [ "$KVM_HOST_PATH" == "" ]; then
-			kvm_usage
-		fi
-		# validate path
-		KVM_HOST_PATH=`echo "$KVM_HOST_PATH" | cut -d';' -f1`
-		KVM_HOST_PATH=`echo "$KVM_HOST_PATH" | cut -d'&' -f1`
-		KVM_HOST_PATH=`echo "$KVM_HOST_PATH" | cut -d' ' -f1`
-		KVM_HOST_PATH=`echo "$KVM_HOST_PATH" | cut -d'$' -f1`
-		if [ ! -d "$KVM_HOST_PATH" ]; then
-			openqrm_post_event 0 "iso" 2 "openqrm-kvm-vm" "No such directory $KVM_HOST_PATH !"
-			exit 1
-		fi
-		# post dir list
-		PICK_ISO_CONFIG_TMP=$resource_id.pick_iso_config
-		echo "P@$KVM_HOST_PATH" > $PICK_ISO_CONFIG_TMP
-		for DIR_CONTENT in `ls -f $KVM_HOST_PATH`; do
-		    if [ -d "$KVM_HOST_PATH"/"$DIR_CONTENT" ]; then
-			echo "D@$DIR_CONTENT" >> $PICK_ISO_CONFIG_TMP
-		    elif [ -f "$KVM_HOST_PATH"/"$DIR_CONTENT" ]; then
-			echo "F@$DIR_CONTENT" >> $PICK_ISO_CONFIG_TMP
-		    fi
-		done
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$KVM_OPENQRM_USERNAME --http-password=$KVM_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $PICK_ISO_CONFIG_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/kvm/kvm-action.php?kvm_server_command=get_pick_iso_config; then
-			openqrm_post_event 0 "iso" 2 "openqrm-kvm-vm" "Could not post pick_iso_config to the openQRM-server at $OPENQRM_SERVER_IP!"
-		fi
-		rm -f $PICK_ISO_CONFIG_TMP
-		rm -f $PICK_ISO_CONFIG_TMP.post
-		;;
-
-	*)
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		kvm_usage
-		;;
-
-
-esac
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/etc/init.d/kvm b/openQRM-5.3.50-CE/src/plugins/kvm/etc/init.d/kvm
deleted file mode 100644
index 05b0302..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/etc/init.d/kvm
+++ /dev/null
@@ -1,218 +0,0 @@
-#!/bin/bash
-# this is the boot-service init script for the Kvm-server hosts
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-# for including the package functions
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/include/openqrm-plugin-kvm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/openqrm-plugin-kvm.conf
-if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-	OPENQRM_SERVER_IP=$resource_openqrmserver
-elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-	openqrm_server_get_config
-	OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-fi
-OPENQRM_VM_DIR="/var/lib/kvm/openqrm/"
-export OPENQRM_VM_DIR
-OPENQRM_VM_MONITOR_DIR="/var/run/openqrm/kvm"
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET="wget -q --no-check-certificate"
-else
-	WGET="wget -q"
-fi
-# which screen binary to use
-if [ -x /usr/bin/screen.real ]; then
-	RUNSCREEN="/usr/bin/screen.real"
-else
-	RUNSCREEN=`which screen`
-fi
-
-# do not start on the intitrd
-if [ -f /etc/initrd-devices.conf ]; then
-	exit 0
-fi
-
-
-function kvm_start() {
-	echo "Starting the openQRM kvm-plugin"
-	# preparing the nic-bios in case the openQRM server itself is the kvm-host
-	if [ ! -d /usr/share/kvm/ ]; then
-		mkdir -p /usr/share/kvm
-	fi
-	# be sure to have the tun device
-	if [ ! -e /dev/tun ]; then
-		mknod /dev/tun c 10 200
-	fi
-	depmod -a
-	modprobe tun
-	# setting the kvm-ifup +kvm-ifdown script to the internal and external bridge
-	# internal
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET1/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifup-net1
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET1/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifdown-net1
-	# external
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET2/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifup-net2
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET2/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifdown-net2
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET3/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifup-net3
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET3/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifdown-net3
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET4/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifup-net4
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET4/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifdown-net4
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET5/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifup-net5
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET5/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifdown-net5
-	# ifup/down scripts for openvswitch
-	# internal
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET1/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#0#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifup-net1
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET1/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#0#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifdown-net1
-	# external
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET2/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#1#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifup-net2
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET2/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#1#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifdown-net2
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET3/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#2#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifup-net3
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET3/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#2#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifdown-net3
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET4/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#3#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifup-net4
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET4/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#3#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifdown-net4
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET5/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#4#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifup-net5
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET5/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#4#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifdown-net5
-
-	# ifup/down scripts for bridged vlans
-	# internal
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET1/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#0#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifup-net1
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET1/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#0#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifdown-net1
-	# external
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET2/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#1#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifup-net2
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET2/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#1#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifdown-net2
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET3/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#2#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifup-net3
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET3/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#2#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifdown-net3
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET4/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#3#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifup-net4
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET4/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#3#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifdown-net4
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET5/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#4#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifup-net5
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET5/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#4#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifdown-net5
-
-	chmod +x $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/*
-
-	# make sure the kvm modules are loaded
-	modprobe kvm
-	if grep flags.*vmx /proc/cpuinfo 1>/dev/null; then modprobe kvm-intel; fi
-	if grep flags.*svm /proc/cpuinfo 1>/dev/null; then modprobe kvm-amd; fi
-
-	# start the vm status autostart
-	if [ -d "$OPENQRM_VM_DIR" ]; then
-		for VM_CONFIG in `find $OPENQRM_VM_DIR/* -name autostart.$resource_id 2>/dev/null`; do
-			VM_NAME=`dirname $VM_CONFIG`
-			VM_NAME=`basename $VM_NAME`
-			. $OPENQRM_VM_DIR/$VM_NAME/net1
-			if ps ax | grep -i "$KVM_VM_MAC_1" | grep -v grep | grep -i screen 1>/dev/null; then
-				echo "- VM $VM_NAME is running already, not auto-starting it ..."
-				continue
-			fi
-			# ask openQRM what to do
-			if ! $WGET -O $OPENQRM_VM_DIR/$VM_NAME/resource-parameter.conf "$openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_mac=$KVM_VM_MAC_1"; then
-				echo "- Could not get parameters for VM $VM_NAME, not auto-starting it ..."
-				continue
-			fi
-			unset appliance_state
-			unset image_rootdevice
-			. $OPENQRM_VM_DIR/$VM_NAME/resource-parameter.conf
-			# is really active ?
-			if [ "$appliance_state" == "active" ] && [ "$image_rootdevice" != "ram" ]; then
-				echo "- Activating Rootdevice $image_rootdevice for VM $VM_NAME"
-				lvchange -ay -y $image_rootdevice
-				sleep 2
-				# make sure the lvm device is active
-				if [ -e "$image_rootdevice" ]; then
-					echo "- auto-starting active VM $VM_NAME"
-					# make sure the rigth device is in the VM config
-					echo "KVM_VM_DISK_1=\"$image_rootdevice\"" > $OPENQRM_VM_DIR/$VM_NAME/disk1
-					$OPENQRM_VM_DIR/$VM_NAME/$VM_NAME.kvm
-					sleep $OPENQRM_PLUGIN_VM_AUTOSTART_DELAY
-				else
-					echo "- Rootdevice $image_rootdevice for VM $VM_NAME not existing, not autostarting it ..."
-					continue
-				fi
-			else
-				# make sure the VM is not still attached to the disk
-				echo 'KVM_VM_DISK_1=""' > $OPENQRM_VM_DIR/$VM_NAME/disk1
-				# start the kvm monitor
-				echo "- auto-starting idle VM $VM_NAME"
-			fi
-			# starting the monitor for active + idle
-			kill `ps ax | grep openqrm-kvm-monitord | grep -v grep | grep -i $KVM_VM_MAC_1 | awk {' print $1 '}` 2>/dev/null
-			$RUNSCREEN -dmS $KVM_VM_MAC_1 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/sbin/openqrm-kvm-monitord $KVM_VM_MAC_1
-		done
-	fi
-
-}
-
-
-function kvm_stop() {
-	echo "Stopping the openQRM kvm-plugin"
-	# by default we do not stop the active VMs, otherwise openqrm-client restart would restart VMs
-#	if [ -d "$OPENQRM_VM_DIR" ]; then
-#		for VM_CONFIG in `find $OPENQRM_VM_DIR/* -name autostart.$resource_id 2>/dev/null`; do
-#			VM_NAME=`dirname $VM_CONFIG`
-#			VM_NAME=`basename $VM_NAME`
-#			if [ -e "$OPENQRM_VM_MONITOR_DIR/kvm.$VM_NAME.mon" ]; then
-#				echo "- Stopping VM $VM_NAME"
-#				echo "system_powerdown" | socat stdio unix:$OPENQRM_VM_MONITOR_DIR/kvm.$VM_NAME.mon
-#			fi
-#		done
-#	fi
-
-
-
-
-}
-
-
-
-
-
-case "$1" in
-	start)
-		kvm_start
-		;;
-	stop)
-		kvm_stop
-		;;
-	restart)
-		kvm_stop
-		sleep 1
-		kvm_start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/etc/init.d/openqrm-plugin-kvm b/openQRM-5.3.50-CE/src/plugins/kvm/etc/init.d/openqrm-plugin-kvm
deleted file mode 100644
index 2562222..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/etc/init.d/openqrm-plugin-kvm
+++ /dev/null
@@ -1,271 +0,0 @@
-#!/bin/bash
-# init script for the openQRM kvm-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/include/openqrm-plugin-kvm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/openqrm-plugin-kvm.conf
-openqrm_server_get_config
-OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-OPENQRM_VM_DIR="/var/lib/kvm/openqrm/"
-export OPENQRM_VM_DIR
-OPENQRM_VM_MONITOR_DIR="/var/run/openqrm/kvm"
-export resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-export LANG=C
-# define wget to use with https
-if [ "$OPENQRM_WEB_PROTOCOL" == "https" ]; then
-	WGET="wget -q --no-check-certificate"
-else
-	WGET="wget -q"
-fi
-# which screen binary to use
-if [ -x /usr/bin/screen.real ]; then
-	RUNSCREEN="/usr/bin/screen.real"
-else
-	RUNSCREEN=`which screen`
-fi
-
-LINE_IFS='
-'
-
-function openqrm_plugin_kvm_start() {
-	openqrm_plugin_kvm_stop 1>/dev/null 2>&1
-	echo "Starting the openQRM kvm-plugin"
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/kvm/.running
-	# start the vm status autostart
-	if [ -d "$OPENQRM_VM_DIR" ]; then
-		for VM_CONFIG in `find $OPENQRM_VM_DIR/* -name autostart.0 2>/dev/null`; do
-			VM_NAME=`dirname $VM_CONFIG`
-			VM_NAME=`basename $VM_NAME`
-			. $OPENQRM_VM_DIR/$VM_NAME/net1
-			if ps ax | grep -i "$KVM_VM_MAC_1" | grep -v grep | grep -i screen 1>/dev/null; then
-				echo "- VM $VM_NAME is running already, not auto-starting it ..."
-				continue
-			fi
-			# ask openQRM what to do
-			if ! $WGET -O $OPENQRM_VM_DIR/$VM_NAME/resource-parameter.conf "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_mac=$KVM_VM_MAC_1"; then
-				echo "- Could not get parameters for VM $VM_NAME, not auto-starting it ..."
-				continue
-			fi
-			unset appliance_state
-			unset image_rootdevice
-			. $OPENQRM_VM_DIR/$VM_NAME/resource-parameter.conf
-			# is really active ?
-			if [ "$appliance_state" == "active" ] && [ "$image_rootdevice" != "ram" ]; then
-				# make sure the lvm device is active
-                                if [ "$image_type" == "kvm-lvm-deployment" ]; then
-                                    echo "- Activating LVM Rootdevice $image_rootdevice for VM $VM_NAME"
-                                    lvchange -ay -y $image_rootdevice
-                                    sleep 2
-                                fi
-                                if [ "$image_type" == "kvm-lvm-deployment" ] || [ "$image_type" == "kvm-bf-deployment" ]; then
-                                    if [ ! -e "$image_rootdevice" ]; then
-                                        echo "- Rootdevice $image_rootdevice for VM $VM_NAME not existing, not autostarting it ..."
-                                        continue
-                                    fi
-                                fi
-
-                                echo "- auto-starting active VM $VM_NAME"
-                                # make sure the right device is in the VM config
-                                echo "KVM_VM_DISK_1=\"$image_rootdevice\"" > $OPENQRM_VM_DIR/$VM_NAME/disk1
-                                $OPENQRM_VM_DIR/$VM_NAME/$VM_NAME.kvm
-                                sleep $OPENQRM_PLUGIN_VM_AUTOSTART_DELAY
-			else
-				# make sure the VM is not still attached to the disk
-				echo 'KVM_VM_DISK_1=""' > $OPENQRM_VM_DIR/$VM_NAME/disk1
-				# start the kvm monitor
-				echo "- auto-starting idle VM $VM_NAME"
-			fi
-			# starting the monitor for active + idle
-			kill `ps ax | grep openqrm-kvm-monitord | grep -v grep | grep -i $KVM_VM_MAC_1 | awk {' print $1 '}` 2>/dev/null
-			$RUNSCREEN -dmS $KVM_VM_MAC_1 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/sbin/openqrm-kvm-monitord $KVM_VM_MAC_1
-		done
-	fi
-
-}
-
-
-function openqrm_plugin_kvm_stop() {
-	echo "Stopping the openQRM kvm-plugin"
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/kvm/.running
-}
-
-function openqrm_plugin_kvm_uninstall() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "kvm: Please give a username to uninstall the plugin : "
-		read USERNAME
-		echo
-		echo -n "kvm: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Uninstalling the openQRM kvm-plugin"
-	openqrm_plugin_kvm_stop
-
-	# trigger init action to eventually remove cloud products
-	if [ -e $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/cloud ]; then
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$USERNAME --http-password=$PASSWORD "$OPENQRM_WEB_PROTOCOL://$resource_openqrmserver/openqrm/base/plugins/kvm/kvm-action.php?kvm_command=uninstall"; then
-			openqrm_post_event 0 "openqrm_plugin_kvm_start" 3 "openqrm-plugin-kvm" "Could not trigger database hook. Please manually remove any Kvm Cloud products!"
-		fi
-	fi
-
-	openqrm_server_remove_deployment_type $USERNAME $PASSWORD kvm-lvm-deployment
-	openqrm_server_remove_deployment_type $USERNAME $PASSWORD kvm-bf-deployment
-	openqrm_server_remove_deployment_type $USERNAME $PASSWORD kvm-gluster-deployment
-	openqrm_server_remove_deployment_type $USERNAME $PASSWORD kvm-ceph-deployment
-	openqrm_server_remove_virtualization_type $USERNAME $PASSWORD kvm
-	openqrm_server_remove_virtualization_type $USERNAME $PASSWORD kvm-vm-local
-	openqrm_server_remove_virtualization_type $USERNAME $PASSWORD kvm-vm-net
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/kvm
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-kvm.tgz
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.kvm-lvm-deployment.php
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.kvm-bf-deployment.php
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.kvm-gluster-deployment.php
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.kvm-ceph-deployment.php
-	return 0
-
-}
-
-function openqrm_plugin_kvm_init() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "kvm: Please give a username to init the plugin : "
-		read USERNAME
-		echo
-		echo -n "kvm: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Initializing the openQRM kvm-plugin"
-	openqrm_server_add_deployment_type $USERNAME $PASSWORD kvm-lvm-deployment kvm-lvm-deployment "LVM deployment for KVM" kvm "KVM LVM Storage"
-	openqrm_server_add_deployment_type $USERNAME $PASSWORD kvm-bf-deployment kvm-bf-deployment "Blockfile deployment for KVM" kvm "KVM Blockfile Storage"
-	openqrm_server_add_deployment_type $USERNAME $PASSWORD kvm-gluster-deployment kvm-gluster-deployment "Glusterfs deployment for KVM" kvm "KVM Gluster Storage"
-	openqrm_server_add_deployment_type $USERNAME $PASSWORD kvm-ceph-deployment kvm-ceph-deployment "Ceph deployment for KVM" kvm "KVM Ceph Storage"
-	openqrm_server_add_virtualization_type $USERNAME $PASSWORD kvm "KVM Host"
-	openqrm_server_add_virtualization_type $USERNAME $PASSWORD kvm-vm-local "KVM VM (localboot)"
-	openqrm_server_add_virtualization_type $USERNAME $PASSWORD kvm-vm-net "KVM VM (networkboot)"
-
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/kvm
-	# link the boot-service
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/boot-service-kvm.tgz $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-kvm.tgz
-	# linking the image deployment parameters menu
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/image.kvm-lvm-deployment.php $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.kvm-lvm-deployment.php
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/image.kvm-bf-deployment.php $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.kvm-bf-deployment.php
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/image.kvm-gluster-deployment.php $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.kvm-gluster-deployment.php
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/image.kvm-ceph-deployment.php $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.kvm-ceph-deployment.php
-	# create storage dir for stat files
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/storage
-	chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/storage
-	echo "Order deny,allow" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/storage/.htaccess
-	echo "Deny from all" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/storage/.htaccess
-
-	# setting the kvm-ifup +kvm-ifdown script to the internal and external bridge
-	# internal
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET1/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifup-net1
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET1/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifdown-net1
-	# external
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET2/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifup-net2
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET2/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifdown-net2
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET3/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifup-net3
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET3/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifdown-net3
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET4/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifup-net4
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET4/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifdown-net4
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET5/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifup-net5
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET5/g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-ifdown-net5
-
-	# ifup/down scripts for openvswitch
-	# internal
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET1/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#0#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifup-net1
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET1/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#0#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifdown-net1
-	# external
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET2/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#1#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifup-net2
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET2/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#1#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifdown-net2
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET3/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#2#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifup-net3
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET3/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#2#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifdown-net3
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET4/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#3#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifup-net4
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET4/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#3#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifdown-net4
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET5/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#4#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifup-net5
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET5/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#4#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-ovs-kvm-ifdown-net5
-	chmod +x $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/*
-
-	# ifup/down scripts for bridged vlans
-	# internal
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET1/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#0#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifup-net1
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET1/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#0#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifdown-net1
-	# external
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET2/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#1#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifup-net2
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET2/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#1#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifdown-net2
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET3/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#2#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifup-net3
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET3/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#2#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifdown-net3
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET4/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#3#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifup-net4
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET4/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#3#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifdown-net4
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET5/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#4#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifup-net5
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown | sed -e "s/@@OPENQRM_PLUGIN_KVM_BRIDGE@@/$OPENQRM_PLUGIN_KVM_BRIDGE_NET5/g" | sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" | sed -e "s#@@OPENQRM_APP_NIC@@#4#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-vlan-kvm-ifdown-net5
-	chmod +x $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/*
-
-	# create kvm-stat dir
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/kvm-stat
-	chmod -R 777 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/kvm-stat
-	echo "Order deny,allow" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/kvm-stat/.htaccess
-	echo "Deny from all" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/web/kvm-stat/.htaccess
-
-	# trigger init action to eventually add cloud products
-	if [ -e $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/cloud ]; then
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$USERNAME --http-password=$PASSWORD "$OPENQRM_WEB_PROTOCOL://$resource_openqrmserver/openqrm/base/plugins/kvm/kvm-action.php?kvm_command=init"; then
-			openqrm_post_event 0 "openqrm_plugin_kvm_start" 3 "openqrm-plugin-kvm" "Could not trigger database hook. Please manually add Kvm Cloud products!"
-		fi
-	fi
-	return 0
-}
-
-USER=$2
-PASS=$3
-
-case "$1" in
-	start)
-		openqrm_plugin_kvm_start
-		;;
-	stop)
-		openqrm_plugin_kvm_stop
-		;;
-	restart)
-		openqrm_plugin_kvm_stop
-		sleep 1
-		openqrm_plugin_kvm_start
-		;;
-	init)
-		openqrm_plugin_kvm_init $USER $PASS
-		;;
-	uninstall)
-		openqrm_plugin_kvm_uninstall $USER $PASS
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/etc/init.d/openqrm-plugin-kvm.postinstall b/openQRM-5.3.50-CE/src/plugins/kvm/etc/init.d/openqrm-plugin-kvm.postinstall
deleted file mode 100644
index c2af1c8..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/etc/init.d/openqrm-plugin-kvm.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-kvm postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/etc/init.d/openqrm-plugin-kvm.preremove b/openQRM-5.3.50-CE/src/plugins/kvm/etc/init.d/openqrm-plugin-kvm.preremove
deleted file mode 100644
index bfb1ad1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/etc/init.d/openqrm-plugin-kvm.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-kvm preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-kvm stop
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/etc/openqrm-plugin-kvm.conf b/openQRM-5.3.50-CE/src/plugins/kvm/etc/openqrm-plugin-kvm.conf
deleted file mode 100644
index d4ca27a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/etc/openqrm-plugin-kvm.conf
+++ /dev/null
@@ -1,119 +0,0 @@
-# this is the openQRM-plugin-kvm info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="Integrates the <a href='http://www.linux-kvm.org' target='_BLANK'>KVM</a> Virtualization Technology"
-OPENQRM_PLUGIN_TYPE="virtualization"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES="local-server, device-manager, network-manager"
-
-# required parameter to set the internal Kvm bridge
-# by default openQRM will use the internal bridge eth0 for the virtual
-# network-interface routed to the management/openQRM network on the Kvm vms.
-OPENQRM_PLUGIN_KVM_BRIDGE_NET1=br0
-
-# required parameter to set the external Kvm bridges
-# by default openQRM will use external bridge eth0 for the virtual
-# network-interface(s) routed to the public network (internet) on the Kvm vms
-OPENQRM_PLUGIN_KVM_BRIDGE_NET2=br0
-OPENQRM_PLUGIN_KVM_BRIDGE_NET3=br0
-OPENQRM_PLUGIN_KVM_BRIDGE_NET4=br0
-OPENQRM_PLUGIN_KVM_BRIDGE_NET5=br0
-
-# the default nic type for the additional network cards
-# supported values are : rtl8139, e1000, virtio
-OPENQRM_PLUGIN_KVM_PRIMARY_NIC_TYPE=e1000
-OPENQRM_PLUGIN_KVM_ADDITIONAL_NIC_TYPE=e1000
-
-# using regular bridging or openvswitch for the virtual nics
-# possible values are :
-#  bridge - for regular bridging via bridge-utils
-#  vlanbridge - for dynamically created VLAN bridges
-#  openvswitch - using openvswitch for bridging
-# OPENQRM_PLUGIN_KVM_BRIDGE_TYPE="openvswitch"
-# OPENQRM_PLUGIN_KVM_BRIDGE_TYPE="vlanbridge"
-OPENQRM_PLUGIN_KVM_BRIDGE_TYPE="bridge"
-
-# for Blockfile-deployment only - location-name:directory for placing the blockfiles, space separated
-OPENQRM_PLUGIN_KVM_FILE_BACKEND_DIRECTORIES="storage1:/var/lib/kvm/storage1 storage2:/var/lib/kvm/storage2"
-
-# for KVM LVM deployment: automatically resize the filesystem on LVM snapshots + clones (true/false, default true)
-# setting this option to true requires that the lvm volumes are installed with the root-filesytem on the first partition (no separated /boot dir for linux)
-OPENQRM_PLUGIN_KVM_RESIZE_SNAPSHOTS_FILESYSTEM="true"
-
-# KVM VMs by default are monitored through their Hosts.
-# If openqrm-monitord is installed and running on the KVM VMs set the following paramter to false
-OPENQRM_PLUGIN_KVM_VM_MONITORING_ON_HOST="true"
-
-# Glusterfs default KVM image type (e.g. raw, qcow2)
-OPENQRM_PLUGIN_KVM_DEFAULT_IMAGE_TYPE="raw"
-
-# VM start delay when the Host is restarting in seconds. Adjust it to avoid overloading a Host when rebooting it
-OPENQRM_PLUGIN_VM_AUTOSTART_DELAY=1
-
-# defines on which network to listen for the VNC console access
-# possible values:
-#	all	- listen on all interfaces
-#	onlyinternal - only listen on the internal openQRM management network
-OPENQRM_PLUGIN_VM_VNC_LISTEN="all"
-
-# defines the amount of swap space of the volume size in percent
-# This option is for volume->clone which re-creates root + swap partition on the volume before resising
-OPENQRM_PLUGIN_KVM_SWAP_PERCENT=5
-
-# defines a local cache directory for caching the master images during clone actions
-# please clean this directory in case of changes in the master images
-OPENQRM_PLUGIN_KVM_LOCAL_IMAGE_CACHE="/var/cache/openqrm/kvm"
-
-# creates a global lock for all lvm operations if set to true
-OPENQRM_PLUGIN_KVM_GLOBAL_LVM_LOCK=false
-
-# defines the Cloud action for creating a new volume. Can be snap or clone, default is clone
-OPENQRM_PLUGIN_KVM_CLOUD_CREATE_VOLUME_ACTION=clone
-
-# run e2fsck after clone finished true/false
-OPENQRM_PLUGIN_KVM_E2FSCK_AFTER_CLONE="true"
-
-# custom params for lvcreate eg. -i5
-OPENQRM_PLUGIN_KVM_LVCREATE_CUSTOM_PARAM=""
-
-# default vnc keymap for accessing the KVM VM console
-OPENQRM_PLUGIN_KVM_DEFAULT_VNC_KEYMAP="en-us"
-
-# ceph image feature configuration for add/create/clone
-OPENQRM_PLUGIN_KVM_CEPH_IMAGE_FEATURE="--image-feature layering"
-
-# If set the Management Network-card gets detached after the delay in seconds
-# This is usefull for e.g. public openQRM Cloud where a permanrent connection to the openQRM Management network is not "wanted"
-#OPENQRM_PLUGIN_VM_DETACH_MANAGEMENT_NIC=120
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/openqrm-plugin-kvm.conf"
-# dirs which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_DIRS="/var/lib/kvm/openqrm/"
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-kvm-ifdown b/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-kvm-ifdown
deleted file mode 100644
index 680e24d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-kvm-ifdown
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export PATH=/usr/sbin:/usr/bin:/sbin:/bin
-ifconfig $1 down
-exit 0
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-kvm-ifup b/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-kvm-ifup
deleted file mode 100644
index 0a08b42..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-kvm-ifup
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-export PATH=/usr/sbin:/usr/bin:/sbin:/bin
-ifconfig $1 0.0.0.0 promisc up
-brctl addif @@OPENQRM_PLUGIN_KVM_BRIDGE@@ $1
-sleep 2
-
-# bandwidth monitor hook enabled ?
-if [ -x "@@OPENQRM_SERVER_BASE_DIR@@/openqrm/plugins/bandwidth/sbin/kvm-bandwidth-monitor" ]; then
-
-    RUNSCREEN=`which screen`
-    if [ -x /usr/bin/screen.real ]; then
-	RUNSCREEN="/usr/bin/screen.real"
-    fi
-
-    # find vm name
-    VM_BASE_DIR=$(pushd $(dirname $0) > /dev/null; echo $PWD; popd > /dev/null)
-    KVM_VM_NAME=`basename $VM_BASE_DIR`
-
-    kill `ps ax | grep kvm-bandwidth-monitor | grep -v grep | grep -w $1 | awk {' print $1 '}` 2>/dev/null
-    $RUNSCREEN -dmS $1 @@OPENQRM_SERVER_BASE_DIR@@/openqrm/plugins/bandwidth/sbin/kvm-bandwidth-monitor $KVM_VM_NAME $1
-fi
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-kvm-vm b/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-kvm-vm
deleted file mode 100644
index 1b60b5c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-kvm-vm
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/bin/bash
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-KVM=`which kvm 2>/dev/null`
-if [ "$KVM" == "" ]; then
-	KVM=`which qemu-kvm  2>/dev/null`
-	if [ "$KVM" == "" ]; then
-		# maybe it is centos and not in the path
-		if [ -x /usr/libexec/qemu-kvm ]; then
-			KVM=/usr/libexec/qemu-kvm
-		else
-			echo "ERROR: kvm ist not installed on this system !" | logger
-			exit 1
-		fi
-	fi
-fi
-# which screen binary to use
-if [ -x /usr/bin/screen.real ]; then
-	RUNSCREEN="/usr/bin/screen.real"
-else
-	RUNSCREEN=`which screen`
-fi
-mkdir -p /var/run/openqrm/kvm
-
-MOUSE="--usbdevice tablet"
-
-# source the component config files
-VM_CONF_DIR=`dirname $0`
-VM_CONF_DIR=`cd $VM_CONF_DIR && pwd && cd - 1>/dev/null`
-VM_NAME=`basename $VM_CONF_DIR`
-. $VM_CONF_DIR/cpus
-. $VM_CONF_DIR/ram
-. $VM_CONF_DIR/disk1
-. $VM_CONF_DIR/disk2
-. $VM_CONF_DIR/disk3
-. $VM_CONF_DIR/disk4
-. $VM_CONF_DIR/cdrom
-. $VM_CONF_DIR/net1
-. $VM_CONF_DIR/net2
-. $VM_CONF_DIR/net3
-. $VM_CONF_DIR/net4
-. $VM_CONF_DIR/net5
-. $VM_CONF_DIR/vnc
-. $VM_CONF_DIR/boot
-if [ -f "$VM_CONF_DIR/vncpassword" ]; then
-	. $VM_CONF_DIR/vncpassword
-fi
-if [ -f "$VM_CONF_DIR/vnckeymap" ]; then
-	. $VM_CONF_DIR/vnckeymap
-	if [ "$KVM_VM_VNCKEYMAP" != "" ] && [ "$KVM_VM_VNCKEYMAP" != "none" ]; then
-		VNCKEYMAP_PARAMETER="-k $KVM_VM_VNCKEYMAP"
-	fi
-fi
-# CDROM
-if [ -f "$VM_CONF_DIR/cdrom2" ]; then
-	. $VM_CONF_DIR/cdrom2
-else
-	KVM_VM_CDROM2=""
-fi
-# disk interface
-if [ -f "$VM_CONF_DIR/disk-interface" ]; then
-	. $VM_CONF_DIR/disk-interface
-else
-	KVM_VM_DISK_INTERFACE="ide"
-fi
-case "$KVM_VM_DISK_INTERFACE" in
-	ide)
-		KVM_VM_DISK="$KVM_VM_DISK_1 $KVM_VM_DISK_2 $KVM_VM_DISK_3 $KVM_VM_DISK_4"
-		;;
-
-	virtio)
-		if [ "$KVM_VM_DISK_1" != "" ]; then
-			if echo $KVM_VM_DISK_1 | grep ^/dev/ 1>/dev/null; then
-				KVM_VM_DISK=" -drive file=$KVM_VM_DISK_1,index=0,if=virtio,format=raw,cache=writeback"
-			elif echo $KVM_VM_DISK_1 | grep ^rbd: 1>/dev/null; then
-				KVM_VM_DISK=" -drive file=$KVM_VM_DISK_1,index=0,if=virtio,format=raw,cache=writeback"
-			else
-				KVM_VM_DISK=" -drive file=$KVM_VM_DISK_1,index=0,if=virtio,cache=writeback"
-			fi
-		fi
-		if [ "$KVM_VM_DISK_2" != "" ]; then
-			if echo $KVM_VM_DISK_2 | grep ^/dev/ 1>/dev/null; then
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_2,index=1,if=virtio,format=raw,cache=writeback"
-			elif echo $KVM_VM_DISK_2 | grep ^rbd: 1>/dev/null; then
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_2,index=1,if=virtio,format=raw,cache=writeback"
-			else
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_2,index=1,if=virtio,cache=writeback"
-			fi
-		fi
-		if [ "$KVM_VM_DISK_3" != "" ]; then
-			if echo $KVM_VM_DISK_3 | grep ^/dev/ 1>/dev/null; then
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_3,index=2,if=virtio,format=raw,cache=writeback"
-			elif echo $KVM_VM_DISK_3 | grep ^rbd: 1>/dev/null; then
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_3,index=2,if=virtio,format=raw,cache=writeback"
-			else
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_3,index=2,if=virtio,cache=writeback"
-			fi
-		fi
-		if [ "$KVM_VM_DISK_4" != "" ]; then
-			if echo $KVM_VM_DISK_4 | grep ^/dev/ 1>/dev/null; then
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_4,index=3,if=virtio,format=raw,cache=writeback"
-			elif echo $KVM_VM_DISK_4 | grep ^rbd 1>/dev/null; then
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_4,index=3,if=virtio,format=raw,cache=writeback"
-			else
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_4,index=3,if=virtio,cache=writeback"
-			fi
-		fi
-		;;
-esac
-KVM_VM_NET="$KVM_VM_NET_1 $KVM_VM_NET_2 $KVM_VM_NET_3 $KVM_VM_NET_4 $KVM_VM_NET_5"
-
-echo "KVM vm $VM_NAME starting up ..." | logger
-$RUNSCREEN -dmS $KVM_VM_MAC_1 bash -c "$KVM $KVM_VM_DISK $KVM_VM_CDROM -m $KVM_VM_RAM -smp $KVM_VM_CPUS $KVM_VM_BOOT $KVM_VM_NET -vnc $KVM_VM_VNC $VNCKEYMAP_PARAMETER -balloon virtio -monitor unix:/var/run/openqrm/kvm/kvm.$VM_NAME.mon,server,nowait -vga std $KVM_VM_CDROM2 $MOUSE > /var/run/openqrm/kvm/kvm.$VM_NAME.log 2>&1"
-# if there is an error starting the kvm VM the error message is now in the log file
-# we cat it here to provide the real error message for the ui event
-# we need to wait a bit for the kvm error message
-sleep 5
-CMD_ERR=`cat /var/run/openqrm/kvm/kvm.$VM_NAME.log`
-if [ "$CMD_ERR" != "" ]; then
-	cat /var/run/openqrm/kvm/kvm.$VM_NAME.log
-	exit 1
-fi
-rm -f /var/run/openqrm/kvm/kvm.$VM_NAME.log
-
-# set vnc password
-if [ "$KVM_VM_VNCPASSWORD" ]; then
-	while ! echo "change vnc password $KVM_VM_VNCPASSWORD" | socat stdio unix:/var/run/openqrm/kvm/kvm.$VM_NAME.mon; do
-		sleep 1
-		LOOP=$(( LOOP + 1 ))
-		if [ "$LOOP" == 10 ]; then
-			break
-		fi
-	done
-fi
-
-# detach-mgmt-nic if set in kvm plugin config
-if [ "$KVM_VM_DETACH_MANAGEMENT_NIC" != "" ]; then
-	echo "sleep $KVM_VM_DETACH_MANAGEMENT_NIC" > $VM_CONF_DIR/detach_mgmt_nic
-	echo "echo "host_net_remove 1 tap.0" | socat stdio unix:/var/run/openqrm/kvm/kvm.$VM_NAME.mon" >> $VM_CONF_DIR/detach_mgmt_nic
-	echo "rm -f $VM_CONF_DIR/detach_mgmt_nic" >> $VM_CONF_DIR/detach_mgmt_nic
-	chmod +x $VM_CONF_DIR/detach_mgmt_nic
-	$RUNSCREEN -dmS $KVM_VM_MAC_1.0 $VM_CONF_DIR/detach_mgmt_nic
-fi
-exit 0
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-kvm-vm.incoming b/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-kvm-vm.incoming
deleted file mode 100644
index 1cb2811..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-kvm-vm.incoming
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/bin/bash
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-KVM_MIGRATION_PORT=$1
-if [ "$KVM_MIGRATION_PORT" == "" ]; then
-	echo "Usage : $0 <migration-port>"
-	exit 1
-fi
-
-KVM=`which kvm 2>/dev/null`
-if [ "$KVM" == "" ]; then
-	KVM=`which qemu-kvm  2>/dev/null`
-	if [ "$KVM" == "" ]; then
-		# maybe it is centos and not in the path
-		if [ -x /usr/libexec/qemu-kvm ]; then
-			KVM=/usr/libexec/qemu-kvm
-		else
-			echo "ERROR: kvm ist not installed on this system !" | logger
-			exit 1
-		fi
-	fi
-fi
-# which screen binary to use
-if [ -x /usr/bin/screen.real ]; then
-	RUNSCREEN="/usr/bin/screen.real"
-else
-	RUNSCREEN=`which screen`
-fi
-mkdir -p /var/run/openqrm/kvm
-
-MOUSE="--usbdevice tablet"
-
-# source the component config files
-VM_CONF_DIR=`dirname $0`
-VM_CONF_DIR=`cd $VM_CONF_DIR && pwd && cd - 1>/dev/null`
-VM_NAME=`basename $VM_CONF_DIR`
-. $VM_CONF_DIR/cpus
-. $VM_CONF_DIR/ram
-. $VM_CONF_DIR/disk1
-. $VM_CONF_DIR/disk2
-. $VM_CONF_DIR/disk3
-. $VM_CONF_DIR/disk4
-. $VM_CONF_DIR/cdrom
-. $VM_CONF_DIR/net1
-. $VM_CONF_DIR/net2
-. $VM_CONF_DIR/net3
-. $VM_CONF_DIR/net4
-. $VM_CONF_DIR/net5
-. $VM_CONF_DIR/vnc
-. $VM_CONF_DIR/boot
-if [ -f "$VM_CONF_DIR/vncpassword" ]; then
-	. $VM_CONF_DIR/vncpassword
-fi
-if [ -f "$VM_CONF_DIR/vnckeymap" ]; then
-	. $VM_CONF_DIR/vnckeymap
-	if [ "$KVM_VM_VNCKEYMAP" != "" ] && [ "$KVM_VM_VNCKEYMAP" != "none" ]; then
-		VNCKEYMAP_PARAMETER="-k $KVM_VM_VNCKEYMAP"
-	fi
-fi
-# CDROM
-if [ -f "$VM_CONF_DIR/cdrom2" ]; then
-	. $VM_CONF_DIR/cdrom2
-else
-	KVM_VM_CDROM2=""
-fi
-# disk interface
-if [ -f "$VM_CONF_DIR/disk-interface" ]; then
-	. $VM_CONF_DIR/disk-interface
-else
-	KVM_VM_DISK_INTERFACE="ide"
-fi
-case "$KVM_VM_DISK_INTERFACE" in
-	ide)
-		KVM_VM_DISK="$KVM_VM_DISK_1 $KVM_VM_DISK_2 $KVM_VM_DISK_3 $KVM_VM_DISK_4"
-		;;
-
-	virtio)
-		if [ "$KVM_VM_DISK_1" != "" ]; then
-			if echo $KVM_VM_DISK_1 | grep ^/dev/ 1>/dev/null; then
-				KVM_VM_DISK=" -drive file=$KVM_VM_DISK_1,index=0,if=virtio,format=raw,cache=writeback"
-			elif echo $KVM_VM_DISK_1 | grep ^rbd: 1>/dev/null; then
-				KVM_VM_DISK=" -drive file=$KVM_VM_DISK_1,index=0,if=virtio,format=raw,cache=writeback"
-			else
-				KVM_VM_DISK=" -drive file=$KVM_VM_DISK_1,index=0,if=virtio,cache=writeback"
-			fi
-		fi
-		if [ "$KVM_VM_DISK_2" != "" ]; then
-			if echo $KVM_VM_DISK_2 | grep ^/dev/ 1>/dev/null; then
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_2,index=1,if=virtio,format=raw,cache=writeback"
-			elif echo $KVM_VM_DISK_2 | grep ^rbd: 1>/dev/null; then
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_2,index=1,if=virtio,format=raw,cache=writeback"
-			else
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_2,index=1,if=virtio,cache=writeback"
-			fi
-		fi
-		if [ "$KVM_VM_DISK_3" != "" ]; then
-			if echo $KVM_VM_DISK_3 | grep ^/dev/ 1>/dev/null; then
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_3,index=2,if=virtio,format=raw,cache=writeback"
-			elif echo $KVM_VM_DISK_3 | grep ^rbd: 1>/dev/null; then
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_3,index=2,if=virtio,format=raw,cache=writeback"
-			else
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_3,index=2,if=virtio,cache=writeback"
-			fi
-		fi
-		if [ "$KVM_VM_DISK_4" != "" ]; then
-			if echo $KVM_VM_DISK_4 | grep ^/dev/ 1>/dev/null; then
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_4,index=3,if=virtio,format=raw,cache=writeback"
-			elif echo $KVM_VM_DISK_4 | grep ^rbd 1>/dev/null; then
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_4,index=3,if=virtio,format=raw,cache=writeback"
-			else
-				KVM_VM_DISK="$KVM_VM_DISK -drive file=$KVM_VM_DISK_4,index=3,if=virtio,cache=writeback"
-			fi
-		fi
-		;;
-esac
-KVM_VM_NET="$KVM_VM_NET_1 $KVM_VM_NET_2 $KVM_VM_NET_3 $KVM_VM_NET_4 $KVM_VM_NET_5"
-
-echo "KVM vm $VM_NAME starting up as incoming on port $KVM_MIGRATION_PORT ..." | logger
-$RUNSCREEN -dmS $KVM_VM_MAC_1 bash -c "$KVM $KVM_VM_DISK $KVM_VM_CDROM -m $KVM_VM_RAM -smp $KVM_VM_CPUS $KVM_VM_BOOT $KVM_VM_NET -vnc $KVM_VM_VNC $VNCKEYMAP_PARAMETER -balloon virtio -monitor unix:/var/run/openqrm/kvm/kvm.$VM_NAME.mon,server,nowait -incoming tcp:0:$KVM_MIGRATION_PORT -vga std $KVM_VM_CDROM2 $MOUSE > /var/run/openqrm/kvm/kvm.$VM_NAME.log 2>&1"
-# if there is an error starting the kvm VM the error message is now in the log file
-# we cat it here to provide the real error message for the ui event
-# we need to wait a bit for the kvm error message
-sleep 5
-CMD_ERR=`cat /var/run/openqrm/kvm/kvm.$VM_NAME.log`
-if [ "$CMD_ERR" != "" ]; then
-	cat /var/run/openqrm/kvm/kvm.$VM_NAME.log
-	exit 1
-fi
-rm -f /var/run/openqrm/kvm/kvm.$VM_NAME.log
-
-# set vnc password
-if [ "$KVM_VM_VNCPASSWORD" ]; then
-	while ! echo "change vnc password $KVM_VM_VNCPASSWORD" | socat stdio unix:/var/run/openqrm/kvm/kvm.$VM_NAME.mon; do
-		sleep 1
-		LOOP=$(( LOOP + 1 ))
-		if [ "$LOOP" == 10 ]; then
-			break
-		fi
-	done
-fi
-
-# detach-mgmt-nic if set in kvm plugin config
-if [ "$KVM_VM_DETACH_MANAGEMENT_NIC" != "" ]; then
-	echo "sleep $KVM_VM_DETACH_MANAGEMENT_NIC" > $VM_CONF_DIR/detach_mgmt_nic
-	echo "echo "host_net_remove 1 tap.0" | socat stdio unix:/var/run/openqrm/kvm/kvm.$VM_NAME.mon" >> $VM_CONF_DIR/detach_mgmt_nic
-	echo "rm -f $VM_CONF_DIR/detach_mgmt_nic" >> $VM_CONF_DIR/detach_mgmt_nic
-	chmod +x $VM_CONF_DIR/detach_mgmt_nic
-	$RUNSCREEN -dmS $KVM_VM_MAC_1.0 $VM_CONF_DIR/detach_mgmt_nic
-fi
-
-while (true); do
-	echo "info status" | socat stdio unix:/var/run/openqrm/kvm/kvm.$VM_NAME.mon > $VM_CONF_DIR/starting_as_incoming
-	if grep status $VM_CONF_DIR/starting_as_incoming | grep running 1>/dev/null; then
-		echo "NOTICE: KVM VM $VM_NAME successfully started as incoming migration!" | logger
-		rm -f $VM_CONF_DIR/starting_as_incoming
-		rm -f $VM_CONF_DIR/migration_in_progress
-		exit 0
-	fi
-	if grep -i error $VM_CONF_DIR/starting_as_incoming 1>/dev/null; then
-		echo "ERROR: KVM VM $VM_NAME failed to un-block!" | logger
-		echo "ERROR: KVM VM $VM_NAME failed to un-block!"
-		rm -f $VM_CONF_DIR/starting_as_incoming
-		rm -f $VM_CONF_DIR/migration_in_progress
-		exit 1
-	fi
-
-	LOOP1=$(( LOOP1 + 1 ))
-	if [ "$LOOP1" == 1800 ]; then
-		echo "ERROR: KVM VM $VM_NAME failed to start as incoming migration!" | logger
-		echo "ERROR: KVM VM $VM_NAME failed to start as incoming migration!"
-		exit 1
-	fi
-	sleep 1
-done
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown b/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown
deleted file mode 100644
index decc9ac..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifdown
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-# this is the boot-service init script for the Kvm-server hosts
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_BASE_DIR=@@OPENQRM_SERVER_BASE_DIR@@
-export OPENVSWITCH=@@OPENQRM_PLUGIN_KVM_BRIDGE@@
-export PATH=/usr/sbin:/usr/bin:/sbin:/bin
-
-# remove the tap dev
-ifconfig $1 0.0.0.0 down
-ovs-vsctl del-port ${OPENVSWITCH} $1
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup b/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup
deleted file mode 100644
index 177f3dd..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-ovs-kvm-ifup
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-# this is the boot-service init script for the Kvm-server hosts
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_BASE_DIR=@@OPENQRM_SERVER_BASE_DIR@@
-export OPENVSWITCH=@@OPENQRM_PLUGIN_KVM_BRIDGE@@
-export APP_NIC=@@OPENQRM_APP_NIC@@
-export PATH=/usr/sbin:/usr/bin:/sbin:/bin
-
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/include/openqrm-plugin-kvm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/openqrm-plugin-kvm.conf
-if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-	resource_id=0
-	openqrm_server_get_config
-	resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-	openqrm_web_protocol=$OPENQRM_WEB_PROTOCOL
-fi
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET="wget -q --no-check-certificate"
-else
-	WGET="wget -q"
-fi
-
-# find out the name
-VM_BASE_DIR=$(pushd $(dirname $0) > /dev/null; echo $PWD; popd > /dev/null)
-VM_NAME=`basename $VM_BASE_DIR`
-# get the net config of the vm
-. $VM_BASE_DIR/net1
-
-# get vms resource parameters
-if ! $WGET -q -t 1 -T 4 -O $VM_BASE_DIR/openqrm-resource.conf "$openqrm_web_protocol://${resource_openqrmserver}/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_mac=$KVM_VM_MAC_1"; then
-	echo "ERROR: Could not refresh VMs resource-parameters!" | logger
-else
-	. $VM_BASE_DIR/openqrm-resource.conf
-fi
-# get ip config
-eval $appliance_capabilities
-if [ "$IPT" != "" ]; then
-	IP_TOKEN=`echo $IPT | cut -d'=' -f1`
-	echo "- getting network configuration for token $IP_TOKEN nic $APP_NIC" | logger
-	if ! $WGET -O $VM_BASE_DIR/openqrm-network.$APP_NIC.conf "$openqrm_web_protocol://${resource_openqrmserver}/openqrm/boot-service/ip-mgmt-appliance-config.php?ip_mgmt_command=get_config&appliance_id=$appliance_id&ip_mgmt_nic_id=$APP_NIC&ip_mgmt_token=$IP_TOKEN"; then
-		echo "ERROR: Could not get ip-configuration from openQRM-server at ${resource_openqrmserver}!"
-		exit -1
-	fi
-	. $VM_BASE_DIR/openqrm-network.$APP_NIC.conf
-else
-	echo "NOTICE: No ip-configuration for VM available. Continuing..." | logger
-fi
-
-# now attach the tap device to the bridge
-ifconfig $1 0.0.0.0 up
-if [ "$VLAN_ID" != "" ]; then
-	VLAN_TAG_PARAMETER="tag=$VLAN_ID"
-fi
-# make sure it is not setup already
-ovs-vsctl del-port ${OPENVSWITCH} $1 2>/dev/null
-# attach tap
-ovs-vsctl add-port ${OPENVSWITCH} $1 $VLAN_TAG_PARAMETER
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown b/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown
deleted file mode 100644
index 691f59a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifdown
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-# this is the ifup/ifdown kvm script to attach the vm nics to the bridge
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_BASE_DIR=@@OPENQRM_SERVER_BASE_DIR@@
-export APP_NIC=@@OPENQRM_APP_NIC@@
-export PATH=/usr/sbin:/usr/bin:/sbin:/bin
-
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/include/openqrm-plugin-kvm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/openqrm-plugin-kvm.conf
-if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-	resource_id=0
-	openqrm_server_get_config
-	resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-	openqrm_web_protocol=$OPENQRM_WEB_PROTOCOL
-fi
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET="wget -q --no-check-certificate"
-else
-	WGET="wget -q"
-fi
-
-# find out the name
-VM_BASE_DIR=$(pushd $(dirname $0) > /dev/null; echo $PWD; popd > /dev/null)
-VM_NAME=`basename $VM_BASE_DIR`
-# get the net config of the vm
-. $VM_BASE_DIR/net1
-
-
-if [ ! -f "$VM_BASE_DIR/openqrm-resource.conf" ]; then
-	# get vms resource parameters
-	if ! $WGET -q -t 1 -T 4 -O $VM_BASE_DIR/openqrm-resource.conf "$openqrm_web_protocol://${resource_openqrmserver}/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_mac=$KVM_VM_MAC_1"; then
-		echo "ERROR: Could not refresh VMs resource-parameters!" | logger
-		exit -1
-	fi
-fi
-. $VM_BASE_DIR/openqrm-resource.conf
-
-# get ip config
-eval $appliance_capabilities
-if [ "$IPT" != "" ]; then
-	IP_TOKEN=`echo $IPT | cut -d'=' -f1`
-	if [ ! -f "$VM_BASE_DIR/openqrm-network.$APP_NIC.conf" ]; then
-		echo "- getting network configuration for token $IP_TOKEN nic $APP_NIC" | logger
-		if ! $WGET -O $VM_BASE_DIR/openqrm-network.$APP_NIC.conf "$openqrm_web_protocol://${resource_openqrmserver}/openqrm/boot-service/ip-mgmt-appliance-config.php?ip_mgmt_command=get_config&appliance_id=$appliance_id&ip_mgmt_nic_id=$APP_NIC&ip_mgmt_token=$IP_TOKEN"; then
-			echo "ERROR: Could not get ip-configuration from openQRM-server at ${resource_openqrmserver}!" | logger
-			exit -1
-		fi
-	else
-		echo "- using exiting network configuration for token $IP_TOKEN nic $APP_NIC" | logger
-	fi
-	. $VM_BASE_DIR/openqrm-network.$APP_NIC.conf
-else
-	echo "NOTICE: No ip-configuration for VM available. Continuing with regular bridging ..." | logger
-fi
-
-
-if [ "$VLAN_ID" != "" ]; then
-
-	echo "NOTICE: if-down - got ip-configuration for VM -> $APP_NIC nic to $VLAN_ID ..." | logger
-	# find out which interface to use according to which bridge is used
-	# get the brigdge, get the phys ethx interface from the bridge
-	PHYS_MAC=`brctl showmacs @@OPENQRM_PLUGIN_KVM_BRIDGE@@ | grep yes | awk '{ print $2 }' | head -n1`
-	if [ "$PHYS_MAC" == "" ]; then
-		echo "ERROR: Could not find the mac address of the phys. interface of @@OPENQRM_PLUGIN_KVM_BRIDGE@@!" | logger
-		exit -1
-	fi
-	echo "NOTICE: Found phys. interface mac adress $PHYS_MAC belongs to @@OPENQRM_PLUGIN_KVM_BRIDGE@@!" | logger
-	PHYS_NIC=`ip a s | grep -A1 ^[0-9] | grep -v lo | grep -i -B1 $PHYS_MAC | grep ^[0-9] | head -n1 | awk {' print $2 '} | cut -d':' -f1`
-	if [ "$PHYS_NIC" == "" ]; then
-		echo "ERROR: Could not find the phys. interface of @@OPENQRM_PLUGIN_KVM_BRIDGE@@!" | logger
-		exit -1
-	fi
-
-	# remove the tap from the bridge
-	brctl delif brvlan$VLAN_ID $1
-
-	if brctl show | grep -A1 brvlan$VLAN_ID | grep -A1 $PHYS_NIC.$VLAN_ID | grep tap &>/dev/null; then
-		echo "NOTICE: Not removing brvlan$VLAN_ID because it is still in use ..." | logger
-	else
-		echo "NOTICE: removing $PHYS_NIC.$VLAN_ID from brvlan$VLAN_ID" | logger
-		brctl delif brvlan$VLAN_ID $PHYS_NIC.$VLAN_ID
-		echo "NOTICE: removing brvlan$VLAN_ID" | logger
-		ifconfig brvlan$VLAN_ID down
-		brctl delbr brvlan$VLAN_ID
-		echo "NOTICE: removing $PHYS_NIC.$VLAN_ID" | logger
-		vconfig rem $PHYS_NIC.$VLAN_ID
-	fi
-fi
-
-# remove the tap dev
-ifconfig $1 0.0.0.0 down
-sleep 2
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup b/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup
deleted file mode 100644
index 2f78cb3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/etc/templates/openqrm-vlan-kvm-ifup
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/bash
-# this is the ifup/ifdown kvm script to attach the vm nics to the bridge
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_BASE_DIR=@@OPENQRM_SERVER_BASE_DIR@@
-export APP_NIC=@@OPENQRM_APP_NIC@@
-export PATH=/usr/sbin:/usr/bin:/sbin:/bin
-
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/include/openqrm-plugin-kvm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/openqrm-plugin-kvm.conf
-if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-	resource_id=0
-	openqrm_server_get_config
-	resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-	openqrm_web_protocol=$OPENQRM_WEB_PROTOCOL
-fi
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET="wget -q --no-check-certificate"
-else
-	WGET="wget -q"
-fi
-
-# find out the name
-VM_BASE_DIR=$(pushd $(dirname $0) > /dev/null; echo $PWD; popd > /dev/null)
-VM_NAME=`basename $VM_BASE_DIR`
-# get the net config of the vm
-. $VM_BASE_DIR/net1
-
-# get vms resource parameters
-if ! $WGET -q -t 1 -T 4 -O $VM_BASE_DIR/openqrm-resource.conf "$openqrm_web_protocol://${resource_openqrmserver}/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_mac=$KVM_VM_MAC_1"; then
-	echo "ERROR: Could not refresh VMs resource-parameters!" | logger
-else
-	. $VM_BASE_DIR/openqrm-resource.conf
-fi
-# get ip config
-eval $appliance_capabilities
-if [ "$IPT" != "" ]; then
-	IP_TOKEN=`echo $IPT | cut -d'=' -f1`
-	echo "- getting network configuration for token $IP_TOKEN nic $APP_NIC" | logger
-	if ! $WGET -O $VM_BASE_DIR/openqrm-network.$APP_NIC.conf "$openqrm_web_protocol://${resource_openqrmserver}/openqrm/boot-service/ip-mgmt-appliance-config.php?ip_mgmt_command=get_config&appliance_id=$appliance_id&ip_mgmt_nic_id=$APP_NIC&ip_mgmt_token=$IP_TOKEN"; then
-		echo "ERROR: Could not get ip-configuration from openQRM-server at ${resource_openqrmserver}!" | logger
-		exit -1
-	fi
-	. $VM_BASE_DIR/openqrm-network.$APP_NIC.conf
-else
-	echo "NOTICE: No ip-configuration for VM available. Continuing with regular bridging ..." | logger
-fi
-
-if [ "$VLAN_ID" == "" ]; then
-	ifconfig $1 0.0.0.0 promisc up
-	brctl addif @@OPENQRM_PLUGIN_KVM_BRIDGE@@ $1
-	sleep 2
-else
-	echo "NOTICE: Got ip-configuration for VM -> $APP_NIC nic to $VLAN_ID ..." | logger
-	# find out which interface to use according to which bridge is used
-	# get the brigdge, get the phys ethx interface from the bridge
-	PHYS_MAC=`brctl showmacs @@OPENQRM_PLUGIN_KVM_BRIDGE@@ | grep yes | awk '{ print $2 }' | head -n1`
-	if [ "$PHYS_MAC" == "" ]; then
-		echo "ERROR: Could not find the mac address of the phys. interface of @@OPENQRM_PLUGIN_KVM_BRIDGE@@!" | logger
-		exit -1
-	fi
-	echo "NOTICE: Found phys. interface mac adress $PHYS_MAC belongs to @@OPENQRM_PLUGIN_KVM_BRIDGE@@!" | logger
-	PHYS_NIC=`ip a s | grep -A1 ^[0-9] | grep -v lo | grep -i -B1 $PHYS_MAC | grep ^[0-9] | head -n1 | awk {' print $2 '} | cut -d':' -f1`
-	if [ "$PHYS_NIC" == "" ]; then
-		echo "ERROR: Could not find the phys. interface of @@OPENQRM_PLUGIN_KVM_BRIDGE@@!" | logger
-		exit -1
-	fi
-
-	# add vlan dev
-	if ! ifconfig $PHYS_NIC.$VLAN_ID &>/dev/null; then
-		echo "NOTICE: adding vlan dev $VLAN_ID on $PHYS_NIC" | logger
-		vconfig add $PHYS_NIC $VLAN_ID 1>/dev/null
-		ifconfig $PHYS_NIC.$VLAN_ID up
-	else
-		echo "NOTICE: vlan dev $VLAN_ID on $PHYS_NIC already exists. Not re-creating it ..." | logger
-	fi
-
-	# add vlan bridge
-	if ! ifconfig brvlan$VLAN_ID &>/dev/null; then
-		echo "NOTICE: adding bridge brvlan$VLAN_ID" | logger
-		brctl addbr brvlan$VLAN_ID
-		# add vlan interface to bridge
-		echo "NOTICE: adding eth0.$VLAN_ID to brvlan$VLAN_ID" | logger
-		brctl addif brvlan$VLAN_ID $PHYS_NIC.$VLAN_ID
-		# enable stp
-		brctl stp brvlan$VLAN_ID on
-		# bring up the bridge
-		ifconfig brvlan$VLAN_ID up
-	else
-		echo "NOTICE: bridge brvlan$VLAN_ID already exists. Not re-creating it ..." | logger
-	fi
-
-	# add vms tap to vlan bridge
-	echo "NOTICE: adding VMs $1 to brvlan$VLAN_ID - $PHYS_NIC.$VLAN_ID" | logger
-	ifconfig $1 0.0.0.0 promisc up
-	brctl addif brvlan$VLAN_ID $1
-	sleep 2
-
-
-fi
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/include/openqrm-plugin-kvm-functions b/openQRM-5.3.50-CE/src/plugins/kvm/include/openqrm-plugin-kvm-functions
deleted file mode 100644
index 6780eaf..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/include/openqrm-plugin-kvm-functions
+++ /dev/null
@@ -1,565 +0,0 @@
-#!/bin/bash
-# this is the functions file for the kvm-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-
-# some definitions
-DEFAULT_IMAGE_SIZE=5000
-LV_SIZE_DEFAULT=5000
-DEVICE_MAPPER_TIMEOUT=120
-
-################ common kvm functions
-
-# logs for kvm
-function kvm_log() {
-	local COMPONENT=$1
-	shift
-	local MESSAGE=$@
-	logger -i -t "kvm plug-in" "$COMPONENT : $MESSAGE"
-}
-
-
-# deps function
-function check_kvm_deps() {
-
-	# check and fullfill dependencies
-	# screen
-	if ! openqrm_full_fill_os_dependency screen screen; then
-		return 1
-	fi
-	if [ -x /usr/bin/screen.real ]; then
-		export RUNSCREEN="/usr/bin/screen.real"
-	else
-		export RUNSCREEN=`which screen`
-	fi
-	# wget
-	if ! openqrm_full_fill_os_dependency wget wget; then
-		return 1
-	fi
-	# procmail for lockfile
-	if ! openqrm_full_fill_os_dependency lockfile procmail; then
-		return 1
-	fi
-	# socat
-	if ! openqrm_full_fill_os_dependency socat socat; then
-		return 1
-	fi
-	# rsync
-	if ! openqrm_full_fill_os_dependency rsync rsync; then
-		return 1
-	fi
-	# resize2fs
-	if ! openqrm_full_fill_os_dependency resize2fs e2fsprogs; then
-		return 1
-	fi
-	# kpartx
-	if ! openqrm_full_fill_os_dependency kpartx kpartx; then
-		return 1
-	fi
-	# parted
-	if ! openqrm_full_fill_os_dependency parted parted; then
-		return 1
-	fi
-	# lvm2
-	if ! openqrm_full_fill_os_dependency lvs lvm2; then
-		return 1
-	fi
-	# bridge-utils
-	if ! openqrm_full_fill_os_dependency brctl bridge-utils; then
-		return 1
-	fi
-
-	# different package names for different distros
-	if [ -f /etc/debian_version ]; then
-		if ! openqrm_full_fill_os_dependency vconfig vlan; then
-			return 1
-		fi
-		if ! openqrm_install_os_dependency ntfsprogs; then
-			if ! openqrm_full_fill_os_dependency ntfsresize ntfs-3g; then
-				return 1
-			fi
-		fi
-		# nfs-common
-		if ! openqrm_full_fill_os_dependency mount.nfs nfs-common; then
-			return 1
-		fi
-		# qemu-kvm
-		if ! openqrm_full_fill_os_dependency kvm qemu-kvm; then
-			return 1
-		fi
-	elif [ -f /etc/redhat-release ]; then
-		if ! openqrm_full_fill_os_dependency vconfig vconfig; then
-			return 1
-		fi
-		if ! openqrm_full_fill_os_dependency ntfsresize ntfsprogs; then
-			return 1
-		fi
-		# nfs-utils
-		if ! openqrm_full_fill_os_dependency mount.nfs nfs-utils; then
-			return 1
-		fi
-		# qemu-kvm
-		if ! openqrm_full_fill_os_dependency ksmtuned qemu-kvm; then
-			return 1
-		fi
-
-	elif [ -f /etc/SuSE-release ]; then
-		if ! openqrm_full_fill_os_dependency vconfig vlan; then
-			return 1
-		fi
-		if ! openqrm_full_fill_os_dependency ntfsresize ntfsprogs; then
-			return 1
-		fi
-		# nfs-utils
-		if ! openqrm_full_fill_os_dependency mount.nfs nfs-client; then
-			return 1
-		fi
-		# qemu-kvm
-		if ! openqrm_full_fill_os_dependency qemu-kvm kvm; then
-			return 1
-		fi
-	fi
-	return 0
-
-
-}
-
-
-
-
-################ kvm functions
-
-# refresh lvm metadata
-function kvm_refresh_lvm() {
-	openqrm_post_event 0 "refresh_lvm" 5 "openqrm-kvm" "Refreshing lvm meta-data!"
-	for LVMCMD in pvscan vgscan lvscan; do
-		CMD_ERR=`$LVMCMD 2>&1`
-		if [ "$?" != 0 ]; then
-			CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-			openqrm_post_event 0 "refresh_lvm" 3 "openqrm-kvm" "Error refreshing lvm meta-data! $CMD_ERR"
-			return 1
-		fi
-	done
-
-#	CMD_ERR=`vgchange --refresh 2>&1`
-#	if [ "$?" != 0 ]; then
-#		CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-#		openqrm_post_event 0 "refresh_lvm" 3 "openqrm-kvm" "Error refreshing VG lvm meta-data! $CMD_ERR"
-#		return 1
-#	fi
-	return 0
-}
-
-
-
-function kvm_get_backend_dir() {
-	local STORAGE_LOC_NAME=$1
-	for FILE_BACKEND in `echo $OPENQRM_PLUGIN_KVM_FILE_BACKEND_DIRECTORIES`; do
-		BACKEND_LOCATION_NAME=`echo $FILE_BACKEND | cut -d':' -f1`
-		if [ "$BACKEND_LOCATION_NAME" == "$STORAGE_LOC_NAME" ]; then
-			FILE_BACKEND_DIR=`echo $FILE_BACKEND | cut -d':' -f2`
-			break
-		fi
-	done
-	if [ "$FILE_BACKEND_DIR" == "" ]; then
-		echo $STORAGE_LOC_NAME
-	else
-		echo $FILE_BACKEND_DIR
-	fi
-}
-
-
-function kvm_get_gluster_backend_dir() {
-	local STORAGE_LOC_NAME=$1
-	GET_BACKEND_TMP=`mktemp /tmp/kvm-gluster.XXXXXX`
-	gluster volume info $STORAGE_LOC_NAME > $GET_BACKEND_TMP
-	for GLUSTER_BRICK in `grep -w "^Brick[0-9].*" $GET_BACKEND_TMP | awk '{ print $2 }'`; do
-		FILE_BACKEND_DIR=`echo $GLUSTER_BRICK | cut -d':' -f2`
-		break
-	done
-	rm -f $GET_BACKEND_TMP
-	echo $FILE_BACKEND_DIR
-}
-
-
-function kvm_get_image_type() {
-	local FILE_PATH=$1
-	local FILE_TYPE=""
-	FILE_TYPE_STR=`file $FILE_PATH`
-	if echo $FILE_TYPE_STR | grep -w "backing file" 1>/dev/null; then
-		# snap
-		FILE_TYPE="snapshot"
-	elif echo $FILE_TYPE_STR | grep -w "User-mode" 1>/dev/null; then
-		# cow
-		FILE_TYPE="cow"
-	elif echo $FILE_TYPE_STR | grep -w "QEMU QCOW Image (v1)" 1>/dev/null; then
-		# qcow
-		FILE_TYPE="qcow"
-	elif echo $FILE_TYPE_STR | grep -w "QEMU QCOW Image (v2)" 1>/dev/null; then
-		# qcow2
-		FILE_TYPE="qcow2"
-	else
-		FILE_TYPE="raw"
-	fi
-	echo $FILE_TYPE
-}
-
-
-function kvm_trigger_gluster_replication() {
-	local VLOC=$1
-	local VNAME=$2
-	V_VOL_TMP_DIR="/tmp/kvm-gluster.$VNAME"
-	mkdir -p $V_VOL_TMP_DIR
-
-	CMD_ERR=`mount -t nfs $resource_ip:$VLOC $V_VOL_TMP_DIR 2>&1`
-	if [ "$?" != 0 ]; then
-		CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-		openqrm_post_event 0 "snap" 3 "openqrm-kvm" "Error mounting $resource_ip:$VLOC/$VNAME. Not replicating! $CMD_ERR"
-		rmdir $V_VOL_TMP_DIR
-		return 1
-	fi
-	touch $V_VOL_TMP_DIR/$VNAME
-	umount $V_VOL_TMP_DIR
-	rmdir $V_VOL_TMP_DIR
-	return 0
-}
-
-
-
-function kvm_clean_dev_maps() {
-	local INAME=$1
-	local VOLG=$2
-	kpartx -d /dev/mapper/$VOLG-$INAME
-	for DM in `ls /dev/mapper/$VOLG-$INAME""p*`; do
-		dmsetup remove $DM
-	done
-}
-
-
-
-function kvm_resize_fs() {
-
-	local LVM_VOLUME=$1
-	local LVM_VOLUME_NAME=`basename $LVM_VOLUME`
-	local LVM_VOLUME_GROUP=`dirname $LVM_VOLUME`
-	local LVM_VOLUME_GROUP=`basename $LVM_VOLUME_GROUP`
-
-	if [ "$LVM_VOLUME" == "" ]; then
-		return
-	fi
-	# find the rootfs and resize it
-	kvm_clean_dev_maps $LVM_VOLUME_NAME $LVM_VOLUME_GROUP
-	PARTITION_START=`parted -s /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME unit B print | grep -A1 ^Number | grep ^" 1" | awk '{ print $2 }'`
-	if [ "$?" != 0 ]; then
-		openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm" "Error finding partition start for volume $LVM_VOLUME_NAME! skipping resize!"
-		return 1
-	fi
-	# get the full disk size
-	ROOTFS_SIZE=`parted -s /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME unit MB print | head -n3 | grep -w ^Disk | grep MB | awk {' print $3 '} | sed -e "s/MB//g" | cut -d',' -f1 | cut -d'.' -f1`
-	if [ "$ROOTFS_SIZE" == "" ]; then
-		openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm" "Error finding disk size for volume $LVM_VOLUME_NAME! $ROOTFS_SIZE skipping resize!"
-		return 1
-	fi
-	ORIGIN_DISK_SIZE=$ROOTFS_SIZE
-
-	# check if we can find swap space
-	CREATE_SWAPSPACE=false
-	SWAPSPACE_SIZE=`parted -s /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME unit MB print 2>/dev/null | grep "linux-swap" | head -n1 | awk {' print $4 '} | sed -e "s/MB//g" | cut -d',' -f1 | cut -d'.' -f1`
-	if [ "$SWAPSPACE_SIZE" != "" ]; then
-		CREATE_SWAPSPACE=true
-		ROOTFS_SIZE=$(( $ROOTFS_SIZE - $SWAPSPACE_SIZE ))
-	else
-		SWAPSPACE_SIZE=`parted -s /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME unit MB print 2>/dev/null | grep "type=82" | head -n1 | awk {' print $4 '} | sed -e "s/MB//g" | cut -d',' -f1 | cut -d'.' -f1`
-		if [ "$SWAPSPACE_SIZE" != "" ]; then
-			CREATE_SWAPSPACE=true
-			ROOTFS_SIZE=$(( $ROOTFS_SIZE - $SWAPSPACE_SIZE ))
-		fi
-	fi
-	# remove partitions
-	for N in `seq 1 5`; do
-		parted -s /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME rm $N
-	done
-
-	# recreate root-partition
-	parted -s /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME mkpart primary $PARTITION_START $ROOTFS_SIZE""MB
-	# make it bootable
-	parted -s /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME set 1 boot on
-
-	if [ "$CREATE_SWAPSPACE" == "true" ]; then
-		# recreate swap
-		parted -s /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME mkpart primary linux-swap $ROOTFS_SIZE""MB $ORIGIN_DISK_SIZE""MB
-
-		# creating partitions on the lvol triggers device-mapper to create p1 + p2 devices in /dev/mapper/vg-lv
-		# this results in the device being already busy when trying to re-create the dev-maps
-		kvm_clean_dev_maps $LVM_VOLUME_NAME $LVM_VOLUME_GROUP
-		SWAP_PARTITION=`kpartx -av /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME | awk '{ print $3 }' | tail -n1`
-		if [ "$?" == 0 ] && [ "$SWAP_PARTITION" != "" ]; then
-			# wait until the device link is created
-			while (:); do
-				if [ -e "/dev/mapper/$SWAP_PARTITION" ]; then
-					break
-				fi
-				sleep 1
-				DL=$(( $DL + 1 ))
-				if [ "$DL" == $DEVICE_MAPPER_TIMEOUT ]; then
-					openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm" "Adding device maps for volume /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME! Not creating swap /dev/mapper/$SWAP_PARTITION - $CMD_ERR!"
-					break
-				fi
-			done
-			CMD_ERR=`mkswap /dev/mapper/$SWAP_PARTITION 2>&1`
-			if [ "$?" != 0 ]; then
-				CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-				openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm" "Could not create swap space /dev/mapper/$SWAP_PARTITION on /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME - $CMD_ERR!"
-			fi
-			kpartx -dv /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME
-		fi
-		sync
-		sleep 2
-		kvm_clean_dev_maps $LVM_VOLUME_NAME $LVM_VOLUME_GROUP
-		sleep 2
-	fi
-
-	# filesystem resize
-	FIRST_PARTITION=`kpartx -av /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME | awk '{ print $3 }' | head -n1`
-	if [ "$?" != 0 ]; then
-		openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm" "Adding device maps for volume /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME failed!"
-		return
-	fi
-	sleep 2
-	# wait until the device link is created
-	if [ "$FIRST_PARTITION" != "" ]; then
-		while (:); do
-			if [ -e "/dev/mapper/$FIRST_PARTITION" ]; then
-				break
-			fi
-			sleep 1
-			DLT=$(( $DLT + 1 ))
-			if [ "$DLT" == $DEVICE_MAPPER_TIMEOUT ]; then
-				openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm" "Adding device maps for volume /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME timed out! Not resizsing!"
-				break
-			fi
-		done
-	fi
-
-	if [ "$FIRST_PARTITION" != "" ] && [ -e /dev/mapper/$FIRST_PARTITION ]; then
-			PARTITION_TYPE=`fdisk -l /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME | grep ^/dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME | head -n1 | sed -e "s#\*##g" | awk '{ print $5 }'`
-			case "$PARTITION_TYPE" in
-					83)
-						e2fsck -y /dev/mapper/$FIRST_PARTITION
-						openqrm_post_event 0 "/dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME" 5 "openqrm-kvm" "Resizing Linux filesystem of volume /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME."
-						CMD_ERR=`resize2fs -f -p /dev/mapper/$FIRST_PARTITION 2>&1`
-						if [ "$?" == 0 ]; then
-							openqrm_post_event 0 "kvm_resize_fs" 5 "openqrm-kvm" "Successfully resized volume /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME."
-						else
-							CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-							openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm" "Errors during resizing volume /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME! $CMD_ERR"
-							if ! e2fsck -fy /dev/mapper/$FIRST_PARTITION; then
-								openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm" "Errors on filesystem of volume /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME!"
-							fi
-						fi
-						e2fsck -fy /dev/mapper/$FIRST_PARTITION
-						;;
-					7)
-						VOLUME_SIZE_PARAM="-s $ROOTFS_SIZE""M"
-						openqrm_post_event 0 "/dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME" 5 "openqrm-kvm" "Resizing Windows filesystem of volume /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME to $ROOTFS_SIZE MB."
-						CMD_ERR=`ntfsresize $VOLUME_SIZE_PARAM -b -f /dev/mapper/$FIRST_PARTITION 2>&1`
-						if [ "$?" == 0 ]; then
-							openqrm_post_event 0 "kvm_resize_fs" 5 "openqrm-kvm" "Successfully resized volume /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME to $ROOTFS_SIZE MB."
-						else
-							CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-							openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm" "Errors during resizing volume /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME! $CMD_ERR"
-						fi
-						;;
-					*)
-						openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm" "Could not find out filesystem type of volume /dev/$LVM_VOLUME_GROUP/$LVM_VOLUME_NAME. Not resizing."
-						;;
-			esac
-	fi
-	sync
-	sleep 2
-	kvm_clean_dev_maps $LVM_VOLUME_NAME $LVM_VOLUME_GROUP
-	return 0
-
-}
-
-
-
-function kvm_resize_ceph_fs() {
-
-	local CEPH_VOLUME=$1
-	local CEPH_POOL=$2
-
-	if [ "$CEPH_VOLUME" == "" ] || [ "$CEPH_POOL" == "" ]; then
-		return
-	fi
-
-	# map
-	rbd unmap $CEPH_VOLUME --pool $CEPH_POOL 2>&1
-	CMD_ERR=`rbd map $CEPH_VOLUME --pool $CEPH_POOL 2>&1`
-	if [ "$?" != 0 ]; then
-		CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-		openqrm_post_event 0 "resize" 3 "openqrm-kvm" "Error mapping rbd volume rbd:$CEPH_POOL/$CEPH_VOLUME! $CMD_ERR"
-
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-
-		exit 1
-	else
-		CEPHDEV=$CMD_ERR
-	fi
-
-
-	openqrm_post_event 0 "resize" 2 "openqrm-kvm" "Found dev $CEPHDEV for rbd volume rbd:$CEPH_POOL/$CEPH_VOLUME!"
-
-	# find the rootfs and resize it
-	PARTITION_START=`parted -s $CEPHDEV unit B print | grep -A1 ^Number | grep ^" 1" | awk '{ print $2 }'`
-	if [ "$?" != 0 ]; then
-		openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm" "Error finding partition start for volume $CEPHDEV! skipping resize!"
-		return 1
-	fi
-	# get the full disk size
-	ROOTFS_SIZE=`parted -s $CEPHDEV unit MB print | head -n3 | grep -w ^Disk | grep MB | awk {' print $3 '} | sed -e "s/MB//g" | cut -d',' -f1 | cut -d'.' -f1`
-	if [ "$ROOTFS_SIZE" == "" ]; then
-		openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm" "Error finding disk size for volume $CEPHDEV! Skipping resize!"
-		return 1
-	fi
-	ORIGIN_DISK_SIZE=$ROOTFS_SIZE
-
-	# check if we can find swap space
-	CREATE_SWAPSPACE=false
-	SWAPSPACE_SIZE=`parted -s $CEPHDEV unit MB print 2>/dev/null | grep "linux-swap" | head -n1 | awk {' print $4 '} | sed -e "s/MB//g" | cut -d',' -f1 | cut -d'.' -f1`
-	if [ "$SWAPSPACE_SIZE" != "" ]; then
-		CREATE_SWAPSPACE=true
-		ROOTFS_SIZE=$(( $ROOTFS_SIZE - $SWAPSPACE_SIZE ))
-	else
-		SWAPSPACE_SIZE=`parted -s $CEPHDEV unit MB print 2>/dev/null | grep "type=82" | head -n1 | awk {' print $4 '} | sed -e "s/MB//g" | cut -d',' -f1 | cut -d'.' -f1`
-		if [ "$SWAPSPACE_SIZE" != "" ]; then
-			CREATE_SWAPSPACE=true
-			ROOTFS_SIZE=$(( $ROOTFS_SIZE - $SWAPSPACE_SIZE ))
-		fi
-	fi
-
-	# remove partitions
-	for N in `seq 1 5`; do
-		parted -s $CEPHDEV rm $N
-	done
-
-	# recreate root-partition
-	parted -s $CEPHDEV mkpart primary $PARTITION_START $ROOTFS_SIZE""MB
-	# make it bootable
-	parted -s $CEPHDEV set 1 boot on
-
-	if [ "$CREATE_SWAPSPACE" == "true" ]; then
-		# recreate swap
-		parted -s $CEPHDEV mkpart primary linux-swap $ROOTFS_SIZE""MB $ORIGIN_DISK_SIZE""MB
-
-		CMD_ERR=`mkswap $CEPHDEV""p2 2>&1`
-		if [ "$?" != 0 ]; then
-			CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-			openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm" "Could not create swap space on $CEPHDEV - $CMD_ERR!"
-		fi
-		sync
-		sleep 2
-	fi
-
-	FIRST_PARTITION=$CEPHDEV""p1
-
-	# filesystem resize
-	if [ -e $FIRST_PARTITION ]; then
-			PARTITION_TYPE=`fdisk -l $CEPHDEV | grep ^$CEPHDEV | head -n1 | sed -e "s#\*##g" | awk '{ print $5 }'`
-			case "$PARTITION_TYPE" in
-					83)
-						e2fsck -y $FIRST_PARTITION
-						openqrm_post_event 0 "$CEPHDEV" 5 "openqrm-kvm" "Resizing Linux filesystem of volume $CEPHDEV."
-						CMD_ERR=`resize2fs -f -p $FIRST_PARTITION 2>&1`
-						if [ "$?" == 0 ]; then
-							openqrm_post_event 0 "kvm_resize_fs" 5 "openqrm-kvm" "Successfully resized volume $CEPHDEV."
-						else
-							CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-							openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm" "Errors during resizing volume $CEPHDEV! $CMD_ERR"
-							if ! e2fsck -fy $FIRST_PARTITION; then
-								openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm" "Errors on filesystem of volume $CEPHDEV!"
-							fi
-						fi
-						e2fsck -fy $FIRST_PARTITION
-						;;
-					7)
-						VOLUME_SIZE_PARAM="-s $ROOTFS_SIZE""M"
-						openqrm_post_event 0 "$CEPHDEV" 5 "openqrm-kvm" "Resizing Windows filesystem of volume $CEPHDEV to $ROOTFS_SIZE MB."
-						CMD_ERR=`ntfsresize $VOLUME_SIZE_PARAM -b -f $FIRST_PARTITION 2>&1`
-						if [ "$?" == 0 ]; then
-							openqrm_post_event 0 "kvm_resize_fs" 5 "openqrm-kvm" "Successfully resized volume $CEPHDEV to $ROOTFS_SIZE MB."
-						else
-							CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-							openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm" "Errors during resizing volume $CEPHDEV! $CMD_ERR"
-						fi
-						;;
-					*)
-						openqrm_post_event 0 "kvm_resize_fs" 2 "openqrm-kvm" "Could not find out filesystem type of volume $CEPHDEV. Not resizing."
-						;;
-			esac
-	fi
-	sync
-	sleep 2
-
-
-	# unmap
-	CMD_ERR=`rbd unmap $CEPH_VOLUME --pool $CEPH_POOL 2>&1`
-	CMD_ERR=`rbd unmap $CEPHDEV 2>&1`
-	if [ "$?" != 0 ]; then
-		CMD_ERR=`openqrm_format_error_msg $CMD_ERR`
-		openqrm_post_event 0 "resize" 3 "openqrm-kvm" "Error unmapping rbd volume rbd:$CEPH_POOL/$CEPH_VOLUME! $CMD_ERR"
-
-		openqrm_lock_queue release kvm $LOCK_TIME
-		trap '' EXIT
-
-		exit 1
-	fi
-
-
-	return 0
-
-}
-
-
-
-# translates ceph df output in MB (can be M, G, T)
-function ceph_inmb()  {
-        local CNUM=$1
-        if echo $CNUM | grep M 1>/dev/null; then
-                COUTPUT=`echo $CNUM | sed -e "s/MiB//g"`
-                COUTPUT=$(echo $COUTPUT | cut -d'.' -f1)
-        elif echo $CNUM | grep G 1>/dev/null; then
-                COUTPUT=`echo $CNUM | sed -e "s/GiB//g"`
-                COUTPUT=$(echo $COUTPUT*1000 | bc | cut -d'.' -f1)
-        elif echo $CNUM | grep T 1>/dev/null; then
-                COUTPUT=`echo $CNUM | sed -e "s/TiB//g"`
-                COUTPUT=$(echo $COUTPUT*1000*1000 | bc | cut -d'.' -f1)
-        else
-                COUTPUT=$CNUM
-        fi
-        echo $COUTPUT
-}
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/sbin/openqrm-kvm-monitord b/openQRM-5.3.50-CE/src/plugins/kvm/sbin/openqrm-kvm-monitord
deleted file mode 100644
index 9358c77..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/sbin/openqrm-kvm-monitord
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/bin/bash
-# this script automatically monitors kvm vms
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/include/openqrm-plugin-kvm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/etc/openqrm-plugin-kvm.conf
-if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-	OPENQRM_SERVER_IP=$resource_openqrmserver
-	export SERVER_PROTOCOL=$openqrm_web_protocol
-elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-	openqrm_server_get_config
-	OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-	resource_id=0
-	export resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-	export SERVER_PROTOCOL=$OPENQRM_WEB_PROTOCOL
-	export resource_senddelay=10
-fi
-OPENQRM_POSTENCODE="$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-postencode"
-OPENQRM_VM_DIR="/var/lib/kvm/openqrm/"
-export LANG=C
-OPENQRM_EVENT="statistics"
-OPENQRM_ACTIVE_STATE="active"
-OPENQRM_STARTING_STATE="starting"
-
-# define wget to use with https
-if [ "$SERVER_PROTOCOL" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate --random-file=/dev/random"
-fi
-
-# let only root run this script
-WHOAMI=`whoami`
-if [ "$WHOAMI" != "root" ]; then
-	echo "ERROR: Please run this script as root!"
-	exit 6
-fi
-
-# mac is the identifier
-KVM_VM_MAC=$1
-if [ "$KVM_VM_MAC" == "" ]; then
-	echo "Usage: $0 <mac-address>"
-	exit 1
-fi
-
-KVM_VM_NAME=`grep -rHi $KVM_VM_MAC $OPENQRM_VM_DIR/*/net1 2>/dev/null | grep KVM_VM_MAC | cut -d':' -f1 2>/dev/null` 2>/dev/null
-KVM_VM_NAME=`dirname $KVM_VM_NAME` 2>/dev/null
-KVM_VM_NAME=`basename $KVM_VM_NAME` 2>/dev/null
-if [ "$KVM_VM_NAME" == "" ]; then
-	echo "NOTICE: Cloud not find KVM-storage vm $KVM_VM_MAC on this host" | logger
-	exit 1
-fi
-
-
-# local used functions
-function send_info() {
-	current_state=`urlencodestring $OPENQRM_ACTIVE_STATE`
-	current_event=`urlencodestring $OPENQRM_EVENT`
-	MESSAGEDATA="resource_id=$resource_id&resource_uptime=$current_uptime&resource_cpunumber=$current_cpu_number&resource_cpuspeed=$current_cpu_speed&resource_cpumodel=$current_cpu_model&resource_memtotal=$current_mem_total&resource_memused=$current_mem_used&resource_swaptotal=$current_swap_total&resource_swapused=$current_swap_used&resource_hostname=$current_hostname&resource_load=$current_cpu_load&resource_nics=$current_nic_count&resource_state=$current_state&resource_event=$current_event";
-	OPENQRM_RESOURCE_INFO_URL="$SERVER_PROTOCOL://$resource_openqrmserver/openqrm/action/resource-monitor.php?resource_command=update_info&$MESSAGEDATA"
-	wget $WGET_NO_CERT_CHECK -q -O /dev/null "$OPENQRM_RESOURCE_INFO_URL"
-}
-
-# uptime
-function find_uptime() {
-	if [ -f /proc/uptime ]; then
-		current_uptime=`cat /proc/uptime | cut -d'.' -f 1`
-	fi
-	if [ -z "$current_uptime" ]; then
-		current_uptime=0
-	fi
-}
-# cpu_speed
-function find_cpu_speed() {
-	if [ -f /proc/cpuinfo ]; then
-		current_cpu_speed=(`cat /proc/cpuinfo | grep "cpu.*MHz"`)
-		current_cpu_speed=${current_cpu_speed[3]/\.*/}
-	fi
-	if [ -z "$current_cpu_speed" ]; then
-		current_cpu_speed=0
-	fi
-}
-# used mem
-function find_mem_used() {
-	local VP=$1
-	if [ -f /proc/$VP/status ]; then
-		VM_RSS=`cat /proc/$VP/status | grep ^VmRSS: | awk '{ print $2 }'`
-		current_mem_used=$(( VM_RSS / 1024 ))
-	else
-		current_mem_used=0
-	fi
-	if [ "$current_mem_used" -gt "$current_mem_total" ]; then
-		current_mem_used=$current_mem_total
-	fi
-	export current_mem_used
-}
-# used cpu load
-function find_cpu_load() {
-	local VP=$1
-	VM_CPU_SLICE=`ps -p $VP -o %cpu | tail -n+2`
-	current_cpu_load=`perl -E "say $VM_CPU_SLICE/10"`
-	export current_cpu_load
-}
-
-
-# get parameters for the vm resource
-KVM_VM_RESOURCE_PARAMETER="$OPENQRM_VM_DIR/$KVM_VM_NAME/resource-parameter.conf"
-# sending resource-id will add the resource if not existing (-1 = new resource)
-# loop get-parameters in case the network card is still not ready initialized
-NETWORKCARD_LOOP=0
-# send id -1 if resource parameters are not existing
-if [ ! -f $KVM_VM_RESOURCE_PARAMETER ]; then
-	NEW_RES_ID="&resource_id=-1"
-fi
-
-while (true); do
-	if wget $WGET_NO_CERT_CHECK -q -O $KVM_VM_RESOURCE_PARAMETER "$SERVER_PROTOCOL://$resource_openqrmserver/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_mac=$KVM_VM_MAC$NEW_RES_ID"; then
-		if grep resource_id $KVM_VM_RESOURCE_PARAMETER 1>/dev/null 2>&1; then
-			break
-		fi
-	fi
-	# no chance ?
-	if [ "$NETWORKCARD_LOOP" == "10" ]; then
-		echo "ERROR: Could not reach the openQRM-Server at $OPENQRM_SERVER_IP_ADDRESS!"
-		exit 1
-	fi
-	NETWORKCARD_LOOP=$(( NETWORKCARD_LOOP + 1 ))
-	sleep 5
-done
-# source parameters
-. $KVM_VM_RESOURCE_PARAMETER
-echo "$0: Gathering resources-information" | logger
-# gather cpu speed only once
-find_cpu_speed
-# main loop
-while (true); do
-	# if we have a disk, check that the vm is still running
-	. $OPENQRM_VM_DIR/$KVM_VM_NAME/disk1
-	if [ "$KVM_VM_DISK_1" != "" ]; then
-		if ! ps ax | grep kvm | grep -v grep | grep -i "macaddr=$KVM_VM_MAC" 1>/dev/null; then
-			exit 1
-		fi
-		# get the used mem from the VM
-		VM_PID=`ps ax | grep kvm | grep -v grep | grep -i "macaddr=$KVM_VM_MAC" | grep -v -i screen | head -n1 | awk '{ print $1 }'`
-		if [ "$VM_PID" != "" ]; then
-			find_mem_used $VM_PID
-			find_cpu_load $VM_PID
-		fi
-	fi
-	# exit if vm got removed
-	if [ ! -d "$OPENQRM_VM_DIR/$KVM_VM_NAME" ]; then
-		exit 1
-	fi
-	# gathering the values, those may be dynamic e.g. if the VM is updated
-	# source kvm vm config
-	. $OPENQRM_VM_DIR/$KVM_VM_NAME/cpus
-	. $OPENQRM_VM_DIR/$KVM_VM_NAME/ram
-	. $OPENQRM_VM_DIR/$KVM_VM_NAME/net1
-	. $OPENQRM_VM_DIR/$KVM_VM_NAME/net2
-	. $OPENQRM_VM_DIR/$KVM_VM_NAME/net3
-	. $OPENQRM_VM_DIR/$KVM_VM_NAME/net4
-	. $OPENQRM_VM_DIR/$KVM_VM_NAME/net5
-	export current_hostname=$KVM_VM_NAME
-	export resource_cpumodel="Qemu Virtual CPU"
-	export current_cpu_number=$KVM_VM_CPUS
-	export current_mem_total=$KVM_VM_RAM
-	# nic count
-	TOTAL_NIC_COUNT=0
-	if [ "$KVM_VM_MAC_1" != "" ]; then
-		TOTAL_NIC_COUNT=$(( TOTAL_NIC_COUNT + 1 ))
-	fi
-	if [ "$KVM_VM_MAC_2" != "" ]; then
-		TOTAL_NIC_COUNT=$(( TOTAL_NIC_COUNT + 1 ))
-	fi
-	if [ "$KVM_VM_MAC_3" != "" ]; then
-		TOTAL_NIC_COUNT=$(( TOTAL_NIC_COUNT + 1 ))
-	fi
-	if [ "$KVM_VM_MAC_4" != "" ]; then
-		TOTAL_NIC_COUNT=$(( TOTAL_NIC_COUNT + 1 ))
-	fi
-	if [ "$KVM_VM_MAC_5" != "" ]; then
-		TOTAL_NIC_COUNT=$(( TOTAL_NIC_COUNT + 1 ))
-	fi
-	export current_nic_count=$TOTAL_NIC_COUNT
-	# uptime
-	find_uptime
-	# sending statistics
-	send_info
-	# delay
-	sleep $resource_senddelay
-done
-# never reached
-exit 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.bootservice.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.bootservice.class.php
deleted file mode 100644
index 3a1b060..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.bootservice.class.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * kvm-about Boot-Service
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_about_bootservice
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "kvm_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/kvm-about-bootservice.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['boot_service_title'], 'boot_service_title');
-		$t->add($this->lang['boot_service_content'], 'boot_service_content');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.controller.class.php
deleted file mode 100644
index ba32b29..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.controller.class.php
+++ /dev/null
@@ -1,392 +0,0 @@
-<?php
-/**
- * kvm-about Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_about_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About KVM',
-		'label' => 'About KVM',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The "KVM" plugin manages KVM Virtual Machines and their belonging virtual disk.
-					   As common in openQRM the Virtual Machines and their virtual disk volumes are managed separately.
-					   Therefore the "KVM" plugin splits up into VM- and Volume-Management.
-					   The VM part provides the Virtual Machines which are abstracted as "Resources".
-					   The Storage part provides volumes which are abstracted as "Images".
-					   Appliance deployment automatically combines "Resource" and "Image".',
-		'requirements_title' => 'Requirements',
-		'requirements_list' => '<ul><li>A resource for the KVM Host Appliance<br>(this can be a remote system integrated into openQRM e.g. via the "local-server" plugin or the openQRM server itself)</li>
-				   <li>The server needs VT (Virtualization Technology) Support in its CPU (requirement for KVM)</li>
-				   <li>The following packages must be installed: kvm (eventual kvm-pxe), socat, bridge-utils, lvm2</li>
-				   <li>For KVM LVM Storage: One (or more) lvm volume group(s) with free space dedicated for the KVM VM storage</li>
-				   <li>For KVM Blockfile Storage: free space dedicated for the KVM VM storage</li>
-				   <li>For KVM Gluster Storage: One or more Gluster Storage Cluster</li>
-				   <li>One or more bridges configured for the virtual machines</li></ul>',
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with KVM Version kvm-62 or better<br>To benefit from the KVM "virtio" feature at least kvm-84 is needed',
-
-		'provides_title' => 'Provides',
-		'provides_list' => '<ul><li>Virtualization types: "KVM Host", "KVM VM (localboot)" and "KVM VM (netboot)"</li>
-				   <li>Storage types: "KVM LVM Storage", "KVM Blockfile Storage" and "KVM Gluster Storage"</li>
-				   <li>Deployment types: "LVM deployment for KVM", "Blockfile deployment for KVM" and "Gluster deployment for KVM"</li></ul>',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Virtualization and Storage',
-
-		'deployment_title' => 'Deployment Type',
-		'deployment_content' => 'Local and Network Deployment for Virtual Machines',
-
-		'migration_title' => 'Requirements for KVM live-migration',
-		'migration_content' => 'Shared storage between the KVM Hosts for the location of the VM config files (/var/lib/kvm/openqrm)
-					and a shared LVM volume group between the KVM Hosts',
-		'documentation_title' => 'Documentation',
-		'use_case_title' => 'Use-Case',
-		'network_deploymet' => 'Network-Deployment',
-		'doc1' => '',
-	),
-	'bootservice' => array (
-		'tab' => 'Boot-Service',
-		'label' => 'KVM Boot-Service',
-		'boot_service_title' => 'KVM Host Boot-Service',
-		'boot_service_content' => 'The KVM Plugin provides an openQRM Boot-Service.
-			This "KVM Boot-Service" is automatically downloaded and executed by the openQRM-Client on all integrated Systems.
-			The Boot-Service is located at:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/kvm/web/boot-service-kvm.tgz</b></i>
-			<br>
-			<br>
-			The "KVM Boot-Service" contains the Client files of the KVM Plugin.<br>
-			Also a configuration file for the KVM Hosts is included in this Boot-Service.<br>
-			<br>
-			The Boot-Service configuration can be viewed and administrated by the "openqrm" utility.<br>
-			To view the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n kvm -a default</b></i>
-			<br>
-			<br>
-			To view a Boot-Service configuration of a specific appliance run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n kvm -a [appliance-name]</b></i>
-			<br>
-			<br>
-			To adapt a parameter in the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n kvm -a default -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			To adapt a paramter in the Boot-Service configuration of a specific appliance run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n kvm -a [appliance-name] -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			In case the openmQRM Server itself is used as the KVM Host please edit:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/kvm/etc/openqrm-plugin-kvm.conf</b></i>
-			<br>
-			<br>
-			and set the configuration keys according to your bridge-configuration.<br>
-			<br>
-			',
-	),
-	'storage' => array (
-		'tab' => 'About KVM',
-		'label' => 'About Storage in KVM',
-		'storage_mgmt_title' => 'KVM Storage Management',
-		'storage_mgmt_list' => '<ul>li>Create a new storage from type "KVM LVM Storage" or "KVM Blockfile Storage"</li>
-				   <li>Create a new Volume on this storage (either LVM or Blockfile)</li>
-				   <li>Creating the Volume automatically creates a new Image using volume as root-device</li></ul>',
-
-	),
-	'vms' => array (
-		'tab' => 'About KVM',
-		'label' => 'About Virtual Machines in KVM',
-		'vm_mgmt_title' => 'KVM VM Management',
-		'vm_mgmt_list' => '<ul><li>Create a new appliance and set its resource type to "KVM Host"</li>
-				   <li>Create and manage KVM virtual machines via the KVM VM Manager</li></ul>',
-	),
-	'usage' => array (
-		'tab' => 'About KVM',
-		'label' => 'KVM Use-Cases',
-	),
-
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/kvm/lang", 'kvm-about.ini');
-
-
-		$this->tpldir   = $this->rootdir.'/plugins/kvm/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "documentation";
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-			case 'bootservice':
-				$content[] = $this->bootservice(true);
-			break;
-			case 'storage':
-				$content[] = $this->storage(true);
-			break;
-			case 'vms':
-				$content[] = $this->vms(true);
-			break;
-			case 'usage':
-				$content[] = $this->usage(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About KVM
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm-about.documentation.class.php');
-			$controller = new kvm_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Boot-Service
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function bootservice( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm-about.bootservice.class.php');
-			$controller = new kvm_about_bootservice($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['bootservice'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['bootservice']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'bootservice' );
-		$content['onclick'] = false;
-		if($this->action === 'bootservice'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About Storage
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function storage( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm-about.storage.class.php');
-			$controller = new kvm_about_storage($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['storage'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['storage']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'storage' );
-		$content['onclick'] = false;
-		if($this->action === 'storage'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About KVM VM management
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function vms( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm-about.vms.class.php');
-			$controller = new kvm_about_vms($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['vms'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['vms']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'vms' );
-		$content['onclick'] = false;
-		if($this->action === 'vms'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-	//--------------------------------------------
-	/**
-	 * About KVM Use-Cases
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function usage( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm-about.usage.class.php');
-			$controller = new kvm_about_usage($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['usage'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['usage']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'usage' );
-		$content['onclick'] = false;
-		if($this->action === 'usage'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.documentation.class.php
deleted file mode 100644
index 725d75f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.documentation.class.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * kvm-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "kvm_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/kvm-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['deployment_title'], 'deployment_title');
-		$t->add($this->lang['deployment_content'], 'deployment_content');
-		$t->add($this->lang['provides_title'], 'provides_title');
-		$t->add($this->lang['provides_list'], 'provides_list');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->lang['migration_title'], 'migration_title');
-		$t->add($this->lang['migration_content'], 'migration_content');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.storage.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.storage.class.php
deleted file mode 100644
index 7cf11f8..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.storage.class.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * kvm-about Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_about_storage
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "kvm_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/kvm-about-storage.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['storage_mgmt_title'], 'storage_mgmt_title');
-		$t->add($this->lang['storage_mgmt_list'], 'storage_mgmt_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.usage.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.usage.class.php
deleted file mode 100644
index 3c8e052..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.usage.class.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * kvm-about Usage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_about_usage
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "kvm_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/kvm-about-usage.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.vms.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.vms.class.php
deleted file mode 100644
index b02b678..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-about.vms.class.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * kvm-about VMs
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_about_vms
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "kvm_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/kvm-about-vms.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['vm_mgmt_title'], 'vm_mgmt_title');
-		$t->add($this->lang['vm_mgmt_list'], 'vm_mgmt_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.add.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.add.class.php
deleted file mode 100644
index fe2e288..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.add.class.php
+++ /dev/null
@@ -1,1044 +0,0 @@
-<?php
-/**
- * KVM-VM Add new VM
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_vm_add
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_vm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_vm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_vm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_vm_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-		$this->controller = $controller;
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-		$id = $this->response->html->request()->get('appliance_id');
-		$this->user = $openqrm->user();
-		$appliance = $this->openqrm->appliance();
-		$resource  = $this->openqrm->resource();
-		$appliance->get_instance_by_id($id);
-		$resource->get_instance_by_id($appliance->resources);
-		$this->resource  = $resource;
-		$this->appliance = $appliance;
-		$this->statfile  = $this->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$resource->id.'.vm_list';
-		$this->response->add('appliance_id', $id);
-		$this->response->add('vmtype', $this->response->html->request()->get('vmtype'));
-
-		require_once $this->openqrm->get('basedir').'/plugins/ip-mgmt/web/class/ip-mgmt.class.php';
-		$ip_mgmt = new ip_mgmt();
-		$this->ip_mgmt = $ip_mgmt;
-		
-		$this->plugin = new plugin();
-		$this->plugins_enabled = $this->plugin->enabled();
-		
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->add();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 2) {
-				$this->controller->reload();
-				$vmtype = $this->response->html->request()->get('vmtype');
-				$foward_to_step = $this->user->wizard_step;
-				$foward_to_step = 2;
-				if($vmtype === 'kvm-vm-local') {
-					if ($this->response->html->request()->get('localboot_image') !== '') {
-						$foward_to_step = 4;
-					}
-				}
-				if($vmtype === 'kvm-vm-net') {
-					if ($this->response->html->request()->get('netboot_image') !== '') {
-						$foward_to_step = 4;
-					}
-				}
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$foward_to_step.'&appliance_id='.$this->user->wizard_id.'&resource_id='.$response->resource_id
-				);
-			} else {
-				if ($response->image_configured) {
-					$this->response->redirect(
-						$this->response->html->thisfile.'?base=appliance&appliance_msg='.$response->msg.'&resource_filter='.$response->resource_id
-					);
-				} else {
-					$this->response->redirect(
-						$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-					);
-				}
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		
-		$a = $this->response->html->a();
-		$a->label   = $this->lang['action_add_vm_image'];
-		$a->css     = 'add';
-		$a->handler = 'onclick="wait();"';
-		$a->href    = $this->response->html->thisfile.'?base=image&image_action=add';
-		$action_add_vm_image   = $a->get_string();
-		
-		$t = $this->response->html->template($this->tpldir.'/kvm-vm-add.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['lang_basic'], 'lang_basic');
-		$t->add($this->lang['lang_hardware'], 'lang_hardware');
-		$t->add($this->lang['lang_net'], 'lang_net');
-		$t->add($this->lang['lang_net_0'], 'lang_net_0');
-		$t->add($this->lang['lang_net_1'], 'lang_net_1');
-		$t->add($this->lang['lang_net_2'], 'lang_net_2');
-		$t->add($this->lang['lang_net_3'], 'lang_net_3');
-		$t->add($this->lang['lang_net_4'], 'lang_net_4');
-		$t->add($this->lang['lang_boot'], 'lang_boot');
-		$t->add($this->lang['lang_virtual_disk'], 'lang_virtual_disk');
-		$t->add($this->lang['lang_vnc'], 'lang_vnc');
-		$t->add($this->lang['lang_browser'], 'lang_browser');
-		$t->add($this->lang['lang_password_generate'], 'lang_password_generate');
-		$t->add($this->lang['lang_password_show'], 'lang_password_show');
-		$t->add($this->lang['lang_password_hide'], 'lang_password_hide');
-		$t->add($action_add_vm_image, 'add_vm_image');
-		$t->add($this->response->html->request()->get('appliance_id'), 'appliance_id');
-		$t->add($this->actions_name, 'actions_name');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function add() {
-		$response = $this->get_response();
-		$form     = $response->form;
-
-		// handle no bridge error
-		if(!isset($respnse->msg)) {
-			// check vnc password
-			$vnc = $form->get_request('vnc');
-			if($vnc !== '' && $vnc !== $form->get_request('vnc_1')) {
-				$form->set_error('vnc_1', $this->lang['error_vnc_password']);
-			}
-			if(isset($vnc) && $vnc !== '' && strlen($vnc) < 6) {
-				$form->set_error('vnc', $this->lang['error_vnc_password_count']);
-			}
-			$vnckeymap = $form->get_request('vnc_keymap');
-			$vnckeymap_parameter = '';
-			if($vnc !== '') {
-				$vnckeymap_parameter = ' -l '.$vnckeymap;
-			}
-			// disk interface
-			$disk_interface = $form->get_request('disk_interface');
-			$disk_interface_parameter = '';
-			if($disk_interface !== '') {
-				$disk_interface_parameter = ' -o '.$disk_interface;
-			}
-			$iso_path = '';
-			if($form->get_request('boot') !== '' && $form->get_request('boot') === 'iso') {
-				if($form->get_request('iso_path') === '') {
-					$form->set_error('iso_path', $this->lang['error_iso_path']);
-				} else {
-					$iso_path = ' -i '.$form->get_request('iso_path');
-				}
-			}
-
-			$image = new image();
-			$vm_using_existing_image = false;
-			if ($form->get_request('localboot_image') !== '') {
-				$image->get_instance_by_id($form->get_request('localboot_image'));
-				$vm_using_existing_image = true;
-			} else if ($form->get_request('netboot_image') !== '') {
-				$image->get_instance_by_id($form->get_request('netboot_image'));
-				$vm_using_existing_image = true;
-			}
-			
-			if(!$form->get_errors() && $this->response->submit()) {
-				$errors = array();
-				$name   = $form->get_request('name');
-				if($form->get_request('boot') === '') {
-					$errors[] = $this->lang['error_boot'];
-				}
-
-				$enabled = array();
-				for($i = 1; $i < 5; $i++) {
-					$enabled[$i] = true;
-					if($form->get_request('net'.$i) !== '') {
-						if($form->get_request('mac'.$i) === '') {
-							$form->set_error('mac'.$i, $this->lang['error_mac']);
-							$enabled[$i] = false;
-						}
-						if($form->get_request('nic'.$i) === '') {
-							$form->set_error('nic'.$i, $this->lang['error_nic']);
-							$enabled[$i] = false;
-						}
-						if($form->get_request('bridge'.$i) === '') {
-							$form->set_error('bridge'.$i, $this->lang['error_bridge']);
-							$enabled[$i] = false;
-						}
-					} else {
-						$enabled[$i] = false;
-					}
-				}
-				// check vm name
-				if ($this->file->exists($this->statfile)) {
-					$lines = explode("\n", $this->file->get_contents($this->statfile));
-					if(count($lines) >= 1) {
-						foreach($lines as $line) {
-							if($line !== '') {
-								$line = explode('@', $line);
-								$check = $line[1];
-								if($name === $check) {
-									$errors[] = sprintf($this->lang['error_exists'], $name);
-								}
-							}
-						}
-					}
-				}
-				if(count($errors) > 0 || $form->get_errors()) {
-					$response->error = join('<br>', $errors);
-				} else {
-					$tables = $this->openqrm->get('table');
-					$resource = new resource();
-					$id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$ip = "";
-					$subnet = "";
-					
-					// default management network or custom ip
-					if($form->get_request('ovs_ip0') === '') {
-						$ip = "0.0.0.0";
-						$subnet = "0.0.0.0";
-					} else {
-						$ovs_ip0_id   = $form->get_request('ovs_ip0');
-						$ovs_ip0_array = $this->ip_mgmt->get_instance('id', $ovs_ip0_id);
-						$ovs_ip0_mgmt_name = trim($ovs_ip0_array['ip_mgmt_name']);
-						$ovs_ip0_mgmt_address = trim($ovs_ip0_array['ip_mgmt_address']);
-						$ovs_ip0_mgmt_network = trim($ovs_ip0_array['ip_mgmt_network']);
-						$ovs_ip0_mgmt_subnet = trim($ovs_ip0_array['ip_mgmt_subnet']);
-						$ovs_ip0_mgmt_broadcast = trim($ovs_ip0_array['ip_mgmt_broadcast']);
-						$ovs_ip0_mgmt_dns1 = trim($ovs_ip0_array['ip_mgmt_dns1']);
-						$ovs_ip0_mgmt_dns2 = trim($ovs_ip0_array['ip_mgmt_dns2']);
-						$ovs_ip0_mgmt_domain = trim($ovs_ip0_array['ip_mgmt_domain']);
-						$ovs_ip0_mgmt_vlan_id = trim($ovs_ip0_array['ip_mgmt_vlan_id']);
-						$ovs_ip0_mgmt_comment = trim($ovs_ip0_array['ip_mgmt_comment']);
-						
-						
-						// still need to save the ip config in ip-mgmt
-						
-						// use first ip as resource ip + subnet to trigger the dhcpd plugin to add it to custom ip-mgmt network
-						$ip = $ovs_ip0_mgmt_address;
-						$subnet = $ovs_ip0_mgmt_subnet;
-					    
-					}
-					
-					
-					
-					
-					
-					$mac = strtolower($form->get_request('mac'));
-					// send command to the openQRM-server
-					$openqrm = new openqrm_server();
-					$openqrm->send_command('openqrm_server_add_resource '.$id.' '.$mac.' '.$ip);
-					// set resource type
-					$vmtype = $this->response->html->request()->get('vmtype');
-					if($vmtype === 'kvm-vm-net') {
-						$virtualization = new virtualization();
-						$virtualization->get_instance_by_type("kvm-vm-net");
-					} else {
-						$virtualization = new virtualization();
-						$virtualization->get_instance_by_type("kvm-vm-local");
-					}
-					// add to openQRM database
-					$fields["resource_id"] = $id;
-					$fields["resource_ip"] = $ip;
-					$fields["resource_subnet"] = $subnet;
-					$fields["resource_mac"] = $mac;
-					$fields["resource_localboot"] = 0;
-					$fields["resource_vtype"] = $virtualization->id;
-					$fields["resource_vhostid"] = $this->resource->id;
-					$fields["resource_vname"] = $name;
-					$this->resource->add($fields);
-
-					$command  = $this->openqrm->get('basedir').'/plugins/kvm/bin/openqrm-kvm-vm create';
-					$command .= ' -n '.$name;
-					$command .= ' -y '.$vmtype;
-					$command .= ' -m '.$mac;
-					$command .= ' -r '.$form->get_request('memory');
-					$command .= ' -c '.$form->get_request('cpus');
-					$command .= ' -t '.$form->get_request('nic');
-					// ovs bridge param from ip_mgmt
-					if (in_array("openvswitch-manager", $this->plugins_enabled)) {
-						$ovs0_ip_id   = $form->get_request('ovs_ip0');
-						$ovs0_ip_array = $this->ip_mgmt->get_instance('id', $ovs0_ip_id);
-						$ovs0_ip_mgmt_bridge_name = trim($ovs0_ip_array['ip_mgmt_bridge_name']);
-						$command .= ' -z '.$ovs0_ip_mgmt_bridge_name;
-						// update ip-mgmt object
-						$ovs0_update_array['ip_mgmt_resource_id'] = $id;
-						$this->ip_mgmt->update_ip($ovs0_ip_id, $ovs0_update_array);
-						
-						foreach($enabled as $key => $value) {
-							if($value === true) {
-								$ovsx_ip_id   = $form->get_request('ovs_ip'.$key);
-								$ovsx_ip_array = $this->ip_mgmt->get_instance('id', $ovsx_ip_id);
-								$ovsx_ip_mgmt_bridge_name = trim($ovsx_ip_array['ip_mgmt_bridge_name']);
-								$command .= ' -m'.$key.' '.$form->get_request('mac'.$key);
-								$command .= ' -t'.$key.' '.$form->get_request('nic'.$key);
-								$command .= ' -z'.$key.' '.$ovsx_ip_mgmt_bridge_name;
-								// update ip-mgmt object
-								$ovsx_update_array['ip_mgmt_resource_id'] = $id;
-								$this->ip_mgmt->update_ip($ovsx_ip_id, $ovsx_update_array);
-
-							}
-						}
-					    
-					} else {
-						// regular bridges from form
-						$command .= ' -z '.$form->get_request('bridge');
-						foreach($enabled as $key => $value) {
-							if($value === true) {
-								$command .= ' -m'.$key.' '.$form->get_request('mac'.$key);
-								$command .= ' -t'.$key.' '.$form->get_request('nic'.$key);
-								$command .= ' -z'.$key.' '.$form->get_request('bridge'.$key);
-							}
-						}
-					}
-
-
-
-					if($form->get_request('cdrom')) {
-						$command .= ' -cdrom '.$form->get_request('cdrom');
-					}
-
-					$command .= ' -b '.$form->get_request('boot');
-					$command .= ' -v '.$form->get_request('vnc');
-					$command .= $iso_path;
-					$command .= $vnckeymap_parameter;
-					$command .= $disk_interface_parameter;
-					$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-					$command .= ' --openqrm-ui-user '.$this->user->name;
-					$command .= ' --openqrm-cmd-mode regular';
-
-					$this->resource->send_command($this->resource->ip, $command);
-					$response->resource_id = $id;
-					$response->msg = sprintf($this->lang['msg_added'], $name);
-					
-					// create server object
-					$response->image_configured = false;
-					if ($vm_using_existing_image) {
-						$response->image_configured = true;
-						// add/update server if any type of image was set
-						$now=$_SERVER['REQUEST_TIME'];
-						if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 2) {
-							// update appliance for this VM if we are coming from the wizard
-							$afields['appliance_resources'] = $id;
-							$afields['appliance_kernelid'] = '1';
-							$afields['appliance_imageid'] = $image->id;
-							$afields["appliance_virtual"]= 0;
-							$afields["appliance_virtualization"]=$virtualization->id;
-							$afields['appliance_wizard'] = '';
-							$afields['appliance_comment'] = 'KVM VM for resource '.$id;
-							$afields['appliance_stoptime']=$now;
-							$afields['appliance_starttime']='';
-							$afields['appliance_state']='stopped';
-							$this->appliance->update($this->user->wizard_id, $afields);
-						} else {
-							// auto create the appliance for this VM if we are not coming from the wizard
-							$appliance_name = str_replace("_", "-", strtolower(trim($name)));
-							$new_appliance_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-							$afields['appliance_id'] = $new_appliance_id;
-							$afields['appliance_name'] = $appliance_name;
-							$afields['appliance_resources'] = $id;
-							$afields['appliance_kernelid'] = '1';
-							$afields['appliance_imageid'] = $image->id;
-							$afields["appliance_virtual"]= 0;
-							$afields["appliance_virtualization"]=$virtualization->id;
-							$afields['appliance_wizard'] = '';
-							$afields['appliance_comment'] = 'KVM VM for resource '.$id;
-							$this->appliance->add($afields);
-							// update state/start+stoptime
-							$aufields['appliance_stoptime']=$now;
-							$aufields['appliance_starttime']='';
-							$aufields['appliance_state']='stopped';
-							$this->appliance->update($new_appliance_id, $aufields);
-						}
-					}
-					
-					// when ovs is enabled configure addtional ip addresses in dhcpd + dns
-					if (in_array("openvswitch-manager", $this->plugins_enabled)) {
-						$openqrm_resource = new resource();
-						$openqrm_resource->get_instance_by_id(0);
-						
-						// first nic dns, dhcpd comes from new resource hook
-						$ovs0_ip_id   = $form->get_request('ovs_ip0');
-						$ovs0_ip_array = $this->ip_mgmt->get_instance('id', $ovs0_ip_id);
-						$ovs0_ip_mgmt_address = trim($ovs0_ip_array['ip_mgmt_address']);
-						$ovs0_ip_mgmt_domain = trim($ovs0_ip_array['ip_mgmt_domain']);
-						
-						$dns_command  = $this->openqrm->get('basedir').'/plugins/dns/bin/openqrm-dns-domain-manager add_host';
-						$dns_command .= ' -n '.$ovs0_ip_mgmt_domain;
-						$dns_command .= ' -i '.$ovs0_ip_mgmt_address;
-						$dns_command .= ' -q '.$name;
-						$openqrm_resource->send_command($openqrm_resource->ip, $dns_command);
-						
-						// additional nics dhcpd + dns
-						foreach($enabled as $key => $value) {
-							if($value === true) {
-								$ovs_mac = $form->get_request('mac'.$key);
-								$ovs_ip_id   = $form->get_request('ovs_ip'.$key);
-								$ovs_ip_array = $this->ip_mgmt->get_instance('id', $ovs_ip_id);
-								$ovs_ip_mgmt_address = trim($ovs_ip_array['ip_mgmt_address']);
-								$ovs_ip_mgmt_subnet = trim($ovs_ip_array['ip_mgmt_subnet']);
-								$ovs_ip_mgmt_domain = trim($ovs_ip_array['ip_mgmt_domain']);
-
-								// dhcpd
-								$command  = $this->openqrm->get('basedir').'/plugins/dhcpd/bin/openqrm-dhcpd-manager add';
-								$command .= ' -d '.$id.$key;
-								$command .= ' -i '.$ovs_ip_mgmt_address;
-								$command .= ' -s '.$ovs_ip_mgmt_subnet;
-								$command .= ' -m '.$ovs_mac;
-								$openqrm_resource->send_command($openqrm_resource->ip, $command);
-								
-								// dns
-								$dns_command  = $this->openqrm->get('basedir').'/plugins/dns/bin/openqrm-dns-domain-manager add_host';
-								$dns_command .= ' -n '.$ovs_ip_mgmt_domain;
-								$dns_command .= ' -i '.$ovs_ip_mgmt_address;
-								$dns_command .= ' -q '.$name;
-								$openqrm_resource->send_command($openqrm_resource->ip, $dns_command);
-								
-								
-							}
-						}
-	
-					}
-					// end ovs
-		
-
-				}
-			} else if($form->get_errors()) {
-				$response->error = implode('<br>', $form->get_errors());
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$OPENQRM_SERVER_BASE_DIR = $this->openqrm->get('basedir');
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'add');
-
-		$cpus[] = array("1", "1 CPU");
-		$cpus[] = array("2", "2 CPUs");
-		$cpus[] = array("4", "4 CPUs");
-		$cpus[] = array("8", "8 CPUs");
-		$cpus[] = array("16", "16 CPUs");
-
-		$ram[] = array("256", "256 MB");
-		$ram[] = array("512", "512 MB");
-		$ram[] = array("1024", "1 GB");
-		$ram[] = array("2048", "2 GB");
-		$ram[] = array("4096", "4 GB");
-		$ram[] = array("8192", "8 GB");
-		$ram[] = array("16384", "16 GB");
-		$ram[] = array("32768", "32 GB");
-		$ram[] = array("65536", "64 GB");
-
-		$nics[] = array("virtio", $this->lang['form_net_virtio']);
-		$nics[] = array("e1000", $this->lang['form_net_e1000']);
-		$nics[] = array("rtl8139", $this->lang['form_net_rtl8139']);
-
-		$keymaps[] = array("de", "de");
-		$keymaps[] = array("en-us", "en-us");
-		$keymaps[] = array("es", "es");
-		$keymaps[] = array("fr", "fr");
-		$keymaps[] = array("it", "it");
-		$keymaps[] = array("ja", "ja");
-		$keymaps[] = array("nl", "nl");
-		$keymaps[] = array("ru", "ru");
-		$keymaps[] = array("none", "none");
-
-		$disk_interfaces[] = array("virtio", "Virtio");
-		$disk_interfaces[] = array("ide", "IDE");
-
-		$swap_select_arr[] = array('1024', '1 GB');
-		$swap_select_arr[] = array('2048', '2 GB');
-		$swap_select_arr[] = array('4096', '4 GB');
-
-		// if we come from the wizard suggest the server name
-		$vm_name_suggestion = '';
-		if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 2) {
-			$appliance = new appliance();
-			$appliance->get_instance_by_id($this->user->wizard_id);
-			$vm_name_suggestion = $appliance->name;
-		}
-
-		// get a list of existing kvm localboot images to select
-		$existing_image_arr = array();
-		$image = new image();
-		$image_image_id_ar = $image->get_ids_by_type('kvm-lvm-deployment');
-		foreach ($image_image_id_ar as $iid_ar) {
-			$image_id = $iid_ar['image_id'];
-			$image->get_instance_by_id($image_id);
-			$existing_image_arr[] = array($image->id, $image->name);
-		}
-		$image_image_id_ar = $image->get_ids_by_type('kvm-bf-deployment');
-		foreach ($image_image_id_ar as $iid_ar) {
-			$image_id = $iid_ar['image_id'];
-			$image->get_instance_by_id($image_id);
-			$existing_image_arr[] = array($image->id, $image->name);
-		}
-		$image_image_id_ar = $image->get_ids_by_type('kvm-gluster-deployment');
-		foreach ($image_image_id_ar as $iid_ar) {
-			$image_id = $iid_ar['image_id'];
-			$image->get_instance_by_id($image_id);
-			$existing_image_arr[] = array($image->id, $image->name);
-		}
-		$existing_image_arr[] = array('', '');
-		
-		// get a list of network-deployment images for netboot vms
-		$existing_netboot_image_arr = array();
-		$existing_netboot_image_id_ar = $image->get_ids();
-		foreach ($existing_netboot_image_id_ar as $iid_ar) {
-			$image_id = $iid_ar['image_id'];
-			$image->get_instance_by_id($image_id);
-			if ($image->is_network_deployment()) {
-				$existing_netboot_image_arr[] = array($image->id, $image->name);
-			}
-		}
-		$existing_netboot_image_arr[] = array('', '');
-
-		
-		// ip addresses for ovs from ip-mgmt
-		// TODO !!!!!!! get network from selected ovs via mapping object
-		//$ip_addresse_ids = $this->ip_mgmt->get_ips_by_name($this->network);
-		
-		$ip_addresse_ids = [];
-		$ip_network_names_array = $this->ip_mgmt->get_names();
-		foreach($ip_network_names_array as $ip_network_name) {
-//			$ip_addresse_ids = $this->ip_mgmt->get_ips_by_name($ip_network_name);
-			array_push($ip_addresse_ids, $this->ip_mgmt->get_ips_by_name($ip_network_name));
-		}
-
-		// TODO !!!!!!! get network from selected ovs via mapping object
-
-
-		foreach($ip_addresse_ids as $ip_adress_network_array) {
-			foreach($ip_adress_network_array as $ip_adress_id) {
-				$ip_array = $this->ip_mgmt->get_instance('id', $ip_adress_id);
-				$ip_mgmt_appliance_id = trim($ip_array['ip_mgmt_appliance_id']);
-				$ip_mgmt_resource_id = trim($ip_array['ip_mgmt_resource_id']);
-				if ($ip_mgmt_appliance_id != NULL) {
-				    continue;
-				}
-				if ($ip_mgmt_resource_id != NULL) {
-				    continue;
-				}
-				$ip_mgmt_name = trim($ip_array['ip_mgmt_name']);
-				$ip_mgmt_domain = trim($ip_array['ip_mgmt_domain']);
-				$ip_mgmt_address = trim($ip_array['ip_mgmt_address']);
-				$ip_mgmt_list_per_user_arr[] = array("value" => $ip_adress_id, "label" => $ip_mgmt_address.' ('.$ip_mgmt_domain.')');
-			}
-		}
-		
-		
-		$file = $OPENQRM_SERVER_BASE_DIR.'/plugins/kvm/web/kvm-stat/'.$this->resource->id.'.bridge_config';
-		$data = openqrm_parse_conf($file);
-		$bridges = array();
-		$bridge_list = $data['OPENQRM_KVM_BRIDGES'];
-		$bridge_list = rtrim($bridge_list, ":");
-		$bridge_array = explode(':', $bridge_list);
-
-		// handle no bridge error
-		if(isset($bridge_array[0]) && $bridge_array[0] !== '') {
-			foreach ($bridge_array as $b) {
-				$bridges[] = array($b, $b);
-			}
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-	
-			$d['name']['label']                             = $this->lang['form_name'];
-			$d['name']['required']                          = true;
-			$d['name']['validate']['regex']                 = '/^[a-z0-9._]+$/i';
-			$d['name']['validate']['errormsg']              = sprintf($this->lang['error_name'], 'a-z0-9._');
-			$d['name']['object']['type']                    = 'htmlobject_input';
-			$d['name']['object']['attrib']['name']          = 'name';
-			$d['name']['object']['attrib']['id']            = 'name';
-			$d['name']['object']['attrib']['type']          = 'text';
-			$d['name']['object']['attrib']['css']           = 'namegen';
-			$d['name']['object']['attrib']['customattribs'] = 'data-prefix="kvm" data-length="6"';
-			$d['name']['object']['attrib']['value']		    = $vm_name_suggestion;
-			$d['name']['object']['attrib']['maxlength']     = 50;
-
-			$d['cpus']['label']                       = $this->lang['form_cpus'];
-			$d['cpus']['required']                    = true;
-			$d['cpus']['object']['type']              = 'htmlobject_select';
-			$d['cpus']['object']['attrib']['name']    = 'cpus';
-			$d['cpus']['object']['attrib']['index']   = array(0,1);
-			$d['cpus']['object']['attrib']['options'] = $cpus;
-
-			$d['memory']['label']                        = $this->lang['form_memory'];
-			$d['memory']['required']                     = true;
-			$d['memory']['object']['type']               = 'htmlobject_select';
-			$d['memory']['object']['attrib']['name']     = 'memory';
-			$d['memory']['object']['attrib']['index']    = array(0,1);
-			$d['memory']['object']['attrib']['options']  = $ram;
-			$d['memory']['object']['attrib']['selected'] = array(512);
-
-			$vmtype = $this->response->html->request()->get('vmtype');
-			if($vmtype === 'kvm-vm-net') {
-				
-				$d['netboot_image']['label']						= $this->lang['form_existing_disk'];
-				$d['netboot_image']['object']['type']				= 'htmlobject_select';
-				$d['netboot_image']['object']['attrib']['index']	= array(0,1);
-				$d['netboot_image']['object']['attrib']['id']		= 'netboot_image';
-				$d['netboot_image']['object']['attrib']['name']		= 'netboot_image';
-				$d['netboot_image']['object']['attrib']['options']	= $existing_netboot_image_arr;
-				$d['netboot_image']['object']['attrib']['selected']	= array('');
-
-				$d['disk_interface'] = "";
-				$d['localboot_image'] = "";
-				$d['cdrom_iso_path'] = "";
-				$d['cdrom_button'] = "";
-				
-			} else {
-				
-				$d['localboot_image']['label']						= $this->lang['form_existing_disk'];
-				$d['localboot_image']['object']['type']				= 'htmlobject_select';
-				$d['localboot_image']['object']['attrib']['index']	= array(0,1);
-				$d['localboot_image']['object']['attrib']['id']		= 'localboot_image';
-				$d['localboot_image']['object']['attrib']['name']		= 'localboot_image';
-				$d['localboot_image']['object']['attrib']['options']	= $existing_image_arr;
-				$d['localboot_image']['object']['attrib']['selected']	= array('');
-
-				$d['disk_interface']['label']                       = $this->lang['form_disk_interface'];
-				$d['disk_interface']['required']                    = true;
-				$d['disk_interface']['object']['type']              = 'htmlobject_select';
-				$d['disk_interface']['object']['attrib']['name']    = 'disk_interface';
-				$d['disk_interface']['object']['attrib']['id']      = 'disk_interface';
-				$d['disk_interface']['object']['attrib']['index']   = array(0,1);
-				$d['disk_interface']['object']['attrib']['options'] = $disk_interfaces;
-
-				$d['cdrom_iso_path']['label']                    = $this->lang['form_cdrom'];
-				$d['cdrom_iso_path']['object']['type']           = 'htmlobject_input';
-				$d['cdrom_iso_path']['object']['attrib']['type'] = 'text';
-				$d['cdrom_iso_path']['object']['attrib']['id']   = 'cdrom';
-				$d['cdrom_iso_path']['object']['attrib']['name'] = 'cdrom';
-
-				$d['cdrom_button']['static']                      = true;
-				$d['cdrom_button']['object']['type']              = 'htmlobject_input';
-				$d['cdrom_button']['object']['attrib']['type']    = 'button';
-				$d['cdrom_button']['object']['attrib']['name']    = 'cdrom_button';
-				$d['cdrom_button']['object']['attrib']['id']      = 'cdrom_button';
-				$d['cdrom_button']['object']['attrib']['css']     = 'browse-button';
-				$d['cdrom_button']['object']['attrib']['handler'] = 'onclick="filepicker.init(\'cdrom\'); return false;"';
-				$d['cdrom_button']['object']['attrib']['style']   = "display:none;";
-				$d['cdrom_button']['object']['attrib']['value']   = $this->lang['lang_browse'];
-				
-				$d['netboot_image'] = "";
-				
-			}
-
-			$mac = '';
-			if(isset($this->resource)) {
-				$this->resource->generate_mac();
-				$mac = $this->resource->mac;
-			}
-
-			$d['net0']['label']                        = $this->lang['lang_net_0'];
-			$d['net0']['object']['type']               = 'htmlobject_input';
-			$d['net0']['object']['attrib']['type']     = 'checkbox';
-			$d['net0']['object']['attrib']['id']       = 'net0';
-			$d['net0']['object']['attrib']['name']     = 'net0';
-			$d['net0']['object']['attrib']['value']    = 'enabled';
-			$d['net0']['object']['attrib']['checked']  = true;
-			$d['net0']['object']['attrib']['disabled'] = true;
-
-			$d['mac']['label']                         = $this->lang['form_mac'];
-			$d['mac']['required']                      = true;
-			$d['mac']['object']['type']                = 'htmlobject_input';
-			$d['mac']['object']['attrib']['name']      = 'mac';
-			$d['mac']['object']['attrib']['type']      = 'text';
-			$d['mac']['object']['attrib']['value']     = $mac;
-			$d['mac']['object']['attrib']['maxlength'] = 50;
-
-			$d['nic']['label']                         = $this->lang['form_netdevice'];
-			$d['nic']['required']                      = true;
-			$d['nic']['object']['type']                = 'htmlobject_select';
-			$d['nic']['object']['attrib']['name']      = 'nic';
-			$d['nic']['object']['attrib']['index']     = array(0,1);
-			$d['nic']['object']['attrib']['options']   = $nics;
-
-			if (in_array("openvswitch-manager", $this->plugins_enabled)) {
-				$d['ovs_ip0']['label']                        = $this->lang['form_ipaddress'];
-				$d['ovs_ip0']['object']['type']               = 'htmlobject_select';
-				$d['ovs_ip0']['object']['attrib']['index']    = array('value', 'label');
-				$d['ovs_ip0']['object']['attrib']['id']       = 'ovs_ip0';
-				$d['ovs_ip0']['object']['attrib']['name']     = 'ovs_ip0';
-				$d['ovs_ip0']['object']['attrib']['options']  = $ip_mgmt_list_per_user_arr;
-
-				$d['bridge'] = '';
-			
-			} else {
-				$d['bridge']['label']                       = $this->lang['form_bridge'];
-				$d['bridge']['required']                    = true;
-				$d['bridge']['object']['type']              = 'htmlobject_select';
-				$d['bridge']['object']['attrib']['name']    = 'bridge';
-				$d['bridge']['object']['attrib']['index']   = array(0,1);
-				$d['bridge']['object']['attrib']['options'] = $bridges;
-
-				$d['ovs_ip0'] = '';
-
-			}
-		
-			// net 1
-			if(isset($this->resource)) {
-				$this->resource->generate_mac();
-				$mac = $this->resource->mac;
-			}
-
-			$d['net1']['label']                       = $this->lang['lang_net_1'];
-			$d['net1']['object']['type']              = 'htmlobject_input';
-			$d['net1']['object']['attrib']['type']    = 'checkbox';
-			$d['net1']['object']['attrib']['id']      = 'net1';
-			$d['net1']['object']['attrib']['name']    = 'net1';
-			$d['net1']['object']['attrib']['value']   = 'enabled';
-			$d['net1']['object']['attrib']['handler'] = 'onchange="nettoggle(this);"';
-
-			$d['mac1']['label']                         = $this->lang['form_mac'];
-			$d['mac1']['object']['type']                = 'htmlobject_input';
-			$d['mac1']['object']['attrib']['name']      = 'mac1';
-			$d['mac1']['object']['attrib']['type']      = 'text';
-			$d['mac1']['object']['attrib']['value']     = $mac;
-			$d['mac1']['object']['attrib']['maxlength'] = 50;
-
-			$d['bridge1']['label']                       = $this->lang['form_bridge'];
-			$d['bridge1']['object']['type']              = 'htmlobject_select';
-			$d['bridge1']['object']['attrib']['name']    = 'bridge1';
-			$d['bridge1']['object']['attrib']['index']   = array(0,1);
-			$d['bridge1']['object']['attrib']['options'] = $bridges;
-
-			$d['nic1']['label']                         = $this->lang['form_netdevice'];
-			$d['nic1']['object']['type']                = 'htmlobject_select';
-			$d['nic1']['object']['attrib']['name']      = 'nic1';
-			$d['nic1']['object']['attrib']['index']     = array(0,1);
-			$d['nic1']['object']['attrib']['options']   = $nics;
-
-			if (in_array("openvswitch-manager", $this->plugins_enabled)) {
-				$d['ovs_ip1']['label']                        = $this->lang['form_ipaddress'];
-				$d['ovs_ip1']['object']['type']               = 'htmlobject_select';
-				$d['ovs_ip1']['object']['attrib']['index']    = array('value', 'label');
-				$d['ovs_ip1']['object']['attrib']['id']       = 'ovs_ip1';
-				$d['ovs_ip1']['object']['attrib']['name']     = 'ovs_ip1';
-				$d['ovs_ip1']['object']['attrib']['options']  = $ip_mgmt_list_per_user_arr;
-			} else {
-				$d['ovs_ip1'] = '';
-			}
-			
-			// net 2
-			if(isset($this->resource)) {
-				$this->resource->generate_mac();
-				$mac = $this->resource->mac;
-			}
-
-			$d['net2']['label']                     = $this->lang['lang_net_2'];
-			$d['net2']['object']['type']            = 'htmlobject_input';
-			$d['net2']['object']['attrib']['type']  = 'checkbox';
-			$d['net2']['object']['attrib']['id']    = 'net2';
-			$d['net2']['object']['attrib']['name']  = 'net2';
-			$d['net2']['object']['attrib']['value'] = 'enabled';
-			$d['net2']['object']['attrib']['handler'] = 'onchange="nettoggle(this);"';
-
-			$d['mac2']['label']                         = $this->lang['form_mac'];
-			$d['mac2']['object']['type']                = 'htmlobject_input';
-			$d['mac2']['object']['attrib']['name']      = 'mac2';
-			$d['mac2']['object']['attrib']['type']      = 'text';
-			$d['mac2']['object']['attrib']['value']     = $mac;
-			$d['mac2']['object']['attrib']['maxlength'] = 50;
-
-			$d['bridge2']['label']                       = $this->lang['form_bridge'];
-			$d['bridge2']['object']['type']              = 'htmlobject_select';
-			$d['bridge2']['object']['attrib']['name']    = 'bridge2';
-			$d['bridge2']['object']['attrib']['index']   = array(0,1);
-			$d['bridge2']['object']['attrib']['options'] = $bridges;
-
-			$d['nic2']['label']                         = $this->lang['form_netdevice'];
-			$d['nic2']['object']['type']                = 'htmlobject_select';
-			$d['nic2']['object']['attrib']['name']      = 'nic2';
-			$d['nic2']['object']['attrib']['index']     = array(0,1);
-			$d['nic2']['object']['attrib']['options']   = $nics;
-
-			if (in_array("openvswitch-manager", $this->plugins_enabled)) {
-				$d['ovs_ip2']['label']                        = $this->lang['form_ipaddress'];
-				$d['ovs_ip2']['object']['type']               = 'htmlobject_select';
-				$d['ovs_ip2']['object']['attrib']['index']    = array('value', 'label');
-				$d['ovs_ip2']['object']['attrib']['id']       = 'ovs_ip2';
-				$d['ovs_ip2']['object']['attrib']['name']     = 'ovs_ip2';
-				$d['ovs_ip2']['object']['attrib']['options']  = $ip_mgmt_list_per_user_arr;
-			} else {
-				$d['ovs_ip2'] = '';
-			}
-
-			// net 3
-			if(isset($this->resource)) {
-				$this->resource->generate_mac();
-				$mac = $this->resource->mac;
-			}
-
-			$d['net3']['label']                     = $this->lang['lang_net_3'];
-			$d['net3']['object']['type']            = 'htmlobject_input';
-			$d['net3']['object']['attrib']['type']  = 'checkbox';
-			$d['net3']['object']['attrib']['id']    = 'net3';
-			$d['net3']['object']['attrib']['name']  = 'net3';
-			$d['net3']['object']['attrib']['value'] = 'enabled';
-			$d['net3']['object']['attrib']['handler'] = 'onchange="nettoggle(this);"';
-
-			$d['mac3']['label']                         = $this->lang['form_mac'];
-			$d['mac3']['object']['type']                = 'htmlobject_input';
-			$d['mac3']['object']['attrib']['name']      = 'mac3';
-			$d['mac3']['object']['attrib']['type']      = 'text';
-			$d['mac3']['object']['attrib']['value']     = $mac;
-			$d['mac3']['object']['attrib']['maxlength'] = 50;
-
-			$d['bridge3']['label']                       = $this->lang['form_bridge'];
-			$d['bridge3']['object']['type']              = 'htmlobject_select';
-			$d['bridge3']['object']['attrib']['name']    = 'bridge3';
-			$d['bridge3']['object']['attrib']['index']   = array(0,1);
-			$d['bridge3']['object']['attrib']['options'] = $bridges;
-
-			$d['nic3']['label']                         = $this->lang['form_netdevice'];
-			$d['nic3']['object']['type']                = 'htmlobject_select';
-			$d['nic3']['object']['attrib']['name']      = 'nic3';
-			$d['nic3']['object']['attrib']['index']     = array(0,1);
-			$d['nic3']['object']['attrib']['options']   = $nics;
-
-			if (in_array("openvswitch-manager", $this->plugins_enabled)) {
-				$d['ovs_ip3']['label']                        = $this->lang['form_ipaddress'];
-				$d['ovs_ip3']['object']['type']               = 'htmlobject_select';
-				$d['ovs_ip3']['object']['attrib']['index']    = array('value', 'label');
-				$d['ovs_ip3']['object']['attrib']['id']       = 'ovs_ip3';
-				$d['ovs_ip3']['object']['attrib']['name']     = 'ovs_ip3';
-				$d['ovs_ip3']['object']['attrib']['options']  = $ip_mgmt_list_per_user_arr;
-			} else {
-				$d['ovs_ip3'] = '';
-			}
-
-			// net 4
-			if(isset($this->resource)) {
-				$this->resource->generate_mac();
-				$mac = $this->resource->mac;
-			}
-
-			$d['net4']['label']                     = $this->lang['lang_net_4'];
-			$d['net4']['object']['type']            = 'htmlobject_input';
-			$d['net4']['object']['attrib']['type']  = 'checkbox';
-			$d['net4']['object']['attrib']['name']  = 'net4';
-			$d['net4']['object']['attrib']['id']    = 'net4';
-			$d['net4']['object']['attrib']['value'] = 'enabled';
-			$d['net4']['object']['attrib']['handler'] = 'onchange="nettoggle(this);"';
-
-			$d['mac4']['label']                         = $this->lang['form_mac'];
-			$d['mac4']['object']['type']                = 'htmlobject_input';
-			$d['mac4']['object']['attrib']['name']      = 'mac4';
-			$d['mac4']['object']['attrib']['type']      = 'text';
-			$d['mac4']['object']['attrib']['value']     = $mac;
-			$d['mac4']['object']['attrib']['maxlength'] = 50;
-
-			$d['bridge4']['label']                       = $this->lang['form_bridge'];
-			$d['bridge4']['object']['type']              = 'htmlobject_select';
-			$d['bridge4']['object']['attrib']['name']    = 'bridge4';
-			$d['bridge4']['object']['attrib']['index']   = array(0,1);
-			$d['bridge4']['object']['attrib']['options'] = $bridges;
-
-			$d['nic4']['label']                         = $this->lang['form_netdevice'];
-			$d['nic4']['object']['type']                = 'htmlobject_select';
-			$d['nic4']['object']['attrib']['name']      = 'nic4';
-			$d['nic4']['object']['attrib']['index']     = array(0,1);
-			$d['nic4']['object']['attrib']['options']   = $nics;
-
-			if (in_array("openvswitch-manager", $this->plugins_enabled)) {
-				$d['ovs_ip4']['label']                        = $this->lang['form_ipaddress'];
-				$d['ovs_ip4']['object']['type']               = 'htmlobject_select';
-				$d['ovs_ip4']['object']['attrib']['index']    = array('value', 'label');
-				$d['ovs_ip4']['object']['attrib']['id']       = 'ovs_ip4';
-				$d['ovs_ip4']['object']['attrib']['name']     = 'ovs_ip4';
-				$d['ovs_ip4']['object']['attrib']['options']  = $ip_mgmt_list_per_user_arr;
-			} else {
-				$d['ovs_ip4'] = '';
-			}
-
-
-			// boot from
-			$d['boot_cd'] = '';
-			$d['boot_iso'] = '';
-			$d['boot_iso_path'] = '';
-			$d['boot_local'] = '';
-			$d['browse_button'] = '';
-			if($vmtype !== 'kvm-vm-net') {
-				$d['boot_cd']['label']                     = $this->lang['form_boot_cd'];
-				$d['boot_cd']['object']['type']            = 'htmlobject_input';
-				$d['boot_cd']['object']['attrib']['type']  = 'radio';
-				$d['boot_cd']['object']['attrib']['name']  = 'boot';
-				$d['boot_cd']['object']['attrib']['value'] = 'cdrom';
-
-				$d['boot_iso']['label']                     = $this->lang['form_boot_iso'];
-				$d['boot_iso']['object']['type']            = 'htmlobject_input';
-				$d['boot_iso']['object']['attrib']['type']  = 'radio';
-				$d['boot_iso']['object']['attrib']['id']    = 'boot_iso';
-				$d['boot_iso']['object']['attrib']['name']  = 'boot';
-				$d['boot_iso']['object']['attrib']['value'] = 'iso';
-
-				$d['boot_iso_path']['label']                    = $this->lang['form_iso_path'];
-				$d['boot_iso_path']['object']['type']           = 'htmlobject_input';
-				$d['boot_iso_path']['object']['attrib']['type'] = 'text';
-				$d['boot_iso_path']['object']['attrib']['id']   = 'iso_path';
-				$d['boot_iso_path']['object']['attrib']['name'] = 'iso_path';
-
-				$d['boot_local']['label']                       = $this->lang['form_boot_local'];
-				$d['boot_local']['object']['type']              = 'htmlobject_input';
-				$d['boot_local']['object']['attrib']['type']    = 'radio';
-				$d['boot_local']['object']['attrib']['name']    = 'boot';
-				$d['boot_local']['object']['attrib']['value']   = 'local';
-				$d['boot_local']['object']['attrib']['checked'] = true;
-
-				$d['browse_button']['static']                      = true;
-				$d['browse_button']['object']['type']              = 'htmlobject_input';
-				$d['browse_button']['object']['attrib']['type']    = 'button';
-				$d['browse_button']['object']['attrib']['name']    = 'browse_button';
-				$d['browse_button']['object']['attrib']['id']      = 'browsebutton';
-				$d['browse_button']['object']['attrib']['css']     = 'browse-button';
-				$d['browse_button']['object']['attrib']['handler'] = 'onclick="filepicker.init(\'iso_path\'); return false;"';
-				$d['browse_button']['object']['attrib']['style']   = "display:none;";
-				$d['browse_button']['object']['attrib']['value']   = $this->lang['lang_browse'];
-			}
-			$d['boot_net']['label']                     = $this->lang['form_boot_net'];
-			$d['boot_net']['object']['type']            = 'htmlobject_input';
-			$d['boot_net']['object']['attrib']['type']  = 'radio';
-			$d['boot_net']['object']['attrib']['name']  = 'boot';
-			$d['boot_net']['object']['attrib']['value'] = 'network';
-			if($vmtype === 'kvm-vm-net') {
-				$d['boot_net']['object']['attrib']['checked'] = true;
-			}
-
-			$d['vnc']['label']                         = $this->lang['form_vnc'];
-			$d['vnc']['required']                      = true;
-			$d['vnc']['object']['type']                = 'htmlobject_input';
-			$d['vnc']['object']['attrib']['name']      = 'vnc';
-			$d['vnc']['object']['attrib']['id']        = 'vnc';
-			$d['vnc']['object']['attrib']['type']      = 'password';
-			$d['vnc']['object']['attrib']['value']     = '';
-			$d['vnc']['object']['attrib']['maxlength'] = 50;
-
-			$d['vnc_1']['label']                         = $this->lang['form_vnc_repeat'];
-			$d['vnc_1']['required']                      = true;
-			$d['vnc_1']['object']['type']                = 'htmlobject_input';
-			$d['vnc_1']['object']['attrib']['name']      = 'vnc_1';
-			$d['vnc_1']['object']['attrib']['id']        = 'vnc_1';
-			$d['vnc_1']['object']['attrib']['value']     = '';
-			$d['vnc_1']['object']['attrib']['type']      = 'password';
-			$d['vnc_1']['object']['attrib']['maxlength'] = 50;
-
-			$d['vnc_keymap']['label']                       = $this->lang['form_vnc_keymap'];
-			$d['vnc_keymap']['object']['type']              = 'htmlobject_select';
-			$d['vnc_keymap']['object']['attrib']['name']    = 'vnc_keymap';
-			$d['vnc_keymap']['object']['attrib']['index']   = array(0,1);
-			$d['vnc_keymap']['object']['attrib']['options'] = $keymaps;
-
-			$form->add($d);
-			$response->form = $form;
-
-		} else {
-			$response->msg = $this->lang['error_no_bridge'];
-			$response->form = $form;
-		}
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.api.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.api.class.php
deleted file mode 100644
index e8dc456..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.api.class.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
- * kvm storage vm api
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_vm_api
-{
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param object $controller
-	 */
-	//--------------------------------------------
-	function __construct($controller) {
-		$this->controller = $controller;
-		$this->user       = $this->controller->user;
-		$this->html       = $this->controller->response->html;
-		$this->response   = $this->html->response();
-		$this->file       = $this->controller->file;
-		$this->admin      = $this->controller->openqrm->admin();
-
-		$id = $this->response->html->request()->get('appliance_id');
-		if($id === '') {
-			return false;
-		}
-		// set ENV
-		$this->response->params['appliance_id'] = $id;
-		$appliance = new appliance();
-		$resource  = new resource();
-
-		$appliance->get_instance_by_id($id);
-		$resource->get_instance_by_id($appliance->resources);
-
-		$this->resource  = $resource;
-		$this->appliance = $appliance;
-		#$this->statfile  = 'kvm-stat/'.$resource->id.'.pick_iso_config';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function action() {
-		$action = $this->html->request()->get($this->controller->actions_name);
-		switch( $action ) {
-			case 'filepicker':
-				$this->filepicker();
-			break;
-		}
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Filepicker
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function filepicker() {
-		$response = $this->response;
-		$iso_path = $response->html->request()->get('path');
-		if ($iso_path !== '') {
-
-			$command  = $this->controller->openqrm->get('basedir')."/plugins/kvm/bin/openqrm-kvm-vm iso";
-			$command .= ' -q '.$iso_path;
-			$command .= ' -u '.$this->admin->name.' -p '.$this->admin->password;
-			$command .= ' --openqrm-ui-user '.$this->user->name;
-			$command .= ' --openqrm-cmd-mode background';
-
-			$file = $this->controller->openqrm->get('webdir').'/plugins/kvm/kvm-stat/'.$this->resource->id.'.pick_iso_config';
-			if($this->file->exists($file)) {
-				$this->file->remove($file);
-			}
-			$this->resource->send_command($this->resource->ip, $command);
-			while (!$this->file->exists($file)) // check if the data file has been modified
-			{
-			  usleep(10000); // sleep 10ms to unload the CPU
-			  clearstatcache();
-			}
-			$lines = $this->file->get_contents($file);
-			$lines = explode("\n", $lines);
-
-			if(is_array($lines) && count($lines) > 1) {
-				$i = 0;
-				foreach($lines as $c) {
-					$tmp = explode('@', $c);
-					if($tmp[0] === 'P') {
-						$base = $tmp[1];
-					} else {
-						if(isset($tmp[1]) && $tmp[1] !== '.') {
-							$a  = $response->html->a();
-							$a->label = $tmp[1];
-							if($tmp['1'] === '..') {
-								if($base !== '/') {
-									$path = substr($base, 0, strrpos($base,'/'));
-									if($path === '') {
-										$path = '/';
-									}
-									$a->href = '#';
-									$a->handler = 'onclick="filepicker.browse(\''.$path.'\'); return false;"';
-									$a->css  = 'folder';
-									$body[$i]['file'] = $c;
-									$body[$i]['name'] = $a->get_string();
-									$i++;
-								}
-							} else {
-								if($base !== '/') {
-									$tmp[1] = '/'.$tmp[1];
-								}
-								if($tmp[0] === 'F') {
-									$a->handler = 'onclick="filepicker.insert(\''.$base.$tmp[1].'\'); return false;"';
-									$a->href = '#';
-									$a->css  = 'file';
-								}
-								if($tmp[0] === 'D') {
-									$a->href = '#';
-									$a->handler = 'onclick="filepicker.browse(\''.$base.$tmp['1'].'\'); return false;"';
-									$a->css  = 'folder';
-								}
-								$body[$i]['file'] = $c;
-								$body[$i]['name'] = $a->get_string();
-								$i++;
-							}
-						}
-					}
-				}
-			}
-			$table = $response->html->tablebuilder('kvm_vm_api', $response);
-
-			$head['file']['hidden']   = true;
-			$head['file']['sortable'] = false;
-			$head['name']['title'] = 'Name';
-			$head['name']['map'] = 'file';
-
-			$table->max                       = count($body);
-			$table->limit                       = count($body);
-			$table->offset                     = 0;
-			$table->order                     = 'ASC';
-			$table->form_action           = $response->html->thisfile;
-			$table->form_method         = 'GET';
-			$table->css                        = 'filepicker_table';
-			$table->border                   = 1;
-			$table->id                          = 'Table';
-			$table->head                     = $head;
-			$table->body                     = $body;
-			$table->sort                       = 'file';
-			$table->sort_form              = false;
-			$table->sort_link                = false;
-			$table->autosort                = true;
-
-			$table = $table->get_object();
-			unset($table->__elements['pageturn_head']);
-			unset($table->__elements[0]);
-
-			echo $table->get_string();
-		} else {
-			echo 'no';
-		}
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get progress
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function progress() {
-		$name = basename($this->response->html->request()->get('name'));
-		$file = $this->controller->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$name;
-		if($this->file->exists($file)) {
-			echo $this->file->get_contents($file);
-		} else {
-			header("HTTP/1.0 404 Not Found");
-		}
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.clone.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.clone.class.php
deleted file mode 100644
index 83abdf2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.clone.class.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-/**
- * kvm-vm clone VM
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_vm_clone
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_vm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_vm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_vm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_vm_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file                     = $openqrm->file();
-		$this->openqrm                  = $openqrm;
-		$this->user = $openqrm->user();
-		$id = $this->response->html->request()->get('appliance_id');
-		if($id === '') {
-			return false;
-		}
-		$vm = $this->response->html->request()->get('vm');
-		if($vm === '') {
-			return false;
-		}
-		$vm_mac = $this->response->html->request()->get('mac');
-		if($vm_mac === '') {
-			return false;
-		}
-		$this->vm = $vm;
-		$this->vm_mac = $vm_mac;
-		$this->response->add('vm', $this->vm);
-		$this->response->add('mac', $this->vm_mac);
-		$appliance = new appliance();
-		$resource  = new resource();
-		$appliance->get_instance_by_id($id);
-		$resource->get_instance_by_id($appliance->resources);
-		$this->resource  = $resource;
-		$this->appliance = $appliance;
-		$this->statfile  = $this->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$resource->id.'.vm_list';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->duplicate();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 2) {
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&resource_id='.$response->resource_id
-				);
-			} else {
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/kvm-vm-clone.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add(sprintf($this->lang['label'], $this->vm), 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * clone
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function duplicate() {
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			$mac_gen_resource = new resource();
-			$mac_gen_resource->generate_mac();
-			$name        = $form->get_request('name');
-			$command     = $this->openqrm->get('basedir').'/plugins/kvm/bin/openqrm-kvm-vm clone';
-			$command    .= ' -n '.$this->vm;
-			$command    .= ' -w '.$name;
-			$command    .= ' -m '.$mac_gen_resource->mac;
-			$command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-			$command .= ' --openqrm-ui-user '.$this->user->name;
-			$command .= ' --openqrm-cmd-mode regular';
-			$statfile = $this->statfile;
-			if ($this->file->exists($statfile)) {
-				$lines = explode("\n", $this->file->get_contents($statfile));
-				if(count($lines) >= 1) {
-					foreach($lines as $line) {
-						if($line !== '') {
-							$line = explode('@', $line);
-							$check = $line[1];
-							if($name === $check) {
-								$error = sprintf($this->lang['error_exists'], $name);
-							}
-						}
-					}
-				}
-			}
-			if(isset($error)) {
-				$response->error = $error;
-			} else {
-
-				$tables = $this->openqrm->get('table');
-				$id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$ip = "0.0.0.0";
-				$mac = $mac_gen_resource->mac;
-				// set resource type, get virt type from origin vm
-				$mac_gen_resource->get_instance_by_mac($this->vm_mac);
-				$virtualization = new virtualization();
-				$virtualization->get_instance_by_id($mac_gen_resource->vtype);
-				// send command to the openQRM-server
-				$openqrm = new openqrm_server();
-				$openqrm->send_command('openqrm_server_add_resource '.$id.' '.$mac.' '.$ip);
-				// add to openQRM database
-				$fields["resource_id"] = $id;
-				$fields["resource_ip"] = $ip;
-				$fields["resource_mac"] = $mac;
-				$fields["resource_localboot"] = 0;
-				$fields["resource_vtype"] = $virtualization->id;
-				$fields["resource_vhostid"] = $this->resource->id;
-				$this->resource->add($fields);
-				$this->resource->send_command($this->resource->ip, $command);
-				$response->resource_id = $id;
-
-				$response->msg = sprintf($this->lang['msg_cloned'], $this->vm, $name);
-			}
-
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'clone');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$d['name']['label']                             = $this->lang['form_name'];
-		$d['name']['required']                          = true;
-		$d['name']['validate']['regex']                 = '/^[a-z0-9._]+$/i';
-		$d['name']['validate']['errormsg']              = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                    = 'htmlobject_input';
-		$d['name']['object']['attrib']['name']          = 'name';
-		$d['name']['object']['attrib']['id']            = 'name';
-		$d['name']['object']['attrib']['type']          = 'text';
-		$d['name']['object']['attrib']['css']           = 'namegen';
-		$d['name']['object']['attrib']['customattribs'] = 'data-prefix="kvm" data-length="6"';
-		$d['name']['object']['attrib']['value']         = $this->vm.'c';
-		$d['name']['object']['attrib']['maxlength']     = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.controller.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.controller.class.php
deleted file mode 100644
index 8fdaf96..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.controller.class.php
+++ /dev/null
@@ -1,885 +0,0 @@
-<?php
-/**
- * KVM-VM Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_vm_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_vm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_vm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_vm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_vm_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array (
-		'tab' => 'Select KVM Host',
-		'label' => 'Select KVM Host Appliance',
-		'action_edit' => 'edit',
-		'table_name' => 'Name',
-		'table_id' => 'Id',
-		'table_recource' => 'Resource',
-		'table_type' => 'Type',
-		'table_deployment' => 'Deployment',
-		'title_vms' => 'Edit Virtual Machines',
-		'title_lvm' => 'Edit LVM Storage',
-		'title_bf' => 'Edit Blockfile Storage',
-		'title_glusterfs' => 'Edit GlusterFS Storage',
-		'error_no_host' => '<b>No KVM Host Appliance configured yet!</b><br><br>Please create a KVM Host Appliance first!',
-		'new' => 'New Appliance',
-		'network_manager' => 'Network',
-		'please_wait' => 'Loading VMs. Please wait ..',
-		'new_storage' => 'New Storage',
-	), 
-	'edit' => array (
-		'tab' => 'Select VM',
-		'label' => 'KVM VMs on KVM Host Appliance %s',
-		'lang_id' => 'ID',
-		'lang_name' => 'Name',
-		'lang_resource' => 'Resource',
-		'lang_state' => 'State',
-		'lang_vfree' => 'Free',
-		'lang_vsize' => 'Total',
-		'lang_password_show' => 'show password',
-		'lang_password_hide' => 'hide password',
-		'action_add_local_vm' => 'Add local VM',
-		'action_add_network_vm' => 'Add network VM',
-		'action_remove' => 'delete',
-		'action_stop' => 'stop',
-		'action_start' => 'start',
-		'action_reboot' => 'reboot',
-		'action_update' => 'update',
-		'action_console' => 'console',
-		'action_migrate' => 'migrate',
-		'action_clone' => 'clone',
-		'action_migrate_in_progress' => 'Migration in progress - Please wait',
-		'action_migrate_finished' => 'Migration finished!',
-		'table_state' => 'State',
-		'table_name' => 'Name',
-		'table_type' => 'Type',
-		'table_mac' => 'Mac',
-		'table_ram' => 'RAM',
-		'table_cpu' => 'CPU',
-		'table_nics' => 'NIC',
-		'table_id' => 'ID',
-		'table_ip' => 'IP',
-		'table_vnc' => 'VNC',
-		'table_vncpassword' => 'VNC password',
-		'table_appliance' => 'Server',
-		'table_kernel' => 'Kernel',
-		'table_image' => 'Image',
-		'table_storage' => 'Storage',
-		'error_no_host' => '<b>No KVM Host Appliance configured yet!</b><br><br>Please create a KVM Host Appliance first!',
-		'please_wait' => 'Loading VMs. Please wait ..',
-	),
-	'add' => array (
-		'tab' => 'Add VM',
-		'label' => 'Add new VM',
-		'lang_basic' => 'Basic',
-		'lang_hardware' => 'Hardware',
-		'lang_net' => 'Network',
-		'lang_net_0' => 'Network_0',
-		'lang_net_1' => 'Network_1',
-		'lang_net_2' => 'Network_2',
-		'lang_net_3' => 'Network_3',
-		'lang_net_4' => 'Network_4',
-		'lang_boot' => 'Boot from',
-		'lang_vnc' => 'VNC Password',
-		'lang_virtual_disk' => 'Virtual disk image',
-		'lang_browse' => 'browse',
-		'lang_browser' => 'Filepicker',
-		'lang_password_generate' => 'generate password',
-		'lang_password_show' => 'show password',
-		'lang_password_hide' => 'hide password',
-		'form_name' => 'Name',
-		'form_cpus' => 'CPU(s)',
-		'form_mac' => 'Mac',
-		'form_ipaddress' => 'IP Address',
-		'form_memory' => 'Memory',
-		'form_bridge' => 'Bridge',
-		'form_boot_cd' => 'CD',
-		'form_boot_iso' => 'Iso',
-		'form_iso_path' => 'Path',
-		'form_boot_net' => 'Net',
-		'form_boot_local' => 'Local',
-		'form_existing_disk' => 'Existing disk',
-		'form_enable' => 'enable',
-		'form_net_virtio' => 'Virtio',
-		'form_net_e1000' => 'E1000',
-		'form_net_rtl8139' => 'Rtl8139',
-		'form_netdevice' => 'Networkcard',
-		'form_disk_interface' => 'Disk Interface',
-		'form_swap' => 'Swap',
-		'form_disk' => 'Disk',
-		'form_cdrom' => 'Cdrom (iso)',
-		'form_vnc' => 'Password',
-		'form_vnc_repeat' => 'Password (repeat)',
-		'form_vnc_keymap' => 'VNC Keymap',
-		'action_add_vm_image' => 'Add a new VM Image',
-		'msg_added' => 'Added VM %s',
-		'error_exists' => 'VM %s already exists',
-		'error_name' => 'Name must be %s',
-		'error_memory' => 'Memory must be %s',
-		'error_mac' => 'Mac is not valid',
-		'error_bridge' => 'Bridge is not valid',
-		'error_nic' => 'Nic is not valid',
-		'error_boot' => 'Please select a boot device',
-		'error_iso_path' => 'Path must not be empty',
-		'error_vnc_password' => 'Password (repeat) does not match Password',
-		'error_vnc_password_count' => 'Password must have at least 6 chars',
-		'error_no_bridge' => 'Error: No network bridge found.',
-		'please_wait' => 'Adding VM. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'update' => array (
-		'tab' => 'Update VM',
-		'label' => 'Update VM %s',
-		'lang_basic' => 'Basic',
-		'lang_hardware' => 'Hardware',
-		'lang_virtual_disk' => 'Virtual disk image',
-		'lang_net' => 'Network',
-		'lang_net_0' => 'Network_0',
-		'lang_net_1' => 'Network_1',
-		'lang_net_2' => 'Network_2',
-		'lang_net_3' => 'Network_3',
-		'lang_net_4' => 'Network_4',
-		'lang_boot' => 'Boot from',
-		'lang_vnc' => 'VNC Password',
-		'lang_browse' => 'browse',
-		'lang_browser' => 'Filepicker',
-		'lang_password_generate' => 'generate password',
-		'lang_password_show' => 'show password',
-		'lang_password_hide' => 'hide password',
-		'form_name' => 'Name',
-		'form_cpus' => 'CPU(s)',
-		'form_mac' => 'Mac',
-		'form_memory' => 'Memory',
-		'form_bridge' => 'Bridge',
-		'form_boot_cd' => 'CD',
-		'form_boot_iso' => 'Iso',
-		'form_iso_path' => 'Path',
-		'form_boot_net' => 'Net',
-		'form_boot_local' => 'Local',
-		'form_enable' => 'enable',
-		'form_net_virtio' => 'Virtio',
-		'form_net_e1000' => 'E1000',
-		'form_net_rtl8139' => 'Rtl8139',
-		'form_netdevice' => 'Networkcard',
-		'form_disk_interface' => 'Disk Interface',
-		'form_swap' => 'Swap',
-		'form_disk' => 'Disk',
-		'form_cdrom' => 'Cdrom (iso)',
-		'form_vnc' => 'Password',
-		'form_vnc_repeat' => 'Password (repeat)',
-		'form_vnc_keymap' => 'VNC Keymap',
-		'msg_updated' => 'Updated VM %s',
-		'error_exists' => 'VM %s already exists',
-		'error_name' => 'Name must be %s',
-		'error_memory' => 'Memory must be %s',
-		'error_mac' => 'Mac is not valid',
-		'error_bridge' => 'Bridge is not valid',
-		'error_nic' => 'Nic is not valid',
-		'error_boot' => 'Please select a boot device',
-		'error_iso_path' => 'Path must not be empty',
-		'error_vnc_password' => 'Password (repeat) does not match Password',
-		'error_vnc_password_count' => 'Password must have at least 6 chars',
-		'error_no_bridge' => 'Error: No network bridge found.',
-		'please_wait' => 'Updating VM. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'clone' => array (
-		'label' => 'Clone VM %s',
-		'tab' => 'Clone VM',
-		'msg_cloned' => 'Cloned %s as %s',
-		'form_name' => 'Name',
-		'error_exists' => 'VM %s allready exists',
-		'error_name' => 'Name must be %s',
-		'please_wait' => 'Cloning VM. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'migrate' => array (
-		'label' => 'Migrate VM %s',
-		'tab' => 'Migrate VM',
-		'msg_migrated' => 'Migrated %s to %s',
-		'error_no_hosts' => 'No KVM Host found to migrate to',
-		'form_target' => 'Target Host Resource',
-		'please_wait' => 'Migrating VM. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'start' => array (
-		'msg_started' => 'Started VM %s',
-	),
-	'stop' => array (
-		'msg_stoped' => 'Stopped VM %s',
-	),
-	'reboot' => array (
-		'msg_rebooted' => 'Rebooted VM %s',
-	),
-	'remove' => array (
-		'label' => 'Delete VM(s)',
-		'msg_removed' => 'Deleted VM %s',
-		'msg_vm_resource_still_in_use' => 'VM %s resource id %s is still in use by appliance(s) %s',
-		'please_wait' => 'Removing VM(s). Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->get('user');
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/kvm/lang", 'kvm-vm.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/kvm/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "edit";
-		}
-		if($this->action !== 'select') {
-			$this->response->params['appliance_id'] = $this->response->html->request()->get('appliance_id');
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'edit':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-			break;
-			case 'reload':
-				$this->action = 'edit';
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-				$this->reload();
-			break;
-			case 'add':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->add(true);
-			break;
-			case 'update':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->update(true);
-			break;
-			case 'clone':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->duplicate(true);
-			break;
-			case 'migrate':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->migrate(true);
-			break;
-			case $this->lang['edit']['action_remove']:
-			case 'remove':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->remove(true);
-			break;
-			case $this->lang['edit']['action_start']:
-			case 'start':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->start(true);
-			break;
-			case $this->lang['edit']['action_stop']:
-			case 'stop':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->stop(true);
-			break;
-			case $this->lang['edit']['action_reboot']:
-			case 'reboot':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->reboot(true);
-			break;
-			case 'sysinfo':
-				$content[] = $this->select(false);
-				$content[] = $this->sysinfo(true);
-			break;
-			// to pick an iso image for boot
-			case 'iso':
-				$content[] = $this->iso(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->rootdir.'/plugins/kvm/class/kvm-vm.api.class.php');
-		$controller = new kvm_vm_api($this);
-		$controller->action();
-	}
-
-	
-	//--------------------------------------------
-	/**
-	 * Select KVM VM Host
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm-vm.select.class.php');
-			$controller = new kvm_vm_select($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Edit KVM-VM
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function edit( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			if($this->reload()) {
-				require_once($this->rootdir.'/plugins/kvm/class/kvm-vm.edit.class.php');
-				$controller                  = new kvm_vm_edit($this->openqrm, $this->response);
-				$controller->actions_name    = $this->actions_name;
-				$controller->tpldir          = $this->tpldir;
-				$controller->message_param   = $this->message_param;
-				$controller->identifier_name = $this->identifier_name;
-				$controller->prefix_tab      = $this->prefix_tab;
-				$controller->lang            = $this->lang['edit'];
-				$data = $controller->action();
-			}
-		}
-		$content['label']   = $this->lang['edit']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'edit' );
-		$content['onclick'] = false;
-		if($this->action === 'edit'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Add new VM
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function add( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			if($this->reload() && $this->reload_bridges()) {
-				require_once($this->rootdir.'/plugins/kvm/class/kvm-vm.add.class.php');
-				$controller                = new kvm_vm_add($this->openqrm, $this->response, $this);
-				$controller->actions_name  = $this->actions_name;
-				$controller->tpldir        = $this->tpldir;
-				$controller->message_param = $this->message_param;
-				$controller->lang          = $this->lang['add'];
-				$controller->rootdir       = $this->rootdir;
-				$controller->prefix_tab    = $this->prefix_tab;
-				$data = $controller->action();
-			}
-		}
-		$content['label']   = $this->lang['add']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'add' );
-		$content['onclick'] = false;
-		if($this->action === 'add'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Update VM
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function update( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			if($this->reload() && $this->reload_bridges()) {
-				require_once($this->rootdir.'/plugins/kvm/class/kvm-vm.update.class.php');
-				$controller                = new kvm_vm_update($this->openqrm, $this->response);
-				$controller->actions_name  = $this->actions_name;
-				$controller->tpldir        = $this->tpldir;
-				$controller->message_param = $this->message_param;
-				$controller->lang          = $this->lang['update'];
-				$controller->rootdir       = $this->rootdir;
-				$controller->prefix_tab    = $this->prefix_tab;
-				$data = $controller->action();
-			}
-		}
-		$content['label']   = $this->lang['update']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'update' );
-		$content['onclick'] = false;
-		if($this->action === 'update'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Clone VM
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function duplicate( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			if($this->reload()) {
-				require_once($this->rootdir.'/plugins/kvm/class/kvm-vm.clone.class.php');
-				$controller                  = new kvm_vm_clone($this->openqrm, $this->response);
-				$controller->actions_name    = $this->actions_name;
-				$controller->tpldir          = $this->tpldir;
-				$controller->message_param   = $this->message_param;
-				$controller->identifier_name = $this->identifier_name;
-				$controller->lang            = $this->lang['clone'];
-				$controller->rootdir         = $this->rootdir;
-				$controller->prefix_tab      = $this->prefix_tab;
-				$data = $controller->action();
-			}
-		}
-		$content['label']   = $this->lang['clone']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'clone' );
-		$content['onclick'] = false;
-		if($this->action === 'clone'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Migrate VM
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function migrate( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm-vm.migrate.class.php');
-			$controller                  = new kvm_vm_migrate($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['migrate'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['migrate']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'migrate' );
-		$content['onclick'] = false;
-		if($this->action === 'migrate'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Remove VM
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function remove( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm-vm.remove.class.php');
-			$controller                  = new kvm_vm_remove($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['remove'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Remove';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'remove' );
-		$content['onclick'] = false;
-		if($this->action === 'remove' || $this->action === $this->lang['edit']['action_remove']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Start VM
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function start( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm-vm.start.class.php');
-			$controller                  = new kvm_vm_start($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['start'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Start';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'start' );
-		$content['onclick'] = false;
-		if($this->action === 'start' || $this->action === $this->lang['edit']['action_start']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Stop VM
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function stop( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm-vm.stop.class.php');
-			$controller                  = new kvm_vm_stop($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['stop'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Stop';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'stop' );
-		$content['onclick'] = false;
-		if($this->action === 'stop' || $this->action === $this->lang['edit']['action_stop']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Reboot VM
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function reboot( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm-vm.reboot.class.php');
-			$controller                  = new kvm_vm_reboot($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['reboot'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Reboot';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'reboot' );
-		$content['onclick'] = false;
-		if($this->action === 'reboot' || $this->action === $this->lang['edit']['action_reboot']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Pick iso
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function iso( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-		    require_once($this->rootdir.'/plugins/kvm/class/kvm-vm.iso.class.php');
-		    $controller                  = new kvm_vm_iso($this->openqrm, $this->response);
-		    $controller->actions_name    = $this->actions_name;
-		    $controller->tpldir          = $this->tpldir;
-		    $controller->message_param   = $this->message_param;
-		    $controller->identifier_name = $this->identifier_name;
-		    $controller->lang            = array();
-		    $controller->rootdir         = $this->rootdir;
-		    $controller->prefix_tab      = $this->prefix_tab;
-		    $data = $controller->action();
-		}
-		$content['label']   = 'Pick ISO Image';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'iso' );
-		$content['onclick'] = false;
-		if($this->action === 'iso'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Sysinfo
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function sysinfo( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm-vm.sysinfo.class.php');
-			$controller                  = new kvm_vm_sysinfo($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = array();
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Sysinfo';
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'sysinfo' );
-		$content['onclick'] = false;
-		if($this->action === 'sysinfo'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Reload VMs
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function reload() {
-		$OPENQRM_SERVER_BASE_DIR = $this->openqrm->get('basedir');
-		$command  = $OPENQRM_SERVER_BASE_DIR.'/plugins/kvm/bin/openqrm-kvm-vm post_vm_list';
-		$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-		$command .= ' --openqrm-ui-user '.$this->user->name;
-		$command .= ' --openqrm-cmd-mode background';
-		$id = $this->response->html->request()->get('appliance_id');
-		$appliance = new appliance();
-		$appliance->get_instance_by_id($id);
-		$resource = new resource();
-		$resource->get_instance_by_id($appliance->resources);
-		$file = $OPENQRM_SERVER_BASE_DIR.'/plugins/kvm/web/kvm-stat/'.$resource->id.'.vm_list';
-		if($this->file->exists($file)) {
-			$this->file->remove($file);
-		}
-		$resource->send_command($resource->ip, $command);
-		while (!$this->file->exists($file)) // check if the data file has been modified
-		{
-		  usleep(10000); // sleep 10ms to unload the CPU
-		  clearstatcache();
-		}
-		return true;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Reload Bridges
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function reload_bridges() {
-		$OPENQRM_SERVER_BASE_DIR = $this->openqrm->get('basedir');
-		$command  = $OPENQRM_SERVER_BASE_DIR.'/plugins/kvm/bin/openqrm-kvm-vm post_bridge_config';
-		$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-		$command .= ' --openqrm-ui-user '.$this->user->name;
-		$command .= ' --openqrm-cmd-mode background';
-		$id = $this->response->html->request()->get('appliance_id');
-		$appliance = new appliance();
-		$appliance->get_instance_by_id($id);
-		$resource = new resource();
-		$resource->get_instance_by_id($appliance->resources);
-		$file = $OPENQRM_SERVER_BASE_DIR.'/plugins/kvm/web/kvm-stat/'.$resource->id.'.bridge_config';
-		if($this->file->exists($file)) {
-			$this->file->remove($file);
-		}
-		$resource->send_command($resource->ip, $command);
-		while (!$this->file->exists($file)) // check if the data file has been modified
-		{
-		  usleep(10000); // sleep 10ms to unload the CPU
-		  clearstatcache();
-		}
-		return true;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.edit.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.edit.class.php
deleted file mode 100644
index 0767dd3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.edit.class.php
+++ /dev/null
@@ -1,444 +0,0 @@
-<?php
-/**
- * kvm-vm Edit VM
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_vm_edit
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_vm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_vm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_vm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_vm_identifier';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file                     = $openqrm->file();
-		$this->openqrm                  = $openqrm;
-		$this->response->add('appliance_id', $this->response->html->request()->get('appliance_id'));
-	}
-
-	//--------------------------------------------
-	/**
-	 * Init
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function init() {
-		$id = $this->response->html->request()->get('appliance_id');
-		if($id === '') {
-			return false;
-		}
-		$appliance  = new appliance();
-		$resource   = new resource();
-		$appliance->get_instance_by_id($id);
-		$resource->get_instance_by_id($appliance->resources);
-		$this->resource  = $resource;
-		$this->appliance = $appliance;
-		$this->statfile  = $this->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$resource->id.'.vm_list';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$this->init();
-		$data = $this->edit();
-		if($data !== false) {
-			$t = $this->response->html->template($this->tpldir.'/kvm-vm-edit.tpl.php');
-			$t->add($this->response->html->thisfile, "thisfile");
-			$t->add($data);
-			$t->add($this->lang['lang_id'], 'lang_id');
-			$t->add($this->lang['lang_name'], 'lang_name');
-			$t->add($this->lang['lang_resource'], 'lang_resource');
-			$t->add($this->lang['lang_state'], 'lang_state');
-			$t->add($this->lang['lang_password_show'], 'lang_password_show');
-			$t->add($this->lang['lang_password_hide'], 'lang_password_hide');
-			$t->add(sprintf($this->lang['label'], $data['name']), 'label');
-			$t->add($this->openqrm->get('baseurl'), 'baseurl');
-			return $t;
-		} else {
-			$msg = sprintf($this->lang['error_no_host'], $this->response->html->request()->get('appliance_id'));
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $msg)
-			);
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return array|false
-	 */
-	//--------------------------------------------
-	function edit() {
-		$resource_icon_default = "/img/resource.png";
-		$storage_icon = "/plugins/kvm/img/plugin.png";
-		//$state_icon = $this->openqrm->get('baseurl')."/img/".$this->resource->state.".png";
-		if ($this->file->exists($this->openqrm->get('webdir').$storage_icon)) {
-			$resource_icon_default = $storage_icon;
-		}
-		$resource_icon_default = $this->openqrm->get('baseurl').$resource_icon_default;
-		// check if we have a plugin implementing the remote console
-		$remote_console = false;
-		$plugin = new plugin();
-		$enabled_plugins = $plugin->enabled();
-		foreach ($enabled_plugins as $index => $plugin_name) {
-			//$plugin_remote_console_running = $this->openqrm->get('webdir')."/plugins/".$plugin_name."/.running";
-			$plugin_remote_console_hook = $this->openqrm->get('webdir')."/plugins/".$plugin_name."/openqrm-".$plugin_name."-remote-console-hook.php";
-			if ($this->file->exists($plugin_remote_console_hook)) {
-				require_once "$plugin_remote_console_hook";
-				$link_function = str_replace("-", "_", "openqrm_"."$plugin_name"."_remote_console");
-				if(function_exists($link_function)) {
-					$remote_functions[] = $link_function;
-					$remote_console = true;
-				}
-			}
-		}
-		// prepare list of all Host resource id for the migration select
-		// we need a select with the ids/ips from all resources which
-		// are used by appliances with kvm capabilities
-		$kvm_hosts = array();
-		$appliance_list = new appliance();
-		$appliance_list_array = $appliance_list->get_list();
-		foreach ($appliance_list_array as $index => $app) {
-			$appliance_kvm_host_check = new appliance();
-			$appliance_kvm_host_check->get_instance_by_id($app["value"]);
-			// only active appliances
-			if ((!strcmp($appliance_kvm_host_check->state, "active")) || ($appliance_kvm_host_check->resources == 0)) {
-				$virtualization = new virtualization();
-				$virtualization->get_instance_by_id($appliance_kvm_host_check->virtualization);
-				if ((!strcmp($virtualization->type, "kvm")) && (!strstr($virtualization->type, "kvm-vm"))) {
-					$kvm_host_resource = new resource();
-					$kvm_host_resource->get_instance_by_id($appliance_kvm_host_check->resources);
-					// exclude source host
-					#if ($kvm_host_resource->id == $this->resource->id) {
-					#	continue;
-					#}
-					// only active appliances
-					if (!strcmp($kvm_host_resource->state, "active")) {
-						$migration_select_label = "Res. ".$kvm_host_resource->id."/".$kvm_host_resource->ip;
-						$kvm_hosts[] = array("value"=>$kvm_host_resource->id, "label"=> $migration_select_label,);
-					}
-				}
-			}
-		}
-
-		$d['state'] = '<span class="pill '.$this->resource->state.'">'.$this->resource->state.'</span>';
-		$d['resource'] = $this->resource->id.' / '.$this->resource->ip;
-		$d['name'] = $this->appliance->name;
-		$d['id'] = $this->appliance->id;
-
-		$a = $this->response->html->a();
-		$a->label   = $this->lang['action_add_local_vm'];
-		$a->css     = 'add';
-		$a->handler = 'onclick="wait();"';
-		$a->href    = $this->response->get_url($this->actions_name, "add").'&vmtype=kvm-vm-local';
-		$d['add_local_vm']   = $a->get_string();
-
-		// only show network deployment VMs if dhcpd is enabled
-		$plugin = $this->openqrm->plugin();
-		$enabled_plugins = $plugin->enabled();
-		if (in_array("dhcpd", $enabled_plugins)) {
-			$a = $this->response->html->a();
-			$a->label   = $this->lang['action_add_network_vm'];
-			$a->css     = 'add';
-			$a->handler = 'onclick="wait();"';
-			$a->href    = $this->response->get_url($this->actions_name, "add").'&vmtype=kvm-vm-net';
-			$d['add_network_vm']   = $a->get_string();
-		} else {
-			$d['add_network_vm']   = '';
-		}
-
-		$body = array();
-		$identifier_disabled = array();
-		$file = $this->statfile;
-		if($this->file->exists($file)) {
-			$lines = explode("\n", $this->file->get_contents($file));
-			if(count($lines) >= 1) {
-				$i = 0;
-				foreach($lines as $line) {
-					if($line !== '') {
-						$line = explode('@', $line);
-						
-						$state = $line[0];
-						$name = $line[1];
-						$mac = $line[2];
-
-						$resource = new resource();
-						$resource->get_instance_by_mac($mac);
-						if ($resource->vhostid != $this->resource->id) {
-							continue;
-						}
-						$res_virtualization = new virtualization();
-						$res_virtualization->get_instance_by_id($resource->vtype);
-
-						$update = '';
-						$a = $this->response->html->a();
-						$a->title   = $this->lang['action_update'];
-						$a->label   = $this->lang['action_update'];
-						$a->handler = 'onclick="wait();"';
-						$a->css     = 'edit';
-						$a->href    = $this->response->get_url($this->actions_name, "update").'&vm='.$name.'&vmtype='.$res_virtualization->type;
-						$update_link = $a->get_string();
-
-						$clone = '';
-						$a = $this->response->html->a();
-						$a->title   = $this->lang['action_clone'];
-						$a->label   = $this->lang['action_clone'];
-						$a->handler = 'onclick="wait();"';
-						$a->css     = 'clone';
-						$a->href    = $this->response->get_url($this->actions_name, "clone").'&vm='.$name.'&mac='.$mac;
-						$clone_link	= $a->get_string();
-						
-						if ($res_virtualization->type == 'kvm-vm-local') {
-							if(($state === '0') && ($resource->image === 'idle')) {
-								$update = $update_link;
-								$clone = $clone_link;
-							}
-						}
-						if ($res_virtualization->type == 'kvm-vm-net') {
-							if(($state !== '2') && ($resource->image === 'idle')) {
-								$update = $update_link;
-								$clone = $clone_link;
-							}
-						}
-						
-						$migrate = '';
-						$a = $this->response->html->a();
-						$a->title   = $this->lang['action_migrate'];
-						$a->label   = $this->lang['action_migrate'];
-						$a->handler = 'onclick="wait();"';
-						$a->css     = 'migrate';
-						$a->href    = $this->response->get_url($this->actions_name, "migrate").'&vm='.$name.'&mac='.$mac;
-						if(count($kvm_hosts) >= 1 && $state === '1') {
-							$migrate    = $a->get_string();
-						}
-
-						$vnc_password_input = "<input type='password' id='vm_vncpasswd_".$resource->id."' name='vm_vncpasswd' class='vm_vncpasswd' size='10' maxlength='20' value='".$line[6]."'>";
-						$vnc_password_input .= "&nbsp<input type='button' id='passtoggle_".$resource->id."' name='vm_vnctoggle' class='vm_vnctoggle' onclick='passgen.toggle(".$resource->id."); return false;' class='password-button' value='".$this->lang['lang_password_show']."'>";
-						
-						
-						$data  = '<b>'.$this->lang['table_id'].'</b>: '.$resource->id.'<br>';
-						$data .= '<b>'.$this->lang['table_name'].'</b>: '.$name.'<br>';
-						$data .= '<b>'.$this->lang['table_type'].'</b>: '.$res_virtualization->name.'<br>';
-						$data .= '<b>'.$this->lang['table_ip'].'</b>: '.$resource->ip.'<br>';
-						$data .= '<b>'.$this->lang['table_mac'].'</b>: '.$mac.'<br>';
-						$data .= '<b>'.$this->lang['table_cpu'].'</b>: '.$line[3].'<br>';
-						$data .= '<b>'.$this->lang['table_ram'].'</b>: '.$line[4].'<br>';
-						$data .= '<b>'.$this->lang['table_nics'].'</b>: '.$resource->nics;
-
-						$appliance = new appliance();
-						$appliance->get_instance_by_virtualization_and_resource($resource->vtype, $resource->id);
-						$server = array();
-						$server[0] = '';
-						$server[1] = '1000000000000000000000000';
-						if($appliance->id !== '') {
-							$kernel = new kernel();
-							$kernel->get_instance_by_id($appliance->kernelid);
-							$image = new image();
-							$image->get_instance_by_id($appliance->imageid);
-							$storage = new storage();
-							$storage->get_instance_by_id($image->storageid);
-
-							$s  = '<b>'.$this->lang['table_appliance'].'</b>: '.$appliance->id.'<br>';
-							$s .= '<b>'.$this->lang['table_name'].'</b>: '.$appliance->name.'<br>';
-							$s .= '<b>'.$this->lang['table_kernel'].'</b>: '.$kernel->name.'<br>';
-							$s .= '<b>'.$this->lang['table_image'].'</b>: '.$image->name.'<br>';
-							$s .= '<b>'.$this->lang['table_storage'].'</b>: '.$storage->name.'<br><br>';
-
-							$s .= '<b>'.$this->lang['table_vnc'].'</b>: '.$line[5].'<br>';
-							$s .= '<b>'.$this->lang['table_vncpassword'].'</b>: '.$vnc_password_input.'<br>';
-							
-							
-							$server[0] = $s;
-							$server[1] = $appliance->id;
-						}
-
-						$console = '';
-						if($state === '2') {
-							$t = $this->response->html->template($this->openqrm->get('webdir').'/js/openqrm-progressbar.js');
-							$identifier_disabled[] = $name;
-							// progressbar
-							$t->add(uniqid('b'), 'id');
-							$t->add($this->openqrm->get('baseurl').'/api.php?action=plugin&plugin=kvm&controller=kvm-vm&kvm_vm_action=progress&name='.$name.'.vm_migration_progress', 'url');
-							$t->add($this->lang['action_migrate_in_progress'], 'lang_in_progress');
-							$t->add($this->lang['action_migrate_finished'], 'lang_finished');
-							$console = $t->get_string();
-						} else {
-							if($remote_console === true && $resource->imageid !== 1 && $state === '1') {
-								foreach($remote_functions as $function) {
-									$a = $function($resource->id);
-									if(is_object($a)) {
-										$console .= $a->get_string();
-									}
-								}
-							}
-						}
-
-						$state = array();
-						$state[0] = '<span class="pill idle">idle</span>';
-						$state[1] = 'i';
-						if(($line[0] === '1') && ($resource->image !== 'idle')) {
-							$state[0] = '<span class="pill active">active</span>';
-							$state[1] = 'a';
-						}
-						if (($res_virtualization->type == 'kvm-vm-net') && ($line[0] === '0')) {
-							$state[0] = '<span class="pill off">off</span>';
-							$state[1] = 'o';
-						}
-						
-						
-						$action = '';
-						if(!in_array($name, $identifier_disabled)) {
-							$action = $update.$clone.$migrate;
-						}
-
-						$body[$i] = array(
-							'state' => $state[0],
-							'state_s' => $state[1],
-							'name' => $name,
-							'id' => $resource->id,
-							'mac' => $mac,
-							'cpu' => $line[3],
-							'ram' => $line[4],
-							'ip' => $resource->ip,
-							'vnc' => $line[5],
-							'data' => $data,
-							'appliance' => $server[0],
-							'appliance_s' => $server[1],
-							'plugins' => $console,
-							'action' => $action,
-						);
-					}
-					$i++;
-				}
-			}
-		}
-
-		$h['state']['title'] = $this->lang['table_state'];
-		$h['state']['sortable'] = false;
-		$h['state_s']['title'] = $this->lang['table_state'];
-		$h['state_s']['sortable'] = true;
-		$h['state_s']['hidden'] = true;
-		$h['id']['title'] = $this->lang['table_id'];
-		$h['id']['hidden'] = true;
-		$h['name']['title'] = $this->lang['table_name'];
-		$h['name']['hidden'] = true;
-		$h['ip']['title'] = $this->lang['table_ip'];
-		$h['ip']['hidden'] = true;
-		$h['mac']['title'] = $this->lang['table_mac'];
-		$h['mac']['hidden'] = true;
-		$h['vnc']['title'] = $this->lang['table_vnc'];
-		$h['vnc']['hidden'] = true;
-		$h['cpu']['title'] = $this->lang['table_cpu'];
-		$h['cpu']['hidden'] = true;
-		$h['ram']['title'] = $this->lang['table_ram'];
-		$h['ram']['hidden'] = true;
-		$h['nics']['title'] = $this->lang['table_nics'];
-		$h['nics']['hidden'] = true;
-		$h['data']['title'] =  '&#160;';
-		$h['data']['sortable'] = false;
-		$h['appliance']['title'] =  '&#160;';
-		$h['appliance']['sortable'] = false;
-		$h['appliance_s']['title'] =  $this->lang['table_appliance'];
-		$h['appliance_s']['sortable'] = true;
-		$h['appliance_s']['hidden'] = true;
-		$h['plugins']['title'] = '&#160;';
-		$h['plugins']['sortable'] = false;
-		$h['action']['title'] = '&#160;';
-		$h['action']['sortable'] = false;
-	
-		$table = $this->response->html->tablebuilder('kvm_vm_edit', $this->response->get_array($this->actions_name, 'edit'));
-		$table->sort            = 'name';
-		$table->limit           = 10;
-		$table->offset          = 0;
-		$table->order           = 'ASC';
-		$table->max             = count($body);
-		$table->autosort        = true;
-		$table->sort_link       = false;
-		$table->id              = 'Tabelle';
-		$table->css             = 'htmlobject_table';
-		$table->border          = 1;
-		$table->cellspacing     = 0;
-		$table->cellpadding     = 3;
-		$table->form_action     = $this->response->html->thisfile;
-		$table->head            = $h;
-		$table->body            = $body;
-		$table->identifier      = 'name';
-		$table->identifier_name = $this->identifier_name;
-		$table->identifier_disabled = $identifier_disabled;
-		$table->actions_name    = $this->actions_name;
-		$table->actions         = array(
-				array('start' => $this->lang['action_start']),
-				array('stop' => $this->lang['action_stop']),
-				array('reboot' => $this->lang['action_reboot']),
-				array('remove' => $this->lang['action_remove'])
-			);
-
-		$d['table'] = $table->get_string();
-		return $d;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.iso.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.iso.class.php
deleted file mode 100644
index 51fbe89..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.iso.class.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-/**
- * kvm-vm ISO
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_vm_iso
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_vm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_vm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_vm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_vm_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-		$this->user	= $openqrm->user();
-		$id = $this->response->html->request()->get('appliance_id');
-		if($id === '') {
-			return false;
-		}
-		$appliance = new appliance();
-		$resource  = new resource();
-		$appliance->get_instance_by_id($id);
-		$resource->get_instance_by_id($appliance->resources);
-		$this->resource  = $resource;
-		$this->appliance = $appliance;
-		$this->statfile  = $this->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$resource->id.'.pick_iso_config';
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-//		$response = $this->iso();
-
-		#$this->response->redirect(
-		#	$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response)
-		#);
-//		echo $response;
-
-		$this->iso();
-	}
-
-	//--------------------------------------------
-	/**
-	 * ISO
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 *
-	 *
-	 * for testing
-	 * http://cloud/openqrm/base/plugins/kvm/index-vm.php?appliance_id=&kvm_vm_action=iso&appliance_id=2&path=/tmp
-	 *
-	 */
-	//--------------------------------------------
-	function iso() {
-		$response = $this->response;
-
-		$iso_path = $response->html->request()->get('path');
-
-		// TODO better validation
-		if ($iso_path !== '') {
-
-		    $command  = $this->openqrm->get('basedir')."/plugins/kvm/bin/openqrm-kvm-vm iso";
-		    $command .= ' -q '.$iso_path;
-		    $command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-			$command .= ' --openqrm-ui-user '.$this->user->name;
-			$command .= ' --openqrm-cmd-mode background';
-
-		    $file = $this->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$this->resource->id.'.pick_iso_config';
-		    if($this->file->exists($file)) {
-			    $this->file->remove($file);
-		    }
-		    $this->resource->send_command($this->resource->ip, $command);
-		    while (!$this->file->exists($file)) // check if the data file has been modified
-		    {
-		      usleep(10000); // sleep 10ms to unload the CPU
-		      clearstatcache();
-		    }
-			$lines = $this->file->get_contents($file);
-			$lines = explode("\n", $lines);
-
-			if(is_array($lines) && count($lines) > 1) {
-				$i = 0;
-				foreach($lines as $c) {
-					$tmp = explode('@', $c);
-					if($tmp[0] === 'P') {
-						$base = $tmp[1];
-					} else {
-						if($tmp[1] !== '.') {
-							$a  = $response->html->a();
-							$a->label = $tmp[1];
-							if($tmp['1'] === '..') {
-								if($base !== '/') {
-									$path = substr($base, 0, strrpos($base,'/'));
-									if($path === '') {
-										$path = '/';
-									}
-									$a->href = $response->get_url($this->actions_name, 'iso' ).'&path='.$path;
-									$a->css  = 'folder';
-									$body[$i]['file'] = $c;
-									$body[$i]['name'] = $a->get_string();
-									$i++;
-								}
-							} else {
-								if($tmp[0] === 'F') {
-									$a->handler = 'onclick="alert(\''.$base.'/'.$tmp[1].'\');"';
-									$a->css  = 'file';
-								}
-								if($tmp[0] === 'D') {
-									$a->href = $response->get_url($this->actions_name, 'iso' ).'&path='.$base.'/'.$tmp['1'];
-									$a->css  = 'folder';
-								}
-								$body[$i]['file'] = $c;
-								$body[$i]['name'] = $a->get_string();
-								$i++;
-							}
-						}
-					}
-				}
-			}
-
-
-			$table = $response->html->tablebuilder('kvm_vm_iso', $response);
-
-			$head['file']['hidden']   = true;
-			$head['file']['sortable'] = false;
-			$head['name']['title'] = 'Name';
-			$head['name']['map'] = 'file';
-
-			$table->max                       = count($body);
-			$table->limit                       = count($body);
-			$table->offset                     = 0;
-			$table->order                     = 'ASC';
-			$table->form_action           = $html->thisfile;
-			$table->form_method         = 'GET';
-			$table->css                        = 'htmlobject_table';
-			$table->border                   = 1;
-			$table->id                          = 'Table';
-			$table->head                     = $head;
-			$table->body                     = $body;
-			$table->sort                       = 'file';
-			$table->sort_form              = false;
-			$table->sort_link                = false;
-			$table->autosort                = true;
-
-			$table = $table->get_object();
-			unset($table->__elements['pageturn_head']);
-			unset($table->__elements[0]);
-
-
-			echo $table->get_string();
-
-
-		} else {
-		    echo 'no';
-		}		
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.migrate.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.migrate.class.php
deleted file mode 100644
index 842af66..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.migrate.class.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-/**
- * KVM-vm migrate VM
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_vm_migrate
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_vm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_vm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_vm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_vm_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file                     = $openqrm->file();
-		$this->openqrm                  = $openqrm;
-		$this->user						= $openqrm->user();
-		$id = $this->response->html->request()->get('appliance_id');
-		if($id === '') {
-			return false;
-		}
-		$vm = $this->response->html->request()->get('vm');
-		if($vm === '') {
-			return false;
-		}
-		$this->vm = $vm;
-		$this->response->params['vm'] = $this->vm;
-		$mac = $this->response->html->request()->get('mac');
-		if($mac === '') {
-			return false;
-		}
-		$this->mac = $mac;
-		$this->response->params['mac'] = $this->mac;
-		$appliance = new appliance();
-		$resource  = new resource();
-		$appliance->get_instance_by_id($id);
-		$resource->get_instance_by_id($appliance->resources);
-		$this->resource  = $resource;
-		$this->appliance = $appliance;
-		$this->statfile  = $this->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$resource->id.'.vm_list';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->migrate();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/kvm-vm-migrate.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add(sprintf($this->lang['label'], $this->vm), 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * clone
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function migrate() {
-		$response = $this->get_response();
-		if(isset($response->msg)) {
-			return $response;
-		}
-		$form = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			$target      = $form->get_request('target');
-			$vm_resource = new resource();
-			$vm_resource->get_instance_by_mac($this->mac);
-			$dest_host_resource = new resource();
-			$dest_host_resource->get_instance_by_id($target);
-			$source_host_resource = new resource();
-			$source_host_resource->get_instance_by_id($vm_resource->vhostid);
-
-			// first transfer the VM config from source to destination
-			$tstatfile=$this->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$this->vm.'.transfer_status';
-			if ($this->file->exists($tstatfile)) {
-				$this->file->remove($tstatfile);
-			}
-			$t_command     = $this->openqrm->get('basedir').'/plugins/kvm/bin/openqrm-kvm-vm transfer_vm_config';
-			$t_command    .= ' -n '.$this->vm;
-			$t_command    .= ' -k '.$dest_host_resource->ip;
-			$t_command    .= ' -k1 '.$source_host_resource->ip;
-			$t_command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-			$t_command .= ' --openqrm-ui-user '.$this->user->name;
-			$t_command .= ' --openqrm-cmd-mode background';
-
-			$openqrm = new openqrm_server();
-			$openqrm->send_command($t_command, NULL, true);
-
-			while (!$this->file->exists($tstatfile)) {
-			  usleep(10000); // sleep 10ms to unload the CPU
-			  clearstatcache();
-			}
-			$msg = trim($this->file->get_contents($tstatfile));
-			if($msg !== "ok") {
-				$response->error = $msg;
-				return $response;
-			}
-
-			// calcuate the migration port
-			list($o1, $o2, $o3, $o4) = explode(".", $vm_resource->ip, 4);
-			$kvm_vm_migration_port = $o4 + 6000;
-
-
-			// start as incoming on destination
-			$s_command     = $this->openqrm->get('basedir').'/plugins/kvm/bin/openqrm-kvm-vm start_as_incoming';
-			$s_command    .= ' -n '.$this->vm;
-			$s_command    .= ' -j '.$kvm_vm_migration_port;
-			$s_command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-			$s_command .= ' --openqrm-ui-user '.$this->user->name;
-			$s_command .= ' --openqrm-cmd-mode background';
-
-			$statfile=$this->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$this->vm.'.vm_migrated_successfully';
-			if ($this->file->exists($statfile)) {
-				$this->file->remove($statfile);
-			}
-
-			$dest_host_resource->send_command($dest_host_resource->ip, $s_command);
-			sleep(5);
-
-			$m_command     = $this->openqrm->get('basedir').'/plugins/kvm/bin/openqrm-kvm-vm migrate';
-			$m_command    .= ' -n '.$this->vm;
-			$m_command    .= ' -k '.$dest_host_resource->ip;
-			$m_command    .= ' -j '.$kvm_vm_migration_port;
-			$m_command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-			$m_command .= ' --openqrm-ui-user '.$this->user->name;
-			$m_command .= ' --openqrm-cmd-mode background';
-			$this->resource->send_command($this->resource->ip, $m_command);
-
-			$fields=array();
-			$fields["resource_vhostid"] = $dest_host_resource->id;
-			$vm_resource->update_info($vm_resource->id, $fields);
-
-			$response->msg = sprintf($this->lang['msg_migrated'], $this->vm, $dest_host_resource->id.' / '.$dest_host_resource->ip);
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'migrate');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$targets = array();
-		$list = array();
-		if(isset($this->appliance)) {
-			$list = $this->appliance->get_list();
-		}
-		foreach ($list as $key => $app) {
-			$appliance = new appliance();
-			$appliance->get_instance_by_id($app["value"]);
-			// only active appliances
-			if ((!strcmp($appliance->state, "active")) || ($appliance->resources == 0)) {
-				$virtualization = new virtualization();
-				$virtualization->get_instance_by_id($appliance->virtualization);
-				if ((!strcmp($virtualization->type, "kvm")) && (!strstr($virtualization->type, "kvm-vm"))) {
-					$resource = new resource();
-					$resource->get_instance_by_id($appliance->resources);
-					// exclude source host
-					if ($resource->id === $this->resource->id) {
-						continue;
-					}
-					// only active appliances
-					if (!strcmp($resource->state, "active")) {
-						$label = $resource->id." / ".$resource->ip;
-						$targets[] = array($resource->id, $label);
-					}
-				}
-			}
-		}
-
-		if(count($targets) >= 1 ) {	
-			$d['target']['label']                       = $this->lang['form_target'];
-			$d['target']['required']                    = true;
-			$d['target']['object']['type']              = 'htmlobject_select';
-			$d['target']['object']['attrib']['name']    = 'target';
-			$d['target']['object']['attrib']['index']   = array(0,1);
-			$d['target']['object']['attrib']['options'] = $targets;
-			$form->add($d);
-			$response->form = $form;
-		} else {
-			$response->msg = $this->lang['error_no_hosts'];
-		}
-		return $response;
-	}
-
-}
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.reboot.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.reboot.class.php
deleted file mode 100644
index 6a6c256..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.reboot.class.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * kvm-vm Reboot VM(s)
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_vm_reboot
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_vm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_vm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_vm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_vm_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file                     = $openqrm->file();
-		$this->openqrm                  = $openqrm;
-		$this->user						= $openqrm->user();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->reboot();
-		$this->response->redirect(
-			$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response)
-		);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Stop
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function reboot() {
-		$response = '';
-		$vms = $this->response->html->request()->get($this->identifier_name);
-		if( $vms !== '' ) {
-			$appliance = $this->openqrm->appliance();
-			$appliance->get_instance_by_id($this->response->html->request()->get('appliance_id'));
-			$server = $this->openqrm->resource();
-			$server->get_instance_by_id($appliance->resources);
-
-			$resource = $this->openqrm->resource();
-			$virttype = $this->openqrm->virtualization();
-			$errors   = array();
-			$message  = array();
-			foreach($vms as $key => $vm) {
-				$resource->get_instance_id_by_hostname($vm);
-				$resource->get_instance_by_id($resource->id);
-				$virttype->get_instance_by_id($resource->vtype);
-
-				$file = $this->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$resource->id.'.vm_list';
-				$command  = $this->openqrm->get('basedir').'/plugins/kvm/bin/openqrm-kvm-vm reboot -n '.$vm;
-				$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-				$command .= ' -y '.$virttype->type;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode background';
-
-				$server->send_command($resource->ip, $command);
-				$message[] = sprintf($this->lang['msg_rebooted'], $vm);
-			}
-			if(count($errors) === 0) {
-				$response = join('<br>', $message);
-			} else {
-				$msg = array_merge($errors, $message);
-				$response = join('<br>', $msg);
-			}
-		} else {
-			$response = '';
-		}
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.remove.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.remove.class.php
deleted file mode 100644
index 8b7d9ef..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.remove.class.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-/**
- * kvm-vm Remove VM(s)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_vm_remove
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_vm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_vm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_vm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_vm_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file                     = $openqrm->file();
-		$this->openqrm                  = $openqrm;
-		$this->user			= $openqrm->user();
-
-		require_once $this->openqrm->get('basedir').'/plugins/ip-mgmt/web/class/ip-mgmt.class.php';
-		$ip_mgmt = new ip_mgmt();
-		$this->ip_mgmt = $ip_mgmt;
-		
-		$this->plugin = new plugin();
-		$this->plugins_enabled = $this->plugin->enabled();
-		
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->remove();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/kvm-vm-remove.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function remove() {
-		$event   = new event();
-		$response = $this->get_response();
-		$vms  = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		$openqrm_resource = new resource();
-		$openqrm_resource->get_instance_by_id(0);
-		
-		if( $vms !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($vms as $ex) {
-				$d['param_f'.$i]['label']                       = $ex;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $ex;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;		
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$appliance_id = $this->response->html->request()->get('appliance_id');
-				$appliance    = new appliance();
-				$resource     = new resource();
-				$errors       = array();
-				$message      = array();
-				foreach($vms as $key => $vm) {
-					$appliance->get_instance_by_id($appliance_id);
-					$resource->get_instance_by_id($appliance->resources);
-					$file = $this->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$resource->id.'.vm_list';
-					if($this->file->exists($file)) {					
-						$lines = explode("\n", $this->file->get_contents($file));
-						if(count($lines) >= 1) {
-							foreach($lines as $line) {
-								if($line !== '') {
-									$line = explode('@', $line);
-									if($vm === $line[1]) {
-										$kvm = new resource();
-										$kvm->get_instance_by_mac($line[2]);
-										
-										// check if it is still in use
-										$appliances_using_resource = $appliance->get_ids_per_resource($kvm->id);
-										if (count($appliances_using_resource) > 0) {
-											$appliances_using_resource_str = implode(",", $appliances_using_resource[0]);
-											$errors[] = sprintf($this->lang['msg_vm_resource_still_in_use'], $vm, $kvm->id, $appliances_using_resource_str);
-										} else {
-										    
-											// remove all nics by mac from dhcpd
-											if($line[7] !== '') {
-												$openqrm_resource = new resource();
-												$openqrm_resource->get_instance_by_id(0);
-												$all_mac_array = explode(',', $line[7]);
-												foreach ($all_mac_array as $addional_mac) {
-													if ($addional_mac == '') {
-													    continue;
-													}
-													$dhcpd_remove_command = $this->openqrm->get('basedir').'/plugins/dhcpd/bin/openqrm-dhcpd-manager remove_by_mac -m '.$addional_mac;
-													$dhcpd_remove_command .= ' --openqrm-cmd-mode background';
-													$event->log("console", $_SERVER['REQUEST_TIME'], 5, "kvm-storge-vm.remove.class.php", 'Removing '.$addional_mac.' from dhcpd server.', "", "", 0, 0, $kvm->id);
-													$openqrm_resource->send_command($openqrm_resource->ip, $dhcpd_remove_command);
-												}
-											}
-											
-											
-											// remove all ips from dns
-											$kvm_ip_id_array = $this->ip_mgmt->get_ids_per_resource($kvm->id);
-											foreach($kvm_ip_id_array as $kvm_ip_id) {
-
-												$ovs_ip_array = $this->ip_mgmt->get_instance('id', $kvm_ip_id);
-												$ovs_ip_mgmt_address = trim($ovs_ip_array['ip_mgmt_address']);
-												$ovs_ip_mgmt_domain = trim($ovs_ip_array['ip_mgmt_domain']);
-
-												$dns_command  = $this->openqrm->get('basedir').'/plugins/dns/bin/openqrm-dns-domain-manager remove_host';
-												$dns_command .= ' -n '.$ovs_ip_mgmt_domain;
-												$dns_command .= ' -i '.$ovs_ip_mgmt_address;
-												$dns_command .= ' -q '.$kvm->vname;
-												$openqrm_resource->send_command($openqrm_resource->ip, $dns_command);
-
-												$ovs_update_array['ip_mgmt_resource_id'] = NULL;
-												$this->ip_mgmt->update_ip($kvm_ip_id, $ovs_update_array);
-
-											}
-
-									    
-											$kvm->remove($kvm->id, $line[2]);
-											$command  = $this->openqrm->get('basedir').'/plugins/kvm/bin/openqrm-kvm-vm delete -n '.$vm;
-											$command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-											$command .= ' --openqrm-ui-user '.$this->user->name;
-											$command .= ' --openqrm-cmd-mode background';
-											$resource->send_command($resource->ip, $command);
-											$form->remove($this->identifier_name.'['.$key.']');
-											$message[] = sprintf($this->lang['msg_removed'], $vm);
-
-											// stop remote console
-											$tmp    = explode(':',$line[5]);
-											$server = $tmp[0];
-											$port   = $tmp[1];
-											$mac    = $line[2];
-											$rid    = $kvm->id;
-											$plugin  = new plugin();
-											$enabled = $plugin->enabled();
-											foreach ($enabled as $index => $name) {
-												$running = $this->openqrm->get('webdir').'/plugins/'.$name.'/.running';
-												$hook = $this->openqrm->get('webdir').'/plugins/'.$name.'/openqrm-'.$name.'-remote-console-hook.php';
-												if (file_exists($hook)) {
-													if (file_exists($running)) {
-														$event->log("console", $_SERVER['REQUEST_TIME'], 5, "kvm-storge-vm.remove.class.php", 'Stopping '.$name.' remote console.', "", "", 0, 0, $kvm->id);
-														require_once($hook);
-														$console_function = 'openqrm_'.$name.'_disable_remote_console';
-														$console_function = str_replace("-", "_", $console_function);
-														$console_function($server, $port, $rid, $mac, $vm);
-													}
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'remove');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.select.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.select.class.php
deleted file mode 100644
index 7a0a00e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.select.class.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-/**
- * kvm-vm Select Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_vm_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_vm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_vm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_vm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_vm_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file                     = $openqrm->file();
-		$this->openqrm                  = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$table = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/kvm-vm-select.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($table, 'table');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return htmlobject_tablebulider | htmlobject_div
-	 */
-	//--------------------------------------------
-	function select() {
-		// set ENV
-		$resource   = $this->openqrm->resource();
-		$virtualization = $this->openqrm->virtualization();
-		$virtualization->get_instance_by_type("kvm");
-		$appliance = $this->openqrm->appliance();
-		$storage = $this->openqrm->storage();
-		$deployment = $this->openqrm->deployment();
-
-		$table = $this->response->html->tablebuilder('kvm_vm', $this->response->get_array($this->actions_name, 'select'));
-		$table->sort      = 'appliance_id';
-		$table->limit     = 10;
-		$table->offset    = 0;
-		$table->order     = 'ASC';
-		$table->max       = $appliance->get_count_per_virtualization($virtualization->id);
-		$table->autosort  = false;
-		$table->sort_link = false;
-		$table->init();
-
-		// handle tab in tab
-		if($this->response->html->request()->get('iplugin') !== '') {
-			$strControler = 'icontroller';
-		}
-		else if($this->response->html->request()->get('rplugin') !== '') {
-			$strControler = 'rcontroller';
-		}
-		else if($this->response->html->request()->get('aplugin') !== '') {
-			$strControler = 'acontroller';
-		} else {
-			$strControler = 'controller';
-		}
-
-		// storages
-		$deployment->get_instance_by_type('kvm');
-		$storages = $storage->display_overview(0, 10000, 'storage_id', 'ASC');
-		$s = array();
-		if(count($storages) >= 1) {
-			foreach($storages as $k => $v) {
-				$storage->get_instance_by_id($v["storage_id"]);
-				$resource->get_instance_by_id($storage->resource_id);
-				$deployment->get_instance_by_id($storage->type);
-				if($deployment->storagetype === 'kvm') {
-					// replace id by string 
-					$v['storage_type'] = $deployment->type;
-					$s[] = $v;
-				}
-			}
-		}
-
-		$servers = $appliance->display_overview_per_virtualization($virtualization->id, $table->offset, $table->limit, $table->sort, $table->order);
-
-		if(count($servers) >= 1) {
-			foreach($servers as $k => $v) {
-				$resource->get_instance_by_id($v["appliance_resources"]);
-				$state_icon = '<span class="pill '.$resource->state.'">'.$resource->state.'</span>';
-
-				$a = $this->response->html->a();
-				$a->title   = $this->lang['title_vms'];
-				$a->label   = 'VMS';
-				$a->handler = 'onclick="wait();"';
-				$a->css     = 'edit';
-				$a->href    = $this->response->get_url($strControler, "kvm-vm").'&kvm_vm_action=edit&appliance_id='.$v['appliance_id'];
-				$links = $a->get_string();
-
-				// handle storages
-				$slinks = '';
-				foreach($s as $storage) {
-					if($storage['storage_resource_id'] === $resource->id) {
-						if($storage['storage_type'] === 'kvm-lvm-deployment') {
-							$a = $this->response->html->a();
-							$a->title   = $this->lang['title_lvm'];
-							$a->label   = 'LVM';
-							$a->handler = 'onclick="wait();"';
-							$a->css     = 'edit';
-							$a->href    = $this->response->get_url($strControler, "kvm").'&kvm_action=edit&storage_id='.$storage['storage_id'];
-							$slinks .= $a->get_string();
-						}
-						else if($storage['storage_type'] === 'kvm-bf-deployment') {
-							$a = $this->response->html->a();
-							$a->title   = $this->lang['title_bf'];
-							$a->label   = 'Blockfiles';
-							$a->handler = 'onclick="wait();"';
-							$a->css     = 'edit';
-							$a->href    = $this->response->get_url($strControler, "kvm").'&kvm_action=edit&storage_id='.$storage['storage_id'];
-							$slinks .= $a->get_string();
-						}
-						else if($storage['storage_type'] === 'kvm-gluster-deployment') {
-							$a = $this->response->html->a();
-							$a->title   = $this->lang['title_glusterfs'];
-							$a->label   = 'GlusterFS';
-							$a->handler = 'onclick="wait();"';
-							$a->css     = 'edit';
-							$a->href    = $this->response->get_url($strControler, "kvm").'&kvm_action=edit&storage_id='.$storage['storage_id'];
-							$slinks .= $a->get_string();
-						}
-						else if($storage['storage_type'] === 'kvm-ceph-deployment') {
-							$a = $this->response->html->a();
-							$a->title   = $this->lang['title_ceph'];
-							$a->label   = 'Ceph';
-							$a->handler = 'onclick="wait();"';
-							$a->css     = 'edit';
-							$a->href    = $this->response->get_url($strControler, "kvm").'&kvm_action=edit&storage_id='.$storage['storage_id'];
-							$slinks .= $a->get_string();
-						}
-					}
-				}
-				// handle missing storage
-				if($slinks === '') {
-					$a = $this->response->html->a();
-					$a->title   = $this->lang['new_storage'];
-					$a->label   = $this->lang['new_storage'];
-					$a->handler = 'onclick="wait();"';
-					$a->css     = 'add';
-					$a->href    = $this->response->html->thisfile.'?base=storage&storage_action=add';
-					$links .= $a->get_string();
-				} else {
-					$links .= $slinks;
-				}
-
-				// Network Manager
-				$n = $this->response->html->a();
-				$n->label   = $this->lang['network_manager'];
-				$n->css     = 'enable';
-				$n->handler = 'onclick="wait();"';
-				$n->href    = $this->response->html->thisfile.'?plugin=network-manager&appliance_id='.$v['appliance_id'];
-				$plugins = $n->get_string();
-				// Sysinfo
-				$n = $this->response->html->a();
-				$n->label   = 'Sysinfo';
-				$n->css     = 'enable';
-				$n->handler = 'onclick="wait();"';
-				$n->href    = $this->response->html->thisfile.'?plugin=kvm&controller=kvm-vm&kvm_vm_action=sysinfo&appliance_id='.$v['appliance_id'];
-				$plugins .= $n->get_string();
-
-				$data  = '<b>'.$this->lang['table_id'].'</b>: '.$v['appliance_id'].'<br>';
-				$data .= '<b>'.$this->lang['table_name'].'</b>: '.$v['appliance_name'].'<br>';
-				$data .= '<b>'.$this->lang['table_recource'].'</b>: '.$resource->hostname.'<br>';
-				$data .= '<b>IP</b>: '.$resource->ip;
-
-				$b[] = array(
-					'state' => $state_icon,
-					'appliance_id' => $v['appliance_id'],
-					'name' => $v['appliance_name'],
-					'appliance_resources' => $resource->id,
-					'data' => $data,
-					'comment' => $v['appliance_comment'].'<hr>'.$plugins,
-					'action' => $links,
-				);
-			}
-
-			$h['state']['title'] ='&#160;';
-			$h['state']['sortable'] = false;
-			$h['appliance_id']['title'] = $this->lang['table_id'];
-			$h['appliance_id']['hidden'] = true;
-			$h['name']['title'] = $this->lang['table_name'];
-			$h['name']['hidden'] = true;
-			$h['appliance_resources']['title'] = $this->lang['table_recource'];
-			$h['appliance_resources']['hidden'] = true;
-			$h['data']['title'] = '&#160;';
-			$h['data']['sortable'] = false;
-			$h['comment']['title'] ='&#160;';
-			$h['comment']['sortable'] = false;
-			$h['action']['title'] = '&#160;';
-			$h['action']['sortable'] = false;
-
-			$table->id = 'Tabelle';
-			$table->css = 'htmlobject_table';
-			$table->border = 1;
-			$table->cellspacing = 0;
-			$table->cellpadding = 3;
-			$table->form_action = $this->response->html->thisfile;
-			$table->head = $h;
-			$table->body = $b;
-			$table->limit_select = array(
-				array("value" => 10, "text" => 10),
-				array("value" => 20, "text" => 20),
-				array("value" => 30, "text" => 30),
-				array("value" => 40, "text" => 40),
-				array("value" => 50, "text" => 50),
-			);
-			return $table->get_string();
-		} else {
-			$box = $this->response->html->div();
-			$box->id = 'htmlobject_box_add';
-			$box->css = 'htmlobject_box';
-			$box_content  = $this->lang['error_no_host'].'<br><br>';
-			$box_content .= '<a href="'.$this->response->html->thisfile.'?base=appliance&appliance_action=step1">'.$this->lang['new'].'</a>';
-			$box->add($box_content);
-			return $box->get_string();
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.start.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.start.class.php
deleted file mode 100644
index 3015e9b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.start.class.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/**
- * kvm-vm Start VM(s)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_vm_start
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_vm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_vm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_vm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_vm_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-		$this->user	    = $openqrm->user();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->start();
-		$this->response->redirect(
-			$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response)
-		);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Start
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function start() {
-		$response = '';
-		$vms = $this->response->html->request()->get($this->identifier_name);
-		if( $vms !== '' ) {
-			$appliance_id = $this->response->html->request()->get('appliance_id');
-			$appliance    = new appliance();
-			$resource     = new resource();
-			$errors       = array();
-			$message      = array();
-			foreach($vms as $key => $vm) {
-				$appliance->get_instance_by_id($appliance_id);
-				$resource->get_instance_by_id($appliance->resources);
-				$file = $this->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$resource->id.'.vm_list';
-				$command  = $this->openqrm->get('basedir').'/plugins/kvm/bin/openqrm-kvm-vm start -n '.$vm;
-				$command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode regular';
-				$resource->send_command($resource->ip, $command);
-				$message[] = sprintf($this->lang['msg_started'], $vm);
-			}
-			if(count($errors) === 0) {
-				$response = join('<br>', $message);
-			} else {
-				$msg = array_merge($errors, $message);
-				$response = join('<br>', $msg);
-			}
-		} else {
-			$response = '';
-		}
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.stop.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.stop.class.php
deleted file mode 100644
index 6267040..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.stop.class.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/**
- * kvm-vm Stop VM(s)
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_vm_stop
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_vm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_vm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_vm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_vm_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file                     = $openqrm->file();
-		$this->openqrm                  = $openqrm;
-		$this->user						= $openqrm->user();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->stop();
-		$this->response->redirect(
-			$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response)
-		);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Stop
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function stop() {
-		$response = '';
-		$vms = $this->response->html->request()->get($this->identifier_name);
-		if( $vms !== '' ) {
-			$appliance_id = $this->response->html->request()->get('appliance_id');
-			$appliance    = new appliance();
-			$resource     = new resource();
-			$errors       = array();
-			$message      = array();
-			foreach($vms as $key => $vm) {
-				$appliance->get_instance_by_id($appliance_id);
-				$resource->get_instance_by_id($appliance->resources);
-				$file = $this->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$resource->id.'.vm_list';
-				$command  = $this->openqrm->get('basedir').'/plugins/kvm/bin/openqrm-kvm-vm stop -n '.$vm;
-				$command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode background';
-				$resource->send_command($resource->ip, $command);
-				$message[] = sprintf($this->lang['msg_stoped'], $vm);
-
-				$file  = $this->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$resource->id.'.vm_list';
-				if($this->file->exists($file)) {
-					$lines   = explode("\n", $this->file->get_contents($file));
-					foreach($lines as $line) {
-						if($line !== '') {
-							$line = explode('@', $line);
-							if($line[1] === $vm) {
-								$tmp    = explode(':',$line[5]);
-								$server = $tmp[0];
-								$port   = $tmp[1];
-								$mac    = $line[2];
-								$resource->get_instance_by_mac($mac);
-								$rid    = $resource->id;
-							}
-						}
-						$event   = new event();
-						$plugin  = new plugin();
-						$enabled = $plugin->enabled();
-						foreach ($enabled as $index => $name) {
-							$running = $this->openqrm->get('webdir').'/plugins/'.$name.'/.running';
-							$hook = $this->openqrm->get('webdir').'/plugins/'.$name.'/openqrm-'.$name.'-remote-console-hook.php';
-							if (file_exists($hook)) {
-								if (file_exists($running)) {
-									$event->log("console", $_SERVER['REQUEST_TIME'], 5, "kvm-vm.console.class.php", 'Found plugin '.$name.' providing a remote console.', "", "", 0, 0, $resource->id);
-									require_once($hook);
-									$console_function = 'openqrm_'.$name.'_disable_remote_console';
-									$console_function = str_replace("-", "_", $console_function);
-									$console_function($server, $port, $rid, $mac, $vm);
-								}
-							}
-						}
-					}
-				}
-			}
-			if(count($errors) === 0) {
-				$response = join('<br>', $message);
-			} else {
-				$msg = array_merge($errors, $message);
-				$response = join('<br>', $msg);
-			}
-		} else {
-			$response = '';
-		}
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.sysinfo.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.sysinfo.class.php
deleted file mode 100644
index 6fe8099..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.sysinfo.class.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/**
- * KVM Adds/Removes an Image from a Volume
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_vm_sysinfo
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_vm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_vm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_vm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_vm_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->sysinfo();
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Sysinfo
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function sysinfo() {
-
-		$appliance = $this->openqrm->appliance();
-		$appliance->get_instance_by_id($this->response->html->request()->get('appliance_id'));
-		$resource = $this->openqrm->resource();
-		$resource->get_instance_by_id($appliance->resources);
-
-		$filename = $resource->id.'.sysinfo';
-		$file = $this->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$filename;
-
-		$command  = $this->openqrm->get('basedir').'/plugins/kvm/bin/openqrm-kvm-sysinfo';
-		$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-		$command .= ' --file-name '.$filename;
-		#$command .= ' --openqrm-cmd-mode background';
-		
-		if($this->openqrm->file()->exists($file)) {
-			$this->openqrm->file()->remove($file);
-		}
-		$resource->send_command($resource->ip, $command);
-		while (!$this->openqrm->file()->exists($file)) // check if the data file has been modified
-		{
-			usleep(10000); // sleep 10ms to unload the CPU
-			clearstatcache();
-		}
-
-		$content = $this->openqrm->file()->get_contents($file);
-
-		$image = $this->openqrm->image();
-		$list  = $image->display_overview(0,10000,'image_id','ASC');
-		foreach($list as $v) {
-			if($v['image_rootdevice'] !== '') {
-				$content = preg_replace('~[^=]('.$v['image_rootdevice'].')([^a-zA-Z0-9])~', '<span style="font-weight:bold">$1</span>$2', $content);
-			}
-		}
-
-		$resource = $this->openqrm->resource();
-		$list     = $resource->display_overview(0,10000,'resource_id','ASC');
-		foreach($list as $v) {
-			if($v['resource_hostname'] !== '') {
-				$content = preg_replace('~([0-9] )('.$v['resource_hostname'].')\n~', '$1<span style="font-weight:bold">$2</span>'."\n", $content);
-			}
-		}
-
-		$d = $this->response->html->div();
-		$d->id = "kvm-sysinfo";
-		$d->add($content);
-
-		$this->openqrm->file()->remove($file);
-
-		return $d;
-
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.update.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.update.class.php
deleted file mode 100644
index 0d015fc..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm-vm.update.class.php
+++ /dev/null
@@ -1,746 +0,0 @@
-<?php
-/**
- * KVM-VM Update VM
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_vm_update
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_vm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_vm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_vm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_vm_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file                     = $openqrm->file();
-		$this->openqrm                  = $openqrm;
-		$this->user						= $openqrm->user();
-		$id = $this->response->html->request()->get('appliance_id');
-		$vm = $this->response->html->request()->get('vm');
-		$this->vm = $vm;
-		$appliance = new appliance();
-		$resource  = new resource();
-		$appliance->get_instance_by_id($id);
-		$resource->get_instance_by_id($appliance->resources);
-		$this->resource  = $resource;
-		$this->appliance = $appliance;
-		$this->statfile  = $this->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$resource->id.'.vm_list';
-
-		$this->response->add('appliance_id', $id);
-		$this->response->add('vm', $this->vm);
-		$this->response->add('vmtype', $this->response->html->request()->get('vmtype'));
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->update();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/kvm-vm-update.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add(sprintf($this->lang['label'], $this->vm), 'label');
-		$t->add($this->lang['lang_basic'], 'lang_basic');
-		$t->add($this->lang['lang_hardware'], 'lang_hardware');
-		$t->add($this->lang['lang_virtual_disk'], 'lang_virtual_disk');
-		$t->add($this->lang['lang_net'], 'lang_net');
-		$t->add($this->lang['lang_net_0'], 'lang_net_0');
-		$t->add($this->lang['lang_net_1'], 'lang_net_1');
-		$t->add($this->lang['lang_net_2'], 'lang_net_2');
-		$t->add($this->lang['lang_net_3'], 'lang_net_3');
-		$t->add($this->lang['lang_net_4'], 'lang_net_4');
-		$t->add($this->lang['lang_boot'], 'lang_boot');
-		$t->add($this->lang['lang_vnc'], 'lang_vnc');
-		$t->add($this->lang['lang_browse'], 'lang_browse');
-		$t->add($this->lang['lang_browser'], 'lang_browser');
-		$t->add($this->lang['lang_password_generate'], 'lang_password_generate');
-		$t->add($this->lang['lang_password_show'], 'lang_password_show');
-		$t->add($this->lang['lang_password_hide'], 'lang_password_hide');
-		$t->add($this->response->html->request()->get('appliance_id'), 'appliance_id');
-		$t->add($this->actions_name, 'actions_name');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Update
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function update() {
-		$this->reload();
-		$response = $this->get_response();
-		$form     = $response->form;
-
-		// handle no bridge error
-		if(!isset($respnse->msg)) {
-			// check vnc password
-			$vnc = $form->get_request('vnc');
-			if($vnc !== '' && $vnc !== $form->get_request('vnc_1')) {
-				$form->set_error('vnc_1', $this->lang['error_vnc_password']);
-			}
-			if(isset($vnc) && $vnc !== '' && strlen($vnc) < 6) {
-				$form->set_error('vnc', $this->lang['error_vnc_password_count']);
-			}
-			$vnckeymap = $form->get_request('vnc_keymap');
-			$vnckeymap_parameter = '';
-			if($vnc !== '') {
-				$vnckeymap_parameter = ' -l '.$vnckeymap;
-			}
-			// disk interface
-			$disk_interface = $form->get_request('disk_interface');
-			$disk_interface_parameter = '';
-			if($disk_interface !== '') {
-				$disk_interface_parameter = ' -o '.$disk_interface;
-			}
-			$iso_path = '';
-			if($form->get_request('boot') !== '' && $form->get_request('boot') === 'iso') {
-				if($form->get_request('iso_path') === '') {
-					$form->set_error('iso_path', $this->lang['error_iso_path']);
-				} else {
-					$iso_path = ' -i '.$form->get_request('iso_path');
-				}
-			}
-
-			if(!$form->get_errors() && $this->response->submit()) {
-				$errors = array();
-				if($form->get_request('boot') === '') {
-					$errors[] = $this->lang['error_boot'];
-				}
-
-				$enabled = array();
-				for($i = 1; $i < 5; $i++) {			
-					$enabled[$i] = true;
-					if($form->get_request('net'.$i) !== '') {
-						if($form->get_request('mac'.$i) === '') {
-							$form->set_error('mac'.$i, $this->lang['error_mac']);
-							$enabled[$i] = false;
-						}
-						if($form->get_request('nic'.$i) === '') {
-							$form->set_error('nic'.$i, $this->lang['error_nic']);
-							$enabled[$i] = false;
-						}
-						if($form->get_request('bridge'.$i) === '') {
-							$form->set_error('bridge'.$i, $this->lang['error_bridge']);
-							$enabled[$i] = false;
-						}
-					} else {
-						$enabled[$i] = false;
-					}
-				}
-
-				if(count($errors) > 0 || $form->get_errors()) {
-					$response->error = join('<br>', $errors);
-				} else {
-					$command  = $this->openqrm->get('basedir').'/plugins/kvm/bin/openqrm-kvm-vm update';
-					$command .= ' -n '.$this->vm;
-					$command .= ' -m '.strtolower($form->get_static('mac'));
-					$command .= ' -r '.$form->get_request('memory');
-					$command .= ' -c '.$form->get_request('cpus');
-					$command .= ' -t '.$form->get_request('nic');
-					$command .= ' -z '.$form->get_request('bridge');
-
-					foreach($enabled as $key => $value) {
-						if($value === true) {
-							$command .= ' -m'.$key.' '.$form->get_request('mac'.$key);
-							$command .= ' -t'.$key.' '.$form->get_request('nic'.$key);
-							$command .= ' -z'.$key.' '.$form->get_request('bridge'.$key);
-						}
-					}
-
-					if($form->get_request('cdrom')) {
-						$command .= ' -cdrom '.$form->get_request('cdrom');
-					}
-
-					$command .= ' -b '.$form->get_request('boot');
-					$command .= ' -v '.$form->get_request('vnc');
-					$command .= $iso_path;
-					$command .= $vnckeymap_parameter;
-					$command .= $disk_interface_parameter;
-					$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-					$command .= ' --openqrm-ui-user '.$this->user->name;
-					$command .= ' --openqrm-cmd-mode background';
-
-					$this->resource->send_command($this->resource->ip, $command);
-					$response->msg = sprintf($this->lang['msg_updated'], $this->vm);
-				}
-			} 
-			else if($form->get_errors()) {
-				$response->error = implode('<br>', $form->get_errors());
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'update');
-
-		$cpus[] = array("1", "1 CPU");
-		$cpus[] = array("2", "2 CPUs");
-		$cpus[] = array("4", "4 CPUs");
-		$cpus[] = array("8", "8 CPUs");
-		$cpus[] = array("16", "16 CPUs");
-
-		$ram[] = array("256", "256 MB");
-		$ram[] = array("512", "512 MB");
-		$ram[] = array("1024", "1 GB");
-		$ram[] = array("2048", "2 GB");
-		$ram[] = array("4096", "4 GB");
-		$ram[] = array("8192", "8 GB");
-		$ram[] = array("16384", "16 GB");
-		$ram[] = array("32768", "32 GB");
-		$ram[] = array("65536", "64 GB");
-
-		$nics[] = array("virtio", $this->lang['form_net_virtio']);
-		$nics[] = array("e1000", $this->lang['form_net_e1000']);
-		$nics[] = array("rtl8139", $this->lang['form_net_rtl8139']);
-
-		$keymaps[] = array("de", "de");
-		$keymaps[] = array("en-us", "en-us");
-		$keymaps[] = array("es", "es");
-		$keymaps[] = array("fr", "fr");
-		$keymaps[] = array("it", "it");
-		$keymaps[] = array("ja", "ja");
-		$keymaps[] = array("nl", "nl");
-		$keymaps[] = array("ru", "ru");
-		$keymaps[] = array("none", "none");
-
-		$disk_interfaces[] = array("virtio", "Virtio");
-		$disk_interfaces[] = array("ide", "IDE");
-
-		$disk_select_arr[] = array('1024','1 GB');
-		$disk_select_arr[] = array('2048','2 GB');
-		$disk_select_arr[] = array('10240','10 GB');
-		$disk_select_arr[] = array('20480','20 GB');
-		$disk_select_arr[] = array('51200','50 GB');
-		$disk_select_arr[] = array('102400','100 GB');
-
-		$swap_select_arr[] = array('1024', '1 GB');
-		$swap_select_arr[] = array('2048','2 GB');
-
-		$file = $this->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$this->resource->id.'.'.$this->vm.'.vm_config';
-		$ini = openqrm_parse_conf($file);
-
-		$bridges = array();
-		$bridge_list = $ini['OPENQRM_KVM_BRIDGES'];
-		$bridge_list = rtrim($bridge_list, ":");
-		$bridge_array = explode(':', $bridge_list);
-
-		// handle no bridge error
-		if(isset($bridge_array[0]) && $bridge_array[0] !== '') {
-			foreach ($bridge_array as $b) {
-				$bridges[] = array($b, $b);
-			}
-
-			$this->response->params['mac'] = $ini['OPENQRM_KVM_VM_MAC_1'];
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-	
-			$d['name']['label']                         = $this->lang['form_name'];
-			$d['name']['static']                        = true;
-			$d['name']['object']['type']                = 'htmlobject_input';
-			$d['name']['object']['attrib']['name']      = 'name';
-			$d['name']['object']['attrib']['id']        = 'name';
-			$d['name']['object']['attrib']['type']      = 'text';
-			$d['name']['object']['attrib']['value']     = $this->vm;
-			$d['name']['object']['attrib']['disabled']  = true;
-
-			$d['cpus']['label']                         = $this->lang['form_cpus'];
-			$d['cpus']['required']                      = true;
-			$d['cpus']['object']['type']                = 'htmlobject_select';
-			$d['cpus']['object']['attrib']['name']      = 'cpus';
-			$d['cpus']['object']['attrib']['index']     = array(0,1);
-			$d['cpus']['object']['attrib']['options']   = $cpus;
-			$d['cpus']['object']['attrib']['selected']  = array($ini['OPENQRM_KVM_VM_CPUS']);
-
-			$d['memory']['label']                       = $this->lang['form_memory'];
-			$d['memory']['required']                    = true;
-			$d['memory']['object']['type']              = 'htmlobject_select';
-			$d['memory']['object']['attrib']['name']    = 'memory';
-			$d['memory']['object']['attrib']['index']   = array(0,1);
-			$d['memory']['object']['attrib']['options'] = $ram;
-			if($ini['OPENQRM_KVM_VM_RAM'] !== '') {
-				$d['memory']['object']['attrib']['selected'] = array($ini['OPENQRM_KVM_VM_RAM']);
-			}
-
-			$vmtype = $this->response->html->request()->get('vmtype');
-			if($vmtype === 'kvm-vm-net') {
-				$d['disk']['label'] = $this->lang['form_swap'];
-				$d['disk']['object']['type']				= 'htmlobject_select';
-				$d['disk']['object']['attrib']['index']		= array(0,1);
-				$d['disk']['object']['attrib']['id']		= 'disk';
-				$d['disk']['object']['attrib']['name']		= 'disk';
-				$d['disk']['object']['attrib']['options']	= $swap_select_arr;
-
-				$d['cdrom_iso_path'] = "";
-				$d['cdrom_button'] = "";
-			} else {
-				$d['disk']['label'] = $this->lang['form_disk'];
-				$d['disk']['object']['type']				= 'htmlobject_select';
-				$d['disk']['object']['attrib']['index']		= array(0,1);
-				$d['disk']['object']['attrib']['id']		= 'disk';
-				$d['disk']['object']['attrib']['name']		= 'disk';
-				$d['disk']['object']['attrib']['options']	= $disk_select_arr;
-
-				$d['cdrom_iso_path']['label']                    = $this->lang['form_cdrom'];
-				$d['cdrom_iso_path']['object']['type']           = 'htmlobject_input';
-				$d['cdrom_iso_path']['object']['attrib']['type'] = 'text';
-				$d['cdrom_iso_path']['object']['attrib']['id']   = 'cdrom';
-				$d['cdrom_iso_path']['object']['attrib']['name'] = 'cdrom';
-				if($ini['OPENQRM_KVM_VM_CDROM2'] !== '') {
-					$cdrompath = str_replace('-drive file=', '',$ini['OPENQRM_KVM_VM_CDROM2']);
-					$cdrompath = str_replace(',media=cdrom', '',$cdrompath);
-					$d['cdrom_iso_path']['object']['attrib']['value'] = $cdrompath;
-				}
-
-				$d['cdrom_button']['static']                      = true;
-				$d['cdrom_button']['object']['type']              = 'htmlobject_input';
-				$d['cdrom_button']['object']['attrib']['type']    = 'button';
-				$d['cdrom_button']['object']['attrib']['name']    = 'cdrom_button';
-				$d['cdrom_button']['object']['attrib']['id']      = 'cdrom_button';
-				$d['cdrom_button']['object']['attrib']['css']     = 'browse-button';
-				$d['cdrom_button']['object']['attrib']['handler'] = 'onclick="filepicker.init(\'cdrom\'); return false;"';
-				$d['cdrom_button']['object']['attrib']['style']   = "display:none;";
-				$d['cdrom_button']['object']['attrib']['value']   = $this->lang['lang_browse'];
-
-			}
-
-			$d['disk_interface']['label']                       = $this->lang['form_disk_interface'];
-			$d['disk_interface']['required']                    = true;
-			$d['disk_interface']['object']['type']              = 'htmlobject_select';
-			$d['disk_interface']['object']['attrib']['name']    = 'disk_interface';
-			$d['disk_interface']['object']['attrib']['id']      = 'disk_interface';
-			$d['disk_interface']['object']['attrib']['index']   = array(0,1);
-			$d['disk_interface']['object']['attrib']['options'] = $disk_interfaces;
-			$d['disk_interface']['object']['attrib']['selected']= array($ini['OPENQRM_KVM_VM_DISK_INTERFACE']);
-
-			$d['net0']['label']                        = $this->lang['lang_net_0'];
-			$d['net0']['object']['type']               = 'htmlobject_input';
-			$d['net0']['object']['attrib']['type']     = 'checkbox';
-			$d['net0']['object']['attrib']['id']       = 'net0';
-			$d['net0']['object']['attrib']['name']     = 'net0';
-			$d['net0']['object']['attrib']['value']    = 'enabled';
-			$d['net0']['object']['attrib']['checked']  = true;
-			$d['net0']['object']['attrib']['disabled'] = true;
-
-			$d['mac']['label']                         = $this->lang['form_mac'];
-			$d['mac']['static']                        = true;
-			$d['mac']['object']['type']                = 'htmlobject_input';
-			$d['mac']['object']['attrib']['name']      = 'dummy';
-			$d['mac']['object']['attrib']['type']      = 'text';
-			$d['mac']['object']['attrib']['value']     = $ini['OPENQRM_KVM_VM_MAC_1'];
-			$d['mac']['object']['attrib']['maxlength'] = 50;
-			$d['mac']['object']['attrib']['disabled']  = true;
-
-			$d['bridge']['label']                        = $this->lang['form_bridge'];
-			$d['bridge']['required']                     = true;
-			$d['bridge']['object']['type']               = 'htmlobject_select';
-			$d['bridge']['object']['attrib']['name']     = 'bridge';
-			$d['bridge']['object']['attrib']['index']    = array(0,1);
-			$d['bridge']['object']['attrib']['options']  = $bridges;
-			$d['bridge']['object']['attrib']['selected'] = array($ini['OPENQRM_KVM_VM_BRIDGE_1']);
-
-			$d['nic']['label']                         = $this->lang['form_netdevice'];
-			$d['nic']['required']                      = true;
-			$d['nic']['object']['type']                = 'htmlobject_select';
-			$d['nic']['object']['attrib']['name']      = 'nic';
-			$d['nic']['object']['attrib']['index']     = array(0,1);
-			$d['nic']['object']['attrib']['options']   = $nics;
-			$d['nic']['object']['attrib']['selected']  = array($ini['OPENQRM_KVM_VM_NIC_TYPE_1']);
-
-			// net 1
-			$checked = false;
-			if($ini['OPENQRM_KVM_VM_MAC_2'] !== '' ) {
-				$mac = $ini['OPENQRM_KVM_VM_MAC_2'];
-				$checked = true;
-			} else {
-				$this->resource->generate_mac();
-				$mac = $this->resource->mac;
-			}
-
-			$d['net1']['label']                       = $this->lang['lang_net_1'];
-			$d['net1']['object']['type']              = 'htmlobject_input';
-			$d['net1']['object']['attrib']['type']    = 'checkbox';
-			$d['net1']['object']['attrib']['id']      = 'net1';
-			$d['net1']['object']['attrib']['name']    = 'net1';
-			$d['net1']['object']['attrib']['value']   = 'enabled';
-			$d['net1']['object']['attrib']['checked'] = $checked;
-			$d['net1']['object']['attrib']['handler'] = 'onchange="nettoggle(this);"';
-
-			$d['mac1']['label']                         = $this->lang['form_mac'];
-			$d['mac1']['object']['type']                = 'htmlobject_input';
-			$d['mac1']['object']['attrib']['name']      = 'mac1';
-			$d['mac1']['object']['attrib']['type']      = 'text';
-			$d['mac1']['object']['attrib']['value']     = $mac;
-			$d['mac1']['object']['attrib']['maxlength'] = 50;
-
-			$d['bridge1']['label']                       = $this->lang['form_bridge'];
-			$d['bridge1']['object']['type']              = 'htmlobject_select';
-			$d['bridge1']['object']['attrib']['name']    = 'bridge1';
-			$d['bridge1']['object']['attrib']['index']   = array(0,1);
-			$d['bridge1']['object']['attrib']['options'] = $bridges;
-			if(isset($ini['OPENQRM_KVM_VM_BRIDGE_2']) && $checked === true) {
-				$d['bridge1']['object']['attrib']['selected'] = array($ini['OPENQRM_KVM_VM_BRIDGE_2']);
-			}
-
-			$d['nic1']['label']                         = $this->lang['form_netdevice'];
-			$d['nic1']['object']['type']                = 'htmlobject_select';
-			$d['nic1']['object']['attrib']['name']      = 'nic1';
-			$d['nic1']['object']['attrib']['index']     = array(0,1);
-			$d['nic1']['object']['attrib']['options']   = $nics;
-			if($checked === true) {
-				$d['nic1']['object']['attrib']['selected'] = array($ini['OPENQRM_KVM_VM_NIC_TYPE_2']);
-			}
-
-			// net 2
-			$checked = false;
-			if($ini['OPENQRM_KVM_VM_MAC_3'] !== '' ) {
-				$mac = $ini['OPENQRM_KVM_VM_MAC_3'];
-				$checked = true;
-			} else {
-				$this->resource->generate_mac();
-				$mac = $this->resource->mac;
-			}
-
-			$d['net2']['label']                       = $this->lang['lang_net_2'];
-			$d['net2']['object']['type']              = 'htmlobject_input';
-			$d['net2']['object']['attrib']['type']    = 'checkbox';
-			$d['net2']['object']['attrib']['id']      = 'net2';
-			$d['net2']['object']['attrib']['name']    = 'net2';
-			$d['net2']['object']['attrib']['value']   = 'enabled';
-			$d['net2']['object']['attrib']['checked'] = $checked;
-			$d['net2']['object']['attrib']['handler'] = 'onchange="nettoggle(this);"';
-
-			$d['mac2']['label']                         = $this->lang['form_mac'];
-			$d['mac2']['object']['type']                = 'htmlobject_input';
-			$d['mac2']['object']['attrib']['name']      = 'mac2';
-			$d['mac2']['object']['attrib']['type']      = 'text';
-			$d['mac2']['object']['attrib']['maxlength'] = 50;
-			$d['mac2']['object']['attrib']['value']     = $mac;
-
-			$d['bridge2']['label']                       = $this->lang['form_bridge'];
-			$d['bridge2']['object']['type']              = 'htmlobject_select';
-			$d['bridge2']['object']['attrib']['name']    = 'bridge2';
-			$d['bridge2']['object']['attrib']['index']   = array(0,1);
-			$d['bridge2']['object']['attrib']['options'] = $bridges;
-			if(isset($ini['OPENQRM_KVM_VM_BRIDGE_3']) && $checked === true) {
-				$d['bridge2']['object']['attrib']['selected'] = array($ini['OPENQRM_KVM_VM_BRIDGE_3']);
-			}
-
-			$d['nic2']['label']                         = $this->lang['form_netdevice'];
-			$d['nic2']['object']['type']                = 'htmlobject_select';
-			$d['nic2']['object']['attrib']['name']      = 'nic2';
-			$d['nic2']['object']['attrib']['index']     = array(0,1);
-			$d['nic2']['object']['attrib']['options']   = $nics;
-			if($checked === true) {
-				$d['nic2']['object']['attrib']['selected'] = array($ini['OPENQRM_KVM_VM_NIC_TYPE_3']);
-			}
-
-			// net 3
-			$checked = false;
-			if($ini['OPENQRM_KVM_VM_MAC_4'] !== '' ) {
-				$mac = $ini['OPENQRM_KVM_VM_MAC_4'];
-				$checked = true;
-			} else {
-				$this->resource->generate_mac();
-				$mac = $this->resource->mac;
-			}
-
-			$d['net3']['label']                       = $this->lang['lang_net_3'];
-			$d['net3']['object']['type']              = 'htmlobject_input';
-			$d['net3']['object']['attrib']['type']    = 'checkbox';
-			$d['net3']['object']['attrib']['id']      = 'net3';
-			$d['net3']['object']['attrib']['name']    = 'net3';
-			$d['net3']['object']['attrib']['value']   = 'enabled';
-			$d['net3']['object']['attrib']['checked'] = $checked;
-			$d['net3']['object']['attrib']['handler'] = 'onchange="nettoggle(this);"';
-
-			$d['mac3']['label']                         = $this->lang['form_mac'];
-			$d['mac3']['object']['type']                = 'htmlobject_input';
-			$d['mac3']['object']['attrib']['name']      = 'mac3';
-			$d['mac3']['object']['attrib']['type']      = 'text';
-			$d['mac3']['object']['attrib']['value']     = $mac;
-			$d['mac3']['object']['attrib']['maxlength'] = 50;
-
-			$d['bridge3']['label']                       = $this->lang['form_bridge'];
-			$d['bridge3']['object']['type']              = 'htmlobject_select';
-			$d['bridge3']['object']['attrib']['name']    = 'bridge3';
-			$d['bridge3']['object']['attrib']['index']   = array(0,1);
-			$d['bridge3']['object']['attrib']['options'] = $bridges;
-			if(isset($ini['OPENQRM_KVM_VM_BRIDGE_4']) && $checked === true) {
-				$d['bridge3']['object']['attrib']['selected'] = array($ini['OPENQRM_KVM_VM_BRIDGE_4']);
-			}
-
-			$d['nic3']['label']                         = $this->lang['form_netdevice'];
-			$d['nic3']['object']['type']                = 'htmlobject_select';
-			$d['nic3']['object']['attrib']['name']      = 'nic3';
-			$d['nic3']['object']['attrib']['index']     = array(0,1);
-			$d['nic3']['object']['attrib']['options']   = $nics;
-			if($checked === true) {
-				$d['nic3']['object']['attrib']['selected'] = array($ini['OPENQRM_KVM_VM_NIC_TYPE_4']);
-			}
-
-			// net 4
-			$checked = false;
-			if($ini['OPENQRM_KVM_VM_MAC_5'] !== '' ) {
-				$mac = $ini['OPENQRM_KVM_VM_MAC_5'];
-				$checked = true;
-			} else {
-				$this->resource->generate_mac();
-				$mac = $this->resource->mac;
-			}
-
-			$d['net4']['label']                       = $this->lang['lang_net_4'];
-			$d['net4']['object']['type']              = 'htmlobject_input';
-			$d['net4']['object']['attrib']['type']    = 'checkbox';
-			$d['net4']['object']['attrib']['id']      = 'net4';
-			$d['net4']['object']['attrib']['name']    = 'net4';
-			$d['net4']['object']['attrib']['value']   = 'enabled';
-			$d['net4']['object']['attrib']['checked'] = $checked;
-			$d['net4']['object']['attrib']['handler'] = 'onchange="nettoggle(this);"';
-
-			$d['mac4']['label']                         = $this->lang['form_mac'];
-			$d['mac4']['object']['type']                = 'htmlobject_input';
-			$d['mac4']['object']['attrib']['name']      = 'mac4';
-			$d['mac4']['object']['attrib']['type']      = 'text';
-			$d['mac4']['object']['attrib']['value']     = $mac;
-			$d['mac4']['object']['attrib']['maxlength'] = 50;
-
-			$d['bridge4']['label']                       = $this->lang['form_bridge'];
-			$d['bridge4']['object']['type']              = 'htmlobject_select';
-			$d['bridge4']['object']['attrib']['name']    = 'bridge4';
-			$d['bridge4']['object']['attrib']['index']   = array(0,1);
-			$d['bridge4']['object']['attrib']['options'] = $bridges;
-			if(isset($ini['OPENQRM_KVM_VM_BRIDGE_5']) && $checked === true) {
-				$d['bridge4']['object']['attrib']['selected'] = array($ini['OPENQRM_KVM_VM_BRIDGE_5']);
-			}
-
-			$d['nic4']['label']                         = $this->lang['form_netdevice'];
-			$d['nic4']['object']['type']                = 'htmlobject_select';
-			$d['nic4']['object']['attrib']['name']      = 'nic4';
-			$d['nic4']['object']['attrib']['index']     = array(0,1);
-			$d['nic4']['object']['attrib']['options']   = $nics;
-			if($checked === true) {
-				$d['nic4']['object']['attrib']['selected'] = array($ini['OPENQRM_KVM_VM_NIC_TYPE_5']);
-			}
-
-			// boot from
-			$d['boot_cd'] = '';
-			$d['boot_iso'] = '';
-			$d['boot_iso_path'] = '';
-			$d['boot_local'] = '';
-			$d['browse_button'] = '';
-			if($vmtype !== 'kvm-vm-net') {
-				$d['boot_cd']['label']                     = $this->lang['form_boot_cd'];
-				$d['boot_cd']['object']['type']            = 'htmlobject_input';
-				$d['boot_cd']['object']['attrib']['type']  = 'radio';
-				$d['boot_cd']['object']['attrib']['name']  = 'boot';
-				$d['boot_cd']['object']['attrib']['value'] = 'cdrom';
-				if($ini['OPENQRM_KVM_VM_BOOT'] === 'cdrom') {
-					$d['boot_cd']['object']['attrib']['checked'] = true;
-				}
-
-				$d['boot_iso']['label']                     = $this->lang['form_boot_iso'];
-				$d['boot_iso']['object']['type']            = 'htmlobject_input';
-				$d['boot_iso']['object']['attrib']['type']  = 'radio';
-				$d['boot_iso']['object']['attrib']['id']    = 'boot_iso';
-				$d['boot_iso']['object']['attrib']['name']  = 'boot';
-				$d['boot_iso']['object']['attrib']['value'] = 'iso';
-				if(strpos($ini['OPENQRM_KVM_VM_BOOT'], 'iso') !== false) {
-					$isopath = str_replace('iso:', '',$ini['OPENQRM_KVM_VM_BOOT']); 
-					$d['boot_iso']['object']['attrib']['checked'] = true;
-				}
-
-				$d['boot_iso_path']['label']                    = $this->lang['form_iso_path'];
-				$d['boot_iso_path']['object']['type']           = 'htmlobject_input';
-				$d['boot_iso_path']['object']['attrib']['type'] = 'text';
-				$d['boot_iso_path']['object']['attrib']['id']   = 'iso_path';
-				$d['boot_iso_path']['object']['attrib']['name'] = 'iso_path';
-				if(isset($isopath)) {
-					$d['boot_iso_path']['object']['attrib']['value'] = $isopath;
-				}
-
-				$d['browse_button']['static']                      = true;
-				$d['browse_button']['object']['type']              = 'htmlobject_input';
-				$d['browse_button']['object']['attrib']['type']    = 'button';
-				$d['browse_button']['object']['attrib']['name']    = 'browse_button';
-				$d['browse_button']['object']['attrib']['id']      = 'browsebutton';
-				$d['browse_button']['object']['attrib']['css']     = 'browse-button';
-				$d['browse_button']['object']['attrib']['handler'] = 'onclick="filepicker.init(\'iso_path\'); return false;"';
-				$d['browse_button']['object']['attrib']['style']   = "display:none;";
-				$d['browse_button']['object']['attrib']['value']   = $this->lang['lang_browse'];
-
-				$d['boot_local']['label']                     = $this->lang['form_boot_local'];
-				$d['boot_local']['object']['type']            = 'htmlobject_input';
-				$d['boot_local']['object']['attrib']['type']  = 'radio';
-				$d['boot_local']['object']['attrib']['name']  = 'boot';
-				$d['boot_local']['object']['attrib']['value'] = 'local';
-				if($ini['OPENQRM_KVM_VM_BOOT'] === 'local') {
-					$d['boot_local']['object']['attrib']['checked'] = true;
-				}
-			}
-			$d['boot_net']['label']                     = $this->lang['form_boot_net'];
-			$d['boot_net']['object']['type']            = 'htmlobject_input';
-			$d['boot_net']['object']['attrib']['type']  = 'radio';
-			$d['boot_net']['object']['attrib']['name']  = 'boot';
-			$d['boot_net']['object']['attrib']['value'] = 'network';
-			if($ini['OPENQRM_KVM_VM_BOOT'] === 'network') {
-				$d['boot_net']['object']['attrib']['checked'] = true;
-			}
-
-			$d['vnc']['label']                         = $this->lang['form_vnc'];
-			$d['vnc']['required']                      = true;
-			$d['vnc']['object']['type']                = 'htmlobject_input';
-			$d['vnc']['object']['attrib']['name']      = 'vnc';
-			$d['vnc']['object']['attrib']['id']        = 'vnc';
-			$d['vnc']['object']['attrib']['type']      = 'password';
-			$d['vnc']['object']['attrib']['value']     = $ini['OPENQRM_KVM_VM_VNCPASSWORD'];
-			$d['vnc']['object']['attrib']['maxlength'] = 50;
-
-			$d['vnc_1']['label']                         = $this->lang['form_vnc_repeat'];
-			$d['vnc_1']['required']                      = true;
-			$d['vnc_1']['object']['type']                = 'htmlobject_input';
-			$d['vnc_1']['object']['attrib']['name']      = 'vnc_1';
-			$d['vnc_1']['object']['attrib']['id']        = 'vnc_1';
-			$d['vnc_1']['object']['attrib']['type']      = 'password';
-			$d['vnc_1']['object']['attrib']['value']     = $ini['OPENQRM_KVM_VM_VNCPASSWORD'];
-			$d['vnc_1']['object']['attrib']['maxlength'] = 50;
-
-			$d['vnc_keymap']['label']                       = $this->lang['form_vnc_keymap'];
-			$d['vnc_keymap']['object']['type']              = 'htmlobject_select';
-			$d['vnc_keymap']['object']['attrib']['name']    = 'vnc_keymap';
-			$d['vnc_keymap']['object']['attrib']['index']   = array(0,1);
-			$d['vnc_keymap']['object']['attrib']['options'] = $keymaps;
-			$d['vnc_keymap']['object']['attrib']['selected']= array($ini['OPENQRM_KVM_VM_VNCKEYMAP']);
-
-			$form->add($d);
-			$response->form = $form;
-		} else {
-			$response->msg = $this->lang['error_no_bridge'];
-			$response->form = $form;
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Reload
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function reload() {
-		$command  = $this->openqrm->get('basedir').'/plugins/kvm/bin/openqrm-kvm-vm post_vm_config';
-		$command .=  ' -n '.$this->vm;
-		$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-		$id = $this->response->html->request()->get('appliance_id');
-		$appliance = new appliance();
-		$appliance->get_instance_by_id($id);
-		$resource = new resource();
-		$resource->get_instance_by_id($appliance->resources);
-		$file = $this->openqrm->get('basedir').'/plugins/kvm/web/kvm-stat/'.$resource->id.'.'.$this->vm.'.vm_config';
-		if($this->file->exists($file)) {
-			$this->file->remove($file);
-		}
-		$resource->send_command($resource->ip, $command);
-		while (!$this->file->exists($file)) // check if the data file has been modified
-		{
-		  usleep(10000); // sleep 10ms to unload the CPU
-		  clearstatcache();
-		}
-		return true;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.add.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.add.class.php
deleted file mode 100644
index 001b081..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.add.class.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-/**
- * KVM Add new Volume
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_add
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-		$this->controller = $controller;
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-		$this->user       = $openqrm->user();
-		$storage_id       = $this->response->html->request()->get('storage_id');
-		$storage          = new storage();
-		$resource         = new resource();
-		$deployment       = new deployment();
-		$this->volgroup   = $this->response->html->request()->get('volgroup');
-		$this->storage    = $storage->get_instance_by_id($storage_id);
-		$this->resource   = $resource->get_instance_by_id($storage->resource_id);
-		$this->deployment = $deployment->get_instance_by_id($storage->type);
-
-		$this->response->add('storage_id', $storage_id);
-		$this->response->add('volgroup', $this->volgroup);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$this->set_max();
-		$response = $this->add();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 3) {
-				$this->controller->__reload('lv');
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&image_id='.$response->image_id
-				);
-			} else {
-				$this->response->params['reload'] = 'false';
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'volgroup', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/kvm-add.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add(sprintf($this->lang['label'], $this->volgroup), 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['lang_name_generate'], 'lang_name_generate');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function add() {
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			if($form->get_request('size') > $this->max) {
-				$form->set_error('size', sprintf($this->lang['error_size_exeeded'], $this->max));
-			}
-			if(!$form->get_errors()) {
-				$name     = $form->get_request('name');
-				$create_type	= $form->get_request('type');
-				if ($create_type == '') {
-					$create_type = 'raw';
-				}
-				$command  = $this->openqrm->get('basedir').'/plugins/kvm/bin/openqrm-kvm add';
-				$command .= ' -n '.$name.' -m '.$form->get_request('size');
-				$command .= ' -o '.$create_type;
-				$command .= ' -t '.$this->deployment->type.' -v '.$this->volgroup;
-				$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode background';
-
-				$statfile = $this->openqrm->get('basedir').'/plugins/kvm/web/storage/'.$this->resource->id.'.'.$this->volgroup.'.lv.stat';
-				if ($this->file->exists($statfile)) {
-					$lines = explode("\n", $this->file->get_contents($statfile));
-					if(count($lines) >= 1) {
-						foreach($lines as $line) {
-							if($line !== '') {
-								$line = explode('@', $line);
-								$check = $line[1];
-								if($name === $check) {
-									$error = sprintf($this->lang['error_exists'], $name);
-								}
-							}
-						}
-					}
-				}
-				// check for image name
-				$image = new image();
-				$image->get_instance_by_name($name);
-				if ((isset($image->id)) && ($image->id > 1)) {
-					$error = sprintf($this->lang['error_exists'], $name);
-				}
-
-				if(isset($error)) {
-					$response->error = $error;
-				} else {
-					if($this->file->exists($statfile)) {
-						$this->file->remove($statfile);
-					}
-					$this->resource->send_command($this->resource->ip, $command);
-					while (!$this->file->exists($statfile)) {
-						usleep(10000); // sleep 10ms to unload the CPU
-						clearstatcache();
-					}
-					// add check that volume $name is now in the statfile
-					$created = false;
-					$bf_volume_path = "";
-					$lines = explode("\n", $this->file->get_contents($statfile));
-					if(count($lines) >= 1) {
-						foreach($lines as $line) {
-							if($line !== '') {
-								$line = explode('@', $line);
-								$check = $line[1];
-								if($name === $check) {
-									$created = true;
-									$bf_volume_path = $line[2];
-									break;
-								}
-							}
-						}
-					}
-
-					if ($created) {
-						$tables = $this->openqrm->get('table');
-						$image_fields = array();
-						$image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-						$image_fields['image_name'] = $name;
-						$image_fields['image_type'] = $this->deployment->type;
-						$image_fields['image_rootfstype'] = 'local';
-						$image_fields['image_storageid'] = $this->storage->id;
-						$image_fields['image_size'] = $form->get_request('size');
-						$image_fields['image_comment'] = "Image Object for volume $name";
-						switch($this->deployment->type) {
-						case 'kvm-lvm-deployment':
-							$image_fields['image_rootdevice'] = '/dev/'.$this->volgroup.'/'.$name;
-							break;
-						case 'kvm-bf-deployment':
-							$image_fields['image_rootdevice'] = $bf_volume_path;
-							break;
-						case 'kvm-gluster-deployment':
-							$image_fields['image_rootdevice'] = "gluster://".$this->resource->ip."/".$this->volgroup."/".$name;
-							break;
-						case 'kvm-ceph-deployment':
-							$image_fields['image_rootdevice'] = "rbd:".$this->volgroup."/".$name;
-							break;
-						}
-						$image = new image();
-						$image->add($image_fields);
-						$response->msg = sprintf($this->lang['msg_added'], $name);
-						// save image id in response for the wizard
-						$response->image_id = $image_fields["image_id"];
-
-					} else {
-						$response->msg = sprintf($this->lang['msg_add_failed'], $name);
-					}
-				}
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'add');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		// create the image type select array
-		$show_type_select = false;
-		switch($this->deployment->type) {
-			case 'kvm-bf-deployment':
-				$image_types[] = array('qcow2','qcow2');
-				$image_types[] = array('raw','raw');
-				$image_types[] = array('qcow','qcow');
-				$image_types[] = array('cow','cow');
-				$show_type_select = true;
-				break;
-		}
-
-		// if we come from the wizard suggest the server name
-		$vm_volume_name_suggestion = '';
-		if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 3) {
-			$appliance = new appliance();
-			$appliance->get_instance_by_id($this->user->wizard_id);
-			$vm_volume_name_suggestion = $appliance->name;
-		}
-		
-
-		$d['name']['label']                             = $this->lang['form_name'];
-		$d['name']['required']                          = true;
-		$d['name']['validate']['regex']                 = '/^[a-z0-9._]+$/i';
-		$d['name']['validate']['errormsg']              = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                    = 'htmlobject_input';
-		$d['name']['object']['attrib']['id']            = 'name';
-		$d['name']['object']['attrib']['name']          = 'name';
-		$d['name']['object']['attrib']['type']          = 'text';
-		$d['name']['object']['attrib']['css']           = 'namegen';
-		$d['name']['object']['attrib']['customattribs'] = 'data-prefix="kvm" data-length="6"';
-		$d['name']['object']['attrib']['value']         = $vm_volume_name_suggestion;
-		$d['name']['object']['attrib']['maxlength']     = 50;
-
-		$d['size']['label']                         = sprintf($this->lang['form_size'], number_format($this->max, 0, '', ''));
-		$d['size']['required']                      = true;
-		$d['size']['validate']['regex']             = '/^[0-9]+$/i';
-		$d['size']['validate']['errormsg']          = sprintf($this->lang['error_size'], '0-9');
-		$d['size']['object']['type']                = 'htmlobject_input';
-		$d['size']['object']['attrib']['name']      = 'size';
-		$d['size']['object']['attrib']['type']      = 'text';
-		$d['size']['object']['attrib']['value']     = '';
-		$d['size']['object']['attrib']['maxlength'] = 50;
-
-		if ($show_type_select) {
-			$d['type']['label']                       = $this->lang['form_type'];
-			$d['type']['object']['type']              = 'htmlobject_select';
-			$d['type']['object']['attrib']['name']    = 'type';
-			$d['type']['object']['attrib']['index']   = array(0,1);
-			$d['type']['object']['attrib']['options'] = $image_types;
-		} else {
-			$d['type'] = '';
-		}
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Set max
-	 *
-	 * @access protected
-	 * @return bool
-	 */
-	//--------------------------------------------
-	function set_max() {
-		$statfile = $this->openqrm->get('basedir').'/plugins/kvm/web/storage/'.$this->resource->id.'.vg.stat';
-		if ($this->file->exists($statfile)) {
-			$lines = explode("\n", $this->file->get_contents($statfile));
-			if(count($lines) >= 1) {
-				foreach($lines as $line) {
-					if($line !== '') {
-						$line = explode('@', $line);
-						if($line[0] === $this->volgroup) {
-							$max = $line[6];
-							if(strpos($max, 'g') !== false) {
-								$max = str_replace('g', '', $max);
-								$max = floor(($max * 1000) * 1.0486);
-								$this->max = $max;
-								return true;
-							} else {
-								$max = str_replace('m', '', $max);
-								$max = (int)$max;
-								$this->max = $max;
-								return true;
-							}
-						}
-					}
-				}
-			} else {
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.addvg.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.addvg.class.php
deleted file mode 100644
index d2dca1f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.addvg.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * KVM Add Volume Group
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-require_once($_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/device-manager/class/device-manager.addvg.class.php');
-class kvm_addvg extends device_manager_addvg { }
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.api.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.api.class.php
deleted file mode 100644
index 7a5f8c8..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.api.class.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * kvm api
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_api
-{
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param object $controller
-	 */
-	//--------------------------------------------
-	function __construct($controller) {
-		$this->controller = $controller;
-		$this->user       = $this->controller->user;
-		$this->html       = $this->controller->response->html;
-		$this->response   = $this->html->response();
-		$this->file       = $this->controller->file;
-		#$this->admin      = $this->controller->openqrm->admin();
-
-		#$id = $this->response->html->request()->get('appliance_id');
-		#if($id === '') {
-		#	return false;
-		#}
-		#// set ENV
-		#$this->response->params['appliance_id'] = $id;
-		#$appliance = new appliance();
-		#$resource  = new resource();
-
-		#$appliance->get_instance_by_id($id);
-		#$resource->get_instance_by_id($appliance->resources);
-
-		#$this->resource  = $resource;
-		#$this->appliance = $appliance;
-		#$this->statfile  = 'kvm-stat/'.$resource->id.'.pick_iso_config';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function action() {
-		$action = $this->html->request()->get($this->controller->actions_name);
-		switch( $action ) {
-			case 'progress':
-				$this->progress();
-			break;
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get progress
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function progress() {
-		$name = basename($this->response->html->request()->get('name'));
-		$file = $this->controller->openqrm->get('basedir').'/plugins/kvm/web/storage/'.$name;
-		if($this->file->exists($file)) {
-			echo $this->file->get_contents($file);
-		} else {
-			header("HTTP/1.0 404 Not Found");
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.clone.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.clone.class.php
deleted file mode 100644
index a3bed71..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.clone.class.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-/**
- * KVM clone Volume
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_clone
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response                 = $response;
-		$this->file                     = $openqrm->file();
-		$this->openqrm                  = $openqrm;
-		$this->user						= $openqrm->user();
-		$this->volgroup                 = $this->response->html->request()->get('volgroup');
-		$this->lvol                     = $this->response->html->request()->get('lvol');
-		$storage_id                     = $this->response->html->request()->get('storage_id');
-		$storage                        = new storage();
-		$resource                       = new resource();
-		$deployment                     = new deployment();
-		$this->storage                  = $storage->get_instance_by_id($storage_id);
-		$this->resource                 = $resource->get_instance_by_id($storage->resource_id);
-		$this->deployment               = $deployment->get_instance_by_id($storage->type);
-
-		$this->response->add('storage_id', $storage_id);
-		$this->response->add('volgroup', $this->volgroup);
-		$this->response->add('lvol', $this->lvol);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->duplicate();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 3) {
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&image_id='.$response->image_id
-				);
-			} else {
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'volgroup', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/kvm-clone.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add(sprintf($this->lang['label'], $this->lvol), 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * clone
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function duplicate() {
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			$name     = $form->get_request('name');
-			$command  = $this->openqrm->get('basedir').'/plugins/kvm/bin/openqrm-kvm clone';
-			$command .= ' -t '.$this->deployment->type;
-			$command .= ' -v '.$this->volgroup;
-			$command .= ' -n '.$this->lvol;
-			$command .= ' -s '.$name;
-			$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-			$command .= ' --caching false';
-			$command .= ' --openqrm-ui-user '.$this->user->name;
-			$command .= ' --openqrm-cmd-mode background';
-
-			$statfile = $this->openqrm->get('basedir').'/plugins/kvm/web/storage/'.$this->resource->id.'.'.$this->volgroup.'.lv.stat';
-			if ($this->file->exists($statfile)) {
-				$lines = explode("\n", $this->file->get_contents($statfile));
-				if(count($lines) >= 1) {
-					foreach($lines as $line) {
-						if($line !== '') {
-							$line = explode('@', $line);
-							$check = $line[1];
-							if($name === $check) {
-								$error = sprintf($this->lang['error_exists'], $name);
-							}
-						}
-					}
-				}
-			}
-			// check for image name
-			$image = new image();
-			$image->get_instance_by_name($name);
-			if ((isset($image->id)) && ($image->id > 1)) {
-			    $error = sprintf($this->lang['error_exists'], $name);
-			}
-
-			if(isset($error)) {
-				$response->error = $error;
-			} else {
-				$file = $this->openqrm->get('basedir').'/plugins/kvm/web/storage/'.$this->resource->id.'.lvm.'.$name.'.sync_progress';
-				if($this->file->exists($file)) {
-					$this->file->remove($file);
-				}
-				$root_device_ident = $this->openqrm->get('basedir').'/plugins/kvm/web/storage/'.$this->resource->id.'.'.$name.'.root_device';
-				if($this->file->exists($root_device_ident)) {
-					$this->file->remove($root_device_ident);
-				}
-				$this->resource->send_command($this->resource->ip, $command);
-				while (!$this->file->exists($file))
-				{
-				  usleep(10000);
-				  clearstatcache();
-				}
-				// wait for the root-device identifier
-				while (!$this->file->exists($root_device_ident))
-				{
-				  usleep(10000);
-				  clearstatcache();
-				}
-				$root_device = trim($this->file->get_contents($root_device_ident));
-				$this->file->remove($root_device_ident);
-
-				$tables = $this->openqrm->get('table');
-				$image_fields = array();
-				$image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$image_fields['image_name'] = $name;
-				$image_fields['image_type'] = $this->deployment->type;
-				$image_fields['image_rootfstype'] = 'local';
-				$image_fields['image_storageid'] = $this->storage->id;
-				$image_fields['image_comment'] = "Image Object for volume $name";
-				$image_fields['image_rootdevice'] = $root_device;
-				$image_fields['image_size'] = 0;
-				$image = new image();
-				$image->add($image_fields);
-				$response->image_id = $image_fields["image_id"];
-				$response->msg = sprintf($this->lang['msg_cloned'], $this->lvol, $name);
-			}
-
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'clone');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$d['name']['label']                         = $this->lang['form_name'];
-		$d['name']['required']                      = true;
-		$d['name']['validate']['regex']             = '/^[a-z0-9._]+$/i';
-		$d['name']['validate']['errormsg']          = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                = 'htmlobject_input';
-		$d['name']['object']['attrib']['name']      = 'name';
-		$d['name']['object']['attrib']['type']      = 'text';
-		$d['name']['object']['attrib']['value']     = $this->lvol.'c';
-		$d['name']['object']['attrib']['maxlength'] = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Set max
-	 *
-	 * @access protected
-	 * @return bool
-	 */
-	//--------------------------------------------
-	function set_max() {
-		$vgmax = '';
-		$kvmax = '';
-		$statfile = $this->openqrm->get('basedir').'/plugins/kvm/web/storage/'.$this->resource->id.'.'.$this->volgroup.'.lv.stat';
-		if ($this->file->exists($statfile)) {
-			$lines = explode("\n", $this->file->get_contents($statfile));
-			if(count($lines) >= 1) {
-				foreach($lines as $line) {
-					if($line !== '') {
-						$line = explode('@', $line);
-						if($line[1] === $this->lvol) {
-							$kvmax = str_replace('.', '', $line[4]);
-							$kvmax = str_replace('m', '', $kvmax);
-							$kvmax = (int)$kvmax / 100;
-						}
-					}
-				}
-			}
-		}
-		return $kvmax;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.controller.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.controller.class.php
deleted file mode 100644
index c81f67b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.controller.class.php
+++ /dev/null
@@ -1,793 +0,0 @@
-<?php
-/**
- * KVM Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array (
-		'tab' => 'Select KVM Host',
-		'label' => 'Select KVM Host',
-		'action_edit' => 'edit',
-		'table_name' => 'Name',
-		'table_id' => 'Id',
-		'table_recource' => 'Resource',
-		'table_type' => 'Type',
-		'table_deployment' => 'Deployment',
-		'title_vms' => 'Edit Virtual Machines',
-		'title_lvm' => 'Edit LVM Storage',
-		'title_bf' => 'Edit Blockfile Storage',
-		'title_glusterfs' => 'Edit GlusterFS Storage',
-		'error_no_storage' => '<b>No storage configured yet!</b><br><br>Please create a KVM first!',
-		'new_storage' => 'New Storage',
-		'network_manager' => 'Network',
-		'please_wait' => 'Loading Volume groups. Please wait ..',
-	), 
-	'edit' => array (
-		'tab' => 'Select Volume group',
-		'label' => 'Select Volume group on KVM %s',
-		'lang_id' => 'ID',
-		'lang_name' => 'Name',
-		'lang_resource' => 'Resource',
-		'lang_state' => 'State',
-		'lang_deployment' => 'Deployment',
-		'action_edit' => 'select',
-		'action_add' => 'Add new Volume Group',
-		'action_remove' => 'remove',
-		'table_name' => 'Name',
-		'table_pv' => 'PV',
-		'table_lv' => 'LV',
-		'table_sn' => 'SN',
-		'table_attr' => 'Attributes',
-		'table_vg' => 'Volue Group Details',
-		'table_bricks' => 'Gluster Bricks',
-		'table_type' => 'Type',
-		'table_status' => 'Status',
-		'table_topology' => 'Topology',
-		'table_transport' => 'Transport',
-		'table_vsize' => 'Size',
-		'table_vfree' => 'Free',
-		'error_no_kvm' => 'Storage %s is not of type kvm',
-		'please_wait' => 'Loading Volume group. Please wait ..',
-	),
-	'addvg' => array(
-		'tab' => 'Add Volume Group',
-		'label' => 'Add Volume Group to storage %s',
-		'partition' => 'Partition',
-		'name' => 'Name',
-		'extend' => 'extend partition',
-		'confirm_text' => 'All Data on %s will be erased.<br>Are you sure to continue?',
-		'msg_added' => 'Successfully added Volume Group %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..'
-	),
-	'removevg' => array(
-		'tab' => 'Remove Volume Group',
-		'label' => 'Remove Volume Group on storage %s',
-		'confirm_text' => 'Do you realy want to remove Volume Group %s?',
-		'msg_removed' => 'Successfully removed Volume Group %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..'
-	),
-	'volgroup' => array (
-		'tab' => 'Edit Volume group',
-		'label' => 'Edit Volume group %s on KVM %s',
-		'lang_id' => 'ID',
-		'lang_name' => 'Name',
-		'lang_deployment' => 'Deployment',
-		'lang_resource' => 'Resource',
-		'lang_state' => 'State',
-		'lang_attr' => 'Attributes',
-		'lang_pv' => 'PV / LV / SN',
-		'lang_size' => 'Size / Free',
-		'action_add' => 'Add new logical volume',
-		'action_remove' => 'remove',
-		'action_resize' => 'resize',
-		'action_snap' => 'snap',
-		'action_clone' => 'clone',
-		'action_add_image' => 'Add',
-		'action_sync' => 'Sync',
-		'action_remove_image' => 'Remove',
-		'action_sync_in_progress' => 'Source of synchronisation - Please wait', 
-		'action_clone_in_progress' => 'Synchronisation in progress - Please wait',
-		'action_clone_finished' => 'Syncronisation finished!',
-		'table_state' => 'State',
-		'table_name' => 'Lvol',
-		'table_deployment' => 'Deployment',
-		'table_attr' => 'Attributes',
-		'table_path' => 'Path',
-		'table_size' => 'Size',
-		'table_source' => 'Source',
-		'table_path_physical' => 'Physical',
-		'table_path_glusters' => 'Logical',
-		'error_no_kvm' => 'Storage %s is not of type kvm-deployment',
-		'please_wait' => 'Loading Volume group. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'add' => array (
-		'tab' => 'Add Logical Volume',
-		'label' => 'Add Logical Volume to Volume group %s',
-		'form_name' => 'Name',
-		'form_size' => 'Size (max: %s MB)',
-		'form_type' => 'Volume Type',
-		'msg_added' => 'Added Logical Volume %s',
-		'msg_add_failed' => 'Failed adding Logical Volume %s',
-		'error_exists' => 'Logical Volume %s allready exists',
-		'error_name' => 'Name must be %s',
-		'error_size' => 'Size must be %s',
-		'error_size_exeeded' => 'Size exeeds %s MB',
-		'lang_name_generate' => 'generate name',
-		'please_wait' => 'Adding Logical Volume. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'image' => array (
-		'label' => 'Add/Remove Image for Logical Volume %s',
-		'tab' => 'Add/Remove Image',
-		'error_exists' => 'Image %s allready exists',
-		'error_image_still_in_use' => 'Image id %s is still in use by Server(s) %s',
-		'msg_added_image' => 'Added Image %s',
-		'msg_removed_image' => 'Removed Image id %s',
-		'msg_synced_image' => 'Synced Image id %s',
-		'please_wait' => 'Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'snap' => array (
-		'label' => 'Snap Logical Volume %s',
-		'tab' => 'Snap Logical Volume',
-		'msg_snaped' => 'Snaped %s to %s',
-		'msg_snap_failed' => 'Snapping failed for %s to %s',
-		'form_name' => 'Name',
-		'form_size' => 'Size (max: %s MB)',
-		'error_exists' => 'Volume %s allready exists',
-		'error_name' => 'Name must be %s',
-		'error_size' => 'Size must be %s',
-		'error_size_exeeded' => 'Size exeeds %s MB',
-		'please_wait' => 'Snaping Logical Volume. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'clone' => array (
-		'label' => 'Clone Logical Volume %s',
-		'tab' => 'Clone Logical Volume',
-		'msg_cloned' => 'Cloned %s as %s',
-		'msg_clone_failed' => 'Clone failed for %s as %s',
-		'form_name' => 'Name',
-		'error_exists' => 'Volume %s allready exists',
-		'error_name' => 'Name must be %s',
-		'please_wait' => 'Cloning Logical Volume. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'remove' => array (
-		'label' => 'Delete Logical Volume(s)',
-		'msg_removed' => 'Deleted Logical Volume %s',
-		'msg_vm_image_still_in_use' => 'Volume %s of Image id %s is still in use by appliance(s) %s',
-		'please_wait' => 'Deleting Logical Volume(s). Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'resize' => array (
-		'label' => 'Resize Logical Volume %s',
-		'tab' => 'Resize Logical Volume',
-		'size' => 'min. %s MB, max. %s MB',
-		'error_size' => 'Size must be %s',
-		'error_size_exeeded' => 'Size exeeds %s MB',
-		'error_size_undercut' => 'Size undercuts %s MB',
-		'msg_resized' => 'Resized Logical Volume %s',
-		'please_wait' => 'Resizing Logical Volume. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/kvm/lang", 'kvm.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/kvm/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			if($this->action === 'addvg' || $this->action === 'removevg') {
-				$this->action = 'edit';
-			} else {
-				$this->action = 'volgroup';
-			}
-		}
-		if($this->action === '') {
-			$this->action = 'select';
-		}
-		// Set response and reload statfile
-		if($this->action !== 'select') {
-			$this->response->add('storage_id', $this->response->html->request()->get('storage_id'));
-			if($this->action !== 'remove' && $this->action !== 'addvg' && $this->action !== 'removevg') {
-				$this->__reload('vg');
-			}
-			if($this->action !== 'edit') {
-				$this->response->add('volgroup', $this->response->html->request()->get('volgroup'));
-			}
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'edit':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-			break;
-			case 'addvg':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->addvg(true);
-			break;
-			case 'removevg':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->removevg(true);
-			break;
-			case 'volgroup':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->volgroup(true);
-			break;
-			case 'add':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->volgroup(false);
-				$content[] = $this->add(true);
-			break;
-			case 'resize':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->volgroup(false);
-				$content[] = $this->resize(true);
-			break;
-			case 'image':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->volgroup(false);
-				$content[] = $this->image(true);
-			break;
-			case 'snap':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->volgroup(false);
-				$content[] = $this->snap(true);
-			break;
-			case 'clone':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->volgroup(false);
-				$content[] = $this->duplicate(true);
-			break;
-			case 'remove':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->volgroup(false);
-				$content[] = $this->remove(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->rootdir.'/plugins/kvm/class/kvm.api.class.php');
-		$controller = new kvm_api($this);
-		$controller->action();
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Select Storages of type KVM
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm-vm.select.class.php');
-			$controller = new kvm_vm_select($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Edit KVM
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function edit( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm.edit.class.php');
-			$controller                  = new kvm_edit($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$controller->lang            = $this->lang['edit'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['edit']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'edit' );
-		$content['onclick'] = false;
-		if($this->action === 'edit'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add lvm volume group
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function addvg( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm.addvg.class.php');
-			$controller                  = new kvm_addvg($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->rootdir.'/plugins/device-manager/tpl/';
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$controller->lang            = $this->lang['addvg'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['addvg']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'addvg' );
-		$content['onclick'] = false;
-		if($this->action === 'addvg'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove lvm volume group
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function removevg( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm.removevg.class.php');
-			$controller                  = new kvm_removevg($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->rootdir.'/plugins/device-manager/tpl/';
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$controller->lang            = $this->lang['removevg'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['removevg']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'removevg' );
-		$content['onclick'] = false;
-		if($this->action === 'removevg'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit KVM volgroup
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function volgroup( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			if($this->response->html->request()->get('reload') !== 'false') {
-				$this->__reload('lv');
-			}
-			require_once($this->rootdir.'/plugins/kvm/class/kvm.volgroup.class.php');
-			$controller                  = new kvm_volgroup($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$controller->lang            = $this->lang['volgroup'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['volgroup']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'volgroup' );
-		$content['onclick'] = false;
-		if($this->action === 'volgroup'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Add new Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function add( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm.add.class.php');
-			$controller                = new kvm_add($this->openqrm, $this->response, $this);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['add'];
-			$controller->rootdir       = $this->rootdir;
-			$controller->prefix_tab    = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['add']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'add' );
-		$content['onclick'] = false;
-		if($this->action === 'add'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Remove Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function remove( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm.remove.class.php');
-			$controller                  = new kvm_remove($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['remove'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Remove';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'remove' );
-		$content['onclick'] = false;
-		if($this->action === 'remove' || $this->action === $this->lang['volgroup']['action_remove']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Add/Remvoe Image object
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function image( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm.image.class.php');
-			$controller                  = new kvm_image($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['image'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['image']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'image' );
-		$content['onclick'] = false;
-		if($this->action === 'image'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Snapshot Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function snap( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm.snap.class.php');
-			$controller                  = new kvm_snap($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['snap'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['snap']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'snap' );
-		$content['onclick'] = false;
-		if($this->action === 'snap' || $this->action === $this->lang['edit']['action_snap']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-	//--------------------------------------------
-	/**
-	 * Clone Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function duplicate( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm.clone.class.php');
-			$controller                  = new kvm_clone($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['clone'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['clone']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'clone' );
-		$content['onclick'] = false;
-		if($this->action === 'clone' || $this->action === $this->lang['edit']['action_clone']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Resize Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function resize( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/kvm/class/kvm.resize.class.php');
-			$controller                  = new kvm_resize($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['resize'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['resize']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'resize' );
-		$content['onclick'] = false;
-		if($this->action === 'resize'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Reload Exports
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function __reload($mode) {
-		$OPENQRM_SERVER_BASE_DIR = $this->openqrm->get('basedir');
-
-		$storage_id = $this->response->html->request()->get('storage_id');
-		$volgroup   = $this->response->html->request()->get('volgroup');
-
-		$storage = new storage();
-		$resource = new resource();
-		$deployment = new deployment();
-
-		$storage->get_instance_by_id($storage_id);
-		$resource->get_instance_by_id($storage->resource_id);
-		$deployment->get_instance_by_id($storage->type);
-
-		$command = '';
-		$file = '';
-		// reload volume group
-		if($mode === 'vg') {
-			$file = $OPENQRM_SERVER_BASE_DIR.'/plugins/kvm/web/storage/'.$resource->id.'.vg.stat';
-			$command .= $OPENQRM_SERVER_BASE_DIR.'/plugins/kvm/bin/openqrm-kvm post_vg -t '.$deployment->type;
-		}
-		// reload logical volumes
-		if($mode === 'lv') {
-			$file = $OPENQRM_SERVER_BASE_DIR.'/plugins/kvm/web/storage/'.$resource->id.'.'.$volgroup.'.lv.stat';
-			$command .= $OPENQRM_SERVER_BASE_DIR.'/plugins/kvm/bin/openqrm-kvm post_lv';
- 			$command .=  ' -v '.$volgroup.' -t '.$deployment->type;
-		}
-		$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-		$command .= ' --openqrm-ui-user '.$this->user->name;
-		$command .= ' --openqrm-cmd-mode background';
-		if($this->file->exists($file)) {
-			$this->file->remove($file);
-		}
-		$resource->send_command($resource->ip, $command);
-		while (!$this->file->exists($file)) // check if the data file has been modified
-		{
-		  usleep(10000); // sleep 10ms to unload the CPU
-		  clearstatcache();
-		}
-		return true;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.edit.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.edit.class.php
deleted file mode 100644
index 6d8460b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.edit.class.php
+++ /dev/null
@@ -1,331 +0,0 @@
-<?php
-/**
- * KVM Edit Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_edit
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_identifier';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-
-		$this->response->add('storage_id', $this->response->html->request()->get('storage_id'));
-	}
-
-	//--------------------------------------------
-	/**
-	 * Init
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function init() {
-		$storage_id = $this->response->html->request()->get('storage_id');
-		if($storage_id === '') {
-			return false;
-		}
-		// set ENV
-		$deployment = new deployment();
-		$storage    = new storage();
-		$resource   = new resource();
-
-		$storage->get_instance_by_id($storage_id);
-		$resource->get_instance_by_id($storage->resource_id);
-		$deployment->get_instance_by_id($storage->type);
-
-		$this->resource   = $resource;
-		$this->storage    = $storage;
-		$this->deployment = $deployment;
-		$this->statfile   = $this->openqrm->get('basedir').'/plugins/kvm/web/storage/'.$resource->id.'.vg.stat';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$this->init();
-		$data = $this->edit();
-		if($data !== false) {
-			$t = $this->response->html->template($this->tpldir.'/kvm-edit.tpl.php');
-			$t->add($this->response->html->thisfile, "thisfile");
-			$t->add($data);
-			$t->add($this->lang['lang_id'], 'lang_id');
-			$t->add($this->lang['lang_name'], 'lang_name');
-			$t->add($this->lang['lang_resource'], 'lang_resource');
-			$t->add($this->lang['lang_deployment'], 'lang_deployment');
-			$t->add($this->lang['lang_state'], 'lang_state');
-			$t->add($this->openqrm->get('baseurl'), 'baseurl');
-			$t->add(sprintf($this->lang['label'], $data['name']), 'label');
-			return $t;
-		} else {
-			$msg = sprintf($this->lang['error_no_kvm'], $this->response->html->request()->get('storage_id'));
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $msg)
-			);
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return array|false
-	 */
-	//--------------------------------------------
-	function edit() {
-		if(strpos($this->deployment->type, 'kvm') !== false) {
-
-			// check device-manager
-			$devicemgm = false;
-			if($this->file->exists($this->openqrm->get('webdir').'/plugins/device-manager/class/device-manager.addvg.class.php')) {
-				$devicemgm = true;
-			}
-
-			$d['state'] = '<span class="pill '.$this->resource->state.'">'.$this->resource->state.'</span>';
-			$d['resource'] = $this->resource->id.' / '.$this->resource->ip;
-			$d['deployment'] = $this->deployment->type;
-			$d['name'] = $this->storage->name;
-			$d['id'] = $this->storage->id;
-
-			$body = array();
-			$file = $this->statfile;
-			if($this->file->exists($file)) {
-				$lines = explode("\n", $this->file->get_contents($file));
-				if(count($lines) >= 1) {
-					$i = 0;
-					foreach($lines as $line) {
-						if($line !== '') {
-							$line  = explode('@', $line);
-							$name  = substr($line[0], strripos($line[0], '/'));
-
-							//handle format send by df
-							$line[5] = str_replace('MB', '.00', $line[5]);
-							$line[6] = str_replace('MB', '.00', $line[6]);
-
-							$vsize = number_format(substr($line[5], 0, strpos($line[5], '.')), 0, '', '').' MB';
-							$vfree = str_replace('m', '', $line[6]);
-							if($vfree !== '0') {
-								$vfree = number_format(substr($line[6], 0, strpos($line[6], '.')), 0, '', '');
-							}
-							$a = $this->response->html->a();
-							$a->title   = $this->lang['action_edit'];
-							$a->label   = $this->lang['action_edit'];
-							$a->handler = 'onclick="wait();"';
-							$a->css     = 'edit';
-							$a->href    = $this->response->get_url($this->actions_name, "volgroup").'&volgroup='.$name;
-
-							if($d['deployment'] === 'kvm-lvm-deployment') {
-								$body[$i] = array(
-									'name' => $name,
-									'pv' => $line[1],
-									'lv' => $line[2],
-									'sn' => $line[3],
-									'attr' => $line[4],
-									'vsize' => $vsize,
-									'vfree' => $vfree.' MB',
-									'action' => $a->get_string(),
-								);
-								if($devicemgm === true) {
-									if($line[2] === '0' && $line[3] === '0') {
-										$a = $this->response->html->a();
-										$a->title   = $this->lang['action_remove'];
-										$a->label   = $this->lang['action_remove'];
-										$a->handler = 'onclick="wait();"';
-										$a->css     = 'remove';
-										$a->href    = $this->response->get_url($this->actions_name, "removevg").'&volgroup='.$name;
-										$body[$i]['action'] = $body[$i]['action'].$a->get_string();
-									}
-								}
-							}
-							if($d['deployment'] === 'kvm-bf-deployment') {
-								$body[$i] = array(
-									'name'   => $name,
-									'vsize' => $vsize,
-									'vfree' => $vfree.' MB',
-									'attr' => '&#160;',
-									'action' => $a->get_string(),
-								);
-							}
-							if($d['deployment'] === 'kvm-gluster-deployment') {
-								$vg  = '<b>'.$this->lang['table_type'].'</b>: '.$line[1].'<br>';
-								$vg .= '<b>'.$this->lang['table_status'].'</b>: '.$line[2].'<br>';
-								$vg .= '<b>'.$this->lang['table_topology'].'</b>: '.$line[3].'<br>';
-								$vg .= '<b>'.$this->lang['table_transport'].'</b>: '.$line[4];
-								$brick_arr  = explode(',', $line[7]);
-								$bricks  = '';
-								foreach($brick_arr as $brick) {
-									$bricks  .= '<b>'.$brick.'</b><br>';
-								}
-								$body[$i] = array(
-									'name'   => $name,
-									'vg' => $vg,
-									'bricks' => $bricks,
-									'vsize' => $vsize,
-									'vfree' => $vfree.' MB',
-									'action' => $a->get_string(),
-								);
-							}
-							if($d['deployment'] === 'kvm-ceph-deployment') {
-								$body[$i] = array(
-									'name'   => $name,
-									'poolid' => $line[1],
-									'vusedpercent' => $line[3].' %',
-									'vused' => $line[4].' MB',
-									'available' => $line[6].' MB',
-									'objects' => $line[2],
-									'action' => $a->get_string(),
-								);
-							}
-
-						}
-						$i++;
-					}
-				}
-			}
-
-			if($d['deployment'] === 'kvm-lvm-deployment') {
-				$h['name']['title'] = $this->lang['table_name'];
-				$h['vsize']['title'] = $this->lang['table_vsize'];
-				$h['vfree']['title'] = $this->lang['table_vfree'];
-				$h['pv']['title'] = $this->lang['table_pv'];
-				$h['lv']['title'] = $this->lang['table_lv'];
-				$h['sn']['title'] = $this->lang['table_sn'];
-				$h['attr']['title'] = $this->lang['table_attr'];
-				$h['action']['title'] = '&#160;';
-				$h['action']['sortable'] = false;
-			}
-			if($d['deployment'] === 'kvm-bf-deployment') {
-				$h['name']['title'] = $this->lang['table_name'];
-				$h['vsize']['title'] = $this->lang['table_vsize'];
-				$h['vfree']['title'] = $this->lang['table_vfree'];
-				$h['attr']['title'] =  '&#160;';
-				$h['attr']['sortable'] = false;
-				$h['action']['title'] = '&#160;';
-				$h['action']['sortable'] = false;
-			}
-			if($d['deployment'] === 'kvm-gluster-deployment') {
-				$h['name']['title'] = $this->lang['table_name'];
-				$h['vg']['title'] = $this->lang['table_vg'];
-				$h['bricks']['title'] = $this->lang['table_bricks'];
-				$h['vsize']['title'] = $this->lang['table_vsize'];
-				$h['vfree']['title'] = $this->lang['table_vfree'];
-				$h['edit']['title'] = '&#160;';
-				$h['edit']['sortable'] = false;
-			}
-			if($d['deployment'] === 'kvm-ceph-deployment') {
-				$h['name']['title'] = $this->lang['table_name'];
-				$h['poolid']['title'] = $this->lang['lang_id'];
-				$h['vusedpercent']['title'] = $this->lang['table_vusedpercent'];
-				$h['vusedpercent']['title'] = $this->lang['table_vusedpercent'];
-				$h['vused']['title'] = $this->lang['table_vused'];
-				$h['vused']['title'] = $this->lang['table_vused'];
-				$h['available']['title'] = $this->lang['table_available'];
-				$h['available']['title'] = $this->lang['table_available'];
-				$h['objects']['title'] = $this->lang['table_objects'];
-				$h['objects']['title'] = $this->lang['table_objects'];
-				$h['action']['title'] = '&#160;';
-				$h['action']['sortable'] = false;
-			}
-
-			$table = $this->response->html->tablebuilder('kvm_edit', $this->response->get_array($this->actions_name, 'edit'));
-			$table->sort            = 'name';
-			$table->limit           = 10;
-			$table->offset          = 0;
-			$table->order           = 'ASC';
-			$table->max             = count($body);
-			$table->autosort        = true;
-			$table->sort_link       = false;
-			$table->id              = 'Tabelle';
-			$table->css             = 'htmlobject_table';
-			$table->border          = 1;
-			$table->cellspacing     = 0;
-			$table->cellpadding     = 3;
-			$table->form_action     = $this->response->html->thisfile;
-			$table->head            = $h;
-			$table->body            = $body;
-
-			$d['add'] = '';
-			if($devicemgm === true && $d['deployment'] === 'kvm-lvm-deployment') {
-				$a = $this->response->html->a();
-				$a->title   = $this->lang['action_add'];
-				$a->label   = $this->lang['action_add'];
-				$a->handler = 'onclick="wait();"';
-				$a->css     = 'add';
-				$a->href    = $this->response->get_url($this->actions_name, "addvg");
-				$d['add'] = $a->get_string();
-			}
-
-			$d['table'] = $table->get_string();
-			return $d;
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.image.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.image.class.php
deleted file mode 100644
index c89ef65..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.image.class.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/**
- * KVM Adds/Removes an Image from a Volume
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_image
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-		$this->user       = $openqrm->user();
-		$storage_id       = $this->response->html->request()->get('storage_id');
-		$storage          = new storage();
-		$resource         = new resource();
-		$deployment       = new deployment();
-		$this->volgroup   = $this->response->html->request()->get('volgroup');
-		$this->storage    = $storage->get_instance_by_id($storage_id);
-		$this->resource   = $resource->get_instance_by_id($storage->resource_id);
-		$this->deployment = $deployment->get_instance_by_id($storage->type);
-
-		$this->response->add('storage_id', $storage_id);
-		$this->response->add('volgroup', $this->volgroup);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->image();
-		$this->response->params['reload'] = 'false';
-		$this->response->redirect(
-			$this->response->get_url($this->actions_name, 'volgroup', $this->message_param, $response)
-		);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add/Remove image object
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function image() {
-		$response = '';
-		$errors       = array();
-		$message      = array();
-		$image_command = $this->response->html->request()->get('image_command');
-
-		if( $image_command !== '' ) {
-			switch ($image_command) {
-				case 'add':
-					$root_device = $this->response->html->request()->get('root_device');
-					if ($this->deployment->type == 'kvm-gluster-deployment') {
-						$image_name = $this->response->html->request()->get('image_name');
-					} else {
-						$image_name = basename($root_device);
-					}
-
-					// check if image name is not in use yet
-					$image = new image();
-					$image->get_instance_by_name($image_name);
-					if (strlen($image->id)) {
-						$errors[] = sprintf($this->lang['error_exists'], $image_name);
-					} else {
-						$tables = $this->openqrm->get('table');
-						$image_fields = array();
-						$image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-						$image_fields['image_name'] = $image_name;
-						$image_fields['image_type'] = $this->deployment->type;
-						$image_fields['image_rootfstype'] = 'local';
-						$image_fields['image_storageid'] = $this->storage->id;
-						$image_fields['image_comment'] = "Image Object for volume $image_name";
-						$image_fields['image_rootdevice'] = $root_device;
-						$image_fields['image_size'] = $this->response->html->request()->get('size');
-						$image = new image();
-						$image->add($image_fields);
-						$message[] = sprintf($this->lang['msg_added_image'], $image_name);
-					}
-					break;
-
-				case 'remove':
-					$image_id = $this->response->html->request()->get('image_id');
-					// check if image is not in use any more before removing
-					$remove_error = 0;
-					$appliance = new appliance();
-					$appliance_id_list = $appliance->get_all_ids();
-					foreach($appliance_id_list as $appliance_list) {
-						$appliance_id = $appliance_list['appliance_id'];
-						$app_image_remove_check = new appliance();
-						$app_image_remove_check->get_instance_by_id($appliance_id);
-						if ($app_image_remove_check->imageid == $image_id) {
-							$image_is_used_by_appliance .= $appliance_id." ";
-							$remove_error = 1;
-						}
-					}
-					if ($remove_error == 1) {
-						$errors[] = sprintf($this->lang['error_image_still_in_use'], $image_id, $image_is_used_by_appliance);
-					} else {
-						$image_remove = new image();
-						$image_remove->remove($image_id);
-						$message[] = sprintf($this->lang['msg_removed_image'], $image_id);
-					}
-					break;
-				case 'sync':
-					$image_id = $this->response->html->request()->get('image_id');
-					$image = $this->openqrm->image();
-					$image_fields['image_size'] = $this->response->html->request()->get('size');
-					$image->update($image_id, $image_fields);
-					$message[] = sprintf($this->lang['msg_synced_image'], $image_id);
-					break;
-			}
-			if(count($errors) === 0) {
-				$response = join('<br>', $message);
-			} else {
-				$msg = array_merge($errors, $message);
-				$response = join('<br>', $msg);
-			}
-		} else {
-			$response = '';
-		}
-		return $response;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.remove.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.remove.class.php
deleted file mode 100644
index 8b97d09..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.remove.class.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/**
- * KVM Remove Volume(s)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_remove
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-		$this->user     = $openqrm->user();
-		$this->volgroup = $this->response->html->request()->get('volgroup');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->remove();
-		if(isset($response->msg)) {
-			$this->response->params['reload'] = 'false';
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'volgroup', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/kvm-remove.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function remove() {
-		$response = $this->get_response();
-		$lvols  = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		if( $lvols !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($lvols as $ex) {
-				$d['param_f'.$i]['label']                       = $ex;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $ex;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;		
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$name       = $this->openqrm->admin()->name;
-				$pass       = $this->openqrm->admin()->password;
-				$storage    = new storage();
-				$resource   = new resource();
-				$deployment = new deployment();
-
-				$storage->get_instance_by_id($this->response->html->request()->get('storage_id'));
-				$resource->get_instance_by_id($storage->resource_id);
-				$deployment->get_instance_by_id($storage->type);
-
-				$errors     = array();
-				$message    = array();
-				foreach($lvols as $key => $lvol) {
-					// check if an appliance is still using the volume as an image
-					$image = new image();
-					$image->get_instance_by_name($lvol);
-
-					// check if it is still in use
-					$appliance = new appliance();
-					$appliances_using_resource = $appliance->get_ids_per_image($image->id);
-					if (count($appliances_using_resource) > 0) {
-						$appliances_using_resource_str = implode(",", $appliances_using_resource[0]);
-						$errors[] = sprintf($this->lang['msg_vm_image_still_in_use'], $lvol, $image->id, $appliances_using_resource_str);
-					} else {
-						$command  = $this->openqrm->get('basedir').'/plugins/kvm/bin/openqrm-kvm remove';
-						$command .= ' -n '.$lvol;
-						$command .= ' -v '.$this->volgroup;
-						$command .= ' -t '.$deployment->type;
-						$command .= ' -u '.$name.' -p '.$pass;
-						$command .= ' --openqrm-ui-user '.$this->user->name;
-						$command .= ' --openqrm-cmd-mode background';
-
-						$file = $this->openqrm->get('basedir').'/plugins/kvm/web/storage/'.$resource->id.'.'.$this->volgroup.'.lv.stat';
-						if($this->file->exists($file)) {
-							$this->file->remove($file);
-						}
-						$resource->send_command($resource->ip, $command);
-						while (!$this->file->exists($file)) {
-							usleep(10000); // sleep 10ms to unload the CPU
-							clearstatcache();
-						}
-
-						$form->remove($this->identifier_name.'['.$key.']');
-						$message[] = sprintf($this->lang['msg_removed'], $lvol);
-						// remove the image of the volume
-						$image->remove_by_name($lvol);
-					}
-
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$this->response->add('storage_id', $this->response->html->request()->get('storage_id'));
-		$this->response->add('volgroup', $this->response->html->request()->get('volgroup'));
-		$this->response->add($this->identifier_name.'[]', '');
-
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'remove');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.removevg.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.removevg.class.php
deleted file mode 100644
index 6d2faee..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.removevg.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * KVM Remove Volume Group
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-require_once($_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/device-manager/class/device-manager.removevg.class.php');
-class kvm_removevg extends device_manager_removevg { }
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.resize.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.resize.class.php
deleted file mode 100644
index f265b79..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.resize.class.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?php
-/**
- * KVM resize Volume
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_resize
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response                 = $response;
-		$this->file                     = $openqrm->file();
-		$this->openqrm                  = $openqrm;
-		$this->user						= $openqrm->user();
-		$this->volgroup                 = $this->response->html->request()->get('volgroup');
-		$this->lvol                     = $this->response->html->request()->get('lvol');
-		$storage_id                     = $this->response->html->request()->get('storage_id');
-		$storage                        = new storage();
-		$resource                       = new resource();
-		$deployment                     = new deployment();
-		$this->storage                  = $storage->get_instance_by_id($storage_id);
-		$this->resource                 = $resource->get_instance_by_id($storage->resource_id);
-		$this->deployment               = $deployment->get_instance_by_id($storage->type);
-
-		$this->response->add('storage_id', $storage_id);
-		$this->response->add('volgroup', $this->volgroup);
-		$this->response->add('lvol', $this->lvol);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		
-		$response = $this->resize();
-		if(isset($response->msg)) {
-			$this->response->params['reload'] = 'false';
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'volgroup', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/kvm-resize.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add(sprintf($this->lang['label'], $this->lvol), 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * resize
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function resize() {
-		$this->set_max();
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			if ($this->deployment->type === 'kvm-lvm-deployment') {
-				if($form->get_request('size') > $this->max) {
-					$form->set_error('size', sprintf($this->lang['error_size_exeeded'], number_format($this->max, 0, '', '')));
-				}
-				if($form->get_request('size') < $this->min) {
-					$form->set_error('size', sprintf($this->lang['error_size_undercut'], number_format($this->min, 0, '', '')));
-				}
-			}
-			if(!$form->get_errors()) {
-				$name     = $form->get_request('name');
-				$command  = $this->openqrm->get('basedir').'/plugins/kvm/bin/openqrm-kvm resize';
-				$command .= ' -t '.$this->deployment->type;
-				$command .= ' -v '.$this->volgroup;
-				$command .= ' -n '.$this->lvol;
-				$command .= ' -m '.$form->get_request('size');
-				$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode background';
-
-				$statfile = $this->openqrm->get('basedir').'/plugins/kvm/web/storage/'.$this->resource->id.'.'.$this->volgroup.'.lv.stat';
-				if($this->file->exists($statfile)) {
-					$this->file->remove($statfile);
-				}
-				$this->resource->send_command($this->resource->ip, $command);
-				while (!$this->file->exists($statfile)) {
-					usleep(10000); // sleep 10ms to unload the CPU
-					clearstatcache();
-				}
-				$response->msg = sprintf($this->lang['msg_resized'], $this->lvol);
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'resize');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		
-		if ($this->deployment->type === 'kvm-ceph-deployment') {
-			$d['size']['label']                         = $this->lang['ceph_size'];
-		} else {
-			$d['size']['label']                         = sprintf($this->lang['size'],number_format($this->min, 0, '', ''), number_format($this->max, 0, '', ''));
-		}
-		$d['size']['required']                      = true;
-		$d['size']['validate']['regex']             = '/^[0-9]+$/i';
-		$d['size']['validate']['errormsg']          = sprintf($this->lang['error_size'], '0-9');
-		$d['size']['object']['type']                = 'htmlobject_input';
-		$d['size']['object']['attrib']['name']      = 'size';
-		$d['size']['object']['attrib']['type']      = 'text';
-		$d['size']['object']['attrib']['value']     = '';
-		$d['size']['object']['attrib']['maxlength'] = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Set min and max
-	 *
-	 * @access protected
-	 */
-	//--------------------------------------------
-	function set_max() {
-		$vgmax = '';
-		$kvmax = '';
-		$statfile = $this->openqrm->get('basedir').'/plugins/kvm/web/storage/'.$this->resource->id.'.'.$this->volgroup.'.lv.stat';
-		if ($this->file->exists($statfile)) {
-			$lines = explode("\n", $this->file->get_contents($statfile));
-			if(count($lines) >= 1) {
-				foreach($lines as $line) {
-					if($line !== '') {
-						$line = explode('@', $line);
-						if($line[1] === $this->lvol) {
-							$kvmax = str_replace('.', '', $line[4]);
-							$kvmax = str_replace('m', '', $kvmax);
-							$kvmax = (int)$kvmax / 100;
-							$this->min = $kvmax;
-						}
-					}
-				}
-			}
-		}
-		$statfile = $this->openqrm->get('basedir').'/plugins/kvm/web/storage/'.$this->resource->id.'.vg.stat';
-		if ($this->file->exists($statfile)) {
-			$lines = explode("\n", $this->file->get_contents($statfile));
-			if(count($lines) >= 1) {
-				foreach($lines as $line) {
-					if($line !== '') {
-						$line = explode('@', $line);
-						if($line[0] === $this->volgroup) {
-							$vgmax = str_replace('.', '', $line[6]);
-							$vgmax = str_replace('m', '', $vgmax);
-							$vgmax = (int)$vgmax / 100;
-							$this->max = $vgmax + $kvmax;
-						}
-					}
-				}
-			}
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.select.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.select.class.php
deleted file mode 100644
index bdd2335..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.select.class.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-/**
- * KVM Select Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$table = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/kvm-select.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($table, 'table');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return htmlobject_tablebulider | htmlobject_div
-	 */
-	//--------------------------------------------
-	function select() {
-		// set ENV
-		$deployment = new deployment();
-		$storage    = new storage();
-		$resource   = new resource();
-		$type       = $this->response->html->request()->get('storage_type');
-		if($type === '') {
-			$type = 'kvm';
-		}
-		$deployment->get_instance_by_type($type);
-		$storages = $storage->display_overview(0, $storage->get_count(), 'storage_id', 'ASC');
-		$b = array();
-		if(count($storages) >= 1) {
-			foreach($storages as $k => $v) {
-				$storage->get_instance_by_id($v["storage_id"]);
-				$resource->get_instance_by_id($storage->resource_id);
-				$deployment->get_instance_by_id($storage->type);
-				if($deployment->storagetype === 'kvm') {
-					$resource_icon_default = "/img/resource.png";
-					$storage_icon = "/plugins/kvm/img/plugin.png";
-					$state_icon = $this->openqrm->get('baseurl')."/img/".$resource->state.".png";
-					if ($this->file->exists($this->openqrm->get('webdir').$storage_icon)) {
-						$resource_icon_default = $storage_icon;
-					}
-					$resource_icon_default = $this->openqrm->get('baseurl').$resource_icon_default;
-
-					$a = $this->response->html->a();
-					$a->title   = $this->lang['action_edit'];
-					$a->label   = $this->lang['action_edit'];
-					$a->handler = 'onclick="wait();"';
-					$a->css     = 'edit';
-					$a->href    = $this->response->get_url($this->actions_name, "edit").'&storage_id='.$storage->id;
-
-					$data  = '<b>'.$this->lang['table_recource'].':</b> '.$resource->id.' / '.$resource->ip.'<br>';
-					$data .= '<b>'.$this->lang['table_type'].':</b> '.$deployment->storagetype.'<br>';
-					$data .= '<b>'.$this->lang['table_deployment'].':</b> '.$deployment->storagedescription.'<br>';
-
-					$b[] = array(
-						'state' => '<img width="24" height="24" src="'.$state_icon.'" alt="State">',
-						'icon' => '<img width="24" height="24" src="'.$resource_icon_default.'" alt="Icon">',
-						'storage_id' => $storage->id,
-						'name' => $storage->name,
-						'storage_resource_id' => $storage->resource_id,
-						'deployment' => $deployment->storagedescription,
-						'data' => $data,
-						'comment' => '',
-						'edit' => $a->get_string(),
-					);
-				}
-			}
-
-			$h = array();
-			$h['state'] = array();
-			$h['state']['title'] ='&#160;';
-			$h['state']['sortable'] = false;
-			$h['icon'] = array();
-			$h['icon']['title'] ='&#160;';
-			$h['icon']['sortable'] = false;
-			$h['storage_id'] = array();
-			$h['storage_id']['title'] = $this->lang['table_id'];
-			$h['name'] = array();
-			$h['name']['title'] = $this->lang['table_name'];
-			$h['storage_resource_id'] = array();
-			$h['storage_resource_id']['title'] = $this->lang['table_recource'];
-			$h['storage_resource_id']['hidden'] = true;
-			$h['data'] = array();
-			$h['data']['title'] = '&#160;';
-			$h['data']['sortable'] = false;
-			$h['deployment'] = array();
-			$h['deployment']['title'] = $this->lang['table_deployment'];
-			$h['deployment']['hidden'] = true;
-			$h['comment'] = array();
-			$h['comment']['title'] ='&#160;';
-			$h['comment']['sortable'] = false;
-			$h['edit'] = array();
-			$h['edit']['title'] = '&#160;';
-			$h['edit']['sortable'] = false;
-
-			$table = $this->response->html->tablebuilder('kvm', $this->response->get_array($this->actions_name, 'select'));
-			$table->sort      = 'storage_id';
-			$table->limit     = 10;
-			$table->offset    = 0;
-			$table->order     = 'ASC';
-			$table->max       = count($b);
-			$table->autosort  = false;
-			$table->sort_link = false;
-			$table->autosort  = true;
-
-			$table->id = 'Tabelle';
-			$table->css = 'htmlobject_table';
-			$table->border = 1;
-			$table->cellspacing = 0;
-			$table->cellpadding = 3;
-			$table->form_action = $this->response->html->thisfile;
-			$table->head = $h;
-			$table->body = $b;
-			return $table->get_string();
-		} else {
-			$a = $this->response->html->a();
-			$a->title   = $this->lang['new_storage'];
-			$a->label   = $this->lang['new_storage'];
-			$a->handler = 'onclick="wait();"';
-			$a->css     = 'add';
-			$a->href    = $this->response->html->thisfile.'?base=storage&storage_action=add';
-
-			$box = $this->response->html->div();
-			$box->id = 'Tabelle';
-			$box->css = 'htmlobject_box';
-			$content  = $this->lang['error_no_storage'].'<br><br>';
-			$content .= $a->get_string();
-			$box->add($content);
-			return $box->get_string();
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.snap.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.snap.class.php
deleted file mode 100644
index ab0fc49..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.snap.class.php
+++ /dev/null
@@ -1,375 +0,0 @@
-<?php
-/**
- * KVM snap Volume
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_snap
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-		$this->user	  = $openqrm->user();
-		$this->lvol       = $this->response->html->request()->get('lvol');
-		$this->volgroup   = $this->response->html->request()->get('volgroup');
-		$storage_id       = $this->response->html->request()->get('storage_id');
-		$storage          = new storage();
-		$resource         = new resource();
-		$deployment       = new deployment();
-		$this->storage    = $storage->get_instance_by_id($storage_id);
-		$this->resource   = $resource->get_instance_by_id($storage->resource_id);
-		$this->deployment = $deployment->get_instance_by_id($storage->type);
-
-		$this->response->add('storage_id', $storage_id);
-		$this->response->add('volgroup', $this->volgroup);
-		$this->response->add('lvol', $this->lvol);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$this->set_max();
-		$response = $this->snap();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 3) {
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&image_id='.$response->image_id
-				);
-			} else {
-				$this->response->params['reload'] = 'false';
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'volgroup', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/kvm-snap.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add(sprintf($this->lang['label'], $this->lvol), 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * snap
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function snap() {
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			if($form->get_request('size') > $this->max) {
-				$form->set_error('size', sprintf($this->lang['error_size_exeeded'], number_format($this->max, 0, '', '')));
-			}
-			if(!$form->get_errors()) {
-
-				$name     = $form->get_request('name');
-				$name_check = $name;
-				$command  = $this->openqrm->get('basedir').'/plugins/kvm/bin/openqrm-kvm snap';
-				$command .= ' -t '.$this->deployment->type;
-				$command .= ' -v '.$this->volgroup;
-				$command .= ' -n '.$this->lvol;
-				if ($this->deployment->type == 'kvm-lvm-deployment') {
-					// snapshot size is only valid for kvm-lvm-deployment
-					$command .= ' -m '.$form->get_request('size');
-				}
-				$command .= ' -s '.$name;
-				$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode background';
-
-				$statfile = $this->openqrm->get('basedir').'/plugins/kvm/web/storage/'.$this->resource->id.'.'.$this->volgroup.'.lv.stat';
-				if ($this->file->exists($statfile)) {
-					$lines = explode("\n", $this->file->get_contents($statfile));
-					if(count($lines) >= 1) {
-						foreach($lines as $line) {
-							if($line !== '') {
-								$line = explode('@', $line);
-								$check = $line[1];
-								if ($this->deployment->type == 'kvm-ceph-deployment') {
-									$check = str_replace('%', '@', $check);
-									$name_check = $this->lvol."@".$name;
-								}
-								if($name_check === $check) {
-									$error = sprintf($this->lang['error_exists'], $name);
-								}
-							}
-						}
-					}
-				}
-				// check for image name
-				$image = new image();
-				$image->get_instance_by_name($name);
-				if ((isset($image->id)) && ($image->id > 1)) {
-					$error = sprintf($this->lang['error_exists'], $name);
-				}
-
-				if(isset($error)) {
-					$response->error = $error;
-				} else {
-
-					// create the image
-					$tables = $this->openqrm->get('table');
-					$image_fields = array();
-					$image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					if ($this->deployment->type == 'kvm-ceph-deployment') {
-						$image_fields['image_name'] = $this->lvol . "@" . $name;
-						$image_origin = new image();
-						$image_origin->get_instance_by_name($this->lvol);
-						$image_fields['image_size'] = $image_origin->size;
-					} else  {
-						$image_fields['image_name'] = $name;
-						$image_fields['image_size'] = 0;
-					}
-					$image_fields['image_type'] = $this->deployment->type;
-					$image_fields['image_rootfstype'] = 'local';
-					$image_fields['image_storageid'] = $this->storage->id;
-					$image_fields['image_comment'] = "Image Object for volume $name";
-					$image = $this->openqrm->image();
-					$image->add($image_fields);
-
-					if($this->file->exists($statfile)) {
-						$this->file->remove($statfile);
-					}
-					$this->resource->send_command($this->resource->ip, $command);
-					while (!$this->file->exists($statfile)) {
-						usleep(10000); // sleep 10ms to unload the CPU
-						clearstatcache();
-					}
-
-					$created = false;
-					$bf_volume_path = "";
-					$lines = explode("\n", $this->file->get_contents($statfile));
-					if(count($lines) >= 1) {
-						foreach($lines as $line) {
-							if($line !== '') {
-								$line = explode('@', $line);
-								$check = $line[1];
-								if ($this->deployment->type == 'kvm-ceph-deployment') {
-									$check = str_replace('%', '@', $check);
-									$name_check = $this->lvol."@".$name;
-								}
-								if($name_check === $check) {
-									$created = true;
-									$bf_volume_path = $line[2];
-									break;
-								}
-							}
-						}
-					}
-
-					if ($created) {
-						// set image rootdevice
-						switch($this->deployment->type) {
-							case 'kvm-lvm-deployment':
-								$rootdevice = '/dev/'.$this->volgroup.'/'.$name;
-								break;
-							case 'kvm-bf-deployment':
-								$rootdevice = $bf_volume_path;
-								break;
-							case 'kvm-gluster-deployment':
-								$rootdevice = "gluster://".$this->resource->ip."/".$this->volgroup."/".$name;
-								break;
-							case 'kvm-ceph-deployment':
-								$rootdevice = "rbd:".$this->volgroup."/".$this->lvol."@".$name;
-								break;
-							}
-						$image->update($image_fields["image_id"], array('image_rootdevice' => $rootdevice));
-						$response->image_id = $image_fields["image_id"];
-						$response->msg = sprintf($this->lang['msg_snaped'], $this->lvol, $name);
-					} else {
-						// if created failed remove the image
-						$image->remove_by_name($name);
-						$response->msg = sprintf($this->lang['msg_snap_failed'], $this->lvol, $name);
-					}
-				}
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'snap');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$d['name']['label']                         = $this->lang['form_name'];
-		$d['name']['required']                      = true;
-		$d['name']['validate']['regex']             = '/^[a-z0-9._]+$/i';
-		$d['name']['validate']['errormsg']          = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                = 'htmlobject_input';
-		$d['name']['object']['attrib']['name']      = 'name';
-		$d['name']['object']['attrib']['type']      = 'text';
-		$d['name']['object']['attrib']['value']     = $this->lvol.'s';
-		$d['name']['object']['attrib']['maxlength'] = 50;
-
-		switch($this->deployment->type) {
-			case 'kvm-lvm-deployment':
-				$d['size']['label']                         = sprintf($this->lang['form_size'], number_format($this->max, 0, '', ''));
-				$d['size']['required']                      = true;
-				$d['size']['validate']['regex']             = '/^[0-9]+$/i';
-				$d['size']['validate']['errormsg']          = sprintf($this->lang['error_size'], '0-9');
-				$d['size']['object']['type']                = 'htmlobject_input';
-				$d['size']['object']['attrib']['name']      = 'size';
-				$d['size']['object']['attrib']['type']      = 'text';
-				$d['size']['object']['attrib']['value']     = '';
-				$d['size']['object']['attrib']['maxlength'] = 50;
-				break;
-			default:
-				$d['size'] = '';
-				break;
-		}
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Set max
-	 *
-	 * @access protected
-	 * @return bool
-	 */
-	//--------------------------------------------
-	function set_max() {
-		$vgmax = '';
-		$kvmax = '';
-		$statfile = $this->openqrm->get('basedir').'/plugins/kvm/web/storage/'.$this->resource->id.'.'.$this->volgroup.'.lv.stat';
-		if ($this->file->exists($statfile)) {
-			$lines = explode("\n", $this->file->get_contents($statfile));
-			if(count($lines) >= 1) {
-				foreach($lines as $line) {
-					if($line !== '') {
-						$line = explode('@', $line);
-						if($line[1] === $this->lvol) {
-							$kvmax = str_replace('.', '', $line[4]);
-							$kvmax = str_replace('m', '', $kvmax);
-							$kvmax = (int)$kvmax / 100;
-						}
-					}
-				}
-			}
-		}
-		$statfile = $this->openqrm->get('basedir').'/plugins/kvm/web/storage/'.$this->resource->id.'.vg.stat';
-		if ($this->file->exists($statfile)) {
-			$lines = explode("\n", $this->file->get_contents($statfile));
-			if(count($lines) >= 1) {
-				foreach($lines as $line) {
-					if($line !== '') {
-						$line = explode('@', $line);
-						if($line[0] === $this->volgroup) {
-							$vgmax = str_replace('.', '', $line[6]);
-							$vgmax = str_replace('m', '', $vgmax);
-							$vgmax = (int)$vgmax / 100;
-						}
-					}
-				}
-			}
-		}
-
-		if(	$vgmax < $kvmax ) {
-			$max = $vgmax;
-		} else {
-			$max = $kvmax;
-		}
-		$this->max = $max;
-		return true;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.volgroup.class.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.volgroup.class.php
deleted file mode 100644
index 5bdb3c0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/class/kvm.volgroup.class.php
+++ /dev/null
@@ -1,597 +0,0 @@
-<?php
-/**
- * KVM Edit Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kvm_volgroup
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kvm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'kvm_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kvm_identifier';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-
-		$this->response->add('storage_id', $this->response->html->request()->get('storage_id'));
-		$this->response->add('volgroup', $this->response->html->request()->get('volgroup'));
-
-		$this->volgroup = $this->response->params['volgroup'];
-	}
-
-	//--------------------------------------------
-	/**
-	 * Init
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function init() {
-		$storage_id = $this->response->html->request()->get('storage_id');
-		if($storage_id === '') {
-			return false;
-		}
-		// set ENV
-		$deployment = new deployment();
-		$storage    = new storage();
-		$resource   = new resource();
-
-		$storage->get_instance_by_id($storage_id);
-		$resource->get_instance_by_id($storage->resource_id);
-		$deployment->get_instance_by_id($storage->type);
-
-		$this->resource   = $resource;
-		$this->storage    = $storage;
-		$this->deployment = $deployment;
-
-		$this->statfile = $this->openqrm->get('basedir').'/plugins/kvm/web/storage/'.$resource->id.'.'.$this->volgroup.'.lv.stat';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$this->init();
-		$data = $this->edit();
-		if($data !== false) {
-			if($this->deployment->type === 'kvm-ceph-deployment') {
-				$t = $this->response->html->template($this->tpldir.'/kvm-volgroup-ceph.tpl.php');
-			} else {
-				$t = $this->response->html->template($this->tpldir.'/kvm-volgroup.tpl.php');
-			}
-			$t->add($this->response->html->thisfile, "thisfile");
-			$t->add($data);
-			$t->add($this->lang['lang_id'], 'lang_id');
-			$t->add($this->lang['lang_name'], 'lang_name');
-			$t->add($this->lang['lang_free'], 'lang_free');
-			$t->add($this->lang['lang_resource'], 'lang_resource');
-			$t->add($this->lang['lang_deployment'], 'lang_deployment');
-			$t->add($this->lang['lang_state'], 'lang_state');
-			$t->add($this->lang['lang_attr'], 'lang_attr');
-			$t->add($this->lang['lang_pv'], 'lang_pv');
-			$t->add($this->lang['lang_size'], 'lang_size');
-			$t->add($this->openqrm->get('baseurl'), 'baseurl');
-			$t->add(sprintf($this->lang['label'], $this->volgroup, $data['name']), 'label');
-			return $t;
-		} else {
-			$msg = sprintf($this->lang['error_no_kvm'], $this->response->html->request()->get('storage_id'));
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $msg)
-			);
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return array|false
-	 */
-	//--------------------------------------------
-	function edit() {
-		if(strpos($this->deployment->type, 'kvm') !== false) {
-			$resource_icon_default = "/img/resource.png";
-			$storage_icon = "/plugins/kvm/img/plugin.png";
-			if ($this->file->exists($this->openqrm->get('webdir').$storage_icon)) {
-				$resource_icon_default = $storage_icon;
-			}
-			$resource_icon_default = $this->openqrm->get('baseurl').$resource_icon_default;
-
-			// Storage info
-			$d['state'] = '<span class="pill '.$this->resource->state.'">'.$this->resource->state.'</span>';
-			$d['resource'] = $this->resource->id.' / '.$this->resource->ip;
-			$d['name'] = $this->storage->name;
-			$d['deployment'] = $this->deployment->type;
-			$d['id'] = $this->storage->id;
-
-			// Volgroup info
-			$lines = explode("\n", $this->file->get_contents($this->openqrm->get('basedir').'/plugins/kvm/web/storage/'.$this->resource->id.'.vg.stat'));
-			foreach($lines as $line) {
-				$line = explode("@", $line);
-				if(isset($line[0]) && $line[0] === $this->volgroup) {
-
-					//handle format sent by df
-					$line[5] = str_replace('MB', '.00', $line[5]);
-					$line[6] = str_replace('MB', '.00', $line[6]);
-				
-					$vsize = number_format(substr($line[5], 0, strpos($line[5], '.')), 0, '', '').' MB';
-					if($d['deployment'] === 'kvm-ceph-deployment') {
-						$vfree = $line[6];
-					} else {
-						$vfree = str_replace('m', '', $line[6]);
-						if($vfree !== '0') {
-							$vfree = substr($line[6], 0, strpos($line[6], '.'));
-						}
-					}
-					$d['volgroup_name'] = $line[0];
-					if($d['deployment'] === 'kvm-lvm-deployment') {
-						$d['volgroup_pv'] = $line[1];
-						$d['volgroup_lv'] = $line[2];
-						$d['volgroup_sn'] = $line[3];
-						$d['volgroup_attr'] = $line[4];
-						$d['volgroup_vsize'] = $vsize;
-						$d['volgroup_vfree'] = number_format($vfree, 0, '', '').' MB';
-					}
-					if($d['deployment'] === 'kvm-bf-deployment') {
-						$d['volgroup_pv'] = '-';
-						$d['volgroup_lv'] = '-';
-						$d['volgroup_sn'] = '-';
-						$d['volgroup_attr'] = 'file';
-						$d['volgroup_vsize'] = $vsize;
-						$d['volgroup_vfree'] = number_format($vfree, 0, '', '').' MB';
-					}
-					if($d['deployment'] === 'kvm-gluster-deployment') {
-						$d['volgroup_pv'] = '-';
-						$d['volgroup_lv'] = '-';
-						$d['volgroup_sn'] = '-';
-						$d['volgroup_attr'] = 'gluster';
-						$d['volgroup_vsize'] = $vsize;
-						$d['volgroup_vfree'] = number_format($vfree, 0, '', '').' MB';
-					}
-					if($d['deployment'] === 'kvm-ceph-deployment') {
-						$d['volgroup_attr'] = 'ceph';
-						$d['volgroup_vfree'] = $line[6].' MB';
-					}
-				}
-			}
-
-			$a = '&#160';
-			if($d['volgroup_vfree'] !== '0 MB') {
-				$a = $this->response->html->a();
-				$a->label   = $this->lang['action_add'];
-				$a->css     = 'add';
-				$a->handler = 'onclick="wait();"';
-				$a->href    = $this->response->get_url($this->actions_name, "add");
-			}
-			$d['add'] = $a;
-
-			$body = array();
-
-			$file = $this->statfile;
-			if($this->file->exists($file)) {
-				$lines = explode("\n", $this->file->get_contents($file));
-				if(count($lines) >= 1) {
-					$disabled = array();
-					$t = $this->response->html->template($this->openqrm->get('webdir').'/js/openqrm-progressbar.js');
-					foreach($lines as $line) {
-						if($line !== '') { 
-							$image_add_remove = '';
-							$deployment_type = ''; 
-							$line = explode('@', $line);
-							$name = $line[1];
-							$mode = substr($line[3], 0, 1);
-							$s = '';
-							$c = '';
-							$r = '';
-							$src = '';
-							$progress = '';
-							if ($line[4] == "clone_in_progress") {
-								// add to disabled identifier
-								$disabled[] = $name;
-								// progressbar
-								$t->add(uniqid('b'), 'id');
-								$t->add($this->openqrm->get('baseurl').'/api.php?action=plugin&plugin=kvm&kvm_action=progress&name='.$this->resource->id.'.lvm.'.$name.'.sync_progress', 'url');
-								$t->add($this->lang['action_clone_in_progress'], 'lang_in_progress');
-								$t->add($this->lang['action_clone_finished'], 'lang_finished');
-								$progress = $t->get_string();
-							} else if ($line[4] == "sync_in_progress") {
-								$progress = $this->lang['action_sync_in_progress'];
-								$disabled[] = $name;
-							} else {
-								if($d['deployment'] === 'kvm-lvm-deployment') {
-									$volume_size = number_format(substr($line[4], 0, strpos($line[4], '.')), 0, '', '');
-									$volume_clone_size = (int)substr($line[4], 0, strpos($line[4], '.'));
-								}
-								if($d['deployment'] === 'kvm-bf-deployment') {
-									$volume_size = number_format(($line[4]/(1000*1000)), 0, '', '');
-									$volume_clone_size = (int)substr($line[4], 0, strpos($line[4], '.'));
-								}
-								if($d['deployment'] === 'kvm-gluster-deployment') {
-									$volume_size = number_format(($line[4]/(1000*1000)), 0, '', '');
-									$volume_clone_size = (int)substr($line[4], 0, strpos($line[4], '.'));
-								}
-								if($d['deployment'] === 'kvm-ceph-deployment') {
-									$volume_size = $line[4];
-									$name = str_replace('%', '@', $name);
-									$volume_clone_size = $line[4];
-								}
-								
-								$image_add_remove = '';
-								$deployment_type = '';
-								$image = $this->openqrm->image();
-								$image->get_instance_by_name($name);
-								if (strlen($image->id)) {
-									if( $image->type == $this->deployment->type ) {
-										if( $line[0] === $this->deployment->type && $line[4] !== "sync_in_progress" && $line[4] !== "clone_in_progress" ) {
-											if($volume_size !== $image->size) {
-												$r = $this->response->html->a();
-												$r->title   = $this->lang['action_sync'];
-												$r->label   = $this->lang['action_sync'];
-												$r->handler = 'onclick="wait();"';
-												$r->css     = 'enable';
-												$r->href    = $this->response->get_url($this->actions_name, "image").'&image_command=sync&image_id='.$image->id.'&size='.$volume_size;
-												$r = $r->get_string();
-												$volume_size = '<span class="error" style="cursor:pointer;" title="Wrong size '.$image->size.' for image object">'.$volume_size.'</span>';
-											}
-											else if($d['volgroup_vfree'] !== '0 MB' ) {
-												if($mode !== 's') {
-													$s = $this->response->html->a();
-													$s->title   = $this->lang['action_snap']; 
-													$s->label   = $this->lang['action_snap'];
-													$s->handler = 'onclick="wait();"';
-													$s->css     = 'snap';
-													$s->href    = $this->response->get_url($this->actions_name, "snap").'&lvol='.$line[1];
-													$s = $s->get_string();
-												} else {
-													$disabled[] = $line[5];
-													$src = $line[5];
-												}
-												if($vfree >= $volume_clone_size) {
-													$c = $this->response->html->a();
-													$c->title   = $this->lang['action_clone'];
-													$c->label   = $this->lang['action_clone'];
-													$c->handler = 'onclick="wait();"';
-													$c->css     = 'clone';
-													$c->href    = $this->response->get_url($this->actions_name, "clone").'&lvol='.$line[1];
-													$c = $c->get_string();
-												}
-												$r = $this->response->html->a();
-												$r->title   = $this->lang['action_resize'];
-												$r->label   = $this->lang['action_resize'];
-												$r->handler = 'onclick="wait();"';
-												$r->css     = 'resize';
-												$r->href    = $this->response->get_url($this->actions_name, "resize").'&lvol='.$line[1];
-												$r = $r->get_string();
-											}
-											$deployment_type = $this->deployment->type;
-										} else {
-											$disabled[] = $name;
-										}
-									}
-								}
-								// create/remove image object, check if image exists
-								if($d['deployment'] === 'kvm-gluster-deployment') {
-									$path_glusters = "gluster://".$this->resource->ip."/".$this->volgroup."/".$name;
-									$path  = '<b>'.$this->lang['table_path_physical'].'</b>: '.$line[2].'<br>';
-									$path .= '<b>'.$this->lang['table_path_glusters'].'</b>: '.$path_glusters.'<br>';
-								}
-								if (strlen($image->id)) {
-									if( $image->type != $this->deployment->type ) {
-										$deployment_type = $image->type;
-										$disabled[] = $name;
-									} else {
-										$i = $this->response->html->a();
-										$i->title   = $this->lang['action_remove_image'];
-										$i->label   = $this->lang['action_remove_image'];
-										$i->handler = 'onclick="wait();"';
-										$i->css     = 'remove';
-										$i->href    = $this->response->get_url($this->actions_name, "image").'&image_id='.$image->id.'&image_command=remove';
-										$image_add_remove = $i->get_string();
-									}
-								} else {
-									$i = $this->response->html->a();
-									$i->title   = $this->lang['action_add_image'];
-									$i->label   = $this->lang['action_add_image'];
-									$i->handler = 'onclick="wait();"';
-									$i->css     = 'add';
-									if($d['deployment'] === 'kvm-lvm-deployment') {
-										$i->href    = $this->response->get_url($this->actions_name, "image").'&root_device=/dev/'.$this->volgroup.'/'.$name.'&image_command=add&size='.$volume_size;
-									} else if($d['deployment'] === 'kvm-bf-deployment') {
-										$i->href    = $this->response->get_url($this->actions_name, "image").'&root_device='.$line[2].'&image_command=add&size='.$volume_size;
-									} else if($d['deployment'] === 'kvm-gluster-deployment') {
-										$i->href    = $this->response->get_url($this->actions_name, "image").'&root_device='.$path_glusters.'&image_name='.$name.'&image_command=add&size='.$volume_size;
-									} else if($d['deployment'] === 'kvm-ceph-deployment') {
-										$path_ceph = "rbd:".$this->volgroup."/".$name;
-										$i->href    = $this->response->get_url($this->actions_name, "image").'&root_device='.$path_ceph.'&image_name='.$name.'&image_command=add&size='.$volume_size;
-									}
-									$disabled[] = $name;
-									$image_add_remove = $i->get_string();
-								}
-							}
-
-							$state = '<span class="pill inactive">unaligned</span>';
-							if($d['deployment'] === 'kvm-lvm-deployment') {
-								switch($image->isactive) {
-									case '0':
-										$state = '<span class="pill idle">idle</span>';
-									break;
-									case '1':
-										$state = '<span class="pill active">active</span>';
-									break;
-								}
-
-								$data  = '<b>'.$this->lang['table_name'].'</b>: '.$name.'<br>';
-								$data .= '<b>'.$this->lang['table_deployment'].'</b>: '.$deployment_type.'<br>';
-								$data .= '<b>'.$this->lang['table_attr'].'</b>: '.$line[3].'<br>';
-								$data .= '<b>'.$this->lang['table_size'].'</b>: '.$volume_size.' MB<br>';
-								$data .= '<b>'.'Root'.'</b>: '.str_replace('/'.$name, '', $image->rootdevice).'<br>';
-								$data .= '<b>'.$this->lang['table_source'].'</b>: '.$src.'<br>';
-								$data .= '<br><br>';
-								$body[] = array(
-									'state'    => $state,
-									'deploy'   => $deployment_type,
-									'name'     => $name,
-									'attr'     => $line[3],
-									'source'   => $src,
-									'size'     => $volume_size,
-									'data'     => $data,
-									'progress' => $progress,
-									'action'   => $image_add_remove.$c.$s.$r,
-								);
-							}
-							if($d['deployment'] === 'kvm-bf-deployment') {
-								switch($image->isactive) {
-									case '0':
-										$state = '<span class="pill idle">idle</span>';
-									break;
-									case '1':
-										$state = '<span class="pill active">active</span>';
-									break;
-								}
-								$root = str_replace('/'.$name, '', $image->rootdevice);
-								$data  = '<b>'.$this->lang['table_name'].'</b>: '.$name.'<br>';
-								$data .= '<b>'.$this->lang['table_deployment'].'</b>: '.$deployment_type.'<br>';
-								$data .= '<b>'.$this->lang['table_attr'].'</b>: '.$line[3].'<br>';
-								$data .= '<b>'.$this->lang['table_size'].'</b>: '.$volume_size.' MB<br>';
-								$data .= '<b>'.'Root'.'</b>: '.$root.'<br>';
-								$data .= '<b>'.$this->lang['table_source'].'</b>: '.str_replace($root.'/', '',$src).'<br>';
-								$data .= '<br>';
-								$body[] = array(
-									'state'    => $state,
-									'deploy'   => $deployment_type,
-									'name'     => $name,
-									'attr'     => $line[3],
-									'source'   => $src,
-									'size'     => $volume_size,
-									'data'     => $data,
-									'progress' => $progress,
-									'action'   => $image_add_remove.$c.$s,
-								);
-							}
-							if($d['deployment'] === 'kvm-gluster-deployment') {
-								$body[] = array(
-									'deploy' => $deployment_type,
-									'name'   => $name,
-									'path'   => $path,
-									'source' => $src,
-									'size'   => $volume_size,
-									'image'   => $image_add_remove,
-									'snap'   => $s,
-									'clone'  => $c,
-								);
-							}
-							if($d['deployment'] === 'kvm-ceph-deployment') {
-								switch($image->isactive) {
-									case '0':
-										$state = '<span class="pill idle">idle</span>';
-									break;
-									case '1':
-										$state = '<span class="pill active">active</span>';
-									break;
-								}
-
-								$is_snapshot = false;
-								$pos = strpos($name, '@');
-								if ($pos === false) {
-									$is_snapshot = false;
-								} else {
-									$is_snapshot = true;
-								}
-
-								$root = str_replace('/'.$name, '', $image->rootdevice);
-								$data  = '<b>'.$this->lang['table_name'].'</b>: '.$name.'<br>';
-								$data .= '<b>'.$this->lang['table_size'].'</b>: '.$volume_size.' MB<br>';
-								if ($image->id != "") {
-									$data .= '<b>'.'Root'.'</b>: '.$image->rootdevice.'<br>';
-									if ($is_snapshot) {
-										$data .= '<b>'.$this->lang['table_source'].'</b>: '.$line[5].'<br>';
-									}
-								}
-								$data .= '<br>';
-								
-								if ($is_snapshot) {
-									$image_action = $image_add_remove.$c.$r;
-								} else {
-									$image_action = $image_add_remove.$c.$r.$s;
-								}
-								
-								$body[] = array(
-									'state'    => $state,
-									'deploy'   => $deployment_type,
-									'name'     => $name,
-									'source'   => $src,
-									'size'     => $volume_size,
-									'data'     => $data,
-									'progress' => $progress,
-									'action'   => $image_action,
-								);
-							}
-						}
-						
-					}
-				}
-			}
-
-			if($d['deployment'] === 'kvm-lvm-deployment') {
-				$h['state']['title']       = $this->lang['table_state'];
-				$h['name']['title']        = $this->lang['table_name'];
-				$h['name']['hidden']       = true;
-				$h['deploy']['title']      = $this->lang['table_deployment'];
-				$h['deploy']['hidden']     = true;
-				$h['attr']['title']        = $this->lang['table_attr'];
-				$h['attr']['hidden']       = true;
-				$h['size']['title']        = $this->lang['table_size'];
-				$h['size']['hidden']       = true;
-				$h['source']['title']      = $this->lang['table_source'];
-				$h['source']['hidden']     = true;
-				$h['data']['title']        = '&#160;';
-				$h['data']['sortable']     = false;
-				$h['progress']['title']    = '&#160;';
-				$h['progress']['sortable'] = false;
-				$h['action']['title']    = '&#160;';
-				$h['action']['sortable'] = false;
-			}
-			if($d['deployment'] === 'kvm-bf-deployment') {
-				$h['state']['title']       = $this->lang['table_state'];
-				$h['name']['title']        = $this->lang['table_name'];
-				$h['name']['hidden']       = true;
-				$h['deploy']['title']      = $this->lang['table_deployment'];
-				$h['deploy']['hidden']     = true;
-				$h['attr']['title']        = $this->lang['table_attr'];
-				$h['attr']['hidden']       = true;
-				$h['size']['title']        = $this->lang['table_size'];
-				$h['size']['hidden']       = true;
-				$h['source']['title']      = $this->lang['table_source'];
-				$h['source']['hidden']     = true;
-				$h['data']['title']        = '&#160;';
-				$h['data']['sortable']     = false;
-				$h['progress']['title']    = '&#160;';
-				$h['progress']['sortable'] = false;
-				$h['action']['title']    = '&#160;';
-				$h['action']['sortable'] = false;
-			}
-			if($d['deployment'] === 'kvm-gluster-deployment') {
-				#$h['icon']['title']      = '&#160;';
-				#$h['icon']['sortable']   = false;
-				$h['name']['title']      = $this->lang['table_name'];
-				$h['deploy']['title']    = $this->lang['table_deployment'];
-				$h['path']['title']      = $this->lang['table_path'];
-				$h['source']['title']    = $this->lang['table_source'];
-				$h['size']['title']      = $this->lang['table_size'];
-				$h['image']['title']      = '&#160;';
-				$h['image']['sortable']   = false;
-				$h['snap']['title']      = '&#160;';
-				$h['snap']['sortable']   = false;
-				$h['clone']['title']     = '&#160;';
-				$h['clone']['sortable']  = false;
-			}
-			if($d['deployment'] === 'kvm-ceph-deployment') {
-				$h['state']['title']       = $this->lang['table_state'];
-				$h['name']['title']        = $this->lang['table_name'];
-				$h['name']['hidden']       = true;
-				$h['deploy']['title']      = $this->lang['table_deployment'];
-				$h['deploy']['hidden']     = true;
-				$h['size']['title']        = $this->lang['table_size'];
-				$h['size']['hidden']       = true;
-				$h['source']['title']      = $this->lang['table_source'];
-				$h['source']['hidden']     = true;
-				$h['data']['title']        = '&#160;';
-				$h['data']['sortable']     = false;
-				$h['progress']['title']    = '&#160;';
-				$h['progress']['sortable'] = false;
-				$h['action']['title']    = '&#160;';
-				$h['action']['sortable'] = false;
-			}
-
-			$table = $this->response->html->tablebuilder('kvm_lvols', $this->response->get_array($this->actions_name, 'volgroup'));
-			$table->sort                = 'name';
-			$table->limit               = 10;
-			$table->offset              = 0;
-			$table->order               = 'ASC';
-			$table->max                 = count($body);
-			$table->autosort            = true;
-			$table->sort_link           = false;
-			$table->id                  = 'Tabelle';
-			$table->css                 = 'htmlobject_table';
-			$table->border              = 1;
-			$table->cellspacing         = 0;
-			$table->cellpadding         = 3;
-			$table->form_action         = $this->response->html->thisfile;
-			$table->head                = $h;
-			$table->body                = $body;
-			$table->identifier          = 'name';
-			$table->identifier_name     = $this->identifier_name;
-			$table->identifier_disabled = $disabled;
-			$table->actions_name        = $this->actions_name;
-			$table->actions             = array(array('remove' => $this->lang['action_remove']));
-
-			$d['table'] = $table->get_string();
-			return $d;
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/css/kvm.css b/openQRM-5.3.50-CE/src/plugins/kvm/web/css/kvm.css
deleted file mode 100644
index bf6db19..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/css/kvm.css
+++ /dev/null
@@ -1,125 +0,0 @@
-/* Edit */
-.htmlobject_table .htmlobject_td.state {
-	width: 60px;
-	vertical-align:top;
-}
-.htmlobject_table .htmlobject_td.data,
-.htmlobject_table .htmlobject_td.appliance {
-	width: 300px;
-	vertical-align:top;
-}
-.htmlobject_table .htmlobject_th.pv,
-.htmlobject_table .htmlobject_td.pv,
-.htmlobject_table .htmlobject_th.lv,
-.htmlobject_table .htmlobject_td.lv,
-.htmlobject_table .htmlobject_th.sn,
-.htmlobject_table .htmlobject_td.sn {
-	width: 30px;
-	vertical-align:top;
-	text-align: center;
-}
-.htmlobject_table .htmlobject_th.name,
-.htmlobject_table .htmlobject_td.name {
-	width: 120px;
-	vertical-align:top;
-	text-align: left;
-}
-.htmlobject_table .htmlobject_th.vsize,
-.htmlobject_table .htmlobject_td.vsize,
-.htmlobject_table .htmlobject_th.vfree,
-.htmlobject_table .htmlobject_td.vfree {
-	width: 110px;
-	vertical-align:top;
-	text-align: left;
-}
-.htmlobject_table .htmlobject_th.attr,
-.htmlobject_table .htmlobject_td.attr {
-	vertical-align:top;
-	text-align: center;
-}
-.htmlobject_table .htmlobject_td.progress {
-	vertical-align:top;
-}
-.htmlobject_table .htmlobject_td.action {
-	width: 110px;
-	vertical-align:top;
-}
-.htmlobject_table .htmlobject_td.action a{
-	display: block;
-	text-align: left;
-}
-#addbuttons {
-	float: right;
-	margin: 0 30px 0 0;
-}
-#kvm_edit .row {
-	margin: 0 0 20px 0;
-}
-
-/* Add / Update */
-#net0_box .left,
-#net1_box .left,
-#net2_box .left,
-#net3_box .left,
-#net4_box .left {
-	float: right;
-	width: auto;
-}
-#net0_box .right,
-#net1_box .right,
-#net2_box .right,
-#net3_box .right,
-#net4_box .right {
-	float: right;
-	padding: 3px 8px 0 0;
-}
-#boot_iso_box {
-	width: 250px;
-	float: left;
-}
-#cdrom_box,
-#iso_path_box{
-	float:left;
-}
-#iso_path_box.htmlobject_box .left{
-	width: 60px;
-}
-.browse-button {
-	margin: 3px 0 0 15px;
-}
-.netbox {
-	display: block;
-	clear: both;
-	padding: 5px 0 10px 24px;
-	/* border-top: 1px solid #ccc; */
-}
-/* Progressbar */
-.ui-progressbar { width:280px; margin: 25px 0 0 0; }
-.progress_watcher { width:280px; text-align: center; }
-
-/* Sysinfo */
-#kvm-sysinfo pre {
-	overflow:auto;
-	white-space: pre;
-	word-break: break-all;
-	word-wrap: break-word;
-	color: #000;
-}
-#kvm-sysinfo b {
-	padding: 0 0 15px 0;
-	display: block;
-}
-
-.vm_vncpasswd {
-	width: 60px;
-	height: 10px ! important;
-	margin: 0 ! important;
-}
-
-
-.vm_vnctoggle {
-	height: 17px ! important;
-	padding-bottom: 0 ! important;
-	padding-top: 0 ! important;
-
-}
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/image.kvm-bf-deployment.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/image.kvm-bf-deployment.php
deleted file mode 100644
index 86dcdb8..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/image.kvm-bf-deployment.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-
-// global event for logging
-$event = new event();
-global $event;
-
-function kvm_bf_deployment_wait_for_identfile($sfile) {
-	$refresh_delay=1;
-	$refresh_loop_max=20;
-	$refresh_loop=0;
-	while (!file_exists($sfile)) {
-		sleep($refresh_delay);
-		$refresh_loop++;
-		flush();
-		if ($refresh_loop > $refresh_loop_max)  {
-			return false;
-		}
-	}
-	return true;
-}
-
-
-function get_kvm_bf_deployment_image_rootdevice_identifier($kvm_bf_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_ADMIN;
-	global $event;
-
-	// place for the storage stat files
-	$StorageDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/kvm/storage';
-	$rootdevice_identifier_array = array();
-	$storage = new storage();
-	$storage->get_instance_by_id($kvm_bf_id);
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$storage_resource = new resource();
-	$storage_resource->get_instance_by_id($storage->resource_id);
-	$storage_resource_id = $storage_resource->id;
-	$ident_file = $StorageDir."/".$storage_resource_id.".lv.kvm-bf-deployment.ident";
-	if (file_exists($ident_file)) {
-		unlink($ident_file);
-	}
-	// send command
-	$resource_command=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm post_identifier -u ".$OPENQRM_ADMIN->name." -p ".$OPENQRM_ADMIN->password." -t ".$deployment->type;
-	$storage_resource->send_command($storage_resource->ip, $resource_command);
-	if (!kvm_bf_deployment_wait_for_identfile($ident_file)) {
-		$event->log("get_image_rootdevice_identifier", $_SERVER['REQUEST_TIME'], 2, "image.kvm-bf-deployment", "Timeout while requesting image identifier from storage id $storage->id", "", "", 0, 0, 0);
-		return;
-	}
-	$fcontent = file($ident_file);
-	foreach($fcontent as $lun_info) {
-		$ident_params = explode(":", $lun_info);
-		$timage_name = trim($ident_params[0]);
-		$troot_device = trim($ident_params[1]);
-		$rootdevice_identifier_array[] = array("value" => "$troot_device", "label" => "$timage_name");
-	}
-	return $rootdevice_identifier_array;
-}
-
-
-function get_kvm_bf_deployment_image_default_rootfs() {
-	return "local";
-}
-
-function get_kvm_bf_deployment_rootfs_transfer_methods() {
-	return false;
-}
-
-function get_kvm_bf_deployment_rootfs_set_password_method() {
-	return true;
-}
-
-function get_kvm_bf_deployment_is_network_deployment() {
-	return false;
-}
-
-function get_kvm_bf_deployment_local_deployment_enabled() {
-	return true;
-}
-
-function get_kvm_bf_deployment_is_resizable() {
-	return false;
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/image.kvm-ceph-deployment.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/image.kvm-ceph-deployment.php
deleted file mode 100644
index ace8364..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/image.kvm-ceph-deployment.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-
-// global event for logging
-$event = new event();
-global $event;
-
-function kvm_ceph_deployment_wait_for_identfile($sfile) {
-	$refresh_delay=1;
-	$refresh_loop_max=20;
-	$refresh_loop=0;
-	while (!file_exists($sfile)) {
-		sleep($refresh_delay);
-		$refresh_loop++;
-		flush();
-		if ($refresh_loop > $refresh_loop_max)  {
-			return false;
-		}
-	}
-	return true;
-}
-
-
-function get_kvm_ceph_deployment_image_rootdevice_identifier($kvm_ceph_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_ADMIN;
-	global $event;
-
-	// place for the storage stat files
-	$StorageDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/kvm/storage';
-	$rootdevice_identifier_array = array();
-	$storage = new storage();
-	$storage->get_instance_by_id($kvm_ceph_id);
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$storage_resource = new resource();
-	$storage_resource->get_instance_by_id($storage->resource_id);
-	$storage_resource_id = $storage_resource->id;
-	$ident_file = $StorageDir."/".$storage_resource_id.".lv.kvm-bf-deployment.ident";
-	if (file_exists($ident_file)) {
-		unlink($ident_file);
-	}
-	// send command
-	$resource_command=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm post_identifier -u ".$OPENQRM_ADMIN->name." -p ".$OPENQRM_ADMIN->password." -t ".$deployment->type;
-	$storage_resource->send_command($storage_resource->ip, $resource_command);
-	if (!kvm_ceph_deployment_wait_for_identfile($ident_file)) {
-		$event->log("get_image_rootdevice_identifier", $_SERVER['REQUEST_TIME'], 2, "image.kvm-bf-deployment", "Timeout while requesting image identifier from storage id $storage->id", "", "", 0, 0, 0);
-		return;
-	}
-	$fcontent = file($ident_file);
-	foreach($fcontent as $lun_info) {
-		$ident_params = explode(":", $lun_info);
-		$timage_name = trim($ident_params[0]);
-		$troot_device = trim($ident_params[1]);
-		$rootdevice_identifier_array[] = array("value" => "$troot_device", "label" => "$timage_name");
-	}
-	return $rootdevice_identifier_array;
-}
-
-
-function get_kvm_ceph_deployment_image_default_rootfs() {
-	return "local";
-}
-
-function get_kvm_ceph_deployment_rootfs_transfer_methods() {
-	return false;
-}
-
-function get_kvm_ceph_deployment_rootfs_set_password_method() {
-	return true;
-}
-
-function get_kvm_ceph_deployment_is_network_deployment() {
-	return false;
-}
-
-function get_kvm_ceph_deployment_local_deployment_enabled() {
-	return true;
-}
-
-function get_kvm_ceph_deployment_is_resizable() {
-	return false;
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/image.kvm-gluster-deployment.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/image.kvm-gluster-deployment.php
deleted file mode 100644
index 0bf7df5..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/image.kvm-gluster-deployment.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-
-// global event for logging
-$event = new event();
-global $event;
-
-function kvm_gluster_deployment_wait_for_identfile($sfile) {
-	$refresh_delay=1;
-	$refresh_loop_max=20;
-	$refresh_loop=0;
-	while (!file_exists($sfile)) {
-		sleep($refresh_delay);
-		$refresh_loop++;
-		flush();
-		if ($refresh_loop > $refresh_loop_max)  {
-			return false;
-		}
-	}
-	return true;
-}
-
-
-function get_kvm_gluster_deployment_image_rootdevice_identifier($kvm_gluster_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_ADMIN;
-	global $event;
-
-	// place for the storage stat files
-	$StorageDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/kvm/storage';
-	$rootdevice_identifier_array = array();
-	$storage = new storage();
-	$storage->get_instance_by_id($kvm_gluster_id);
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$storage_resource = new resource();
-	$storage_resource->get_instance_by_id($storage->resource_id);
-	$storage_resource_id = $storage_resource->id;
-	$ident_file = $StorageDir."/".$storage_resource_id.".lv.kvm-bf-deployment.ident";
-	if (file_exists($ident_file)) {
-		unlink($ident_file);
-	}
-	// send command
-	$resource_command=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm post_identifier -u ".$OPENQRM_ADMIN->name." -p ".$OPENQRM_ADMIN->password." -t ".$deployment->type;
-	$storage_resource->send_command($storage_resource->ip, $resource_command);
-	if (!kvm_gluster_deployment_wait_for_identfile($ident_file)) {
-		$event->log("get_image_rootdevice_identifier", $_SERVER['REQUEST_TIME'], 2, "image.kvm-bf-deployment", "Timeout while requesting image identifier from storage id $storage->id", "", "", 0, 0, 0);
-		return;
-	}
-	$fcontent = file($ident_file);
-	foreach($fcontent as $lun_info) {
-		$ident_params = explode(":", $lun_info);
-		$timage_name = trim($ident_params[0]);
-		$troot_device = trim($ident_params[1]);
-		$rootdevice_identifier_array[] = array("value" => "$troot_device", "label" => "$timage_name");
-	}
-	return $rootdevice_identifier_array;
-}
-
-
-function get_kvm_gluster_deployment_image_default_rootfs() {
-	return "local";
-}
-
-function get_kvm_gluster_deployment_rootfs_transfer_methods() {
-	return false;
-}
-
-function get_kvm_gluster_deployment_rootfs_set_password_method() {
-	return true;
-}
-
-function get_kvm_gluster_deployment_is_network_deployment() {
-	return false;
-}
-
-function get_kvm_gluster_deployment_local_deployment_enabled() {
-	return true;
-}
-
-function get_kvm_gluster_deployment_is_resizable() {
-	return false;
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/image.kvm-lvm-deployment.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/image.kvm-lvm-deployment.php
deleted file mode 100644
index 4f8ddf3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/image.kvm-lvm-deployment.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-
-// global event for logging
-$event = new event();
-global $event;
-
-function kvm_lvm_deployment_wait_for_identfile($sfile) {
-	$refresh_delay=1;
-	$refresh_loop_max=20;
-	$refresh_loop=0;
-	while (!file_exists($sfile)) {
-		sleep($refresh_delay);
-		$refresh_loop++;
-		flush();
-		if ($refresh_loop > $refresh_loop_max)  {
-			return false;
-		}
-	}
-	return true;
-}
-
-
-function get_kvm_lvm_deployment_image_rootdevice_identifier($kvm_lvm_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_ADMIN;
-	global $event;
-
-	// place for the storage stat files
-	$StorageDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/kvm/storage';
-	$rootdevice_identifier_array = array();
-	$storage = new storage();
-	$storage->get_instance_by_id($kvm_lvm_id);
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$storage_resource = new resource();
-	$storage_resource->get_instance_by_id($storage->resource_id);
-	$storage_resource_id = $storage_resource->id;
-	$ident_file = $StorageDir."/".$storage_resource_id.".lv.kvm-lvm-deployment.ident";
-	if (file_exists($ident_file)) {
-		unlink($ident_file);
-	}
-	// send command
-	$resource_command=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm post_identifier -u ".$OPENQRM_ADMIN->name." -p ".$OPENQRM_ADMIN->password." -t ".$deployment->type;
-	$storage_resource->send_command($storage_resource->ip, $resource_command);
-	if (!kvm_lvm_deployment_wait_for_identfile($ident_file)) {
-		$event->log("get_image_rootdevice_identifier", $_SERVER['REQUEST_TIME'], 2, "image.kvm-lvm-deployment", "Timeout while requesting image identifier from storage id $storage->id", "", "", 0, 0, 0);
-		return;
-	}
-	$fcontent = file($ident_file);
-	foreach($fcontent as $lun_info) {
-		$tpos = strpos($lun_info, ":");
-		$timage_name = trim(substr($lun_info, 0, $tpos));
-		$troot_device = trim(substr($lun_info, $tpos+1));
-		$rootdevice_identifier_array[] = array("value" => "$troot_device", "label" => "$timage_name");
-	}
-	return $rootdevice_identifier_array;
-}
-
-
-function get_kvm_lvm_deployment_image_default_rootfs() {
-	return "local";
-}
-
-function get_kvm_lvm_deployment_rootfs_transfer_methods() {
-	return false;
-}
-
-function get_kvm_lvm_deployment_rootfs_set_password_method() {
-	return true;
-}
-
-function get_kvm_lvm_deployment_is_network_deployment() {
-	return false;
-}
-
-function get_kvm_lvm_deployment_local_deployment_enabled() {
-	return true;
-}
-
-function get_kvm_lvm_deployment_is_resizable() {
-	return true;
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/img/kvm-lvm-deployment.png b/openQRM-5.3.50-CE/src/plugins/kvm/web/img/kvm-lvm-deployment.png
deleted file mode 100644
index 1231960..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/kvm/web/img/kvm-lvm-deployment.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/img/kvm-network-deployment.png b/openQRM-5.3.50-CE/src/plugins/kvm/web/img/kvm-network-deployment.png
deleted file mode 100644
index 3adddf5..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/kvm/web/img/kvm-network-deployment.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/kvm/web/img/plugin.png
deleted file mode 100644
index 16abe90..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/kvm/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/js/helpers.js b/openQRM-5.3.50-CE/src/plugins/kvm/web/js/helpers.js
deleted file mode 100644
index 8ecca6d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/js/helpers.js
+++ /dev/null
@@ -1,364 +0,0 @@
-/**
- * Get Browser Infos
- * 
- */
-var BrowserInfo = {
-	swfVersion : function() {
-		var isIE    = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
-		var isWin   = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;
-		var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;
-		var version = "false";	
-		if (navigator.plugins != null && navigator.plugins.length > 0) {
-			if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
-				var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
-				var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
-				var descArray = flashDescription.split(" ");
-				var tempArrayMajor = descArray[2].split(".");			
-				var vMa = tempArrayMajor[0];
-				var vMin = tempArrayMajor[1];
-				var vRev = descArray[3];
-				if (vRev == "") {
-					vRev = descArray[4];
-				}
-				if (vRev[0] == "d") {
-					vRev = vRev.substring(1);
-				} else if (vRev[0] == "r") {
-					vRev = vRev.substring(1);
-					if (vRev.indexOf("d") > 0) {
-						vRev = vRev.substring(0, vRev.indexOf("d"));
-					}
-				}
-				version = vMa + "," + vMin + "," + vRev;
-			}
-		}
-		else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) version = 4;
-		else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) version = 3;
-		else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) version = 2;
-		else if (isIE && isWin && !isOpera) {
-			try {
-				axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
-				version = axo.GetVariable("$version");
-			} catch (e) {}
-			if (!version)
-			{
-				try {
-					axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");			
-					version = "WIN 6,0,21,0";
-					axo.AllowScriptAccess = "always";
-					version = axo.GetVariable("$version");
-				} catch (e) {}
-			}
-			if (!version)
-			{
-				try {
-					axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-					version = axo.GetVariable("$version");
-				} catch (e) {}
-			}
-			if (!version)
-			{
-				try {
-					axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-					version = "WIN 3,0,18,0";
-				} catch (e) {}
-			}
-			if (!version)
-			{
-				try {
-					axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
-					version = "WIN 2,0,0,11";
-				} catch (e) { version = "false"; }
-			}	
-		}
-		version = version.replace(/[a-z ]/gi, ''); 
-		version = version.replace(/,/g, '.'); 
-		return version;
-	},
-	info : function() {
-		info = {
-			CODENAME   : navigator.appCodeName,
-			APPNAME    : navigator.appName,
-			VERSION    : navigator.appVersion,
-			COOKIES    : navigator.cookieEnabled,
-			LANGUAGE   : navigator.language,
-			PLATFORM   : navigator.platform,
-			USERAGENT  : navigator.userAgent,
-			WxH        : screen.width +" x "+ screen.height,
-			COLORDEPTH : screen.colorDepth,
-			FLASH      : this.swfVersion()
-		}
-		return info;
-	}
-};
-
-/**
- * Drag functions
- * 
- */
-var Drag = {
-
-	obj : null,
-	init : function(o, oRoot, minX, maxX, minY, maxY, bSwapHorzRef, bSwapVertRef, fXMapper, fYMapper)
-	{
-		o.onmousedown	= Drag.start;        
-		o.hmode			= bSwapHorzRef ? false : true ;
-		o.vmode			= bSwapVertRef ? false : true ;
-		o.root = oRoot && oRoot != null ? oRoot : o ;
-
-		if (o.hmode  && isNaN(parseInt(o.root.style.left  ))) o.root.style.left   = "0px";
-		if (o.vmode  && isNaN(parseInt(o.root.style.top   ))) o.root.style.top    = "0px";
-		if (!o.hmode && isNaN(parseInt(o.root.style.right ))) o.root.style.right  = "0px";
-		if (!o.vmode && isNaN(parseInt(o.root.style.bottom))) o.root.style.bottom = "0px";
-
-		o.minX	= typeof minX != 'undefined' ? minX : 0;
-		o.minY	= typeof minY != 'undefined' ? minY : 0;
-		o.maxX	= typeof maxX != 'undefined' ? maxX : null;
-		o.maxY	= typeof maxY != 'undefined' ? maxY : null;
-
-		o.xMapper = fXMapper ? fXMapper : null;
-		o.yMapper = fYMapper ? fYMapper : null;
-
-		o.root.onDragStart	= new Function();
-		o.root.onDragEnd	= new Function();
-		o.root.onDrag		= new Function();
-	},
-
-	start : function(e)
-	{
-		var o = Drag.obj = this;
-		e = Drag.fixE(e);
-		var y = parseInt(o.vmode ? o.root.style.top  : o.root.style.bottom);
-		var x = parseInt(o.hmode ? o.root.style.left : o.root.style.right );
-		o.root.onDragStart(x, y);
-
-		o.lastMouseX	= e.clientX;
-		o.lastMouseY	= e.clientY;
-
-		if (o.hmode) {
-			if (o.minX != null)	o.minMouseX	= e.clientX - x + o.minX;
-			if (o.maxX != null)	o.maxMouseX	= o.minMouseX + o.maxX - o.minX;
-		} else {
-			if (o.minX != null) o.maxMouseX = -o.minX + e.clientX + x;
-			if (o.maxX != null) o.minMouseX = -o.maxX + e.clientX + x;
-		}
-
-		if (o.vmode) {
-			if (o.minY != null)	o.minMouseY	= e.clientY - y + o.minY;
-			if (o.maxY != null)	o.maxMouseY	= o.minMouseY + o.maxY - o.minY;
-		} else {
-			if (o.minY != null) o.maxMouseY = -o.minY + e.clientY + y;
-			if (o.maxY != null) o.minMouseY = -o.maxY + e.clientY + y;
-		}
-
-		document.onmousemove	= Drag.drag;
-		document.onmouseup		= Drag.end;
-
-		return false;
-	},
-
-	drag : function(e)
-	{
-		e = Drag.fixE(e);
-		var o = Drag.obj;
-
-		var ey	= e.clientY;
-		var ex	= e.clientX;
-		var y = parseInt(o.vmode ? o.root.style.top  : o.root.style.bottom);
-		var x = parseInt(o.hmode ? o.root.style.left : o.root.style.right );
-		var nx, ny;
-
-		if (o.minX != null) ex = o.hmode ? Math.max(ex, o.minMouseX) : Math.min(ex, o.maxMouseX);
-		if (o.maxX != null) ex = o.hmode ? Math.min(ex, o.maxMouseX) : Math.max(ex, o.minMouseX);
-		if (o.minY != null) ey = o.vmode ? Math.max(ey, o.minMouseY) : Math.min(ey, o.maxMouseY);
-		if (o.maxY != null) ey = o.vmode ? Math.min(ey, o.maxMouseY) : Math.max(ey, o.minMouseY);
-
-		nx = x + ((ex - o.lastMouseX) * (o.hmode ? 1 : -1));
-		ny = y + ((ey - o.lastMouseY) * (o.vmode ? 1 : -1));
-
-		if (o.xMapper)		nx = o.xMapper(y)
-		else if (o.yMapper)	ny = o.yMapper(x)
-
-		Drag.obj.root.style[o.hmode ? "left" : "right"] = nx + "px";
-		Drag.obj.root.style[o.vmode ? "top" : "bottom"] = ny + "px";
-		Drag.obj.lastMouseX	= ex;
-		Drag.obj.lastMouseY	= ey;
-
-		Drag.obj.root.onDrag(nx, ny);
-		return false;
-	},
-
-	end : function()
-	{
-		document.onmousemove = null;
-		document.onmouseup   = null;
-		Drag.obj.root.onDragEnd(	parseInt(Drag.obj.root.style[Drag.obj.hmode ? "left" : "right"]), 
-									parseInt(Drag.obj.root.style[Drag.obj.vmode ? "top" : "bottom"]));
-		Drag.obj = null;
-	},
-
-	fixE : function(e)
-	{
-		if (typeof e == 'undefined') e = window.event;
-		if (typeof e.layerX == 'undefined') e.layerX = e.offsetX;
-		if (typeof e.layerY == 'undefined') e.layerY = e.offsetY;
-		return e;
-	}
-};
-
-/**
- * Get current mouse position
- * 
- */
-var MousePosition = {	
-	init : function ()
-	{
-		this.x = '';
-		this.y = '';
-		this.MicrosoftModel = 0;
-		if (document.all){
-			this.MicrosoftModel  = 1;
-			document.onmousemove = this.capture;
-		}
-		if (!(this.MicrosoftModel)){
-			if (typeof(document.addEventListener) == "function"){
-				document.addEventListener("mousemove", this.capture, true);
-			} else if (document.runner){
-		  		window.captureEvents(Event.MOUSEMOVE);
-		 		window.onmousemove = this.capture;
-			}
-		}
-	},
-	capture : function( event ){
-		if (!event){  event = window.event; }
-		if (typeof(event)!="object") return;
-		if (document.all){
-			x = event.clientX;
-			y = event.clientY + document.documentElement.scrollTop;
-		} else {
-			x = event.pageX;
-			y = event.pageY;
-		}
-		MousePosition.x = x;
-		MousePosition.y = y;
-	},
-	get : function (){
-		return { x: this.x, y: this.y };
-	}
-};
-
-/**
- * Get window size
- * 
- */
-var WindowSize = function() {
-	height = "";
-	if(window.innerHeight != "undefined") {
-		height = window.innerHeight;
-	}
-	if(document.body.clientHeight != "undefined") {
-		height = document.body.clientHeight;
-	}
-	if(document.documentElement.clientHeight != "undefined") {
-		height = document.documentElement.clientHeight;
-	}
-
-	width = "";
-	if(window.innerWidth != "undefined") {
-		width = window.innerWidth;
-	}
-	if(document.body.clientWidth != "undefined") {
-		width = document.body.clientWidth;
-	}
-	if(document.documentElement.clientWidth != "undefined") {
-		width = document.documentElement.clientWidth;
-	}
-
-	return { height: height, width: width };
-};
-
-/**
- * Get or Set Selection or Insert at Selection of an element
- * 
- */
-var SelectionRange = {
-
-	get : function(element){
-		if(window.getSelection) {
-			start = element.selectionStart;
-			end   = element.selectionEnd;
-		}
-		else if( document.selection ){
-			// current selection
-			range = document.selection.createRange();
-			// use this as a 'dummy'
-			stored_range = range.duplicate();
-			// select all text
-			stored_range.moveToElementText( element );
-			// move 'dummy' end point to end point of original range
-			stored_range.setEndPoint( 'EndToEnd', range );
-			// calculate start and end points
-			start = parseInt(stored_range.text.length) - parseInt(range.text.length);
-			end   = parseInt(start) + parseInt(range.text.length);
-		}
-		return {start: start, end: end};
-	},
-
-	set : function(element, start, end){
-		if (element.setSelectionRange) {
-			element.focus();
-			element.setSelectionRange(start, end);
-		}
-		else if (element.createTextRange) {
-			range = element.createTextRange();
-			start = element.value.substring(0, start).replace(/\r/g,"");
-			end   = element.value.substring(0, end).replace(/\r/g,"");
-			range.collapse(true);
-			range.moveEnd('character', end.length);
-			range.moveStart('character', start.length);
-			range.select();
-		}
-	},
-
-	insert : function(element, content){
-		st  = element.scrollTop;
-		sl  = element.scrollLeft;
-		sel = this.get(element);
-		element.value = element.value.substring(0, sel.start) + content + element.value.substring(sel.end, element.value.length);
-		this.set(element,  parseInt(sel.start) + parseInt(content.length), parseInt(sel.start) + parseInt(content.length));
-		element.scrollTop  = st;
-		element.scrollLeft = sl;
-	}
-
-};
-
-/**
- * Parse object attributes
- *
- *
- */
-function objects(obj) {
-	val = new Array();
-	i = 0;
-	for (var attrib in obj) {
-		val[i] = attrib + ' : ' + obj[attrib];
-		i = i+1;
-	}
-	val.sort();
-	alert(val.join(", "));
-}
-
-/**
- * Generate Password
- *
- *
- */
-function GeneratePassword() {
-	var password = "";
-	var password_characters = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-	var one_random_char;
-	for (j=0; j<8; j++) {
-		one_random_char = password_characters.charAt(Math.floor(Math.random()*password_characters.length));
-		password += one_random_char;
-	}
-	return password;
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/kvm-action.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/kvm-action.php
deleted file mode 100644
index 075ec2d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/kvm-action.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/authblocker.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-// filter inputs
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-global $IMAGE_INFO_TABLE;
-global $DEPLOYMENT_INFO_TABLE;
-global $OPENQRM_SERVER_BASE_DIR;
-
-$cloud_product_hook = $RootDir.'/plugins/kvm/openqrm-kvm-cloud-product-hook.php';
-$cloud_selector_class = $RootDir.'/plugins/cloud/class/cloudselector.class.php';
-$cloud_usergroup_class = $RootDir.'/plugins/cloud/class/cloudusergroup.class.php';
-
-// place for the storage stat files
-$StorageDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/kvm/storage';
-// place for the kvm_server stat files
-$KvmDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/kvm/kvm-stat';
-// get params
-$lvm_command = $request->get('lvm_command');
-$kvm_server_command = $request->get('kvm_server_command');
-$kvm_server_id = $request->get('kvm_server_id');
-if (!strlen($lvm_command)) {
-	$lvm_command = $kvm_server_command;
-}
-$kvm_image_name = $request->get('kvm_image_name');
-
-
-// global event for logging
-$event = new event();
-
-// user/role authentication
-if ($OPENQRM_USER->role != "administrator") {
-	$event->log("authorization", $_SERVER['REQUEST_TIME'], 1, "lvm-action", "Un-Authorized access to lvm-actions from $OPENQRM_USER->name", "", "", 0, 0, 0);
-	exit();
-}
-
-
-// $event->log("$lvm_command", $_SERVER['REQUEST_TIME'], 5, "kvm-action", "Processing kvm command $lvm_command", "", "", 0, 0, 0);
-switch ($lvm_command) {
-	// storage commands
-	case 'get':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	case 'get_ident':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	case 'clone_finished':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	case 'get_sync_progress':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	case 'get_sync_finished':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		sleep(5);
-		unlink($filename);
-		break;
-
-	case 'auth_finished':
-		// remove storage-auth-blocker if existing
-		$authblocker = new authblocker();
-		$authblocker->get_instance_by_image_name($kvm_image_name);
-		if (strlen($authblocker->id)) {
-			$event->log('auth_finished', $_SERVER['REQUEST_TIME'], 5, "kvm-action", "Removing authblocker for image $kvm_image_name", "", "", 0, 0, 0);
-			$authblocker->remove($authblocker->id);
-		}
-		break;
-
-
-	// vm commands
-	// get the incoming vm list
-	case 'get_kvm_server':
-		if (!file_exists($KvmDir)) {
-			mkdir($KvmDir);
-		}
-		$filename = $KvmDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	// send command to send the vm list
-	case 'refresh_vm_list':
-		$kvm_appliance = new appliance();
-		$kvm_appliance->get_instance_by_id($kvm_server_id);
-		$kvm_server = new resource();
-		$kvm_server->get_instance_by_id($kvm_appliance->resources);
-		$resource_command="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-vm post_vm_list -u $OPENQRM_ADMIN->name -p $OPENQRM_ADMIN->password";
-		$kvm_server->send_command($kvm_server->ip, $resource_command);
-		break;
-
-	// get the incoming vm config
-	case 'get_kvm_config':
-		if (!file_exists($KvmDir)) {
-			mkdir($KvmDir);
-		}
-		$filename = $KvmDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	// send command to send the vm config
-	case 'refresh_vm_config':
-		$kvm_appliance = new appliance();
-		$kvm_appliance->get_instance_by_id($kvm_server_id);
-		$kvm_server = new resource();
-		$kvm_server->get_instance_by_id($kvm_appliance->resources);
-		$resource_command="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-vm post_vm_config -n $kvm_server_name -u $OPENQRM_ADMIN->name -p $OPENQRM_ADMIN->password";
-		$kvm_server->send_command($kvm_server->ip, $resource_command);
-		break;
-
-	// get the incoming bridge config
-	case 'get_bridge_config':
-		if (!file_exists($KvmDir)) {
-			mkdir($KvmDir);
-		}
-		$filename = $KvmDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	// get VM migration status
-	case 'get_vm_migration':
-		if (!file_exists($KvmDir)) {
-			mkdir($KvmDir);
-		}
-		$filename = $KvmDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	// get pick_iso config
-	case 'get_pick_iso_config':
-		if (!file_exists($KvmDir)) {
-			mkdir($KvmDir);
-		}
-		$filename = $KvmDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-		
-	case 'init':
-		// add cloud products
-		if (file_exists($cloud_usergroup_class)) {
-			require_once $cloud_usergroup_class;
-			$cloud_project = new cloudusergroup();
-			$cloud_project->get_instance_by_name('Admin');
-			if (file_exists($cloud_selector_class)) {
-				if (file_exists($cloud_product_hook)) {
-					$cloud_hook_config = array();
-					$cloud_hook_config['cloud_admin_procect'] = $cloud_project->id;
-					require_once $cloud_product_hook;
-					openqrm_kvm_cloud_product("add", $cloud_hook_config);
-				}
-			}
-		}
-		break;
-		
-	case 'uninstall':
-		// remove cloud products
-		if (file_exists($cloud_usergroup_class)) {
-			require_once $cloud_usergroup_class;
-			$cloud_project = new cloudusergroup();
-			$cloud_project->get_instance_by_name('Admin');
-			if (file_exists($cloud_selector_class)) {
-				if (file_exists($cloud_product_hook)) {
-					$cloud_hook_config = array();
-					$cloud_hook_config['cloud_admin_procect'] = $cloud_project->id;
-					require_once $cloud_product_hook;
-					openqrm_kvm_cloud_product("remove", $cloud_hook_config);
-				}
-			}
-		}
-		break;
-
-	case 'put_vnc':
-		$cloud_vnc_dir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/action/cloud-conf/';
-		if (!file_exists($cloud_vnc_dir)) {
-			mkdir($cloud_vnc_dir);
-		}
-		$filename = $cloud_vnc_dir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	case 'put_stats':
-		$cloud_vnc_dir = $KvmDir;
-		if (!file_exists($KvmDir)) {
-			mkdir($KvmDir);
-		}
-		$filename = $KvmDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	case 'set_image_size':
-		$kvm_image_name = $request->get('kvm_image_name');
-		$kvm_image_size = $request->get('kvm_image_size');
-		if($kvm_image_name !== '' && $kvm_image_size !== '') {
-			$kvm_image = new image();
-			$kvm_image->get_instance_by_name($kvm_image_name);
-			if($kvm_image->id !== '') {
-				$kvm_image->update($kvm_image->id, array('image_size' => $kvm_image_size));
-			}
-		}
-		break;
-
-	default:
-		$event->log("$lvm_command", $_SERVER['REQUEST_TIME'], 3, "kvm-action", "No such kvm command ($lvm_command)", "", "", 0, 0, 0);
-		break;
-
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/de.kvm-about.ini b/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/de.kvm-about.ini
deleted file mode 100644
index d5f3611..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/de.kvm-about.ini
+++ /dev/null
@@ -1,99 +0,0 @@
-[documentation]
-tab = "Über KVM"
-label = "Über KVM"
-introduction_title = "Einleitung"
-introduction_content = "Das 'KVM' Plugin verwaltet KVM Virtuellen Maschinen und deren zugehörige virtuelle Festplatte.
-					   Wie üblich in openQRM openQRM ist dier Verwaltung der Virtuellen Maschineen und das die Storage/Volume-Verwaltung separiert.
-					   Das 'KVM' Plugin teilt sich also in VM- und Volume-Management auf.
-					   Der VM Teil bietet Virtuelle Maschinen, die in openQRM als 'Ressources' abstrahiert sind.
-					   Der Storage Teil beinhaltet die Volumes die als 'Image' abstrahiert sind.
-					   Server deployment verbindet automatisch 'Ressource' und 'Image'."
-requirements_title = "Anforderungen"
-requirements_list = "<ul><li>Eine 'Resource' für die KVM Host Server<br>(dies kann ein System sein das mittels des "local-server" Plugin in openQRM eingebunden ist oder der openQRM Server selber)</li>
-				   <li>Der Server benötigt die VT (Virtualization Technology) Extension in der CPU (benötigt für KVM)</li>
-				   <li>Die folgenden Paket werden benötigt: kvm (eventuel kvm-pxe), socat, bridge-utils, lvm2</li>
-				   <li>Für KVM LVM Storage: Eine (oder mehrere) LVM Volume Group(s) mit freiem Speicher dediziert für KVM VM storage</li>
-				   <li>Für KVM Blockfile Storage: freiem Speicher dediziert für KVM VM storage</li>
-					<li>For KVM Gluster Storage: Ein oder mehrere Gluster Storage Cluster</li>
-				   <li>Eine (oder mehrere) 'bridges' konfiguriert für die virtuellen Netzwerkkarten der Virtuellen Maschinen</li></ul>"
-tested_title = "Testet mit"
-tested_content = "Diese Plugin ist getestet ab KVM Version kvm-62. Für KVM 'virtio' wird kvm-84 (oder besser) benötigt"
-
-provides_title = "Bietet"
-provides_list = "<ul><li>Virtualization Typen: 'KVM Host', 'KVM VM (localboot)' und 'KVM VM (netboot)'</li>
-				   <li>Storage Typen: 'KVM LVM Storage', 'KVM Blockfile Storage' und 'KVM Gluster Storage'</li>
-				   <li>Deployment types: 'LVM deployment für KVM', 'Blockfile deployment für KVM' und 'Gluster deployment für KVM'</li></ul>"
-type_title = "Plugin Typ"
-type_content = "Virtualization und Storage"
-
-deployment_title = "Deployment Typ"
-deployment_content = "Local und Network Deployment für Virtuelle Maschinen"
-
-migration_title = "Anforderungen für KVM live-migration"
-migration_content = "Verteilte Storage zwischen den KVM Hosts für die VM Konfigurationdateien (/var/lib/kvm/openqrm)
-					und eine verteiltes LVM Volume Group zwischen den KVM Hosts"
-documentation_title = "Dokumentation"
-use_case_title = "Anwendungsfall"
-network_deploymet = "Network-Deployment"
-doc1 = ""
-
-
-[bootservice]
-tab = "Boot-Service"
-label = "KVM Boot-Service"
-boot_service_title = "KVM Host Boot-Service"
-boot_service_content = "Das KVM Plugin beinhaltet einen openQRM Boot-Service.
-			Dieser 'KVM Boot-Service' wird automatisch von allen in openQRM integrierten Systeme heruntergeladen und ausgeführt.
-			Der Boot-Service befindet sich unter:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/kvm/web/boot-service-kvm.tgz</b></i>
-			<br>
-			<br>
-			Der 'KVM Boot-Service' beinhaltet die 'Client' Dateien des KVM Plugin.<br>
-			Eine Konfigurationsdatei für den KVM Hosts ist ebenfalls enhalten.<br>
-			<br>
-			Die Boot-Service konfiguration wird mittels des 'openqrm' Kommandozeilenwerkzeugs verwaltet.<br>
-			Der folgende Befehl zeigt die die momentane 'default' Boot-Service Konfiguration an:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n kvm -a default</b></i>
-			<br>
-			<br>
-			Die Boot-Service Konfiguration eines speziellen Server zeigt der folgende Befehl an:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n kvm -a [Server-name]</b></i>
-			<br>
-			<br>
-			Der folgende Befehl passt einen Konfigurationparameter des 'default' Boot-Service an:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n kvm -a default -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			Die Boot-Service Konfigurarationsparameter eines speziellen Server passt der folgende Befehl an:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n kvm -a [Server-name] -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			Im Falle das der openmQRM Server selber als KVM Host genutzt wird werden die Konfigurationsparameter in der folgenden Datei manuell angeepasst:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/kvm/etc/openqrm-plugin-kvm.conf</b></i>
-			<br><br>"
-
-[storage]
-tab = "Über KVM"
-label = "Über Storage in KVM"
-storage_mgmt_title = "KVM Storage Management"
-storage_mgmt_list = "<ul><li>Erstellen Sie eine neue 'Storage' vom Typ 'KVM LVM Storage' oder 'KVM Blockfile Storage'</li>
-				   <li>Erstellen Sie ein neues Volume auf der 'Storage' (entweder LVM oder Blockfile)</li>
-				   <li>Aus dem erstellten Volume wird automatisch ein 'Image' mit dem Volume als 'root-device' erstellt</li></ul>"
-
-[vms]
-tab = "Über KVM"
-label = "Über Virtuelle Maschine in KVM"
-vm_mgmt_title = "KVM VM Management"
-vm_mgmt_list = "<ul><li>Erstellen Sie eine neue 'Server' und setzen Sie 'Virtualization' auf 'KVM Host'</li>
-				   <li>Erstellen Sie KVM Virtuelle Maschinen mittels dem KVM VM Manager</li>
-				   <li>Aus der neuen Virtuelle Maschinen wird in openQRM automatisch eine neue Ressource erstellt, die mittels eines Server ausgebracht werden kann.</li></ul>"
-
-[usage]
-tab = "About KVM"
-label = "KVM Anwendungsfälle"
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/de.kvm-vm.ini b/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/de.kvm-vm.ini
deleted file mode 100644
index 043d234..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/de.kvm-vm.ini
+++ /dev/null
@@ -1,198 +0,0 @@
-[select]
-tab = "KVM Host auswählen"
-label = "KVM Host Server auswählen"
-action_edit = "bearbeiten"
-table_name = "Name"
-table_id = "Id"
-table_recource = "Resource"
-table_type = "Typ"
-table_deployment = "Deployment"
-error_no_host = "<b>Keinen KVM Host Server angelegt!</b><br><br>Bitte legen Sie erst einen KVM Host Server an!"
-new = "Neuer Server"
-please_wait = "Lade VMs. Bitte warten .."
-
-[edit]
-tab = "KVM Host bearbeiten"
-label = "KVM VMs auf KVM Host Server %s"
-lang_id = "ID"
-lang_name = "Name"
-lang_resource = "Resource"
-lang_state = "Status"
-lang_vfree = "Frei"
-lang_vsize = "Gesamt"
-action_add_local_vm = "Lokale VM hinzufügen"
-action_add_network_vm = "Netzwerk VM hinzufügen"
-action_remove = "entfernen"
-action_stop = "stop"
-action_start = "start"
-action_reboot = "reboot"
-action_update = "bearbeiten"
-action_console = "console"
-action_migrate = "migrieren"
-action_clone = "klonen"
-action_migrate_in_progress = "Migration in Bearbeitung - Bitte warten"
-action_migrate_finished = "Migration beendet!"
-table_name = "Name"
-table_mac = "Mac"
-table_ram = "RAM"
-table_cpu = "CPU"
-table_nics = "NIC"
-table_id = "ID"
-table_ip = "IP"
-table_vnc = "VNC"
-table_state = "Status"
-table_type = "Typ"
-table_appliance = "Server"
-table_kernel = "Kernel"
-table_image = "Image"
-table_storage = "Storage"
-error_no_host = "<b>Keinen KVM Host Server angelegt!</b><br><br>Bitte legen Sie erst einen KVM Host Server an!"
-please_wait = "Lade VMs. Bitte warten .."
-
-[add]
-tab = "Neue VM"
-label = "Neue VM anlegen"
-lang_basic = "Basic"
-lang_hardware = "Virtual Hardware"
-lang_net = "Virtual Netzwerk"
-lang_net_0 = "1. Netzwerkkarte"
-lang_net_1 = "2. Netzwerkkarte"
-lang_net_2 = "3. Netzwerkkarte"
-lang_net_3 = "4. Netzwerkkarte"
-lang_net_4 = "5. Netzwerkkarte"
-lang_boot = "Starten von"
-lang_virtual_disk = "Virtual Disk Image"
-lang_vnc = "VNC Password"
-lang_browse = "auswählen"
-lang_browser = "Dateiauswahl"
-lang_password_generate = "Passwort generieren"
-lang_password_show = "Passwort anzeigen"
-lang_password_hide = "Passwort verbergen"
-form_name = "Name"
-form_cpus = "CPU(s)"
-form_disk = "Disk"
-form_swap = "Swap"
-form_mac = "Mac"
-form_ipaddress = "IP Adresse"
-form_memory = "Memory"
-form_bridge = "Bridge"
-form_boot_cd = "CD"
-form_boot_iso = "Iso"
-form_iso_path = "Path"
-form_boot_net = "Net"
-form_boot_local = "Local"
-form_enable = "ein"
-form_net_virtio = "Virtio"
-form_net_e1000 = "E1000"
-form_net_rtl8139 = "Rtl8139"
-form_netdevice = "Networkcard"
-form_disk_interface = "Disk Interface"
-form_existing_disk = "Bestehende Disk"
-form_vnc = "Passwort"
-form_vnc_repeat = "Passwort (wiederholen)"
-form_vnc_keymap = "VNC Tastatur"
-form_swap = "Swap"
-form_disk = "Disk"
-msg_added = "VM %s angelegt"
-action_add_vm_image = "Neues VM Image erstellen"
-error_exists = "VM %s existiert bereits"
-error_name = "Name darf nur %s beinhalten"
-error_memory = "Memory darf nur %s beinhalten"
-error_mac = "Mac ist invalid"
-error_bridge = "Bridge ist invalid"
-error_nic = "Nic ist invalid"
-error_boot = "Bitte Boot-Device auswählen"
-error_iso_path = "Pfad darf nicht leer sein"
-error_vnc_password = "Eingegebene Passwörter sind nicht gleich!"
-error_vnc_password_count = "Passwort muss mindestens 6 Zeichen enthalten"
-please_wait = "Lade VMs. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[update]
-tab = "Bearbeite VM"
-label = "Bearbeite VM %s"
-lang_basic = "Basic"
-lang_hardware = "Hardware"
-lang_net = "Netzwerk"
-lang_net_0 = "1. Netzwerkkarte"
-lang_net_1 = "2. Netzwerkkarte"
-lang_net_2 = "3. Netzwerkkarte"
-lang_net_3 = "4. Netzwerkkarte"
-lang_net_4 = "5. Netzwerkkarte"
-lang_boot = "Starten von"
-lang_vnc = "VNC Password"
-lang_browse = "auswählen"
-lang_browser = "Dateiauswahl"
-lang_password_generate = "Passwort generieren"
-lang_password_show = "Passwort anzeigen"
-lang_password_hide = "Passwort verbergen"
-form_name = "Name"
-form_cpus = "CPU(s)"
-form_mac = "Mac"
-form_memory = "Memory"
-form_bridge = "Bridge"
-form_boot_cd = "CD"
-form_boot_iso = "Iso"
-form_iso_path = "Path"
-form_boot_net = "Net"
-form_boot_local = "Local"
-form_enable = "ein"
-form_net_virtio = "Virtio"
-form_net_e1000 = "E1000"
-form_net_rtl8139 = "Rtl8139"
-form_netdevice = "Networkcard"
-form_disk_interface = "Disk Interface"
-form_vnc = "Passwort"
-form_vnc_repeat = "Passwort (wiederholen)"
-form_vnc_keymap = "VNC Tastatur"
-form_swap = "Swap"
-form_disk = "Disk"
-msg_updated = "Updated VM %s"
-error_exists = "VM %s existiert bereits"
-error_name = "Name darf nur %s beinhalten"
-error_memory = "Memory darf nur %s beinhalten"
-error_mac = "Mac ist invalid"
-error_bridge = "Bridge ist invalid"
-error_nic = "Nic ist invalid"
-error_boot = "Bitte Boot-Device auswählen"
-error_iso_path = "Pfad darf nicht leer sein"
-error_vnc_password = "Eingegebene Passwörter sind nicht gleich!"
-error_vnc_password_count = "Passwort muss mindestens 6 Zeichen enthalten"
-please_wait = "Lade VMs. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[clone]
-label = "Clone VM %s"
-tab = "Clone VM"
-msg_cloned = "VM %s als %s geklont"
-form_name = "Name"
-error_exists = "VM %s existiert bereits"
-error_name = "Name darf nur %s beinhalten"
-please_wait = "Lade VMs. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[migrate]
-label = "Migrate VM %s"
-tab = "Migrate VM"
-msg_migrated = "Migrated %s nach %s"
-error_no_hosts = "Keinen KVM Host Server gefunden um zu migrieren"
-form_target = "Target Host Resource"
-please_wait = "Lade VMs. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[start]
-msg_started = "VM %s gestartet"
-
-[stop]
-msg_stoped = "VM %s gestoppt"
-
-[reboot]
-msg_rebooted = "VM %s neu gestartet"
-
-[remove]
-label = "Entferne VM(s)"
-msg_removed = "VM %s entfernt"
-msg_vm_resource_still_in_use = "VM %s resource id %s is still in use by Server %s"
-please_wait = "Lade VMs. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/de.kvm.ini b/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/de.kvm.ini
deleted file mode 100644
index c987106..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/de.kvm.ini
+++ /dev/null
@@ -1,167 +0,0 @@
-[select]
-tab = "KVM auswählen"
-label = "KVM auswählen"
-action_edit = "bearbeiten"
-table_name = "Name"
-table_id = "Id"
-table_recource = "Resource"
-table_type = "Typ"
-table_deployment = "Deployment"
-error_no_storage = "<b>Keine Storage angelegt!</b><br><br>Bitte legen Sie erst eine KVM Storage an!"
-new_storage = "Neue Storage"
-please_wait = "Lade Volume Groups. Bitte warten .."
-
-[edit]
-tab = "Volume Group auswählen"
-label = "Volume Group auf KVM %s auswählen"
-lang_id = "ID"
-lang_name = "Name"
-lang_resource = "Resource"
-lang_state = "Status"
-lang_deployment = "Deployment"
-action_edit = "select"
-action_add ="Neue Volume Group erstellen"
-action_remove ="entfernen"
-table_name = "Name"
-table_pv = "PV"
-table_lv = "LV"
-table_sn = "SN"
-table_attr = "Attr"
-table_vsize = "Vsize"
-table_vfree = "VFree"
-table_vused = "Benutzt"
-table_vusedpercent = "%"
-table_available = "Verfügbar"
-table_objects = "Objekte"
-table_vg = "Volume Group Details"
-table_bricks = "Gluster Bricks"
-table_type = "Typ"
-table_status = "Status"
-table_topology = "Topology"
-table_transport = "Transport"
-error_no_kvm = "Storage %s ist nicht vom Typ 'KVM'"
-please_wait = "Lade Volume Groups. Bitte warten .."
-
-[addvg]
-tab = "Volume Group erstellen"
-label = "Volume Group auf storage %s erstellen"
-partition = "Partition"
-name = "Name"
-extend = "Partition erweitern"
-confirm_text = "Alle Daten auf %s werden gelöscht.<br>Wirklich fortsetzen?"
-msg_added = "Volume Group %s erfolgreich erstellt"
-please_wait = "Lade Volume group. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[removevg]
-tab = "Volume Group entfernen"
-label = "Volume Group auf storage %s entfernen"
-confirm_text = "Wollen Sie die Volume Group %s wirlich entfernen?"
-msg_removed = "Volume Group %s erfolgreich entfernt"
-please_wait = "Lade Volume group. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[volgroup]
-tab = "Volume Group bearbeiten"
-label = "Bearbeite Volume Group %s auf KVM %s"
-lang_id = "ID"
-lang_name = "Name"
-lang_deployment = "Deployment"
-lang_resource = "Resource"
-lang_state = "Status"
-lang_attr = "Attr"
-lang_pv = "PV / LV / SN"
-lang_size = "Vsize / Vfree"
-lang_free = "Frei"
-action_add = "Neues Logical Volume hinzufügen"
-action_remove = "entfernen"
-action_resize = "resize"
-action_snap = "snap"
-action_clone = "clone"
-action_add_image = "Image hinzufügen"
-action_remove_image = "Image entfernen"
-action_sync_in_progress = "Ziel einer Synchronisation - Bitte warten"
-action_clone_in_progress = "Synchronisation in Bearbeitung - Bitte warten"
-action_clone_finished = "Syncronisation beendet!"
-table_name = "Lvol"
-table_deployment = "Deployment"
-table_attr = "Attr"
-table_path = "Pfad"
-table_size = "Size"
-table_source = "Source"
-table_path_physical = "Physikalisch"
-table_path_glusters = "Logisch"
-error_no_kvm = "Storage %s ist nicht vom Typ 'KVM'"
-please_wait = "Lade Volume Groups. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[add]
-tab = "Logical Volume hinzufügen"
-label = "Logical Volume zu Volume group %s hinzufügen"
-form_name = "Name"
-form_size = "Grösse (max: %s MB)"
-form_type = "Volume Typ"
-msg_added = "Logical Volume %s hinzugefügt"
-msg_add_failed = "Fehler beim hinzufügen des Logical Volume %s"
-lang_name_generate = "Erzeuge Namen"
-error_exists = "Logical Volume %s existiert bereits"
-error_name = "Name darf nur %s beinhalten"
-error_size = "Grösse darf nur %s beinhalten"
-error_size_exeeded = "Grösse übersteigt %s MB"
-please_wait = "Lade Volume Groups. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[image]
-label = "Image für Logical Volume %s hinzufügen/entfernen"
-tab = "Image hinzufügen/entfernen"
-error_exists = "Image %s existiert bereits"
-error_image_still_in_use = "Image ID %s ist noch in benutztung von Server %s"
-msg_added_image = "Image %s hinzugefügt"
-msg_removed_image = "Image id %s entfernt"
-please_wait = "Bitt warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[snap]
-label = "Snap Logical Volume %s"
-tab = "Snap Logical Volume"
-msg_snaped = "Snaped %s zu %s"
-msg_snap_failed = "Fehler beim Snapping von %s nach %s"
-form_name = "Name"
-form_size = "Grösse (max: %s MB)"
-error_exists = "Logical Volume %s existiert bereits"
-error_name = "Name darf nur %s beinhalten"
-error_size = "Grösse darf nur %s beinhalten"
-error_size_exeeded = "Grösse übersteigt %s MB"
-please_wait = "Lade Volume Groups. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[clone]
-label = "Clone Logical Volume %s"
-tab = "Clone Logical Volume"
-msg_cloned = "Cloned %s as %s"
-msg_clone_failed = "Clone failed for %s as %s"
-form_name = "Name"
-error_exists = "Logical Volume %s existiert bereits"
-error_name = "Name darf nur %s beinhalten"
-please_wait = "Lade Volume Groups. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[remove]
-label = "Entferne Logical Volume(s)"
-msg_removed = "Logical Volume %s entfernt"
-msg_vm_image_still_in_use = "Das Volume %s des Image ID %s ist noch in benutztung von Server %s"
-please_wait = "Lade Volume Groups. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[resize]
-label = "Resize Logical Volume %s"
-tab = "Resize Logical Volume"
-size = "min. %s MB, max. %s MB"
-ceph_size = "Neue Volume Grösse in MB"
-error_size = "Grösse darf nur %s beinhalten"
-error_size_exeeded = "Grösse übersteigt %s MB"
-error_size_undercut = "Grösse unterschreitet %s MB"
-msg_resized = "Resized Logical Volume %s"
-please_wait = "Lade Volume Groups. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/en.kvm-about.ini b/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/en.kvm-about.ini
deleted file mode 100644
index df0b4ef..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/en.kvm-about.ini
+++ /dev/null
@@ -1,100 +0,0 @@
-[documentation]
-tab = "About KVM"
-label = "About KVM"
-introduction_title = "Introduction"
-introduction_content = "The 'KVM' plugin manages KVM Virtual Machines and their belonging virtual disk.
-					   As common in openQRM the Virtual Machines and their virtual disk volumes are managed separately.
-					   Therefore the 'KVM' plugin splits up into VM- and Volume-Management.
-					   The VM part provides the Virtual Machines which are abstracted as 'Resources'.
-					   The Storage part provides volumes which are abstracted as 'Images'.
-					   Server deployment automatically combines 'Resource' and 'Image'."
-requirements_title = "Requirements"
-requirements_list = "<ul><li>A resource for the KVM Host Server<br>(this can be a remote system integrated into openQRM e.g. via the 'local-server' plugin or the openQRM server itself)</li>
-				   <li>The server needs VT (Virtualization Technology) Support in its CPU (requirement for KVM)</li>
-				   <li>The following packages must be installed: kvm (eventual kvm-pxe), socat, bridge-utils, lvm2</li>
-				   <li>For KVM LVM Storage: One (or more) lvm volume group(s) with free space dedicated for the KVM VM storage</li>
-				   <li>For KVM Blockfile Storage: free space dedicated for the KVM VM storage</li>
-				   <li>For KVM Gluster Storage: One or more Gluster Storage Cluster</li>
-				   <li>One or more bridges configured for the virtual machines</li></ul>"
-tested_title = "Tested with"
-tested_content = "This plugin is tested with KVM kvm-62 or better<br>To benefit from the KVM 'virtio' feature at least kvm-84 is needed"
-
-provides_title = "Provides"
-provides_list = "<ul><li>Virtualization types: 'KVM Host', 'KVM VM (localboot)' and 'KVM VM (netboot)'</li>
-				   <li>Storage types: 'KVM LVM Storage', 'KVM Blockfile Storage' and 'KVM Gluster Storage'</li>
-				   <li>Deployment types: 'LVM deployment for KVM', 'Blockfile deployment for KVM' and 'Gluster deployment for KVM'</li></ul>"
-type_title = "Plugin Type"
-type_content = "Virtualization and Storage"
-
-deployment_title = "Deployment Type"
-deployment_content = "Local and Network Deployment for Virtual Machines"
-
-migration_title = "Requirements for KVM live-migration"
-migration_content = "Shared storage between the KVM Hosts for the location of the VM config files (/var/lib/kvm/openqrm)
-					and a shared LVM volume group between the KVM Hosts"
-documentation_title = "Documentation"
-use_case_title = "Use-Case"
-network_deploymet = "Network-Deployment"
-doc1 = ""
-
-
-[bootservice]
-tab = "Boot-Service"
-label = "KVM Boot-Service"
-boot_service_title = "KVM Host Boot-Service"
-boot_service_content = "The KVM Plugin provides an openQRM Boot-Service.
-			This 'KVM Boot-Service' is automatically downloaded and executed by the openQRM-Client on all integrated Systems.
-			The Boot-Service is located at:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/kvm/web/boot-service-kvm.tgz</b></i>
-			<br>
-			<br>
-			The 'KVM Boot-Service' contains the Client files of the KVM Plugin.<br>
-			Also a configuration file for the KVM Hosts is included in this Boot-Service.<br>
-			<br>
-			The Boot-Service configuration can be viewed and administrated by the 'openqrm' utility.<br>
-			To view the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n kvm -a default</b></i>
-			<br>
-			<br>
-			To view a Boot-Service configuration of a specific Server run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n kvm -a [Server-name]</b></i>
-			<br>
-			<br>
-			To adapt a parameter in the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n kvm -a default -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			To adapt a paramter in the Boot-Service configuration of a specific Server run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n kvm -a [Server-name] -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			In case the openmQRM Server itself is used as the KVM Host please edit:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/kvm/etc/openqrm-plugin-kvm.conf</b></i>
-			<br>
-			<br>
-			and set the configuration keys according to your bridge-configuration.<br>
-			<br>"
-[storage]
-tab = "About KVM"
-label = "About Storage in KVM"
-storage_mgmt_title = "KVM Storage Management"
-storage_mgmt_list = "<ul><li>Create a new storage from type 'KVM LVM Storage' or 'KVM Blockfile Storage'</li>
-				   <li>Create a new Volume on this storage (either LVM or Blockfile)</li>
-				   <li>Creating the Volume automatically creates a new Image using volume as root-device</li></ul>"
-
-[vms]
-tab = "About KVM"
-label = "About Virtual Machines in KVM"
-vm_mgmt_title = "KVM VM Management"
-vm_mgmt_list = "<ul><li>Create a new Server and set 'Virtualization' to 'KVM Host'</li>
-				   <li>Create and manage KVM virtual machines via the KVM VM Manager</li></ul>"
-
-[usage]
-tab = "About KVM"
-label = "KVM Use-Cases"
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/en.kvm-vm.ini b/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/en.kvm-vm.ini
deleted file mode 100644
index 2f12480..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/en.kvm-vm.ini
+++ /dev/null
@@ -1,198 +0,0 @@
-[select]
-tab = "Select KVM Host"
-label = "Select KVM Host Server"
-action_edit = "edit"
-table_name = "Name"
-table_id = "Id"
-table_recource = "Resource"
-table_type = "Type"
-table_deployment = "Deployment"
-error_no_host = "<b>No KVM Host Server configured yet!</b><br><br>Please create a KVM Host Server first!"
-new = "New Server"
-please_wait = "Loading VMs. Please wait .."
-
-[edit]
-tab = "Select VM"
-label = "KVM VMs on KVM Host Server %s"
-lang_id = "ID"
-lang_name = "Name"
-lang_resource = "Resource"
-lang_state = "State"
-lang_vfree = "Free"
-lang_vsize = "Total"
-action_add_local_vm = "Add local VM"
-action_add_network_vm = "Add network VM"
-action_remove = "delete"
-action_stop = "stop"
-action_start = "start"
-action_reboot = "reboot"
-action_update = "update"
-action_console = "console"
-action_migrate = "migrate"
-action_clone = "clone"
-action_migrate_in_progress = "Migration in progress - Please wait"
-action_migrate_finished = "Migration finished!"
-table_name = "Name"
-table_mac = "Mac"
-table_ram = "RAM"
-table_cpu = "CPU"
-table_nics = "NIC"
-table_id = "ID"
-table_ip = "IP"
-table_vnc = "VNC"
-table_state = "State"
-table_type = "Type"
-table_appliance = "Server"
-table_kernel = "Kernel"
-table_image = "Image"
-table_storage = "Storage"
-error_no_host = "<b>No KVM Host Server configured yet!</b><br><br>Please create a KVM Host Server first!"
-please_wait = "Loading VMs. Please wait .."
-
-[add]
-tab = "Add VM"
-label = "Add new VM"
-lang_basic = "Basic"
-lang_hardware = "Virtual Hardware"
-lang_net = "Virtual Network"
-lang_net_0 = "Network_0"
-lang_net_1 = "Network_1"
-lang_net_2 = "Network_2"
-lang_net_3 = "Network_3"
-lang_net_4 = "Network_4"
-lang_boot = "Boot from"
-lang_virtual_disk = "Virtual disk image"
-lang_vnc = "VNC Password"
-lang_browse = "browse"
-lang_browser = "Filepicker"
-lang_password_generate = "generate password"
-lang_password_show = "show password"
-lang_password_hide = "hide password"
-form_name = "Name"
-form_cpus = "CPU(s)"
-form_disk = "Disk"
-form_swap = "Swap"
-form_mac = "Mac"
-form_ipaddress = "IP Adress"
-form_memory = "Memory"
-form_bridge = "Bridge"
-form_boot_cd = "CD"
-form_boot_iso = "Iso"
-form_iso_path = "Path"
-form_boot_net = "Net"
-form_boot_local = "Local"
-form_existing_disk = "Existing disk"
-form_enable = "enable"
-form_net_virtio = "Virtio"
-form_net_e1000 = "E1000"
-form_net_rtl8139 = "Rtl8139"
-form_netdevice = "Networkcard"
-form_disk_interface = "Disk Interface"
-form_vnc = "Password"
-form_vnc_repeat = "Password (repeat)"
-form_vnc_keymap = "VNC Keymap"
-form_swap = "Swap"
-form_disk = "Disk"
-msg_added = "Added VM %s"
-action_add_vm_image = "Add a new VM Image"
-error_exists = "VM %s already exists"
-error_name = "Name must be %s"
-error_memory = "Memory must be %s"
-error_mac = "Mac is not valid"
-error_bridge = "Bridge is not valid"
-error_nic = "Nic is not valid"
-error_boot = "Please select a boot device"
-error_iso_path = "Path must not be empty"
-error_vnc_password = "Password (repeat) does not match Password"
-error_vnc_password_count = "Password must have at least 6 chars"
-please_wait = "Adding VM. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[update]
-tab = "Update VM"
-label = "Update VM %s"
-lang_basic = "Basic"
-lang_hardware = "Hardware"
-lang_net = "Network"
-lang_net_0 = "Network_0"
-lang_net_1 = "Network_1"
-lang_net_2 = "Network_2"
-lang_net_3 = "Network_3"
-lang_net_4 = "Network_4"
-lang_boot = "Boot from"
-lang_vnc = "VNC Password"
-lang_browse = "browse"
-lang_browser = "Filepicker"
-lang_password_generate = "generate password"
-lang_password_show = "show password"
-lang_password_hide = "hide password"
-form_name = "Name"
-form_cpus = "CPU(s)"
-form_mac = "Mac"
-form_memory = "Memory"
-form_bridge = "Bridge"
-form_boot_cd = "CD"
-form_boot_iso = "Iso"
-form_iso_path = "Path"
-form_boot_net = "Net"
-form_boot_local = "Local"
-form_enable = "enable"
-form_net_virtio = "Virtio"
-form_net_e1000 = "E1000"
-form_net_rtl8139 = "Rtl8139"
-form_netdevice = "Networkcard"
-form_disk_interface = "Disk Interface"
-form_vnc = "Password"
-form_vnc_repeat = "Password (repeat)"
-form_vnc_keymap = "VNC Keymap"
-form_swap = "Swap"
-form_disk = "Disk"
-msg_updated = "Updated VM %s"
-error_exists = "VM %s already exists"
-error_name = "Name must be %s"
-error_memory = "Memory must be %s"
-error_mac = "Mac is not valid"
-error_bridge = "Bridge is not valid"
-error_nic = "Nic is not valid"
-error_boot = "Please select a boot device"
-error_iso_path = "Path must not be empty"
-error_vnc_password = "Password (repeat) does not match Password"
-error_vnc_password_count = "Password must have at least 6 chars"
-please_wait = "Updating VM. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[clone]
-label = "Clone VM %s"
-tab = "Clone VM"
-msg_cloned = "Cloned %s as %s"
-form_name = "Name"
-error_exists = "VM %s allready exists"
-error_name = "Name must be %s"
-please_wait = "Cloning VM. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[migrate]
-label = "Migrate VM %s"
-tab = "Migrate VM"
-msg_migrated = "Migrated %s to %s"
-error_no_hosts = "No KVM Host found to migrate to"
-form_target = "Target Host Resource"
-please_wait = "Migrating VM. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[start]
-msg_started = "Started VM %s"
-
-[stop]
-msg_stoped = "Stopped VM %s"
-
-[reboot]
-msg_rebooted = "Rebooted VM %s"
-
-[remove]
-label = "Delete VM(s)"
-msg_removed = "Deleted VM %s"
-msg_vm_resource_still_in_use = "VM %s resource id %s is still in use by Server %s"
-please_wait = "Removing VM(s). Please wait .."
-canceled = "Operation canceled. Please wait .."
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/en.kvm.ini b/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/en.kvm.ini
deleted file mode 100644
index bf0968f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/lang/en.kvm.ini
+++ /dev/null
@@ -1,167 +0,0 @@
-[select]
-tab = "Select KVM Host"
-label = "Select KVM Host"
-action_edit = "edit"
-table_name = "Name"
-table_id = "Id"
-table_recource = "Resource"
-table_type = "Type"
-table_deployment = "Deployment"
-error_no_storage = "<b>No storage configured yet!</b><br><br>Please create a KVM first!"
-new_storage = "New Storage"
-please_wait = "Loading Volume groups. Please wait .."
-
-[edit]
-tab = "Select Volume group"
-label = "Select Volume group on KVM %s"
-lang_id = "ID"
-lang_name = "Name"
-lang_resource = "Resource"
-lang_state = "State"
-lang_deployment = "Deployment"
-action_edit = "select"
-action_add ="Add new Volume Group"
-action_remove ="remove"
-table_name = "Name"
-table_pv = "PV"
-table_lv = "LV"
-table_sn = "SN"
-table_attr = "Attributes"
-table_vsize = "Size"
-table_vfree = "Free"
-table_vused = "Used"
-table_vusedpercent = "%"
-table_available = "Available"
-table_objects = "Objects"
-table_vg = "Volume Group Details"
-table_bricks = "Gluster Bricks"
-table_type = "Typ"
-table_status = "Status"
-table_topology = "Topology"
-table_transport = "Transport"
-error_no_kvm = "Storage %s is not of type kvm"
-please_wait = "Loading Volume group. Please wait .."
-
-[addvg]
-tab = "Add Volume Group"
-label = "Add Volume Group to storage %s"
-partition = "Partition"
-name = "Name"
-extend = "extend partition"
-confirm_text = "All Data on %s will be erased.<br>Are you sure to continue?"
-msg_added = "Successfully added Volume Group %s"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[removevg]
-tab = "Remove Volume Group"
-label = "Remove Volume Group on storage %s"
-confirm_text = "Do you realy want to remove Volume Group %s?"
-msg_removed = "Successfully removed Volume Group %s"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[volgroup]
-tab = "Edit Volume group"
-label = "Edit Volume group %s on KVM %s"
-lang_id = "ID"
-lang_name = "Name"
-lang_deployment = "Deployment"
-lang_resource = "Resource"
-lang_state = "State"
-lang_attr = "Attributes"
-lang_pv = "PV / LV / SN"
-lang_size = "Size / Free"
-lang_free = "Free"
-action_add = "Add new logical volume"
-action_remove = "delete"
-action_resize = "resize"
-action_snap = "snap"
-action_clone = "clone"
-action_add_image = "Add"
-action_remove_image = "Remove"
-action_sync_in_progress = "Source of synchronisation - Please wait"
-action_clone_in_progress = "Synchronisation in progress - Please wait"
-action_clone_finished = "Syncronisation finished!"
-table_name = "Lvol"
-table_deployment = "Deployment"
-table_attr = "Attributes"
-table_path = "Path"
-table_size = "Size"
-table_source = "Source"
-table_path_physical = "Physical"
-table_path_glusters = "Logical"
-error_no_kvm = "Storage %s is not of type kvm-deployment"
-please_wait = "Loading Volume group. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[add]
-tab = "Add Logical Volume"
-label = "Add Logical Volume to Volume group %s"
-form_name = "Name"
-form_size = "Size (max: %s MB)"
-form_type = "Volume Type"
-msg_added = "Added Logical Volume %s"
-msg_add_failed = "Failed adding Logical Volume %s"
-error_exists = "Logical Volume %s allready exists"
-error_name = "Name must be %s"
-error_size = "Size must be %s"
-error_size_exeeded = "Size exeeds %s MB"
-lang_name_generate = "generate name"
-please_wait = "Adding Logical Volume. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[image]
-label = "Add/Remove Image for Logical Volume %s"
-tab = "Add/Remove Image"
-error_exists = "Image %s allready exists"
-error_image_still_in_use = "Image id %s is still in use by Server(s) %s"
-msg_added_image = "Added Image %s"
-msg_removed_image = "Removed Image id %s"
-please_wait = "Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[snap]
-label = "Snap Logical Volume %s"
-tab = "Snap Logical Volume"
-msg_snaped = "Snaped %s to %s"
-msg_snap_failed = "Snapping failed for %s to %s"
-form_name = "Name"
-form_size = "Size (max: %s MB)"
-error_exists = "Volume %s allready exists"
-error_name = "Name must be %s"
-error_size = "Size must be %s"
-error_size_exeeded = "Size exeeds %s MB"
-please_wait = "Snaping Logical Volume. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[clone]
-label = "Clone Logical Volume %s"
-tab = "Clone Logical Volume"
-msg_cloned = "Cloned %s as %s"
-msg_clone_failed = "Clone failed for %s as %s"
-form_name = "Name"
-error_exists = "Volume %s allready exists"
-error_name = "Name must be %s"
-please_wait = "Cloning Logical Volume. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[remove]
-label = "Delete Logical Volume(s)"
-msg_removed = "Deleted Logical Volume %s"
-msg_vm_image_still_in_use = "Volume %s of Image id %s is still in use by Server %s"
-please_wait = "Deleting Logical Volume(s). Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[resize]
-label = "Resize Logical Volume %s"
-tab = "Resize Logical Volume"
-size = "min. %s MB, max. %s MB"
-ceph_size = "New Volume size MB"
-error_size = "Size must be %s"
-error_size_exeeded = "Size exeeds %s MB"
-error_size_undercut = "Size undercuts %s MB"
-msg_resized = "Resized Logical Volume %s"
-please_wait = "Resizing Logical Volume. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/kvm/web/menu.txt
deleted file mode 100644
index f722e4a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/menu.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|KVM
-...|Hosts|index.php?plugin=kvm&controller=kvm-vm|KVM Hosts
-...|Help|
-....|About|index.php?plugin=kvm&controller=kvm-about|How to use
-....|Config|index.php?plugin=kvm&controller=kvm-about&kvm_about_action=bootservice|KVM Host Boot-Service
-....|VMs|index.php?plugin=kvm&controller=kvm-about&kvm_about_action=vms|Virtual Machine Management
-....|Storage|index.php?plugin=kvm&controller=kvm-about&kvm_about_action=storage|Storage Management
-....|Usage|index.php?plugin=kvm&controller=kvm-about&kvm_about_action=usage|Use-cases
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-appliance-hook.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-appliance-hook.php
deleted file mode 100644
index 723c5dd..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-appliance-hook.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-
-
-function openqrm_kvm_appliance($cmd, $appliance_fields) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	$appliance_id=$appliance_fields["appliance_id"];
-	$appliance_name=$appliance_fields["appliance_name"];
-	$resource = new resource();
-	$resource->get_instance_by_id($appliance_fields["appliance_resources"]);
-	$appliance_ip=$resource->ip;
-	$appliance = new appliance();
-	$appliance->get_instance_by_id($appliance_id);
-	// check appliance values, maybe we are in update and they are incomplete
-	if ($appliance->imageid == 1) {
-		return;
-	}
-	if (($resource->id == "-1") || ($resource->id == "") || (!isset($resource->vtype))) {
-		return;
-	}
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-
-	$event->log("openqrm_kvm_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-appliance-hook.php", "Handling $cmd event $appliance_id/$appliance_name/$appliance_ip", "", "", 0, 0, $appliance_id);
-
-	switch($cmd) {
-		case "start":
-			// send command to assign image and start vm
-
-			// NOTICE : please enable this hook only if you are using the ip-mgmt plugin with vlans
-			// check if resource type -> kvm-vm-net
-//			$virtualization = new virtualization();
-//			$virtualization->get_instance_by_type("kvm-vm-net");
-//			$kvm_host_resource = new resource();
-//			$kvm_host_resource->get_instance_by_id($resource->vhostid);
-//			if ($resource->vtype != $virtualization->id) {
-//				$kvm_command="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-vm reset_vlans_by_mac -b start -m $resource->mac";
-//				$kvm_host_resource->send_command($kvm_host_resource->ip, $kvm_command);
-//				return;
-//			}
-
-
-			// check resource type -> kvm-vm-local
-			$virtualization = new virtualization();
-			$virtualization->get_instance_by_type("kvm-vm-local");
-			if ($resource->vtype != $virtualization->id) {
-				$event->log("openqrm_kvm_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-appliance-hook.php", "$appliance_id is not from type kvm-vm, skipping .. $appliance_name/$appliance_ip", "", "", 0, 0, $appliance_id);
-				return;
-			}
-			// check image is on the same storage server
-			// get the kvm host resource
-			$kvm_host_resource = new resource();
-			$kvm_host_resource->get_instance_by_id($resource->vhostid);
-			// get the kvm resource
-			$image = new image();
-			$image->get_instance_by_id($appliance->imageid);
-			$storage = new storage();
-			$storage->get_instance_by_id($image->storageid);
-			$kvm_resource = new resource();
-			$kvm_resource->get_instance_by_id($storage->resource_id);
-			if ($kvm_host_resource->id != $kvm_resource->id) {
-				$event->log("openqrm_kvm_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-appliance-hook.php", "Appliance $appliance_id image is not available on this kvm host. Assuming SAN-Backend", "", "", 0, 0, $appliance_id);
-			}
-			$kvm_command=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm-vm start_by_mac -m ".$resource->mac." -d ".$image->rootdevice." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password;
-			$kvm_host_resource->send_command($kvm_host_resource->ip, $kvm_command);
-			break;
-		case "stop":
-			// send command to stop the vm and deassign image
-
-			// NOTICE : please enable this hook only if you are using the ip-mgmt plugin with vlans
-			// check if resource type -> kvm-vm-net
-//			$virtualization = new virtualization();
-//			$virtualization->get_instance_by_type("kvm-vm-net");
-//			$kvm_host_resource = new resource();
-//			$kvm_host_resource->get_instance_by_id($resource->vhostid);
-//			if ($resource->vtype != $virtualization->id) {
-//				$kvm_command="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm reset_vlans_by_mac -b stop -m $resource->mac";
-//				$kvm_host_resource->send_command($kvm_host_resource->ip, $kvm_command);
-//				return;
-//			}
-
-
-			// check resource type -> kvm-vm-local
-			$virtualization = new virtualization();
-			$virtualization->get_instance_by_type("kvm-vm-local");
-			if ($resource->vtype != $virtualization->id) {
-				$event->log("openqrm_kvm_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-appliance-hook.php", "$appliance_id is not from type kvm-vm, skipping .. $appliance_name/$appliance_ip", "", "", 0, 0, $appliance_id);
-				return;
-			}
-			// check image is on the same storage server
-			// get the kvm host resource
-			$kvm_host_resource = new resource();
-			$kvm_host_resource->get_instance_by_id($resource->vhostid);
-			// get the kvm resource
-			$image = new image();
-			$image->get_instance_by_id($appliance->imageid);
-			$storage = new storage();
-			$storage->get_instance_by_id($image->storageid);
-			$kvm_resource = new resource();
-			$kvm_resource->get_instance_by_id($storage->resource_id);
-			if ($kvm_host_resource->id != $kvm_resource->id) {
-				$event->log("openqrm_kvm_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-appliance-hook.php", "Appliance $appliance_id image is not available on this kvm host. Assuming SAN-Backend", "", "", 0, 0, $appliance_id);
-			}
-			$kvm_command=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm-vm restart_by_mac -m ".$resource->mac." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-			$kvm_host_resource->send_command($kvm_host_resource->ip, $kvm_command);
-			break;
-
-		case "update":
-			// check if the appliance was set to a kvm Host, if yes, auto-create the storage objects
-			$virtualization = new virtualization();
-			$virtualization->get_instance_by_type("kvm");
-			if ($appliance->virtualization == $virtualization->id)  {
-				// KVM LVM Storage
-				$deployment = new deployment();
-				$deployment->get_instance_by_name('kvm-lvm-deployment');
-				$storage = new storage();
-				$kvm_id_list = $storage->get_ids_by_storage_type($deployment->id);
-				$found_kvm = false;
-				$found_kvm_id = -1;
-				foreach ($kvm_id_list as $list) {
-					foreach ($list as $kvm_id) {
-						$storage->get_instance_by_id($kvm_id);
-						if ($storage->resource_id == $appliance->resources) {
-							$found_kvm = true;
-							$found_kvm_id = $storage->id;
-							break;
-						}
-					}
-				}
-				if (!$found_kvm) {
-					$found_kvm_id=(int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$storage_fields['storage_id']=$found_kvm_id;
-					$storage_fields['storage_name']=$appliance->name."-lvm";
-					$storage_fields['storage_type']=$deployment->id;
-					$storage_fields['storage_comment']='KVM LVM Storage Object for Appliance '.$appliance->name;
-					$storage_fields['storage_resource_id']=$appliance->resources;
-					$storage_fields['storage_capabilities'] = '';
-					$storage->add($storage_fields);
-					$event->log("openqrm_kvm_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-appliance-hook.php", "Created KVM LVM Storage Object for Appliance ".$appliance_id."!", "", "", 0, 0, $appliance_id);
-				} else {
-					$event->log("openqrm_kvm_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-appliance-hook.php", "KVM LVM Storage Object for Appliance ".$appliance_id." already existing.", "", "", 0, 0, $appliance_id);
-				}
-				// KVM Blockfile Storage
-				$deployment = new deployment();
-				$deployment->get_instance_by_name('kvm-bf-deployment');
-				$storage = new storage();
-				$kvm_id_list = $storage->get_ids_by_storage_type($deployment->id);
-				$found_kvm = false;
-				$found_kvm_id = -1;
-				foreach ($kvm_id_list as $list) {
-					foreach ($list as $kvm_id) {
-						$storage->get_instance_by_id($kvm_id);
-						if ($storage->resource_id == $appliance->resources) {
-							$found_kvm = true;
-							$found_kvm_id = $storage->id;
-							break;
-						}
-					}
-				}
-				if (!$found_kvm) {
-					$found_kvm_id=(int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$storage_fields['storage_id']=$found_kvm_id;
-					$storage_fields['storage_name']=$appliance->name."-bf";
-					$storage_fields['storage_type']=$deployment->id;
-					$storage_fields['storage_comment']='KVM Blockfile Storage Object for Appliance '.$appliance->name;
-					$storage_fields['storage_resource_id']=$appliance->resources;
-					$storage_fields['storage_capabilities'] = '';
-					$storage->add($storage_fields);
-					$event->log("openqrm_kvm_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-appliance-hook.php", "Created KVM Blockfile Storage Object for Appliance ".$appliance_id."!", "", "", 0, 0, $appliance_id);
-				} else {
-					$event->log("openqrm_kvm_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-appliance-hook.php", "KVM Blockfile Storage Object for Appliance ".$appliance_id." already existing.", "", "", 0, 0, $appliance_id);
-				}
-
-
-			}
-			break;
-
-
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-bf-deployment-auth-hook.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-bf-deployment-auth-hook.php
deleted file mode 100644
index 0b3c5ce..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-bf-deployment-auth-hook.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
- /*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/image_authentication.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-
-/**
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- */
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $IMAGE_AUTHENTICATION_TABLE;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $openqrm_server;
-$event = new event();
-global $event;
-
-
-
-	//--------------------------------------------------
-	/**
-	* authenticates the storage volume for the appliance resource
-	* <code>
-	* storage_auth_function("start", 2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_function($cmd, $appliance_id) {
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-		global $IMAGE_AUTHENTICATION_TABLE;
-		global $openqrm_server;
-		global $RootDir;
-
-		$appliance = new appliance();
-		$appliance->get_instance_by_id($appliance_id);
-
-		$image = new image();
-		$image->get_instance_by_id($appliance->imageid);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		$resource = new resource();
-		$resource->get_instance_by_id($appliance->resources);
-		$resource_mac=$resource->mac;
-		$resource_ip=$resource->ip;
-
-		// For kvm vms we assume that the image is located on the vm-host
-		// so we send the auth command to the vm-host instead of the image storage.
-		// This enables using a e.g. a NAS or Glustefs backend as shared VM location for all kvm hosts
-		$vm_host_resource = new resource();
-		$vm_host_resource->get_instance_by_id($resource->vhostid);
-		if ($vm_host_resource->id != $storage_resource->id) {
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-auth-hook.php", "Appliance ".$appliance_id." image IS NOT available on this kvm host, ".$storage_resource->id." not equal ".$vm_host_resource->id." !! Assuming NAS/Glusterfs Backend", "", "", 0, 0, $appliance_id);
-		} else {
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-auth-hook.php", "Appliance ".$appliance_id." image IS available on this kvm host, ".$storage_resource->id." equal ".$vm_host_resource->id.".", "", "", 0, 0, $appliance_id);
-		}
-
-		switch($cmd) {
-			case "start":
-				// authenticate the rootfs / needs openqrm user + pass
-				$openqrm_admin_user = new user("openqrm");
-				$openqrm_admin_user->set_user();
-				// generate a password for the image
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-auth-hook.php", "Authenticating ".$image_name." / ".$image_rootdevice." to resource ".$resource_mac.".", "", "", 0, 0, $appliance_id);
-				$auth_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$deployment_plugin_name."/bin/openqrm-".$deployment_plugin_name." auth -n ".$image_name." -r ".$image_rootdevice." -i ".$image_name." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." -t ".$deployment->type." --openqrm-cmd-mode background";
-				$resource->send_command($vm_host_resource->ip, $auth_start_cmd);
-				break;
-		}
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage volume for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage deployment volumes for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_deployment_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_deployment_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-
-	}
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-bf-deployment-cloud-hook.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-bf-deployment-cloud-hook.php
deleted file mode 100644
index 6639e26..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-bf-deployment-cloud-hook.php
+++ /dev/null
@@ -1,393 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This file implements the cloud storage methods
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-// special cloud classes
-require_once "$RootDir/plugins/cloud/class/cloudimage.class.php";
-
-$event = new event();
-global $event;
-
-global $OPENQRM_SERVER_BASE_DIR;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $RESOURCE_INFO_TABLE;
-
-
-// ---------------------------------------------------------------------------------
-// general cloudstorage methods
-// ---------------------------------------------------------------------------------
-
-
-// clones the volume of an image
-function create_clone_kvm_bf_deployment($cloud_image_id, $image_clone_name, $disk_size) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	// we got the cloudimage id here, get the image out of it
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	$event->log("create_clone_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Creating clone ".$image_clone_name." of image ".$cloudimage->image_id." on the storage", "", "", 0, 0, 0);
-	// get image, this is already the new logical clone
-	// we just need to physical snapshot it and update the rootdevice
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$imageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($imageid);
-	$storage_resource_id = $storage->resource_id;
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// kvm-bf-deployment
-	$image->get_instance_by_id($image_id);
-	// parse the identifiers
-	// origin image volume name
-	$origin_volume_name=basename($image_rootdevice);
-	// location of the volume (path)
-	$image_location_name=dirname($image_rootdevice);
-	// set default snapshot size
-	if (!strlen($disk_size)) {
-		$disk_size=5000;
-	}
-	// update the image rootdevice parameter
-	$ar_image_update = array(
-		'image_rootdevice' => $image_location_name."/".$image_clone_name,
-	);
-
-	// For kvm vms we assume that the image is located on the vm-host
-	// so we send the auth command to the vm-host instead of the image storage.
-	// This enables using a NAS/Glusterfs backend with all volumes accessible for all hosts
-	// get the vm resource
-	$vm_resource = new resource();
-	$vm_resource->get_instance_by_id($cloudimage->resource_id);
-	// get the lxc host
-	$vm_host_resource = new resource();
-	$vm_host_resource->get_instance_by_id($vm_resource->vhostid);
-	// san backend ?
-	if ($vm_host_resource->id != $resource->id) {
-		$event->log("create_clone_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Image ".$image_id." IS NOT available on this kvm host, ".$resource->id." not equal ".$vm_host_resource->id." !! Assuming SAN Backend", "", "", 0, 0, 0);
-
-		// update the image storage id with the vm-host-resource
-		$image_deployment = new deployment();
-		$image_deployment->get_instance_by_type($image_type);
-		// loop over all storage id from type $image_type
-		$found_image=0;
-		$storage_list_by_type = new storage();
-		$storage_id_list_by_type = $storage_list_by_type->get_ids_by_storage_type($image_deployment->id);
-		foreach($storage_id_list_by_type as $storage_id_list) {
-			$storage_id = $storage_id_list['storage_id'];
-			$tstorage = new storage();
-			$tstorage->get_instance_by_id($storage_id);
-			if ($tstorage->resource_id == $vm_host_resource->id) {
-				// re-create update array + new storage id
-				$ar_image_update = array(
-					'image_rootdevice' => $image_location_name."/".$image_clone_name,
-					'image_storageid' => $tstorage->id,
-				);
-				$event->log("create_clone_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Updating Image ".$image_id." / ".$image_name." with storage id ".$tstorage->id.".", "", "", 0, 0, 0);
-				$found_image=1;
-				break;
-			}
-		}
-		if ($found_image == 0) {
-			$event->log("create_clone_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 2, "openqrm-kvm-bf-deployment-cloud-hook.php", "SETUP ERROR: Could not find a storage server type ".$image_type." using resource ".$vm_host_resource->id.". Please create one!", "", "", 0, 0, 0);
-			$event->log("create_clone_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 2, "openqrm-kvm-bf-deployment-cloud-hook.php", "SETUP ERROR: Not cloning image ".$image_id.".", "", "", 0, 0, 0);
-			return;
-		}
-
-	} else {
-		$event->log("create_clone_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Image ".$image_id." IS available on this kvm host, ".$resource->id." equal ".$vm_host_resource->id.".", "", "", 0, 0, 0);
-	}
-
-	$event->log("create_clone_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Updating rootdevice of image ".$image_id." / ".$image_name." with ".$image_location_name."/".$image_clone_name, "", "", 0, 0, 0);
-	$image->update($image_id, $ar_image_update);
-	$image_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm snap -n ".$origin_volume_name." -v ".$image_location_name." -s ".$image_clone_name." -m ".$disk_size." -t ".$deployment->type." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-	$event->log("create_clone_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Running : ".$image_clone_cmd, "", "", 0, 0, 0);
-	$resource->send_command($vm_host_resource->ip, $image_clone_cmd);
-}
-
-
-
-// removes the volume of an image
-function remove_kvm_bf_deployment($cloud_image_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	$event->log("remove_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Removing image ".$cloudimage->image_id." from storage.", "", "", 0, 0, 0);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$imageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($imageid);
-	$storage_resource_id = $storage->resource_id;
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// parse the identifiers
-	// origin image volume name
-	$origin_volume_name=basename($image_rootdevice);
-	// location of the volume (path)
-	$image_location_name=dirname($image_rootdevice);
-
-	// For kvm vms we assume that the image is located on the vm-host
-	// so we send the auth command to the vm-host instead of the image storage.
-	// This enables using a NAS/Glusterfs backend with all volumes accessible for all hosts
-	//
-	// Still we need to send the remove command to the storage resource since the
-	// create-phase automatically adapted the image->storageid, we cannot use the vm-resource here
-	// because cloudimage->resource_id will be set to -1 when the cloudapp is in paused/resize/private state
-	//
-	if ($cloudimage->resource_id > 0) {
-		// try to get the vm resource
-		$vm_resource = new resource();
-		$vm_resource->get_instance_by_id($cloudimage->resource_id);
-		// get the lxc host
-		$vm_host_resource = new resource();
-		$vm_host_resource->get_instance_by_id($vm_resource->vhostid);
-		// san backend ?
-		if ($vm_host_resource->id != $resource->id) {
-			$event->log("remove_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Image ".$image_id." IS NOT available on this kvm host, ".$resource->id." not equal ".$vm_host_resource->id." !! Assuming SAN Backend", "", "", 0, 0, 0);
-		} else {
-			$event->log("remove_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Image ".$image_id." IS available on this kvm host, ".$resource->id." equal ".$vm_host_resource->id.".", "", "", 0, 0, 0);
-		}
-	}
-	$image_remove_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm remove -n ".$origin_volume_name." -v ".$image_location_name." -t ".$deployment->type." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-	$event->log("remove_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Running : ".$image_remove_clone_cmd, "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_remove_clone_cmd);
-}
-
-
-// resizes the volume of an image
-function resize_kvm_bf_deployment($cloud_image_id, $resize_value) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	$event->log("resize_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Resize image ".$cloudimage->image_id." on storage.", "", "", 0, 0, 0);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$imageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($imageid);
-	$storage_resource_id = $storage->resource_id;
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// parse the identifiers
-	// origin image volume name
-	$origin_volume_name=basename($image_rootdevice);
-	// location of the volume (path)
-	$image_location_name=dirname($image_rootdevice);
-
-	// For kvm vms we assume that the image is located on the vm-host
-	// so we send the auth command to the vm-host instead of the image storage.
-	// This enables using a NAS/Glusterfs backend with all volumes accessible for all hosts
-	//
-	// Still we need to send the remove command to the storage resource since the
-	// create-phase automatically adapted the image->storageid, we cannot use the vm-resource here
-	// because cloudimage->resource_id will be set to -1 when the cloudapp is in paused/resize/private state
-	//
-	if ($cloudimage->resource_id > 0) {
-		// try to get the vm resource
-		$vm_resource = new resource();
-		$vm_resource->get_instance_by_id($cloudimage->resource_id);
-		// get the lxc host
-		$vm_host_resource = new resource();
-		$vm_host_resource->get_instance_by_id($vm_resource->vhostid);
-		// san backend ?
-		if ($vm_host_resource->id != $resource->id) {
-			$event->log("resize_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Image ".$image_id." IS NOT available on this kvm host, ".$resource->id." not equal ".$vm_host_resource->id." !! Assuming SAN Backend", "", "", 0, 0, 0);
-		} else {
-			$event->log("resize_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Image ".$image_id." IS available on this kvm host, ".$resource->id." equal ".$vm_host_resource->id, "", "", 0, 0, 0);
-		}
-	}
-
-	$image_resize_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm resize -n ".$origin_volume_name." -v ".$image_location_name." -m ".$resize_value." -t ".$deployment->type." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-	$event->log("resize_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Running : ".$image_resize_cmd, "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_resize_cmd);
-}
-
-
-
-// creates a private copy of the volume of an image
-function create_private_kvm_bf_deployment($cloud_image_id, $private_disk, $private_image_name) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	$event->log("create_private_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Creating private image ".$cloudimage->image_id." on storage.", "", "", 0, 0, 0);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$imageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($imageid);
-	$storage_resource_id = $storage->resource_id;
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// create an admin user to post when cloning has finished
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-	// parse the identifiers
-	// origin image volume name
-	$origin_volume_name=basename($image_rootdevice);
-	// location of the volume (path)
-	$image_location_name=dirname($image_rootdevice);
-
-	// For kvm vms we assume that the image is located on the vm-host
-	// so we send the auth command to the vm-host instead of the image storage.
-	// This enables using a NAS/Glusterfs backend with all volumes accessible for all hosts
-	//
-	// Still we need to send the remove command to the storage resource since the
-	// create-phase automatically adapted the image->storageid, we cannot use the vm-resource here
-	// because cloudimage->resource_id will be set to -1 when the cloudapp is in paused/resize/private state
-	//
-	if ($cloudimage->resource_id > 0) {
-		// try to get the vm resource
-		$vm_resource = new resource();
-		$vm_resource->get_instance_by_id($cloudimage->resource_id);
-		// get the lxc host
-		$vm_host_resource = new resource();
-		$vm_host_resource->get_instance_by_id($vm_resource->vhostid);
-		// san backend ?
-		if ($vm_host_resource->id != $resource->id) {
-			$event->log("create_private_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Image ".$image_id." IS NOT available on this kvm host, ".$resource->id." not equal ".$vm_host_resource->id." !! Assuming SAN Backend", "", "", 0, 0, 0);
-		} else {
-			$event->log("create_private_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Image ".$image_id." IS available on this kvm host, ".$resource->id." equal ".$vm_host_resource->id.".", "", "", 0, 0, 0);
-		}
-	}
-
-	$image_resize_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm clone -n ".$origin_volume_name." -s ".$private_image_name." -v ".$image_location_name." -m ".$private_disk." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." -t ".$deployment->type." --openqrm-cmd-mode background";
-	$event->log("create_private_kvm_bf_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-bf-deployment-cloud-hook.php", "Running : $image_resize_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_resize_cmd);
-	// set the storage specific image root_device parameter
-	$new_rootdevice = str_replace($origin_volume_name, $private_image_name, $image->rootdevice);
-	return $new_rootdevice;
-}
-
-
-
-// ---------------------------------------------------------------------------------
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-ceph-deployment-auth-hook b/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-ceph-deployment-auth-hook
deleted file mode 100644
index d8f064e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-ceph-deployment-auth-hook
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
- /*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/image_authentication.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-
-/**
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- */
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $IMAGE_AUTHENTICATION_TABLE;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $openqrm_server;
-$event = new event();
-global $event;
-
-
-
-	//--------------------------------------------------
-	/**
-	* authenticates the storage volume for the appliance resource
-	* <code>
-	* storage_auth_function("start", 2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_function($cmd, $appliance_id) {
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-		global $IMAGE_AUTHENTICATION_TABLE;
-		global $openqrm_server;
-		global $RootDir;
-
-		$appliance = new appliance();
-		$appliance->get_instance_by_id($appliance_id);
-
-		$image = new image();
-		$image->get_instance_by_id($appliance->imageid);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		$resource = new resource();
-		$resource->get_instance_by_id($appliance->resources);
-		$resource_mac=$resource->mac;
-		$resource_ip=$resource->ip;
-
-		$vm_host_resource = new resource();
-		$vm_host_resource->get_instance_by_id($resource->vhostid);
-
-		switch($cmd) {
-			case "start":
-				// authenticate the rootfs / needs openqrm user + pass
-				$openqrm_admin_user = new user("openqrm");
-				$openqrm_admin_user->set_user();
-				// generate a password for the image
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-auth-hook.php", "Authenticating ".$image_name." / ".$image_rootdevice." to resource ".$resource_mac.".", "", "", 0, 0, $appliance_id);
-				$auth_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$deployment_plugin_name."/bin/openqrm-".$deployment_plugin_name." auth -n ".$image_name." -r ".$image_rootdevice." -i ".$image_name." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." -t ".$deployment->type." --openqrm-cmd-mode background";
-				$resource->send_command($storage_resource->ip, $auth_start_cmd);
-				break;
-		}
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage volume for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage deployment volumes for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_deployment_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_deployment_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-
-	}
-
-
-
-
-
-
-?>
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-ceph-deployment-cloud-hook b/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-ceph-deployment-cloud-hook
deleted file mode 100644
index eddabd9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-ceph-deployment-cloud-hook
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This file implements the cloud storage methods
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-// special cloud classes
-require_once "$RootDir/plugins/cloud/class/cloudimage.class.php";
-
-$event = new event();
-global $event;
-
-global $OPENQRM_SERVER_BASE_DIR;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $RESOURCE_INFO_TABLE;
-
-
-// ---------------------------------------------------------------------------------
-// general cloudstorage methods
-// ---------------------------------------------------------------------------------
-
-
-// clones the volume of an image
-function create_clone_kvm_ceph_deployment($cloud_image_id, $image_clone_name, $disk_size) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	// we got the cloudimage id here, get the image out of it
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	$event->log("create_clone_kvm_ceph_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-ceph-deployment-cloud-hook.php", "Creating clone ".$image_clone_name." of image ".$cloudimage->image_id." on the storage", "", "", 0, 0, 0);
-	// get image, this is already the new logical clone
-	// we just need to physical snapshot it and update the rootdevice
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$imageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($imageid);
-	$storage_resource_id = $storage->resource_id;
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// kvm-ceph-deployment
-	$image->get_instance_by_id($image_id);
-	$ceph_uri_arr = parse_url($image_rootdevice);
-	// origin image volume name
-	$origin_volume_name=basename($ceph_uri_arr['path']);
-	// location of the volume (path)
-	$image_location_name=str_replace('/', '', dirname($ceph_uri_arr['path']));
-	// set default snapshot size
-	if (!strlen($disk_size)) {
-		$disk_size=5000;
-	}
-	// update the image rootdevice parameter
-	$ar_image_update = array(
-		'image_rootdevice' => "rbd:".$image_location_name."/".$origin_volume_name."@".$image_clone_name,
-	);
-	// get the vm resource
-	$vm_resource = new resource();
-	$vm_resource->get_instance_by_id($cloudimage->resource_id);
-	// get the VM host
-	$vm_host_resource = new resource();
-	$vm_host_resource->get_instance_by_id($vm_resource->vhostid);
-
-	$event->log("create_clone_kvm_ceph_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-ceph-deployment-cloud-hook.php", "Updating rootdevice of image ".$image_id." / ".$image_name." with ".$image_location_name."/".$image_clone_name, "", "", 0, 0, 0);
-	$image->update($image_id, $ar_image_update);
-	$image_clone_cmd="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm snap -n ".$origin_volume_name." -v ".$image_location_name." -s ".$image_clone_name." -m ".$disk_size." -t ".$deployment->type." --openqrm-cmd-mode background";
-	$event->log("create_clone_kvm_ceph_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-ceph-deployment-cloud-hook.php", "Running : ".$image_clone_cmd, "", "", 0, 0, 0);
-	$resource->send_command($resource->ip, $image_clone_cmd);
-}
-
-
-
-// removes the volume of an image
-function remove_kvm_ceph_deployment($cloud_image_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	$event->log("remove_kvm_ceph_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-ceph-deployment-cloud-hook.php", "Removing image ".$cloudimage->image_id." from storage.", "", "", 0, 0, 0);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$imageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($imageid);
-	$storage_resource_id = $storage->resource_id;
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	$ceph_uri_arr = parse_url($image_rootdevice);
-	// origin image volume name
-	$origin_volume_name=basename($ceph_uri_arr['path']);
-	// location of the volume (path)
-	$image_location_name=str_replace('/', '', dirname($ceph_uri_arr['path']));
-	$image_remove_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm remove -n ".$origin_volume_name." -v ".$image_location_name." -t ".$deployment->type." --openqrm-cmd-mode background";
-	$event->log("remove_kvm_ceph_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-ceph-deployment-cloud-hook.php", "Running : ".$image_remove_clone_cmd, "", "", 0, 0, 0);
-	$resource->send_command($resource->ip, $image_remove_clone_cmd);
-}
-
-
-// resizes the volume of an image
-function resize_kvm_ceph_deployment($cloud_image_id, $resize_value) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	$event->log("resize_kvm_ceph_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-ceph-deployment-cloud-hook.php", "Resize image ".$cloudimage->image_id." on storage.", "", "", 0, 0, 0);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$imageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($imageid);
-	$storage_resource_id = $storage->resource_id;
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	$ceph_uri_arr = parse_url($image_rootdevice);
-	// origin image volume name
-	$origin_volume_name=basename($ceph_uri_arr['path']);
-	// location of the volume (path)
-	$image_location_name=str_replace('/', '', dirname($ceph_uri_arr['path']));
-	$image_resize_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm resize -n ".$origin_volume_name." -v ".$image_location_name." -m ".$resize_value." -t ".$deployment->type." --openqrm-cmd-mode background";
-	$event->log("resize_kvm_ceph_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-ceph-deployment-cloud-hook.php", "Running : ".$image_resize_cmd, "", "", 0, 0, 0);
-	$resource->send_command($resource->ip, $image_resize_cmd);
-}
-
-
-
-// creates a private copy of the volume of an image
-function create_private_kvm_ceph_deployment($cloud_image_id, $private_disk, $private_image_name) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	$event->log("create_private_kvm_ceph_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-ceph-deployment-cloud-hook.php", "Creating private image ".$cloudimage->image_id." on storage.", "", "", 0, 0, 0);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$imageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($imageid);
-	$storage_resource_id = $storage->resource_id;
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// create an admin user to post when cloning has finished
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-	$ceph_uri_arr = parse_url($image_rootdevice);
-	// origin image volume name
-	$origin_volume_name=basename($ceph_uri_arr['path']);
-	// location of the volume (path)
-	$image_location_name=str_replace('/', '', dirname($ceph_uri_arr['path']));
-	$image_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm clone -n ".$origin_volume_name." -s ".$private_image_name." -v ".$image_location_name." -m ".$private_disk." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." -t ".$deployment->type." --openqrm-cmd-mode background";
-	$event->log("create_private_kvm_ceph_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-ceph-deployment-cloud-hook.php", "Running : $image_resize_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource->ip, $image_clone_cmd);
-	// set the storage specific image root_device parameter
-	$new_rootdevice = "ceph:".$resource->ip."//".$image_location_name."/".$private_image_name;
-	return $new_rootdevice;
-}
-
-
-
-// ---------------------------------------------------------------------------------
-
-
-?>
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-cloud-hook.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-cloud-hook.php
deleted file mode 100644
index fb01429..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-cloud-hook.php
+++ /dev/null
@@ -1,451 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This file implements the virtual machine abstraction in the cloud of openQRM
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-
-// for ovs we need to get the request for the ips
-require_once "$RootDir/plugins/cloud/class/cloudrequest.class.php";
-require_once "$RootDir/plugins/cloud/class/cloudconfig.class.php";
-require_once "$RootDir/plugins/cloud/class/clouduser.class.php";
-
-
-$event = new event();
-global $event;
-
-global $OPENQRM_SERVER_BASE_DIR;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $RESOURCE_INFO_TABLE;
-
-// ---------------------------------------------------------------------------------
-// general kvm cloudvm methods
-// ---------------------------------------------------------------------------------
-
-
-// creates a vm 
-function create_kvm_vm($host_resource_id, $name, $mac, $memory, $cpu, $swap, $additional_nic_str, $vm_type, $vncpassword, $source_image_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	global $RootDir;
-	$event->log("create_kvm_vm_local", $_SERVER['REQUEST_TIME'], 5, "kvm-cloud-hook", "Creating KVM VM $name on Host resource $host_resource_id", "", "", 0, 0, 0);
-	// start the vm on the host
-	$host_resource = new resource();
-	$host_resource->get_instance_by_id($host_resource_id);
-	// we need to have an openQRM server object too since some of the
-	// virtualization commands are sent from openQRM directly
-	$openqrm = new openqrm_server();
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-	
-	$vncpassword_parameter = "";
-	if ($vncpassword != '') {
-		$vncpassword_parameter = " -v ".$vncpassword;
-	}
-	
-	
-	// fill mac array from additional_network_str
-	$vm_ovs_additonal_nic_str = '';
-	$vm_resource_mac_array[] = $mac;
-	$vm_resource_mac_tmp_array = explode(' ', trim($additional_nic_str));
-	foreach($vm_resource_mac_tmp_array as $mac_param) {
-	    if(strpos($mac_param, '-m') === false) {
-		$vm_resource_mac_array[] = $mac_param;
-	    }
-
-	}
-
-	// if ovs enabled remove last mac address from addtional_nic_str
-	// and pop from array
-	// for ovs we send the bridges from ip_mgmt
-	$plugin = new plugin();
-	if (in_array("openvswitch-manager", $plugin->enabled())) {
-
-	    array_pop($vm_resource_mac_array);
-	    // rebuild add_nic_str
-	    $vm_ovs_additonal_nic_array = $vm_resource_mac_array;
-	    array_shift($vm_ovs_additonal_nic_array);
-	    $add_nic_loop = 1;
-	    foreach ($vm_ovs_additonal_nic_array as $vm_ovs_additonal_nic_mac) {
-		$vm_ovs_additonal_nic_str .= " -m".$add_nic_loop." ".$vm_ovs_additonal_nic_mac." ";
-		$add_nic_loop++;
-	    }
-
-	    $additional_nic_str = $vm_ovs_additonal_nic_str;
-
-	    // if ovs enabled  - get cr and add ip-mgmt ips to dhcpd
-	    $vm_resource = new resource();
-	    $vm_resource->get_instance_by_mac($mac);
-
-	    // the resource name is set as the appliance_name in the cr we are looking for
-	    $crl = new cloudrequest();
-	    $cr_list = $crl->get_all_new_and_approved_ids();
-	    $vm_cr_id = 0;
-	    foreach($cr_list as $list) {
-		    $cr_id = $list['cr_id'];
-		    $cr = new cloudrequest();
-		    $cr->get_instance_by_id($cr_id);
-		    if ($cr->appliance_hostname == $name) {
-			    $vm_cr_id = $cr->id;
-			    $event->log("create_kvm_vm_local", $_SERVER['REQUEST_TIME'], 5, "kvm-cloud-hook", "OVS: Found cloud request id $vm_cr_id", "", "", 0, 0, 0);
-		    }
-	    }
-	    if ($vm_cr_id == 0) {
-		    $event->log("create_kvm_vm_local", $_SERVER['REQUEST_TIME'], 2, "kvm-cloud-hook", "OVS: Could not find out cloud request id!", "", "", 0, 0, 0);
-		    return;
-	    }
-
-	    // here we have found the cr for this vm
-	    $cr = new cloudrequest();
-	    $cr->get_instance_by_id($vm_cr_id);
-
-	    $cu = new clouduser();
-	    $cu->get_instance_by_id($cr->cu_id);
-
-	    $ovs_network_parameter = '';
-
-	    // check ip-mgmt
-	    $cc_conf = new cloudconfig();
-	    $show_ip_mgmt = $cc_conf->get_value(26);	// ip-mgmt enabled ?
-	    if (!strcmp($show_ip_mgmt, "true")) {
-		    if (file_exists("$RootDir/plugins/ip-mgmt/.running")) {
-			    require_once "$RootDir/plugins/ip-mgmt/class/ip-mgmt.class.php";
-			    $ip_mgmt_array = explode(",", $cr->ip_mgmt);
-			    $ip_mgmt_assign_loop = 0;
-			    foreach($ip_mgmt_array as $ip_mgmt_config_str) {
-
-				    $collon_pos = strpos($ip_mgmt_config_str, ":");
-				    $nic_id = substr($ip_mgmt_config_str, 0, $collon_pos);
-				    $ip_mgmt_id = substr($ip_mgmt_config_str, $collon_pos+1);
-				    if (!strlen($ip_mgmt_id)) {
-					    continue;
-				    }
-				    $orginal_ip_mgmt_id = $ip_mgmt_id;
-				    $ip_mgmt_assign = new ip_mgmt();
-				    $ip_mgmt_id_final = $ip_mgmt_id;
-				    // we need to check if the ip is still free
-				    $ip_mgmt_object_arr = $ip_mgmt_assign->get_instance('id', $ip_mgmt_id);
-				    $ip_app_id = $ip_mgmt_object_arr['ip_mgmt_appliance_id'];
-				    if ($ip_app_id > 0) {
-					    $event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "cloud-monitor", "WARNING: ip-mgmt id ".$ip_mgmt_id." is already in use. Trying to find the next free ip..", "", "", 0, 0, 0);
-					    $ip_mgmt_id = -2;
-				    } else {
-					    $event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "cloud-monitor", "SUCCESS: ip-mgmt id ".$ip_mgmt_id." is free.", "", "", 0, 0, 0);
-				    }
-
-				    // if ip_mgmt_id == auto (-2) search the next free ip for the user
-				    if ($ip_mgmt_id == -2) {
-					    $ip_mgmt_list_per_user = $ip_mgmt_assign->get_list_by_user($cu->cg_id);
-					    $next_free_ip_mgmt_id = 0;
-					    foreach($ip_mgmt_list_per_user as $list) {
-						    $possible_next_ip_mgmt_id = $list['ip_mgmt_id'];
-						    $possible_next_ip_mgmt_object_arr = $ip_mgmt_assign->get_instance('id', $possible_next_ip_mgmt_id);
-						    if ($possible_next_ip_mgmt_object_arr['ip_mgmt_appliance_id'] == NULL) {
-							    // we have found the next free ip-mgmt id
-							    $next_free_ip_mgmt_id = $possible_next_ip_mgmt_id;
-							    $ip_mgmt_id_final = $possible_next_ip_mgmt_id;
-							    break;
-						    }
-					    }
-					    if ($next_free_ip_mgmt_id == 0) {
-						    $event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "cloud-monitor", "WARNING: Could not find the next free ip-mgmt id for appliance ".$appliance_id.".", "", "", 0, 0, 0);
-						    continue;
-					    } else {
-						    $event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "cloud-monitor", "SUCCESS: Found the next free ip-mgmt id ".$next_free_ip_mgmt_id." for appliance ".$appliance_id.".", "", "", 0, 0, 0);
-						    $ip_mgmt_id = $next_free_ip_mgmt_id;
-						    // here we have to update the cr with the new ip-mgmt-id
-						    $new_cr_ip_mgmt_str = str_replace($nic_id.":".$orginal_ip_mgmt_id, $nic_id.":".$ip_mgmt_id, $cr->ip_mgmt);
-						    $new_cr_ip_mgmt_fields=array();
-						    $new_cr_ip_mgmt_fields["cr_ip_mgmt"]=$new_cr_ip_mgmt_str;
-						    $cr->update($cr->id, $new_cr_ip_mgmt_fields);
-						    $cr->get_instance_by_id($cr->id);
-					    }
-				    }
-
-				    // here we have a valid ip-mgmt opbject to update
-
-
-
-				    $ip_mgmt_fields=array();
-
-				    // get full network config
-				    $ovs_ip_array = $ip_mgmt_assign->get_instance('id', $ip_mgmt_id);
-				    $ovs_ip_mgmt_name = trim($ovs_ip_array['ip_mgmt_name']);
-				    $ovs_ip_mgmt_address = trim($ovs_ip_array['ip_mgmt_address']);
-				    $ovs_ip_mgmt_network = trim($ovs_ip_array['ip_mgmt_network']);
-				    $ovs_ip_mgmt_subnet = trim($ovs_ip_array['ip_mgmt_subnet']);
-				    $ovs_ip_mgmt_broadcast = trim($ovs_ip_array['ip_mgmt_broadcast']);
-				    $ovs_ip_mgmt_dns1 = trim($ovs_ip_array['ip_mgmt_dns1']);
-				    $ovs_ip_mgmt_dns2 = trim($ovs_ip_array['ip_mgmt_dns2']);
-				    $ovs_ip_mgmt_domain = trim($ovs_ip_array['ip_mgmt_domain']);
-				    $ovs_ip_mgmt_vlan_id = trim($ovs_ip_array['ip_mgmt_vlan_id']);
-				    $ovs_ip_mgmt_bridge_name = trim($ovs_ip_array['ip_mgmt_bridge_name']);
-				    $ovs_ip_mgmt_comment = trim($ovs_ip_array['ip_mgmt_comment']);
-
-				    // update ip-mgmt object with resource_id
-				    $ip_mgmt_fields["ip_mgmt_resource_id"]=$vm_resource->id;
-				    $ip_mgmt_fields["ip_mgmt_nic_id"]=$nic_id;
-				    $ip_mgmt_assign->update_ip($ip_mgmt_id, $ip_mgmt_fields);
-
-				    // set resource_external_ip
-				    if ($ip_mgmt_assign_loop == 0) {
-					    $ip_mgmt_assign_arr = $ip_mgmt_assign->get_config_by_id($ip_mgmt_id_final);
-					    $resource_external_ip = $ip_mgmt_assign_arr[0]['ip_mgmt_address'];
-
-					    $command  = $OPENQRM_SERVER_BASE_DIR.'/openqrm/plugins/dhcpd/bin/openqrm-dhcpd-manager remove_by_mac';
-					    $command .= ' -m '.$vm_resource_mac_array[$ip_mgmt_assign_loop];
-
-					    $openqrm->send_command($command);
-					    sleep(1);
-					    // update vm resource objects main ip
-					    $resource_fields['resource_ip'] = $ovs_ip_mgmt_address;
-					    $resource_fields['resource_subnet'] = $ovs_ip_mgmt_subnet;
-					    $resource_fields['resource_network'] = $ovs_ip_mgmt_network;
-					    $resource_fields['resource_broadcast'] = $ovs_ip_mgmt_broadcast;
-					    $vm_resource->update_info($vm_resource->id, $resource_fields);
-
-					    // build bridge param - first nic
-					    $ovs_network_parameter .= " -z ".$ovs_ip_mgmt_bridge_name;
-
-				    } else {
-					    // build bridge param - additional nics
-					    $ovs_network_parameter .= " -z".$ip_mgmt_assign_loop." ".$ovs_ip_mgmt_bridge_name;
-
-
-				    }
-				    // assign to dhcpd
-				    $command  = $OPENQRM_SERVER_BASE_DIR.'/openqrm/plugins/dhcpd/bin/openqrm-dhcpd-manager add';
-				    $command .= ' -d '.$vm_resource->id.$ip_mgmt_assign_loop;
-				    $command .= ' -i '.$ovs_ip_mgmt_address;
-				    $command .= ' -s '.$ovs_ip_mgmt_subnet;
-				    $command .= ' -m '.$vm_resource_mac_array[$ip_mgmt_assign_loop];
-				    $openqrm->send_command($command);
-
-				    // assign to dns
-				    $command  = $OPENQRM_SERVER_BASE_DIR.'/openqrm/plugins/dns/bin/openqrm-dns-domain-manager add_host';
-				    $command .= ' -n '.$ovs_ip_mgmt_domain;
-				    $command .= ' -i '.$ovs_ip_mgmt_address;
-				    $command .= ' -q '.$name;
-				    $openqrm->send_command($command);
-
-				    sleep(1);
-				    $ip_mgmt_assign_loop++;
-			    }
-		    }
-	    }
-
-	}
-	// send command to create vm / regular bridges
-	$vm_create_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm-vm create";
-	$vm_create_cmd .= " -n ".$name;
-	$vm_create_cmd .= " -y ".$vm_type;
-	$vm_create_cmd .= " -m ".$mac;
-	$vm_create_cmd .= " -r ".$memory;
-	$vm_create_cmd .= " -c ".$cpu;
-	$vm_create_cmd .= " -b local";
-	$vm_create_cmd .= " ".$additional_nic_str;
-	$vm_create_cmd .= " ".$vncpassword_parameter;
-	$vm_create_cmd .= " -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password;
-	// for ovs we send the bridges from ip_mgmt
-	if (in_array("openvswitch-manager", $plugin->enabled())) {
-		$vm_create_cmd .= " ".$ovs_network_parameter;
-	}
-
-	$event->log("create_kvm_vm_local", $_SERVER['REQUEST_TIME'], 5, "kvm-cloud-hook", "Running $vm_create_cmd", "", "", 0, 0, 0);
-	$host_resource->send_command($host_resource->ip, $vm_create_cmd);
-
-
-	
-	
-	
-}
-
-
-
-// removes a vm
-function remove_kvm_vm($host_resource_id, $name, $mac) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	global $RootDir;
-
-	$host_resource = new resource();
-	$host_resource->get_instance_by_id($host_resource_id);
-	// we need to have an openQRM server object too since some of the
-	// virtualization commands are sent from openQRM directly
-	$openqrm = new openqrm_server();
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-
-	
-	// be sure to remove first $mac from dhcpd
-	$dhcpd_remove_command = $OPENQRM_SERVER_BASE_DIR.'/openqrm/plugins/dhcpd/bin/openqrm-dhcpd-manager remove_by_mac -m '.$mac;
-	$dhcpd_remove_command .= ' --openqrm-cmd-mode background';
-	$openqrm->send_command($dhcpd_remove_command);
-	sleep(1);
-
-	$plugin = new plugin();
-	if (in_array("openvswitch-manager", $plugin->enabled())) {
-	
-	    // OVS: check to remove all mac addresses from dhcpd
-	    $command  = $OPENQRM_SERVER_BASE_DIR.'/openqrm/plugins/kvm/bin/openqrm-kvm-vm post_vm_list';
-	    $command .= ' -u '.$openqrm_admin_user->name.' -p '.$openqrm_admin_user->password;
-	    $command .= ' --openqrm-ui-user '.$openqrm_admin_user->name;
-	    $command .= ' --openqrm-cmd-mode background';
-
-	    $file = $OPENQRM_SERVER_BASE_DIR.'/openqrm/plugins/kvm/web/kvm-stat/'.$host_resource->id.'.vm_list';
-	    if(file_exists($file)) {
-		    unlink($file);
-	    }
-	    $host_resource->send_command($host_resource->ip, $command);
-	    while (!file_exists($file)) // check if the data file has been modified
-	    {
-		    usleep(10000); // sleep 10ms to unload the CPU
-		    clearstatcache();
-	    }
-	    $lines = explode("\n", file_get_contents($file));
-	    if(count($lines) >= 1) {
-		    foreach($lines as $line) {
-			    if($line !== '') {
-				    $line = explode('@', $line);
-				    if($name === $line[1]) {
-					    // remove all nics by mac from dhcpd
-					    if($line[7] !== '') {
-						$mac_str = $line[7];
-						$all_mac_array = explode(',', $line[7]);
-						    foreach ($all_mac_array as $addional_mac) {
-							    if ($addional_mac == '') {
-								continue;
-							    }
-							    $dhcpd_remove_command = $OPENQRM_SERVER_BASE_DIR.'/openqrm/plugins/dhcpd/bin/openqrm-dhcpd-manager remove_by_mac -m '.$addional_mac;
-							    $dhcpd_remove_command .= ' --openqrm-cmd-mode background';
-							    $event->log("console", $_SERVER['REQUEST_TIME'], 5, "kvm-cloud-hook.php", 'Removing '.$addional_mac.' from dhcpd server.', "", "", 0, 0, 0);
-							    $openqrm->send_command($dhcpd_remove_command);
-							    sleep(1);
-						    }
-					    }
-
-				    }
-			    }
-		    }
-	    }
-
-
-	    // check ip-mgmt
-	    $cc_conf = new cloudconfig();
-	    $show_ip_mgmt = $cc_conf->get_value(26);	// ip-mgmt enabled ?
-	    if (!strcmp($show_ip_mgmt, "true")) {
-		    if (file_exists("$RootDir/plugins/ip-mgmt/.running")) {
-			    require_once "$RootDir/plugins/ip-mgmt/class/ip-mgmt.class.php";
-
-			    // remove all ips from dns
-			    $ip_mgmt_deassign = new ip_mgmt();
-			    $vm_resource = new resource();
-			    $vm_resource->get_instance_by_mac($mac);
-			    $kvm_ip_id_array = $ip_mgmt_deassign->get_ids_per_resource($vm_resource->id);
-			    foreach($kvm_ip_id_array as $kvm_ip_id) {
-
-				    $ovs_ip_array = $ip_mgmt_deassign->get_instance('id', $kvm_ip_id);
-				    $ovs_ip_mgmt_address = trim($ovs_ip_array['ip_mgmt_address']);
-				    $ovs_ip_mgmt_domain = trim($ovs_ip_array['ip_mgmt_domain']);
-
-				    $dns_command  = $OPENQRM_SERVER_BASE_DIR.'/openqrm/plugins/dns/bin/openqrm-dns-domain-manager remove_host';
-				    $dns_command .= ' -n '.$ovs_ip_mgmt_domain;
-				    $dns_command .= ' -i '.$ovs_ip_mgmt_address;
-				    $dns_command .= ' -q '.$vm_resource->vname;
-				    $openqrm->send_command($dns_command);
-
-				    $ovs_update_array['ip_mgmt_resource_id'] = NULL;
-				    $ip_mgmt_deassign->update_ip($kvm_ip_id, $ovs_update_array);
-
-			    }
-		    }
-	    }
-	    sleep(1);
-	}	
-	
-	// remove the vm from host
-	$event->log("remove_kvm_vm_local", $_SERVER['REQUEST_TIME'], 5, "kvm-cloud-hook", "Removing KVM VM $name/$mac from Host resource $host_resource_id", "", "", 0, 0, 0);
-	// we need to have an openQRM server object too since some of the
-	// virtualization commands are sent from openQRM directly
-	$openqrm = new openqrm_server();
-	// send command to create the vm on the host
-	$vm_remove_cmd = "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-vm delete -n ".$name." --openqrm-cmd-mode background";
-	$event->log("remove_kvm_vm_local", $_SERVER['REQUEST_TIME'], 5, "kvm-cloud-hook", "Running $vm_remove_cmd", "", "", 0, 0, 0);
-	$host_resource->send_command($host_resource->ip, $vm_remove_cmd);
-}
-
-
-// Cloud hook methods
-
-function create_kvm_vm_local($host_resource_id, $name, $mac, $memory, $cpu, $swap, $additional_nic_str, $vncpassword, $source_image_id, $size, $cu_id) {
-	global $event;
-	create_kvm_vm($host_resource_id, $name, $mac, $memory, $cpu, $swap, $additional_nic_str, "kvm-vm-local", $vncpassword, $source_image_id);
-}
-
-function create_kvm_vm_net($host_resource_id, $name, $mac, $memory, $cpu, $swap, $additional_nic_str, $vncpassword, $source_image_id, $size, $cu_id) {
-	global $event;
-	create_kvm_vm($host_resource_id, $name, $mac, $memory, $cpu, $swap, $additional_nic_str, "kvm-vm-net", $vncpassword, $source_image_id);
-}
-
-function remove_kvm_vm_local($host_resource_id, $name, $mac, $cu_id) {
-	global $event;
-	remove_kvm_vm($host_resource_id, $name, $mac);
-}
-
-function remove_kvm_vm_net($host_resource_id, $name, $mac, $cu_id) {
-	global $event;
-	remove_kvm_vm($host_resource_id, $name, $mac);
-}
-
-
-
-
-// ---------------------------------------------------------------------------------
-
-/*
-$host_resource_id = 0;
-$name = "kvmovscloudtest";
-$mac="2c:76:8a:e5:a5:10";
-$memory=512;
-$cpu=1;
-$swap=0;
-$additional_nic_str = " -m1 2c:76:8a:e5:a5:11 -m2 2c:76:8a:e5:a5:12 ";
-$vm_type = "kvm-vm-local";
-$vncpassword = "openqrm";
-$source_image_id = "14998967150366";
-
-echo "running create_kvm_vm <br>";
-
-create_kvm_vm($host_resource_id, $name, $mac, $memory, $cpu, $swap, $additional_nic_str, $vm_type, $vncpassword, $source_image_id);
-*/
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-cloud-product-hook.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-cloud-product-hook.php
deleted file mode 100644
index 3033f1f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-cloud-product-hook.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $IMAGE_AUTHENTICATION_TABLE;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $openqrm_server;
-$event = new event();
-global $event;
-
-
-
-function openqrm_kvm_cloud_product($cmd, $cloud_hook_config) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RootDir;
-
-	$openqrm_server = new openqrm_server();
-
-	$event->log("openqrm_kvm_cloud_product", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-cloud-product-hook.php", "Handling ".$cmd." event", "", "", 0, 0, 0);
-	switch($cmd) {
-			case "add":
-				$event->log("openqrm_kvm_cloud_product", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-cloud-product-hook.php", "Handling cloud-product ".$cmd." event", "", "", 0, 0, 0);
-				// create resource products
-				$db=openqrm_get_db_connection();
-				$image = new image();
-				$checked_virtualization_plugins = array();
-				$virtualization = new virtualization();
-				$virtualization_id_ar = $virtualization->get_list();
-				unset($virtualization_id_ar[0]);
-				foreach ($virtualization_id_ar as $key => $value) {
-					$next_sort_id = 0;
-					$id = $value['value'];
-					$virtualization->get_instance_by_id($id);
-					$pos = strpos($virtualization->type, 'kvm-vm-');
-					if ($pos !== false) {
-						$event->log("openqrm_kvm_cloud_product", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-cloud-product-hook.php", "Adding ".$virtualization->type." as cloud-product", "", "", 0, 0, 0);
-						$cloud_product_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-						$create_resource_cloudselector_config = "insert into cloud_selector (id, type, sort_id, quantity, price, name, description, state) VALUES (".$cloud_product_id.", 'resource', ".$next_sort_id.", '".$virtualization->id."', 1, '".$virtualization->type."', '".$virtualization->name."', 1);";
-						$recordSet = $db->Execute($create_resource_cloudselector_config);
-						$next_sort_id++;
-
-						// add all existing images for this virtualization type to private images
-						$virtualization_plugin_name = $virtualization->get_plugin_name();
-						if (!in_array($virtualization_plugin_name, $checked_virtualization_plugins)) {
-							$checked_virtualization_plugins[] = $virtualization_plugin_name;
-							$deployment = new deployment();
-							$deployment_id_ar = $deployment->get_id_by_storagetype($virtualization_plugin_name);
-							foreach ($deployment_id_ar as $key => $value) {
-								$did = $value['value'];
-								$deployment->get_instance_by_id($did);
-								$image_id_deployment_ar = $image->get_ids_by_type($deployment->type);
-								foreach ($image_id_deployment_ar as $iid_ar) {
-									// add to private images
-									$image_id = $iid_ar['image_id'];
-									$event->log("openqrm_kvm_cloud_product", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-cloud-product-hook.php", "Adding Image ".$image_id." as private image", "", "", 0, 0, 0);
-									$cloud_pr_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-									$create_private_image_config = "insert into cloud_private_image (co_id, co_image_id, co_cu_id, co_clone_on_deploy, co_state) VALUES (".$cloud_pr_id.", ".$image_id.", 0, 1, 1);";
-									$recordSet = $db->Execute($create_private_image_config);
-								}
-							}
-						}
-					}
-				}
-				// add host to admin resource pool
-				$admin_project_id = $cloud_hook_config['cloud_admin_procect'];
-				$virtualization->get_instance_by_type('kvm');
-				$appliance = new appliance();
-				$appliance_id_ar = $appliance->get_ids_per_virtualization($virtualization->id);
-				foreach ($appliance_id_ar as $key => $value) {
-					$appliance_id = $value['appliance_id'];
-					$appliance->get_instance_by_id($appliance_id);
-					$cloud_respool_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$create_default_resource_pool_config = "insert into cloud_respool(rp_id, rp_resource_id, rp_cg_id) values (".$cloud_respool_id.", ".$appliance->resources.", ".$admin_project_id.");";
-					$recordSet = $db->Execute($create_default_resource_pool_config);
-				}
-				
-				break;
-			case "remove":
-				$cloud_product_class = $RootDir."/plugins/cloud/class/cloudselector.class.php";
-				if (file_exists($cloud_product_class)) {
-					require_once $cloud_product_class;
-					$cloud_selector = new cloudselector();
-					$virtualization = new virtualization();
-					
-					$virtualization->get_instance_by_type('kvm-vm-local');
-					$event->log("openqrm_kvm_cloud_product", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-cloud-product-hook.php", "Removing resource type ".$virtualization->type." from cloud-products", "", "", 0, 0, 0);
-					$cloud_selector->remove_by_quantity($virtualization->id);
-
-					$virtualization->get_instance_by_type('kvm-vm-net');
-					$event->log("openqrm_kvm_cloud_product", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-cloud-product-hook.php", "Removing resource type ".$virtualization->type." from cloud-products", "", "", 0, 0, 0);
-					$cloud_selector->remove_by_quantity($virtualization->id);
-					
-				}
-				break;
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-gluster-deployment-auth-hook.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-gluster-deployment-auth-hook.php
deleted file mode 100644
index 2b5e513..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-gluster-deployment-auth-hook.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
- /*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/image_authentication.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-
-/**
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- */
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $IMAGE_AUTHENTICATION_TABLE;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $openqrm_server;
-$event = new event();
-global $event;
-
-
-
-	//--------------------------------------------------
-	/**
-	* authenticates the storage volume for the appliance resource
-	* <code>
-	* storage_auth_function("start", 2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_function($cmd, $appliance_id) {
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-		global $IMAGE_AUTHENTICATION_TABLE;
-		global $openqrm_server;
-		global $RootDir;
-
-		$appliance = new appliance();
-		$appliance->get_instance_by_id($appliance_id);
-
-		$image = new image();
-		$image->get_instance_by_id($appliance->imageid);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		$resource = new resource();
-		$resource->get_instance_by_id($appliance->resources);
-		$resource_mac=$resource->mac;
-		$resource_ip=$resource->ip;
-
-		$vm_host_resource = new resource();
-		$vm_host_resource->get_instance_by_id($resource->vhostid);
-
-		switch($cmd) {
-			case "start":
-				// authenticate the rootfs / needs openqrm user + pass
-				$openqrm_admin_user = new user("openqrm");
-				$openqrm_admin_user->set_user();
-				// generate a password for the image
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-auth-hook.php", "Authenticating ".$image_name." / ".$image_rootdevice." to resource ".$resource_mac.".", "", "", 0, 0, $appliance_id);
-				$auth_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$deployment_plugin_name."/bin/openqrm-".$deployment_plugin_name." auth -n ".$image_name." -r ".$image_rootdevice." -i ".$image_name." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." -t ".$deployment->type." --openqrm-cmd-mode background";
-				$resource->send_command($storage_resource->ip, $auth_start_cmd);
-				break;
-		}
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage volume for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage deployment volumes for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_deployment_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_deployment_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-
-	}
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-gluster-deployment-cloud-hook.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-gluster-deployment-cloud-hook.php
deleted file mode 100644
index 7070b6a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-gluster-deployment-cloud-hook.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This file implements the cloud storage methods
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-// special cloud classes
-require_once "$RootDir/plugins/cloud/class/cloudimage.class.php";
-
-$event = new event();
-global $event;
-
-global $OPENQRM_SERVER_BASE_DIR;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $RESOURCE_INFO_TABLE;
-
-
-// ---------------------------------------------------------------------------------
-// general cloudstorage methods
-// ---------------------------------------------------------------------------------
-
-
-// clones the volume of an image
-function create_clone_kvm_gluster_deployment($cloud_image_id, $image_clone_name, $disk_size) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	// we got the cloudimage id here, get the image out of it
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	$event->log("create_clone_kvm_gluster_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-gluster-deployment-cloud-hook.php", "Creating clone ".$image_clone_name." of image ".$cloudimage->image_id." on the storage", "", "", 0, 0, 0);
-	// get image, this is already the new logical clone
-	// we just need to physical snapshot it and update the rootdevice
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$imageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($imageid);
-	$storage_resource_id = $storage->resource_id;
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// kvm-gluster-deployment
-	$image->get_instance_by_id($image_id);
-	$gluster_uri_arr = parse_url($image_rootdevice);
-	// origin image volume name
-	$origin_volume_name=basename($gluster_uri_arr['path']);
-	// location of the volume (path)
-	$image_location_name=str_replace('/', '', dirname($gluster_uri_arr['path']));
-	// set default snapshot size
-	if (!strlen($disk_size)) {
-		$disk_size=5000;
-	}
-	// update the image rootdevice parameter
-	$ar_image_update = array(
-		'image_rootdevice' => "gluster:".$resource->ip."//".$image_location_name."/".$image_clone_name,
-	);
-	// get the vm resource
-	$vm_resource = new resource();
-	$vm_resource->get_instance_by_id($cloudimage->resource_id);
-	// get the VM host
-	$vm_host_resource = new resource();
-	$vm_host_resource->get_instance_by_id($vm_resource->vhostid);
-
-	$event->log("create_clone_kvm_gluster_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-gluster-deployment-cloud-hook.php", "Updating rootdevice of image ".$image_id." / ".$image_name." with ".$image_location_name."/".$image_clone_name, "", "", 0, 0, 0);
-	$image->update($image_id, $ar_image_update);
-	$image_clone_cmd="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm snap -n ".$origin_volume_name." -v ".$image_location_name." -s ".$image_clone_name." -m ".$disk_size." -t ".$deployment->type." --openqrm-cmd-mode background";
-	$event->log("create_clone_kvm_gluster_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-gluster-deployment-cloud-hook.php", "Running : ".$image_clone_cmd, "", "", 0, 0, 0);
-	$resource->send_command($resource->ip, $image_clone_cmd);
-}
-
-
-
-// removes the volume of an image
-function remove_kvm_gluster_deployment($cloud_image_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	$event->log("remove_kvm_gluster_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-gluster-deployment-cloud-hook.php", "Removing image ".$cloudimage->image_id." from storage.", "", "", 0, 0, 0);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$imageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($imageid);
-	$storage_resource_id = $storage->resource_id;
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	$gluster_uri_arr = parse_url($image_rootdevice);
-	// origin image volume name
-	$origin_volume_name=basename($gluster_uri_arr['path']);
-	// location of the volume (path)
-	$image_location_name=str_replace('/', '', dirname($gluster_uri_arr['path']));
-	$image_remove_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm remove -n ".$origin_volume_name." -v ".$image_location_name." -t ".$deployment->type." --openqrm-cmd-mode background";
-	$event->log("remove_kvm_gluster_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-gluster-deployment-cloud-hook.php", "Running : ".$image_remove_clone_cmd, "", "", 0, 0, 0);
-	$resource->send_command($resource->ip, $image_remove_clone_cmd);
-}
-
-
-// resizes the volume of an image
-function resize_kvm_gluster_deployment($cloud_image_id, $resize_value) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	$event->log("resize_kvm_gluster_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-gluster-deployment-cloud-hook.php", "Resize image ".$cloudimage->image_id." on storage.", "", "", 0, 0, 0);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$imageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($imageid);
-	$storage_resource_id = $storage->resource_id;
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	$gluster_uri_arr = parse_url($image_rootdevice);
-	// origin image volume name
-	$origin_volume_name=basename($gluster_uri_arr['path']);
-	// location of the volume (path)
-	$image_location_name=str_replace('/', '', dirname($gluster_uri_arr['path']));
-	$image_resize_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm resize -n ".$origin_volume_name." -v ".$image_location_name." -m ".$resize_value." -t ".$deployment->type." --openqrm-cmd-mode background";
-	$event->log("resize_kvm_gluster_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-gluster-deployment-cloud-hook.php", "Running : ".$image_resize_cmd, "", "", 0, 0, 0);
-	$resource->send_command($resource->ip, $image_resize_cmd);
-}
-
-
-
-// creates a private copy of the volume of an image
-function create_private_kvm_gluster_deployment($cloud_image_id, $private_disk, $private_image_name) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	$event->log("create_private_kvm_gluster_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-gluster-deployment-cloud-hook.php", "Creating private image ".$cloudimage->image_id." on storage.", "", "", 0, 0, 0);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$imageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($imageid);
-	$storage_resource_id = $storage->resource_id;
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// create an admin user to post when cloning has finished
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-	$gluster_uri_arr = parse_url($image_rootdevice);
-	// origin image volume name
-	$origin_volume_name=basename($gluster_uri_arr['path']);
-	// location of the volume (path)
-	$image_location_name=str_replace('/', '', dirname($gluster_uri_arr['path']));
-	$image_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm clone -n ".$origin_volume_name." -s ".$private_image_name." -v ".$image_location_name." -m ".$private_disk." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." -t ".$deployment->type." --openqrm-cmd-mode background";
-	$event->log("create_private_kvm_gluster_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-gluster-deployment-cloud-hook.php", "Running : $image_resize_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource->ip, $image_clone_cmd);
-	// set the storage specific image root_device parameter
-	$new_rootdevice = "gluster:".$resource->ip."//".$image_location_name."/".$private_image_name;
-	return $new_rootdevice;
-}
-
-
-
-// ---------------------------------------------------------------------------------
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-ha-cmd-hook.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-ha-cmd-hook.php
deleted file mode 100644
index 4105467..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-ha-cmd-hook.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This file implements the virtual machine abstraction in the cloud of openQRM
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-
-$event = new event();
-global $event;
-
-global $OPENQRM_SERVER_BASE_DIR;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $RESOURCE_INFO_TABLE;
-
-// ---------------------------------------------------------------------------------
-// general kvm cloudvm methods
-// ---------------------------------------------------------------------------------
-
-
-// creates a vm
-function create_ha_kvm_vm($host_resource_id, $name, $mac, $memory, $cpu, $swap, $additional_nic_str, $vm_type) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("create_kvm_vm", $_SERVER['REQUEST_TIME'], 5, "kvm-ha-hook", "Creating KVM VM $name on Host resource $host_resource_id", "", "", 0, 0, 0);
-	// start the vm on the host
-	$host_resource = new resource();
-	$host_resource->get_instance_by_id($host_resource_id);
-	// we need to have an openQRM server object too since some of the
-	// virtualization commands are sent from openQRM directly
-	$openqrm = new openqrm_server();
-	// send command to create vm
-	$vm_create_cmd = "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-vm create -n ".$name." -y ".$vm_type." -m ".$mac." -r ".$memory." -c ".$cpu." -b local ".$additional_nic_str;
-	$host_resource->send_command($host_resource->ip, $vm_create_cmd);
-	$event->log("create_kvm_vm", $_SERVER['REQUEST_TIME'], 5, "kvm-ha-hook", "Running $vm_create_cmd", "", "", 0, 0, 0);
-}
-
-
-
-// fences a vm
-function fence_ha_kvm_vm($host_resource_id, $mac) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	// fences the vm on its host
-	$host_resource = new resource();
-	$host_resource->get_instance_by_id($host_resource_id);
-	$event->log("fence_kvm_vm", $_SERVER['REQUEST_TIME'], 5, "kvm-ha-hook", "Fencing KVM VM $mac from Host resource $host_resource_id", "", "", 0, 0, 0);
-	// we need to have an openQRM server object too since some of the
-	// virtualization commands are sent from openQRM directly
-	$openqrm = new openqrm_server();
-	// send command to fence the vm on the host
-	$vm_fence_cmd = "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-vm fence -m ".$mac." --openqrm-cmd-mode background";
-	$event->log("fence_kvm_vm", $_SERVER['REQUEST_TIME'], 5, "kvm-ha-hook", "Running $vm_fence_cmd", "", "", 0, 0, 0);
-	$host_resource->send_command($host_resource->ip, $vm_fence_cmd);
-}
-
-
-// HA hook methods
-
-function create_kvm_vm_local($host_resource_id, $name, $mac, $memory, $cpu, $swap, $additional_nic_str, $origin_resource_id) {
-	global $event;
-	create_ha_kvm_vm($host_resource_id, $name, $mac, $memory, $cpu, $swap, $additional_nic_str, "kvm-vm-local");
-}
-
-function create_kvm_vm_net($host_resource_id, $name, $mac, $memory, $cpu, $swap, $additional_nic_str, $origin_resource_id) {
-	global $event;
-	create_ha_kvm_vm($host_resource_id, $name, $mac, $memory, $cpu, $swap, $additional_nic_str, "kvm-vm-net");
-}
-
-function fence_kvm_vm_local($host_resource_id, $mac) {
-	global $event;
-	fence_ha_kvm_vm($host_resource_id, $mac);
-}
-
-function fence_kvm_vm_net($host_resource_id, $mac) {
-	global $event;
-	fence_ha_kvm_vm($host_resource_id, $mac);
-}
-
-
-// ---------------------------------------------------------------------------------
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-lvm-deployment-auth-hook.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-lvm-deployment-auth-hook.php
deleted file mode 100644
index 8259f51..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-lvm-deployment-auth-hook.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
- /*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/image_authentication.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-
-/**
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- */
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $IMAGE_AUTHENTICATION_TABLE;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $openqrm_server;
-$event = new event();
-global $event;
-
-
-
-	//--------------------------------------------------
-	/**
-	* authenticates the storage volume for the appliance resource
-	* <code>
-	* storage_auth_function("start", 2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_function($cmd, $appliance_id) {
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-		global $IMAGE_AUTHENTICATION_TABLE;
-		global $openqrm_server;
-		global $RootDir;
-
-		$appliance = new appliance();
-		$appliance->get_instance_by_id($appliance_id);
-
-		$image = new image();
-		$image->get_instance_by_id($appliance->imageid);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		$resource = new resource();
-		$resource->get_instance_by_id($appliance->resources);
-		$resource_mac=$resource->mac;
-		$resource_ip=$resource->ip;
-
-		// For kvm vms we assume that the image is located on the vm-host
-		// so we send the auth command to the vm-host instead of the image storage.
-		// This enables using a SAN backend with dedicated volumes per vm-host which all
-		// contain all "golden-images" which are used for snapshotting.
-		// We do this to overcome the current lvm limitation of not supporting cluster-wide snapshots
-		$vm_host_resource = new resource();
-		$vm_host_resource->get_instance_by_id($resource->vhostid);
-		if ($vm_host_resource->id != $storage_resource->id) {
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-auth-hook.php", "Appliance ".$appliance_id." image IS NOT available on this kvm host, ".$storage_resource->id." not equal ".$vm_host_resource->id." !! Assuming SAN Backend", "", "", 0, 0, $appliance_id);
-		} else {
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-auth-hook.php", "Appliance ".$appliance_id." image IS available on this kvm host, ".$storage_resource->id." equal ".$vm_host_resource->id.".", "", "", 0, 0, $appliance_id);
-		}
-
-		switch($cmd) {
-			case "start":
-				// authenticate the rootfs / needs openqrm user + pass
-				$openqrm_admin_user = new user("openqrm");
-				$openqrm_admin_user->set_user();
-				// generate a password for the image
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-auth-hook.php", "Authenticating ".$image_name." / ".$image_rootdevice." to resource ".$resource_mac.".", "", "", 0, 0, $appliance_id);
-				$auth_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$deployment_plugin_name."/bin/openqrm-".$deployment_plugin_name." auth -n ".$image_name." -r ".$image_rootdevice." -i ".$image_name." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." -t ".$deployment->type." --openqrm-cmd-mode background";
-				$resource->send_command($vm_host_resource->ip, $auth_start_cmd);
-				break;
-		}
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage volume for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage deployment volumes for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_deployment_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_deployment_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-
-	}
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-lvm-deployment-cloud-hook.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-lvm-deployment-cloud-hook.php
deleted file mode 100644
index aef198b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-lvm-deployment-cloud-hook.php
+++ /dev/null
@@ -1,417 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This file implements the cloud storage methods
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once $RootDir."/include/user.inc.php";
-require_once $RootDir."/include/openqrm-database-functions.php";
-require_once $RootDir."/class/resource.class.php";
-require_once $RootDir."/class/image.class.php";
-require_once $RootDir."/class/storage.class.php";
-require_once $RootDir."/class/deployment.class.php";
-require_once $RootDir."/class/appliance.class.php";
-require_once $RootDir."/class/openqrm_server.class.php";
-require_once $RootDir."/class/plugin.class.php";
-require_once $RootDir."/class/event.class.php";
-// special cloud classes
-require_once "$RootDir/plugins/cloud/class/cloudimage.class.php";
-
-$event = new event();
-global $event;
-
-global $OPENQRM_SERVER_BASE_DIR;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $RESOURCE_INFO_TABLE;
-
-
-$kvm_plugin_config = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/etc/openqrm-plugin-kvm.conf";
-$store = openqrm_parse_conf($kvm_plugin_config);
-$kvm_plugin_cloud_create_volume_action = "snap";
-if (isset($store['OPENQRM_PLUGIN_KVM_CLOUD_CREATE_VOLUME_ACTION'])) {
-	if ($store['OPENQRM_PLUGIN_KVM_CLOUD_CREATE_VOLUME_ACTION'] == 'clone') {
-		$kvm_plugin_cloud_create_volume_action = "clone";
-	}
-}
-
-
-// ---------------------------------------------------------------------------------
-// general cloudstorage methods
-// ---------------------------------------------------------------------------------
-
-
-// clones the volume of an image
-function create_clone_kvm_lvm_deployment($cloud_image_id, $image_clone_name, $disk_size) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	// clone or snap cloud action
-	$kvm_plugin_config = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/etc/openqrm-plugin-kvm.conf";
-	$store = openqrm_parse_conf($kvm_plugin_config);
-	$kvm_plugin_cloud_create_volume_action = "snap";
-	if (isset($store['OPENQRM_PLUGIN_KVM_CLOUD_CREATE_VOLUME_ACTION'])) {
-		if ($store['OPENQRM_PLUGIN_KVM_CLOUD_CREATE_VOLUME_ACTION'] == 'clone') {
-			$kvm_plugin_cloud_create_volume_action = "clone";
-		}
-	}
-
-	// we got the cloudimage id here, get the image out of it
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	$event->log("create_clone_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Creating clone ".$image_clone_name." of image ".$cloudimage->image_id." on the storage", "", "", 0, 0, 0);
-	// get image, this is already the new logical clone
-	// we just need to physical snapshot it and update the rootdevice
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$imageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($imageid);
-	$storage_resource_id = $storage->resource_id;
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// kvm-lvm-deployment
-	$image->get_instance_by_id($image_id);
-	// parse the volume group info in the identifier
-	$volume_group_location=dirname($image_rootdevice);
-	$volume_group=basename($volume_group_location);
-	$image_location_name=basename($image_rootdevice);
-	// set default snapshot size
-	if (!strlen($disk_size)) {
-		$disk_size=5000;
-	}
-	// update the image rootdevice parameter
-	$ar_image_update = array(
-		'image_rootdevice' => "/dev/".$volume_group."/".$image_clone_name,
-	);
-
-	// For kvm vms we assume that the image is located on the vm-host
-	// so we send the auth command to the vm-host instead of the image storage.
-	// This enables using a SAN backend with dedicated volumes per vm-host which all
-	// contain all "golden-images" which are used for snapshotting.
-	// We do this to overcome the current lvm limitation of not supporting cluster-wide snapshots
-	// get the vm resource
-	$vm_resource = new resource();
-	$vm_resource->get_instance_by_id($cloudimage->resource_id);
-	// get the lxc host
-	$vm_host_resource = new resource();
-	$vm_host_resource->get_instance_by_id($vm_resource->vhostid);
-	// san backend ?
-	if ($vm_host_resource->id != $resource->id) {
-		$event->log("create_clone_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Image ".$image_id." IS NOT available on this kvm host, ".$resource->id." not equal ".$vm_host_resource->id." !! Assuming SAN Backend", "", "", 0, 0, 0);
-
-		// update the image storage id with the vm-host-resource
-		$image_deployment = new deployment();
-		$image_deployment->get_instance_by_type($image_type);
-		// loop over all storage id from type $image_type
-		$found_image=0;
-		$storage_list_by_type = new storage();
-		$storage_id_list_by_type = $storage_list_by_type->get_ids_by_storage_type($image_deployment->id);
-		foreach($storage_id_list_by_type as $storage_id_list) {
-			$storage_id = $storage_id_list['storage_id'];
-			$tstorage = new storage();
-			$tstorage->get_instance_by_id($storage_id);
-			if ($tstorage->resource_id == $vm_host_resource->id) {
-				// re-create update array + new storage id
-				$ar_image_update = array(
-					'image_rootdevice' => "/dev/".$volume_group."/".$image_clone_name,
-					'image_storageid' => $tstorage->id,
-				);
-				$event->log("create_clone_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Updating Image ".$image_id." / ".$image_name." with storage id ".$tstorage->id.".", "", "", 0, 0, 0);
-				$found_image=1;
-				break;
-			}
-		}
-		if ($found_image == 0) {
-			$event->log("create_clone_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 2, "openqrm-kvm-lvm-deployment-cloud-hook.php", "SETUP ERROR: Could not find a storage server type ".$image_type." using resource ".$vm_host_resource->id.". Please create one!", "", "", 0, 0, 0);
-			$event->log("create_clone_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 2, "openqrm-kvm-lvm-deployment-cloud-hook.php", "SETUP ERROR: Not cloning image ".$image_id.".", "", "", 0, 0, 0);
-			return;
-		}
-
-	} else {
-		$event->log("create_clone_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Image ".$image_id." IS available on this kvm host, ".$resource->id." equal ".$vm_host_resource->id.".", "", "", 0, 0, 0);
-	}
-
-	$event->log("create_clone_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Updating rootdevice of image ".$image_id." / ".$image_name." with /dev/".$volume_group."/".$image_clone_name, "", "", 0, 0, 0);
-	$image->update($image_id, $ar_image_update);
-	$image_clone_cmd="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm ".$kvm_plugin_cloud_create_volume_action." -n ".$image_location_name." -v ".$volume_group." -s ".$image_clone_name." -m ".$disk_size." -t ".$deployment->type." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-	$event->log("create_clone_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Running : ".$image_clone_cmd, "", "", 0, 0, 0);
-	$resource->send_command($vm_host_resource->ip, $image_clone_cmd);
-}
-
-
-
-// removes the volume of an image
-function remove_kvm_lvm_deployment($cloud_image_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	$event->log("remove_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Removing image ".$cloudimage->image_id." from storage.", "", "", 0, 0, 0);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$imageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($imageid);
-	$storage_resource_id = $storage->resource_id;
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// parse the volume group info in the identifier
-	$volume_group_location=dirname($image_rootdevice);
-	$volume_group=basename($volume_group_location);
-	$image_location_name=basename($image_rootdevice);
-
-	// For kvm vms we assume that the image is located on the vm-host
-	// so we send the auth command to the vm-host instead of the image storage.
-	// This enables using a SAN backend with dedicated volumes per vm-host which all
-	// contain all "golden-images" which are used for snapshotting.
-	// We do this to overcome the current lvm limitation of not supporting cluster-wide snapshots
-	//
-	// Still we need to send the remove command to the storage resource since the
-	// create-phase automatically adapted the image->storageid, we cannot use the vm-resource here
-	// because cloudimage->resource_id will be set to -1 when the cloudapp is in paused/resize/private state
-	//
-	if ($cloudimage->resource_id > 0) {
-		// try to get the vm resource
-		$vm_resource = new resource();
-		$vm_resource->get_instance_by_id($cloudimage->resource_id);
-		// get the lxc host
-		$vm_host_resource = new resource();
-		$vm_host_resource->get_instance_by_id($vm_resource->vhostid);
-		// san backend ?
-		if ($vm_host_resource->id != $resource->id) {
-			$event->log("remove_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Image ".$image_id." IS NOT available on this kvm host, ".$resource->id." not equal ".$vm_host_resource->id." !! Assuming SAN Backend", "", "", 0, 0, 0);
-		} else {
-			$event->log("remove_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Image ".$image_id." IS available on this kvm host, ".$resource->id." equal ".$vm_host_resource->id.".", "", "", 0, 0, 0);
-		}
-	}
-	$image_remove_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm remove -n ".$image_location_name." -v ".$volume_group." -t ".$deployment->type." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-	$event->log("remove_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Running : ".$image_remove_clone_cmd, "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_remove_clone_cmd);
-}
-
-
-// resizes the volume of an image
-function resize_kvm_lvm_deployment($cloud_image_id, $resize_value) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	$event->log("resize_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Resize image ".$cloudimage->image_id." on storage.", "", "", 0, 0, 0);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$imageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($imageid);
-	$storage_resource_id = $storage->resource_id;
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// parse the volume group info in the identifier
-	$volume_group_location=dirname($image_rootdevice);
-	$volume_group=basename($volume_group_location);
-	$image_location_name=basename($image_rootdevice);
-
-	// For kvm vms we assume that the image is located on the vm-host
-	// so we send the auth command to the vm-host instead of the image storage.
-	// This enables using a SAN backend with dedicated volumes per vm-host which all
-	// contain all "golden-images" which are used for snapshotting.
-	// We do this to overcome the current lvm limitation of not supporting cluster-wide snapshots
-	//
-	// Still we need to send the remove command to the storage resource since the
-	// create-phase automatically adapted the image->storageid, we cannot use the vm-resource here
-	// because cloudimage->resource_id will be set to -1 when the cloudapp is in paused/resize/private state
-	//
-	if ($cloudimage->resource_id > 0) {
-		// try to get the vm resource
-		$vm_resource = new resource();
-		$vm_resource->get_instance_by_id($cloudimage->resource_id);
-		// get the lxc host
-		$vm_host_resource = new resource();
-		$vm_host_resource->get_instance_by_id($vm_resource->vhostid);
-		// san backend ?
-		if ($vm_host_resource->id != $resource->id) {
-			$event->log("resize_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Image ".$image_id." IS NOT available on this kvm host, ".$resource->id." not equal ".$vm_host_resource->id." !! Assuming SAN Backend", "", "", 0, 0, 0);
-		} else {
-			$event->log("resize_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Image ".$image_id." IS available on this kvm host, ".$resource->id." equal ".$vm_host_resource->id, "", "", 0, 0, 0);
-		}
-	}
-
-	$image_resize_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm resize -n ".$image_location_name." -v ".$volume_group." -m ".$resize_value." -t ".$deployment->type." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-	$event->log("resize_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Running : ".$image_resize_cmd, "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_resize_cmd);
-}
-
-
-
-// creates a private copy of the volume of an image
-function create_private_kvm_lvm_deployment($cloud_image_id, $private_disk, $private_image_name) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	$event->log("create_private_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Creating private image ".$cloudimage->image_id." on storage.", "", "", 0, 0, 0);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$imageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($imageid);
-	$storage_resource_id = $storage->resource_id;
-	// get deployment type
-	$deployment = new deployment();
-	$deployment->get_instance_by_id($storage->type);
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// create an admin user to post when cloning has finished
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-	// parse the volume group info in the identifier
-	$volume_group_location=dirname($image_rootdevice);
-	$volume_group=basename($volume_group_location);
-	$image_location_name=basename($image_rootdevice);
-
-	// For kvm vms we assume that the image is located on the vm-host
-	// so we send the auth command to the vm-host instead of the image storage.
-	// This enables using a SAN backend with dedicated volumes per vm-host which all
-	// contain all "golden-images" which are used for snapshotting.
-	// We do this to overcome the current lvm limitation of not supporting cluster-wide snapshots
-	//
-	// Still we need to send the remove command to the storage resource since the
-	// create-phase automatically adapted the image->storageid, we cannot use the vm-resource here
-	// because cloudimage->resource_id will be set to -1 when the cloudapp is in paused/resize/private state
-	//
-	if ($cloudimage->resource_id > 0) {
-		// try to get the vm resource
-		$vm_resource = new resource();
-		$vm_resource->get_instance_by_id($cloudimage->resource_id);
-		// get the lxc host
-		$vm_host_resource = new resource();
-		$vm_host_resource->get_instance_by_id($vm_resource->vhostid);
-		// san backend ?
-		if ($vm_host_resource->id != $resource->id) {
-			$event->log("create_private_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Image ".$image_id." IS NOT available on this kvm host, ".$resource->id." not equal ".$vm_host_resource->id." !! Assuming SAN Backend", "", "", 0, 0, 0);
-		} else {
-			$event->log("create_private_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Image ".$image_id." IS available on this kvm host, ".$resource->id." equal ".$vm_host_resource->id.".", "", "", 0, 0, 0);
-		}
-	}
-
-	$image_resize_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/kvm/bin/openqrm-kvm clone -n ".$image_location_name." -s ".$private_image_name." -v ".$volume_group." -m ".$private_disk." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." -t ".$deployment->type." --openqrm-cmd-mode background";
-	$event->log("create_private_kvm_lvm_deployment", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-lvm-deployment-cloud-hook.php", "Running : $image_resize_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_resize_cmd);
-	// set the storage specific image root_device parameter
-	$new_rootdevice = str_replace($image_location_name, $private_image_name, $image->rootdevice);
-	return $new_rootdevice;
-}
-
-
-
-// ---------------------------------------------------------------------------------
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-resource-virtual-command-hook.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-resource-virtual-command-hook.php
deleted file mode 100644
index 1d93b4d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/openqrm-kvm-resource-virtual-command-hook.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-
-
-function openqrm_kvm_resource_virtual_command($cmd, $resource_fields) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-
-	$resource_id = $resource_fields["resource_id"];
-	$resource = new resource();
-	$resource->get_instance_by_id($resource_id);
-	$host_resource = new resource();
-	$host_resource->get_instance_by_id($resource->vhostid);
-	$virtualization = new virtualization();
-	$virtualization->get_instance_by_id($resource->vtype);
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-	
-	switch($cmd) {
-		case "reboot":
-			$event->log("openqrm_kvm_resource_virtual_command", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-resource-virtual-command-hook.php", "Handling $cmd command", "", "", 0, 0, 0);
-			if ($virtualization->type == "kvm-vm-local") {
-				$virtual_command = "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-vm restart_by_mac -m ".$resource->mac." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." -d noop --openqrm-cmd-mode background";
-				$host_resource->send_command($host_resource->ip, $virtual_command);
-			}
-			if($virtualization->type == "kvm-vm-net") {
-				// simply add to cmd queue. do not use resource->send_command(ip, reboot) since this will re-trigger this hook
-				$cmd_token = md5(uniqid(rand(), true));
-				$resource_command = $OPENQRM_SERVER_BASE_DIR."/openqrm/sbin/openqrm-exec -i ".$resource->ip." -t ".$cmd_token." -c reboot";
-				shell_exec($resource_command);
-			}
-			if($virtualization->type == "kvm") {
-				$cmd_token = md5(uniqid(rand(), true));
-				$resource_command = $OPENQRM_SERVER_BASE_DIR."/openqrm/sbin/openqrm-exec -i ".$resource->ip." -t ".$cmd_token." -c reboot";
-				shell_exec($resource_command);
-			}
-			$resource_reboot_fields=array();
-			$resource_reboot_fields["resource_state"]="transition";
-			$resource_reboot_fields["resource_event"]="reboot";
-			$resource->update_info($resource->id, $resource_reboot_fields);
-			
-			break;
-		case "halt":
-			$event->log("openqrm_kvm_resource_virtual_command", $_SERVER['REQUEST_TIME'], 5, "openqrm-kvm-resource-virtual-command-hook.php", "Handling $cmd command", "", "", 0, 0, 0);
-			if ($virtualization->type == "kvm-vm-local") {
-				$virtual_command = "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/kvm/bin/openqrm-kvm-vm stop_by_mac -m ".$resource->mac." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-				$host_resource->send_command($host_resource->ip, $virtual_command);
-			}
-			if($virtualization->type == "kvm-vm-net") {
-				// simply add to cmd queue. do not use resource->send_command(ip, reboot) since this will re-trigger this hook
-				$cmd_token = md5(uniqid(rand(), true));
-				$resource_command = $OPENQRM_SERVER_BASE_DIR."/openqrm/sbin/openqrm-exec -i ".$resource->ip." -t ".$cmd_token." -c halt";
-				shell_exec($resource_command);
-			}
-			if($virtualization->type == "kvm") {
-				// simply add to cmd queue. do not use resource->send_command(ip, reboot) since this will re-trigger this hook
-				$cmd_token = md5(uniqid(rand(), true));
-				$resource_command = $OPENQRM_SERVER_BASE_DIR."/openqrm/sbin/openqrm-exec -i ".$resource->ip." -t ".$cmd_token." -c halt";
-				shell_exec($resource_command);
-			}
-			$resource_reboot_fields=array();
-			$resource_reboot_fields["resource_state"]="off";
-			$resource_reboot_fields["resource_event"]="reboot";
-			$resource->update_info($resource->id, $resource_reboot_fields);
-			break;
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-about-bootservice.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-about-bootservice.tpl.php
deleted file mode 100644
index ec1111b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-about-bootservice.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{boot_service_title}</h3>
-		{boot_service_content}
-	</div>
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-about-documentation.tpl.php
deleted file mode 100644
index 9ebab02..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-about-documentation.tpl.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{introduction_title}</h3>
-		{introduction_content}
-	
-		<h3>{provides_title}</h3>
-		{provides_list}
-	
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-
-	
-	</div>
-	<div class="span2 offset1">
-		<h3>{type_title}</h3>
-		<span class="pill">{type_content}</span>
-	
-		<h3>{deployment_title}</h3>
-		{deployment_content}
-	
-		<h3>{tested_title}</h3>
-		{tested_content}
-
-	</div>
-</div>
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-about-storage.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-about-storage.tpl.php
deleted file mode 100644
index adfa499..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-about-storage.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{storage_mgmt_title}</h3>
-		{storage_mgmt_list}
-	</div>
-</div>
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-about-usage.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-about-usage.tpl.php
deleted file mode 100644
index 443941c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-about-usage.tpl.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<img border=0 src="{baseurl}/plugins/kvm/img/kvm-lvm-deployment.png">
-<hr>
-<img border=0 src="{baseurl}/plugins/kvm/img/kvm-network-deployment.png">
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-about-vms.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-about-vms.tpl.php
deleted file mode 100644
index fa18fbb..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-about-vms.tpl.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{vm_mgmt_title}</h3>
-		{vm_mgmt_list}
-	</div>
-</div>
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-add.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-add.tpl.php
deleted file mode 100644
index 1eb0d04..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-add.tpl.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div id="form">
-	<form action="{thisfile}" method="GET">
-		{form}
-		{name}
-		{type}
-		{size}
-	<div id="buttons">{submit}&#160;{cancel}</div>
-</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-clone.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-clone.tpl.php
deleted file mode 100644
index 760ecb2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-clone.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div id="form">
-	<form action="{thisfile}" method="GET">
-	{form}
-	{name}
-	<!-- {size} //-->
-	<div id="buttons">{submit}&#160;{cancel}</div>
-</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-edit.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-edit.tpl.php
deleted file mode 100644
index 12e455a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-edit.tpl.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-
-<div id="form">
-	<div style="float:left; width:380px; margin: 15px 0 0 15px;">
-		<div><b>{lang_id}</b>: {id}</div>
-		<div><b>{lang_name}</b>: {name}</div>
-		<div><b>{lang_resource}</b>: {resource}</div>
-		<div><b>{lang_deployment}</b>: {deployment}</div>
-		<div><b>{lang_state}</b>: {state}</div>
-	</div>
-	<div style="float:right; margin: 15px 20px 0 0;">
-		<div>{add}</div>
-	</div>
-	<div style="clear:both; margin: 0 0 25px 0;" class="floatbreaker">&#160;</div>
-	{table}
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-remove.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-remove.tpl.php
deleted file mode 100644
index e9a43c0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-remove.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<form action="{thisfile}">
-	<div id="form">
-		{form}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-resize.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-resize.tpl.php
deleted file mode 100644
index c34a7cb..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-resize.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<form action="{thisfile}">
-	<div id="form">
-		{form}
-		{size}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-select.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-select.tpl.php
deleted file mode 100644
index bd68de0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-select.tpl.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-{table}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-snap.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-snap.tpl.php
deleted file mode 100644
index 897ed78..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-snap.tpl.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div id="form">
-	<form action="{thisfile}" method="GET">
-	{form}
-	{name}
-	{size}
-	<div id="buttons">{submit}&#160;{cancel}</div>
-	</form>
-</div>
-
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-add.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-add.tpl.php
deleted file mode 100644
index 436d31a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-add.tpl.php
+++ /dev/null
@@ -1,275 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<script type="text/javascript">
-MousePosition.init();
-function tr_hover() {}
-function tr_click() {}
-var filepicker = {
-	init : function( element ) {
-		this.element = element;
-		mouse = MousePosition.get();
-		document.getElementById('canvas').innerHTML = '<img src="{baseurl}/img/loading.gif" style="margin-top:150px;">';
-		document.getElementById('filepicker').style.left = (mouse.x + -210)+'px';
-		document.getElementById('filepicker').style.top  = (mouse.y - 270)+'px';
-		document.getElementById('filepicker').style.display = 'block';
-		$.ajax({
-			url: "{baseurl}/api.php?action=plugin&plugin=kvm&controller=kvm-vm&path=/&appliance_id={appliance_id}&{actions_name}=filepicker",
-			dataType: "text",
-			success: function(response) {
-				document.getElementById('canvas').innerHTML = response;	
-			}
-		});
-	},
-	browse : function(target) {
-		document.getElementById('canvas').innerHTML = '<img src="{baseurl}/img/loading.gif" style="margin-top:150px;">';
-		$.ajax({
-			url: "{baseurl}/api.php?action=plugin&plugin=kvm&controller=kvm-vm&path="+target+"&appliance_id={appliance_id}&{actions_name}=filepicker",
-			dataType: "text",
-			success: function(response) {
-				document.getElementById('canvas').innerHTML = response;	
-			}
-		});
-	},
-	insert : function(value) {
-		document.getElementById(this.element).value = value;
-		document.getElementById('filepicker').style.display = 'none';
-	}
-}
-
-var passgen = {
-	generate : function() {
-		pass = GeneratePassword();
-		document.getElementById('vnc').value = pass;
-		document.getElementById('vnc_1').value = pass;
-	},
-	toggle : function() {
-		vnc = document.getElementById('vnc');
-		but = document.getElementById('passtoggle');
-		if(vnc.type == 'password') {
-			but.value = "{lang_password_hide}";
-			np = vnc.cloneNode(true);
-			np.type='text';
-			vnc.parentNode.replaceChild(np,vnc);
-		}
-		if(vnc.type == 'text') {
-			but.value = "{lang_password_show}";
-			np = vnc.cloneNode(true);
-			np.type='password';
-			vnc.parentNode.replaceChild(np,vnc);
-		}
-	}
-}
-function namegen() {
-	var name = "";
-	var name_characters = "0123456789";
-	var one_random_char;
-	for (j=0; j<6; j++) {
-		one_random_char = name_characters.charAt(Math.floor(Math.random()*name_characters.length));
-		name += one_random_char;
-	}
-	document.getElementById('name').value = 'kvm'+name;
-}
-</script>
-
-<script>
-	function nettoggle(element) {
-		if(element.checked == false) {
-			document.getElementById(element.name+'box').style.display = 'none';
-		}
-		else {
-			document.getElementById(element.name+'box').style.display = 'block';
-		}
-	}
-</script>
-
-<h2>{label}</h2>
-
-<div id="form">
-	<form action="{thisfile}" method="GET">
-	{form}
-
-	<fieldset>
-		<legend>{lang_basic}</legend>
-			<div class="span8">
-				{name}
-			</div>
-	</fieldset>
-
-	<fieldset>
-		<legend>{lang_hardware}</legend>
-			<div class="span8">
-			{cpus}
-			{memory}
-		</div>
-	</fieldset>
-
-	<fieldset>
-		<legend>{lang_virtual_disk}</legend>
-			<div class="span8">
-				<div style="float:left;">
-					{localboot_image}
-					{netboot_image}
-					{disk_interface}
-				</div>
-				<div style="float:left; width: 250px; margin: 3px 0 0 15px">
-					{add_vm_image}
-				</div>
-				<div class="floatbreaker" style="line-height:0px;height:0px;clear:both;">&nbsp;</div>
-					{cdrom_iso_path}
-					{cdrom_button}
-				<div class="floatbreaker" style="line-height:0px;height:0px;clear:both;">&nbsp;</div>
-			</div>
-	</fieldset>
-	
-	
-	<fieldset>
-		<legend>{lang_net}</legend>
-		<div class="span8">
-			<fieldset>
-				<div style="float:left;">{net0}</div>
-				<div id="net0box" class="netbox">
-					{mac}
-					{bridge}
-					{nic}
-					{ovs_ip0}
-				</div>
-			</fieldset>
-
-			<fieldset>
-				<div style="float:left;">{net1}</div>
-				<div id="net1box" class="netbox">
-					{mac1}
-					{bridge1}
-					{nic1}
-					{ovs_ip1}
-				</div>
-			</fieldset>
-			<script>
-				if(document.getElementById('net1').checked == false) {
-					document.getElementById('net1box').style.display = 'none';
-				}
-			</script>
-
-			<fieldset>
-				<div style="float:left;">{net2}</div>
-				<div id="net2box" class="netbox">
-					{mac2}
-					{bridge2}
-					{nic2}
-					{ovs_ip2}
-				</div>
-			</fieldset>
-			<script>
-				if(document.getElementById('net2').checked == false) {
-					document.getElementById('net2box').style.display = 'none';
-				}
-			</script>
-
-			<fieldset>
-				<div style="float:left;">{net3}</div>
-				<div id="net3box" class="netbox">
-					{mac3}
-					{bridge3}
-					{nic3}
-					{ovs_ip3}
-				</div>
-			</fieldset>
-			<script>
-				if(document.getElementById('net3').checked == false) {
-					document.getElementById('net3box').style.display = 'none';
-				}
-			</script>
-
-			<fieldset>
-				<div style="float:left;">{net4}</div>
-				<div id="net4box" class="netbox">
-					{mac4}
-					{bridge4}
-					{nic4}
-					{ovs_ip4}
-				</div>
-			</fieldset>
-			<script>
-				if(document.getElementById('net4').checked == false) {
-					document.getElementById('net4box').style.display = 'none';
-				}
-			</script>
-		</div>
-	</fieldset>
-
-	<fieldset>
-		<legend>{lang_boot}</legend>
-		<div class="span8">
-			{boot_cd}
-			<div>
-				{boot_iso}
-				{boot_iso_path}
-				{browse_button}
-				<div class="floatbreaker" style="line-height:0px;height:0px;clear:both;">&nbsp;</div>
-			</div>
-			{boot_net}
-			{boot_local}
-		</div>
-	</fieldset>
-
-	<fieldset>
-		<legend>{lang_vnc}</legend>
-		<div class="span8">
-			<div style="float:left;">
-				{vnc}
-				{vnc_1}
-				{vnc_keymap}
-			</div>
-			<div style="float:left; width: 250px; margin: 3px 0 0 15px">
-				<input type="button" id="passgenerate" onclick="passgen.generate(); return false;" class="password-button" value="{lang_password_generate}" style="display:none;"><br>
-				<input type="button" id="passtoggle" onclick="passgen.toggle(); return false;" class="password-button" value="{lang_password_show}" style="display:none;">
-			</div>
-			<div class="floatbreaker" style="line-height:0px;height:0px;clear:both;">&nbsp;</div>
-		</div>
-	</fieldset>
-
-	<div id="buttons">{submit}&#160;{cancel}</div>
-
-	</form>
-</div>
-
-<div id="filepicker" style="display:none;position:absolute;top:15;left:15px;"  class="function-box">
-	<div class="functionbox-capation-box" 
-			id="caption"
-			onclick="MousePosition.init();"
-			onmousedown="Drag.init(document.getElementById('filepicker'));"
-			onmouseup="document.getElementById('filepicker').onmousedown = null;">
-		<div class="functionbox-capation">
-			{lang_browser}
-			<input type="button" id ="close" class="functionbox-closebutton" value="X" onclick="document.getElementById('filepicker').style.display = 'none';">
-		</div>
-	</div>
-	<div id="canvas"></div>
-</div>
-
-
-
-<script type="text/javascript">
-if(document.getElementById('browsebutton')) {
-	document.getElementById('browsebutton').style.display = 'inline';
-}
-if(document.getElementById('cdrom_button')) {
-	document.getElementById('cdrom_button').style.display = 'inline';
-}
-document.getElementById('passgenerate').style.display = 'inline';
-document.getElementById('passtoggle').style.display = 'inline';
-</script>
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-clone.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-clone.tpl.php
deleted file mode 100644
index 60f8a5d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-clone.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}" method="GET">
-	{form}
-	<div id="form">
-		{name}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-edit.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-edit.tpl.php
deleted file mode 100644
index 8ee0b79..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-edit.tpl.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-
-<script type="text/javascript">
-
-var passgen = {
-	toggle : function(id) {
-		vnc_e_id = 'vm_vncpasswd_' + id;
-		pass_e_id = 'passtoggle_' + id;
-		vnc = document.getElementById(vnc_e_id);
-		but = document.getElementById(pass_e_id);
-		if(vnc.type == 'password') {
-			but.value = "{lang_password_hide}";
-			np = vnc.cloneNode(true);
-			np.type='text';
-			vnc.parentNode.replaceChild(np,vnc);
-		}
-		if(vnc.type == 'text') {
-			but.value = "{lang_password_show}";
-			np = vnc.cloneNode(true);
-			np.type='password';
-			vnc.parentNode.replaceChild(np,vnc);
-		}
-	}
-}
-
-</script>
-
-
-<h2>{label}</h2>
-
-<div id="kvm_edit">
-	<div class="row">
-		<div class="span3">
-			<div><b>{lang_id}</b>: {id}</div>
-			<div><b>{lang_name}</b>: {name}</div>
-			<div><b>{lang_resource}</b>: {resource}</div>
-			<div><b>{lang_state}</b>: {state}</div>
-		</div>
-		<div id="addbuttons">
-			{add_local_vm}<br>
-			{add_network_vm}
-		</div>
-	</div>
-	<div style="clear:both;" class="floatbreaker">&#160;</div>
-	{table}
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-migrate.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-migrate.tpl.php
deleted file mode 100644
index a8f50ef..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-migrate.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div id="form">
-	<form action="{thisfile}" method="GET">
-	{form}
-	{target}
-	<div id="buttons">{submit}&#160;{cancel}</div>
-</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-remove.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-remove.tpl.php
deleted file mode 100644
index e9a43c0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-remove.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<form action="{thisfile}">
-	<div id="form">
-		{form}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-select.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-select.tpl.php
deleted file mode 100644
index bd68de0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-select.tpl.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-{table}
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-update.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-update.tpl.php
deleted file mode 100644
index b2b0a77..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-vm-update.tpl.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<script type="text/javascript">
-MousePosition.init();
-function tr_hover() {}
-function tr_click() {}
-var filepicker = {
-	init : function( element ) {
-		this.element = element;
-		mouse = MousePosition.get();
-		document.getElementById('canvas').innerHTML = '<img src="{baseurl}/img/loading.gif" style="margin-top:150px;">';
-		document.getElementById('filepicker').style.left = (mouse.x + -210)+'px';
-		document.getElementById('filepicker').style.top  = (mouse.y - 270)+'px';
-		document.getElementById('filepicker').style.display = 'block';
-		$.ajax({
-			url: "{baseurl}/api.php?action=plugin&plugin=kvm&controller=kvm-vm&path=/&appliance_id={appliance_id}&{actions_name}=filepicker",
-			dataType: "text",
-			success: function(response) {
-				document.getElementById('canvas').innerHTML = response;	
-			}
-		});
-	},
-	browse : function(target) {
-		document.getElementById('canvas').innerHTML = '<img src="{baseurl}/img/loading.gif" style="margin-top:150px;">';
-		$.ajax({
-			url: "{baseurl}/api.php?action=plugin&plugin=kvm&controller=kvm-vm&path="+target+"&appliance_id={appliance_id}&{actions_name}=filepicker",
-			dataType: "text",
-			success: function(response) {
-				document.getElementById('canvas').innerHTML = response;	
-			}
-		});
-	},
-	insert : function(value) {
-		document.getElementById(this.element).value = value;
-		document.getElementById('filepicker').style.display = 'none';
-	}
-}
-
-var passgen = {
-	generate : function() {
-		pass = GeneratePassword();
-		document.getElementById('vnc').value = pass;
-		document.getElementById('vnc_1').value = pass;
-	},
-	toggle : function() {
-		vnc = document.getElementById('vnc');
-		but = document.getElementById('passtoggle');
-		if(vnc.type == 'password') {
-			but.value = "{lang_password_hide}";
-			np = vnc.cloneNode(true);
-			np.type='text';
-			vnc.parentNode.replaceChild(np,vnc);
-		}
-		if(vnc.type == 'text') {
-			but.value = "{lang_password_show}";
-			np = vnc.cloneNode(true);
-			np.type='password';
-			vnc.parentNode.replaceChild(np,vnc);
-		}
-	}
-}
-function namegen() {
-	var name = "";
-	var name_characters = "0123456789";
-	var one_random_char;
-	for (j=0; j<6; j++) {
-		one_random_char = name_characters.charAt(Math.floor(Math.random()*name_characters.length));
-		name += one_random_char;
-	}
-	document.getElementById('name').value = 'kvm'+name;
-}
-</script>
-
-<script>
-	function nettoggle(element) {
-		if(element.checked == false) {
-			document.getElementById(element.name+'box').style.display = 'none';
-		}
-		else {
-			document.getElementById(element.name+'box').style.display = 'block';
-		}
-	}
-</script>
-
-<h2>{label}</h2>
-
-<div id="form">
-	<form action="{thisfile}" method="GET">
-	{form}
-
-	<fieldset>
-		<legend>{lang_basic}</legend>
-			<div class="span8">
-				{name}
-			</div>
-	</fieldset>
-
-	<fieldset>
-		<legend>{lang_hardware}</legend>
-			<div class="span8">
-				{cpus}
-				{memory}
-			</div>
-	</fieldset>
-
-	<fieldset>
-		<legend>{lang_virtual_disk}</legend>
-			<div class="span8">
-				<div style="float:left;">
-					{disk_interface}
-				</div>
-				<div class="floatbreaker" style="line-height:0px;height:0px;clear:both;">&nbsp;</div>
-					{cdrom_iso_path}
-					{cdrom_button}
-				<div class="floatbreaker" style="line-height:0px;height:0px;clear:both;">&nbsp;</div>
-			</div>
-	</fieldset>
-
-	<fieldset>
-		<legend>{lang_net}</legend>
-		<div class="span8">
-			<fieldset>
-				<div style="float:left;">{net0}</div>
-				<div id="net0box" class="netbox">
-					{mac}
-					{bridge}
-					{nic}
-				</div>
-			</fieldset>
-
-			<fieldset>
-				<div style="float:left;">{net1}</div>
-				<div id="net1box" class="netbox">
-					{mac1}
-					{bridge1}
-					{nic1}
-				</div>
-			</fieldset>
-			<script>
-				if(document.getElementById('net1').checked == false) {
-					document.getElementById('net1box').style.display = 'none';
-				}
-			</script>
-
-			<fieldset>
-				<div style="float:left;">{net2}</div>
-				<div id="net2box" class="netbox">
-					{mac2}
-					{bridge2}
-					{nic2}
-				</div>
-			</fieldset>
-			<script>
-				if(document.getElementById('net2').checked == false) {
-					document.getElementById('net2box').style.display = 'none';
-				}
-			</script>
-
-			<fieldset>
-				<div style="float:left;">{net3}</div>
-				<div id="net3box" class="netbox">
-					{mac3}
-					{bridge3}
-					{nic3}
-				</div>
-			</fieldset>
-			<script>
-				if(document.getElementById('net3').checked == false) {
-					document.getElementById('net3box').style.display = 'none';
-				}
-			</script>
-
-			<fieldset>
-				<div style="float:left;">{net4}</div>
-				<div id="net4box" class="netbox">
-					{mac4}
-					{bridge4}
-					{nic4}
-				</div>
-			</fieldset>
-			<script>
-				if(document.getElementById('net4').checked == false) {
-					document.getElementById('net4box').style.display = 'none';
-				}
-			</script>
-		</div>
-	</fieldset>
-
-	<fieldset>
-		<legend>{lang_boot}</legend>
-		<div class="span8">
-			{boot_cd}
-			<div>
-				{boot_iso}
-				{boot_iso_path}
-				{browse_button}
-				<div class="floatbreaker" style="line-height:0px;height:0px;clear:both;">&nbsp;</div>
-			</div>
-			{boot_net}
-			{boot_local}
-		</div>
-	</fieldset>
-
-	<fieldset>
-		<legend>{lang_vnc}</legend>
-		<div class="span8">
-			<div style="float:left;">
-				{vnc}
-				{vnc_1}
-				{vnc_keymap}
-			</div>
-			<div style="float:left; width: 250px; margin: 3px 0 0 15px">
-				<input type="button" id="passgenerate" onclick="passgen.generate(); return false;" class="password-button" value="{lang_password_generate}" style="display:none;"><br>
-				<input type="button" id="passtoggle" onclick="passgen.toggle(); return false;" class="password-button" value="{lang_password_show}" style="display:none;">
-			</div>
-			<div class="floatbreaker" style="line-height:0px;height:0px;clear:both;">&nbsp;</div>
-		</div>
-	</fieldset>
-
-	<div id="buttons">{submit}&#160;{cancel}</div>
-
-	</form>
-</div>
-
-<div id="filepicker" style="display:none;position:absolute;top:15;left:15px;"  class="function-box">
-	<div class="functionbox-capation-box" 
-			id="caption"
-			onclick="MousePosition.init();"
-			onmousedown="Drag.init(document.getElementById('filepicker'));"
-			onmouseup="document.getElementById('filepicker').onmousedown = null;">
-		<div class="functionbox-capation">
-			{lang_browser}
-			<input type="button" id ="close" class="functionbox-closebutton" value="X" onclick="document.getElementById('filepicker').style.display = 'none';">
-		</div>
-	</div>
-	<div id="canvas"></div>
-</div>
-
-
-
-<script type="text/javascript">
-if(document.getElementById('browsebutton')) {
-	document.getElementById('browsebutton').style.display = 'inline';
-}
-if(document.getElementById('cdrom_button')) {
-	document.getElementById('cdrom_button').style.display = 'inline';
-}
-document.getElementById('passgenerate').style.display = 'inline';
-document.getElementById('passtoggle').style.display = 'inline';
-</script>
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-volgroup-ceph.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-volgroup-ceph.tpl.php
deleted file mode 100644
index 7df9467..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-volgroup-ceph.tpl.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div id="form">
-
-	<div style="float:left; width:380px; margin: 15px 0 0 15px;">
-		<div><b>{lang_id}</b>: {id}</div>
-		<div><b>{lang_name}</b>: {name}</div>
-		<div><b>{lang_resource}</b>: {resource}</div>
-		<div><b>{lang_deployment}</b>: {deployment}</div>
-		<div><b>{lang_state}</b>: {state}</div>
-	</div>
-
-	<div style="float: left; margin: 15px 0 0 0;">
-		<div><b>{lang_name}</b>: {volgroup_name}</div>
-		<div><b>{lang_free}</b>: {volgroup_vfree}</div>
-	</div>
-
-
-	<div style="float:right; margin: 15px 20px 0 0;">
-		<div id="add">{add}</div>
-	</div>
-
-	<div style="clear:both; margin: 0 0 25px 0;" class="floatbreaker">&#160;</div>
-	{table}
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-volgroup.tpl.php b/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-volgroup.tpl.php
deleted file mode 100644
index 82e314e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/kvm/web/tpl/kvm-volgroup.tpl.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div id="form">
-
-	<div style="float:left; width:380px; margin: 15px 0 0 15px;">
-		<div><b>{lang_id}</b>: {id}</div>
-		<div><b>{lang_name}</b>: {name}</div>
-		<div><b>{lang_resource}</b>: {resource}</div>
-		<div><b>{lang_deployment}</b>: {deployment}</div>
-		<div><b>{lang_state}</b>: {state}</div>
-	</div>
-
-	<div style="float: left; margin: 15px 0 0 0;">
-		<div><b>{lang_name}</b>: {volgroup_name}</div>
-		<div><b>{lang_attr}</b>: {volgroup_attr}</div>
-		<div><b>{lang_pv}</b>: {volgroup_pv} / {volgroup_lv} / {volgroup_sn}</div>
-		<div><b>{lang_size}</b>: {volgroup_vsize} / {volgroup_vfree}</div>
-	</div>
-
-
-	<div style="float:right; margin: 15px 20px 0 0;">
-		<div id="add">{add}</div>
-	</div>
-
-	<div style="clear:both; margin: 0 0 25px 0;" class="floatbreaker">&#160;</div>
-	{table}
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/Makefile b/openQRM-5.3.50-CE/src/plugins/lcmc/Makefile
deleted file mode 100644
index 63c6e33..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lcmc/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# this is the openQRM lcmc-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-	../../make-assistant openqrm_cache_or_download LCMC-applet etc/build.conf/lcmc.conf
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web/img
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web/lang/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && . etc/build.conf/lcmc.conf && if ! cp $$OPENQRM_BUILD_TMP_DIR/openqrm-build/LCMC-applet/source/LCMC-applet-$$OPENQRM_SOURCE_VERSION.jar $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web/ 2>/dev/null; then cp ../../$$OPENQRM_BUILD_TMP_DIR/openqrm-build/LCMC-applet/source/LCMC-applet-$$OPENQRM_SOURCE_VERSION.jar $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web; fi
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/lcmc
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/lcmc/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/etc/build.conf/lcmc.conf b/openQRM-5.3.50-CE/src/plugins/lcmc/etc/build.conf/lcmc.conf
deleted file mode 100644
index 7d2c505..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lcmc/etc/build.conf/lcmc.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# Below the download locations for third-party components are defined
-# openqrm-plugin-novnc-components.tgz provides a stripped ajaxterm and a
-# static compiled pound as the reverse ssl-proxy
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="1.7.10"
-#OPENQRM_SOURCE_DOWNLOAD="http://downloads.sourceforge.net/project/lcmc/all-releases/LCMC-applet-$OPENQRM_SOURCE_VERSION.jar"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/plugins/lcmc/LCMC-applet-$OPENQRM_SOURCE_VERSION.jar"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/etc/init.d/openqrm-plugin-lcmc b/openQRM-5.3.50-CE/src/plugins/lcmc/etc/init.d/openqrm-plugin-lcmc
deleted file mode 100644
index 79e62ed..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lcmc/etc/init.d/openqrm-plugin-lcmc
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-# init script for the openQRM lcmc plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/include/openqrm-plugin-lcmc-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/etc/openqrm-plugin-lcmc.conf
-
-LCMC_MC_VERSION="1.3.2"
-
-function openqrm_plugin_lcmc_start() {
-	echo "Starting the openQRM lcmc-plugin"
-	openqrm_plugin_lcmc_stop 1>/dev/null 2>&1
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/lcmc/.running
-	return $RET
-}
-
-
-function openqrm_plugin_lcmc_stop() {
-	echo "Stopping the openQRM lcmc-plugin"
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/lcmc/.running
-	return 0
-}
-
-
-function openqrm_plugin_lcmc_init() {
-	echo "Initializing the openQRM lcmc-plugin"
-	# copy lcmc-applet to the cloud
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/user/lcmc/
-	cd $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/user/lcmc/
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web/lcmc-gui.php .
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web/LCMC-applet-"$LCMC_MC_VERSION".jar .
-	cd - 1>/dev/null
-	cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web/img/plugin.png $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/img/ha_console.png
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lcmc/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/lcmc
-	return 0
-}
-
-
-function openqrm_plugin_lcmc_uninstall() {
-	echo "Uninstalling the openQRM lcmc-plugin"
-	openqrm_plugin_lcmc_stop
-	# remove from cloud
-	rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/user/lcmc
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/img/ha_console.png
-	# unlinking the web dir
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/lcmc
-}
-
-
-
-case "$1" in
-	start)
-		openqrm_plugin_lcmc_start
-		;;
-	stop)
-		openqrm_plugin_lcmc_stop
-		;;
-	restart)
-		openqrm_plugin_lcmc_stop
-		sleep 1
-		openqrm_plugin_lcmc_start
-		;;
-	init)
-		openqrm_plugin_lcmc_init
-		;;
-	uninstall)
-		openqrm_plugin_lcmc_uninstall
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/etc/init.d/openqrm-plugin-lcmc.postinstall b/openQRM-5.3.50-CE/src/plugins/lcmc/etc/init.d/openqrm-plugin-lcmc.postinstall
deleted file mode 100644
index 6600602..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lcmc/etc/init.d/openqrm-plugin-lcmc.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-lcmc postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/etc/init.d/openqrm-plugin-lcmc.preremove b/openQRM-5.3.50-CE/src/plugins/lcmc/etc/init.d/openqrm-plugin-lcmc.preremove
deleted file mode 100644
index 41dee99..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lcmc/etc/init.d/openqrm-plugin-lcmc.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-lcmc preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-lcmc stop
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/etc/openqrm-plugin-lcmc.conf b/openQRM-5.3.50-CE/src/plugins/lcmc/etc/openqrm-plugin-lcmc.conf
deleted file mode 100644
index 9bb62dc..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lcmc/etc/openqrm-plugin-lcmc.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-# this is the openQRM-plugin-lcmc info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.1.3"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="Integrates LCMC (<a href='http://lcmc.sourceforge.net/' target='_BLANK'>Linux Cluster Management Console</a>) to manage Service-Highavailability."
-OPENQRM_PLUGIN_TYPE="HA"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES=""
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES=""
-# dirs which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_DIRS=""
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/include/openqrm-plugin-lcmc-functions b/openQRM-5.3.50-CE/src/plugins/lcmc/include/openqrm-plugin-lcmc-functions
deleted file mode 100644
index 8c4d2ea..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lcmc/include/openqrm-plugin-lcmc-functions
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the functions file for the lcmc-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/web/class/lcmc-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/lcmc/web/class/lcmc-about.controller.class.php
deleted file mode 100644
index ea524c4..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lcmc/web/class/lcmc-about.controller.class.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/**
- * lcmc-about Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lcmc_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lcmc_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'lcmc_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'lcmc_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'lcmc_about_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About LCMC',
-		'label' => 'About LCMC',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The lcmc plugin integrates the LCMC (<a href="http://lcmc.sourceforge.net/" target="_BLANK">Linux Cluster Management Console</a> by Rasto Levrinc) into openQRM.
-			It provides a convenient way to configure Highavailability (pacemaker/heartbeat/corosync) for appliactions on Appliances via an intuitive GUI.
-			No manual configuration for this plugin is needed.',
-
-		'requirements_title' => 'Requirements',
-		'requirements_list' => 'none',
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-		'provides_title' => 'Provides',
-		'provides_list' => 'Integrates LCMC (Linux Cluster Management Console)',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Highavailability',
-		'documentation_title' => 'Documentation',
-		'use_case_title' => 'Use-Case',
-	),
-	'usage' => array (
-		'tab' => 'About LCMC',
-		'label' => 'LCMC Use-Cases',
-	),
-
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/lcmc/lang", 'lcmc-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/lcmc/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "documentation";
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-			case 'bootservice':
-				$content[] = $this->bootservice(true);
-			break;
-			case 'vms':
-				$content[] = $this->vms(true);
-			break;
-			case 'usage':
-				$content[] = $this->usage(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About LCMC
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lcmc/class/lcmc-about.documentation.class.php');
-			$controller = new lcmc_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Boot-Service
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function bootservice( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lcmc/class/lcmc-about.bootservice.class.php');
-			$controller = new lcmc_about_bootservice($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['bootservice'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['bootservice']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'bootservice' );
-		$content['onclick'] = false;
-		if($this->action === 'bootservice'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-
-	//--------------------------------------------
-	/**
-	 * About LCMC VM management
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function vms( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lcmc/class/lcmc-about.vms.class.php');
-			$controller = new lcmc_about_vms($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['vms'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['vms']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'vms' );
-		$content['onclick'] = false;
-		if($this->action === 'vms'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-	//--------------------------------------------
-	/**
-	 * About LCMC Use-Cases
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function usage( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lcmc/class/lcmc-about.usage.class.php');
-			$controller = new lcmc_about_usage($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['usage'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['usage']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'usage' );
-		$content['onclick'] = false;
-		if($this->action === 'usage'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/web/class/lcmc-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/lcmc/web/class/lcmc-about.documentation.class.php
deleted file mode 100644
index cdc1fef..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lcmc/web/class/lcmc-about.documentation.class.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * lcmc-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lcmc_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lcmc_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "lcmc_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-
-		$this->basedir    = $this->openqrm->get('basedir');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/lcmc-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['provides_title'], 'provides_title');
-		$t->add($this->lang['provides_list'], 'provides_list');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/web/css/lcmc.css b/openQRM-5.3.50-CE/src/plugins/lcmc/web/css/lcmc.css
deleted file mode 100644
index c87cb02..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lcmc/web/css/lcmc.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/*-Icon classes ----- */
-a.graphs {
-	padding: 0;
-	border: 0px none;
-	width: 32px;
-	height: 32px;
-	display:block;
-	text-align: center;
-	text-decoration: none;
-	line-height: 0px;
-	overflow: hidden;
-	color: transparent;
-}
-a.graphs {
-	background: url('/openqrm/base/plugins/lcmc/img/plugin.png') no-repeat center top;
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/lcmc/web/img/plugin.png
deleted file mode 100644
index ea5a80d..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/lcmc/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/web/lang/de.lcmc-about.ini b/openQRM-5.3.50-CE/src/plugins/lcmc/web/lang/de.lcmc-about.ini
deleted file mode 100644
index 026b4dd..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lcmc/web/lang/de.lcmc-about.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[documentation]
-tab = "Über LCMC"
-label = "Über LCMC"
-introduction_title = "Einleitung"
-introduction_content = "Das 'LCMC' Plugin integriert LCMC (<a href='http://lcmc.sourceforge.net/' target='_BLANK'>Linux Cluster Management Console</a> von Rasto Levrinc).
-	LCMC bietet einen benutzerfreundliche Methode Hochverfügbarkeit (pacemaker/heartbeat/corosync) für Dienste auf dem Server mittels einer intuitiven Benutzeroberfläche zu konfigurieren.
-	Manuelle Konfiguration des Plugins ist nicht nötig."
-
-requirements_title = "Anforderungen"
-requirements_list = "keine"
-tested_title = "Testet mit"
-tested_content = "Diese Plugin ist getestet mit Debian, Ubuntu und CentOS Linux Distributionen"
-
-provides_title = "Bietet"
-provides_list = "Integriert LCMC (Linux Cluster Management Console)"
-
-type_title = "Plugin Typ"
-type_content = "Hochverfügbarkeit"
-
-documentation_title = "Dokumentation"
-use_case_title = "Anwendungsfall"
-
-
-[usage]
-tab = "About LCMC"
-label = "LCMC Anwendungsfälle"
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/web/lang/en.lcmc-about.ini b/openQRM-5.3.50-CE/src/plugins/lcmc/web/lang/en.lcmc-about.ini
deleted file mode 100644
index e20db54..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lcmc/web/lang/en.lcmc-about.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[documentation]
-tab = "About LCMC"
-label = "About LCMC"
-introduction_title = "Introduction"
-introduction_content = "The lcmc plugin integrates the LCMC (<a href='http://lcmc.sourceforge.net/' target='_BLANK'>Linux Cluster Management Console</a> by Rasto Levrinc) into openQRM.
-			It provides a convenient way to configure Highavailability (pacemaker/heartbeat/corosync) for appliactions on Server via an intuitive GUI.
-			No manual configuration for this plugin is needed."
-
-requirements_title = "Requirements"
-requirements_list = "none"
-tested_title = "Tested with"
-tested_content = "This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions."
-provides_title = "Provides"
-provides_list = "Integrates LCMC (Linux Cluster Management Console)"
-type_title = "Plugin Type"
-type_content = "Highavailability"
-documentation_title = "Documentation"
-use_case_title = "Use-Case"
-
-
-[usage]
-tab = "About LCMC"
-label = "LCMC Use-Cases"
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/web/lcmc-action.php b/openQRM-5.3.50-CE/src/plugins/lcmc/web/lcmc-action.php
deleted file mode 100644
index bb2fe15..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lcmc/web/lcmc-action.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/authblocker.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-// filter inputs
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-global $IMAGE_INFO_TABLE;
-global $DEPLOYMENT_INFO_TABLE;
-global $OPENQRM_SERVER_BASE_DIR;
-
-// get params
-$lcmc_command = $request->get('lcmc_command');
-$lcmc_resource_id = $request->get('resource_id');
-$lcmc_resource_ip = $request->get('resource_ip');
-
-// get event + openQRM server
-$event = new event();
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $event;
-
-// user/role authentication
-if ($OPENQRM_USER->role != "administrator") {
-	$event->log("authorization", $_SERVER['REQUEST_TIME'], 1, "lcmc-action", "Un-Authorized access to lcmc-actions from $OPENQRM_USER->name", "", "", 0, 0, 0);
-	exit();
-}
-
-
-$event->log("$lcmc_command", $_SERVER['REQUEST_TIME'], 5, "lcmc-action", "Processing lcmc command $lcmc_command", "", "", 0, 0, 0);
-switch ($lcmc_command) {
-
-	default:
-		$event->log("$lcmc_command", $_SERVER['REQUEST_TIME'], 3, "lcmc-action", "No such lcmc command ($lcmc_command)", "", "", 0, 0, 0);
-		break;
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/web/lcmc-gui.php b/openQRM-5.3.50-CE/src/plugins/lcmc/web/lcmc-gui.php
deleted file mode 100644
index 203a002..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lcmc/web/lcmc-gui.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>openQRM - LCMC Console</title>
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
-<meta http-equiv="content-style-type" content="text/css">
-
-<link rel="stylesheet" media="all" href="/openqrm/base/css/bootstrap/normalize.css" type="text/css">
-
-<!--
-<link rel="stylesheet" media="all" href="css/htmlobject.css" type="text/css">
-<link rel="stylesheet" media="all" href="css/default.css" type="text/css">
-<link rel="stylesheet" href="css/menu.css" type="text/css">
-<link type="text/css" href="/openqrm/base/js/jquery/development-bundle/themes/smoothness/ui.all.css" rel="stylesheet">
-<script src="/openqrm/base/js/jquery/js/jquery-1.3.2.min.js" type="text/javascript"></script>
-<script src="/openqrm/base/js/jquery/js/jquery-ui-1.7.1.custom.min.js" type="text/javascript"></script>
-<script src="/openqrm/base/js/jqClock.min.js" type="text/javascript"></script>
-<script src="/openqrm/base/js/interface/interface.js" type="text/javascript"></script>
-<script src="js/menu.js" type="text/javascript"></script>
--->
-
-</head>
-<body>
-
-
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-?>
-
-
-<applet archive="LCMC-applet-1.7.10.jar"
-	code="lcmc.LCMCApplet"
-	name=LCMCApplet
-	height="700"
-	width="1150"
-	vspace="0"
-	hspace="0">
-	<param name="params" value="--no-plugin-check"/>
-</applet>
-
-
-</body>
-</html>
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/lcmc/web/menu.txt
deleted file mode 100644
index cd964f6..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lcmc/web/menu.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|LCMC
-...|LCMC|index.php?iframe=plugins/lcmc/lcmc-gui.php|Linux Cluster Management Console
-...|About|index.php?plugin=lcmc&controller=lcmc-about|How to use
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/web/openqrm-lcmc-appliance-link-hook.php b/openQRM-5.3.50-CE/src/plugins/lcmc/web/openqrm-lcmc-appliance-link-hook.php
deleted file mode 100644
index 79cd6d2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lcmc/web/openqrm-lcmc-appliance-link-hook.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/htmlobjects/htmlobject.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-
-
-function get_lcmc_appliance_link($appliance_id) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-
-	$p_appliance = new appliance();
-	$p_appliance->get_instance_by_id($appliance_id);
-	$p_resource = new resource();
-	$p_resource->get_instance_by_id($p_appliance->resources);
-	$lcmc_gui="/openqrm/base/plugins/lcmc/lcmc-gui.php";
-	$icon_size = "width='24' height='24'";
-	$icon_title = "Configure appliaction highavailability";
-
-	$html = new htmlobject($OPENQRM_SERVER_BASE_DIR.'/openqrm/web/base/class/htmlobjects');
-	$a = $html->a();
-	$a->label = 'LCMC'; //'<img title="'.$icon_title.'" alt="'.$icon_title.'" $icon_size src="/openqrm/base/plugins/lcmc/img/plugin.png" border=0>';
-	$a->css = 'badge';
-	$a->href = '#';
-	$a->handler = 'onclick="window.open(\''.$lcmc_gui.'\',\'\', \'location=0,status=0,scrollbars=1,width=1150,height=800,left=50,top=50,screenX=50,screenY=50\');return false;"';
-
-	$plugin_link = '';
-	if (strstr($p_appliance->state, "active")) {
-		$plugin_link = $a;
-	}
-	if ($p_resource->id == 0) {
-		$plugin_link = $a;
-	}
-	if ($p_resource->id == '') {
-		$plugin_link = "";
-	}
-
-	return $plugin_link;
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lcmc/web/tpl/lcmc-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/lcmc/web/tpl/lcmc-about-documentation.tpl.php
deleted file mode 100644
index 8c06b78..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lcmc/web/tpl/lcmc-about-documentation.tpl.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{introduction_title}</h3>
-		{introduction_content}
-
-		<h3>{provides_title}</h3>
-		{provides_list}
-	
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-
-	</div>
-	<div class="span2 offset1">
-		<h3>{type_title}</h3>
-		<span class="pill">{type_content}</span>
-
-		<h3>{tested_title}</h3>
-		{tested_content}
-	
-	</div>
-</div>
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/ldap/Makefile b/openQRM-5.3.50-CE/src/plugins/ldap/Makefile
deleted file mode 100644
index 0245fa3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ldap/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/ldap/etc
-	cp etc/openqrm-plugin-ldap.conf /usr/share/openqrm/plugins/ldap/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/ldap/etc/openqrm-plugin-ldap.conf b/openQRM-5.3.50-CE/src/plugins/ldap/etc/openqrm-plugin-ldap.conf
deleted file mode 100644
index b2dda3b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/ldap/etc/openqrm-plugin-ldap.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Central user-management for openQRM, openQRM Cloud and openQRM Enterprise Cloud Zones via LDAP. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="network"
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/Makefile b/openQRM-5.3.50-CE/src/plugins/linuxcoe/Makefile
deleted file mode 100644
index 846bd7f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# this is the openQRM linuxcoe-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-	../../make-assistant openqrm_cache_or_download linuxcoe-sd etc/build.conf/linuxcoe-sd.conf
-	../../make-assistant openqrm_cache_or_download linuxcoe-sd-data-centos etc/build.conf/linuxcoe-sd-data-centos.conf
-	../../make-assistant openqrm_cache_or_download linuxcoe-sd-data-debian etc/build.conf/linuxcoe-sd-data-debian.conf
-	../../make-assistant openqrm_cache_or_download linuxcoe-sd-data-ubuntu etc/build.conf/linuxcoe-sd-data-ubuntu.conf
-	../../make-assistant openqrm_cache_or_download linuxcoe-sd-iso-ubuntu64 etc/build.conf/linuxcoe-sd-iso-ubuntu64.conf
-	../../make-assistant openqrm_cache_or_download linuxcoe-sd-iso-debian64 etc/build.conf/linuxcoe-sd-iso-debian64.conf
-	../../make-assistant openqrm_cache_or_download linuxcoe-sd-iso-centos64 etc/build.conf/linuxcoe-sd-iso-centos64.conf
-	../../make-assistant openqrm_cache_or_download linuxcoe-coe-bootimage etc/build.conf/linuxcoe-coe-bootimage.conf
-
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/linuxcoe $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/init.d/linuxcoe
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/data
-	. $(OPENQRM_SERVER_CONF) && cp etc/templates/data/* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/data/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/osvend.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/templates/osvend.d/* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/osvend.d/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/depots
-	. $(OPENQRM_SERVER_CONF) && cp etc/templates/depots/* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/depots/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/patches
-	. $(OPENQRM_SERVER_CONF) && cp etc/templates/patches/*.diff $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/patches/
-	. $(OPENQRM_SERVER_CONF) && cp etc/templates/linuxcoe* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/img
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/lang/
-	. $(OPENQRM_SERVER_CONF) && chmod 777 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/bin
-	. $(OPENQRM_SERVER_CONF) && cp bin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/bin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/bin/openqrm*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/sbin
-	. $(OPENQRM_SERVER_CONF) && cp sbin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/sbin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/sbin/openqrm*
-	# copy linuxcoe packages, we cannot install here since DESTINATION_DIR won't fit
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/lcoe-install/packages/
-	. $(OPENQRM_SERVER_CONF) && . etc/build.conf/linuxcoe-sd.conf && if ! cp $$OPENQRM_BUILD_TMP_DIR/openqrm-build/linuxcoe-sd/source/linuxcoe-sd-$$OPENQRM_SOURCE_VERSION.tar.gz $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/lcoe-install/packages/ 2>/dev/null; then cp ../../$$OPENQRM_BUILD_TMP_DIR/openqrm-build/linuxcoe-sd/source/linuxcoe-sd-$$OPENQRM_SOURCE_VERSION.tar.gz $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/lcoe-install/packages/; fi
-	. $(OPENQRM_SERVER_CONF) && . etc/build.conf/linuxcoe-sd-data-centos.conf && if ! cp $$OPENQRM_BUILD_TMP_DIR/openqrm-build/linuxcoe-sd-data-centos/source/linuxcoe-sd-data-centos-$$OPENQRM_SOURCE_VERSION.tar.gz $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/lcoe-install/packages/ 2>/dev/null; then cp ../../$$OPENQRM_BUILD_TMP_DIR/openqrm-build/linuxcoe-sd-data-centos/source/linuxcoe-sd-data-centos-$$OPENQRM_SOURCE_VERSION.tar.gz $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/lcoe-install/packages/; fi
-	. $(OPENQRM_SERVER_CONF) && . etc/build.conf/linuxcoe-sd-data-debian.conf && if ! cp $$OPENQRM_BUILD_TMP_DIR/openqrm-build/linuxcoe-sd-data-debian/source/linuxcoe-sd-data-debian-$$OPENQRM_SOURCE_VERSION.tar.gz $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/lcoe-install/packages/ 2>/dev/null; then cp ../../$$OPENQRM_BUILD_TMP_DIR/openqrm-build/linuxcoe-sd-data-debian/source/linuxcoe-sd-data-debian-$$OPENQRM_SOURCE_VERSION.tar.gz $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/lcoe-install/packages/; fi
-	. $(OPENQRM_SERVER_CONF) && . etc/build.conf/linuxcoe-sd-data-centos.conf && if ! cp $$OPENQRM_BUILD_TMP_DIR/openqrm-build/linuxcoe-sd-data-ubuntu/source/linuxcoe-sd-data-ubuntu-$$OPENQRM_SOURCE_VERSION.tar.gz $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/lcoe-install/packages/ 2>/dev/null; then cp ../../$$OPENQRM_BUILD_TMP_DIR/openqrm-build/linuxcoe-sd-data-ubuntu/source/linuxcoe-sd-data-ubuntu-$$OPENQRM_SOURCE_VERSION.tar.gz $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/lcoe-install/packages/; fi
-	. $(OPENQRM_SERVER_CONF) && . etc/build.conf/linuxcoe-sd-iso-centos64.conf && if ! cp $$OPENQRM_BUILD_TMP_DIR/openqrm-build/linuxcoe-sd-iso-centos64/source/*.tar $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/lcoe-install/packages/ 2>/dev/null; then cp ../../$$OPENQRM_BUILD_TMP_DIR/openqrm-build/linuxcoe-sd-iso-centos64/source/*.tar $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/lcoe-install/packages/; fi
-	. $(OPENQRM_SERVER_CONF) && . etc/build.conf/linuxcoe-sd-iso-debian64.conf && if ! cp $$OPENQRM_BUILD_TMP_DIR/openqrm-build/linuxcoe-sd-iso-debian64/source/*.tar $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/lcoe-install/packages/ 2>/dev/null; then cp ../../$$OPENQRM_BUILD_TMP_DIR/openqrm-build/linuxcoe-sd-iso-debian64/source/*.tar $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/lcoe-install/packages/; fi
-	. $(OPENQRM_SERVER_CONF) && . etc/build.conf/linuxcoe-sd-iso-ubuntu64.conf && if ! cp $$OPENQRM_BUILD_TMP_DIR/openqrm-build/linuxcoe-sd-iso-ubuntu64/source/*.tar $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/lcoe-install/packages/ 2>/dev/null; then cp ../../$$OPENQRM_BUILD_TMP_DIR/openqrm-build/linuxcoe-sd-iso-ubuntu64/source/*.tar $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/lcoe-install/packages/; fi
-	. $(OPENQRM_SERVER_CONF) && . etc/build.conf/linuxcoe-coe-bootimage.conf && if ! cp $$OPENQRM_BUILD_TMP_DIR/openqrm-build/linuxcoe-coe-bootimage/source/*.tgz $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/ 2>/dev/null; then cp ../../$$OPENQRM_BUILD_TMP_DIR/openqrm-build/linuxcoe-coe-bootimage/source/*.tgz $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/; fi
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/linuxcoe
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/linuxcoe/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe
-	/bin/rm -f /etc/apache2/conf.d/LinuxCOE-SystemDesigner.conf
-	/bin/rm -f /etc/httpd/conf.d/LinuxCOE-SystemDesigner.conf
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/bin/openqrm-linuxcoe b/openQRM-5.3.50-CE/src/plugins/linuxcoe/bin/openqrm-linuxcoe
deleted file mode 100644
index 3315531..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/bin/openqrm-linuxcoe
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/bash
-# this script provides a guided installation/uninstallation for linuxcoe
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# get the openQRM functions
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-OPENQRM_SOURCE_DIR=$OPENQRM_SERVER_BASE_DIR
-export OPENQRM_SOURCE_DIR
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/include/openqrm-plugin-linuxcoe-functions
-
-LCOE_BASE_VERSION="4"
-LCOE_SUB_VERSION="3"
-LCOE_BASE="linuxcoe-sd-$LCOE_BASE_VERSION.$LCOE_SUB_VERSION.tar.gz"
-LCOE_DISTRIBUTIONS="centos debian ubuntu"
-LCOE_INSTALL_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/linuxcoe-sd"
-LCOE_INSTALL_TMP="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/lcoe-install"
-CURRENT_DIR=`pwd`
-
-
-
-function lcoe_install() {
-
-	linuxcoe_log "> Installing LinuxCOE"
-	# unpack
-	rm -rf $LCOE_INSTALL_TMP/install
-	mkdir -p $LCOE_INSTALL_TMP/install
-	if [ ! -d $LCOE_INSTALL_TMP/install/linuxcoe-sd-$LCOE_BASE_VERSION.$LCOE_SUB_VERSION ]; then
-		tar -C $LCOE_INSTALL_TMP/install -xzf $LCOE_INSTALL_TMP/packages/$LCOE_BASE
-	fi
-	for DIST in $LCOE_DISTRIBUTIONS; do
-		if [ ! -d $LCOE_INSTALL_TMP/install/linuxcoe-sd-data-$DIST-$LCOE_BASE_VERSION.$LCOE_SUB_VERSION ]; then
-			tar -C  $LCOE_INSTALL_TMP/install -xzf $LCOE_INSTALL_TMP/packages/linuxcoe-sd-data-$DIST-$LCOE_BASE_VERSION.$LCOE_SUB_VERSION.tar.gz
-		fi
-	done
-	# LinuxCOE installs well with the defaults on Debian/Ubuntu, for RH/Centos we have to set some configuration env
-	if [ -f /etc/debian_version ]; then
-		LCO_INSTALL_PARAMS=""
-	elif [ -f /etc/redhat-release ]; then
-		LCO_INSTALL_PARAMS="httpdcfgdir=/etc/httpd/conf.d httpd_user=apache httpd_group=apache"
-	elif [ -f /etc/SuSE-release ]; then
-		LCO_INSTALL_PARAMS="httpd_user=wwwrun httpd_group=www"
-	fi
-	cd $LCOE_INSTALL_TMP/install/linuxcoe-sd-$LCOE_BASE_VERSION.$LCOE_SUB_VERSION
-	if [ ! -f $LCOE_INSTALL_TMP/install/linuxcoe-sd-$LCOE_BASE_VERSION.$LCOE_SUB_VERSION/Makefile ]; then
-		./autogen.sh 1>/dev/null
-		export CONFIG_SITE="./config.site"
-		if ! ./configure --prefix=$LCOE_INSTALL_DIR $LCO_INSTALL_PARAMS; then
-			linuxcoe_log "! Error during configure of LinuxCOE. Please check the requirements !"
-			exit 1
-		fi
-	fi
-	make -s
-	make -s install
-	make -s integrate
-	for DIST in $LCOE_DISTRIBUTIONS; do
-		linuxcoe_log "> Installing linuxcoe-sd-data-$DIST"
-		cd $LCOE_INSTALL_TMP/install/linuxcoe-sd-data-$DIST-$LCOE_BASE_VERSION.$LCOE_SUB_VERSION
-		./configure --prefix=$LCOE_INSTALL_DIR $LCO_INSTALL_PARAMS
-		make -s
-		make -s install
-	done
-	# cp all additional iso.tar images
-	/bin/cp -f $LCOE_INSTALL_TMP/packages/*iso.tar $LCOE_INSTALL_DIR/images/
-	# post config
-	/bin/cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/data/* $LCOE_INSTALL_DIR/data/
-	/bin/cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/osvend.d/* $LCOE_INSTALL_DIR/osvend.d/
-	/bin/cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/depots/* $LCOE_INSTALL_DIR/depots/
-	# patches
-	# Centos 6 does not like langsupport in ks
-	if ! grep CentOS $LCOE_INSTALL_DIR/cgi-bin/nph-coe_image 1>/dev/null; then
-		linuxcoe_log "> Patching $LCOE_INSTALL_DIR/cgi-bin/nph-coe_image for CentOS"
-		cd $LCOE_INSTALL_DIR/
-		patch -p0 -i  $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/patches/nph-coe_image.diff
-		cp -af $LCOE_INSTALL_DIR/cgi-bin/nph-coe_image $LCOE_INSTALL_DIR/cgi-bin/nonph-coe_image
-		cd $CURRENT_DIR
-	fi
-	cd $CURRENT_DIR
-	linuxcoe_log "> Installation of LinuxCOE finished successfully"
-}
-
-
-function lcoe_uninstall() {
-	linuxcoe_log "> Un-installing LinuxCOE"
-	rm -f /etc/apache2/conf.d/LinuxCOE-SystemDesigner.conf
-	rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/linuxcoe-sd
-	rm -rf /etc/linuxcoe-sd
-	cd $CURRENT_DIR
-	linuxcoe_log "> Uninstallation of LinuxCOE finished successfully"
-}
-
-
-
-case "$1" in
-	install)
-		LOCK_TIME=`openqrm_lock_queue aquire linuxcoe`
-		trap "openqrm_lock_queue release linuxcoe $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		lcoe_uninstall
-		lcoe_install
-
-		openqrm_lock_queue release linuxcoe $LOCK_TIME
-		trap '' EXIT
-		;;
-	uninstall)
-		LOCK_TIME=`openqrm_lock_queue aquire linuxcoe`
-		trap "openqrm_lock_queue release linuxcoe $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		lcoe_uninstall
-
-		openqrm_lock_queue release linuxcoe $LOCK_TIME
-		trap '' EXIT
-		;;
-		*)
-		echo $"Usage: $0 {install|uninstall}"
-		exit 1
-		;;
-esac
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/bin/openqrm-linuxcoe-autoinstall-client b/openQRM-5.3.50-CE/src/plugins/linuxcoe/bin/openqrm-linuxcoe-autoinstall-client
deleted file mode 100644
index c938ddf..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/bin/openqrm-linuxcoe-autoinstall-client
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-# this script manages the linuxcoe profiles
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_IP=$1
-RESOURCE_ID=$2
-RESOURCE_MAC=$3
-RESOURCE_BASEDIR=$4
-OPENQRM_WEB_PROTOCOL=$5
-
-if [ $# != 5 ]; then
-	echo "This tool automatically install the openQRM Client on a Linux system"
-	echo "Usage: $0 <OPENQRM_SERVER_IP> <RESOURCE_ID> <RESOURCE_MAC> <RESOURCE_BASEDIR> <OPENQRM_WEB_PROTOCOL>"
-	exit 1
-fi
-
-# some defines
-OPENQRM_RESOURCE_PARAMETER_FILE="/var/openqrm/openqrm-resource.conf"
-# be sure cmd output is english
-export LANGUAGE=C
-export LANG=C
-export LC_ALL=C
-# define wget to use with https
-if [ "$OPENQRM_WEB_PROTOCOL" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-
-# checks
-if ! ip a s | grep -i $RESOURCE_MAC &>/dev/null; then
-	echo "ERROR: Mac address $RESOURCE_MAC not found on this system!"
-	exit 1
-fi
-
-# gather resource parameters
-mkdir -p `dirname $OPENQRM_RESOURCE_PARAMETER_FILE`
-if ! wget $WGET_NO_CERT_CHECK -O $OPENQRM_RESOURCE_PARAMETER_FILE "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_id=$RESOURCE_ID&resource_mac=$RESOURCE_MAC"; then
-	echo "ERROR: Could not get the resource parameters from openQRM Server at $OPENQRM_SERVER_IP!"
-	exit 1
-fi
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-
-
-echo "Getting openqrm-client package"
-# run default openqrm-client boot-service
-KERNEL_ARCH=`uname -m`
-if echo $KERNEL_ARCH | grep i.*86 1>/dev/null; then
-	# i386
-	OPENQRM_CLIENT_ARCH=i386
-else
-	OPENQRM_CLIENT_ARCH=$KERNEL_ARCH
-fi
-# find out the short distri name
-if [ -f /etc/debian_version ]; then
-	# debian or ubuntu, try to find out without lsb-release which may not be installed
-	if grep -i ubuntu /etc/apt/sources.list 1>/dev/null; then
-		OPENQRM_SHORT_DISTRI_NAME="ubuntu"
-	else
-		OPENQRM_SHORT_DISTRI_NAME="debian"
-	fi
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_SHORT_DISTRI_NAME="centos"
-fi
-
-cd /
-echo "Getting openqrm-client package"
-if ! wget $WGET_NO_CERT_CHECK -O openqrm-client.tgz "$openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/boot-service/openqrm-client.tgz"; then
-	rm -f openqrm-client.tgz
-	echo "ERROR: Could not download the openqrm-client package from openQRM Server $OPENQRM_SERVER_IP!"
-	exit 1
-fi
-
-tar -xzf openqrm-client.tgz
-rm -f openqrm-client.tgz
-ln -sf $resource_basedir/openqrm/etc/init.d/openqrm-client /etc/init.d/openqrm-client
-export OPENQRM_SERVER_BASE_DIR=$resource_basedir
-. $resource_basedir/openqrm/include/openqrm-functions
-openqrm_chkconfig add openqrm-client
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/bin/openqrm-linuxcoe-manager b/openQRM-5.3.50-CE/src/plugins/linuxcoe/bin/openqrm-linuxcoe-manager
deleted file mode 100644
index a8ad904..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/bin/openqrm-linuxcoe-manager
+++ /dev/null
@@ -1,466 +0,0 @@
-#!/bin/bash
-# this script manages the linuxcoe profiles
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# get the openQRM functions
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-OPENQRM_SOURCE_DIR=$OPENQRM_SERVER_BASE_DIR
-export OPENQRM_SOURCE_DIR
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-# unblock starting command queue early for non-blocking + ui commands
-# only blocking commands
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/include/openqrm-plugin-linuxcoe-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/openqrm-plugin-linuxcoe.conf
-CURRENT_DIR=`pwd`
-
-AUTO_INSTALL_PXE_TEMPLATE_PRESEED="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/linuxcoe-pxe.preseed"
-AUTO_INSTALL_PXE_TEMPLATE_KICKSTART="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/linuxcoe-pxe.kickstart"
-AUTO_INSTALL_PXE_TEMPLATE_AUTOYAST="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/linuxcoe-pxe.autoyast"
-LINUXCOE_INSTALL_LANGUAGE="en"
-
-
-# get the full openQRM-server config
-openqrm_server_get_config
-
-# functions running on the linuxcoe-server
-function linuxcoe_usage() {
-	echo "Usage : $0 transfer_to_linuxcoe -i <resource-ip> -m <resource-mac> -x <resource-id> -n <profile-name>"
-	echo "        $0 take_over_from_linuxcoe -i <resource-ip> -m <resource-mac> -x <resource-id> -n <profile-name>"
-	echo "        $0 set_linuxcoe_client_to_local_boot -m <resource-mac>"
-	echo "        $0 remove -n <profile-name>"
-	echo "        $0 check"
-	echo ""
-	echo "Optional parameters:"
-	echo "             [--openqrm-ui-user <username>]"
-	echo "             [--openqrm-internal-cmd <true/false>]"
-	echo "             [--openqrm-cmd-mode <regular/background/fork>]"
-	exit 1
-}
-
-
-
-FULL_COMMANDLINE="$0 $@"
-LINUXCOE_COMMAND=$1
-shift
-
-while [ $# -ne 0 ]; do
-	case "$1" in
-		-i)
-			PARAM_RESOURCE_IP=$2
-			shift
-			;;
-		-x)
-			PARAM_RESOURCE_ID=$2
-			shift
-			;;
-		-m)
-			PARAM_RESOURCE_MAC=$2
-			shift
-			;;
-		-n)
-			PARAM_PROFILE_NAME=$2
-			shift
-			;;
-		--openqrm-ui-user)
-			OPENQRM_UI_USER=$2
-			shift
-			;;
-		--openqrm-internal-cmd)
-			OPENQRM_INTERNAL_CMD=$2
-			shift
-			;;
-		--openqrm-cmd-mode)
-			OPENQRM_CMD_MODE=$2
-			shift
-			;;
-		*)
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			echo "ERROR: Free commandline arguments are not allowed"
-			linuxcoe_usage
-			;;
-	esac
-	shift
-done
-
-# checks
-if [ "$LINUXCOE_COMMAND" == "" ]; then
-	openqrm_unblock_starting_queue $FULL_COMMANDLINE
-	linuxcoe_usage
-fi
-if [ "$OPENQRM_UI_USER" != "" ]; then
-	OPENQRM_UI_USER_PARAMETER=" --openqrm-ui-user $OPENQRM_UI_USER"
-fi
-
-# main
-case "$LINUXCOE_COMMAND" in
-	check)
-		LOCK_TIME=`openqrm_lock_queue aquire linuxcoe`
-		trap "openqrm_lock_queue release linuxcoe $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# first check that the nfs export is ready
-		if ! grep ^$LINUXCOE_ISO_DIRECTORY $NFSEXPORTS 1>/dev/null 2>&1; then
-			if [ ! -d "$LINUXCOE_ISO_DIRECTORY" ]; then
-				mkdir -p $LINUXCOE_ISO_DIRECTORY
-			fi
-			echo "$LINUXCOE_ISO_DIRECTORY *(rw,insecure,no_root_squash,async)" >> $NFSEXPORTS
-			if [ -x /etc/init.d/nfs ]; then
-				/etc/init.d/nfs reload
-			elif [ -x /etc/init.d/nfs-kernel-server ]; then
-				/etc/init.d/nfs-kernel-server reload
-			elif [ -x /etc/init.d/nfsserver ]; then
-				/etc/init.d/nfsserver reload
-			else
-				openqrm_post_event 0 "reload-nfs" 3 "linuxcoe" "Could not find nfs-server init script!"
-			fi
-		fi
-		linuxcoe_log "Checking for unpacked profiles ..."
-
-		for FILE in `file $LINUXCOE_SYSTEMDESIGNER_DIR/* | grep ISO | cut -d':' -f1`; do
-			FILENAME=`basename $FILE`
-			if [ ! -d $LINUXCOE_PROFILE_DIR/$FILENAME ]; then
-				linuxcoe_log "Unpacking $FILE..."
-				MOUNTPOINT=`mktemp -d /tmp/$FILENAME.XXXXXXXXXX` || exit 1
-				if ! mount -o loop $FILE $MOUNTPOINT; then
-					openqrm_post_event 0 "check" 3 "linuxcoe" "ERROR: Could not loop mount $FILE at $MOUNTPOINT!"
-					continue
-				fi
-				mkdir -p $LINUXCOE_PROFILE_DIR/$FILENAME
-				/bin/cp -aRv $MOUNTPOINT/* $LINUXCOE_PROFILE_DIR/$FILENAME/
-				# create the info file for the comments
-				touch $LINUXCOE_PROFILE_DIR/$FILENAME/openqrm.info
-				chmod 777 $LINUXCOE_PROFILE_DIR/$FILENAME/openqrm.info
-				# create the custom post file
-				touch $LINUXCOE_PROFILE_DIR/$FILENAME/custom-post.info
-				chmod 777 $LINUXCOE_PROFILE_DIR/$FILENAME/custom-post.info
-				umount $MOUNTPOINT
-				# add to nfs-export
-				cp -f $LINUXCOE_SYSTEMDESIGNER_DIR/$FILENAME $LINUXCOE_ISO_DIRECTORY/
-			else
-				if [ ! -f $LINUXCOE_PROFILE_DIR/$FILENAME/custom-post.info ]; then
-					touch $LINUXCOE_PROFILE_DIR/$FILENAME/custom-post.info
-					chmod 777 $LINUXCOE_PROFILE_DIR/$FILENAME/custom-post.info
-				fi
-			fi
-		done
-		mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/stat/
-		touch $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/stat/check
-		chmod -R 777 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/stat/
-
-		openqrm_lock_queue release linuxcoe $LOCK_TIME
-		trap '' EXIT
-		;;
-
-	remove)
-		if [ "$PARAM_PROFILE_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			linuxcoe_usage
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire linuxcoe`
-		trap "openqrm_lock_queue release linuxcoe $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		linuxcoe_log "Removing profile $PARAM_PROFILE_NAME"
-		if [ -d "$LINUXCOE_PROFILE_DIR/$PARAM_PROFILE_NAME" ]; then
-			rm -rf "$LINUXCOE_PROFILE_DIR/$PARAM_PROFILE_NAME"
-		fi
-		if [ -f "$LINUXCOE_SYSTEMDESIGNER_DIR/$PARAM_PROFILE_NAME" ]; then
-			rm -f "$LINUXCOE_SYSTEMDESIGNER_DIR/$PARAM_PROFILE_NAME"
-		fi
-		if [ -f "$LINUXCOE_ISO_DIRECTORY/$PARAM_PROFILE_NAME" ]; then
-			rm -f "$LINUXCOE_ISO_DIRECTORY/$PARAM_PROFILE_NAME"
-		fi
-
-		openqrm_lock_queue release linuxcoe $LOCK_TIME
-		trap '' EXIT
-		;;
-
-	transfer_to_linuxcoe)
-		if [ "$PARAM_PROFILE_NAME" == "" ] || [ "$PARAM_RESOURCE_ID" == "" ] || [ "$PARAM_RESOURCE_IP" == "" ] || [ "$PARAM_RESOURCE_MAC" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			linuxcoe_usage
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire linuxcoe`
-		trap "openqrm_lock_queue release linuxcoe $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		linuxcoe_log "Applying profile $PARAM_PROFILE_NAME to resource $PARAM_RESOURCE_ID ($PARAM_RESOURCE_IP/$PARAM_RESOURCE_MAC)"
-		RESOURCE_PXELINUXCFG_FILE=`echo 01-$PARAM_RESOURCE_MAC | sed -e "s/:/-/g" | tr '[:upper:]' '[:lower:]'`
-		/bin/cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE.lcoe-$PARAM_PROFILE_NAME
-
-		# check which auto-install method to use
-		if [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/profiles/$PARAM_PROFILE_NAME/preseed ]; then
-			AUTO_INSTALL_METHOD="preseed"
-		elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/profiles/$PARAM_PROFILE_NAME/ks.cfg ]; then
-			AUTO_INSTALL_METHOD="kickstart"
-		elif grep autoyast $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/profiles/$PARAM_PROFILE_NAME/isolinux.cfg 1>/dev/null; then
-			AUTO_INSTALL_METHOD="autoyast"
-		else
-			linuxcoe_log "ERROR: Could not find out which Auto-install method to use. Exiting."
-
-			openqrm_lock_queue release linuxcoe $LOCK_TIME
-			trap '' EXIT
-
-			exit 1
-		fi
-
-		case "$AUTO_INSTALL_METHOD" in
-			preseed)
-					linuxcoe_log "Using Automatic installation method $AUTO_INSTALL_METHOD."
-					DEBIAN_NETINSTALL_KERNEL="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/profiles/$PARAM_PROFILE_NAME/linux"
-					DEBIAN_NETINSTALL_INITRD="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/profiles/$PARAM_PROFILE_NAME/initrd.gz"
-					# prepare kernel + initrd for the aut-install
-					if [ ! -f $DEBIAN_NETINSTALL_KERNEL ]; then
-						linuxcoe_log "ERROR: Could not find Debian auto-install kernel $DEBIAN_NETINSTALL_KERNEL"
-
-						openqrm_lock_queue release linuxcoe $LOCK_TIME
-						trap '' EXIT
-
-						exit 1
-					fi
-					if [ ! -f $DEBIAN_NETINSTALL_INITRD ]; then
-						linuxcoe_log "ERROR: Could not find Debian auto-install initrd $DEBIAN_NETINSTALL_INITRD"
-
-						openqrm_lock_queue release linuxcoe $LOCK_TIME
-						trap '' EXIT
-
-						exit 1
-					fi
-					/bin/cp -f $DEBIAN_NETINSTALL_KERNEL $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/vmlinuz-$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME
-					/bin/cp -f $DEBIAN_NETINSTALL_INITRD $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/initrd-$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME.img
-
-					# prepare the auto-install pxe boot
-					cat $AUTO_INSTALL_PXE_TEMPLATE_PRESEED | \
-						sed -e "s#@@OPENQRM_BOOTIMAGE_KERNEL@@#vmlinuz-$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME#g"	| \
-						sed -e "s#@@OPENQRM_BOOTIMAGE_INITRD@@#initrd-$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME.img#g"	| \
-						sed -e "s#@@LINUXCOE_INSTALL_LANGUAGE@@#$LINUXCOE_INSTALL_LANGUAGE#g"	| \
-						sed -e "s#@@OPENQRM_SERVER_IP_ADDRESS@@#$OPENQRM_SERVER_IP_ADDRESS#g"	| \
-						sed -e "s#@@LINUXCOE_PROFILE_NAME@@#$PARAM_PROFILE_NAME#g"	| \
-						sed -e "s#@@OPENQRM_RESOURCE_ID@@#$PARAM_RESOURCE_ID#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-
-					linuxcoe_log "Prepared resources pxe-configuration for the automatic installation ($OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE)"
-					# copy the preseed config to the boot-service dir
-					mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/lcoe
-					/bin/cp -f $LINUXCOE_PROFILE_DIR/$PARAM_PROFILE_NAME/preseed $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/lcoe/preseed.$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME.cfg
-
-					# add the custom post section
-					if [ -f $LINUXCOE_PROFILE_DIR/$PARAM_PROFILE_NAME/custom-post.info ]; then
-						/bin/cp -f $LINUXCOE_PROFILE_DIR/$PARAM_PROFILE_NAME/custom-post.info $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/lcoe/custom-post.info.$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME
-					fi
-
-					# add custom late_command for preseed to auto-install openQRM client
-					sed -i -e "s#.*late_command.*##g" $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/lcoe/preseed.$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME.cfg
-					echo "d-i preseed/late_command string wget http://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/lcoe/openqrm-linuxcoe-autoinstall-client && chmod +x ./openqrm-linuxcoe-autoinstall-client && mv -f openqrm-linuxcoe-autoinstall-client /target && if [ ! -e /target/proc/uptime ]; then mount -t proc proc /target/proc; touch /umount_proc; fi && chroot /target ./openqrm-linuxcoe-autoinstall-client $OPENQRM_SERVER_IP_ADDRESS $PARAM_RESOURCE_ID $PARAM_RESOURCE_MAC $OPENQRM_SERVER_BASE_DIR $OPENQRM_WEB_PROTOCOL && wget http://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/lcoe/custom-post.info.$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME && chmod +x custom-post.info.$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME && mv -f custom-post.info.$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME /target && chroot /target ./custom-post.info.$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME && if [ -e /umount_proc ]; then umount /target/proc; rm -f /umount_proc; fi" >> $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/lcoe/preseed.$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME.cfg
-					# allow to use weak passwords, linuxcoe does only allow 8 chars
-					echo "d-i user-setup/allow-password-weak boolean true" >> $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/lcoe/preseed.$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME.cfg
-					echo "d-i user-setup/encrypt-home boolean false" >> $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/lcoe/preseed.$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME.cfg
-					;;
-
-
-			kickstart)
-					linuxcoe_log "Using Automatic installation method $AUTO_INSTALL_METHOD."
-					# copy the kickstart config to the boot-service dir early
-					mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/lcoe
-					PKS="$OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/lcoe/ks.$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME.cfg"
-					/bin/cp -f $LINUXCOE_PROFILE_DIR/$PARAM_PROFILE_NAME/ks.cfg $PKS
-
-					# adapt ks, remove motd msg + add post
-					cat $PKS | grep useradd > $PKS.useradd
-					sed -i -e "s#.*/etc/motd.*##g" $PKS
-					sed -i -e "s#.*useradd.*##g" $PKS
-					sed -i -e "s#^%post.*##g" $PKS
-					echo "%post" >> $PKS
-					echo "#!/bin/bash" >> $PKS
-					echo "wget http://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/lcoe/openqrm-linuxcoe-autoinstall-client" >> $PKS
-					echo "chmod +x ./openqrm-linuxcoe-autoinstall-client" >> $PKS
-					echo "mount -t proc proc /proc" >> $PKS
-					echo "./openqrm-linuxcoe-autoinstall-client $OPENQRM_SERVER_IP_ADDRESS $PARAM_RESOURCE_ID $PARAM_RESOURCE_MAC $OPENQRM_SERVER_BASE_DIR $OPENQRM_WEB_PROTOCOL" >> $PKS
-					echo "umount /proc" >> $PKS
-					# add the custom post section
-					if [ -f $LINUXCOE_PROFILE_DIR/$PARAM_PROFILE_NAME/custom-post.info ]; then
-						cat $LINUXCOE_PROFILE_DIR/$PARAM_PROFILE_NAME/custom-post.info >> $PKS
-					fi
-					cat $PKS.useradd >> $PKS
-					rm -f $PKS.useradd
-					# add to install section
-					grep ^%packages -B 1000 $PKS | grep -v ^%packages > $PKS.firstpart
-					grep ^%packages -A 1000 $PKS > $PKS.secondpart
-					echo "text" > $PKS.addtoinstall
-					echo "selinux --disabled" >> $PKS.addtoinstall
-					echo "firewall --disabled" >> $PKS.addtoinstall
-					echo "reboot" >> $PKS.addtoinstall
-					echo "" >> $PKS.addtoinstall
-					echo "" >> $PKS.addtoinstall
-					cat $PKS.firstpart $PKS.addtoinstall $PKS.secondpart > $PKS
-					rm -f $PKS.firstpart $PKS.addtoinstall $PKS.secondpart
-
-					# prepare kernel + initrd for the auto-install
-					KICKSTART_KERNEL="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/profiles/$PARAM_PROFILE_NAME/isolinux/vmlinuz"
-					KICKSTART_INITRD="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/profiles/$PARAM_PROFILE_NAME/isolinux/initrd.img"
-					if [ ! -f $KICKSTART_KERNEL ]; then
-						linuxcoe_log "ERROR: Could not find kickstart auto-install kernel $KICKSTART_KERNEL"
-
-						openqrm_lock_queue release linuxcoe $LOCK_TIME
-						trap '' EXIT
-
-						exit 1
-					fi
-					if [ ! -f $KICKSTART_INITRD ]; then
-						linuxcoe_log "ERROR: Could not find kickstart auto-install initrd $KICKSTART_INITRD"
-
-						openqrm_lock_queue release linuxcoe $LOCK_TIME
-						trap '' EXIT
-
-						exit 1
-					fi
-					/bin/cp -f $KICKSTART_KERNEL $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/vmlinuz-$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME
-					/bin/cp -f $KICKSTART_INITRD $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/initrd-$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME.img
-
-					# prepare the auto-install pxe boot
-					cat $AUTO_INSTALL_PXE_TEMPLATE_KICKSTART | \
-						sed -e "s#@@OPENQRM_BOOTIMAGE_KERNEL@@#vmlinuz-$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME#g"	| \
-						sed -e "s#@@OPENQRM_BOOTIMAGE_INITRD@@#initrd-$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME.img#g"	| \
-						sed -e "s#@@LINUXCOE_INSTALL_LANGUAGE@@#$LINUXCOE_INSTALL_LANGUAGE#g"	| \
-						sed -e "s#@@OPENQRM_SERVER_IP_ADDRESS@@#$OPENQRM_SERVER_IP_ADDRESS#g"	| \
-						sed -e "s#@@LINUXCOE_PROFILE_NAME@@#$PARAM_PROFILE_NAME#g"	| \
-						sed -e "s#@@PARAM_RESOURCE_MAC@@#$PARAM_RESOURCE_MAC#g"	| \
-						sed -e "s#@@OPENQRM_RESOURCE_ID@@#$PARAM_RESOURCE_ID#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-
-					linuxcoe_log "Prepared resources pxe-configuration for the automatic installation ($OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE)"
-
-
-					;;
-
-			autoyast)
-
-					linuxcoe_log "Automatic installation method $AUTO_INSTALL_METHOD not supported yet."
-
-					;;
-
-			*)
-					linuxcoe_log "Automatic installation method $AUTO_INSTALL_METHOD not supported yet."
-
-					openqrm_lock_queue release linuxcoe $LOCK_TIME
-					trap '' EXIT
-
-					exit 1
-					;;
-		esac
-
-		openqrm_lock_queue release linuxcoe $LOCK_TIME
-		trap '' EXIT
-
-		# wait for reboot of the resource
-		sleep $OPENQRM_PLUGIN_LINUXCOE_INSTALL_START_DELAY
-		# revert pxe config
-		$0 take_over_from_linuxcoe -n $PARAM_PROFILE_NAME -x $PARAM_RESOURCE_ID -i $PARAM_RESOURCE_IP -m $PARAM_RESOURCE_MAC --openqrm-internal-cmd true
-		# set the clients pxe config to local-boot
-		RESOURCE_PXELINUXCFG_FILE=`echo 01-$PARAM_RESOURCE_MAC | sed -e "s/:/-/g" | tr '[:upper:]' '[:lower:]'`
-		sed -i -e "s/^default.*/default local/g" $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-		chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-
-		# start the openqrm-linuxcoe-monitord to send transaction state to openQRM
-		$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/sbin/openqrm-linuxcoe-monitord $PARAM_RESOURCE_ID $PARAM_RESOURCE_MAC
-		;;
-
-	take_over_from_linuxcoe)
-		if [ "$PARAM_PROFILE_NAME" == "" ] || [ "$PARAM_RESOURCE_ID" == "" ] || [ "$PARAM_RESOURCE_IP" == "" ] || [ "$PARAM_RESOURCE_MAC" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			linuxcoe_usage
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire linuxcoe`
-		trap "openqrm_lock_queue release linuxcoe $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		linuxcoe_log "Reverting profile $PARAM_PROFILE_NAME to resource $PARAM_RESOURCE_ID ($PARAM_RESOURCE_IP/$PARAM_RESOURCE_MAC)"
-		RESOURCE_PXELINUXCFG_FILE=`echo 01-$PARAM_RESOURCE_MAC | sed -e "s/:/-/g" | tr '[:upper:]' '[:lower:]'`
-		/bin/mv -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE.lcoe-$PARAM_PROFILE_NAME $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-		# set the clients pxe config to net-boot, this is for appliance stop
-		sed -i -e "s/^default.*/default linux/g" $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-		chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-
-		# clean-up kernel + initrd
-		rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/vmlinuz-$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME
-		rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot/initrd-$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME.img
-
-		# check which auto-install method was used
-		if [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/profiles/$PARAM_PROFILE_NAME/preseed ]; then
-			AUTO_INSTALL_METHOD="preseed"
-		elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/profiles/$PARAM_PROFILE_NAME/ks.cfg ]; then
-			AUTO_INSTALL_METHOD="kickstart"
-		elif grep autoyast $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/profiles/$PARAM_PROFILE_NAME/isolinux.cfg 1>/dev/null; then
-			AUTO_INSTALL_METHOD="autoyast"
-		else
-			linuxcoe_log "ERROR: Could not find out which Auto-install method to use. Exiting."
-
-			openqrm_lock_queue release linuxcoe $LOCK_TIME
-			trap '' EXIT
-
-			exit 1
-		fi
-		case "$AUTO_INSTALL_METHOD" in
-			preseed)
-				rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/lcoe/preseed.$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME.cfg
-				;;
-			kickstart)
-				rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/lcoe/ks.$PARAM_RESOURCE_ID-$PARAM_PROFILE_NAME.cfg
-				;;
-			autoyast)
-				linuxcoe_log "Automatic installation method $AUTO_INSTALL_METHOD not supported yet."
-				;;
-
-			*)
-				linuxcoe_log "Automatic installation method $AUTO_INSTALL_METHOD not supported yet."
-
-				openqrm_lock_queue release linuxcoe $LOCK_TIME
-				trap '' EXIT
-
-				exit 1
-				;;
-		esac
-
-		openqrm_lock_queue release linuxcoe $LOCK_TIME
-		trap '' EXIT
-		;;
-
-
-	set_linuxcoe_client_to_local_boot)
-		if [ "$PARAM_RESOURCE_MAC" == "" ]; then
-			linuxcoe_usage
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire linuxcoe`
-		trap "openqrm_lock_queue release linuxcoe $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		echo "NOTICE: Setting resource $PARAM_RESOURCE_MAC to local-boot."
-		# set the clients pxe config to local-boot, this is for appliance start
-		RESOURCE_PXELINUXCFG_FILE=`echo 01-$PARAM_RESOURCE_MAC | sed -e "s/:/-/g" | tr '[:upper:]' '[:lower:]'`
-		sed -i -e "s/^default.*/default local/g" $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-		chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.cfg/$RESOURCE_PXELINUXCFG_FILE
-
-		openqrm_lock_queue release linuxcoe $LOCK_TIME
-		trap '' EXIT
-		;;
-
-esac
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-coe-bootimage.conf b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-coe-bootimage.conf
deleted file mode 100644
index d5067e0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-coe-bootimage.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="4.3"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/plugins/linuxcoe/coe_bootimage_$OPENQRM_SOURCE_VERSION.pachted.tgz"
-OPENQRM_SOURCE_BINARY_RESULT=""
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-data-centos.conf b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-data-centos.conf
deleted file mode 100644
index 4717b81..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-data-centos.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="4.3"
-#OPENQRM_SOURCE_DOWNLOAD="http://www.instalinux.com/snapshots/linuxcoe-sd-data-centos-$OPENQRM_SOURCE_VERSION.tar.gz"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/plugins/linuxcoe/linuxcoe-sd-data-centos-$OPENQRM_SOURCE_VERSION.tar.gz"
-OPENQRM_SOURCE_BINARY_RESULT=""
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-data-debian.conf b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-data-debian.conf
deleted file mode 100644
index c70bda5..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-data-debian.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="4.3"
-#OPENQRM_SOURCE_DOWNLOAD="http://www.instalinux.com/snapshots/linuxcoe-sd-data-debian-$OPENQRM_SOURCE_VERSION.tar.gz"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/plugins/linuxcoe/linuxcoe-sd-data-debian-$OPENQRM_SOURCE_VERSION.tar.gz"
-OPENQRM_SOURCE_BINARY_RESULT=""
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-data-ubuntu.conf b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-data-ubuntu.conf
deleted file mode 100644
index 63b8174..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-data-ubuntu.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="4.3"
-#OPENQRM_SOURCE_DOWNLOAD="http://www.instalinux.com/snapshots/linuxcoe-sd-data-ubuntu-$OPENQRM_SOURCE_VERSION.tar.gz"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/plugins/linuxcoe/linuxcoe-sd-data-ubuntu-$OPENQRM_SOURCE_VERSION.tar.gz"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-iso-centos64.conf b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-iso-centos64.conf
deleted file mode 100644
index 2e6d4a9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-iso-centos64.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="4.3"
-#OPENQRM_SOURCE_DOWNLOAD="http://www.instalinux.com/snapshots/images/CentOS-6-x86_64-iso.tar"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/plugins/linuxcoe/update/CentOS-6-x86_64-iso.tar"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-iso-debian64.conf b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-iso-debian64.conf
deleted file mode 100644
index 5314d27..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-iso-debian64.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="4.3"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/plugins/linuxcoe/update/Debian-Wheezy-x86_64-iso.tar"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-iso-ubuntu64.conf b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-iso-ubuntu64.conf
deleted file mode 100644
index 9aa4d92..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd-iso-ubuntu64.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="4.3"
-#OPENQRM_SOURCE_DOWNLOAD="http://www.instalinux.com/snapshots/images/Ubuntu-Precise-x86_64-iso.tar"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/plugins/linuxcoe/update/Ubuntu-Trusty-x86_64-iso.tar"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd.conf b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd.conf
deleted file mode 100644
index 78aaeb2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/build.conf/linuxcoe-sd.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="4.3"
-#OPENQRM_SOURCE_DOWNLOAD="http://www.instalinux.com/snapshots/linuxcoe-sd-$OPENQRM_SOURCE_VERSION.tar.gz"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/plugins/linuxcoe/linuxcoe-sd-$OPENQRM_SOURCE_VERSION.tar.gz"
-OPENQRM_SOURCE_BINARY_RESULT=""
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/init.d/linuxcoe b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/init.d/linuxcoe
deleted file mode 100644
index 001eb29..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/init.d/linuxcoe
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-# this is the boot-service init script for the linuxcoe resources
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-# for including the package functions
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-OPENQRM_SERVER_IP=$resource_openqrmserver
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-# do not run on idle resources
-if [ "$resource_image" == "idle" ]; then
-	exit 0
-fi
-
-
-function linuxcoe_start() {
-	echo "Starting the openQRM linuxcoe-plugin"
-	linuxcoe_stop 1>/dev/null 2>&1
-	return 0
-}
-
-
-function linuxcoe_stop() {
-	echo "Stopping the openQRM linuxcoe-plugin"
-	return 0
-}
-
-
-
-
-
-case "$1" in
-	start)
-		linuxcoe_start
-		;;
-	stop)
-		linuxcoe_stop
-		;;
-	restart)
-		linuxcoe_stop
-		sleep 1
-		linuxcoe_start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/init.d/openqrm-plugin-linuxcoe b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/init.d/openqrm-plugin-linuxcoe
deleted file mode 100644
index de2617c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/init.d/openqrm-plugin-linuxcoe
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/bin/bash
-# init script for the openQRM linuxcoe-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/include/openqrm-plugin-linuxcoe-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/openqrm-plugin-linuxcoe.conf
-# get the ip config
-openqrm_server_get_config
-export resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-export LANG=C
-# define wget to use with https
-if [ "$OPENQRM_WEB_PROTOCOL" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-function openqrm_plugin_linuxcoe_start() {
-	echo "Starting the openQRM linuxcoe-plugin"
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/linuxcoe/.running
-}
-
-
-function openqrm_plugin_linuxcoe_stop() {
-	echo "Stopping the openQRM linuxcoe-plugin"
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/linuxcoe/.running
-}
-
-function openqrm_plugin_linuxcoe_uninstall() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "linuxcoe: Please give a username to uninstall the plugin : "
-		read USERNAME
-		echo
-		echo -n "linuxcoe: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Uninstalling the openQRM linuxcoe-plugin"
-	openqrm_plugin_linuxcoe_stop
-	openqrm_server_remove_deployment_type $USERNAME $PASSWORD linuxcoe-deployment
-	# removing the tables
-	if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$USERNAME --http-password=$PASSWORD "$OPENQRM_WEB_PROTOCOL://localhost/openqrm/base/plugins/linuxcoe/linuxcoe-action.php?linuxcoe_command=uninstall"; then
-		linuxcoe_log init "ERROR: Could not remove the linuxcoe plugin tables in the database!"
-	fi
-	# uninstall linuxcoe
-	if ! $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/bin/openqrm-linuxcoe uninstall; then
-		linuxcoe_log init "ERROR: Could not uninstall LinuxCOE!"
-	fi
-
-
-	if [ -f /etc/debian_version ]; then
-		OPENQRM_WEBSERVER_CONFIG_DIR=/etc/apache2/conf.d
-	elif [ -f /etc/redhat-release ]; then
-		OPENQRM_WEBSERVER_CONFIG=/etc/httpd/conf.d
-	elif [ -f /etc/SuSE-release ]; then
-		OPENQRM_WEBSERVER_CONFIG_DIR=/etc/apache2/conf.d
-	fi
-
-	if [ -e $OPENQRM_WEBSERVER_CONFIG_DIR/LinuxCOE-SystemDesigner.conf ]; then
-		rm -f $OPENQRM_WEBSERVER_CONFIG_DIR/LinuxCOE-SystemDesigner.conf
-		openqrm_webserver reload
-	fi
-
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/lock/install-lock
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/linuxcoe
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.linuxcoe-deployment.php
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/template.linuxcoe-deployment.php
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-linuxcoe.tgz
-
-}
-
-function openqrm_plugin_linuxcoe_init() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "linuxcoe: Please give a username to init the plugin : "
-		read USERNAME
-		echo
-		echo -n "linuxcoe: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Initializing the openQRM linuxcoe-plugin"
-	openqrm_server_add_deployment_type $USERNAME $PASSWORD linuxcoe-deployment linuxcoe-deployment "Automatic Linux Installation (LinuxCOE)" linuxcoe "Physical local disk (LinuxCOE)"
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/linuxcoe
-	# creating the tables
-	if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$USERNAME --http-password=$PASSWORD "$OPENQRM_WEB_PROTOCOL://localhost/openqrm/base/plugins/linuxcoe/linuxcoe-action.php?linuxcoe_command=init"; then
-		linuxcoe_log init "ERROR: Could not create the linuxcoe plugin tables in the database!"
-		rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/linuxcoe
-		exit 1
-	fi
-	a2enmod cgi
-	openqrm_webserver reload
-	# install linuxcoe
-	if ! $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/bin/openqrm-linuxcoe install; then
-		linuxcoe_log init "ERROR: Could not install LinuxCOE!"
-	fi
-
-	# fix 1 for >= Ubuntu 14.04 - apache options
-	sed -i -e "s/Options ExecCGI -MultiViews SymLinksIfOwnerMatch/Options ExecCGI SymLinksIfOwnerMatch/g" $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/linuxcoe-sd/etc/includes/LinuxCOE-SystemDesigner.conf
-	openqrm_webserver reload
-
-	# fix 1 for >= Ubuntu 14.04 - coe_bootimage perl stricts errors
-	if ! $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/linuxcoe-sd/cgi-bin/coe_bootimage 2>/dev/null; then
-		if [ ! -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/linuxcoe-sd/cgi-bin/coe_bootimage.original ]; then
-			echo "- backing up $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/linuxcoe-sd/cgi-bin/coe_bootimage"
-			cp -af $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/linuxcoe-sd/cgi-bin/coe_bootimage $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/linuxcoe-sd/cgi-bin/coe_bootimage.original
-		fi
-		echo "- patching $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/linuxcoe-sd/cgi-bin/coe_bootimage"
-		tar -C $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/linuxcoe-sd/cgi-bin/ -xzvf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/templates/coe_bootimage_4.3.pachted.tgz
-	fi
-
-	# link the image + template hooks
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/image.linuxcoe-deployment.php $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.linuxcoe-deployment.php
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/template.linuxcoe-deployment.php $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/template.linuxcoe-deployment.php
-	# creating place for autoinstall files
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/lcoe
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/bin/openqrm-linuxcoe-autoinstall-client $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/lcoe/openqrm-linuxcoe-autoinstall-client
-	# creating the dir for the linuxcoe profiles
-	mkdir -p $LINUXCOE_PROFILE_DIR
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/stat/
-	chmod -R 777 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/stat/
-	echo "Order deny,allow" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/stat/.htaccess
-	echo "Deny from all" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/stat/.htaccess
-
-}
-
-
-USER=$2
-PASS=$3
-
-case "$1" in
-	start)
-		openqrm_plugin_linuxcoe_start
-		;;
-	stop)
-		openqrm_plugin_linuxcoe_stop
-		;;
-	restart)
-		openqrm_plugin_linuxcoe_stop
-		sleep 1
-		openqrm_plugin_linuxcoe_start
-		;;
-	init)
-		openqrm_plugin_linuxcoe_init $USER $PASS
-		;;
-	uninstall)
-		openqrm_plugin_linuxcoe_uninstall $USER $PASS
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/init.d/openqrm-plugin-linuxcoe.postinstall b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/init.d/openqrm-plugin-linuxcoe.postinstall
deleted file mode 100644
index 98e0979..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/init.d/openqrm-plugin-linuxcoe.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-linuxcoe postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/init.d/openqrm-plugin-linuxcoe.preremove b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/init.d/openqrm-plugin-linuxcoe.preremove
deleted file mode 100644
index d4f99ca..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/init.d/openqrm-plugin-linuxcoe.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-linuxcoe preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-linuxcoe stop
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/openqrm-plugin-linuxcoe.conf b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/openqrm-plugin-linuxcoe.conf
deleted file mode 100644
index b0fe4ed..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/openqrm-plugin-linuxcoe.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# this is the openQRM-plugin-linuxcoe info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.1.6"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, libapache2-mod-perl2, screen, make, autoconf, automake, genisoimage, sudo, nfs-kernel-server, nfs-common"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen, make, autoconf, automake, mkisofs, sudo, nfs-utils, perl-CGI"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen, make, autoconf, automake, cdrkit-cdrtools-compat, genisoimage, sudo, nfs-client"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="Integrates <a href='http://linuxcoe.sourceforge.net/' target='_BLANK'>LinuxCOE</a> Install Server for automatic Linux deployments (local-deployment)."
-OPENQRM_PLUGIN_TYPE="deployment"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES="dhcpd, tftpd"
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/etc/openqrm-plugin-linuxcoe.conf"
-
-# seconds to wait for the linuxcoe-auto-installation to start
-OPENQRM_PLUGIN_LINUXCOE_INSTALL_START_DELAY=240
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/data/bundles-CentOS-6 b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/data/bundles-CentOS-6
deleted file mode 100644
index fbc6c81..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/data/bundles-CentOS-6
+++ /dev/null
@@ -1,45 +0,0 @@
-Administration Tools
-Authoring and Publishing
-Base
-Clustering
-Cluster Storage
-Core
-Development Libraries
-Development Tools
-Dialup Networking Support
-DNS Name Server
-Editors
-Emacs
-Engineering and Scientific
-FTP Server
-Games and Entertainment
-GNOME Desktop Environment
-GNOME Software Development
-Graphical Internet
-Graphics
-Java
-Java Development
-KDE (K Desktop Environment)
-KDE Software Development
-Legacy Network Server
-Legacy Software Development
-Legacy Software Support
-Mail Server
-Miscellaneous Included Packages
-MySQL Database
-Network Servers
-News Server
-Office/Productivity
-PostgreSQL Database
-Printing Support
-Ruby
-Server Configuration Tools
-Sound and Video
-System Tools
-Text-based Internet
-Virtualization
-Virtualization
-Web Server
-Windows File Server
-X Software Development
-X Window System
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/data/bundles-Debian-Wheezy b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/data/bundles-Debian-Wheezy
deleted file mode 100644
index fcd8829..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/data/bundles-Debian-Wheezy
+++ /dev/null
@@ -1,8 +0,0 @@
-database-server
-desktop
-dns-server
-file-server
-laptop
-mail-server
-print-server
-web-server
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/data/bundles-Ubuntu-Trusty b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/data/bundles-Ubuntu-Trusty
deleted file mode 100644
index 238e653..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/data/bundles-Ubuntu-Trusty
+++ /dev/null
@@ -1,31 +0,0 @@
-dns-server
-edubuntu-desktop
-edubuntu-desktop-gnome
-edubuntu-desktop-kde
-edubuntu-server
-eucalyptus-cloud
-eucalyptus-cluster
-eucalyptus-node
-eucalyptus-storage
-eucalyptus-walrus
-kubuntu-desktop
-kubuntu-netbook
-lamp-server
-mail-server
-minimal
-mythbuntu-backend-master
-mythbuntu-backend-slave
-mythbuntu-desktop
-mythbuntu-frontend
-openssh-server
-postgresql-server
-print-server
-samba-server
-server
-standard
-tomcat-server
-ubuntu-desktop
-ubuntu-netbook
-uec
-virt-host
-xubuntu-desktop
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/data/disk_data b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/data/disk_data
deleted file mode 100644
index bb08b22..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/data/disk_data
+++ /dev/null
@@ -1,18 +0,0 @@
-# disk_data - There are the choices in the disk pulldown
-/dev/vda  VIRTIO:0 - First Virtual Disk (vda)
-/dev/vdb  VIRTIO:1 - Second Virtual Disk (vdb)
-/dev/hda  IDE0:0 - First IDE Master (hda1)
-/dev/hdb  IDE0:1 - First IDE Slave (hdb)
-/dev/hdc  IDE1:0 - Second IDE Master (hdc)
-/dev/hdd  IDE1:1 - Second IDE Slave (hdd)
-/dev/sda  SCSI0:0 - First SATA or SCSI disk (sda)
-/dev/sdb  SCSI0:1 - Second SATA or SCSI disk (sdb)
-/dev/ida/c0d0  First CPQ Integrated Smart Array LUN (ida/c0d0)
-/dev/ida/c0d1  Second CPQ Integrated Smart Array LUN (ida/c0d1)
-/dev/cciss/c0d0  CPQ array LUN (cciss/c0d0)
-/dev/cciss/c0d1  CPQ array LUN (cciss/c0d1)
-/dev/cciss/c0d2  CPQ array LUN (cciss/c0d2)
-/dev/cciss/c0d3  CPQ array LUN (cciss/c0d3)
-/dev/cciss/c0d4  CPQ array LUN (cciss/c0d4)
-/dev/cciss/c0d5  CPQ array LUN (cciss/c0d5)
-/dev/cciss/c0d6  CPQ array LUN (cciss/c0d6)
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/depots/apt-Debian-Wheezy b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/depots/apt-Debian-Wheezy
deleted file mode 100644
index 0a4c978..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/depots/apt-Debian-Wheezy
+++ /dev/null
@@ -1,7 +0,0 @@
-
-deb @METHOD@ftp.de.debian.org/debian wheezy main contrib non-free
-#deb-src deb @METHOD@ftp.us.debian.org/debian wheezy main contrib non-free
-
-deb @METHOD@security.debian.org/ wheezy/updates main contrib non-free
-#deb-src @METHOD@security.debian.org/ wheezy/updates main contrib non-free
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/depots/apt-Ubuntu-Trusty b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/depots/apt-Ubuntu-Trusty
deleted file mode 100644
index 92ced4e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/depots/apt-Ubuntu-Trusty
+++ /dev/null
@@ -1,4 +0,0 @@
-
-deb @METHOD@ftp.halifax.rwth-aachen.de/ubuntu trusty main
-#deb-src deb @METHOD@archive.ubuntu.com/ubuntu trusty main
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/depots/yum-CentOS-6 b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/depots/yum-CentOS-6
deleted file mode 100644
index 6de97b1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/depots/yum-CentOS-6
+++ /dev/null
@@ -1,61 +0,0 @@
-# CentOS-Base.repo
-#
-# This file uses a new mirrorlist system developed by Lance Davis for CentOS.
-# The mirror system uses the connecting IP address of the client and the
-# update status of each mirror to pick mirrors that are updated to and
-# geographically close to the client.  You should use this for CentOS updates
-# unless you are manually picking other mirrors.
-#
-# If the mirrorlist= does not work for you, as a fall back you can try the 
-# remarked out baseurl= line instead.
-#
-#
-
-[base]
-name=CentOS-$releasever - Base
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os
-#baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/
-gpgcheck=1
-gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6
-
-#released updates 
-[update]
-name=CentOS-$releasever - Updates
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates
-#baseurl=http://mirror.centos.org/centos/$releasever/updates/$basearch/
-gpgcheck=1
-gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6
-
-#packages used/produced in the build but not released
-[addons]
-name=CentOS-$releasever - Addons
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=addons
-#baseurl=http://mirror.centos.org/centos/$releasever/addons/$basearch/
-gpgcheck=1
-gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6
-
-#additional packages that extend functionality of existing packages
-[centosplus]
-name=CentOS-$releasever - Plus
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus
-#baseurl=http://mirror.centos.org/centos/$releasever/centosplus/$basearch/
-gpgcheck=1
-enabled=0
-gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6
-
-#additional packages that may be useful
-[extras]
-name=CentOS-$releasever - Extras
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras
-#baseurl=http://mirror.centos.org/centos/$releasever/extras/$basearch/
-gpgcheck=1
-gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6
-
-#fasttrack 
-[fasttrack]
-name=CentOS-$releasever - fasttrack
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=fasttrack
-#baseurl=http://mirror.centos.org/centos/$releasever/fasttrack/$basearch/
-gpgcheck=1
-enabled=0
-gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/linuxcoe-pxe.autoyast b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/linuxcoe-pxe.autoyast
deleted file mode 100644
index 3335734..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/linuxcoe-pxe.autoyast
+++ /dev/null
@@ -1,9 +0,0 @@
-default linux
-
-label linux
-kernel boot/@@OPENQRM_BOOTIMAGE_KERNEL@@
-append ramdisk_size=65536 initrd=boot/@@OPENQRM_BOOTIMAGE_INITRD@@ acpi=off apm=off autoyast=http://@@OPENQRM_SERVER_IP_ADDRESS@@/openqrm/boot-service/lcoe/autoyast.@@OPENQRM_RESOURCE_ID@@-@@LINUXCOE_PROFILE_NAME@@.xml info=http://@@OPENQRM_SERVER_IP_ADDRESS@@/openqrm/boot-service/lcoe/info.@@OPENQRM_RESOURCE_ID@@-@@LINUXCOE_PROFILE_NAME@@ id=@@OPENQRM_RESOURCE_ID@@ openqrm=@@OPENQRM_SERVER_IPADDRESS@@ selinux=0
-ipappend 3
-
-label local
-LOCALBOOT 0
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/linuxcoe-pxe.kickstart b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/linuxcoe-pxe.kickstart
deleted file mode 100644
index 2afc0a4..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/linuxcoe-pxe.kickstart
+++ /dev/null
@@ -1,9 +0,0 @@
-default linux
-
-label linux
-kernel boot/@@OPENQRM_BOOTIMAGE_KERNEL@@
-append ramdisk_size=131072 initrd=boot/@@OPENQRM_BOOTIMAGE_INITRD@@ ksdevice=@@PARAM_RESOURCE_MAC@@ ks=http://@@OPENQRM_SERVER_IP_ADDRESS@@/openqrm/boot-service/lcoe/ks.@@OPENQRM_RESOURCE_ID@@-@@LINUXCOE_PROFILE_NAME@@.cfg
-ipappend 3
-
-label local
-LOCALBOOT 0
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/linuxcoe-pxe.preseed b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/linuxcoe-pxe.preseed
deleted file mode 100644
index 4da4d64..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/linuxcoe-pxe.preseed
+++ /dev/null
@@ -1,12 +0,0 @@
-default linux
-
-label linux
-kernel boot/@@OPENQRM_BOOTIMAGE_KERNEL@@
-append ramdisk_size=131072 initrd=boot/@@OPENQRM_BOOTIMAGE_INITRD@@ locale=en_US console-setup/layoutcode=en_US languagechooser/language-name=@@LINUXCOE_INSTALL_LANGUAGE@@ interface=eth0 auto=true preseed/locale=en_US kbd-chooser/method=us preseed/url=http://@@OPENQRM_SERVER_IP_ADDRESS@@/openqrm/boot-service/lcoe/preseed.@@OPENQRM_RESOURCE_ID@@-@@LINUXCOE_PROFILE_NAME@@.cfg root=/dev/ram rw debconf/priority=critical debian-installer/framebuffer=false
-ipappend 3
-
-
-label local
-LOCALBOOT 0
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/osvend.d/CentOS b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/osvend.d/CentOS
deleted file mode 100644
index 7d9a116..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/osvend.d/CentOS
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# Examples (for supported versions of CentOS):
-# other sites listed at
-# http://www.centos.org/modules/tinycontent/index.php?id=13
-# the path (last component) must be the prefix
-# (but not include) the "CentOS/base" directory
-
-
-OSVEND ftp.halifax.rwth-aachen.de CentOS 6   x86_64 HTTP  /centos/6/os/x86_64
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/osvend.d/Debian b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/osvend.d/Debian
deleted file mode 100644
index 8d06ede..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/osvend.d/Debian
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# Examples (for supported versions of Debian):
-# other sites listed at
-# http://www.debian.org/mirror/list
-# the path (last component) must be the prefix
-# (but not include) the "dists" directory
-
-OSVEND ftp.de.debian.org  Debian Wheezy x86_64 HTTP /debian/
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/osvend.d/Ubuntu b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/osvend.d/Ubuntu
deleted file mode 100644
index 453803d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/osvend.d/Ubuntu
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# Examples (for supported versions of Ubuntu):
-# other sites listed at
-# https://wiki.ubuntu.com/Archive
-# the path (last component) must be the prefix
-# (but not include) the "dists" directory
-
-OSVEND ftp.halifax.rwth-aachen.de Ubuntu Trusty x86_64 HTTP  /ubuntu/
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/patches/nph-coe_image.diff b/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/patches/nph-coe_image.diff
deleted file mode 100644
index a56d09d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/etc/templates/patches/nph-coe_image.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- cgi-bin/nph-coe_image.org	2012-06-19 19:03:38.130887467 +0200
-+++ cgi-bin/nph-coe_image	2012-06-19 19:30:05.530887457 +0200
-@@ -223,7 +223,7 @@
-   print KS "# ks.cfg : Created by $BRAND at ".`date`;
-   print KS "# COE-Profile used: $profile\n";
-   print KS "lang ".$qin->param('lang')."\n" unless ($version =~ /^ESX-4/);
--  unless (( $os =~ /Fedora/ ) || ( $version =~ /^ESX-4/)) {
-+  unless (( $os =~ /Fedora/ ) || ( $os =~ /CentOS/ ) || ( $version =~ /^ESX-4/)) {
-     print KS "langsupport --default ".$qin->param('lang')."\n";  
-     print KS "mouse ".$qin->param('mouse')."\n";
-   }
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/include/openqrm-plugin-linuxcoe-functions b/openQRM-5.3.50-CE/src/plugins/linuxcoe/include/openqrm-plugin-linuxcoe-functions
deleted file mode 100644
index 01ed43d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/include/openqrm-plugin-linuxcoe-functions
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-# this is the functions file for the linuxcoe-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-LINUXCOE_PROFILE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/web/profiles"
-LINUXCOE_SYSTEMDESIGNER_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/linuxcoe-sd/var/cache/linuxcoe-sd/scratchmonkey/systemdesigner"
-LINUXCOE_ISO_DIRECTORY="/linuxcoe"
-NFSEXPORTS="/etc/exports"
-################ common linuxcoe functions
-
-# logs for linuxcoe
-function linuxcoe_log() {
-	local COMPONENT=$1
-	shift
-	local MESSAGE=$@
-	echo "linuxcoe plug-in" "$COMPONENT : $MESSAGE"
-	logger -i -t "linuxcoe plug-in" "$COMPONENT : $MESSAGE"
-}
-
-
-################ linuxcoe functions
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/sbin/openqrm-linuxcoe-monitord b/openQRM-5.3.50-CE/src/plugins/linuxcoe/sbin/openqrm-linuxcoe-monitord
deleted file mode 100644
index 37c1026..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/sbin/openqrm-linuxcoe-monitord
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/bash
-# this script automatically monitors kvm vms
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-# this script automatically monitors linuxcoe auto-installations
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/linuxcoe/include/openqrm-plugin-linuxcoe-functions
-OPENQRM_POSTENCODE="$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-postencode"
-openqrm_server_get_config
-export resource_id=0
-export resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-export SERVER_PROTOCOL=$OPENQRM_WEB_PROTOCOL
-export resource_senddelay=10
-export LANG=C
-OPENQRM_EVENT="statistics"
-OPENQRM_ACTIVE_STATE="transition"
-OPENQRM_STARTING_STATE="starting"
-
-# define wget to use with https
-if [ "$SERVER_PROTOCOL" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate --random-file=/dev/random"
-fi
-
-# let only root run this script
-WHOAMI=`whoami`
-if [ "$WHOAMI" != "root" ]; then
-	echo "ERROR: Please run this script as root!"
-	exit 6
-fi
-
-# mac is the identifier
-RESOURCE_ID=$1
-RESOURCE_MAC=$2
-if [ "$RESOURCE_ID" == "" ] || [ "$RESOURCE_MAC" == "" ]; then
-	echo "Usage: $0 <resource_id> <resource_mac>"
-	exit 1
-fi
-
-
-# local used functions
-function send_info() {
-	current_state=$OPENQRM_ACTIVE_STATE
-	current_event=$OPENQRM_EVENT
-	MESSAGEDATA="resource_id=$RESOURCE_ID&resource_uptime=$current_uptime&resource_state=$current_state&resource_event=$current_event";
-	OPENQRM_RESOURCE_INFO_URL="$SERVER_PROTOCOL://$resource_openqrmserver/openqrm/action/resource-monitor.php?resource_command=update_info&$MESSAGEDATA"
-	wget $WGET_NO_CERT_CHECK -q -O /dev/null "$OPENQRM_RESOURCE_INFO_URL"
-}
-
-
-
-# uptime
-function find_uptime() {
-	if [ -f /proc/uptime ]; then
-		current_uptime=`cat /proc/uptime | cut -d'.' -f 1`
-	fi
-	if [ -z "$current_uptime" ]; then
-		current_uptime=0
-	fi
-}
-
-
-
-# main loop
-while (true); do
-	# we need to send transaction first, then check
-	# the resource may have rebooted slow and send active before reboot
-	# uptime
-	find_uptime
-	# sending statistics
-	send_info
-	# delay
-	sleep $resource_senddelay
-	# get install state
-	wget $WGET_NO_CERT_CHECK -q -O /tmp/openqrm-parameters.$RESOURCE_MAC.conf "$SERVER_PROTOCOL://$resource_openqrmserver/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_id=$RESOURCE_ID&resource_mac=$RESOURCE_MAC"
-	. /tmp/openqrm-parameters.$RESOURCE_MAC.conf
-	rm -f /tmp/openqrm-parameters.$RESOURCE_MAC.conf
-	if echo $resource_state | grep active 1>/dev/null; then
-			# ready installed, exit the montird
-			exit 0
-	fi
-done
-# never reached
-exit 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-about.bootservice.class.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-about.bootservice.class.php
deleted file mode 100644
index 78924d1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-about.bootservice.class.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * linuxcoe-about Boot-Service
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class linuxcoe_about_bootservice
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'linuxcoe_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "linuxcoe_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/linuxcoe-about-bootservice.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['boot_service_title'], 'boot_service_title');
-		$t->add($this->lang['boot_service_content'], 'boot_service_content');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-about.controller.class.php
deleted file mode 100644
index 1a9db55..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-about.controller.class.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/**
- * linuxcoe-about Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class linuxcoe_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'linuxcoe_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'linuxcoe_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'linuxcoe_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'linuxcoe_about_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About LinuxCOE',
-		'label' => 'About LinuxCOE',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The "LinuxCOE" plugin integrates <a href="http://linuxcoe-project.org/" target="_BLANK">LinuxCOE</a> Install Server for automatic Linux deployments.
-			LinuxCOE comes with a user-friendly UI to create automatic Linux installations for different distributions (Debian/Ubuntu/CentOS etc.) resulting in ISO files/images which can be used to
-			fully automatically install physical Server and also Virtual Machines.<br>The integration of LinuxCOE in openQRM provides two different modes:<br><br>
-
-				<strong>Automatic Installations from ISO</strong><br>
-				After creating an Installation Template the resulting ISO image can be burned on an CD to automatically install a physical Server (the initial goal of the LinuxCOE Project).<br><br>
-				In openQRM the LinuxCOE ISO Images are also automatically available on Virtualization Host from the type "local-deployment VMs" (e.g. "kvm-storage" and "xen-storage") in the /linuxcoe-iso directory.
-				Simply configure a Virtual Machine to boot from such a LinuxCOE ISO image for an fully automatic VM installation.<br><br>
-				Please notice that after a successfull installation the VM will most likely try to boot from the ISO image again after the automatic install procedure finished!
-				Please stop the VMs Appliance after the initial automatic installation, then re-configure the Virtual Machine to boot from "local" and start the Appliance again.<br><br>
-
-				<strong>Automatic Network-Installations</strong><br>
-				The LinuxCOE integration in openQRM provides the capability to use the pre-configured automatic installations templates also for "network-deployment".
-				For "network-deployment" physical Server and Virtual Machines from the type "local-deployment for VMs" (e.g. "kvm-storage" and "xen-storage") are supported.<br>
-				-> physical Server and VMs for "network-deployment" must be set to network-boot (PXE) either in the BIOS or VM configuration!<br><br>
-				The deployment of the LinuxCOE templates works via openQRMs "install-from-template" mechanism which allows to attach those automatic installation templates to Images.
-				For Virtual Machines the templates can be directly attached to the Virtual Machines Image, for physical Server please create an Image pointing to a local disk with the LinuxCOE "Image Manager".<br><br>
-				Starting an Appliance with an LinuxCOE automatic installation template attached to its Image automatically applies the specified configuration and automatically installs the systems.<br><br>
-				Network-deploying LinuxCOE templates automatically installs the openQRM-Client and integrates the system into openQRM.
-				After the automatic installation the resource (physical Server or VM) is automatically set to local-boot.<br><br>
-
-				<strong>Cloud deployment</strong><br>
-				Images with an attached LinuxCOE <strong>Automatic Network-Installation</strong> template are fully supported for Cloud-deployment!<br><br>',
-
-		'requirements_title' => 'Requirements',
-		'requirements_list' => '<ul><li>A LinuxCOE Install Server Storage using the openQRM as the resource</li>
-				   <li>The following packages must be installed: screen, make, autoconf, automake, genisoimage, sudo, nfs-kernel-server, nfs-common</li></ul>',
-
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-
-		'provides_title' => 'Provides',
-		'provides_list' => '<ul><li>Storage type: "linuxcoe-deployment"</li>
-					<li>Deployment types: "Automatic Linux Installation (LinuxCOE)"</li></ul>',
-
-		'howto_title' => 'How to use',
-		'howto_list' => '<ul><li>Create a new Storage from type "linuxcoe-deployment" using the openQRM Server as the resource</li>
-					<li>Create one or more LinuxCOE Installation Templates</li>
-					<li>Use the Template Manager to add a description to your Installation Templates</li>
-					<li>Choose either <strong>Automatic Installations from ISO</strong> or <strong>Automatic Network-Installations</strong> to deploy the Templates</li></ul>',
-
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Deployment',
-
-		'deployment_title' => 'Deployment Type',
-		'deployment_content' => 'Local-Deployment',
-
-		'documentation_title' => 'Documentation',
-		'use_case_title' => 'Use-Case',
-		'network_deploymet' => 'Network-Deployment',
-		'doc1' => '',
-	),
-	'bootservice' => array (
-		'tab' => 'Boot-Service',
-		'label' => 'LinuxCOE Boot-Service',
-		'boot_service_title' => 'LinuxCOE Boot-Service',
-		'boot_service_content' => 'The LinuxCOE Plugin provides an openQRM Boot-Service.
-			This "LinuxCOE Boot-Service" is automatically downloaded and executed by the openQRM-Client on all integrated Systems.
-			The Boot-Service is located at:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/linuxcoe/web/boot-service-linuxcoe.tgz</b></i>
-			<br>
-			<br>
-			The "LinuxCOE Boot-Service contains the Client files of the LinuxCOE Plugin.<br>
-			Also a configuration file for the LinuxCOE server is included in this Boot-Service.<br>
-			<br>
-			The Boot-Service configuration can be viewed and administrated by the "openqrm" utility.<br>
-			To view the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n linuxcoe -a default</b></i>
-			<br>
-			<br>
-			To view a Boot-Service configuration of a specific appliance run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n linuxcoe -a [appliance-name]</b></i>
-			<br>
-			<br>
-			To adapt a parameter in the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n linuxcoe -a default -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			To adapt a paramter in the Boot-Service configuration of a specific appliance run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n linuxcoe -a [appliance-name] -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/linuxcoe/lang", 'linuxcoe-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/linuxcoe/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "documentation";
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-			case 'bootservice':
-				$content[] = $this->bootservice(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About LinuxCOE
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/linuxcoe/class/linuxcoe-about.documentation.class.php');
-			$controller = new linuxcoe_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Boot-Service
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function bootservice( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/linuxcoe/class/linuxcoe-about.bootservice.class.php');
-			$controller = new linuxcoe_about_bootservice($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['bootservice'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['bootservice']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'bootservice' );
-		$content['onclick'] = false;
-		if($this->action === 'bootservice'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-about.documentation.class.php
deleted file mode 100644
index 978ea66..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-about.documentation.class.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * linuxcoe-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class linuxcoe_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'linuxcoe_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "linuxcoe_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/linuxcoe-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['deployment_title'], 'deployment_title');
-		$t->add($this->lang['deployment_content'], 'deployment_content');
-		$t->add($this->lang['provides_title'], 'provides_title');
-		$t->add($this->lang['provides_list'], 'provides_list');
-		$t->add($this->lang['howto_title'], 'howto_title');
-		$t->add($this->lang['howto_list'], 'howto_list');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-template.controller.class.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-template.controller.class.php
deleted file mode 100644
index 9671bbb..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-template.controller.class.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-/**
- * LinuxCOE-Templates Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-class linuxcoe_template_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'linuxcoe_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'linuxcoe_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'linuxcoe_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'linuxcoe_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array (
-		'tab' => 'LinuxCOE Templates',
-		'label' => 'LinuxCOE Automatic Installation Templates',
-		'action_edit' => 'edit',
-		'action_remove' => 'remove',
-		'table_name' => 'Name',
-		'table_id' => 'ID',
-		'table_comment' => 'Description',
-		'please_wait' => 'Loading LinuxCOE Templates. Please wait ..',
-	),
-	'edit' => array (
-		'tab' => 'Edit LinuxCOE Template',
-		'label' => 'Edit LinuxCOE Template %s description',
-		'form_comment' => 'Description',
-		'form_post' => 'Custom POST-Install section',
-		'msg_edit' => 'Updated LinuxCOE Template %s',
-		'error_comment' => 'Comment must be %s',
-		'please_wait' => 'Loading LinuxCOE Templates. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'remove' => array (
-		'tab' => 'Remove LinuxCOE Templates',
-		'label' => 'Remove LinuxCOE Template(s)',
-		'msg_removed' => 'Removed Volume %s',
-		'please_wait' => 'Removing Volume(s). Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-);
-
-var $openqrm_base_dir;
-var $openqrm;
-var $openqrm_ip;
-var $event;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->basedir  = $this->openqrm->get('basedir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/linuxcoe/lang", 'linuxcoe-template.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/linuxcoe/tpl';
-		require_once $this->rootdir."/class/folder.class.php";
-		$this->folder	= new folder();
-		$this->openqrm_server = new openqrm_server();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "select";
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'remove':
-				$content[] = $this->select(false);
-				$content[] = $this->remove(true);
-			break;
-			case 'edit':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select template
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			if($this->reload()) {
-				require_once($this->rootdir.'/plugins/linuxcoe/class/linuxcoe-template.select.class.php');
-				$controller = new linuxcoe_template_select($this->openqrm, $this->response);
-				$controller->actions_name    = $this->actions_name;
-				$controller->tpldir          = $this->tpldir;
-				$controller->identifier_name = $this->identifier_name;
-				$controller->folder          = $this->folder;
-				$controller->webdir          = $this->rootdir;
-				$controller->basedir         = $this->basedir;
-				$controller->lang            = $this->lang['select'];
-				$data = $controller->action();
-			}
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-	//--------------------------------------------
-	/**
-	 * Remove template
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function remove( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/linuxcoe/class/linuxcoe-template.remove.class.php');
-			$controller = new linuxcoe_template_remove($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->folder          = $this->folder;
-			$controller->webdir          = $this->rootdir;
-			$controller->basedir         = $this->basedir;
-			$controller->openqrm_server  = $this->openqrm_server;
-			$controller->lang            = $this->lang['remove'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['remove']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'remove' );
-		$content['onclick'] = false;
-		if($this->action === 'remove'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-	//--------------------------------------------
-	/**
-	 * Edit template
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function edit( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/linuxcoe/class/linuxcoe-template.edit.class.php');
-			$controller = new linuxcoe_template_edit($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->folder          = $this->folder;
-			$controller->webdir          = $this->rootdir;
-			$controller->basedir         = $this->basedir;
-			$controller->openqrm_server  = $this->openqrm_server;
-			$controller->lang            = $this->lang['edit'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['edit']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'edit' );
-		$content['onclick'] = false;
-		if($this->action === 'edit'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	
-	
-	//--------------------------------------------
-	/**
-	 * Reload Profiles
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function reload() {
-		$command  = $this->basedir.'/plugins/linuxcoe/bin/openqrm-linuxcoe-manager check';
-		$command .= ' --openqrm-ui-user '.$this->user->name;
-		$command .= ' --openqrm-cmd-mode background';
-		$file = $this->basedir.'/plugins/linuxcoe/web/stat/check';
-		if($this->file->exists($file)) {
-			$this->file->remove($file);
-		}
-		$this->openqrm_server->send_command($command, NULL, true);
-		while (!$this->file->exists($file))
-		{
-		  usleep(10000);
-		  clearstatcache();
-		}
-		return true;
-	}
-	
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-template.edit.class.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-template.edit.class.php
deleted file mode 100644
index b0f8204..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-template.edit.class.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/**
- * Edit Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class linuxcoe_template_edit
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'linuxcoe_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'linuxcoe_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'linuxcoe_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'linuxcoe_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-		$this->template_name = $response->html->request()->get('linuxcoe_template');
-		$this->response->add('linuxcoe_template', $this->template_name);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-
-		$response = $this->edit();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-	
-		$t = $this->response->html->template($this->tpldir."/linuxcoe-template-edit.tpl.php");
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add(sprintf($this->lang['label'], $this->template_name), 'label');
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function edit() {
-
-		$response = $this->get_response();
-		$form     = $response->form;
-
-		if(!$form->get_errors() && $response->submit()) {
-			$template_comment		= $this->response->html->request()->get('template_comment');
-			$template_post			= $this->response->html->request()->get('template_post');
-			file_put_contents($this->webdir."/plugins/linuxcoe/profiles/".$this->template_name."/openqrm.info", $template_comment);
-			if (strlen($template_post)) {
-				file_put_contents($this->webdir."/plugins/linuxcoe/profiles/".$this->template_name."/custom-post.info", $template_post."\n");
-			}
-			$response->msg = sprintf($this->lang['msg_edit'], $this->template_name);
-		}
-		return $response;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'edit');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-		
-		$lcoe_profile_comment_str = '';
-		if (file_exists($this->webdir."/plugins/linuxcoe/profiles/".$this->template_name."/openqrm.info")) {
-			$lcoe_profile_comment_str = trim(file_get_contents($this->webdir."/plugins/linuxcoe/profiles/".$this->template_name."/openqrm.info"));
-		}
-		
-		$lcoe_profile_post_str = '';
-		if (file_exists($this->webdir."/plugins/linuxcoe/profiles/".$this->template_name."/custom-post.info")) {
-			$lcoe_profile_post_str = trim(file_get_contents($this->webdir."/plugins/linuxcoe/profiles/".$this->template_name."/custom-post.info"));
-		}
-		
-		$d['template_comment']['label']                     = $this->lang['form_comment'];
-		$d['template_comment']['validate']['regex']         = '/^[a-z0-9._ -]+$/i';
-		$d['template_comment']['validate']['errormsg']      = sprintf($this->lang['error_comment'], 'a-z0-9._ -');
-		$d['template_comment']['object']['type']            = 'htmlobject_textarea';
-		$d['template_comment']['object']['attrib']['name']  = 'template_comment';
-		$d['template_comment']['object']['attrib']['value'] = $lcoe_profile_comment_str;
-
-		$d['template_post']['label']                     = $this->lang['form_post'];
-		$d['template_post']['validate']['regex']         = '';
-		$d['template_post']['object']['type']            = 'htmlobject_textarea';
-		$d['template_post']['object']['attrib']['name']  = 'template_post';
-		$d['template_post']['object']['attrib']['value'] = $lcoe_profile_post_str;
-		
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-template.remove.class.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-template.remove.class.php
deleted file mode 100644
index 97b41c8..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-template.remove.class.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-
-class linuxcoe_template_remove
-{
-
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'linuxcoe_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'linuxcoe_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'linuxcoe_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'linuxcoe_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang;
-
-
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->user    = $openqrm->user();
-		$this->file = $this->openqrm->file();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action New
-	 *
-	 * @access public
-	 * @param enum $type [file|folder]
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->remove();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir."/linuxcoe-template-remove.tpl.php");
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function remove() {
-		$response = $this->get_response();
-		$template_names  = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		if( $template_names !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($template_names as $ex) {
-				$d['param_f'.$i]['label']                       = $ex;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $ex;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;		
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$errors     = array();
-				$message    = array();
-				foreach($template_names as $key => $template_name) {
-					$command  = $this->basedir.'/plugins/linuxcoe/bin/openqrm-linuxcoe-manager remove -n '.$template_name;
-					$command .= ' --openqrm-ui-user '.$this->user->name;
-					$command .= ' --openqrm-cmd-mode background';
-					$this->openqrm_server->send_command($command, NULL, true);
-					$form->remove($this->identifier_name.'['.$key.']');
-					$message[] = sprintf($this->lang['msg_removed'], $template_name);
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'remove');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-template.select.class.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-template.select.class.php
deleted file mode 100644
index 5fdd314..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-template.select.class.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-
-class linuxcoe_template_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'linuxcoe_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'linuxcoe_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'linuxcoe_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'linuxcoe_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang;
-
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action New
-	 *
-	 * @access public
-	 * @param enum $type [file|folder]
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function action() {
-		$table = $this->select();
-		$template = $this->response->html->template($this->tpldir."/linuxcoe-template-select.tpl.php");
-		$template->add($this->response->html->thisfile, "thisfile");
-		$template->add($this->lang['label'], "linuxcoe_title");
-		$template->add($table, 'table');
-		$template->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $template;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access protected
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function select() {
-//		$this->__response->html->debug();
-
-		$arHead = array();
-
-		$arHead['lcoe_profile_icon'] = array();
-		$arHead['lcoe_profile_icon']['title'] =' ';
-		$arHead['lcoe_profile_icon']['sortable'] = false;
-
-		$arHead['lcoe_profile_id'] = array();
-		$arHead['lcoe_profile_id']['title'] = $this->lang['table_id'];
-
-		$arHead['lcoe_profile_name'] = array();
-		$arHead['lcoe_profile_name']['title'] = $this->lang['table_name'];
-
-		$arHead['lcoe_profile_comment'] = array();
-		$arHead['lcoe_profile_comment']['title'] = $this->lang['table_comment'];
-
-		$arHead['lcoe_profile_edit'] = array();
-		$arHead['lcoe_profile_edit']['title'] =' ';
-		$arHead['lcoe_profile_edit']['sortable'] = false;
-
-		$table = $this->response->html->tablebuilder( 'table_linuxcoe_template', $this->response->get_array($this->actions_name, 'select'));
-		$table->css             = 'htmlobject_table';
-		$table->border          = 0;
-		$table->limit           = 10;
-		$table->id              = 'Tabelle';
-		$table->head            = $arHead;
-		$table->sort            = 'lcoe_profile_id';
-		$table->autosort        = true;
-		$table->form_action	= $this->response->html->thisfile;
-
-		$lcoe_profile_count=1;
-		$plugin_icon=$this->openqrm->get('baseurl')."/plugins/linuxcoe/img/plugin.png";
-		$lcoe_profile_array = array();
-		if (is_dir($this->webdir."/plugins/linuxcoe/profiles/")) {
-			$this->folder->getFolders($this->webdir."/plugins/linuxcoe/profiles/");
-			foreach ($this->folder->folders as $lcoe_profile) {
-					array_push($lcoe_profile_array, $lcoe_profile);
-			}
-		}
-		if(count($lcoe_profile_array) > 0) {
-			foreach ($lcoe_profile_array as $lcoe) {
-				// check if a comment exists
-				if (file_exists($this->webdir."/plugins/linuxcoe/profiles/".$lcoe."/openqrm.info")) {
-					$lcoe_profile_comment_str = file_get_contents($this->webdir."/plugins/linuxcoe/profiles/".$lcoe."/openqrm.info");
-				}
-				// edit button
-				$a = $this->response->html->a();
-				$a->title   = $this->lang['action_edit'];
-				$a->label   = $this->lang['action_edit'];
-				$a->handler = 'onclick="wait();"';
-				$a->css     = 'edit';
-				$a->href    = $this->response->get_url($this->actions_name, "edit").'&linuxcoe_template='.$lcoe;
-				$edit_action = $a->get_string();
-				
-				
-				$arBody[] = array(
-					'lcoe_profile_icon' => '<img width="24" height="24" src="'.$plugin_icon.'" alt="LinuxCOE Installation Profile">',
-					'lcoe_profile_id' => $lcoe_profile_count,
-					'lcoe_profile_name' => $lcoe,
-					'lcoe_profile_comment' => $lcoe_profile_comment_str,
-					'lcoe_profile_edit' => $edit_action,
-				);
-				$lcoe_profile_count++;
-			}
-			$table->body = $arBody;
-		}
-		$table->max = $lcoe_profile_count-1;
-		$table->actions_name = $this->actions_name;
-		$table->actions = array(array('remove' => $this->lang['action_remove']));
-		$table->sort_link = false;
-		$table->identifier = 'lcoe_profile_name';
-		$table->identifier_name = $this->identifier_name;
-		return $table;
-	}
-
-
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-volume.class.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-volume.class.php
deleted file mode 100644
index a14d6a1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe-volume.class.php
+++ /dev/null
@@ -1,355 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-	$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-	require_once "$RootDir/include/openqrm-server-config.php";
-	require_once "$RootDir/include/openqrm-database-functions.php";
-	require_once "$RootDir/class/event.class.php";
-
-/**
- * This class represents an linuxcoe_volume object
- *
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- */
-
-
-class linuxcoe_volume
-{
-
-/**
-* linuxcoe_volume id
-* @access protected
-* @var int
-*/
-var $id = '';
-/**
-* linuxcoe_volume name
-* @access protected
-* @var string
-*/
-var $name = '';
-/**
-* linuxcoe_volume root
-* @access protected
-* @var string
-*/
-var $root = '';
-/**
-* linuxcoe_volume description
-* @access protected
-* @var string
-*/
-var $description = '';
-
-
-/**
-* name of database table
-* @access protected
-* @var string
-*/
-var $_db_table;
-/**
-* path to openqrm basedir
-* @access protected
-* @var string
-*/
-var $_base_dir;
-/**
-* event object
-* @access protected
-* @var object
-*/
-var $_event;
-
-	//--------------------------------------------------
-	/**
-	* Constructor
-	*/
-	//--------------------------------------------------
-	function linuxcoe_volume() {
-		$this->init();
-	}
-
-	//--------------------------------------------------
-	/**
-	* init storage environment
-	* @access public
-	*/
-	//--------------------------------------------------
-	function init() {
-		global $OPENQRM_SERVER_BASE_DIR;
-		$this->_event = new event();
-		$this->_db_table = "linuxcoe_volumes";
-		$this->_base_dir = $OPENQRM_SERVER_BASE_DIR;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an instance of an linuxcoe_volume object from db
-	* @access public
-	* @param int $id
-	* @param string $name
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance($id, $name) {
-		$linuxcoe_volume_array = array();
-		$db=openqrm_get_db_connection();
-		if ("$id" != "") {
-			$linuxcoe_volume_array = $db->Execute("select * from ".$this->_db_table." where linuxcoe_volume_id=".$id);
-		} else if ("$name" != "") {
-			$linuxcoe_volume_array = $db->Execute("select * from ".$this->_db_table." where linuxcoe_volume_name='".$name."'");
-		}
-		foreach ($linuxcoe_volume_array as $index => $linuxcoe_volume) {
-			$this->id = $linuxcoe_volume["linuxcoe_volume_id"];
-			$this->name = $linuxcoe_volume["linuxcoe_volume_name"];
-			$this->root = $linuxcoe_volume["linuxcoe_volume_root"];
-			$this->description = $linuxcoe_volume["linuxcoe_volume_description"];
-		}
-		return $this;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an instance of an linuxcoe_volume by id
-	* @access public
-	* @param int $id
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance_by_id($id) {
-		$this->get_instance($id, "");
-		return $this;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an instance of an linuxcoe_volume by name
-	* @access public
-	* @param int $name
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance_by_name($name) {
-		$this->get_instance("", $name);
-		return $this;
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* add a new linuxcoe_volume
-	* @access public
-	* @param array $linuxcoe_volume_fields
-	*/
-	//--------------------------------------------------
-	function add($linuxcoe_volume_fields) {
-		if (!is_array($linuxcoe_volume_fields)) {
-			$this->_event->log("add", $_SERVER['REQUEST_TIME'], 2, "linuxcoe-volume.class.php", "Fields not well defined", "", "", 0, 0, 0);
-			return 1;
-		}
-		$db=openqrm_get_db_connection();
-		$result = $db->AutoExecute($this->_db_table, $linuxcoe_volume_fields, 'INSERT');
-		if (! $result) {
-			$this->_event->log("add", $_SERVER['REQUEST_TIME'], 2, "linuxcoe-volume.class.php", "Failed adding new linuxcoe_volume to database", "", "", 0, 0, 0);
-		}
-	}
-
-	//--------------------------------------------------
-	/**
-	* update an linuxcoe_volume
-	* <code>
-	* $fields = array();
-	* $fields['linuxcoe_volume_name'] = 'somename';
-	* $fields['linuxcoe_volume_uri'] = 'some-uri';
-	* $linuxcoe_volume = new linuxcoe_volume();
-	* $linuxcoe_volume->update(1, $fields);
-	* </code>
-	* @access public
-	* @param int $linuxcoe_volume_id
-	* @param array $linuxcoe_volume_fields
-	* @return bool
-	*/
-	//--------------------------------------------------
-	function update($linuxcoe_volume_id, $linuxcoe_volume_fields) {
-		if ($linuxcoe_volume_id < 0 || ! is_array($linuxcoe_volume_fields)) {
-			$this->_event->log("update", $_SERVER['REQUEST_TIME'], 2, "linuxcoe-volume.class.php", "Unable to update linuxcoe_volume $linuxcoe_volume_id", "", "", 0, 0, 0);
-			return 1;
-		}
-		$db=openqrm_get_db_connection();
-		unset($linuxcoe_volume_fields["linuxcoe_volume_id"]);
-		$result = $db->AutoExecute($this->_db_table, $linuxcoe_volume_fields, 'UPDATE', "linuxcoe_volume_id = $linuxcoe_volume_id");
-		if (! $result) {
-			$this->_event->log("update", $_SERVER['REQUEST_TIME'], 2, "linuxcoe-volume.class.php", "Failed updating linuxcoe_volume $linuxcoe_volume_id", "", "", 0, 0, 0);
-		}
-	}
-
-	//--------------------------------------------------
-	/**
-	* remove an linuxcoe_volume by id
-	* @access public
-	* @param int $linuxcoe_volume_id
-	*/
-	//--------------------------------------------------
-	function remove($linuxcoe_volume_id) {
-		// remove from db
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from ".$this->_db_table." where linuxcoe_volume_id=".$linuxcoe_volume_id);
-	}
-
-	//--------------------------------------------------
-	/**
-	* remove an linuxcoe_volume by name
-	* @access public
-	* @param string $linuxcoe_volume_name
-	*/
-	//--------------------------------------------------
-	function remove_by_name($linuxcoe_volume_name) {
-		// remove from db
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from ".$this->_db_table." where linuxcoe_volume_name='".$linuxcoe_volume_name."'");
-
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* get linuxcoe_volume name by id
-	* @access public
-	* @param int $linuxcoe_volume_id
-	* @return string
-	*/
-	//--------------------------------------------------
-	function get_name($linuxcoe_volume_id) {
-		$db=openqrm_get_db_connection();
-		$linuxcoe_volume_set = $db->Execute("select linuxcoe_volume_name from ".$this->_db_table." where linuxcoe_volume_id=".$linuxcoe_volume_id);
-		if (!$linuxcoe_volume_set) {
-			$this->_event->log("get_name", $_SERVER['REQUEST_TIME'], 2, "linuxcoe-volume.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			if (!$linuxcoe_volume_set->EOF) {
-				return $linuxcoe_volume_set->fields["linuxcoe_volume_name"];
-			} else {
-				return "not found";
-			}
-		}
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of all linuxcoe_volume names
-	* <code>
-	* $linuxcoe_volume = new linuxcoe_volume();
-	* $arr = $linuxcoe_volume->get_list();
-	* // $arr[0]['value']
-	* // $arr[0]['label']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_list() {
-		$query = "select linuxcoe_volume_id, linuxcoe_volume_name from ".$this->_db_table." order by linuxcoe_volume_id ASC";
-		$linuxcoe_volume_name_array = array();
-		$linuxcoe_volume_name_array = openqrm_db_get_result_double ($query);
-		return $linuxcoe_volume_name_array;
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of all linuxcoe_volume ids
-	* <code>
-	* $linuxcoe_volume = new linuxcoe_volume();
-	* $arr = $linuxcoe_volume->get_ids();
-	* // $arr['value']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_ids() {
-		$linuxcoe_volume_array = array();
-		$query = "select linuxcoe_volume_id from ".$this->_db_table;
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute($query);
-		if (!$rs)
-			$event->log("get_list", $_SERVER['REQUEST_TIME'], 2, "linuxcoe-volume.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		else
-		while (!$rs->EOF) {
-			$linuxcoe_volume_array[] = $rs->fields;
-			$rs->MoveNext();
-		}
-		return $linuxcoe_volume_array;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get number of linuxcoe_volume accounts
-	* @access public
-	* @return int
-	*/
-	//--------------------------------------------------
-	function get_count() {
-		$count=0;
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("select count(linuxcoe_volume_id) as num from ".$this->_db_table);
-		if (!$rs) {
-			$this->_event->log("get_count", $_SERVER['REQUEST_TIME'], 2, "linuxcoe-volume.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			$count = $rs->fields["num"];
-		}
-		return $count;
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of linuxcoe_volumes
-	* @access public
-	* @param int $offset
-	* @param int $limit
-	* @param string $sort
-	* @param enum $order [ASC/DESC]
-	* @return array
-	*/
-	//--------------------------------------------------
-	function display_overview($offset, $limit, $sort, $order) {
-		$db=openqrm_get_db_connection();
-		$recordSet = $db->SelectLimit("select * from ".$this->_db_table." order by $sort $order", $limit, $offset);
-		$linuxcoe_volume_array = array();
-		if (!$recordSet) {
-			$this->_event->log("display_overview", $_SERVER['REQUEST_TIME'], 2, "linuxcoe-volume.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			while (!$recordSet->EOF) {
-				array_push($linuxcoe_volume_array, $recordSet->fields);
-				$recordSet->MoveNext();
-			}
-			$recordSet->Close();
-		}
-		return $linuxcoe_volume_array;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.add.class.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.add.class.php
deleted file mode 100644
index 0273fd1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.add.class.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-/**
- * Local-Storage Add new Volume
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class linuxcoe_add
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'linuxcoe_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'linuxcoe_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'linuxcoe_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'linuxcoe_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-		$this->controller = $controller;
-		$this->response   = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-		$this->user = $openqrm->user();
-		$storage_id       = $this->response->html->request()->get('storage_id');
-		$storage          = $this->openqrm->storage();
-		$resource         = $this->openqrm->resource();
-		$deployment       = $this->openqrm->deployment();
-		$this->response->params['storage_id'] = $this->response->html->request()->get('storage_id');
-		$this->storage    = $storage->get_instance_by_id($storage_id);
-		$this->resource   = $resource->get_instance_by_id($storage->resource_id);
-		$this->deployment = $deployment->get_instance_by_id($storage->type);
-		require_once($this->openqrm->get('basedir').'/plugins/linuxcoe/web/class/linuxcoe-volume.class.php');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->add();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 3) {
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&image_id='.$response->image_id
-				);
-			} else {
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/linuxcoe-add.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function add() {
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			if(!$form->get_errors()) {
-				$name        = $form->get_request('name');
-				$root        = $form->get_request('root');
-				$description = $form->get_request('description');
-
-				// check if volume / image name is aleady existing
-				$image_check = new image();
-				$image_check->get_instance_by_name($name);
-				if (isset($image_check->id) && $image_check->id > 0) {
-					$error = sprintf($this->lang['error_image_exists'], $name);
-				}
-
-				$linuxcoe_volume = new linuxcoe_volume();
-				$linuxcoe_volume->get_instance_by_name($name);
-				if (isset($linuxcoe_volume->id) && $linuxcoe_volume->id > 0) {
-					$error = sprintf($this->lang['error_exists'], $name);
-				}
-
-				if(isset($error)) {
-					$response->error = $error;
-				} else {
-					// add volume
-					$volume_fields = array();
-					$volume_fields["linuxcoe_volume_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$volume_fields['linuxcoe_volume_name'] = $name;
-					$volume_fields['linuxcoe_volume_root'] = $root;
-					$volume_fields['linuxcoe_volume_description'] = $description;
-					$linuxcoe_volume->add($volume_fields);
-					// add image
-					$tables = $this->openqrm->get('table');
-					$image_fields = array();
-					$image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$image_fields['image_name'] = $name;
-					$image_fields['image_type'] = $this->deployment->type;
-					$image_fields['image_rootfstype'] = 'local';
-					$image_fields['image_storageid'] = $this->storage->id;
-					$image_fields['image_comment'] = "Image Object for volume $name";
-					$image_fields['image_rootdevice'] = 'local';
-					$image_fields['image_size']=0;
-					$image = new image();
-					$image->add($image_fields);
-					$response->msg = sprintf($this->lang['msg_added'], $name);
-					// save image id in response for the wizard
-					$response->image_id = $image_fields["image_id"];
-				}
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'add');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$volume_root_arr[] = array("/dev/sda", "/dev/sda");
-		$volume_root_arr[] = array("/dev/sdb", "/dev/sdb");
-		$volume_root_arr[] = array("/dev/sdc", "/dev/sdc");
-		$volume_root_arr[] = array("/dev/sdd", "/dev/sdd");
-
-		$d['name']['label']                             = $this->lang['form_name'];
-		$d['name']['required']                          = true;
-		$d['name']['validate']['regex']                 = '/^[a-z0-9._]+$/i';
-		$d['name']['validate']['errormsg']              = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                    = 'htmlobject_input';
-		$d['name']['object']['attrib']['name']          = 'name';
-		$d['name']['object']['attrib']['id']            = 'name';
-		$d['name']['object']['attrib']['type']          = 'text';
-		$d['name']['object']['attrib']['value']         = '';
-		$d['name']['object']['attrib']['css']           = 'namegen';
-		$d['name']['object']['attrib']['customattribs'] = 'data-prefix="linuxcoe_" data-length="8"';
-		$d['name']['object']['attrib']['maxlength']     = 50;
-
-		$d['root']['label']                         = $this->lang['form_root'];
-		$d['root']['object']['type']                = 'htmlobject_select';
-		$d['root']['object']['attrib']['name']      = 'root';
-		$d['root']['object']['attrib']['index']     = array(0,1);
-		$d['root']['object']['attrib']['options']   = $volume_root_arr;
-
-		$d['description']['label']                         = $this->lang['form_description'];
-		$d['description']['required']                      = true;
-		$d['description']['validate']['regex']             = '/^[a-z 0-9._]+$/i';
-		$d['description']['validate']['errormsg']          = sprintf($this->lang['error_description'], 'a-z 0-9._');
-		$d['description']['object']['type']                = 'htmlobject_input';
-		$d['description']['object']['attrib']['name']      = 'description';
-		$d['description']['object']['attrib']['type']      = 'text';
-		$d['description']['object']['attrib']['value']     = '';
-		$d['description']['object']['attrib']['maxlength'] = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.clone.class.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.clone.class.php
deleted file mode 100644
index 04e8dce..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.clone.class.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/**
- * Local-Storage Clone Volume(s)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class linuxcoe_clone
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'linuxcoe_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'linuxcoe_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'linuxcoe_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'linuxcoe_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->user = $openqrm->user();
-		$this->file = $this->openqrm->file();
-		$this->volume = $this->response->html->request()->get('volume');
-		$this->response->params['volume'] = $this->volume;
-		require_once($this->openqrm->get('basedir').'/plugins/linuxcoe/web/class/linuxcoe-volume.class.php');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->duplicate();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 3) {
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&image_id='.$response->image_id
-				);
-			} else {
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/linuxcoe-clone.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add(sprintf($this->lang['label'], $this->volume), 'label');
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Clone
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function duplicate() {
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-
-			$storage_id = $this->response->html->request()->get('storage_id');
-			$storage    = new storage();
-			$resource   = new resource();
-			$deployment = new deployment();
-			$storage->get_instance_by_id($storage_id);
-			$resource->get_instance_by_id($storage->resource_id);
-			$deployment->get_instance_by_id($storage->type);
-			$name        = $form->get_request('name');
-
-			// check if volume / image name is aleady existing
-			$image_check = new image();
-			$image_check->get_instance_by_name($name);
-			if (isset($image_check->id) && $image_check->id > 0) {
-				$error = sprintf($this->lang['error_image_exists'], $name);
-			}
-
-			$linuxcoe_volume = new linuxcoe_volume();
-			$linuxcoe_volume->get_instance_by_name($name);
-			if (isset($linuxcoe_volume->id) && $linuxcoe_volume->id > 0) {
-				$error = sprintf($this->lang['error_exists'], $name);
-			}
-
-			if(isset($error)) {
-				$response->error = $error;
-			} else {
-				// add volume
-				$linuxcoe_volume->get_instance_by_name($this->volume);
-				$volume_fields = array();
-				$volume_fields["linuxcoe_volume_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$volume_fields['linuxcoe_volume_name'] = $name;
-				$volume_fields['linuxcoe_volume_root'] = $linuxcoe_volume->root;
-				$volume_fields['linuxcoe_volume_description'] = $linuxcoe_volume->description;
-				$linuxcoe_volume->add($volume_fields);
-				// add image
-				$tables = $this->openqrm->get('table');
-				$image_fields = array();
-				$image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$image_fields['image_name'] = $name;
-				$image_fields['image_type'] = $deployment->type;
-				$image_fields['image_rootfstype'] = 'local';
-				$image_fields['image_storageid'] = $storage->id;
-				$image_fields['image_comment'] = "Image Object for volume $name";
-				$image_fields['image_rootdevice'] = 'local';
-				$image_fields['image_size']=0;
-				$image = new image();
-				$image->add($image_fields);
-
-				$response->msg = sprintf($this->lang['msg_cloned'], $this->volume, $name);
-				// save image id in response for the wizard
-				$response->image_id = $image_fields["image_id"];
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'clone');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$d['name']['label']                             = $this->lang['form_name'];
-		$d['name']['required']                          = true;
-		$d['name']['validate']['regex']                 = '/^[a-z0-9._]+$/i';
-		$d['name']['validate']['errormsg']              = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                    = 'htmlobject_input';
-		$d['name']['object']['attrib']['name']          = 'name';
-		$d['name']['object']['attrib']['id']            = 'name';
-		$d['name']['object']['attrib']['type']          = 'text';
-		$d['name']['object']['attrib']['css']           = 'namegen';
-		$d['name']['object']['attrib']['customattribs'] = 'data-prefix="linuxcoe_" data-length="8"';
-		$d['name']['object']['attrib']['value']         = $this->volume.'_clone';
-		$d['name']['object']['attrib']['maxlength']     = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.controller.class.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.controller.class.php
deleted file mode 100644
index d02a7ea..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.controller.class.php
+++ /dev/null
@@ -1,393 +0,0 @@
-<?php
-/**
- * LinuxCOE-Storage Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class linuxcoe_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'linuxcoe_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'linuxcoe_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'linuxcoe_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'linuxcoe_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array (
-		'tab' => 'Select LinuxCOE-storage',
-		'label' => 'Select LinuxCOE-storage',
-		'action_edit' => 'edit',
-		'table_name' => 'Name',
-		'table_id' => 'Id',
-		'table_recource' => 'Resource',
-		'table_type' => 'Type',
-		'table_deployment' => 'Deployment',
-		'error_no_storage' => '<b>No storage configured yet!</b><br><br>Please create a LinuxCOE Storage first!',
-		'new_storage' => 'New Storage',
-		'please_wait' => 'Loading Storage. Please wait ..',
-	), 
-	'edit' => array (
-		'tab' => 'Edit LinuxCOE-storage',
-		'label' => 'LinuxCOE Volumes on storage %s',
-		'lang_id' => 'ID',
-		'lang_name' => 'Name',
-		'lang_resource' => 'Resource',
-		'lang_state' => 'State',
-		'lang_vfree' => 'Free',
-		'lang_vsize' => 'Total',
-		'action_add' => 'Add new Volume',
-		'action_refresh' => 'Reload Page',
-		'action_manual' => 'Manual Configuration',
-		'action_clone' => 'clone',
-		'action_remove' => 'remove',
-		'action_auth' => 'auth',
-		'action_edit' => 'Edit Image of this Volume',
-		'action_clone_in_progress' => 'Synchronisation in progress - Please wait',
-		'action_clone_finished' => 'Syncronisation finished!',
-		'table_name' => 'Name',
-		'table_id' => 'ID',
-		'table_root' => 'Root device',
-		'table_description' => 'Description',
-		'error_no_local' => 'Storage %s is not of type local-deployment',
-		'please_wait' => 'Loading Volumes. Please wait ..',
-		'manual_configured' => 'Storage is manually configured and can not be be edited by openQRM',
-	),
-	'add' => array (
-		'tab' => 'Add LinuxCOE Volume',
-		'label' => 'Add new Volume',
-		'form_name' => 'Name',
-		'form_root' => 'Device',
-		'form_description' => 'Description',
-		'msg_added' => 'Added Volume %s',
-		'msg_add_failed' => 'Failed to add Volume %s',
-		'error_exists' => 'Volume %s already exists',
-		'error_image_exists' => 'Image with name %s already exists',
-		'error_name' => 'Name must be %s',
-		'error_description' => 'Description must be %s',
-		'please_wait' => 'Adding Volume. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'clone' => array (
-		'tab' => 'Clone LinuxCOE Volume',
-		'label' => 'Clone Volume %s',
-		'form_name' => 'Name',
-		'msg_cloned' => 'Cloned %s as %s',
-		'msg_clone_failed' => 'Failed to clone Volume %s',
-		'error_exists' => 'Volume %s already exists',
-		'error_name' => 'Name must be %s',
-		'please_wait' => 'Cloning Volume. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'remove' => array (
-		'label' => 'Remove Volume(s)',
-		'msg_removed' => 'Removed Volume %s',
-		'msg_image_still_in_use' => 'Volume %s of Image id %s is still in use by appliance(s) %s',
-		'please_wait' => 'Removing Volume(s). Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/linuxcoe/lang", 'linuxcoe.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/linuxcoe/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "edit";
-		}
-		if($this->action !== 'select') {
-			$this->response->params['storage_id'] = $this->response->html->request()->get('storage_id');
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'edit':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-			break;
-			case 'add':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->add(true);
-			break;
-			case 'remove':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->remove(true);
-			break;
-			case 'clone':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->duplicate(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->rootdir.'/plugins/linuxcoe/class/linuxcoe.api.class.php');
-		$controller = new linuxcoe_api($this);
-		$controller->action();
-	}
-
-	
-	//--------------------------------------------
-	/**
-	 * Select LinuxCOE Install Server
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/linuxcoe/class/linuxcoe.select.class.php');
-			$controller = new linuxcoe_select($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Edit LinuxCOE Server
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function edit( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-		    require_once($this->rootdir.'/plugins/linuxcoe/class/linuxcoe.edit.class.php');
-		    $controller                  = new linuxcoe_edit($this->openqrm, $this->response);
-		    $controller->actions_name    = $this->actions_name;
-		    $controller->tpldir          = $this->tpldir;
-		    $controller->message_param   = $this->message_param;
-		    $controller->identifier_name = $this->identifier_name;
-		    $controller->prefix_tab      = $this->prefix_tab;
-		    $controller->lang            = $this->lang['edit'];
-			$controller->rootdir         = $this->rootdir;
-		    $data = $controller->action();
-		}
-		$content['label']   = $this->lang['edit']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'edit' );
-		$content['onclick'] = false;
-		if($this->action === 'edit'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Add new Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function add( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-		    require_once($this->rootdir.'/plugins/linuxcoe/class/linuxcoe.add.class.php');
-		    $controller                = new linuxcoe_add($this->openqrm, $this->response, $this);
-		    $controller->actions_name  = $this->actions_name;
-		    $controller->tpldir        = $this->tpldir;
-		    $controller->message_param = $this->message_param;
-		    $controller->lang          = $this->lang['add'];
-		    $controller->rootdir       = $this->rootdir;
-		    $controller->prefix_tab    = $this->prefix_tab;
-		    $data = $controller->action();
-		}
-		$content['label']   = $this->lang['add']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'add' );
-		$content['onclick'] = false;
-		if($this->action === 'add'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Remove Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function remove( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-		    require_once($this->rootdir.'/plugins/linuxcoe/class/linuxcoe.remove.class.php');
-		    $controller                  = new linuxcoe_remove($this->openqrm, $this->response);
-		    $controller->actions_name    = $this->actions_name;
-		    $controller->tpldir          = $this->tpldir;
-		    $controller->message_param   = $this->message_param;
-		    $controller->identifier_name = $this->identifier_name;
-		    $controller->lang            = $this->lang['remove'];
-		    $controller->rootdir         = $this->rootdir;
-		    $controller->prefix_tab      = $this->prefix_tab;
-		    $data = $controller->action();
-		}
-		$content['label']   = 'Remove';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'remove' );
-		$content['onclick'] = false;
-		if($this->action === 'remove' || $this->action === $this->lang['edit']['action_remove']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Clone Volume
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function duplicate( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-		    require_once($this->rootdir.'/plugins/linuxcoe/class/linuxcoe.clone.class.php');
-		    $controller                  = new linuxcoe_clone($this->openqrm, $this->response);
-		    $controller->actions_name    = $this->actions_name;
-		    $controller->tpldir          = $this->tpldir;
-		    $controller->message_param   = $this->message_param;
-		    $controller->identifier_name = $this->identifier_name;
-		    $controller->lang            = $this->lang['clone'];
-		    $controller->rootdir         = $this->rootdir;
-		    $controller->prefix_tab      = $this->prefix_tab;
-		    $data = $controller->action();
-		}
-		$content['label']   = $this->lang['clone']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'clone' );
-		$content['onclick'] = false;
-		if($this->action === 'clone' || $this->action === $this->lang['edit']['action_clone']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.edit.class.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.edit.class.php
deleted file mode 100644
index 3af3659..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.edit.class.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/**
- * Local-Storage Edit Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class linuxcoe_edit
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'linuxcoe_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'linuxcoe_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'linuxcoe_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'linuxcoe_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-		require_once($this->openqrm->get('basedir').'/plugins/linuxcoe/web/class/linuxcoe-volume.class.php');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Init
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function init() {
-		$storage_id = $this->response->html->request()->get('storage_id');
-		if($storage_id === '') {
-			return false;
-		}
-		// set ENV
-		$deployment = new deployment();
-		$storage    = new storage();
-		$resource   = new resource();
-
-		$storage->get_instance_by_id($storage_id);
-		$resource->get_instance_by_id($storage->resource_id);
-		$deployment->get_instance_by_id($storage->type);
-
-		$this->resource   = $resource;
-		$this->storage    = $storage;
-		$this->deployment = $deployment;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$this->init();
-		$data = $this->edit();
-		if($data !== false) {
-			$t = $this->response->html->template($this->tpldir.'/linuxcoe-edit.tpl.php');
-			$t->add($this->response->html->thisfile, "thisfile");
-			$t->add($data);
-			$t->add($this->lang['lang_id'], 'lang_id');
-			$t->add($this->lang['lang_name'], 'lang_name');
-			$t->add($this->lang['lang_resource'], 'lang_resource');
-			$t->add($this->lang['lang_state'], 'lang_state');
-			$t->add($this->lang['lang_vfree'], 'lang_vfree');
-			$t->add($this->lang['lang_vsize'], 'lang_vsize');
-			$t->add(sprintf($this->lang['label'], $data['name']), 'label');
-			$t->add($this->openqrm->get('baseurl'), 'baseurl');
-			return $t;
-		} else {
-			$msg = sprintf($this->lang['error_no_local'], $this->response->html->request()->get('storage_id'));
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $msg)
-			);
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return array|false
-	 */
-	//--------------------------------------------
-	function edit() {
-		if($this->deployment->type === 'linuxcoe-deployment') {
-			$resource_icon_default="/img/resource.png";
-			$storage_icon="/plugins/linuxcoe/img/plugin.png";
-			$state_icon = $this->openqrm->get('baseurl')."/img/".$this->resource->state.".png";
-			if ($this->file->exists($this->openqrm->get('webdir').$storage_icon)) {
-				$resource_icon_default=$storage_icon;
-			}
-			$resource_icon_default = $this->openqrm->get('baseurl').$resource_icon_default;
-
-			$d['state'] = '<img width="24" height="24" src="'.$state_icon.'">';
-			$d['icon'] = '<img width="24" height="24" src="'.$resource_icon_default.'">';
-			$d['resource'] = $this->resource->id.' / '.$this->resource->ip;
-			$d['name'] = $this->storage->name;
-			$d['id'] = $this->storage->id;
-
-			$a = $this->response->html->a();
-			$a->label = $this->lang['action_add'];
-			$a->css   = 'add';
-			$a->handler = 'onclick="wait();"';
-			$a->href  = $this->response->get_url($this->actions_name, "add");
-			$d['add'] = $a->get_string();
-
-			$body = array();
-			$identifier_disabled = array();
-
-			$table = $this->response->html->tablebuilder('linuxcoe_edit', $this->response->get_array($this->actions_name, 'edit'));
-			$table->sort            = 'linuxcoe_volume_id';
-			$table->limit           = 10;
-			$table->offset          = 0;
-			$table->order           = 'ASC';
-			$table->autosort        = true;
-			$table->sort_link       = false;
-			$table->init();
-
-			$linuxcoe_volume = new linuxcoe_volume();
-			$linuxcoe_volume_arr = $linuxcoe_volume->display_overview(0, 10000, $table->sort, $table->order);
-			if(count($linuxcoe_volume_arr) >= 1) {
-				foreach($linuxcoe_volume_arr as $k => $v) {
-
-					$c = $this->response->html->a();
-					$c->title   = $this->lang['action_clone'];
-					$c->label   = $this->lang['action_clone'];
-					$c->handler = 'onclick="wait();"';
-					$c->css     = 'clone';
-					$c->href    = $this->response->get_url($this->actions_name, "clone").'&volume='.$v['linuxcoe_volume_name'];
-
-					// edit image
-					$local_image = new image();
-					$local_image->get_instance_by_name($v['linuxcoe_volume_name']);
-					$e = $this->response->html->a();
-					$e->title   = $this->lang['action_edit'];
-					$e->label   = $this->lang['action_edit'];
-					$e->handler = 'onclick="wait();"';
-					$e->css     = 'edit';
-					$e->href    = '/openqrm/base/index.php?base=image&image_action=edit&image_id='.$local_image->id;
-
-					$body[] = array(
-						'icon' => $d['icon'],
-						'linuxcoe_volume_id' => $v['linuxcoe_volume_id'],
-						'linuxcoe_volume_name'   => $v['linuxcoe_volume_name'],
-						'linuxcoe_volume_root'   => $v['linuxcoe_volume_root'],
-						'description' => $v['linuxcoe_volume_description'],
-						'clone' => $c,
-						'edit' => $e,
-					);
-				}
-			}
-
-			$h['icon']['title'] = '&#160;';
-			$h['icon']['sortable'] = false;
-			$h['linuxcoe_volume_id']['title'] = $this->lang['table_id'];
-			$h['linuxcoe_volume_name']['title'] = $this->lang['table_name'];
-			$h['linuxcoe_volume_root']['title'] = $this->lang['table_root'];
-			$h['description']['title'] = $this->lang['table_description'];
-			$h['description']['sortable'] = false;
-			$h['clone']['title'] = '&#160;';
-			$h['clone']['sortable'] = false;
-			$h['edit']['title'] = '&#160;';
-			$h['edit']['sortable'] = false;
-
-			$table->id              = 'Tabelle';
-			$table->css             = 'htmlobject_table';
-			$table->border          = 1;
-			$table->cellspacing     = 0;
-			$table->cellpadding     = 3;
-			$table->form_action	    = $this->response->html->thisfile;
-			$table->max             = count($linuxcoe_volume_arr);
-			$table->head            = $h;
-			$table->body            = $body;
-			$table->identifier      = 'linuxcoe_volume_name';
-			$table->identifier_name = $this->identifier_name;
-			$table->identifier_disabled = $identifier_disabled;
-			$table->actions_name    = $this->actions_name;
-			$table->actions         = array(array('remove' => $this->lang['action_remove']));
-
-			$d['table'] = $table->get_string();
-			return $d;
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.remove.class.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.remove.class.php
deleted file mode 100644
index 864ea02..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.remove.class.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
- * Local-Storage Remove Volume(s)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class linuxcoe_remove
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'linuxcoe_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'linuxcoe_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'linuxcoe_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'linuxcoe_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-		require_once($this->openqrm->get('basedir').'/plugins/linuxcoe/web/class/linuxcoe-volume.class.php');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->remove();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/linuxcoe-remove.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function remove() {
-		$response = $this->get_response();
-		$volume_names  = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		if( $volume_names !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($volume_names as $ex) {
-				$d['param_f'.$i]['label']                       = $ex;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $ex;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;		
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$storage_id = $this->response->html->request()->get('storage_id');
-				$storage    = new storage();
-				$resource   = new resource();
-				$errors     = array();
-				$message    = array();
-				foreach($volume_names as $key => $volume_name) {
-
-					// check if an appliance is still using the volume as an image
-					$image = new image();
-					$image->get_instance_by_name($volume_name);
-
-					// check if it is still in use
-					$appliance = new appliance();
-					$appliances_using_resource = $appliance->get_ids_per_image($image->id);
-					if (count($appliances_using_resource) > 0) {
-						$appliances_using_resource_str = implode(",", $appliances_using_resource[0]);
-						$errors[] = sprintf($this->lang['msg_image_still_in_use'], $volume_name, $image->id, $appliances_using_resource_str);
-					} else {
-						// remove volume
-						$linuxcoe_volume = new linuxcoe_volume();
-						$linuxcoe_volume->remove_by_name($volume_name);
-						// remove the image of the volume
-						$image->remove_by_name($volume_name);
-
-						$form->remove($this->identifier_name.'['.$key.']');
-						$message[] = sprintf($this->lang['msg_removed'], $volume_name);
-
-					}
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'remove');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.select.class.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.select.class.php
deleted file mode 100644
index 277a484..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoe.select.class.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-/**
- * Local-Storage Select Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class linuxcoe_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'linuxcoe_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'linuxcoe_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'linuxcoe_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'linuxcoe_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$table = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/linuxcoe-select.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($table, 'table');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return htmlobject_tablebulider | htmlobject_div
-	 */
-	//--------------------------------------------
-	function select() {
-		// set ENV
-		$deployment = new deployment();
-		$storage    = new storage();
-		$resource   = new resource();
-
-		$deployment->get_instance_by_type("linuxcoe-deployment");
-		$table = $this->response->html->tablebuilder('linuxcoe_select', $this->response->get_array($this->actions_name, 'select'));
-		$table->sort      = 'storage_id';
-		$table->limit     = 10;
-		$table->offset    = 0;
-		$table->order     = 'ASC';
-		$table->max       = $storage->get_count_per_type($deployment->id);
-		$table->autosort  = false;
-		$table->sort_link = false;
-		$table->init();
-		$storages = $storage->display_overview_per_type($deployment->id, $table->offset, $table->limit, $table->sort, $table->order);
-
-		if(count($storages) >= 1) {
-			foreach($storages as $k => $v) {
-				$storage->get_instance_by_id($v["storage_id"]);
-				$resource->get_instance_by_id($storage->resource_id);
-				$deployment->get_instance_by_id($storage->type);
-				$resource_icon_default="/img/resource.png";
-				$storage_icon="/plugins/linuxcoe/img/plugin.png";
-				$state_icon = $this->openqrm->get('baseurl')."/img/".$resource->state.".png";
-				if ($this->file->exists($this->openqrm->get('webdir').$storage_icon)) {
-					$resource_icon_default=$storage_icon;
-				}
-				$resource_icon_default = $this->openqrm->get('baseurl').$resource_icon_default;
-
-				$a = $this->response->html->a();
-				$a->title   = $this->lang['action_edit'];
-				$a->label   = $this->lang['action_edit'];
-				$a->handler = 'onclick="wait();"';
-				$a->css     = 'edit';
-				$a->href    = $this->response->get_url($this->actions_name, "edit").'&storage_id='.$storage->id;
-
-				$data  = '<b>'.$this->lang['table_recource'].':</b> '.$resource->id.' / '.$resource->ip.'<br>';
-				$data .= '<b>'.$this->lang['table_type'].':</b> '.$deployment->type.'<br>';
-				$data .= '<b>'.$this->lang['table_deployment'].':</b> '.$deployment->storagedescription.'<br>';
-
-				$b[] = array(
-					'state' => '<img width="24" height="24" src="'.$state_icon.'" alt="State">',
-					'icon' => '<img width="24" height="24" src="'.$resource_icon_default.'" alt="Icon">',
-					'storage_id' => $storage->id,
-					'storage_name' => $storage->name,
-					'storage_resource_id' => $storage->resource_id,
-					'storage_data' => $data,
-					'storage_comment' => '',
-					'storage_edit' => $a->get_string(),
-				);
-			}
-
-			$h = array();
-			$h['state'] = array();
-			$h['state']['title'] ='&#160;';
-			$h['state']['sortable'] = false;
-			$h['icon'] = array();
-			$h['icon']['title'] ='&#160;';
-			$h['icon']['sortable'] = false;
-			$h['storage_id'] = array();
-			$h['storage_id']['title'] = $this->lang['table_id'];
-			$h['storage_name'] = array();
-			$h['storage_name']['title'] = $this->lang['table_name'];
-			$h['storage_resource_id'] = array();
-			$h['storage_resource_id']['title'] = $this->lang['table_recource'];
-			$h['storage_resource_id']['hidden'] = true;
-			$h['storage_data'] = array();
-			$h['storage_data']['title'] = '&#160;';
-			$h['storage_data']['sortable'] = false;
-			$h['storage_comment'] = array();
-			$h['storage_comment']['title'] ='&#160;';
-			$h['storage_comment']['sortable'] = false;
-			$h['storage_edit'] = array();
-			$h['storage_edit']['title'] = '&#160;';
-			$h['storage_edit']['sortable'] = false;
-
-			$table->id = 'Tabelle';
-			$table->css = 'htmlobject_table';
-			$table->border = 1;
-			$table->cellspacing = 0;
-			$table->cellpadding = 3;
-			$table->form_action	= $this->response->html->thisfile;
-			$table->head = $h;
-			$table->body = $b;
-			$table->limit_select = array(
-				array("value" => 10, "text" => 10),
-				array("value" => 20, "text" => 20),
-				array("value" => 30, "text" => 30),
-				array("value" => 40, "text" => 40),
-				array("value" => 50, "text" => 50),
-			);
-			return $table->get_string();
-		} else {
-			$a = $this->response->html->a();
-			$a->title   = $this->lang['new_storage'];
-			$a->label   = $this->lang['new_storage'];
-			$a->handler = 'onclick="wait();"';
-			$a->css     = 'add';
-			$a->href    = $this->response->html->thisfile.'?base=storage&storage_action=add';
-
-			$box = $this->response->html->div();
-			$box->id = 'Tabelle';
-			$box->css = 'htmlobject_box';
-			$content  = $this->lang['error_no_storage'].'<br><br>';
-			$content .= $a->get_string();
-			$box->add($content);
-			return $box->get_string();
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoeresource.class.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoeresource.class.php
deleted file mode 100644
index 5a950db..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoeresource.class.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This class represents a linuxcoeresource object in openQRM
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/kernel.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-$event = new event();
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $event;
-
-
-class linuxcoeresource {
-
-var $id = '';
-var $resource_id = '';
-
-
-//--------------------------------------------------
-/**
-* Constructor
-*/
-//--------------------------------------------------
-function linuxcoeresource() {
-	$this->init();
-}
-
-//--------------------------------------------------
-/**
-* init storage environment
-* @access public
-*/
-//--------------------------------------------------
-function init() {
-	global $OPENQRM_SERVER_BASE_DIR;
-	$this->_event = new event();
-	$this->_base_dir = $OPENQRM_SERVER_BASE_DIR;
-}
-
-
-// ---------------------------------------------------------------------------------
-// methods to set a resource boot-sequence
-// This is especially needed for KVM VMs since the boot-sequence "nc" does
-// not use the local disk for boot if set by pxe. -> bug in kvm
-// ---------------------------------------------------------------------------------
-
-function set_boot($resource_id, $boot) {
-	global $event;
-	$event->log("set_boot", $_SERVER['REQUEST_TIME'], 5, "linuxcoeresource.class.php", "Setting boot-sequence of resource ".$resource_id." to ".$boot.".", "", "", 0, 0, 0);
-	$boot_sequence = "net";
-	switch($boot) {
-		case '0':
-			// netboot
-			$boot_sequence = "net";
-			break;
-		case '1':
-			// local boot
-			$boot_sequence = "local";
-			break;
-	}
-	$linuxcoe_resource = new resource();
-	$linuxcoe_resource->get_instance_by_id($resource_id);
-	// is it a vm ?
-	if ($linuxcoe_resource->vhostid == $resource_id) {
-		return;
-	}
-	$linuxcoe_resource_virtualization = new virtualization();
-	$linuxcoe_resource_virtualization->get_instance_by_id($linuxcoe_resource->vtype);
-	switch($linuxcoe_resource_virtualization->type) {
-		case 'kvm-vm-net':
-			$linuxcoe_resource_vhost = new resource();
-			$linuxcoe_resource_vhost->get_instance_by_id($linuxcoe_resource->vhostid);
-			$linuxcoe_resource_set_boot_commmand = $this->_base_dir."/openqrm/plugins/kvm/bin/openqrm-kvm-vm setboot -m ".$linuxcoe_resource->mac." -b ".$boot_sequence." --openqrm-cmd-mode background";
-			$linuxcoe_resource_vhost->send_command($linuxcoe_resource_vhost->ip, $linuxcoe_resource_set_boot_commmand);
-			$event->log("set_boot", $_SERVER['REQUEST_TIME'], 5, "linuxcoeresource.class.php", "Resource ".$resource_id." is a KVM VM on Host ".$linuxcoe_resource_vhost->id.".", "", "", 0, 0, 0);
-			break;
-		case 'kvm-vm-local':
-			$linuxcoe_resource_vhost = new resource();
-			$linuxcoe_resource_vhost->get_instance_by_id($linuxcoe_resource->vhostid);
-			$linuxcoe_resource_set_boot_commmand = $this->_base_dir."/openqrm/plugins/kvm/bin/openqrm-kvm-vm setboot -m ".$linuxcoe_resource->mac." -b ".$boot_sequence." --openqrm-cmd-mode background";
-			$linuxcoe_resource_vhost->send_command($linuxcoe_resource_vhost->ip, $linuxcoe_resource_set_boot_commmand);
-			$event->log("set_boot", $_SERVER['REQUEST_TIME'], 5, "linuxcoeresource.class.php", "Resource ".$resource_id." is a KVM-Storage VM on Host ".$linuxcoe_resource_vhost->id.".", "", "", 0, 0, 0);
-			break;
-	}
-
-}
-
-
-
-// ---------------------------------------------------------------------------------
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoestate.class.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoestate.class.php
deleted file mode 100644
index cf90350..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/class/linuxcoestate.class.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This class represents a linuxcoestate object in openQRM
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/kernel.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-$event = new event();
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $event;
-
-
-class linuxcoestate {
-
-var $id = '';
-var $resource_id = '';
-var $install_start = '';
-var $timeout = '';
-
-//--------------------------------------------------
-/**
-* Constructor
-*/
-//--------------------------------------------------
-function linuxcoestate() {
-	$this->init();
-}
-
-//--------------------------------------------------
-/**
-* init storage environment
-* @access public
-*/
-//--------------------------------------------------
-function init() {
-	global $OPENQRM_SERVER_BASE_DIR;
-	$this->_event = new event();
-	$this->_db_table = "linuxcoe_state";
-	$this->_base_dir = $OPENQRM_SERVER_BASE_DIR;
-}
-
-
-
-
-
-// ---------------------------------------------------------------------------------
-// methods to create an instance of a linuxcoestate object filled from the db
-// ---------------------------------------------------------------------------------
-
-// returns an appliance from the db selected by id or name
-function get_instance($id, $resource_id) {
-	$db=openqrm_get_db_connection();
-	if ("$id" != "") {
-		$linuxcoestate_array = $db->Execute("select * from ".$this->_db_table." where linuxcoe_id=".$id);
-	} else if ("$resource_id" != "") {
-		$linuxcoestate_array = $db->Execute("select * from ".$this->_db_table." where linuxcoe_resource_id=".$resource_id);
-	} else {
-		$this->_event->log("get_instance", $_SERVER['REQUEST_TIME'], 2, "linuxcoestate.class.php", "Could not create instance of event without data", "", "", 0, 0, 0);
-		return;
-	}
-	foreach ($linuxcoestate_array as $index => $linuxcoestate) {
-		$this->id = $linuxcoestate["linuxcoe_id"];
-		$this->resource_id = $linuxcoestate["linuxcoe_resource_id"];
-		$this->install_start = $linuxcoestate["linuxcoe_install_start"];
-		$this->timeout = $linuxcoestate["linuxcoe_timeout"];
-	}
-	return $this;
-}
-
-// returns an linuxcoestate from the db selected by id
-function get_instance_by_id($id) {
-	$this->get_instance($id, "");
-	return $this;
-}
-
-// returns an linuxcoestate from the db selected by the resource_id
-function get_instance_by_resource_id($resource_id) {
-	$this->get_instance("", $resource_id);
-	return $this;
-}
-
-
-// ---------------------------------------------------------------------------------
-// general linuxcoestate methods
-// ---------------------------------------------------------------------------------
-
-
-
-
-// checks if given linuxcoestate id is free in the db
-function is_id_free($linuxcoestate_id) {
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select linuxcoe_id from ".$this->_db_table." where linuxcoe_id=".$linuxcoestate_id);
-	if (!$rs)
-		$this->_event->log("is_id_free", $_SERVER['REQUEST_TIME'], 2, "linuxcoestate.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	if ($rs->EOF) {
-		return true;
-	} else {
-		return false;
-	}
-}
-
-
-// adds linuxcoestate to the database
-function add($linuxcoestate_fields) {
-	if (!is_array($linuxcoestate_fields)) {
-		$this->_event->log("add", $_SERVER['REQUEST_TIME'], 2, "linuxcoestate.class.php", "linuxcoestate_field not well defined", "", "", 0, 0, 0);
-		return 1;
-	}
-	// set stop time and status to now
-	$now=$_SERVER['REQUEST_TIME'];
-	$db=openqrm_get_db_connection();
-	$result = $db->AutoExecute($this->_db_table, $linuxcoestate_fields, 'INSERT');
-	if (! $result) {
-		$this->_event->log("add", $_SERVER['REQUEST_TIME'], 2, "linuxcoestate.class.php", "Failed adding new linuxcoestate to database", "", "", 0, 0, 0);
-	}
-}
-
-
-
-// removes linuxcoestate from the database
-function remove($linuxcoestate_id) {
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("delete from ".$this->_db_table." where linuxcoe_id=".$linuxcoestate_id);
-}
-
-
-// removes linuxcoestate from the database by resource id
-function remove_by_resource_id($linuxcoestate_resource_id) {
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("delete from ".$this->_db_table." where linuxcoe_resource_id=".$linuxcoestate_resource_id);
-}
-
-
-
-// returns the number of linuxcoestates for an linuxcoestate type
-function get_count() {
-	$count=0;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select count(linuxcoe_id) as num from ".$this->_db_table);
-	if (!$rs) {
-		print $db->ErrorMsg();
-	} else {
-		$count = $rs->fields["num"];
-	}
-	return $count;
-}
-
-
-
-
-// returns a list of all linuxcoestate ids
-function get_all_ids() {
-	$linuxcoestate_list = array();
-	$query = "select linuxcoe_id from ".$this->_db_table;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute($query);
-	if (!$rs)
-		$this->_event->log("get_list", $_SERVER['REQUEST_TIME'], 2, "linuxcoestate.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	while (!$rs->EOF) {
-		$linuxcoestate_list[] = $rs->fields;
-		$rs->MoveNext();
-	}
-	return $linuxcoestate_list;
-
-}
-
-
-
-
-
-// ---------------------------------------------------------------------------------
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/css/linuxcoe.css b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/css/linuxcoe.css
deleted file mode 100644
index e69de29..0000000
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/image.linuxcoe-deployment.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/image.linuxcoe-deployment.php
deleted file mode 100644
index 92a02a0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/image.linuxcoe-deployment.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-
-// global event for logging
-$event = new event();
-global $event;
-
-
-function get_linuxcoe_deployment_image_rootdevice_identifier($local_storage_storage_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_ADMIN;
-	global $event;
-	$rootdevice_identifier_array[] = array("value" => "sda", "label" => "Local SCSI Disk 1");
-	return $rootdevice_identifier_array;
-}
-
-function get_linuxcoe_deployment_image_default_rootfs() {
-	return "local fileystem";
-}
-
-function get_linuxcoe_deployment_rootfs_transfer_methods() {
-	return false;
-}
-
-function get_linuxcoe_deployment_rootfs_set_password_method() {
-	return true;
-}
-
-function get_linuxcoe_deployment_is_network_deployment() {
-	return true;
-}
-
-function get_linuxcoe_deployment_local_deployment_enabled() {
-	return true;
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/img/plugin.png
deleted file mode 100644
index 8b06f2a..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/de.linuxcoe-about.ini b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/de.linuxcoe-about.ini
deleted file mode 100644
index 7f894ba..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/de.linuxcoe-about.ini
+++ /dev/null
@@ -1,96 +0,0 @@
-[documentation]
-tab = "Über LinuxCOE"
-label = "Über LinuxCOE"
-introduction_title = "Einleitung"
-introduction_content = "Das 'LinuxCOE' Plugin verwaltet <a href='http://linuxcoe.sourceforge.net/' target='_BLANK'>LinuxCOE</a> Install Server für voll automatische Linux Installationen.
-
-	LinuxCOE bietet eine Benutzer-freundliche Oberfläche um automatische Linux Installationen für verschiedene Distribution (Debian/Ubuntu/CentOS etc.) zu erstellen.
-	Die resultierenden ISO Dateien werden dann benutzt um Physikalische Server und auch Virtuelle Maschinenen vollautomatisch mit einer Linux Installation zu provisionieren.<br>
-	Die Integration von LinuxCOE in openQRM bietet zwei verschiedene Modi:<br><br>
-
-		<strong>Automatische Installation per ISO</strong><br>
-		Nach dem erstellen eines Installations Templates kann die resultierende ISO Datei auf eine CD transferiert werden die dann benutzt werden kann um Physikalische Systeme automatisch zu installieren.
-		(das eigentliche Ziel des LinuxCOE Projektes)<br><br>
-		In openQRM sind die ISO Dateien der Installation Templates automatisch auf allen Virtualisations Hosts vom Typ 'local-deployment VMs' (z.B. 'kvm-storage' und 'xen-storage') im /linuxcoe-iso Verzeichnis verfügbar.
-		Eine Virtuelle Maschine lässt sich so einfach konfigurieren von einer der LinuxCOE ISO Dateien zu starten um die automatische Installation durchzuführen.<br><br>
-		Beachten Sie das nach einer erfolgreichen automatischen Installation die VM immer noch konfiguriert ist von der ISO Datei zu starten!
-		Bitte stoppen Sie die Server der VM, dann re-konfigurieren Sie die VM von der lokalen Festplatte zu starten. Danach starten Sie die Server erneut.<br><br>
-
-		<strong>Automatische Netzwerk-Installation</strong><br>
-		Die LinuxCOE Integration in openQRM bietet zusätzlich die Möglichkeit die vor-konfigurierten Installation Templates per Netzwerk-Deployment ('network-deployment') zu benutzen.
-		Für Netzwerk-Deployment sind Physikalische Server sowie auch Virtuelle Maschinen vom Typ 'local-deployment VMs' (z.B. 'kvm-storage' und 'xen-storage') unterstützt.<br>
-		-> Physikalische Server und VMs die mittles Netzwerk-Deployment provisioniert werden müssent per BIOS Einstellung oder VM Konfiguration auf 'netzwerk-boot' (PXE) eingestellt werden!<br><br>
-		Die Provisionierung der LinuxCEO Templates wird in openQRM mittels des 'install-from-template' Mechanismus durchgeführt der erlaubt Templates für automatische Installationen an Images anzuhängen.
-		Für Virtuelle Maschinen können die Templates direkt an das Image der Virtuellen Maschine angehängt werden, für physikalische Server erstellen Sie bitte ein Image das auf eine der lokalen Festplatten zeigt mittels des LinuxCOE 'Image Manager'.<br><br>
-		Starten eines Server mit einem LinuxCOE Template angehängt an dem Image der Server führt automatisch die spezifizierte automatische Installation des Systems durch.<br><br>
-		Während des Netzwerk-Deployment Vorgang wird automatisch auch der openQRM-Client auf dem System installiert und das System wird in openQRM integriert.
-		Nach erfolgreicher automatischer Installation startet die Ressource automatisch von der lokalen Festplatte.<br><br>
-
-		<strong>Cloud Deployment</strong><br>
-		Images mit einem angehängten LinuxCOE <strong>Automatischen Netzwerk-Installations</strong> Template werden voll unterstützt für Cloud Deployment!<br><br>
-"
-
-requirements_title = "Anforderungen"
-requirements_list = "<ul><li>Die folgenden Paket werden benötigt: screen, make, autoconf, automake, genisoimage, sudo, nfs-kernel-server, nfs-common</li></ul>"
-
-tested_title = "Testet mit"
-tested_content = "Diese Plugin ist getestet mit Debian, Ubuntu und CentOS Linux Distributionen"
-
-provides_title = "Bietet"
-provides_list = "<ul><li>Storage Typen: 'linuxcoe-deployment'</li>
-				   <li>Deployment types: 'Automatic Linux Installation (LinuxCOE)'</li></ul>"
-
-howto_title = "Deployment mit LinuxCOE"
-howto_list = "<ul><li>Erstellen Sie aus der openQRM Ressource eine LinuxCOE Storage vom Typ 'linuxcoe-deployment'</li>
-					<li>Erstellen Sie ein oder mehrere LinuxCOE Automatische Installations Templates</li>
-					<li>Fügen Sie den Templates mittels des 'Template Managers' eine kurze Beschreibung hinzu</li>
-					<li>Wählen Sie entweder <strong>Automatische Installation per ISO</strong> oder <strong>Automatische Netzwerk-Installation</strong> um die Templates zu provisionieren.</li></ul>"
-
-type_title = "Plugin Typ"
-type_content = "Deployment"
-
-deployment_title = "Deployment Typ"
-deployment_content = "Local-Deployment"
-
-documentation_title = "Dokumentation"
-use_case_title = "Anwendungsfall"
-network_deploymet = "Netzwerk-Deployment"
-doc1 = ""
-
-
-[bootservice]
-tab = "Boot-Service"
-label = "LinuxCOE Boot-Service"
-boot_service_title = "LinuxCOE Boot-Service"
-boot_service_content = "Das LinuxCOE Plugin beinhaltet einen openQRM Boot-Service.
-			Dieser 'LinuxCOE Boot-Service' wird automatisch von allen in openQRM integrierten Systeme heruntergeladen und ausgeführt.
-			Der Boot-Service befindet sich unter:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/linuxcoe/web/boot-service-linuxcoe.tgz</b></i>
-			<br>
-			<br>
-			Der 'LinuxCOE Boot-Service' beinhaltet die 'Client' Dateien des LinuxCOE Plugin.<br>
-			Eine Konfigurationsdatei für den LinuxCOE Server ist ebenfalls enhalten.<br>
-			<br>
-			Die Boot-Service konfiguration wird mittels des 'openqrm' Kommandozeilenwerkzeugs verwaltet.<br>
-			Der folgende Befehl zeigt die die momentane 'default' Boot-Service Konfiguration an:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n linuxcoe -a default</b></i>
-			<br>
-			<br>
-			Die Boot-Service Konfiguration eines speziellen Server zeigt der folgende Befehl an:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n linuxcoe -a [Server-name]</b></i>
-			<br>
-			<br>
-			Der folgende Befehl passt einen Konfigurationparameter des 'default' Boot-Service an:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n linuxcoe -a default -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			Die Boot-Service Konfigurarationsparameter eines speziellen Server passt der folgende Befehl an:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n linuxcoe -a [Server-name] -k [key] -v [value]</b></i>
-			<br>
-			<br>"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/de.linuxcoe-template.ini b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/de.linuxcoe-template.ini
deleted file mode 100644
index 7b816af..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/de.linuxcoe-template.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-[select]
-tab = "LinuxCOE Templates"
-label = "LinuxCOE Automatic Installation Templates"
-action_edit = "edit"
-action_remove = "remove"
-table_name = "Name"
-table_id = "ID"
-table_comment = "Beschreibung"
-please_wait = "Lade LinuxCOE Templates. Bitte warten .."
-[edit]
-tab = "Bearbeite LinuxCOE Template"
-label = "Bearbeite LinuxCOE Template %s Beschreibung"
-form_comment = "Description"
-form_post = "Custom POST-Install Sektion"
-msg_edit = "LinuxCOE Template %s bearbeietet"
-error_comment = "Kommentar darf nur %s beinhalten"
-please_wait = "Lade LinuxCOE Templates. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[remove]
-tab = "Entferne LinuxCOE Templates"
-label = "Entferne LinuxCOE Template(s)"
-msg_removed = "LinuxCOE Template %s entfertn"
-please_wait = "Lade LinuxCOE Templates. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/de.linuxcoe.ini b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/de.linuxcoe.ini
deleted file mode 100644
index 76c60a1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/de.linuxcoe.ini
+++ /dev/null
@@ -1,69 +0,0 @@
-[select]
-tab = "LinuxCOE Server auswählen"
-label = "LinuxCOE Server auswählen"
-action_edit = "bearbeiten"
-table_name = "Name"
-table_id = "Id"
-table_recource = "Resource"
-table_type = "Typ"
-table_deployment = "Deployment"
-error_no_storage = "<b>Keine Storage angelegt!</b><br><br>Bitte legen Sie erst eine LinuxCOE Storage an!"
-new_storage = "Neue Storage"
-please_wait = "Lade Storage. Bitte warten .."
-[edit]
-tab = "LinuxCOE Server bearbeiten"
-label = "LinuxCOE Volumes auf Storage %s"
-lang_id = "ID"
-lang_name = "Name"
-lang_resource = "Resource"
-lang_state = "Status"
-lang_vfree = "Frei"
-lang_vsize = "Gesamt"
-action_add = "Neues Volume anlegen"
-action_refresh = "Reload Page"
-action_clone = "klonen"
-action_manual = "Manuelle Konfiguration"
-action_remove = "löschen"
-action_auth = "Berechtigung"
-action_edit = "Image dieses Volumes bearbeiten"
-action_clone_in_progress = "Syncronisation in Bearbeitung - Bitte warten"
-action_clone_finished = "Syncronisation beendet!"
-table_name = "Name"
-table_id = "ID"
-table_root = "Laufwerk"
-table_description = "Beschreibung"
-error_no_local = "Storage %s ist nicht vom Typ LinuxCOE"
-please_wait = "Lade Volumes. Bitte warten .."
-manual_configured = "Storage ist manuell konfiguriert und kann nicht von openQRM verwaltet werden!"
-[add]
-tab = "Neues LinuxCOE Volume"
-label = "Neues LinuxCOE Volume anlegen"
-form_name = "Name"
-form_root = "Laufwerk"
-form_description = "Beschreibung"
-lang_name_generate = "Name generieren"
-msg_added = "Volume %s angelegt"
-msg_add_failed = "Fehler beim anlegen des Volumes %s"
-error_exists = "Volume %s besteht bereits"
-error_image_exists = "Image mit Namen %s besteht bereits"
-error_name = "Name darf nur %s beinhalten"
-error_description = "Beschreibung darf nur %s beinhalten"
-please_wait = "Erstelle Volume. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[clone]
-tab = "Volume klonen"
-label = "Volume klonen"
-form_name = "Name"
-lang_name_generate = "Name generieren"
-msg_cloned = "Klone %s als %s"
-msg_clone_failed = "Fehler beim Klonen des Volumes %s"
-error_exists = "Volume %s besteht bereits"
-error_name = "Name darf nur %s beinhalten"
-please_wait = "Klone Volume. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[remove]
-label = "Volume(s) löschen"
-msg_removed = "Volume %s gelöscht"
-msg_image_still_in_use = "Das Volume %s des Image ID %s ist noch in benutztung von Server %s"
-please_wait = "Lösche Volume(s). Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/en.linuxcoe-about.ini b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/en.linuxcoe-about.ini
deleted file mode 100644
index 11b160a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/en.linuxcoe-about.ini
+++ /dev/null
@@ -1,93 +0,0 @@
-[documentation]
-tab = "About LinuxCOE"
-label = "About LinuxCOE"
-introduction_title = "Introduction"
-introduction_content = "The 'LinuxCOE' plugin integrates <a href='http://linuxcoe-project.org/' target='_BLANK'>LinuxCOE</a> Install Server for automatic Linux deployments.
-			LinuxCOE comes with a user-friendly UI to create automatic Linux installations for different distributions (Debian/Ubuntu/CentOS etc.) resulting in ISO files/images which can be used to
-			fully automatically install physical Server and also Virtual Machines.<br>The integration of LinuxCOE in openQRM provides two different modes:<br><br>
-
-				<strong>Automatic Installations from ISO</strong><br>
-				After creating an Installation Template the resulting ISO image can be burned on an CD to automatically install a physical Server (the initial goal of the LinuxCOE Project).<br><br>
-				In openQRM the LinuxCOE ISO Images are also automatically available on Virtualization Host from the type 'local-deployment VMs' (e.g. 'kvm-storage' and 'xen-storage') in the /linuxcoe-iso directory.
-				Simply configure a Virtual Machine to boot from such a LinuxCOE ISO image for an fully automatic VM installation.<br><br>
-				Please notice that after a successfull installation the VM will most likely try to boot from the ISO image again after the automatic install procedure finished!
-				Please stop the VMs Server after the initial automatic installation, then re-configure the Virtual Machine to boot from 'local' and start the Server again.<br><br>
-
-				<strong>Automatic Network-Installations</strong><br>
-				The LinuxCOE integration in openQRM provides the capability to use the pre-configured automatic installations templates also for 'network-deployment'.
-				For 'network-deployment' physical Server and Virtual Machines from the type 'local-deployment for VMs' (e.g. 'kvm-storage' and 'xen-storage') are supported.<br>
-				-> physical Server and VMs for 'network-deployment' must be set to network-boot (PXE) either in the BIOS or VM configuration!<br><br>
-				The deployment of the LinuxCOE templates works via openQRMs 'install-from-template' mechanism which allows to attach those automatic installation templates to Images.
-				For Virtual Machines the templates can be directly attached to the Virtual Machines Image, for physical Server please create an Image pointing to a local disk with the LinuxCOE 'Image Manager'.<br><br>
-				Starting an Server with an LinuxCOE automatic installation template attached to its Image automatically applies the specified configuration and automatically installs the systems.<br><br>
-				Network-deploying LinuxCOE templates automatically installs the openQRM-Client and integrates the system into openQRM.
-				After the automatic installation the resource (physical Server or VM) is automatically set to local-boot.<br><br>
-
-				<strong>Cloud deployment</strong><br>
-				Images with an attached LinuxCOE <strong>Automatic Network-Installation</strong> template are fully supported for Cloud-deployment!<br><br>"
-
-requirements_title = "Requirements"
-requirements_list = "<ul><li>A LinuxCOE Install Server Storage using the openQRM as the resource</li>
-				   <li>The following packages must be installed: screen, make, autoconf, automake, genisoimage, sudo, nfs-kernel-server, nfs-common</li></ul>"
-
-tested_title = "Tested with"
-tested_content = "This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions."
-
-provides_title = "Provides"
-provides_list = "<ul><li>Storage type: 'linuxcoe-deployment'</li>
-					<li>Deployment types: 'Automatic Linux Installation (LinuxCOE)'</li></ul>"
-
-howto_title = "How to use"
-howto_list = "<ul><li>Create a new Storage from type 'linuxcoe-deployment' using the openQRM Server as the resource</li>
-					<li>Create one or more LinuxCOE Installation Templates</li>
-					<li>Use the Template Manager to add a description to your Installation Templates</li>
-					<li>Choose either <strong>Automatic Installations from ISO</strong> or <strong>Automatic Network-Installations</strong> to deploy the Templates</li></ul>"
-
-type_title = "Plugin Type"
-type_content = "Deployment"
-
-deployment_title = "Deployment Type"
-deployment_content = "Local-Deployment"
-
-documentation_title = "Documentation"
-use_case_title = "Use-Case"
-network_deploymet = "Network-Deployment"
-doc1 = ""
-
-
-[bootservice]
-tab = "Boot-Service"
-label = "LinuxCOE Boot-Service"
-boot_service_title = "LinuxCOE Boot-Service"
-boot_service_content = "The LinuxCOE Plugin provides an openQRM Boot-Service.
-			This 'LinuxCOE Boot-Service' is automatically downloaded and executed by the openQRM-Client on all integrated Systems.
-			The Boot-Service is located at:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/linuxcoe/web/boot-service-linuxcoe.tgz</b></i>
-			<br>
-			<br>
-			The 'LinuxCOE Boot-Service contains the Client files of the LinuxCOE Plugin.<br>
-			Also a configuration file for the LinuxCOE server is included in this Boot-Service.<br>
-			<br>
-			The Boot-Service configuration can be viewed and administrated by the 'openqrm' utility.<br>
-			To view the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n linuxcoe -a default</b></i>
-			<br>
-			<br>
-			To view a Boot-Service configuration of a specific Server run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n linuxcoe -a [Server-name]</b></i>
-			<br>
-			<br>
-			To adapt a parameter in the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n linuxcoe -a default -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			To adapt a paramter in the Boot-Service configuration of a specific Server run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n linuxcoe -a [Server-name] -k [key] -v [value]</b></i>
-			<br>
-			<br>"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/en.linuxcoe-template.ini b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/en.linuxcoe-template.ini
deleted file mode 100644
index 8805e05..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/en.linuxcoe-template.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-[select]
-tab = "LinuxCOE Templates"
-label = "LinuxCOE Automatic Installation Templates"
-action_edit = "edit"
-action_remove = "remove"
-table_name = "Name"
-table_id = "ID"
-table_comment = "Description"
-please_wait = "Loading LinuxCOE Templates. Please wait .."
-[edit]
-tab = "Edit LinuxCOE Template"
-label = "Edit LinuxCOE Template %s description"
-form_comment = "Description"
-form_post = "Custom POST-Install section"
-msg_edit = "Updated LinuxCOE Template %s"
-error_comment = "Comment must be %s"
-please_wait = "Loading LinuxCOE Templates. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[remove]
-tab = "Remove LinuxCOE Templates"
-label = "Remove LinuxCOE Template(s)"
-msg_removed = "Removed Volume %s"
-please_wait = "Removing Volume(s). Please wait .."
-canceled = "Operation canceled. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/en.linuxcoe.ini b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/en.linuxcoe.ini
deleted file mode 100644
index 8ccca2d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/lang/en.linuxcoe.ini
+++ /dev/null
@@ -1,69 +0,0 @@
-[select]
-tab = "Select LinuxCOE-storage"
-label = "Select LinuxCOE-storage"
-action_edit = "edit"
-table_name = "Name"
-table_id = "Id"
-table_recource = "Resource"
-table_type = "Type"
-table_deployment = "Deployment"
-error_no_storage = "<b>No storage configured yet!</b><br><br>Please create a LinuxCOE Storage first!"
-new_storage = "New Storage"
-please_wait = "Loading Storage. Please wait .."
-[edit]
-tab = "Edit LinuxCOE-storage"
-label = "LinuxCOE Volumes on storage %s"
-lang_id = "ID"
-lang_name = "Name"
-lang_resource = "Resource"
-lang_state = "State"
-lang_vfree = "Free"
-lang_vsize = "Total"
-action_add = "Add new Volume"
-action_refresh = "Reload Page"
-action_manual = "Manual Configuration"
-action_clone = "clone"
-action_remove = "remove"
-action_auth = "auth"
-action_edit = "Edit Image of this Volume"
-action_clone_in_progress = "Synchronisation in progress - Please wait"
-action_clone_finished = "Syncronisation finished!"
-table_name = "Name"
-table_id = "ID"
-table_root = "Root device"
-table_description = "Description"
-error_no_local = "Storage %s is not of type local-deployment"
-please_wait = "Loading Volumes. Please wait .."
-manual_configured = "Storage is manually configured and can not be be edited by openQRM"
-[add]
-tab = "Add LinuxCOE Volume"
-label = "Add new Volume"
-form_name = "Name"
-form_root = "Device"
-form_description = "Description"
-lang_name_generate = "generate name"
-msg_added = "Added Volume %s"
-msg_add_failed = "Failed to add Volume %s"
-error_exists = "Volume %s already exists"
-error_image_exists = "Image with name %s already exists"
-error_name = "Name must be %s"
-error_description = "Description must be %s"
-please_wait = "Adding Volume. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[clone]
-tab = "Clone LinuxCOE Volume"
-label = "Clone Volume %s"
-form_name = "Name"
-lang_name_generate = "generate name"
-msg_cloned = "Cloned %s as %s"
-msg_clone_failed = "Failed to clone Volume %s"
-error_exists = "Volume %s already exists"
-error_name = "Name must be %s"
-please_wait = "Cloning Volume. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[remove]
-label = "Remove Volume(s)"
-msg_removed = "Removed Volume %s"
-msg_image_still_in_use = "Volume %s of Image id %s is still in use by Server %s"
-please_wait = "Removing Volume(s). Please wait .."
-canceled = "Operation canceled. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/linuxcoe-action.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/linuxcoe-action.php
deleted file mode 100644
index c365be9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/linuxcoe-action.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-// error_reporting(E_ALL);
-$thisfile = basename($_SERVER['PHP_SELF']);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-$BaseDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-// filter inputs
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-$event = new event();
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $event;
-
-// user/role authentication
-if ($OPENQRM_USER->role != "administrator") {
-	$event->log("authorization", $_SERVER['REQUEST_TIME'], 1, "linuxcoe-action", "Un-Authorized access to linuxcoe-actions from $OPENQRM_USER->name", "", "", 0, 0, 0);
-	exit();
-}
-
-$linuxcoe_command = $request->get('linuxcoe_command');
-
-// main
-$event->log("$linuxcoe_command", $_SERVER['REQUEST_TIME'], 5, "linuxcoe-action", "Processing linuxcoe command $linuxcoe_command", "", "", 0, 0, 0);
-
-switch ($linuxcoe_command) {
-
-	case 'init':
-		// create linuxcoe_state
-		// -> linuxcoe_state
-		// linuxcoe_id BIGINT
-		// linuxcoe_resource_id BIGINT
-		// linuxcoe_install_start VARCHAR(20)
-		// linuxcoe_timeout BIGINT
-		$create_linuxcoe_state = "create table linuxcoe_state(linuxcoe_id BIGINT, linuxcoe_resource_id BIGINT, linuxcoe_install_start VARCHAR(20), linuxcoe_timeout BIGINT)";
-		$db=openqrm_get_db_connection();
-		$recordSet = $db->Execute($create_linuxcoe_state);
-		// -> linuxcoe_volumes
-		// linuxcoe_volume_id BIGINT
-		// linuxcoe_volume_name VARCHAR(50)
-		// linuxcoe_volume_size VARCHAR(50)
-		// linuxcoe_volume_description VARCHAR(255)
-		$create_linuxcoe_volume_table = "create table linuxcoe_volumes(linuxcoe_volume_id BIGINT, linuxcoe_volume_name VARCHAR(50), linuxcoe_volume_root VARCHAR(50), linuxcoe_volume_description VARCHAR(255))";
-		$db=openqrm_get_db_connection();
-		$recordSet = $db->Execute($create_linuxcoe_volume_table);
-		break;
-
-	case 'uninstall':
-		// remove linuxcoe_resource
-		$remove_linuxcoe_state = "drop table linuxcoe_state;";
-		$db=openqrm_get_db_connection();
-		$recordSet = $db->Execute($remove_linuxcoe_state);
-		// remove volume table
-		$drop_linuxcoe_volume_table = "drop table linuxcoe_volumes";
-		$db=openqrm_get_db_connection();
-		$recordSet = $db->Execute($drop_linuxcoe_volume_table);
-		break;
-
-
-
-	default:
-		$event->log("$linuxcoe_command", $_SERVER['REQUEST_TIME'], 3, "linuxcoe-action", "No such event command ($linuxcoe_command)", "", "", 0, 0, 0);
-		break;
-
-
-}
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/menu.txt
deleted file mode 100644
index 83359b1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/menu.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|LinuxCOE
-...|Create Templates|index.php?iframe=/systemdesigner-cgi-bin/coe_bootimage|Create new LinuxCOE Automatic-Installation Templates
-...|Image Manager|index.php?plugin=linuxcoe&controller=linuxcoe|Linuxcoe Image Manager
-...|Template Manager|index.php?plugin=linuxcoe&controller=linuxcoe-template|Manage LinuxCOE Automatic-Installation Templates
-...|About|index.php?plugin=linuxcoe&controller=linuxcoe-about|How to use
-...|Config|index.php?plugin=linuxcoe&controller=linuxcoe-about&linuxcoe_about_action=bootservice|LinuxCOE Boot-Service
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/openqrm-linuxcoe-appliance-hook.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/openqrm-linuxcoe-appliance-hook.php
deleted file mode 100644
index 96f99ee..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/openqrm-linuxcoe-appliance-hook.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-// special linuxcoe classes
-require_once "$RootDir/plugins/linuxcoe/class/linuxcoestate.class.php";
-require_once "$RootDir/plugins/linuxcoe/class/linuxcoeresource.class.php";
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $openqrm_server;
-$event = new event();
-global $event;
-
-
-function openqrm_linuxcoe_appliance($cmd, $appliance_fields) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	$openqrm_server = new openqrm_server();
-	$appliance_id=$appliance_fields["appliance_id"];
-	$appliance_name=$appliance_fields["appliance_name"];
-	$resource = new resource();
-	$resource->get_instance_by_id($appliance_fields["appliance_resources"]);
-	$resource_mac=$resource->mac;
-	$resource_ip=$resource->ip;
-	$appliance = new appliance();
-	$appliance->get_instance_by_id($appliance_id);
-	$linuxcoe_install_timeout = 240;
-	// check appliance values, maybe we are in update and they are incomplete
-	if ($appliance->imageid == 1) {
-		return;
-	}
-	if (($resource->id == "-1") || ($resource->id == "")) {
-		return;
-	}
-
-	// check if image is type linuxcoe-deployment
-	$image = new image();
-	$image->get_instance_by_id($appliance->imageid);
-	// linuxcoe configured in image deployment parameters ?
-	$linuxcoe_auto_install_enabled = false;
-	$linuxcoe_deployment_parameters = trim($image->get_deployment_parameter("INSTALL_CONFIG"));
-	if (strlen($linuxcoe_deployment_parameters)) {
-		$linuxcoe_deployment_parameter_arr = explode(":", $linuxcoe_deployment_parameters);
-		$local_deployment_persistent = $linuxcoe_deployment_parameter_arr[0];
-		$local_deployment_type = $linuxcoe_deployment_parameter_arr[1];
-		if (strcmp($local_deployment_type, "linuxcoe-deployment")) {
-			$event->log("openqrm_linuxcoe_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-linuxcoe-appliance-hook.php", "Appliance ".$appliance_id."/".$appliance_name." image is not from type linuxcoe-deployment", "", "", 0, 0, $resource->id);
-			return;
-		}
-		$linuxcoe_server_storage_id = $linuxcoe_deployment_parameter_arr[2];
-		$linuxcoe_install_profile = $linuxcoe_deployment_parameter_arr[3];
-		$linuxcoe_auto_install_enabled = true;
-	}
-
-
-	$event->log("openqrm_linuxcoe_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-linuxcoe-appliance-hook.php", "Handling $cmd event $appliance_id/$appliance_name/$resource_ip/$resource_mac", "", "", 0, 0, $resource->id);
-	switch($cmd) {
-		case "start":
-			$event->log("openqrm_linuxcoe_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-linuxcoe-appliance-hook.php", "START event $appliance_id/$appliance_name/$resource_ip/$resource_mac", "", "", 0, 0, $resource->id);
-
-			if ($linuxcoe_auto_install_enabled) {
-				// prepare automatic-installation / transfer client to linuxcoe server
-				$linuxcoe_command = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/linuxcoe/bin/openqrm-linuxcoe-manager transfer_to_linuxcoe -x ".$resource->id." -i ".$resource_ip." -m ".$resource_mac." -n ".$linuxcoe_install_profile." --openqrm-cmd-mode background";
-				$event->log("openqrm_linuxcoe_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-linuxcoe-appliance-hook.php", "transfer_to_linuxcoe $resource_ip / $linuxcoe_install_profile", "", "", 0, 0, $resource->id);
-				$openqrm_server->send_command($linuxcoe_command, NULL, true);
-				// Remove image-deployment paramters, if auto-install is a single-shot actions
-				if (!strcmp($local_deployment_persistent, "0")) {
-					$image->set_deployment_parameters("INSTALL_CONFIG", "");
-				}
-
-				// create linuxcoestate-state object to allow to run a late setboot to local command on the vm host
-				$linuxcoe_state = new linuxcoestate();
-				$linuxcoe_state->remove_by_resource_id($resource->id);
-				$linuxcoe_state_fields=array();
-				$linuxcoe_state_fields["linuxcoe_id"]=(int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$linuxcoe_state_fields["linuxcoe_resource_id"]=$resource->id;
-				$linuxcoe_state_fields["linuxcoe_install_start"]=$_SERVER['REQUEST_TIME'];
-				$linuxcoe_state_fields["linuxcoe_timeout"]=$linuxcoe_install_timeout;
-				$linuxcoe_state->add($linuxcoe_state_fields);
-
-
-			} else {
-
-				if (strcmp($image->type, "linuxcoe-deployment")) {
-					$event->log("openqrm_linuxcoe_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-linuxcoe-appliance-hook.php", "Appliance $appliance_id/$appliance_name image is not from type linuxcoe-deployment", "", "", 0, 0, $resource->id);
-				} else {
-					// we have auto-installed already, if it is VM the linuxcoeresource object will care to set the boot-sequence on the VM Host to local boot
-					$linuxcoeresource = new linuxcoeresource();
-					$linuxcoeresource->set_boot($resource->id, 1);
-					// set pxe config to local-boot
-					$event->log("openqrm_linuxcoe_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-linuxcoe-appliance-hook.php", "Setting resource $resource_ip to local-boot", "", "", 0, 0, $resource->id);
-					$linuxcoe_command = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/linuxcoe/bin/openqrm-linuxcoe-manager set_linuxcoe_client_to_local_boot -m ".$resource_mac." --openqrm-cmd-mode background";
-					$openqrm_server->send_command($linuxcoe_command, NULL, true);
-				}
-			}
-			break;
-
-
-		case "stop":
-
-			if (strcmp($image->type, "linuxcoe-deployment")) {
-				$event->log("stop", $_SERVER['REQUEST_TIME'], 5, "openqrm-linuxcoe-appliance-hook.php", "Appliance $appliance_id/$appliance_name image is not from type linuxcoe-deployment", "", "", 0, 0, $resource->id);
-			} else {
-				$event->log("stop", $_SERVER['REQUEST_TIME'], 5, "openqrm-linuxcoe-appliance-hook.php", "Stop event for appliance ".$appliance_id."/".$appliance->name.".", "", "", 0, 0, $resource->id);
-				// remove linuxcoestate-state object if existing
-				$local_storage_state = new linuxcoestate();
-				$local_storage_state->remove_by_resource_id($resource->id);
-				// if it is VM the linuxcoeresource object will care to set the boot-sequence on the VM Host to network boot
-				$linuxcoeresource = new linuxcoeresource();
-				$linuxcoeresource->set_boot($resource->id, 0);
-
-			}
-			break;
-
-
-	}
-
-
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/openqrm-linuxcoe-monitor-hook.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/openqrm-linuxcoe-monitor-hook.php
deleted file mode 100644
index 5ccafdf..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/openqrm-linuxcoe-monitor-hook.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-// error_reporting(E_ALL);
-$thisfile = basename($_SERVER['PHP_SELF']);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-$BaseDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/image_authentication.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/event.class.php";
-// special linuxcoe classes
-require_once "$RootDir/plugins/linuxcoe/class/linuxcoestate.class.php";
-require_once "$RootDir/plugins/linuxcoe/class/linuxcoeresource.class.php";
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-$event = new event();
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-
-
-
-// this function is going to manage the linuxcoe installation states
-function openqrm_linuxcoe_monitor() {
-	global $event;
-	global $RootDir;
-	global $openqrm_server;
-	global $OPENQRM_SERVER_BASE_DIR;
-
-	// $event->log("openqrm_linuxcoe_monitor", $_SERVER['REQUEST_TIME'], 5, "openqrm-linuxcoe-monitor-hook.php", "Checking the linuxcoe states .....", "", "", 0, 0, 0);
-	$now = $_SERVER['REQUEST_TIME'];
-	$linuxcoe_state_monitor = new linuxcoestate();
-	$linuxcoe_state_id_arr = $linuxcoe_state_monitor->get_all_ids();
-	foreach($linuxcoe_state_id_arr as $linuxcoe_state_id_db) {
-		$linuxcoe_state_id = $linuxcoe_state_id_db['linuxcoe_id'];
-		$linuxcoe_state = new linuxcoestate();
-		$linuxcoe_state->get_instance_by_id($linuxcoe_state_id);
-		$linuxcoe_time_diff = $now - $linuxcoe_state->install_start;
-		if ($linuxcoe_time_diff >= $linuxcoe_state->timeout) {
-			$event->log("openqrm_linuxcoe_monitor", $_SERVER['REQUEST_TIME'], 5, "openqrm-linuxcoe-monitor-hook.php", "Linuxcoe states resource ".$linuxcoe_state->resource_id." timeout, setting to localboot.....", "", "", 0, 0, 0);
-			$linuxcoeresource = new linuxcoeresource();
-			$linuxcoeresource->set_boot($linuxcoe_state->resource_id, 1);
-			// remove
-			$linuxcoe_state->remove($linuxcoe_state->id);
-		} else {
-			$event->log("openqrm_linuxcoe_monitor", $_SERVER['REQUEST_TIME'], 5, "openqrm-linuxcoe-monitor-hook.php", "Linuxcoe states still waiting for ".$linuxcoe_state->resource_id." timeout to appear .....", "", "", 0, 0, 0);
-		}
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/template.linuxcoe-deployment.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/template.linuxcoe-deployment.php
deleted file mode 100644
index d6e34d3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/template.linuxcoe-deployment.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-
-// global event for logging
-$event = new event();
-global $event;
-
-function wait_for_linuxcoe_netboot_product_list($sfile) {
-	$refresh_delay=1;
-	$refresh_loop_max=20;
-	$refresh_loop=0;
-	while (!file_exists($sfile)) {
-		sleep($refresh_delay);
-		$refresh_loop++;
-		flush();
-		if ($refresh_loop > $refresh_loop_max)  {
-			return false;
-		}
-	}
-	return true;
-}
-
-function get_linuxcoe_deployment_templates($local_storage_storage_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_ADMIN;
-	global $event;
-	$StorageDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/linuxcoe/profiles';
-	$local_deployment_tepmplates_identifier_array = array();
-	if ($handle = opendir($StorageDir)) {
-		while (false !== ($file = readdir($handle))) {
-			if ($file != "." && $file != "..") {
-				$openqrm_profile_info = "";
-				$openqrm_info_file = $StorageDir."/".$file."/openqrm.info";
-				if (file_exists($openqrm_info_file)) {
-					$openqrm_profile_info = file_get_contents($openqrm_info_file);
-				} else {
-					$openqrm_profile_info = file_get_contents($file);
-				}
-				$openqrm_install_parameter = "linuxcoe-deployment:0:".$file;
-				$local_deployment_tepmplates_identifier_array[] = array("value" => $openqrm_install_parameter, "label" => $openqrm_profile_info);
-			}
-		}
-		closedir($handle);
-	}
-	return $local_deployment_tepmplates_identifier_array;
-}
-
-
-function get_linuxcoe_deployment_methods() {
-	// select template
-	$linuxcoe_deployment_methods_array = array("value" => "linuxcoe-deployment", "label" => "Automatic Linux Installation (LinuxCOE)");
-	return $linuxcoe_deployment_methods_array;
-}
-
-
-function get_linuxcoe_deployment_additional_parameters() {
-	// possible 4 additional inputs for addtional parameters
-	$local_deployment_additional_parameters[] = '';
-//	$local_deployment_additional_parameters[] = array("value" => "", "label" => 'Product-Key');
-//	$local_deployment_additional_parameters[] = array("value" => "", "label" => 'Key2');
-//	$local_deployment_additional_parameters[] = array("value" => "", "label" => 'Key3');
-//	$local_deployment_additional_parameters[] = array("value" => "", "label" => 'Key4');
-	return $local_deployment_additional_parameters;
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-about-bootservice.tpl.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-about-bootservice.tpl.php
deleted file mode 100644
index 96fac92..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-about-bootservice.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{boot_service_title}</h3>
-		{boot_service_content}
-	</div>
-</div>
-
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-about-documentation.tpl.php
deleted file mode 100644
index dc09439..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-about-documentation.tpl.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-
-
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{introduction_title}</h3>
-		{introduction_content}
-	
-		<h3>{provides_title}</h3>
-		{provides_list}
-	
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-
-		<h3>{howto_title}</h3>
-		{howto_list}
-	
-	</div>
-	<div class="span2 offset1">
-		<h3>{type_title}</h3>
-		<span class="pill">{type_content}</span>
-	
-		<h3>{deployment_title}</h3>
-		{deployment_content}
-	
-		<h3>{tested_title}</h3>
-		{tested_content}
-
-	</div>
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-add.tpl.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-add.tpl.php
deleted file mode 100644
index 396d44c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-add.tpl.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}" method="GET">
-{form}
-	<div id="form">
-		{name}
-		{root}
-		{description}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-clone.tpl.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-clone.tpl.php
deleted file mode 100644
index 329822d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-clone.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-<form action="{thisfile}">
-	{form}
-	<div id="form">
-		{name}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-edit.tpl.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-edit.tpl.php
deleted file mode 100644
index d94e5c0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-edit.tpl.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-
-<div id="form">
-	<div style="width:250px;float:left;">
-		<div><b>{lang_id}</b>: {id}</div>
-		<div><b>{lang_name}</b>: {name}</div>
-		<div><b>{lang_resource}</b>: {resource}</div>
-		<div><b>{lang_state}</b>: {state}</div>
-	</div>
-
-	<div style="width:280px;float:right;">
-		<div>{add}</div>
-	</div>
-	<div style="clear:both; margin: 0 0 25px 0;" class="floatbreaker">&#160;</div>
-	{table}
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-remove.tpl.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-remove.tpl.php
deleted file mode 100644
index f86e797..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-remove.tpl.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-<form action="{thisfile}">
-	<div id="form">
-	{form}
-	<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-select.tpl.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-select.tpl.php
deleted file mode 100644
index 111f228..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-select.tpl.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-{table}
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-template-edit.tpl.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-template-edit.tpl.php
deleted file mode 100644
index c5ed75b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-template-edit.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}">
-	<div id="form">
-		{form}
-		{template_comment}
-		{template_post}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-template-remove.tpl.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-template-remove.tpl.php
deleted file mode 100644
index f86e797..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-template-remove.tpl.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-<form action="{thisfile}">
-	<div id="form">
-	{form}
-	<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-template-select.tpl.php b/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-template-select.tpl.php
deleted file mode 100644
index a68bfff..0000000
--- a/openQRM-5.3.50-CE/src/plugins/linuxcoe/web/tpl/linuxcoe-template-select.tpl.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-
-<h2>{linuxcoe_title}</h2>
-{table}
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/Makefile b/openQRM-5.3.50-CE/src/plugins/local-server/Makefile
deleted file mode 100644
index 4e37e0e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# this is the openQRM local-server-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/etc/templates
-	. $(OPENQRM_SERVER_CONF) && cp etc/templates/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/etc/templates/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.local-server $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/bin
-	. $(OPENQRM_SERVER_CONF) && cp bin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/bin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/bin/openqrm*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/img
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/lang/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/tpl/
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/local-server
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/local-server/
-
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/bin/openqrm-local-server b/openQRM-5.3.50-CE/src/plugins/local-server/bin/openqrm-local-server
deleted file mode 100644
index d6b3ccf..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/bin/openqrm-local-server
+++ /dev/null
@@ -1,8 +0,0 @@
-clear
-echo '#################### Please notice !! #################'
-echo '# The distributed system management openQRM feature   #'
-echo '# local-server is available in the Enterprise Edtion! #'
-echo '#                                                     #'
-echo '# Please check http://www.openqrm-enterprise.com/     #'
-echo '#######################################################'
-echo ''
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/etc/init.d/openqrm-plugin-local-server b/openQRM-5.3.50-CE/src/plugins/local-server/etc/init.d/openqrm-plugin-local-server
deleted file mode 100644
index 31dfacc..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/etc/init.d/openqrm-plugin-local-server
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-# init script for the openQRM local-server-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/include/openqrm-plugin-local-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/etc/openqrm-plugin-local-server.conf
-openqrm_server_get_config
-
-
-function openqrm_plugin_local_server_start() {
-	echo "Starting the openQRM local-server-plugin"
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/local-server/.running
-}
-
-
-function openqrm_plugin_local_server_stop() {
-	echo "Stopping the openQRM local-server-plugin"
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/local-server/.running
-}
-
-function openqrm_plugin_local_server_uninstall() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "local-server: Please give a username to uninstall the plugin : "
-		read USERNAME
-		echo
-		echo -n "local-server: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Uninstalling the openQRM local-server-plugin"
-	openqrm_plugin_local_server_stop
-	openqrm_server_remove_deployment_type $USERNAME $PASSWORD local-server
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/local-server
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.local-server
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/openqrm-functions
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/openqrm-package-functions
-
-}
-
-function openqrm_plugin_local_server_init() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "local-server: Please give a username to init the plugin : "
-		read USERNAME
-		echo
-		echo -n "local-server: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Initializing the openQRM local-server-plugin"
-	openqrm_server_add_deployment_type $USERNAME $PASSWORD local-server local-server "Local-installed server" local-server "Local-installed server"
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/local-server
-	chmod +x $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/root-mount.local-server
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/root-mount.local-server $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.local-server
-	# create openqrm-local-vm-client
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/local-vm
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/etc/templates/openqrm-local-vm-client |	\
-		sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" |	\
-		sed -e "s#@@OPENQRM_SERVER_IP_ADDRESS@@#$OPENQRM_SERVER_IP_ADDRESS#g" |	\
-		sed -e "s#@@OPENQRM_WEB_PROTOCOL@@#$OPENQRM_WEB_PROTOCOL#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/local-vm/openqrm-local-vm-client
-	chmod +x $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/web/local-vm/openqrm-local-vm-client
-	# linking function files to enable downloading them
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/openqrm-functions
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/openqrm-package-functions
-
-}
-
-USER=$2
-PASS=$3
-
-case "$1" in
-	start)
-		openqrm_plugin_local_server_start
-		;;
-	stop)
-		openqrm_plugin_local_server_stop
-		;;
-	restart)
-		openqrm_plugin_local_server_stop
-		sleep 1
-		openqrm_plugin_local_server_start
-		;;
-	init)
-		openqrm_plugin_local_server_init $USER $PASS
-		;;
-	uninstall)
-		openqrm_plugin_local_server_uninstall $USER $PASS
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/etc/init.d/openqrm-plugin-local-server.postinstall b/openQRM-5.3.50-CE/src/plugins/local-server/etc/init.d/openqrm-plugin-local-server.postinstall
deleted file mode 100644
index 29cd21b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/etc/init.d/openqrm-plugin-local-server.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-local-server postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/etc/init.d/openqrm-plugin-local-server.preremove b/openQRM-5.3.50-CE/src/plugins/local-server/etc/init.d/openqrm-plugin-local-server.preremove
deleted file mode 100644
index 42e9f76..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/etc/init.d/openqrm-plugin-local-server.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-local-server preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-local-server stop
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/etc/openqrm-plugin-local-server.conf b/openQRM-5.3.50-CE/src/plugins/local-server/etc/openqrm-plugin-local-server.conf
deleted file mode 100644
index f3cab68..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/etc/openqrm-plugin-local-server.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# this is the openQRM-plugin-local-server info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="Integrates existing, local-installed Server into openQRM."
-OPENQRM_PLUGIN_TYPE="misc"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES=""
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/local-server/etc/openqrm-plugin-local-server.conf"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/etc/templates/openqrm-local-vm-client b/openQRM-5.3.50-CE/src/plugins/local-server/etc/templates/openqrm-local-vm-client
deleted file mode 100644
index 401ccfe..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/etc/templates/openqrm-local-vm-client
+++ /dev/null
@@ -1,312 +0,0 @@
-#!/bin/bash
-# openqrm-local-vm-client	openQRM init script for local-VMs
-# - kvm-storage, xen-storage, lxc-storage, openvz-storage, ...
-#
-# chkconfig: 2345 98 19
-# description: openQRM is the next generation Linux Data Center management
-
-# support for LSB init scripts
-### BEGIN INIT INFO
-# Provides: openqrm-local-vm-client
-# Required-Start: $all
-# Required-Stop: $all
-# Default-Start:  2 3 4 5
-# Default-Stop: 0 1 2 6
-# Short-Description: openQRM init script for local-VMs
-# Description: openQRM init script for local-VMs
-### END INIT INFO
-
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# some defines setup by the plugin init
-###########################################################
-OPENQRM_SERVER_BASE_DIR=@@OPENQRM_SERVER_BASE_DIR@@
-export OPENQRM_SERVER_BASE_DIR
-OPENQRM_WEB_PROTOCOL=@@OPENQRM_WEB_PROTOCOL@@
-export OPENQRM_WEB_PROTOCOL
-OPENQRM_SERVER_IP_ADDRESS=@@OPENQRM_SERVER_IP_ADDRESS@@
-export OPENQRM_SERVER_IP_ADDRESS
-###########################################################
-
-export OPENQRM_SOURCE_DIR=$OPENQRM_SERVER_BASE_DIR/openqrm
-export LANG=C
-PATH=/usr/bin:/sbin:/bin:/usr/sbin
-export PATH
-LOCKFILE=/var/lock/subsys/openqrm
-mkdir -p $(dirname $LOCKFILE)
-mkdir -p /var/openqrm
-
-# define wget to use with https
-if [ "$OPENQRM_WEB_PROTOCOL" == "https" ]; then
-	WGET="wget -q --no-check-certificate"
-else
-	WGET="wget -q"
-fi
-
-# do not run on the initrd phase
-if [ -f /etc/initrd-devices.conf ]; then
-	exit 0
-fi
-
-if [ -f /var/openqrm/openqrm-resource.conf ]; then
-	. /var/openqrm/openqrm-resource.conf
-	# make sure to have a valid backup of the parameters, at least including the openQRM server ip
-	if [ ! -f /var/openqrm/openqrm-resource.conf.last ]; then
-		/bin/cp -f /var/openqrm/openqrm-resource.conf /var/openqrm/openqrm-resource.conf.last
-	fi
-	if [ "$resource_mac" == "" ]; then
-		/bin/cp -f /var/openqrm/openqrm-resource.conf.last /var/openqrm/openqrm-resource.conf
-		. /var/openqrm/openqrm-resource.conf
-		# if we still do not have a mac address here set it to xxxxxxxxxxxxxx which probes later
-		if [ "$resource_mac" == "" ]; then
-			resource_mac="xxxxxxxxxxxxxxxxxx"
-		fi
-	fi
-fi
-export resource_mac
-
-# install/uninstall
-FILE_NAME=$(basename $0)
-if [ "$1" == "" ]; then
-	# this should be a fresh installation, check to setup everyting in place
-	if [ ! -x $OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d/$FILE_NAME ]; then
-		# check for udev persistant net-rules
-		if [ -f /etc/udev/rules.d/70-persistent-net.rules ]; then
-			rm -f /etc/udev/rules.d/70-persistent-net.rules
-			ln -sf /dev/null /etc/udev/rules.d/70-persistent-net.rules
-		fi
-		mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d/
-		/bin/cp -f $0 $OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d/
-		chmod +x $OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d/$FILE_NAME
-		ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d/$FILE_NAME /etc/init.d/$FILE_NAME
-		/etc/init.d/$FILE_NAME start
-		exit 0
-	fi
-elif [ "$1" == "uninstall" ]; then
-	if [ -x "$OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d/$FILE_NAME" ]; then
-		$OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d/$FILE_NAME stop
-	fi
-	if [ -f "$OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions" ] && [ -f "$OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions" ]; then
-		. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-		. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-		openqrm_chkconfig del openqrm-local-vm-client
-	fi
-	rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm
-	rm -f /etc/init.d/$FILE_NAME
-	exit 0
-fi
-
-
-
-# gets/starts/stops enabled boot-services for the resources
-function openqrm_boot_service() {
-	local BOOT_SERVICE=$1
-	local BOOT_SERVICE_CMD=$2
-	local CURRENT=`pwd`
-
-	# get + install the package during start
-	if [ "$BOOT_SERVICE_CMD" == "start" ]; then
-		echo "Getting boot-service package $BOOT_SERVICE"
-		mkdir -p  $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$BOOT_SERVICE
-		cd $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$BOOT_SERVICE
-		if ! $WGET $OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/boot-service-$BOOT_SERVICE.tgz; then
-			echo "ERROR: Could not get boot-service package for boot-service $BOOT_SERVICE !"
-			return 1
-		fi
-		tar -xzf boot-service-$BOOT_SERVICE.tgz
-		rm -f boot-service-$BOOT_SERVICE.tgz
-		# get optional custom appliance config
-		if [ "$appliance_name" != "" ]; then
-			if $WGET -O $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$BOOT_SERVICE/etc/openqrm-plugin-$BOOT_SERVICE.conf.$appliance_name.conf $OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/plugins/$BOOT_SERVICE/openqrm-plugin-$BOOT_SERVICE.$appliance_name.conf; then
-				echo "- applying custom $BOOT_SERVICE boot-service configuration for appliance $appliance_name"
-				/bin/cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$BOOT_SERVICE/etc/openqrm-plugin-$BOOT_SERVICE.conf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$BOOT_SERVICE/etc/openqrm-plugin-$BOOT_SERVICE.conf.default
-				/bin/cp -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$BOOT_SERVICE/etc/openqrm-plugin-$BOOT_SERVICE.conf.$appliance_name.conf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$BOOT_SERVICE/etc/openqrm-plugin-$BOOT_SERVICE.conf
-			fi
-		fi
-
-	fi
-	# run the boot-service cmd
-	BOOT_SERVICE_INIT="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$BOOT_SERVICE/etc/init.d/$BOOT_SERVICE"
-	if [ -x $BOOT_SERVICE_INIT ]; then
-		echo "Running $BOOT_SERVICE_CMD on boot-service $BOOT_SERVICE"
-		$BOOT_SERVICE_INIT $BOOT_SERVICE_CMD
-	fi
-	cd $CURRENT
-}
-
-
-
-
-
-function openqrm_client_start() {
-	echo "Starting openQRM-local-vm-client"
-	openqrm_client_stop 1>/dev/null 2>&1
-	START_RETRY=0
-	LOOP_CONNECT=0
-	MAX_CONNECT=5
-
-	# network up ?
-	echo "NOTICE: Checking connection to openQRM server at $OPENQRM_SERVER_IP_ADDRESS"
-	while ! $WGET -q -t 1 -T 4 -O /dev/null "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-monitor.php"; do
-		echo -n "."
-		sleep 2
-		LOOP_CONNECT=$(( LOOP_CONNECT + 1 ))
-		if [ "$LOOP_CONNECT" == "$MAX_CONNECT" ]; then
-			echo "NOTICE: Could not connect to openQRM server at $OPENQRM_SERVER_IP_ADDRESS!"
-			# exit good here without starting the boot-services since we cannot reach openQRM anyway
-			exit 0
-		fi
-	done
-
-	# download function files
-	if [ ! -f "$OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions" ]; then
-		mkdir $OPENQRM_SERVER_BASE_DIR/openqrm/include/
-		if ! $WGET -q -t 1 -T 4 -O $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/openqrm-functions"; then
-			echo "NOTICE: Could not connect to openQRM server at $OPENQRM_SERVER_IP_ADDRESS!"
-			rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-			# exit good here without starting the boot-services since we cannot reach openQRM anyway
-			exit 0
-		fi
-	fi
-	if [ ! -f "$OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions" ]; then
-		if ! $WGET -q -t 1 -T 4 -O $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/openqrm-package-functions"; then
-			echo "NOTICE: Could not connect to openQRM server at $OPENQRM_SERVER_IP_ADDRESS!"
-			rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-			# exit good here without starting the boot-services since we cannot reach openQRM anyway
-			exit 0
-		fi
-	fi
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-	openqrm_chkconfig add openqrm-local-vm-client
-
-	# check if we have resource_mac, if not try to find the right interface integrated in openQRM
-	if ifconfig -a | grep ^e | grep -i $resource_mac &>/dev/null; then
-		if ! $WGET -q -t 1 -T 4 -O /var/openqrm/openqrm-resource.conf "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_mac=$resource_mac"; then
-			# restore
-			/bin/cp -f /var/openqrm/openqrm-resource.conf.last /var/openqrm/openqrm-resource.conf
-			echo "NOTICE: Could not refresh resource-parameters. Using previous one."
-		else
-			. /var/openqrm/openqrm-resource.conf
-		fi
-	else
-		# here we do not found the resource_mac on one of the systems network cards
-		# assuming auto-install or clone to local-disk
-		if [ -f /var/openqrm/openqrm-resource.conf ]; then
-			/bin/cp -f /var/openqrm/openqrm-resource.conf /var/openqrm/openqrm-resource.conf.previous_res
-		fi
-
-		# centos 7 is using a different ifconfig output
-		RESOURCE_MAC_LIST=`ifconfig -a | grep ^e | grep -v ":oq" | awk '{ print $5 }'`
-		if [ "$RESOURCE_MAC_LIST" == "" ]; then
-			RESOURCE_MAC_LIST=`ifconfig -a | grep -A3 ^e | grep -v :oq | grep ether | awk '{ print $2 }'`
-		fi
-		for RESOURCE_MAC in $RESOURCE_MAC_LIST; do
-			echo "NOTICE: Refreshing resource-parameters. Trying $RESOURCE_MAC."
-			rm -f /var/openqrm/openqrm-resource.conf
-			if $WGET -q -t 1 -T 4 -O /var/openqrm/openqrm-resource.conf "$OPENQRM_WEB_PROTOCOL://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_mac=$RESOURCE_MAC"; then
-				if grep -i $RESOURCE_MAC /var/openqrm/openqrm-resource.conf &>/dev/null; then
-					. /var/openqrm/openqrm-resource.conf
-					break
-				fi
-			fi
-		done
-	fi
-	# start openqrm-monitord if existing -> vm plugin config dependent if monitoring is on the Host or VM
-	if [ -x $resource_basedir/openqrm/sbin/openqrm-monitord ]; then
-		if [ ! -d /tmp ]; then mkdir -p /tmp; fi
-		nohup $resource_basedir/openqrm/sbin/openqrm-monitord 1>/tmp/openqrm-monitord.out 2>&1 &
-		rm -f /tmp/openqrm-monitord.out
-	fi
-	openqrm_post_event $resource_id "openqrm-client" 5 openqrm_client_start "Resource $resource_id fully started"
-	# allow to overwrite the resource-configuration e.g. for cluster-resources
-	if [ -f /var/openqrm/openqrm-resource.conf.static ]; then
-		cat /var/openqrm/openqrm-resource.conf.static >> /var/openqrm/openqrm-resource.conf
-	fi
-	# set the image password if not idle
-	if [ "$resource_image" != "idle" ]; then
-		if  $WGET -O /tmp/iauth.$image_id $openqrm_web_protocol://$resource_openqrmserver/openqrm/action/image-auth/iauth.$image_id.php 2>/tmp/iauth.log; then
-			cryptedpassword=`cat /tmp/iauth.$image_id`
-			rm -f /tmp/iauth.$image_id /tmp/iauth.log
-			if [ "$cryptedpassword" != "" ]; then
-				sed -i "s#^root:[^:]*#root:$cryptedpassword#" /etc/shadow
-				sed -i "s#^root:[^:]*#root:$cryptedpassword#" /etc/shadow-
-			fi
-		fi
-		# if not idle make sure acpid is installed
-		if [ -f /etc/debian_version ]; then
-			if ! openqrm_full_fill_os_dependency acpid acpid; then
-				echo "ERROR: Could not install acpid! Please install manually."
-			fi
-		elif [ -f /etc/redhat-release ]; then
-			if ! openqrm_full_fill_os_dependency acpid acpid; then
-				echo "ERROR: Could not install acpid! Please install manually."
-			fi
-		elif [ -f /etc/SuSE-release ]; then
-			if ! openqrm_full_fill_os_dependency acpid acpid; then
-				echo "ERROR: Could not install acpid! Please install manually."
-			fi
-		fi
-	fi
-
-	# start boot-services from enabled plugins
-	for boot_service in $openqrm_boot_services; do
-		openqrm_boot_service $boot_service start
-	done
-	touch ${LOCKFILE}
-}
-
-
-function openqrm_client_stop() {
-	echo "Stopping openQRM-local-vm-client"
-	# stop boot-services from enabled plugins
-	for boot_service in $openqrm_boot_services; do
-		openqrm_boot_service $boot_service stop
-	done
-	/bin/rm -f ${LOCKFILE}
-}
-
-
-function openqrm_client_status() {
-	if [ -f ${LOCKFILE} ]; then
-		echo "openQRM-local-vm-client service is running"
-	else
-		echo "openQRM-local-vm-client service is not running"
-	fi
-}
-
-
-
-case "$1" in
-	start)
-		openqrm_client_start
-		;;
-	stop)
-		openqrm_client_stop
-		;;
-	status)
-		openqrm_client_status
-		;;
-	restart)
-		openqrm_client_stop
-		openqrm_client_start
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|status|restart|uninstall}"
-		exit 1
-		;;
-esac
-
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/include/openqrm-plugin-local-server-assign-hook b/openQRM-5.3.50-CE/src/plugins/local-server/include/openqrm-plugin-local-server-assign-hook
deleted file mode 100644
index 01eb59a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/include/openqrm-plugin-local-server-assign-hook
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-# This function gets called after writing the resource pxe-config file
-# It re-writes the config localboot
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-
-
-function local_server_assign_hook() {
-
-	local OPENQRM_RESOURCE_ID=$1
-	local OPENQRM_KERNEL_NAME=$2
-	local OPENQRM_RESOURCE_PXELINUXCFG_FILE=$3
-	local OPENQRM_RESOURCE_MAC=`echo $OPENQRM_RESOURCE_PXELINUXCFG_FILE | sed -e "s/01-//g" | sed -e "s/-/:/g"`
-
-	if ! echo $OPENQRM_KERNEL_NAME | grep default 1>/dev/null; then
-		if [ "$OPENQRM_KERNEL_NAME" == "resource$OPENQRM_RESOURCE_ID" ]; then
-			echo "local-server-plugin: Running assign hook with $OPENQRM_RESOURCE_ID $OPENQRM_KERNEL_NAME $OPENQRM_RESOURCE_PXELINUXCFG_FILE"
-			echo "local-server-plugin: Running assign hook with $OPENQRM_RESOURCE_ID $OPENQRM_KERNEL_NAME $OPENQRM_RESOURCE_PXELINUXCFG_FILE" | logger
-
-			# get more infos about the resource
-			openqrm_get_resource_parameter $OPENQRM_RESOURCE_MAC
-			if echo $resource_capabilities | grep TYPE | grep local-server 1>/dev/null; then
-				openqrm_server_set_boot local $resource_id $resource_mac $resource_ip
-			fi
-		else
-			echo "local-server-plugin: Resource $OPENQRM_RESOURCE_ID netbooting. Skipping local-assign" | logger
-		fi
-	fi
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/include/openqrm-plugin-local-server-functions b/openQRM-5.3.50-CE/src/plugins/local-server/include/openqrm-plugin-local-server-functions
deleted file mode 100644
index 3fb60c2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/include/openqrm-plugin-local-server-functions
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# this is the functions file for the local-server-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/web/class/local-server-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/local-server/web/class/local-server-about.controller.class.php
deleted file mode 100644
index 3f8cc4b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/web/class/local-server-about.controller.class.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-/**
- * local-server-about Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class local_server_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'local_server_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'local_server_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'local_server_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'local_server_about_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About Local-Server',
-		'label' => 'About Local-Server',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The local-server-plugin provides an integration for already existing, local-installed systems in openQRM.
-			After integrating an existing, local-installed server it can be used "grab" the systems root-fs and transform
-			it to an openQRM server-image. It also allows to dynamically deploy network-booted server images while
-			still being able to restore/restart the existing server-system located on the local-harddisk.
-			No manual configuration is needed.',
-		'requirements_title' => 'Requirements',
-		'requirements_list' => '<li>none</li>',
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-		'provides_title' => 'Provides',
-		'provides_list' => '<li>Integrates existing, local installed Systems into openQRM</li>',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Misc',
-		'documentation_title' => 'Documentation',
-		'use_case_title' => 'Use-Case',
-	),
-	'usage' => array (
-		'tab' => 'About Local-Server',
-		'label' => 'Local-Server Use-Cases',
-		'usage_integrate_title' => 'Local-Server Integrate',
-		'usage_integrate_content' => '<ul><li>Copy (scp) the "openqrm-local-server" utility to an existing, local-installed server in your network<br><br>
-			<i><b>scp %s/plugins/local-server/bin/openqrm-local-server [ip-address-of-existing-server]:/tmp/</b></i>
-			<br><br>
-			</li><li>
-			Execute the "openqrm-local-server" utility on the remote system via ssh e.g. :
-			<br><br>
-			<i><b>ssh [ip-address-of-existing-server] /tmp/openqrm-local-server integrate -u openqrm -p openqrm -q %s -i eth0 [-s http/https]</b></i>
-			<br><br>
-			</li><li>
-			The system now appears in the openQRM-server as new resource
-			<br><br>
-			It should be now set to "network-boot" in its BIOS to allow dynamic assign- and deployment.
-			<br>
-			The resource can now be used to e.g. create a new "storage-server" within openQRM.
-			</li><li>
-			After setting the system to "network-boot" in its BIOS it also can be used to deploy server-images from diffrent types.
-			</li></ul>',
-		'usage_remove_title' => 'Local-Server Remove',
-		'usage_remove_content' => '<ul><li>To remove a system from openQRM integrated via the local-server plugin run the "openqrm-local-server" utility again. e.g. :<br><br>
-			<i><b>ssh [ip-address-of-existing-server] /tmp/openqrm-local-server remove -u openqrm -p openqrm -q %s [-s http/https]</b></i>
-			<br><br>
-			</li></ul>',
-
-	),
-	'localvm' => array (
-		'tab' => 'About Local VMs',
-		'label' => 'Local-Server for Local Virtual Machines',
-		'usage_localvm_title' => 'How to use Local-Server for Local Virtual Machines',
-		'usage_localvm' => 'For local-installed Virtual Machines (e.g. kvm-storage, xen-storage, lxc-storage, openvz-storage)
-			which have access to the openQRM network there is an "openqrm-local-vm-client" available.
-			This "openqrm-local-vm-client" just starts and stops the plugin-boot-services to allow further management functionality.
-			Monitoring and openQRM actions are still running on behalf of the VM Host.',
-		'usage_integrate_localvm' => '<ul><li>Download/Copy the <a href="/openqrm/base/plugins/local-server/local-vm/openqrm-local-vm-client" target="_BLANK">"openqrm-local-vm-client"</a> to a local installed VM<br><br>
-			<i><b>scp openqrm-local-vm-client [ip-address-of-existing-server]:/tmp/</b></i>
-			<br><br>
-			</li><li>
-			Execute the "openqrm-local-vm-client" on the VM
-			<br><br>
-			<i><b>openqrm-local-vm-client</b></i>
-			<br><br>
-			</li><li>
-			The "openqrm-local-vm-client" fully automatically configures itself.
-			</li></ul>',
-	),
-
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/local-server/lang", 'local-server-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/local-server/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "documentation";
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-			case 'localvm':
-				$content[] = $this->localvm(true);
-			break;
-			case 'usage':
-				$content[] = $this->usage(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About Local-Server
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/local-server/class/local-server-about.documentation.class.php');
-			$controller = new local_server_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-
-
-	//--------------------------------------------
-	/**
-	 * About Local-Server VM management
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function localvm( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/local-server/class/local-server-about.localvm.class.php');
-			$controller = new local_server_about_localvm($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['localvm'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['localvm']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'localvm' );
-		$content['onclick'] = false;
-		if($this->action === 'localvm'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-	//--------------------------------------------
-	/**
-	 * About Local-Server Use-Cases
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function usage( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/local-server/class/local-server-about.usage.class.php');
-			$controller = new local_server_about_usage($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['usage'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['usage']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'usage' );
-		$content['onclick'] = false;
-		if($this->action === 'usage'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/web/class/local-server-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/local-server/web/class/local-server-about.documentation.class.php
deleted file mode 100644
index 7ad2e05..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/web/class/local-server-about.documentation.class.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * local-server-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class local_server_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'local_server_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "local_server_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-
-		$this->basedir    = $this->openqrm->get('basedir');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/local-server-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['provides_title'], 'provides_title');
-		$t->add($this->lang['provides_list'], 'provides_list');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/web/class/local-server-about.localvm.class.php b/openQRM-5.3.50-CE/src/plugins/local-server/web/class/local-server-about.localvm.class.php
deleted file mode 100644
index cf4f0fc..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/web/class/local-server-about.localvm.class.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * local-server-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class local_server_about_localvm
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'local_server_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "local_server_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-
-		$this->basedir    = $this->openqrm->get('basedir');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/local-server-about-localvm.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['usage_localvm'], 'usage_localvm');
-		$t->add($this->lang['usage_localvm_title'], 'usage_localvm_title');
-		$t->add($this->lang['usage_integrate_localvm'], 'usage_integrate_localvm');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/web/class/local-server-about.usage.class.php b/openQRM-5.3.50-CE/src/plugins/local-server/web/class/local-server-about.usage.class.php
deleted file mode 100644
index 753ece7..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/web/class/local-server-about.usage.class.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * local-server-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class local_server_about_usage
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'local_server_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "local_server_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-
-		$this->basedir    = $this->openqrm->get('basedir');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$resource = new resource();
-		$resource->get_instance_by_id(0);
-		$t = $this->response->html->template($this->tpldir.'/local-server-about-usage.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['usage_integrate_title'], 'usage_integrate_title');
-		$t->add($this->lang['usage_remove_title'], 'usage_remove_title');
-		$t->add(sprintf($this->lang['usage_integrate_content'], $this->basedir, $resource->ip), 'usage_integrate_content');
-		$t->add(sprintf($this->lang['usage_remove_content'], $resource->ip), 'usage_remove_content');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/web/css/local-server.css b/openQRM-5.3.50-CE/src/plugins/local-server/web/css/local-server.css
deleted file mode 100644
index 68ff08e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/web/css/local-server.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/*-Icon classes ----- */
-a.graphs {
-	padding: 0;
-	border: 0px none;
-	width: 32px;
-	height: 32px;
-	display:block;
-	text-align: center;
-	text-decoration: none;
-	line-height: 0px;
-	overflow: hidden;
-	color: transparent;
-}
-a.graphs {
-	background: url('/openqrm/base/plugins/local-server/img/plugin.png') no-repeat center top;
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/local-server/web/img/plugin.png
deleted file mode 100644
index f9ff505..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/local-server/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/web/lang/de.local-server-about.ini b/openQRM-5.3.50-CE/src/plugins/local-server/web/lang/de.local-server-about.ini
deleted file mode 100644
index a93d787..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/web/lang/de.local-server-about.ini
+++ /dev/null
@@ -1,51 +0,0 @@
-[documentation]
-tab = "Über Local-Server"
-label = "Über Local-Server"
-introduction_title = "Einleitung"
-introduction_content = "<p>Das Local-Server-Plugin ermöglicht die Integration von bereits existierenden Systemen. Das auf der lokalen Festplatte dieser Server installierte System wird als Image erfasst und in openQRM, z.B. zur Provisionierung weiterer (virtueller) Maschinen, bereitgestellt.</p>
-<p>Manuelle Konfiguration dieses Plugins ist nicht nötig.</p>"
-
-requirements_title = "Anforderungen"
-requirements_list = "keine"
-tested_title = "Getestet mit"
-tested_content = "<p>Dieses Plugin ist getestet mit Debian, Ubuntu und CentOS</p>"
-
-provides_title = "Bietet"
-provides_list = "<p>Integration von bereits bestehenden Systemen in openQRM</p>"
-
-type_title = "Plugin-Typ"
-type_content = "<span class=\"pill\">Misc</span>"
-
-documentation_title = "Dokumentation"
-use_case_title = "Anwendungsfall"
-
-
-[usage]
-tab = "Über Local-Server"
-label = "Anwendungsfälle für Local-Server"
-
-usage_integrate_title = "Local-Server einrichten"
-usage_integrate_content = "<p>Kopieren Sie das <code>openqrm-local-server</code> Utility auf ein bestehendes lokal installiertes System (z.B. per scp):</p>
-	<pre>scp %s/plugins/local-server/bin/openqrm-local-server [ip-address-of-existing-server]:/tmp/</pre>
-	
-	<p>Führen Sie <code>openqrm-local-server</code> auf dem System aus (z.B. per ssh):</p>
-	<pre>ssh [ip-address-of-existing-server] /tmp/openqrm-local-server integrate -u openqrm -p openqrm -q %s -i eth0 [-s http/https]</pre>
-	
-	<p>Das System erscheint nun in openQRM als neue Ressource. Der openQRM-Client wird auf dem System gestartet und ermöglicht, dieses vollständig über openQRM zu verwalten. Falls Netzwerk-Deployment mit PXE benötigt wird, muss das System nun im BIOS auf 'Netzwerk-Boot' (PXE) eingestellt werden. Die Ressource kann nun in openQRM benutzt werden, um z.B. als neuer Storage-Host in openQRM zu dienen.</p>"
-usage_remove_title = "Local-Server entfernen"
-usage_remove_content = "<p>Um ein mit diesem Plugin integriertes System aus openQRM zu entfernen führen Sie das <code>openqrm-local-server</code> Utility nochmals mit dem Parameter 'remove' aus:</p>
-	<pre>ssh [ip-address-of-existing-server] /tmp/openqrm-local-server remove -u openqrm -p openqrm -q %s [-s http/https]</pre>"
-
-[localvm]
-tab = "Über Lokale VMs"
-label = "Local-Server für Lokale Virtuelle Maschinen"
-usage_localvm_title = "Einrichten von Local-Server für lokale virtuelle Maschinen"
-usage_localvm = "Für lokal installierte virtuelle Maschinen, die Zugang zum openQRM-Verwaltungsnetzwerk haben, bietet sich an den <code>openqrm-local-vm-client</code> einzusetzen. <code>openqrm-local-vm-client</code> aktiviert NUR die Plugin-Boot-Services und erlaubt erweiterte Administrationsfunktionen. Überwachung und Steuerung der lokalen virtuellen Maschinen wird über den VM-Host ausgeführt.</p>"
-usage_integrate_localvm = "<p>Kopieren Sie den <code><a href='/openqrm/base/plugins/local-server/local-vm/openqrm-local-vm-client' target='blank'>openqrm-local-vm-client</a></code> auf eine lokal installierte VM:</p>
-	<pre>scp openqrm-local-vm-client [ip-address-of-existing-server]:/tmp/</pre>
-	
-	<p>Führen Sie den <code>openqrm-local-vm-client</code> auf der VM aus:</p>
-	<pre>openqrm-local-vm-client</pre>
-	
-	<p><code>openqrm-local-vm-client</code> konfiguriert die VM nun automatisch und stellt sie in openQRM bereit.</p"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/web/lang/en.local-server-about.ini b/openQRM-5.3.50-CE/src/plugins/local-server/web/lang/en.local-server-about.ini
deleted file mode 100644
index 93ae8c0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/web/lang/en.local-server-about.ini
+++ /dev/null
@@ -1,53 +0,0 @@
-[documentation]
-tab = "About Local-Server"
-label = "About Local-Server"
-
-introduction_title = "Introduction"
-introduction_content = "<p>The local-server-plugin provides an integration for already existing, local-installed systems in openQRM. After integrating an existing, local-installed server it can be used 'grab' the systems root-fs and transform it to an openQRM server-image. It also allows to dynamically deploy network-booted server images while still being able to restore/restart the existing server-system located on the local-harddisk.</p><p>No manual configuration is needed.</p>"
-
-requirements_title = "Requirements"
-requirements_list = "		none"
-
-tested_title = "Tested with"
-tested_content = "This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions."
-
-provides_title = "Provides"
-provides_list = "Integrates existing, local installed Systems into openQRM"
-
-type_title = "Plugin Type"
-type_content = "<span class=\"pill\">Misc</span>"
-
-documentation_title = "Documentation"
-
-use_case_title = "Use case"
-
-[usage]
-tab = "About Local-Server"
-label = "Local-Server Use-Cases"
-
-usage_integrate_title = "Local-Server Integrate"
-usage_integrate_content = "Copy (scp) the <code>openqrm-local-server</code> utility to an existing, local-installed server in your network<br><br>
-			<pre>scp %s/plugins/local-server/bin/openqrm-local-server [ip-address-of-existing-server]:/tmp/</pre>		
-			
-			<p>Execute the <code>openqrm-local-server</code> utility on the remote system via ssh e.g.:</p>
-			<pre>ssh [ip-address-of-existing-server] /tmp/openqrm-local-server integrate -u openqrm -p openqrm -q %s -i eth0 [-s http/https]</pre>
-			
-			<p>The system now appears in the openQRM-server as new resource. It should be now set to 'network-boot' in its BIOS to allow dynamic assign- and deployment. The resource can now be used to e.g. create a new 'storage-server' within openQRM. After setting the system to 'network-boot' in its BIOS it also can be used to deploy server-images from diffrent types.</p>"
-
-usage_remove_title = "Local-Server Remove"
-usage_remove_content = "<p>To remove a system from openQRM integrated via the local-server plugin run the <code>openqrm-local-server</code> utility again. e.g.:</p>
-<pre>ssh [ip-address-of-existing-server] /tmp/openqrm-local-server remove -u openqrm -p openqrm -q %s [-s http/https]</pre>"
-
-[localvm]
-tab = "About Local VMs"
-label = "Local-Server for Local Virtual Machines"
-
-usage_localvm_title = "How to use Local-Server for Local Virtual Machines"
-usage_localvm = "<p>For local-installed Virtual Machines (e.g. kvm-storage, xen-storage, lxc-storage, openvz-storage) which have access to the openQRM network there is an <code>openqrm-local-vm-client</code> available. This <code>openqrm-local-vm-client</code> just starts and stops the plugin-boot-services to allow further management functionality. Monitoring and openQRM actions are still running on behalf of the VM Host.</p>"
-usage_integrate_localvm = "<p>Download/Copy the <code><a href='/openqrm/base/plugins/local-server/local-vm/openqrm-local-vm-client' target='_BLANK'>openqrm-local-vm-client</a></code> to a local installed VM:</p>
-			<pre>scp openqrm-local-vm-client [ip-address-of-existing-server]:/tmp/</pre>
-			
-			<p>Execute <code>openqrm-local-vm-client</code> on the VM:</p>
-			<pre>openqrm-local-vm-client</pre>
-			
-			<p><code>openqrm-local-vm-client</code> will automatically configure the local server and add it to openQRM management.</p>"
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/web/local-server-action.php b/openQRM-5.3.50-CE/src/plugins/local-server/web/local-server-action.php
deleted file mode 100644
index aceceb9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/web/local-server-action.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/kernel.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-// filter inputs
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-global $IMAGE_INFO_TABLE;
-global $DEPLOYMENT_INFO_TABLE;
-global $KERNEL_INFO_TABLE;
-global $STORAGETYPE_INFO_TABLE;
-global $OPENQRM_SERVER_BASE_DIR;
-
-// user/role authentication
-if ($OPENQRM_USER->role != "administrator") {
-	$event->log("authorization", $_SERVER['REQUEST_TIME'], 1, "local-server-action", "Un-Authorized access to lvm-actions from $OPENQRM_USER->name", "", "", 0, 0, 0);
-	exit();
-}
-
-
-$local_server_command = $request->get('local_server_command');
-$local_server_id = $request->get('local_server_id');
-$local_server_root_device = $request->get('local_server_root_device');
-$local_server_root_device_type = $request->get('local_server_root_device_type');
-$local_server_kernel_version = $request->get('local_server_kernel_version');
-$local_server_name = $request->get('local_server_name');
-
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-
-	$event->log("$local_server_command", $_SERVER['REQUEST_TIME'], 5, "local-server-action", "Processing local-server command $local_server_command", "", "", 0, 0, 0);
-	switch ($local_server_command) {
-
-		case 'integrate':
-
-			// create storage server
-			$storage_fields["storage_name"] = "resource$local_server_id";
-			$storage_fields["storage_resource_id"] = "$local_server_id";
-			$deployment = new deployment();
-			$deployment->get_instance_by_type('local-server');
-			$storage_fields["storage_type"] = $deployment->id;
-			$storage_fields["storage_comment"] = "Local-server resource $local_server_id";
-			$storage_fields["storage_capabilities"] = 'TYPE=local-server';
-			$storage = new storage();
-			$storage_fields["storage_id"]=(int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-			$storage->add($storage_fields);
-
-			// create image
-			$image_fields["image_id"]=(int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-			$image_fields["image_name"] = "resource$local_server_id";
-			$image_fields["image_type"] = $deployment->type;
-			$image_fields["image_rootdevice"] = $local_server_root_device;
-			$image_fields["image_rootfstype"] = $local_server_root_device_type;
-			$image_fields["image_storageid"] = $storage_fields["storage_id"];
-			$image_fields["image_comment"] = "Local-server image resource $local_server_id";
-			$image_fields["image_capabilities"] = 'TYPE=local-server';
-			$image = new image();
-			$image->add($image_fields);
-
-			// create kernel
-			$kernel_fields["kernel_id"]=(int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-			$kernel_fields["kernel_name"]="resource$local_server_id";
-			$kernel_fields["kernel_version"]="$local_server_kernel_version";
-			$kernel_fields["kernel_capabilities"]='TYPE=local-server';
-			$kernel = new kernel();
-			$kernel->add($kernel_fields);
-
-			// create appliance
-			$next_appliance_id=(int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-			$appliance_fields["appliance_id"]=$next_appliance_id;
-			$appliance_fields["appliance_name"]=$local_server_name;
-			$appliance_fields["appliance_kernelid"]=$kernel_fields["kernel_id"];
-			$appliance_fields["appliance_imageid"]=$image_fields["image_id"];
-			$appliance_fields["appliance_resources"]="$local_server_id";
-			$appliance_fields["appliance_capabilities"]='TYPE=local-server';
-			$appliance_fields["appliance_comment"]="Local-server appliance resource $local_server_id";
-			$appliance = new appliance();
-			$appliance->add($appliance_fields);
-			// set start time, reset stoptime, set state
-			$now=$_SERVER['REQUEST_TIME'];
-			$appliance_fields["appliance_starttime"]=$now;
-			$appliance_fields["appliance_stoptime"]=0;
-			$appliance_fields['appliance_state']='active';
-			// set resource type to physical
-			$appliance_fields['appliance_virtualization']=1;
-			$appliance->update($next_appliance_id, $appliance_fields);
-
-			// set resource to localboot
-			$resource = new resource();
-			$resource->get_instance_by_id($local_server_id);
-			$openqrm_server->send_command("openqrm_server_set_boot local $local_server_id $resource->mac 0.0.0.0");
-			$resource->set_localboot($local_server_id, 1);
-
-			// update resource fields with kernel + image
-			$kernel->get_instance_by_id($kernel_fields["kernel_id"]);
-			$resource_fields["resource_kernel"]=$kernel->name;
-			$resource_fields["resource_kernelid"]=$kernel_fields["kernel_id"];
-			$image->get_instance_by_id($image_fields["image_id"]);
-			$resource_fields["resource_image"]=$image->name;
-			$resource_fields["resource_imageid"]=$image_fields["image_id"];
-			// set capabilites
-			$resource_fields["resource_capabilities"]='TYPE=local-server';
-			$resource->update_info($local_server_id, $resource_fields);
-
-			// add + start hook
-			$appliance->get_instance_by_id($next_appliance_id);
-			$now=$_SERVER['REQUEST_TIME'];
-			$appliance_fields = array();
-			$appliance_fields['appliance_stoptime']=$now;
-			$appliance_fields['appliance_state']='stopped';
-			// fill in the rest of the appliance info in the array for the plugin hook
-			$appliance_fields["appliance_id"]=$next_appliance_id;
-			$appliance_fields["appliance_name"]=$appliance->name;
-			$appliance_fields["appliance_kernelid"]=$appliance->kernelid;
-			$appliance_fields["appliance_imageid"]=$appliance->imageid;
-			$appliance_fields["appliance_cpunumber"]=$appliance->cpunumber;
-			$appliance_fields["appliance_cpuspeed"]=$appliance->cpuspeed;
-			$appliance_fields["appliance_cpumodel"]=$appliance->cpumodel;
-			$appliance_fields["appliance_memtotal"]=$appliance->memtotal;
-			$appliance_fields["appliance_swaptotal"]=$appliance->swaptotal;
-			$appliance_fields["appliance_nics"]=$appliance->nics;
-			$appliance_fields["appliance_capabilities"]=$appliance->capabilities;
-			$appliance_fields["appliance_cluster"]=$appliance->cluster;
-			$appliance_fields["appliance_ssi"]=$appliance->ssi;
-			$appliance_fields["appliance_resources"]=$appliance->resources;
-			$appliance_fields["appliance_highavailable"]=$appliance->highavailable;
-			$appliance_fields["appliance_virtual"]=$appliance->virtual;
-			$appliance_fields["appliance_virtualization"]=$appliance->virtualization;
-			$appliance_fields["appliance_virtualization_host"]=$appliance->virtualization_host;
-			$appliance_fields["appliance_comment"]=$appliance->comment;
-			$appliance_fields["appliance_event"]=$appliance->event;
-
-			$plugin = new plugin();
-			$enabled_plugins = $plugin->enabled();
-			foreach ($enabled_plugins as $index => $plugin_name) {
-				$plugin_start_appliance_hook = "$RootDir/plugins/$plugin_name/openqrm-$plugin_name-appliance-hook.php";
-				if (file_exists($plugin_start_appliance_hook)) {
-					$event->log("integrate", $_SERVER['REQUEST_TIME'], 5, "local-server-action", "Found plugin $plugin_name handling add-appliance event.", "", "", 0, 0, $appliance->resources);
-					require_once "$plugin_start_appliance_hook";
-					$appliance_function="openqrm_"."$plugin_name"."_appliance";
-					$appliance_function=str_replace("-", "_", $appliance_function);
-					// add
-					$appliance_function("add", $appliance_fields);
-					// start
-					$appliance_fields['appliance_stoptime']='';
-					$appliance_fields['appliance_starttime']=$now;
-					$appliance_fields['appliance_state']='active';
-					$appliance->update($next_appliance_id, $appliance_fields);
-					$appliance_function("start", $appliance_fields);
-
-				}
-			}
-
-
-			break;
-
-		case 'remove':
-			// remove all appliance with resource set to localserver id
-			$appliance = new appliance();
-			$appliance_id_list = $appliance->get_all_ids();
-			foreach($appliance_id_list as $appliance_list) {
-				$appliance_id = $appliance_list['appliance_id'];
-				$app_resource_remove_check = new appliance();
-				$app_resource_remove_check->get_instance_by_id($appliance_id);
-				if ($app_resource_remove_check->resources == $local_server_id) {
-
-					// stop + remove hooks
-					$now=$_SERVER['REQUEST_TIME'];
-					$appliance_fields = array();
-					$appliance_fields['appliance_stoptime']=$now;
-					$appliance_fields['appliance_state']='stopped';
-					// fill in the rest of the appliance info in the array for the plugin hook
-					$appliance_fields["appliance_id"]=$appliance_id;
-					$appliance_fields["appliance_name"]=$app_resource_remove_check->name;
-					$appliance_fields["appliance_kernelid"]=$app_resource_remove_check->kernelid;
-					$appliance_fields["appliance_imageid"]=$app_resource_remove_check->imageid;
-					$appliance_fields["appliance_cpunumber"]=$app_resource_remove_check->cpunumber;
-					$appliance_fields["appliance_cpuspeed"]=$app_resource_remove_check->cpuspeed;
-					$appliance_fields["appliance_cpumodel"]=$app_resource_remove_check->cpumodel;
-					$appliance_fields["appliance_memtotal"]=$app_resource_remove_check->memtotal;
-					$appliance_fields["appliance_swaptotal"]=$app_resource_remove_check->swaptotal;
-					$appliance_fields["appliance_nics"]=$app_resource_remove_check->nics;
-					$appliance_fields["appliance_capabilities"]=$app_resource_remove_check->capabilities;
-					$appliance_fields["appliance_cluster"]=$app_resource_remove_check->cluster;
-					$appliance_fields["appliance_ssi"]=$app_resource_remove_check->ssi;
-					$appliance_fields["appliance_resources"]=$app_resource_remove_check->resources;
-					$appliance_fields["appliance_highavailable"]=$app_resource_remove_check->highavailable;
-					$appliance_fields["appliance_virtual"]=$app_resource_remove_check->virtual;
-					$appliance_fields["appliance_virtualization"]=$app_resource_remove_check->virtualization;
-					$appliance_fields["appliance_virtualization_host"]=$app_resource_remove_check->virtualization_host;
-					$appliance_fields["appliance_comment"]=$app_resource_remove_check->comment;
-					$appliance_fields["appliance_event"]=$app_resource_remove_check->event;
-
-					$plugin = new plugin();
-					$enabled_plugins = $plugin->enabled();
-					foreach ($enabled_plugins as $index => $plugin_name) {
-						$plugin_start_appliance_hook = "$RootDir/plugins/$plugin_name/openqrm-$plugin_name-appliance-hook.php";
-						if (file_exists($plugin_start_appliance_hook)) {
-							$event->log("remove", $_SERVER['REQUEST_TIME'], 5, "local-server-action", "Found plugin $plugin_name handling add-appliance event.", "", "", 0, 0, $app_resource_remove_check->resources);
-							require_once "$plugin_start_appliance_hook";
-							$appliance_function="openqrm_"."$plugin_name"."_appliance";
-							$appliance_function=str_replace("-", "_", $appliance_function);
-							// stop
-							$appliance_function("stop", $appliance_fields);
-							// remove
-							$appliance_function("remove", $appliance_fields);
-
-						}
-					}
-					// remove appliance
-					$appliance->remove($appliance_id);
-				}
-			}
-
-			// remove kernel
-			$kernel = new kernel();
-			$kernel->remove_by_name("resource$local_server_id");
-			// remove image
-			$image = new image();
-			$image->remove_by_name("resource$local_server_id");
-			// remove storage serveer
-			$storage = new storage();
-			$storage->remove_by_name("resource$local_server_id");
-
-			break;
-
-
-		default:
-			$event->log("$local_server_command", $_SERVER['REQUEST_TIME'], 3, "local-server-action", "No such local-server command ($local_server_command)", "", "", 0, 0, 0);
-			break;
-
-
-	}
-?>
-
-</body>
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/local-server/web/menu.txt
deleted file mode 100644
index ba9948c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/web/menu.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|Local-server
-...|About|index.php?plugin=local-server&controller=local-server-about|How to use
-...|Local VMs|index.php?plugin=local-server&controller=local-server-about&local_server_about_action=localvm|How to use
-...|Usage|index.php?plugin=local-server&controller=local-server-about&local_server_about_action=usage|How to use
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/web/root-mount.local-server b/openQRM-5.3.50-CE/src/plugins/local-server/web/root-mount.local-server
deleted file mode 100644
index 4a01289..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/web/root-mount.local-server
+++ /dev/null
@@ -1,234 +0,0 @@
-#!/bin/bash
-# this is the root-mount initrd-service
-# which proivdes function to mount/remount the remote
-# local-rootfs according to the image_deployment_parameters at /mnt
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# local-storage
-# Required defines in the image_deploy_paramters
-#
-#
-# Optional parameters
-#
-# IMAGE_INSTALL_FROM_NFS			- can be set to an (nfs) location from
-#									  which the image will be installed at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_TRANSFER_TO_NFS				- can be set to an (nfs) location from
-#									  which the image will be transfered to at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_INSTALL_FROM_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this
-#									  option will install the local-storage image on
-#									  boot-time from the local-device
-#
-# IMAGE_TRANSFER_TO_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this option will transfrom
-#									  the local-storage image on boot-time to the local-device
-#
-#
-#
-# IMAGE_INSTALL_FROM_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_TRANSFER_TO_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_NFS_MOUNT_OPTIONS			- can be e.g. set to proto=tcp for the install/transform phase
-#
-
-# get the deployment parameters from openqrm.conf
-OPENQRM_RESOURCE_PARAMETER_FILE="/var/openqrm/openqrm-resource.conf"
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-eval $image_deployment_parameter
-export OPENQRM_SERVER_BASE_DIR=$resource_basedir
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-
-# nfs-options for the install+transform phase
-if [ "$IMAGE_NFS_MOUNT_OPTIONS" != "" ]; then
-	IMAGE_NFS_MOUNT_OPTIONS=",$IMAGE_NFS_MOUNT_OPTIONS"
-fi
-# default to ext3
-if [ "$IMAGE_INSTALL_FROM_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_INSTALL_FROM_LOCAL_FS_TYPE="ext3"
-fi
-if [ "$IMAGE_TRANSFER_TO_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_TRANSFER_TO_LOCAL_FS_TYPE="ext3"
-fi
-
-
-#######################################################################
-# required functions ##################################################
-#######################################################################
-
-function mount_rootfs() {
-
-	# mount root
-	if ! mount -t $image_rootfstype $image_rootdevice /mnt; then
-		# in case we install from nfs we create a fs since this should be a new lun
-		if  [ "$IMAGE_INSTALL_FROM_NFS" != "" ]; then
-			echo "NOTICE: Found install-from-nfs enabled but failed mounting the rootdevice"
-			echo "NOTICE: Assuming a new (unformatted) Lun -> creating $image_rootfstype filesystem on $image_rootdevice"
-			mke2fs -F -j $image_rootdevice
-			if ! mount -t $image_rootfstype $image_rootdevice /mnt; then
-				echo "ERROR: Could not mount $image_rootdevice via local"
-				# give a shell for the admin
-				/bin/bash
-			else
-				echo "local-storage: Mounted $image_rootdevice rw"
-			fi
-		else
-			echo "ERROR: Could not mount $image_rootdevice via local"
-			# give a shell for the admin
-			/bin/bash
-		fi
-	else
-		echo "local-storage: Mounted $image_rootdevice rw"
-	fi
-
-	if  [ "$IMAGE_INSTALL_FROM_NFS" != "" ]; then
-		install_rootfs_from_nfs
-	else
-		echo "local-storage: Skipping install phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_NFS" != "" ]; then
-		transfer_rootfs_to_nfs
-	else
-		echo "local-storage: Skipping transfer-to-nfs phase"
-	fi
-	if  [ "$IMAGE_INSTALL_FROM_LOCAL" != "" ]; then
-		install_rootfs_from_local
-	else
-		echo "local-storage: Skipping install-from-local phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_LOCAL" != "" ]; then
-		transfer_rootfs_to_local
-	else
-		echo "local-storage: Skipping transfer-to-local phase"
-	fi
-}
-
-
-function remount_rootfs() {
-
-	REMOUNT_LOOP=0
-	# remont /mnt ro
-	while ! mount -t $image_rootfstype -o ro,remount $image_rootdevice /mnt; do
-		echo -n "."
-		sleep 1
-		REMOUNT_LOOP=$[ REMOUNT_LOOP + 1 ]
-		if [ "$REMOUNT_LOOP" == "10" ]; then
-			echo "ERROR: local-storage could not remount /mnt "
-			/bin/bash
-		fi
-	done
-	echo "local-storage: Re-mounted $image_rootdevice ro"
-
-}
-
-
-function create_fstab() {
-	rm -f $IMAGE_FSTAB
-	echo "$image_rootdevice   /     $image_rootfstype  defaults   0 0" >> $IMAGE_FSTAB
-}
-
-
-#######################################################################
-# optional functions ##################################################
-#######################################################################
-
-
-function install_rootfs_from_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f1`
-	IMAGE_INSTALL_FROM_NFS=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f2-`
-	echo "local-storage: Installing $resource_image from $IMAGE_INSTALL_FROM_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o ro$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_INSTALL_FROM_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "local-storage: Starting install-from-nfs phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "local-storage: Install-from-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-function transfer_rootfs_to_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f1`
-	IMAGE_TRANSFER_TO_NFS=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f2-`
-	echo "local-storage: Transfering $resource_image to $IMAGE_TRANSFER_TO_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o rw$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_TRANSFER_TO_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "local-storage: Starting transfer-to-nfs phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "local-storage: Transfer-to-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-function install_rootfs_from_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE -o ro $IMAGE_INSTALL_FROM_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_LOCAL / $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "local-storage: Starting install-to-local phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "local-storage: Install-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-function transfer_rootfs_to_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE -o rw $IMAGE_TRANSFER_TO_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_LOCAL / $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "local-storage: Starting transfer-to-local phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "local-storage: Transfer-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/web/tpl/local-server-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/local-server/web/tpl/local-server-about-documentation.tpl.php
deleted file mode 100644
index fa887c6..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/web/tpl/local-server-about-documentation.tpl.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{introduction_title}</h3>
-		{introduction_content}	
-	
-		<h3>{provides_title}</h3>
-		{provides_list}
-	
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-	</div>
-	<div class="span2 offset1">
-		<h3>{type_title}</h3>
-		{type_content}
-		
-		<h3>{tested_title}</h3>
-		{tested_content}
-	</div>
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/web/tpl/local-server-about-localvm.tpl.php b/openQRM-5.3.50-CE/src/plugins/local-server/web/tpl/local-server-about-localvm.tpl.php
deleted file mode 100644
index 49680fa..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/web/tpl/local-server-about-localvm.tpl.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">	
-		<h3>{usage_localvm_title}</h3>
-		{usage_localvm}
-		{usage_integrate_localvm}
-	</div>
-</div>
-
diff --git a/openQRM-5.3.50-CE/src/plugins/local-server/web/tpl/local-server-about-usage.tpl.php b/openQRM-5.3.50-CE/src/plugins/local-server/web/tpl/local-server-about-usage.tpl.php
deleted file mode 100644
index 044eb7a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/local-server/web/tpl/local-server-about-usage.tpl.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{usage_integrate_title}</h3>
-		{usage_integrate_content}
-			
-		<h3>{usage_remove_title}</h3>
-		{usage_remove_content}
-	</div>
-</div>
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/loom/Makefile b/openQRM-5.3.50-CE/src/plugins/loom/Makefile
deleted file mode 100644
index 35383e9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/loom/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/loom/etc
-	cp etc/openqrm-plugin-loom.conf /usr/share/openqrm/plugins/loom/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/loom/etc/openqrm-plugin-loom.conf b/openQRM-5.3.50-CE/src/plugins/loom/etc/openqrm-plugin-loom.conf
deleted file mode 100644
index e97e352..0000000
--- a/openQRM-5.3.50-CE/src/plugins/loom/etc/openqrm-plugin-loom.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Configure Event mails. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="management"
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/Makefile b/openQRM-5.3.50-CE/src/plugins/lvm-storage/Makefile
deleted file mode 100644
index 78d4397..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# this is the openQRM lvm-storage-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/lvm-storage $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/root-mount* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/image* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/img/
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/class/
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/css/
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/lang/
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/lang/
-	. $(OPENQRM_SERVER_CONF) && chmod 777 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/bin
-	. $(OPENQRM_SERVER_CONF) && cp bin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/bin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/bin/openqrm*
-	. $(OPENQRM_SERVER_CONF) && tar -C $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage -czvf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/boot-service-lvm-storage.tgz include/ bin/ etc/init.d/lvm-storage etc/openqrm-plugin-lvm-storage.conf
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/lvm-storage
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/lvm-storage/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/bin/openqrm-lvm-storage b/openQRM-5.3.50-CE/src/plugins/lvm-storage/bin/openqrm-lvm-storage
deleted file mode 100644
index 3b0d549..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/bin/openqrm-lvm-storage
+++ /dev/null
@@ -1,1000 +0,0 @@
-#!/bin/bash
-# this script automatically manages nfs and iscsi on lvm
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-# unblock starting command queue early for non-blocking + ui commands
-LVM_COMMAND=$1
-if [ "$LVM_COMMAND" == "post_lv" ] || [ "$LVM_COMMAND" == "post_vg" ] || [ "$LVM_COMMAND" == "post_identifier" ] || [ "$LVM_COMMAND" == "list" ] || [ "$LVM_COMMAND" == "auth" ] || [ "$LVM_COMMAND" == "post_sync_progress" ] || [ "$LVM_COMMAND" == "post_sync_finished" ]; then
-	openqrm_unblock_starting_queue $@
-	NON_BLOCKING=true
-fi
-
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/etc/openqrm-plugin-lvm-storage.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/include/openqrm-plugin-lvm-storage-functions
-OPENQRM_POSTENCODE="$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-postencode"
-if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-	OPENQRM_SERVER_IP=$resource_openqrmserver
-	OPENQRM_EXEC_PORT=$resource_execdport
-elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-	openqrm_server_get_config
-	OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-	resource_id=0
-	resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-	openqrm_web_protocol=$OPENQRM_WEB_PROTOCOL
-fi
-export LANG=C
-LINEBR='
-'
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-# using the resource_id as the shelf-id
-AOE_SHELF=$resource_id
-export AOE_SHELF
-# how long to wait for the volume authentication, each loop is 5 secs
-MAX_VOLUME_AUTHENTICATION_LOOP=60
-export MAX_VOLUME_AUTHENTICATION_LOOP
-# dir for progress stats
-SYNC_PROGRESS_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/lock"
-if [ ! -d "$SYNC_PROGRESS_DIR" ]; then
-	mkdir -p $SYNC_PROGRESS_DIR
-fi
-
-# let only root run this script
-WHOAMI=`whoami`
-if [ "$WHOAMI" != "root" ]; then
-	echo "ERROR: Please run this script as root!"
-	exit 6
-fi
-
-
-function lvm_storage_usage() {
-	echo "Usage : $0 add/remove/snap/list/resize/clone <-n image-name> <-v volume-group> <-t lvm-nfs-deployment/lvm-iscsi-deployment/lvm-aoe-deployment>"
-	echo "             [-m size in MB]"
-	echo "             [-s image-snapshot-name]"
-	echo "             (for lvm-iscsi-deployment : <-i authidentifier>)"
-	echo "        $0 auth <-r image-rootdevice> <-n image-name> <-i authidentifier> <-t lvm-nfs-deployment/lvm-iscsi-deployment/lvm-aoe-deployment>"
-	echo "        $0 adapt <-n image-name> <-v volume-group> <-t lvm-nfs-deployment/lvm-iscsi-deployment/lvm-aoe-deployment> <-u username> <-p password> [-i image-password]"
-	echo "        $0 post_vg <-u username> <-p password>"
-	echo "        $0 post_lv <-u username> <-p password> <-v volume-group>"
-	echo "        $0 post_identifier <-t lvm-nfs-deployment/lvm-iscsi-deployment/lvm-aoe-deployment> <-u username> <-p password>"
-	echo "        $0 post_sync_progress <-n image-name> <-s image-snapshot-name> <-v volume-group> <-t lvm-nfs-deployment/lvm-iscsi-deployment/lvm-aoe-deployment> <-u username> <-p password>"
-	echo "        $0 post_sync_finished <-n image-name> <-v volume-group> <-t lvm-nfs-deployment/lvm-iscsi-deployment/lvm-aoe-deployment> <-u username> <-p password>"
-	echo ""
-	echo "Optional parameters:"
-	echo "             [--openqrm-ui-user <username>]"
-	echo "             [--openqrm-internal-cmd <true/false>]"
-	echo "             [--openqrm-cmd-mode <regular/background/fork>]"
-	exit 1
-}
-
-
-function lvm_storage_resize_fs() {
-	local LVM_VOLUME=$1
-	local VOLUME_SIZE=$2
-	LVM_VOLUME_NAME=`basename $LVM_VOLUME`
-	openqrm_post_event 0 "$LVM_VOLUME" 5 "openqrm-lvm-storage" "Resizing Linux filesystem of volume $LVM_VOLUME to + $VOLUME_SIZE MB."
-	e2fsck -y $LVM_VOLUME
-	if resize2fs -f -p $LVM_VOLUME $VOLUME_SIZE""M; then
-		if ! e2fsck -fy $LVM_VOLUME; then
-			openqrm_post_event 0 "snap" 2 "openqrm-lvm-storage" "Errors during resizing volume $LVM_VOLUME."
-		fi
-	fi
-	openqrm_post_event 0 "snap" 5 "openqrm-lvm-storage" "Finished resizing volume $LVM_VOLUME to + $VOLUME_SIZE MB."
-}
-
-
-FULL_COMMANDLINE="$0 $@"
-LVM_COMMAND=$1
-shift
-
-while [ $# -ne 0 ]; do
-	case "$1" in
-		-n)
-			LVM_IMAGE_NAME=$2
-			shift
-			;;
-		-m)
-			LVM_IMAGE_SIZE=$2
-			shift
-			;;
-		-s)
-			LVM_IMAGE_SNAPSHOT_NAME=$2
-			shift
-			;;
-		-t)
-			LVM_IMAGE_TYPE=$2
-			shift
-			;;
-		-i)
-			LVM_IMAGE_AUTH=$2
-			shift
-			;;
-		-r)
-			LVM_IMAGE_ROOTDEVICE=$2
-			shift
-			;;
-		-u)
-			LVM_OPENQRM_USERNAME=$2
-			shift
-			;;
-		-p)
-			LVM_OPENQRM_PASSWORD=$2
-			shift
-			;;
-		-v)
-			LVM_STORAGE_SERVER_VOLUME_GROUP=$2
-			shift
-			;;
-		--openqrm-ui-user)
-			OPENQRM_UI_USER=$2
-			shift
-			;;
-		--openqrm-internal-cmd)
-			OPENQRM_INTERNAL_CMD=$2
-			shift
-			;;
-		--openqrm-cmd-mode)
-			OPENQRM_CMD_MODE=$2
-			shift
-			;;
-
-		*)
-			if [ "$NON_BLOCKING" != "true" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			fi
-			echo "ERROR: Free commandline arguments are not allowed"
-			lvm_storage_usage
-			exit 6
-			;;
-	esac
-	shift
-done
-
-
-# main
-if [ "$LVM_COMMAND" == "" ]; then
-	openqrm_unblock_starting_queue $FULL_COMMANDLINE
-	lvm_storage_usage
-fi
-
-if [ "$LVM_COMMAND" == "post_lv" ] || [ "$LVM_COMMAND" == "post_vg" ] || [ "$LVM_COMMAND" == "post_identifier" ]; then
-		if [ "$LVM_OPENQRM_USERNAME" == "" ]; then
-			lvm_storage_usage
-		fi
-		if [ "$LVM_OPENQRM_PASSWORD" == "" ]; then
-			lvm_storage_usage
-		fi
-		if [ "$LVM_COMMAND" == "post_lv" ]; then
-			if [ "$LVM_STORAGE_SERVER_VOLUME_GROUP" == "" ]; then
-				lvm_storage_usage
-			fi
-		fi
-		if [ "$LVM_COMMAND" == "post_identifier" ]; then
-			if [ "$LVM_IMAGE_TYPE" == "" ]; then
-				lvm_storage_usage
-			fi
-		fi
-
-else
-
-	if [ "$LVM_COMMAND" != "list" ] && [ "$LVM_COMMAND" != "auth" ]; then
-		if [ "$LVM_IMAGE_NAME" == "" ]; then
-			if [ "$NON_BLOCKING" != "true" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			fi
-			lvm_storage_usage
-		fi
-		if [ "$LVM_STORAGE_SERVER_VOLUME_GROUP" == "" ]; then
-			if [ "$NON_BLOCKING" != "true" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			fi
-			lvm_storage_usage
-		fi
-		if [ "$LVM_IMAGE_TYPE" == "" ]; then
-			if [ "$NON_BLOCKING" != "true" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			fi
-			lvm_storage_usage
-		fi
-	fi
-fi
-# load required lvm modules if needed
-if ! grep dm_mod /proc/modules 1>/dev/null; then
-	modprobe dm-mod 1>/dev/null 2>&1
-	modprobe dm-snapshot 1>/dev/null 2>&1
-fi
-
-if [ "$LVM_COMMAND" != "list" ] && [ "$LVM_COMMAND" != "post_vg" ] && [ "$LVM_COMMAND" != "post_identifier" ] && [ "$LVM_COMMAND" != "auth" ]; then
-	# check if volume group exists
-	if ! vgs --unbuffered $LVM_STORAGE_SERVER_VOLUME_GROUP 1>/dev/null 2>&1; then
-		if [ "$NON_BLOCKING" != "true" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		fi
-		openqrm_post_event 0 "check-vg" 3 "lvm-storage" "Could not find volume-group $LVM_STORAGE_SERVER_VOLUME_GROUP on the storage-server"
-		exit 1
-	fi
-fi
-
-# check requirements
-if [ "$LVM_IMAGE_TYPE" == "lvm-iscsi-deployment" ]; then
-	if ! check_lvm_iscsi_storage_deps; then
-		if [ "$NON_BLOCKING" != "true" ]; then
-			openqrm_unblock_starting_queue $@
-		fi
-		exit 1
-	fi
-elif [ "$LVM_IMAGE_TYPE" == "lvm-nfs-deployment" ]; then
-	if ! check_lvm_nfs_storage_deps; then
-		if [ "$NON_BLOCKING" != "true" ]; then
-			openqrm_unblock_starting_queue $@
-		fi
-		exit 1
-	fi
-elif [ "$LVM_IMAGE_TYPE" == "lvm-aoe-deployment" ]; then
-	if ! check_lvm_aoe_storage_deps; then
-		if [ "$NON_BLOCKING" != "true" ]; then
-			openqrm_unblock_starting_queue $@
-		fi
-		exit 1
-	fi
-
-fi
-if [ "$OPENQRM_UI_USER" != "" ]; then
-	OPENQRM_UI_USER_PARAMETER=" --openqrm-ui-user $OPENQRM_UI_USER"
-fi
-
-
-case "$LVM_COMMAND" in 
-
-	add)
-		if [ "$LVM_IMAGE_SIZE" == "" ]; then
-			LVM_IMAGE_SIZE=$DEFAULT_IMAGE_SIZE
-		fi
-		export LVM_IMAGE_SIZE
-		# check if already exists
-		if [ -e /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME ]; then
-			openqrm_post_event 0 "add" 3 "lvm-storage" "Volume $LVM_IMAGE_NAME already exists"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-		#echo -n "Creating logical volume $LVM_IMAGE_NAME size $LVM_IMAGE_SIZE MB using volume group $LVM_STORAGE_SERVER_VOLUME_GROUP"
-		LOCK_TIME=`openqrm_lock_queue aquire lvm-storage`
-		trap "openqrm_lock_queue release lvm-storage $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		### set size
-		if ! lvcreate -L$LVM_IMAGE_SIZE"M" -n$LVM_IMAGE_NAME $LVM_STORAGE_SERVER_VOLUME_GROUP; then
-			openqrm_post_event 0 "add" 3 "lvm-storage" "Error while adding $LVM_IMAGE_NAME to $LVM_STORAGE_SERVER_VOLUME_GROUP"
-
-			openqrm_lock_queue release lvm-storage $LOCK_TIME
-			trap '' EXIT
-
-			exit 1
-		fi
-		if [ "$LVM_IMAGE_TYPE" == "lvm-iscsi-deployment" ]; then
-			echo "Detected Iscsi-image. Adding to $IETDCONF"
-			manage_iscsi add regular $LVM_IMAGE_AUTH
-		elif [ "$LVM_IMAGE_TYPE" == "lvm-nfs-deployment" ]; then
-			# we mount them and add to exports
-			echo "Detected NFS-image. Mounting and adding $LVM_IMAGE_NAME to /etc/fstab + /etc/exports"
-			manage_fstab add
-			manage_nfs add regular $OPENQRM_SERVER_IP
-		elif [ "$LVM_IMAGE_TYPE" == "lvm-aoe-deployment" ]; then
-			echo "Detected Aoe-image. Adding to $VBLADECONF"
-			manage_vblade add
-		fi
-
-		openqrm_lock_queue release lvm-storage $LOCK_TIME
-		trap '' EXIT
-
-		# in case we have a username + password post the updated list to the openQRM-server
-		if [ "$LVM_OPENQRM_USERNAME" != "" ] && [ "$LVM_OPENQRM_PASSWORD" != "" ]; then
-			# if we have an image name send size back to openQRM
-			if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$LVM_OPENQRM_USERNAME --http-password=$LVM_OPENQRM_PASSWORD "$openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/lvm-storage/lvm-storage-action.php?lvm_storage_command=set_image_size&lvm_image_name=$LVM_IMAGE_NAME&lvm_image_size=$LVM_IMAGE_SIZE"; then
-				openqrm_post_event 0 "add" 2 "openqrm-lvm" "Could not post size of volume $LVM_IMAGE_NAME!"
-			fi
-			$0 post_lv -u $LVM_OPENQRM_USERNAME -p $LVM_OPENQRM_PASSWORD -v $LVM_STORAGE_SERVER_VOLUME_GROUP -t $LVM_IMAGE_TYPE --openqrm-internal-cmd true
-		fi
-
-		;;
-
-	remove)
-		if [ ! -e /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME ]; then
-			openqrm_post_event 0 "remove" 3 "lvm-storage" "Could not find source volume /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME!"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-		# check that no snapshots existing with this volume as the origin
-		if lvs | awk '{ print $5 }' | grep -w $LVM_IMAGE_NAME 1>/dev/null; then
-			openqrm_post_event 0 "remove" 3 "lvm-storage" "Snapshot exist from volume /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME. Not removing!"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-
-		# check that it is not in use by a syncing action
-		if ls $SYNC_PROGRESS_DIR/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME.sync_in_progress.* 1>/dev/null 2>&1; then
-			openqrm_post_event 0 "remove" 3 "lvm-storage" "Volume /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME is currently in use by a sync action!"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-		if [ -f "$SYNC_PROGRESS_DIR/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME.clone_in_progress" ]; then
-			openqrm_post_event 0 "remove" 3 "lvm-storage" "Volume /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME is currently in use by a clone action!"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire lvm-storage`
-		trap "openqrm_lock_queue release lvm-storage $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		#echo -n "Removing logical volume $LVM_IMAGE_NAME on volume group $LVM_STORAGE_SERVER_VOLUME_GROUP"
-		if [ "$LVM_IMAGE_TYPE" == "lvm-iscsi-deployment" ]; then
-			echo "Detected Iscsi-image. Removing from $IETDCONF"
-			manage_iscsi remove
-		elif [ "$LVM_IMAGE_TYPE" == "lvm-nfs-deployment" ]; then
-			echo "Detected NFS-image. Removing from /etc/exports"
-			manage_nfs remove
-			manage_fstab remove
-		elif [ "$LVM_IMAGE_TYPE" == "lvm-aoe-deployment" ]; then
-			echo "Detected Aoe-image. Removing from $VBLADECONF"
-			manage_vblade remove
-		fi
-		# give time to settle
-		sync
-		sleep 2
-		lvchange -a n -y /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME
-		lvremove -f /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME
-
-		openqrm_lock_queue release lvm-storage $LOCK_TIME
-		trap '' EXIT
-
-		# in case we have a username + password post the updated list to the openQRM-server
-		if [ "$LVM_OPENQRM_USERNAME" != "" ] && [ "$LVM_OPENQRM_PASSWORD" != "" ]; then
-			$0 post_lv -u $LVM_OPENQRM_USERNAME -p $LVM_OPENQRM_PASSWORD -v $LVM_STORAGE_SERVER_VOLUME_GROUP -t $LVM_IMAGE_TYPE --openqrm-internal-cmd true
-		fi
-
-		;;
-
-	snap)
-		if [ "$LVM_IMAGE_SNAPSHOT_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			lvm_storage_usage
-		fi
-		if [ "$LVM_IMAGE_SIZE" == "" ]; then
-			LVM_IMAGE_SIZE=$DEFAULT_IMAGE_SIZE
-		fi
-		export LVM_IMAGE_SIZE
-		# check that source fs-images exist
-		if [ ! -e /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME ]; then
-			openqrm_post_event 0 "snap" 3 "lvm-storage" "Source volume /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME does not exist."
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-		if [ -e /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_SNAPSHOT_NAME ]; then
-			openqrm_post_event 0 "snap" 3 "lvm-storage" "Volume $LVM_IMAGE_SNAPSHOT_NAME already exists"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire lvm-storage`
-		trap "openqrm_lock_queue release lvm-storage $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		touch $SYNC_PROGRESS_DIR/$LVM_IMAGE_SNAPSHOT_NAME
-		echo -n "Creating snapshot size $LVM_IMAGE_SIZE from logical volume $LVM_IMAGE_NAME -> $LVM_IMAGE_SNAPSHOT_NAME"
-		### set size
-		if ! lvcreate --size $LVM_IMAGE_SIZE"M" --snapshot --name $LVM_IMAGE_SNAPSHOT_NAME /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME; then
-			rm -f $SYNC_PROGRESS_DIR/$LVM_IMAGE_SNAPSHOT_NAME
-			openqrm_post_event 0 "snap" 3 "lvm-storage" "Error while adding snapshot $LVM_IMAGE_SNAPSHOT_NAME to $LVM_STORAGE_SERVER_VOLUME_GROUP"
-
-			openqrm_lock_queue release lvm-storage $LOCK_TIME
-			trap '' EXIT
-
-			exit 1
-		fi
-		if [ "$OPENQRM_PLUGIN_LVM_STORAGE_RESIZE_SNAPSHOTS_FILESYSTEM" == "true" ]; then
-			# find the rootfs and resize it
-			lvm_storage_resize_fs /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_SNAPSHOT_NAME $LVM_IMAGE_SIZE
-		fi
-		export LVM_IMAGE_NAME=$LVM_IMAGE_SNAPSHOT_NAME
-
-		if [ "$LVM_IMAGE_TYPE" == "lvm-iscsi-deployment" ]; then
-			echo "Detected Iscsi-image. Adding to $IETDCONF"
-			manage_iscsi add snap $LVM_IMAGE_AUTH
-		elif [ "$LVM_IMAGE_TYPE" == "lvm-nfs-deployment" ]; then
-			echo "Detected NFS-image. Mounting and adding $IMAGE_NAME to /etc/fstab + /etc/exports"
-			manage_fstab add
-			manage_nfs add snap $OPENQRM_SERVER_IP
-		elif [ "$LVM_IMAGE_TYPE" == "lvm-aoe-deployment" ]; then
-			echo "Detected Aoe-image. Adding to $VBLADECONF"
-			manage_vblade add snap
-		fi
-		rm -f $SYNC_PROGRESS_DIR/$LVM_IMAGE_SNAPSHOT_NAME
-
-		openqrm_lock_queue release lvm-storage $LOCK_TIME
-		trap '' EXIT
-
-		# in case we have a username + password post the updated list to the openQRM-server
-		if [ "$LVM_OPENQRM_USERNAME" != "" ] && [ "$LVM_OPENQRM_PASSWORD" != "" ]; then
-			# if we have an image name send size back to openQRM
-			if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$LVM_OPENQRM_USERNAME --http-password=$LVM_OPENQRM_PASSWORD "$openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/lvm-storage/lvm-storage-action.php?lvm_storage_command=set_image_size&lvm_image_name=$LVM_IMAGE_SNAPSHOT_NAME&lvm_image_size=$LVM_IMAGE_SIZE"; then
-				openqrm_post_event 0 "add" 2 "openqrm-lvm" "Could not post size of volume $LVM_IMAGE_SNAPSHOT_NAME!"
-			fi
-			$0 post_lv -u $LVM_OPENQRM_USERNAME -p $LVM_OPENQRM_PASSWORD -v $LVM_STORAGE_SERVER_VOLUME_GROUP -t $LVM_IMAGE_TYPE --openqrm-internal-cmd true
-		fi
-		;;
-
-	clone)
-		# cloning is similar to snapshots but since lvm cannot (yet) create snapshots
-		# from snapshots we have to rsync the origin (which may be a snapshot) to a
-		# new lvol.
-		# .... good to have no partitions on the luns :) so we can mount them easily
-		if [ "$LVM_IMAGE_SNAPSHOT_NAME" == "" ]; then
-			openqrm_post_event 0 "clone" 3 "lvm-storage" "No volume name for the clone given"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			lvm_storage_usage
-		fi
-		if [ "$LVM_IMAGE_SIZE" == "" ]; then
-			LVM_IMAGE_SIZE=$DEFAULT_IMAGE_SIZE
-		fi
-		export LVM_IMAGE_SIZE
-		# check that source fs-images exist
-		if [ ! -e /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME ]; then
-			openqrm_post_event 0 "clone" 3 "lvm-storage" "Source volume /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME does not exist."
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-		if [ -e /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_SNAPSHOT_NAME ]; then
-			openqrm_post_event 0 "clone" 3 "lvm-storage" "Volume $LVM_IMAGE_SNAPSHOT_NAME already exists"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire lvm-storage`
-		trap "openqrm_lock_queue release lvm-storage $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		touch $SYNC_PROGRESS_DIR/$LVM_IMAGE_SNAPSHOT_NAME
-		echo "Cloning logical volume $LVM_IMAGE_NAME to $LVM_IMAGE_SNAPSHOT_NAME size $LVM_IMAGE_SIZE MB volume group $LVM_STORAGE_SERVER_VOLUME_GROUP"
-		ORIGIN_SIZE=""
-		ORIGIN_VOLUME="/dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME"
-		# if source volume is a snapshot find out the size of the origin
-		VOLUME_IS_SNAPSHOT=`lvs --noheadings -o origin $ORIGIN_VOLUME | awk '{ print $1 }'`
-		if [ "$VOLUME_IS_SNAPSHOT" != "" ]; then
-			ORIGIN_VOLUME="/dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$VOLUME_IS_SNAPSHOT"
-		fi
-		ORIGIN_SIZE=`lvs --noheadings -o lv_size --units m --nosuffix $ORIGIN_VOLUME | awk '{ print $1 }' | cut -d'.' -f1`
-		if [ "$ORIGIN_SIZE" != "" ]; then
-			LVM_IMAGE_SIZE=$ORIGIN_SIZE
-		fi
-		# capture the original image name early, we later will shift it for the add/remove functions
-		LVM_ORIGINAL_IMAGE_NAME=$LVM_IMAGE_NAME
-		# create mountpoints for origin and clone
-		MOUNTPOINT_ORIGIN=`mktemp -d /tmp/$LVM_IMAGE_NAME.origin.XXXXXXXXXX` || exit 1
-		MOUNTPOINT_CLONE=`mktemp -d /tmp/$LVM_IMAGE_SNAPSHOT_NAME.clone.XXXXXXXXXX` || exit 1
-
-		# create new volume
-		### set size
-		if ! lvcreate -L$LVM_IMAGE_SIZE"M" -n$LVM_IMAGE_SNAPSHOT_NAME $LVM_STORAGE_SERVER_VOLUME_GROUP; then
-			rm -f $SYNC_PROGRESS_DIR/$LVM_IMAGE_SNAPSHOT_NAME
-			openqrm_post_event 0 "clone" 3 "lvm-storage" "Could not create the new clone volume"
-
-			openqrm_lock_queue release lvm-storage $LOCK_TIME
-			trap '' EXIT
-
-			exit 1
-		fi
-		# create fs
-		if ! mkfs.ext3 -F /dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_SNAPSHOT_NAME; then
-			rm -f $SYNC_PROGRESS_DIR/$LVM_IMAGE_SNAPSHOT_NAME
-			openqrm_post_event 0 "clone" 3 "lvm-storage" "Could not create the filesystem on /dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_SNAPSHOT_NAME"
-
-			openqrm_lock_queue release lvm-storage $LOCK_TIME
-			trap '' EXIT
-
-			exit 1
-		fi
-		# mount clone
-		if ! mount /dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_SNAPSHOT_NAME $MOUNTPOINT_CLONE; then
-			rm -f $SYNC_PROGRESS_DIR/$LVM_IMAGE_SNAPSHOT_NAME
-			openqrm_post_event 0 "clone" 3 "lvm-storage" "Could not mount clone /dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_SNAPSHOT_NAME"
-
-			openqrm_lock_queue release lvm-storage $LOCK_TIME
-			trap '' EXIT
-
-			exit 1
-		fi
-
-		# remove origin from san/nas, for lvm aoe we do not remove since this may change shelf/slot of the origin
-		export LVM_IMAGE_NAME=$LVM_IMAGE_NAME
-		if [ "$LVM_IMAGE_TYPE" == "lvm-iscsi-deployment" ]; then
-			manage_iscsi remove
-		elif [ "$LVM_IMAGE_TYPE" == "lvm-nfs-deployment" ]; then
-			manage_nfs remove
-		elif [ "$LVM_IMAGE_TYPE" == "lvm-aoe-deployment" ]; then
-			# we add aoe volumes early to post back the root-device identifier
-			ORIGIN_LVM_IMAGE_NAME=$LVM_IMAGE_NAME
-			export LVM_IMAGE_NAME=$LVM_IMAGE_SNAPSHOT_NAME
-			manage_vblade add snap
-			export LVM_IMAGE_NAME=$ORIGIN_LVM_IMAGE_NAME
-		fi
-
-		# mount origin
-		if ! mount /dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME $MOUNTPOINT_ORIGIN; then
-			rm -f $SYNC_PROGRESS_DIR/$LVM_IMAGE_SNAPSHOT_NAME
-			openqrm_post_event 0 "clone" 3 "lvm-storage" "Could not mount origin /dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME"
-
-			openqrm_lock_queue release lvm-storage $LOCK_TIME
-			trap '' EXIT
-
-			exit 1
-		fi
-
-		# create locks for origin + snapshot
-		touch "$SYNC_PROGRESS_DIR/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME.sync_in_progress.$LVM_IMAGE_SNAPSHOT_NAME"
-		touch "$SYNC_PROGRESS_DIR/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-
-		# create long-term-action start event
-		openqrm_post_event 0 "$LVM_IMAGE_SNAPSHOT_NAME" 9 "lvm-storage" "Started to clone $LVM_IMAGE_SNAPSHOT_NAME from $LVM_IMAGE_NAME"
-		# get a list of files to sync
-		rsync -a -vv --list-only --progress $MOUNTPOINT_ORIGIN/* $MOUNTPOINT_CLONE/ > $SYNC_PROGRESS_DIR/rsync_files.$LVM_IMAGE_SNAPSHOT_NAME.log
-		> $SYNC_PROGRESS_DIR/rsync_progress.$LVM_IMAGE_SNAPSHOT_NAME.log
-		# post exports early, we show the progress in the ui
-		if [ "$LVM_OPENQRM_USERNAME" != "" ] && [ "$LVM_OPENQRM_PASSWORD" != "" ]; then
-			$0 post_sync_progress -n $LVM_IMAGE_SNAPSHOT_NAME -v $LVM_STORAGE_SERVER_VOLUME_GROUP -t $LVM_IMAGE_TYPE -u $LVM_OPENQRM_USERNAME -p $LVM_OPENQRM_PASSWORD  --openqrm-internal-cmd true &
-		fi
-
-		openqrm_lock_queue release lvm-storage $LOCK_TIME
-		trap '' EXIT
-
-		# rsync origin to clone, let other lvm commands run in this time
-		# delay start syncing
-		sleep 10
-		if ! rsync -a --progress $MOUNTPOINT_ORIGIN/* $MOUNTPOINT_CLONE/ > $SYNC_PROGRESS_DIR/rsync_progress.$LVM_IMAGE_SNAPSHOT_NAME.log; then
-			rm -f $SYNC_PROGRESS_DIR/$LVM_IMAGE_SNAPSHOT_NAME
-			openqrm_post_event 0 "clone" 2 "openqrm-lvm-storage" "Could not copy target logical volume $LVM_IMAGE_NAME!"
-			rm -f "$SYNC_PROGRESS_DIR/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME.sync_in_progress.$LVM_IMAGE_SNAPSHOT_NAME"
-			rm -f "$SYNC_PROGRESS_DIR/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-			openqrm_post_event 0 "$LVM_IMAGE_SNAPSHOT_NAME" 10 "lvm-storage" "Started to clone $LVM_IMAGE_SNAPSHOT_NAME from $LVM_IMAGE_NAME"
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire lvm-storage`
-		trap "openqrm_lock_queue release lvm-storage $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# remove lock from the origin + snapshot
-		rm -f "$SYNC_PROGRESS_DIR/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME.sync_in_progress.$LVM_IMAGE_SNAPSHOT_NAME"
-		rm -f "$SYNC_PROGRESS_DIR/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_SNAPSHOT_NAME.clone_in_progress"
-
-		# umount origin + clone
-		umount $MOUNTPOINT_ORIGIN
-		umount $MOUNTPOINT_CLONE
-		rmdir $MOUNTPOINT_ORIGIN $MOUNTPOINT_CLONE
-
-		# add origin to san/nas
-		export LVM_IMAGE_NAME=$LVM_IMAGE_NAME
-		if [ "$LVM_IMAGE_TYPE" == "lvm-iscsi-deployment" ]; then
-			manage_iscsi add snap $LVM_IMAGE_AUTH
-		elif [ "$LVM_IMAGE_TYPE" == "lvm-nfs-deployment" ]; then
-			manage_nfs add snap $OPENQRM_SERVER_IP
-		fi
-
-		# add clone to san/nas
-		export LVM_IMAGE_NAME=$LVM_IMAGE_SNAPSHOT_NAME
-		if [ "$LVM_IMAGE_TYPE" == "lvm-iscsi-deployment" ]; then
-			manage_iscsi add snap $LVM_IMAGE_AUTH
-		elif [ "$LVM_IMAGE_TYPE" == "lvm-nfs-deployment" ]; then
-			manage_fstab add
-			manage_nfs add snap $OPENQRM_SERVER_IP
-		fi
-		# stop sync-progress monitor and send sync-finished to openQRM
-		rm -f $SYNC_PROGRESS_DIR/rsync_progress.$LVM_IMAGE_SNAPSHOT_NAME.log $SYNC_PROGRESS_DIR/rsync_files.$LVM_IMAGE_SNAPSHOT_NAME.log
-
-		openqrm_lock_queue release lvm-storage $LOCK_TIME
-		trap '' EXIT
-
-		$0 post_sync_finished -n $LVM_IMAGE_SNAPSHOT_NAME -v $LVM_STORAGE_SERVER_VOLUME_GROUP -t $LVM_IMAGE_TYPE -u $LVM_OPENQRM_USERNAME -p $LVM_OPENQRM_PASSWORD --openqrm-internal-cmd true
-		# create long-term-action finished event
-		openqrm_post_event 0 "$LVM_IMAGE_SNAPSHOT_NAME" 10 "lvm-storage" "Started to clone $LVM_IMAGE_SNAPSHOT_NAME from $LVM_IMAGE_NAME"
-		rm -f $SYNC_PROGRESS_DIR/$LVM_IMAGE_SNAPSHOT_NAME
-
-		# here we notify openQRM Cloud that cloning has finished
-		# in case we have a username + password post the updated list to the openQRM-server
-		# and notify openQRM that cloning has finished
-		if [ "$LVM_OPENQRM_USERNAME" != "" ] && [ "$LVM_OPENQRM_PASSWORD" != "" ]; then
-			CLONE_FINISHED="$LVM_IMAGE_SNAPSHOT_NAME.clone"
-			touch $CLONE_FINISHED
-			if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$LVM_OPENQRM_USERNAME --http-password=$LVM_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $CLONE_FINISHED` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/lvm-storage/lvm-storage-action.php?lvm_storage_command=clone_finished; then
-				openqrm_post_event 0 "clone" 3 "lvm-storage" "Could not post clone-finished status to the openQRM-server at $OPENQRM_SERVER_IP"
-			fi
-			rm -f $CLONE_FINISHED
-			# if we have an image name send size back to openQRM
-			if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$LVM_OPENQRM_USERNAME --http-password=$LVM_OPENQRM_PASSWORD "$openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/lvm-storage/lvm-storage-action.php?lvm_storage_command=set_image_size&lvm_image_name=$LVM_IMAGE_SNAPSHOT_NAME&lvm_image_size=$LVM_IMAGE_SIZE"; then
-				openqrm_post_event 0 "add" 2 "openqrm-lvm" "Could not post size of volume $LVM_IMAGE_SNAPSHOT_NAME!"
-			fi
-		fi
-
-		;;
-
-	resize)
-		if [ "$LVM_IMAGE_SIZE" == "" ]; then
-			LVM_IMAGE_SIZE=$DEFAULT_IMAGE_SIZE
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire lvm-storage`
-		trap "openqrm_lock_queue release lvm-storage $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		export LVM_IMAGE_SIZE
-		# echo "Resizing logical volume $LVM_IMAGE_NAME + size $LVM_IMAGE_SIZE MB using volume group $LVM_STORAGE_SERVER_VOLUME_GROUP"
-		touch $SYNC_PROGRESS_DIR/$LVM_IMAGE_NAME
-		lvresize -L $LVM_IMAGE_SIZE /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME 2>&1 | logger
-		if [ "$OPENQRM_PLUGIN_LVM_STORAGE_RESIZE_SNAPSHOTS_FILESYSTEM" == "true" ]; then
-			if [ "$LVM_IMAGE_TYPE" == "lvm-iscsi-deployment" ]; then
-				#echo "Detected Iscsi-image. Running resize2fs on /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME"
-				manage_iscsi remove
-				e2fsck -f -y /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME 2>&1 | logger
-				resize2fs -fp /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME 2>&1 | logger
-				manage_iscsi add snap $LVM_IMAGE_AUTH
-			elif [ "$LVM_IMAGE_TYPE" == "lvm-nfs-deployment" ]; then
-				# if it is lvm-nfs deployment we can resize the fs immediately
-				#echo "Detected NFS-image. Running resize2fs on /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME"
-				manage_nfs remove
-				e2fsck -f -y /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME 2>&1 | logger
-				resize2fs -fp /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME 2>&1 | logger
-				manage_nfs add snap $OPENQRM_SERVER_IP
-			elif [ "$LVM_IMAGE_TYPE" == "lvm-aoe-deployment" ]; then
-				#echo "Detected Aoe-image. Running resize2fs on /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME"
-				manage_vblade remove
-				e2fsck -f -y /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME 2>&1 | logger
-				resize2fs -fp /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME 2>&1 | logger
-				manage_vblade add snap
-			fi
-		fi
-		rm -f $SYNC_PROGRESS_DIR/$LVM_IMAGE_NAME
-
-		openqrm_lock_queue release lvm-storage $LOCK_TIME
-		trap '' EXIT
-		# in case we have a username + password post the updated list to the openQRM-server
-		if [ "$LVM_OPENQRM_USERNAME" != "" ] && [ "$LVM_OPENQRM_PASSWORD" != "" ]; then
-			$0 post_lv -u $LVM_OPENQRM_USERNAME -p $LVM_OPENQRM_PASSWORD -v $LVM_STORAGE_SERVER_VOLUME_GROUP -t $LVM_IMAGE_TYPE --openqrm-internal-cmd true
-		fi
-		;;
-
-
-	auth)
-		echo "Authenticating $LVM_IMAGE_TYPE image $LVM_IMAGE_ROOTDEVICE to $LVM_IMAGE_AUTH"
-		# this is just for starting auth, make sure the device is there, otherwise wait
-		if [ "$LVM_IMAGE_TYPE" == "lvm-iscsi-deployment" ]; then
-			LVM_CHECK_ROOT_DEVICE="$LVM_IMAGE_ROOTDEVICE"
-		elif [ "$LVM_IMAGE_TYPE" == "lvm-nfs-deployment" ]; then
-			LVM_CHECK_ROOT_DEVICE="/dev$LVM_IMAGE_ROOTDEVICE"
-		elif [ "$LVM_IMAGE_TYPE" == "lvm-aoe-deployment" ]; then
-			LVM_CHECK_VOLUME_GROUP=`echo $LVM_IMAGE_ROOTDEVICE | cut -d':' -f1`
-			LVM_CHECK_VOLUME_NAME=`echo $LVM_IMAGE_ROOTDEVICE | cut -d':' -f2`
-			LVM_CHECK_AOE_DEVICE_NAME=`echo $LVM_IMAGE_ROOTDEVICE | cut -d':' -f3`
-			LVM_CHECK_ROOT_DEVICE="/dev/$LVM_CHECK_VOLUME_GROUP/$LVM_CHECK_VOLUME_NAME"
-		fi
-		if [ "$LVM_OPENQRM_USERNAME" != "" ] && [ "$LVM_OPENQRM_PASSWORD" != "" ] && [ "$LVM_IMAGE_NAME" != "" ]; then
-			MAX_AUTH_LOOP=0
-			while (true); do
-				if [ -e "$LVM_CHECK_ROOT_DEVICE" ] && [ ! -f "$SYNC_PROGRESS_DIR/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME.clone_in_progress" ]; then
-					# fs resize active ?
-					if [ ! -f "$SYNC_PROGRESS_DIR/$LVM_IMAGE_NAME" ]; then
-						break
-					fi
-				fi
-				sleep 5
-				if [ "$MAX_AUTH_LOOP" == "$MAX_VOLUME_AUTHENTICATION_LOOP" ]; then
-					openqrm_post_event 0 "auth" 3 "lvm-storage" "Volume $LVM_IMAGE_TYPE image $LVM_IMAGE_ROOTDEVICE does not exists. Cannot auth to $LVM_IMAGE_AUTH"
-					exit 1
-				fi
-				MAX_AUTH_LOOP=$(( MAX_AUTH_LOOP + 1 ))
-			done
-		fi
-
-		# run the auth command
-		LOCK_TIME=`openqrm_lock_queue aquire lvm-storage`
-		trap "openqrm_lock_queue release lvm-storage $LOCK_TIME" EXIT
-
-		if [ "$LVM_IMAGE_TYPE" == "lvm-iscsi-deployment" ]; then
-			manage_iscsi auth $LVM_IMAGE_AUTH
-		elif [ "$LVM_IMAGE_TYPE" == "lvm-nfs-deployment" ]; then
-			manage_nfs auth $LVM_IMAGE_AUTH
-		elif [ "$LVM_IMAGE_TYPE" == "lvm-aoe-deployment" ]; then
-			manage_vblade auth $LVM_IMAGE_AUTH
-		fi
-
-		openqrm_lock_queue release lvm-storage $LOCK_TIME
-		trap '' EXIT
-
-		# if we have an image name send back to openQRM that storage auth finished to remvoe the storage-auth-blocker
-		if [ "$LVM_OPENQRM_USERNAME" != "" ] && [ "$LVM_OPENQRM_PASSWORD" != "" ] && [ "$LVM_IMAGE_NAME" != "" ]; then
-			if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$LVM_OPENQRM_USERNAME --http-password=$LVM_OPENQRM_PASSWORD "$openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/lvm-storage/lvm-storage-action.php?lvm_storage_command=auth_finished&lvm_image_name=$LVM_IMAGE_NAME"; then
-				openqrm_post_event 0 "auth" 3 "lvm-storage" "Could not remove the storage-auth-blocker from the openQRM-server at $OPENQRM_SERVER_IP"
-			fi
-		fi
-		;;
-
-	adapt)
-		if [ ! -e /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			openqrm_post_event 0 "add" 3 "lvm-storage" "Volume $LVM_IMAGE_NAME does not exist"
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire lvm-storage`
-		trap "openqrm_lock_queue release lvm-storage $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		STORAGE_STATUS_TMP=$resource_id.lvm.$LVM_IMAGE_NAME.adapt
-		> $STORAGE_STATUS_TMP
-		if [ "$LVM_IMAGE_TYPE" == "lvm-iscsi-deployment" ]; then
-			# make sure it is not still used by another storage type, check for aoe + nfs
-			if [ "$VBLADECONF" != "" ]; then
-				if grep -w "/dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME" $VBLADECONF | grep -v '^#'; then
-					if `which vblade 1>/dev/null`; then
-						manage_vblade remove
-					fi
-				fi
-			fi
-			if [ "$NFSEXPORTS" != "" ]; then
-				if grep -w "/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME" $NFSEXPORTS | grep -v '^#'; then
-					if `which exportfs 1>/dev/null`; then
-						manage_fstab remove
-						manage_nfs remove
-					fi
-				fi
-			fi
-			manage_iscsi adapt $LVM_IMAGE_AUTH
-			LUN=`grep -w $LVM_IMAGE_NAME $IETDCONF | grep -v "#" | grep Lun | awk {'print $2 '}`
-			TARGET=`grep -w $LVM_IMAGE_NAME $IETDCONF | grep -v "#" | grep Target | awk {' print $2 '}`
-			echo "$LVM_IMAGE_NAME,$LVM_STORAGE_SERVER_VOLUME_GROUP:/dev/$TARGET/$LUN" >> $STORAGE_STATUS_TMP
-		elif [ "$LVM_IMAGE_TYPE" == "lvm-nfs-deployment" ]; then
-			# make sure it is not still used by another storage type, check for aoe + iscsi
-			if [ "$VBLADECONF" != "" ]; then
-				if grep -w "/dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME" $VBLADECONF | grep -v '^#'; then
-					if `which vblade 1>/dev/null`; then
-						manage_vblade remove
-					fi
-				fi
-			fi
-			if [ "$IETDCONF" != "" ]; then
-				if grep -w "/dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME" $IETDCONF | grep -v '^#'; then
-					if `which ietadm 1>/dev/null`; then
-						manage_iscsi remove
-					fi
-				fi
-			fi
-			manage_nfs adapt $OPENQRM_SERVER_IP
-			echo "$LVM_STORAGE_SERVER_VOLUME_GROUP,/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME" >> $STORAGE_STATUS_TMP
-		elif [ "$LVM_IMAGE_TYPE" == "lvm-aoe-deployment" ]; then
-			# make sure it is not still used by another storage type, check for iscsi + nfs
-			if [ "$IETDCONF" != "" ]; then
-				if grep -w "/dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME" $IETDCONF | grep -v '^#'; then
-					if `which ietadm 1>/dev/null`; then
-						manage_iscsi remove
-					fi
-				fi
-			fi
-			if [ "$NFSEXPORTS" != "" ]; then
-				if grep -w "/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME" $NFSEXPORTS | grep -v '^#'; then
-					if `which exportfs 1>/dev/null`; then
-						manage_fstab remove
-						manage_nfs remove
-					fi
-				fi
-			fi
-			manage_vblade adapt
-			V_SHELF=`grep -w $LVM_IMAGE_NAME $VBLADECONF | awk {' print $2 '}`
-			V_SLOT=`grep -w $LVM_IMAGE_NAME $VBLADECONF | awk {' print $3 '}`
-			echo "$LVM_IMAGE_NAME,$LVM_STORAGE_SERVER_VOLUME_GROUP:$LVM_IMAGE_NAME:/dev/etherd/e$V_SHELF.$V_SLOT" >> $STORAGE_STATUS_TMP
-		fi
-
-		openqrm_lock_queue release lvm-storage $LOCK_TIME
-		trap '' EXIT
-
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$LVM_OPENQRM_USERNAME --http-password=$LVM_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/lvm-storage/lvm-storage-action.php?lvm_storage_command=get_ident; then
-			openqrm_post_event 0 "adapt" 3 "lvm-storage" "Could not post the rootfs-identifier to the openQRM-server at $OPENQRM_SERVER_IP"
-		fi
-		rm -f $STORAGE_STATUS_TMP $STORAGE_STATUS_TMP.post
-		;;
-
-	list)
-		lvs
-		;;
-	post_vg)
-		#echo "Posting current volume group status to the openQRM-server"
-		STORAGE_STATUS_TMP=$resource_id.vg.stat
-		### set size
-		vgs --units m | grep -v VFree | sed -e "s/ \{1,\}//" > $STORAGE_STATUS_TMP
-		sed -i -e "s/ \{1,\}/@/g" $STORAGE_STATUS_TMP
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$LVM_OPENQRM_USERNAME --http-password=$LVM_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/lvm-storage/lvm-storage-action.php?lvm_storage_command=get_storage; then
-			openqrm_post_event 0 "post_vg" 3 "lvm-storage" "Could not post the volume group status to the openQRM-server at $OPENQRM_SERVER_IP"
-		fi
-		rm -f $STORAGE_STATUS_TMP $STORAGE_STATUS_TMP.post
-		;;
-	post_lv)
-		#echo "Posting current $LVM_IMAGE_TYPE logic volume status to the openQRM-server"
-		STORAGE_STATUS_TMP=$resource_id.$LVM_STORAGE_SERVER_VOLUME_GROUP.lv.stat
-		> $STORAGE_STATUS_TMP
-		lvs $LVM_STORAGE_SERVER_VOLUME_GROUP --noheadings --units m -o lv_name,vg_name,lv_attr,lv_size,origin | sed -e "s/ \{1,\}//" > $STORAGE_STATUS_TMP.tmp
-		for LVOL in `cat $STORAGE_STATUS_TMP.tmp | awk {' print $1 '}`; do
-			if grep -w $LVOL $NFSEXPORTS 1>/dev/null; then
-				# is this a clonezilla location ?
-				if [ ! -f /$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVOL/clonezilla ]; then
-					echo -n "lvm-nfs-deployment " >> $STORAGE_STATUS_TMP
-				else
-					echo -n " " >> $STORAGE_STATUS_TMP
-				fi
-			elif grep -w $LVOL $IETDCONF 1>/dev/null; then
-				echo -n "lvm-iscsi-deployment " >> $STORAGE_STATUS_TMP
-			elif grep -w $LVOL $VBLADECONF 1>/dev/null; then
-				echo -n "lvm-aoe-deployment " >> $STORAGE_STATUS_TMP
-			else
-				echo -n " " >> $STORAGE_STATUS_TMP
-			fi
-			grep -w ^$LVOL $STORAGE_STATUS_TMP.tmp >> $STORAGE_STATUS_TMP
-		done
-		# detect clone-in-progress
-		for CLONE in `find $SYNC_PROGRESS_DIR/$LVM_STORAGE_SERVER_VOLUME_GROUP-* -type f`; do
-		    CLONE_IMAGE_NAME=`basename $CLONE | cut -d'-' -f2- | sed -e "s/\.clone_in_progress//g"`
-		    SOURCE_IMAGE_NAME=`echo $CLONE_IMAGE_NAME | cut -d'.' -f1`
-		    SYNC_IN_PROGRESS=`echo $CLONE_IMAGE_NAME | cut -d'.' -f2`
-		    if [ "$SYNC_IN_PROGRESS" == "sync_in_progress" ]; then
-				grep -w -v $SOURCE_IMAGE_NAME $STORAGE_STATUS_TMP > $STORAGE_STATUS_TMP.clone
-				mv -f $STORAGE_STATUS_TMP.clone $STORAGE_STATUS_TMP
-				echo "- $SOURCE_IMAGE_NAME - - sync_in_progress - - " >> $STORAGE_STATUS_TMP
-		    else
-				grep -w -v $CLONE_IMAGE_NAME $STORAGE_STATUS_TMP > $STORAGE_STATUS_TMP.clone
-				mv -f $STORAGE_STATUS_TMP.clone $STORAGE_STATUS_TMP
-				echo "- $CLONE_IMAGE_NAME - - clone_in_progress - - " >> $STORAGE_STATUS_TMP
-		    fi
-		done
-		sed -i -e "s/ \{1,\}/@/g" $STORAGE_STATUS_TMP
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$LVM_OPENQRM_USERNAME --http-password=$LVM_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/lvm-storage/lvm-storage-action.php?lvm_storage_command=get_storage; then
-			openqrm_post_event 0 "post_lv" 3 "lvm-storage" "Could not post the logical volume list to the openQRM-server at $OPENQRM_SERVER_IP"
-		fi
-		rm -f $STORAGE_STATUS_TMP $STORAGE_STATUS_TMP.post $STORAGE_STATUS_TMP.tmp
-		;;
-	post_identifier)
-		STORAGE_STATUS_TMP=$resource_id.lv.$LVM_IMAGE_TYPE.ident
-		> $STORAGE_STATUS_TMP
-
-		for LVOL in `openqrm_get_lvm_volume_paths`; do
-			LVOL_SHORT=`basename $LVOL`
-			case $LVM_IMAGE_TYPE in
-				lvm-nfs-deployment)
-					exportfs -v | awk {' print $1 '} | grep -v "<.*>" > /tmp/$STORAGE_STATUS_TMP
-					if grep -w $LVOL_SHORT /tmp/$STORAGE_STATUS_TMP 1>/dev/null; then
-						EXPORT_PATH=`echo $LVOL | sed -e "s#^/dev##g"`
-						# is this a clonezilla location ?
-						if [ ! -f $EXPORT_PATH/clonezilla ]; then
-							echo "$LVOL,$EXPORT_PATH"
-							echo "$LVOL,$EXPORT_PATH" >> $STORAGE_STATUS_TMP
-						fi
-					fi
-					rm -f /tmp/$STORAGE_STATUS_TMP
-					;;
-
-				lvm-iscsi-deployment)
-					if grep $LVOL_SHORT $IETDCONF 1>/dev/null; then
-						LUN=`grep -w $LVOL_SHORT $IETDCONF | grep Lun | awk {'print $2 '}`
-						TARGET=`cat $IETDCONF | grep -v "#" | grep Target | grep -w $LVOL_SHORT | awk {' print $2 '}`
-						IMAGE_NAME=$LVOL_SHORT
-						VOLUME_GROUP=`echo $LVOL | cut -d'/' -f3`
-						echo "$IMAGE_NAME,$VOLUME_GROUP:/dev/$TARGET/$LUN"
-						echo "$IMAGE_NAME,$VOLUME_GROUP:/dev/$TARGET/$LUN" >> $STORAGE_STATUS_TMP
-					fi
-					;;
-
-				lvm-aoe-deployment)
-					if grep -w $LVOL_SHORT $VBLADECONF 1>/dev/null; then
-						INTERFACE=`grep -w $LVOL_SHORT $VBLADECONF | awk {'print $1	'}`
-						V_SHELF=`grep -w $LVOL_SHORT $VBLADECONF | awk {' print $2 '}`
-						V_SLOT=`grep -w $LVOL_SHORT $VBLADECONF | awk {' print $3 '}`
-						V_IMAGE=`grep -w $LVOL_SHORT $VBLADECONF | awk {' print $4 '}`
-						V_ALLOWED_MAC=`grep -w $LVOL_SHORT $VBLADECONF | awk {' print $5 '}`
-						VOLUME_GROUP=`echo $LVOL | cut -d'/' -f3`
-						echo "$V_IMAGE,$VOLUME_GROUP:$LVOL_SHORT:/dev/etherd/e$V_SHELF.$V_SLOT"
-						echo "$V_IMAGE,$VOLUME_GROUP:$LVOL_SHORT:/dev/etherd/e$V_SHELF.$V_SLOT" >> $STORAGE_STATUS_TMP
-					fi
-					;;
-			esac
-
-		done
-
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$LVM_OPENQRM_USERNAME --http-password=$LVM_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/lvm-storage/lvm-storage-action.php?lvm_storage_command=get_ident; then
-			openqrm_post_event 0 "post_identifier" 3 "lvm-storage" "Could not post the rootfs-identifier to the openQRM-server at $OPENQRM_SERVER_IP"
-		fi
-		rm -f $STORAGE_STATUS_TMP $STORAGE_STATUS_TMP.post
-		;;
-
-
-	post_sync_progress)
-		echo "Posting progress of the sync action for volume $LVM_IMAGE_NAME to the openQRM-server"
-		if [ ! -f "$SYNC_PROGRESS_DIR/rsync_files.$LVM_IMAGE_NAME.log" ] || [ ! -f "$SYNC_PROGRESS_DIR/rsync_progress.$LVM_IMAGE_NAME.log" ]; then
-			exit 0
-		fi
-		STORAGE_STATUS_TMP=$resource_id.lvm.$LVM_IMAGE_NAME.sync_progress
-		while (true); do
-			# if this is a snapshot volume we have to wait until the sync is ready
-			if [ -e "/dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME" ] && [ ! -f "$SYNC_PROGRESS_DIR/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME.clone_in_progress" ]; then
-				# sync is ready
-				break
-			else
-				if [ ! -f "$SYNC_PROGRESS_DIR/rsync_files.$LVM_IMAGE_NAME.log" ] || [ ! -f "$SYNC_PROGRESS_DIR/rsync_progress.$LVM_IMAGE_NAME.log" ]; then
-				    # cloning not started yet, waiting for the snapshot to appear
-				    echo "0" > $STORAGE_STATUS_TMP
-				else
-				    # get the size of all changes
-				    COMPLETE_CHANGE_SIZE=`cat $SYNC_PROGRESS_DIR/rsync_files.$LVM_IMAGE_NAME.log | wc -l`
-				    # double up to get around 100 percent
-				    COMPLETE_CHANGE_SIZE=$(( COMPLETE_CHANGE_SIZE * 2 ))
-				    PARTITIAL_CHANGE_SIZE=`cat $SYNC_PROGRESS_DIR/rsync_progress.$LVM_IMAGE_NAME.log | wc -l`
-				    if [ "$PARTITIAL_CHANGE_SIZE" == 0 ]; then
-					    PARTITIAL_CHANGE_SIZE=1
-				    fi
-				    CURRENT_SYNC_PROGRESS_IN_PERCENT=$(( COMPLETE_CHANGE_SIZE / PARTITIAL_CHANGE_SIZE ))
-				    CURRENT_SYNC_PROGRESS_IN_PERCENT=$(( 100 / CURRENT_SYNC_PROGRESS_IN_PERCENT ))
-				    # make sure to not send 100%, this is send by clone finished
-				    CURRENT_SYNC_PROGRESS_IN_PERCENT=$(( CURRENT_SYNC_PROGRESS_IN_PERCENT - 1 ))
-					if (( $CURRENT_SYNC_PROGRESS_IN_PERCENT < 0 )); then
-						CURRENT_SYNC_PROGRESS_IN_PERCENT=0
-					fi
-				    echo "$CURRENT_SYNC_PROGRESS_IN_PERCENT" > $STORAGE_STATUS_TMP
-				    if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$LVM_OPENQRM_USERNAME --http-password=$LVM_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/lvm-storage/lvm-storage-action.php?lvm_storage_command=get_sync_progress; then
-					    lvm_storage_log "post_sync_progress" "Could not post the sync progress for volume $LVM_IMAGE_NAME to openQRM at $OPENQRM_SERVER_IP."
-				    fi
-				    rm -f $STORAGE_STATUS_TMP $STORAGE_STATUS_TMP.post
-				fi
-			fi
-			sleep 2
-		done
-		;;
-
-
-	post_sync_finished)
-		echo "Posting finished for volume $LVM_IMAGE_NAME to the openQRM-server"
-		STORAGE_STATUS_TMP=$resource_id.lvm.$LVM_IMAGE_NAME.sync_progress
-		echo "100" > $STORAGE_STATUS_TMP
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$LVM_OPENQRM_USERNAME --http-password=$LVM_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/lvm-storage/lvm-storage-action.php?lvm_storage_command=get_sync_finished; then
-			lvm_storage_log "post_sync_finished" "Could not post the sync progress for volume $LVM_IMAGE_NAME to openQRM at $OPENQRM_SERVER_IP."
-		fi
-		rm -f $STORAGE_STATUS_TMP $STORAGE_STATUS_TMP.post
-		;;
-
-
-
-	*)
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		lvm_storage_usage
-		;;
-
-
-esac
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/etc/init.d/lvm-storage b/openQRM-5.3.50-CE/src/plugins/lvm-storage/etc/init.d/lvm-storage
deleted file mode 100644
index 4394920..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/etc/init.d/lvm-storage
+++ /dev/null
@@ -1,205 +0,0 @@
-#!/bin/bash
-# this is the boot-service init script for the LVM-Storage-hosts
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/include/openqrm-plugin-lvm-storage-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/etc/openqrm-plugin-lvm-storage.conf
-LINE_IFS='
-'
-
-# do not start on the intitrd
-if [ -f /etc/initrd-devices.conf ]; then
-	exit 0
-fi
-
-function lvm_storage_start() {
-	echo "Starting the openQRM lvm-storage-plugin"
-	if [ "$LVM_AOE_STORAGE_AUTO_START" == "yes" ]; then
-		# aoe
-		mkdir -p /var/run/vblade/
-		if [ -x "/etc/init.d/vblade" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d vblade start
-			else
-				/etc/init.d/vblade start
-			fi
-		else
-			if [ -f $VBLADECONF ]; then
-				if which vbladed 1>/dev/null; then
-					echo "Starting vblades ..."
-					OLD_IFS=$IFS
-					IFS=$LINE_IFS
-					for VBLADE_L in `cat $VBLADECONF | grep -v '#' | sed '/^$/d'`; do
-						V_INTERFACE=`echo $VBLADE_L | awk {' print $1 '}`
-						V_SHELF=`echo $VBLADE_L | awk {' print $2 '}`
-						V_SLOT=`echo $VBLADE_L | awk {' print $3 '}`
-						V_IMAGE=`echo $VBLADE_L | awk {' print $4 '}`
-						V_ALLOWED_MAC=`echo $VBLADE_L | awk {' print $5 '}`
-						vbladed $V_SHELF $V_SLOT $V_INTERFACE $V_IMAGE
-					done
-					IFS=$OLD_IFS
-				fi
-			fi
-		fi
-	fi
-	if [ "$LVM_NFS_STORAGE_AUTO_START" == "yes" ]; then
-		if [ -x "/etc/init.d/nfs-kernel-server" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfs-kernel-server start
-			else
-				/etc/init.d/nfs-kernel-server start
-			fi
-		fi
-		if [ -x "/etc/init.d/nfs" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfs start
-			else
-				/etc/init.d/nfs start
-			fi
-		fi
-		if [ -x "/etc/init.d/nfslock" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfslock start
-			else
-				/etc/init.d/nfslock start
-			fi
-		fi
-		# for Suse
-		if [ -x /etc/init.d/nfsserver ]; then
-			/etc/init.d/nfsserver start
-		fi
-	fi
-	if [ "$LVM_ISCSI_STORAGE_AUTO_START" == "yes" ]; then
-		if [ -x "/etc/init.d/iscsi-target" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d iscsi-target start
-			else
-				/etc/init.d/iscsi-target start
-			fi
-		elif [ -x /etc/init.d/iscsitarget ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d iscsitarget start
-			else
-				/etc/init.d/iscsitarget start
-			fi
-		fi
-	fi
-}
-
-
-function lvm_storage_stop() {
-	echo "Stopping the openQRM lvm-storage-plugin"
-	if [ "$LVM_AOE_STORAGE_AUTO_START" == "yes" ]; then
-		# aoe
-		if [ -x "/etc/init.d/vblade" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d vblade stop
-			else
-				/etc/init.d/vblade stop
-				for VPID in `ps ax | grep vblade | grep -v grep | awk {' print $1 '}`; do
-					kill $VPID
-				done
-			fi
-		else
-			if [ -f $VBLADECONF ]; then
-				echo "Stopping vblades ..."
-				OLD_IFS=$IFS
-				IFS=$LINE_IFS
-				for VBLADE_L in `cat $VBLADECONF | grep -v '#' | sed '/^$/d'`; do
-					V_INTERFACE=`echo $VBLADE_L | awk {' print $1 '}`
-					V_SHELF=`echo $VBLADE_L | awk {' print $2 '}`
-					V_SLOT=`echo $VBLADE_L | awk {' print $3 '}`
-					V_IMAGE=`echo $VBLADE_L | awk {' print $4 '}`
-					V_ALLOWED_MAC=`echo $VBLADE_L | awk {' print $5 '}`
-					for VBLADE_PID in `ps ax | grep vblade | grep -w $V_IMAGE | awk {' print $1 '}`; do
-						kill $VBLADE_PID
-					done
-				done
-				IFS=$OLD_IFS
-			fi
-			killall vblade 1>/dev/null 2>&1
-		fi
-	fi
-	if [ "$LVM_NFS_STORAGE_AUTO_START" == "yes" ]; then
-		if [ -x "/etc/init.d/nfs-kernel-server" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfs-kernel-server stop
-			else
-				/etc/init.d/nfs-kernel-server stop
-			fi
-		fi
-		if [ -x "/etc/init.d/nfs" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfs stop
-			else
-				/etc/init.d/nfs stop
-			fi
-		fi
-		if [ -x "/etc/init.d/nfslock" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfslock stop
-			else
-				/etc/init.d/nfslock stop
-			fi
-		fi
-		# for Suse
-		if [ -x /etc/init.d/nfsserver ]; then
-			/etc/init.d/nfsserver stop
-		fi
-	fi
-	if [ "$LVM_ISCSI_STORAGE_AUTO_START" == "yes" ]; then
-		if [ -x "/etc/init.d/iscsi-target" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d iscsi-target stop
-			else
-				/etc/init.d/iscsi-target stop
-			fi
-		elif [ -x /etc/init.d/iscsitarget ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d iscsitarget stop
-			else
-				/etc/init.d/iscsitarget stop
-			fi
-		fi
-	fi
-
-}
-
-
-
-
-
-case "$1" in
-	start)
-		lvm_storage_start
-		;;
-	stop)
-		lvm_storage_stop
-		;;
-	restart)
-		lvm_storage_stop
-		sleep 1
-		lvm_storage_start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-
-esac
-exit $?
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/etc/init.d/openqrm-plugin-lvm-storage b/openQRM-5.3.50-CE/src/plugins/lvm-storage/etc/init.d/openqrm-plugin-lvm-storage
deleted file mode 100644
index e444318..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/etc/init.d/openqrm-plugin-lvm-storage
+++ /dev/null
@@ -1,350 +0,0 @@
-#!/bin/bash
-# init script for the openQRM lvm-storage-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/include/openqrm-plugin-lvm-storage-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/etc/openqrm-plugin-lvm-storage.conf
-
-
-LINE_IFS='
-'
-
-function openqrm_plugin_lvm-storage_start() {
-	echo "Starting the openQRM lvm-storage-plugin"
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/lvm-storage/.running
-
-	if [ "$LVM_AOE_STORAGE_AUTO_START" == "yes" ]; then
-	   # make sure vbladed is stopped, not using the init script here because this may exit 1
-		for VPID in `ps ax | grep vblade | grep -v grep | awk {' print $1 '}`; do
-			kill $VPID
-		done
-		killall vblade 1>/dev/null 2>&1
-		#openqrm_plugin_lvm-storage_stop 1>/dev/null 2>&1
-
-		# aoe
-		mkdir -p /var/run/vblade/
-		if [ -x "/etc/init.d/vblade" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d vblade start
-			else
-				/etc/init.d/vblade start
-			fi
-		else
-			if [ -f $VBLADECONF ]; then
-				if which vbladed 1>/dev/null; then
-					echo "Starting vblades ..."
-					OLD_IFS=$IFS
-					IFS=$LINE_IFS
-					for VBLADE_L in `cat $VBLADECONF | grep -v '#' | sed '/^$/d'`; do
-						V_INTERFACE=`echo $VBLADE_L | awk {' print $1 '}`
-						V_SHELF=`echo $VBLADE_L | awk {' print $2 '}`
-						V_SLOT=`echo $VBLADE_L | awk {' print $3 '}`
-						V_IMAGE=`echo $VBLADE_L | awk {' print $4 '}`
-						V_ALLOWED_MAC=`echo $VBLADE_L | awk {' print $5 '}`
-						vbladed $V_SHELF $V_SLOT $V_INTERFACE $V_IMAGE
-					done
-					IFS=$OLD_IFS
-				fi
-			fi
-		fi
-	fi
-	if [ "$LVM_NFS_STORAGE_AUTO_START" == "yes" ]; then
-		if [ -x "/etc/init.d/nfs-kernel-server" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfs-kernel-server start
-			else
-				/etc/init.d/nfs-kernel-server start
-			fi
-		fi
-		if [ -x "/etc/init.d/nfs" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfs start
-			else
-				/etc/init.d/nfs start
-			fi
-		fi
-		if [ -x "/etc/init.d/nfslock" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfslock start
-			else
-				/etc/init.d/nfslock start
-			fi
-		fi
-		# for Suse
-		if [ -x /etc/init.d/nfsserver ]; then
-			/etc/init.d/nfsserver start
-		fi
-	fi
-	if [ "$LVM_ISCSI_STORAGE_AUTO_START" == "yes" ]; then
-		if [ -x "/etc/init.d/iscsi-target" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d iscsi-target start
-			else
-				/etc/init.d/iscsi-target start
-			fi
-		elif [ -x /etc/init.d/iscsitarget ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d iscsitarget start
-			else
-				/etc/init.d/iscsitarget start
-			fi
-		fi
-	fi
-
-}
-
-
-function openqrm_plugin_lvm-storage_stop() {
-	echo "Stopping the openQRM lvm-storage-plugin"
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/lvm-storage/.running
-
-	if [ "$LVM_AOE_STORAGE_AUTO_START" == "yes" ]; then
-		# aoe
-		if [ -x "/etc/init.d/vblade" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d vblade stop
-			else
-				/etc/init.d/vblade stop
-				for VPID in `ps ax | grep vblade | grep -v grep | awk {' print $1 '}`; do
-					kill $VPID
-				done
-			fi
-		else
-			if [ -f $VBLADECONF ]; then
-				echo "Stopping vblades ..."
-				OLD_IFS=$IFS
-				IFS=$LINE_IFS
-				for VBLADE_L in `cat $VBLADECONF | grep -v '#' | sed '/^$/d'`; do
-					V_INTERFACE=`echo $VBLADE_L | awk {' print $1 '}`
-					V_SHELF=`echo $VBLADE_L | awk {' print $2 '}`
-					V_SLOT=`echo $VBLADE_L | awk {' print $3 '}`
-					V_IMAGE=`echo $VBLADE_L | awk {' print $4 '}`
-					V_ALLOWED_MAC=`echo $VBLADE_L | awk {' print $5 '}`
-					for VBLADE_PID in `ps ax | grep vblade | grep -w $V_IMAGE | awk {' print $1 '}`; do
-						kill $VBLADE_PID
-					done
-				done
-				IFS=$OLD_IFS
-			fi
-			killall vblade 1>/dev/null 2>&1
-		fi
-	fi
-
-	if [ "$LVM_NFS_STORAGE_AUTO_START" == "yes" ]; then
-		if [ -x "/etc/init.d/nfs-kernel-server" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfs-kernel-server stop
-			else
-				/etc/init.d/nfs-kernel-server stop
-			fi
-		fi
-		if [ -x "/etc/init.d/nfs" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfs stop
-			else
-				/etc/init.d/nfs stop
-			fi
-		fi
-		if [ -x "/etc/init.d/nfslock" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfslock stop
-			else
-				/etc/init.d/nfslock stop
-			fi
-		fi
-		# for Suse
-		if [ -x /etc/init.d/nfsserver ]; then
-			/etc/init.d/nfsserver stop
-		fi
-	fi
-	if [ "$LVM_ISCSI_STORAGE_AUTO_START" == "yes" ]; then
-		if [ -x "/etc/init.d/iscsi-target" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d iscsi-target stop
-			else
-				/etc/init.d/iscsi-target stop
-			fi
-		elif [ -x /etc/init.d/iscsitarget ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d iscsitarget stop
-			else
-				/etc/init.d/iscsitarget stop
-			fi
-		fi
-	fi
-}
-
-
-function openqrm_plugin_lvm-storage_uninstall() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "lvm-storage: Please give a username to uninstall the plugin : "
-		read USERNAME
-		echo
-		echo -n "lvm-storage: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Uninstalling the openQRM lvm-storage-plugin"
-	openqrm_plugin_lvm-storage_stop
-	openqrm_server_remove_deployment_type $USERNAME $PASSWORD lvm-aoe-deployment
-	openqrm_server_remove_deployment_type $USERNAME $PASSWORD lvm-iscsi-deployment
-	openqrm_server_remove_deployment_type $USERNAME $PASSWORD lvm-nfs-deployment
-	openqrm_server_remove_deployment_type $USERNAME $PASSWORD custom-iscsi-deployment
-	openqrm_server_remove_deployment_type $USERNAME $PASSWORD custom-nfs-deployment
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/lvm-storage
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-lvm-storage.tgz
-
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.lvm-aoe-deployment
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.lvm-iscsi-deployment
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.custom-iscsi-deployment
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.custom-nfs-deployment
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.lvm-nfs-deployment
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.lvm-aoe-deployment.php
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.lvm-iscsi-deployment.php
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.custom-iscsi-deployment.php
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.custom-nfs-deployment.php
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.lvm-nfs-deployment.php
-
-	# remove only if nfs/iscsi/aoe is not enabled
-	if ! ls $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins | grep iscsi-storage 1>/dev/null 2>&1; then
-		if ! ls $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins | grep netapp-storage 1>/dev/null 2>&1; then
-			rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/iscsid
-			rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/iscsiadm
-		fi
-	fi
-	if ! ls $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins | grep aoe-storage 1>/dev/null 2>&1; then
-		rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/aoe-interfaces
-		rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/aoe-discover
-		rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/aoe-stat
-		rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/aoe-mkdevs
-		rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/aoe-mkshelf
-	fi
-
-}
-
-function openqrm_plugin_lvm-storage_init() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "lvm-storage: Please give a username to init the plugin : "
-		read USERNAME
-		echo
-		echo -n "lvm-storage: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Initializing the openQRM lvm-storage-plugin"
-	openqrm_server_add_deployment_type $USERNAME $PASSWORD lvm-aoe-deployment lvm-aoe-deployment "Lvm Aoe-root deployment" lvm-storage "Lvm Storage Server (Aoe)"
-	openqrm_server_add_deployment_type $USERNAME $PASSWORD lvm-iscsi-deployment lvm-iscsi-deployment "Lvm Iscsi-root deployment" lvm-storage "Lvm Storage Server (Iscsi)"
-	openqrm_server_add_deployment_type $USERNAME $PASSWORD lvm-nfs-deployment lvm-nfs-deployment "Lvm Nfs-root deployment" lvm-storage "Lvm Storage Server (Nfs)"
-	openqrm_server_add_deployment_type $USERNAME $PASSWORD custom-iscsi-deployment custom-iscsi-deployment "Custom iSCSI-root deployment" lvm-storage "Custom Storage Server (iSCSI)"
-	openqrm_server_add_deployment_type $USERNAME $PASSWORD custom-nfs-deployment custom-nfs-deployment "Custom NFS-root deployment" lvm-storage "Custom Storage Server (NAS/NFS)"
-
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/lvm-storage
-	# link the boot-service
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/boot-service-lvm-storage.tgz $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-lvm-storage.tgz
-	# linking the root mount hooks
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/root-mount.lvm-aoe-deployment $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.lvm-aoe-deployment
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/root-mount.lvm-iscsi-deployment $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.lvm-iscsi-deployment
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/root-mount.custom-iscsi-deployment $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.custom-iscsi-deployment
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/root-mount.custom-nfs-deployment $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.custom-nfs-deployment
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/root-mount.lvm-nfs-deployment $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.lvm-nfs-deployment
-	# linking the image deployment parameters menu
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/image.lvm-aoe-deployment.php $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.lvm-aoe-deployment.php
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/image.lvm-iscsi-deployment.php $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.lvm-iscsi-deployment.php
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/image.custom-iscsi-deployment.php $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.custom-iscsi-deployment.php
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/image.custom-nfs-deployment.php $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.custom-nfs-deployment.php
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/image.lvm-nfs-deployment.php $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.lvm-nfs-deployment.php
-
-	# copying iscsid to boot-service dir
-	if [ ! -x $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/iscsid ]; then
-		cp -f `which iscsid` $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/
-	fi
-	# copying iscsiadm to boot-service dir
-	if [ ! -x $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/iscsiadm ]; then
-		cp -f `which iscsiadm` $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/
-	fi
-
-	# copying aoe-interfaces to boot-service dir
-	if [ ! -x $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/aoe-interfaces ]; then
-		cp -f `which aoe-interfaces` $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/
-	fi
-	# copying aoe-discover to boot-service dir
-	if [ ! -x $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/aoe-discover ]; then
-		cp -f `which aoe-discover` $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/
-	fi
-	# copying aoe-stat to boot-service dir
-	if [ ! -x $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/aoe-stat ]; then
-		cp -f `which aoe-stat` $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/
-	fi
-	# copying aoe-mkdevs to boot-service dir
-	if [ ! -x $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/aoe-mkdevs ]; then
-		cp -f `which aoe-mkdevs` $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/
-		# remove the axwwww from the ps cmd in aoe-mkdevs
-		sed -i -e "s/axwwww//g" $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/aoe-mkdevs
-	fi
-	# copying aoe-mkshelf to boot-service dir
-	if [ ! -x $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/aoe-mkshelf ]; then
-		cp -f `which aoe-mkshelf` $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/
-		# remove the axwwww from the ps cmd in aoe-mkshelf
-		sed -i -e "s/axwwww//g" $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/aoe-mkshelf
-	fi
-	# create storage dir for stat files
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/storage
-	chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/storage
-	echo "Order deny,allow" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/storage/.htaccess
-	echo "Deny from all" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/web/storage/.htaccess
-
-}
-
-USER=$2
-PASS=$3
-
-case "$1" in
-	start)
-		openqrm_plugin_lvm-storage_start
-		;;
-	stop)
-		openqrm_plugin_lvm-storage_stop
-		;;
-	restart)
-		openqrm_plugin_lvm-storage_stop
-		sleep 1
-		openqrm_plugin_lvm-storage_start
-		;;
-	init)
-		openqrm_plugin_lvm-storage_init $USER $PASS
-		;;
-	uninstall)
-		openqrm_plugin_lvm-storage_uninstall $USER $PASS
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/etc/init.d/openqrm-plugin-lvm-storage.postinstall b/openQRM-5.3.50-CE/src/plugins/lvm-storage/etc/init.d/openqrm-plugin-lvm-storage.postinstall
deleted file mode 100644
index cf5ee9a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/etc/init.d/openqrm-plugin-lvm-storage.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-lvm-storage postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/etc/init.d/openqrm-plugin-lvm-storage.preremove b/openQRM-5.3.50-CE/src/plugins/lvm-storage/etc/init.d/openqrm-plugin-lvm-storage.preremove
deleted file mode 100644
index cbe256c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/etc/init.d/openqrm-plugin-lvm-storage.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-lvm-storage preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-lvm-storage stop
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/etc/openqrm-plugin-lvm-storage.conf b/openQRM-5.3.50-CE/src/plugins/lvm-storage/etc/openqrm-plugin-lvm-storage.conf
deleted file mode 100644
index e5a017a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/etc/openqrm-plugin-lvm-storage.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-# this is the openQRM-plugin-lvm-storage info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, aoetools, open-iscsi"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	if [ -f /etc/centos-release ]; then
-		# no aoetools package for centos any more
-		OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, iscsi-initiator-utils"
-	else
-		OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, aoetools, iscsi-initiator-utils"
-	fi
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, open-iscsi"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="Integrates LVM2 with NFS/iSCSI/AOE as Storage technology (network-deployment)."
-OPENQRM_PLUGIN_TYPE="storage"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES="device-manager"
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/etc/openqrm-plugin-lvm-storage.conf"
-
-# if openQRM should start/stop the storage component (yes/no), default no
-LVM_AOE_STORAGE_AUTO_START=no
-LVM_ISCSI_STORAGE_AUTO_START=no
-LVM_NFS_STORAGE_AUTO_START=no
-
-# for lvm-storage deployment: automatically resize the filesystem on LVM snapshots (true/false, default true)
-OPENQRM_PLUGIN_LVM_STORAGE_RESIZE_SNAPSHOTS_FILESYSTEM="true"
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/include/openqrm-plugin-lvm-storage-functions b/openQRM-5.3.50-CE/src/plugins/lvm-storage/include/openqrm-plugin-lvm-storage-functions
deleted file mode 100644
index 5f7119f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/include/openqrm-plugin-lvm-storage-functions
+++ /dev/null
@@ -1,512 +0,0 @@
-#!/bin/bash
-# this is the functions file for the lvm-storage-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-
-# iscsi-target config file
-IETDCONF=`find /etc/ -name ietd.conf -type f | head -n1`
-if [ "$IETDCONF" == "" ]; then
-	IETDCONF="/etc/ietd.conf"
-fi
-# vblade config file
-VBLADECONF=/etc/vblade.conf
-# nfs config files
-ETCFSTAB="/etc/fstab"
-NFSEXPORTS="/etc/exports"
-# some definitions
-DEFAULT_IMAGE_SIZE=5000
-MAX_UMOUNT_LOOP=5
-LV_SIZE_DEFAULT=5000
-ISCSI_TARGET_URL=http://iscsitarget.sourceforge.net/
-AOE_AUTHENTICATED_MAC="00:00:00:00:00:00"
-IMAGE_LUN=1
-# which screen binary to use
-if [ -x /usr/bin/screen.real ]; then
-	RUNSCREEN="/usr/bin/screen.real"
-else
-	RUNSCREEN=`which screen`
-fi
-
-################ common lvm-storage functions
-
-# logs for lvm_storage
-function lvm_storage_log() {
-	local COMPONENT=$1
-	shift
-	local MESSAGE=$@
-	logger -i -t "lvm-storage plug-in" "$COMPONENT : $MESSAGE"
-}
-
-
-################ lvm-storage functions
-
-
-# deps function
-function check_lvm_iscsi_storage_deps() {
-	# check and fullfill dependencies
-	# lvm2
-	if ! openqrm_full_fill_os_dependency lvm lvm2; then
-		return 1
-	fi
-	# e2fsprogs
-	if ! openqrm_full_fill_os_dependency resize2fs e2fsprogs; then
-		return 1
-	fi
-	# wget
-	if ! openqrm_full_fill_os_dependency wget wget; then
-		return 1
-	fi
-	# procmail for lockfile
-	if ! openqrm_full_fill_os_dependency lockfile procmail; then
-		return 1
-	fi
-	if [ -f /etc/debian_version ]; then
-		# open-iscsi
-		if ! openqrm_full_fill_os_dependency iscsid open-iscsi; then
-			return 1
-		fi
-		# open-iscsi-utils
-		if ! openqrm_full_fill_os_dependency iscsiadm open-iscsi-utils; then
-			return 1
-		fi
-		# ietd - needs dkms package on debian/ubuntu
-		if ! openqrm_full_fill_os_dependency ietd iscsitarget-dkms; then
-			return 1
-		fi
-		if ! openqrm_full_fill_os_dependency ietd iscsitarget; then
-			return 1
-		fi
-	elif [ -f /etc/redhat-release ]; then
-		# iscsi-initiator-utils
-		if ! openqrm_full_fill_os_dependency iscsid iscsi-initiator-utils; then
-			return 1
-		fi
-		# ietd
-		if ! openqrm_full_fill_os_dependency ietd iscsitarget; then
-			return 1
-		fi
-	elif [ -f /etc/SuSE-release ]; then
-		# open-iscsi
-		if ! openqrm_full_fill_os_dependency iscsid open-iscsi; then
-			return 1
-		fi
-		# ietd
-		if ! openqrm_full_fill_os_dependency ietd iscsitarget; then
-			return 1
-		fi
-	fi
-
-}
-
-
-# deps function
-function check_lvm_nfs_storage_deps() {
-	# check and fullfill dependencies
-	# lvm2
-	if ! openqrm_full_fill_os_dependency lvm lvm2; then
-		return 1
-	fi
-	# e2fsprogs
-	if ! openqrm_full_fill_os_dependency resize2fs e2fsprogs; then
-		return 1
-	fi
-	# wget
-	if ! openqrm_full_fill_os_dependency wget wget; then
-		return 1
-	fi
-	# rsync
-	if ! openqrm_full_fill_os_dependency rsync rsync; then
-		return 1
-	fi
-	if [ -f /etc/debian_version ]; then
-		# nfs-kernel-server
-		if ! openqrm_full_fill_os_dependency exportfs nfs-kernel-server; then
-			return 1
-		fi
-		# nfs-common
-		if ! openqrm_full_fill_os_dependency mount.nfs nfs-common; then
-			return 1
-		fi
-	elif [ -f /etc/redhat-release ]; then
-		# nfs-utils
-		if ! openqrm_full_fill_os_dependency mount.nfs nfs-utils; then
-			return 1
-		fi
-	elif [ -f /etc/SuSE-release ]; then
-		# nfs-client
-		if ! openqrm_full_fill_os_dependency mount.nfs nfs-client; then
-			return 1
-		fi
-		# nfs-kernel-server
-		if ! openqrm_full_fill_os_dependency exportfs nfs-kernel-server; then
-			return 1
-		fi
-	fi
-
-}
-
-# deps function
-function check_lvm_aoe_storage_deps() {
-	# check and fullfill dependencies
-	# lvm2
-	if ! openqrm_full_fill_os_dependency lvm lvm2; then
-		return 1
-	fi
-	# e2fsprogs
-	if ! openqrm_full_fill_os_dependency resize2fs e2fsprogs; then
-		return 1
-	fi
-	# wget
-	if ! openqrm_full_fill_os_dependency wget wget; then
-		return 1
-	fi
-	if ! openqrm_full_fill_os_dependency vbladed vblade; then
-		return 1
-	fi
-	if ! openqrm_full_fill_os_dependency aoe-discover aoetools; then
-		return 1
-	fi
-}
-
-
-
-################ lvm-nfs ###################################
-
-
-function manage_fstab() {
-	case "$1" in
-		add)
-			if ! grep -w ^/dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME $ETCFSTAB; then
-				echo "/dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME    /$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME      ext3    defaults        1 1" >> $ETCFSTAB
-			fi
-			;;
-		remove)
-			# tabs and spaces
-			sed -i -e "s#^/dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME .*##g" $ETCFSTAB
-			sed -i -e "s#^/dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME	.*##g" $ETCFSTAB
-			;;
-	esac
-}
-
-
-function restart_lvm_nfs() {
-	if [ -x /etc/init.d/nfs ]; then
-		/etc/init.d/nfs reload
-	elif [ -x /etc/init.d/nfs-kernel-server ]; then
-		/etc/init.d/nfs-kernel-server reload
-	elif [ -x /etc/init.d/nfsserver ]; then
-		/etc/init.d/nfsserver reload
-	else
-		exportfs -r
-	fi
-}
-
-
-function manage_nfs() {
-	case "$1" in
-		add)
-			OPENQRM_SERVER=$3
-			if [ "$2" != "snap" ]; then
-				lvm_storage_log manage_nfs "NOTICE: creating ext3 filesytem on /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME"
-				if ! mkfs.ext3 -F /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME; then
-					openqrm_post_event 0 "add" 3 "openqrm-lvm-manager" "Could not create filesytem on /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME"
-					manage_fstab remove
-					return 1
-				fi
-			fi
-			mkdir -p /$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME
-			if ! `mount /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME /$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME`; then
-				openqrm_post_event 0 "add" 3 "openqrm-lvm-manager" "Could not mount /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME"
-				manage_fstab remove
-				return 1
-			fi
-			echo "/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME	$OPENQRM_SERVER(rw,insecure,no_root_squash,async)" >> $NFSEXPORTS
-			restart_lvm_nfs
-			;;
-		remove)
-			# tabs and spaces
-			sed -i -e "s#^/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME .*##g" $NFSEXPORTS
-			sed -i -e "s#^/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME	.*##g" $NFSEXPORTS
-			sed -i '/^$/d' $NFSEXPORTS
-			restart_lvm_nfs
-			while ! `umount /$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME`; do
-				if [ "$UMOUNT_LOOP" == "$MAX_UMOUNT_LOOP" ]; then
-					openqrm_post_event 0 "remove" 3 "openqrm-lvm-manager" "Could not umount /$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME"
-					manage_fstab remove
-					return 20
-				fi
-				UMOUNT_LOOP=$(( UMOUNT_LOOP + 1 ))
-				sleep 2
-			done
-			rmdir /$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME
-			;;
-		auth)
-			AUTH_IP=$2
-			# tabs and spaces
-			sed -i -e "s#^$LVM_IMAGE_ROOTDEVICE .*#$LVM_IMAGE_ROOTDEVICE	$AUTH_IP(rw,insecure,no_root_squash,async)#g" $NFSEXPORTS
-			sed -i -e "s#^$LVM_IMAGE_ROOTDEVICE	.*#$LVM_IMAGE_ROOTDEVICE	$AUTH_IP(rw,insecure,no_root_squash,async)#g" $NFSEXPORTS
-			sed -i '/^$/d' $NFSEXPORTS
-			restart_lvm_nfs
-			;;
-
-		adapt)
-			AUTH_IP=$3
-			if ! grep -w "/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME" $NFSEXPORTS 1>/dev/null; then
-				mkdir -p /$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME
-				if ! `mount /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME /$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME`; then
-					openqrm_post_event 0 "adapt" 3 "openqrm-lvm-manager" "Could not mount /dev/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME"
-					manage_fstab remove
-					return 1
-				fi
-				manage_fstab add
-				echo "/$LVM_STORAGE_SERVER_VOLUME_GROUP/$LVM_IMAGE_NAME	$AUTH_IP(rw,insecure,no_root_squash,async)" >> $NFSEXPORTS
-				restart_lvm_nfs
-			fi
-			;;
-
-	esac
-}
-
-
-
-################ lvm-iscsi ###################################
-
-
-function manage_iscsi() {
-
-	case "$1" in
-		add)
-			IMAGE_PASS=$3
-			if [ "$2" != "snap" ]; then
-				# create fs, currently static all ext3
-				mkfs.ext3 -F /dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME
-			fi
-			echo "Target $LVM_IMAGE_NAME" >> $IETDCONF
-			echo "	IncomingUser $LVM_IMAGE_NAME $IMAGE_PASS" >> $IETDCONF
-			echo "	Lun $IMAGE_LUN Path=/dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME,Type=fileio" >> $IETDCONF
-			echo "	MaxConnections 1    # $LVM_IMAGE_NAME" >> $IETDCONF
-			echo "	MaxSessions 1     # $LVM_IMAGE_NAME" >> $IETDCONF
-			echo "	NOPInterval 3    # $LVM_IMAGE_NAME" >> $IETDCONF
-			echo "	NOPTimeout  3    # $LVM_IMAGE_NAME" >> $IETDCONF
-			LAST_TID=`grep tid: /proc/net/iet/volume | cut -d':' -f2 | awk {' print $1 '} | sort -g | tail -n1`
-			NEW_TID=$(( $LAST_TID + 1 ))
-			# dynamically add new target
-			if ! ietadm --op new --tid=$NEW_TID --params Name=$LVM_IMAGE_NAME; then
-				openqrm_post_event 0 "add" 3 "openqrm-lvm-manager" "Could not create new iSCSI target"
-				return 1
-			fi
-			# set path to lvm device in the new target
-			if ! ietadm --op new --tid=$NEW_TID --lun=$IMAGE_LUN --params Path=/dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME; then
-				openqrm_post_event 0 "add" 3 "openqrm-lvm-manager" "Could not set Lun-path in new iSCSI target"
-				return 1
-			fi
-			# auth target
-			if ! ietadm --op new --tid=$NEW_TID --user --params IncomingUser=$LVM_IMAGE_NAME,Password=$IMAGE_PASS; then
-				openqrm_post_event 0 "add" 3 "openqrm-lvm-manager" "Could not set username/password in new iSCSI target"
-				return 1
-			fi
-			;;
-		remove)
-			# remove from config file
-			cat $IETDCONF | grep -v -w $LVM_IMAGE_NAME > $IETDCONF.tmp
-			mv -f $IETDCONF.tmp $IETDCONF
-			sed -i '/^$/d' $IETDCONF
-			# remove from target
-			TID_TO_REMOVE=`cat /proc/net/iet/volume | grep "name:$LVM_IMAGE_NAME$" | cut -d':' -f2 | awk {' print $1 '}`
-			OPEN_SESSION=`cat /proc/net/iet/session | grep -w ^tid:$TID_TO_REMOVE -A1 | grep sid: | cut -d':' -f2 | awk {' print $1 '}`
-			if [ "$OPEN_SESSION" != "" ]; then
-				# first remove active session (does not support multiple sessions yet)
-				if ! ietadm --op delete --tid=$TID_TO_REMOVE --sid=$OPEN_SESSION --cid=0; then
-					openqrm_post_event 0 "remove" 3 "openqrm-lvm-manager" "Could not remove session $OPEN_SESSION for tid $TID_TO_REMOVE"
-					return 1
-				fi
-			fi
-			# remove lun
-			if ! ietadm --op delete --tid=$TID_TO_REMOVE --lun=$IMAGE_LUN; then
-				openqrm_post_event 0 "remove" 3 "openqrm-lvm-manager" "Could not remove lun $IMAGE_LUN for tid $TID_TO_REMOVE"
-				return 1
-			fi
-			# remove target dynamically
-			if ! ietadm --op delete --tid=$TID_TO_REMOVE; then
-				openqrm_post_event 0 "remove" 3 "openqrm-lvm-manager" "Could not remove target tid $TID_TO_REMOVE"
-				return 1
-			fi
-			;;
-		auth)
-			IMAGE_PASS=$2
-			IMAGE_AUTHNAME=`basename $LVM_IMAGE_ROOTDEVICE`
-			sed -i -e "s#IncomingUser $IMAGE_AUTHNAME .*#IncomingUser $IMAGE_AUTHNAME $IMAGE_PASS#g" $IETDCONF
-			sed -i '/^$/d' $IETDCONF
-			TID_TO_AUTH=`cat /proc/net/iet/volume | grep "name:$IMAGE_AUTHNAME$" | cut -d':' -f2 | awk {' print $1 '}`
-			if [ "$TID_TO_AUTH" == "" ]; then
-				openqrm_post_event 0 "auth" 3 "openqrm-lvm-manager" "Could not find target $IMAGE_AUTHNAME to update the authentication"
-				return 1
-			fi
-			if ! ietadm --op new --tid=$TID_TO_AUTH --user --params IncomingUser=$IMAGE_AUTHNAME,Password=$IMAGE_PASS; then
-				openqrm_post_event 0 "auth" 3 "openqrm-lvm-manager" "Could not find target $IMAGE_AUTHNAME to update the authentication"
-				return 1
-			fi
-			;;
-
-		adapt)
-			IMAGE_PASS=$3
-			if [ "$IMAGE_PASS" == "" ]; then
-			    IMAGE_PASS=`cat /dev/urandom|tr -dc "a-zA-Z0-9-_\$\?"|fold -w 9|head -n1`
-			fi
-			if ! grep -w "/dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME" $IETDCONF | grep -v '^#' 1>/dev/null; then
-				echo "Target $LVM_IMAGE_NAME" >> $IETDCONF
-				echo "	IncomingUser $LVM_IMAGE_NAME $IMAGE_PASS" >> $IETDCONF
-				echo "	Lun $IMAGE_LUN Path=/dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME,Type=fileio" >> $IETDCONF
-				echo "	MaxConnections 1    # $LVM_IMAGE_NAME" >> $IETDCONF
-				echo "	MaxSessions 1     # $LVM_IMAGE_NAME" >> $IETDCONF
-				echo "	NOPInterval 3    # $LVM_IMAGE_NAME" >> $IETDCONF
-				echo "	NOPTimeout  3    # $LVM_IMAGE_NAME" >> $IETDCONF
-				LAST_TID=`grep tid: /proc/net/iet/volume | cut -d':' -f2 | awk {' print $1 '} | sort -g | tail -n1`
-				NEW_TID=$(( $LAST_TID + 1 ))
-				# dynamically add new target
-				if ! ietadm --op new --tid=$NEW_TID --params Name=$LVM_IMAGE_NAME; then
-					openqrm_post_event 0 "adapt" 3 "openqrm-lvm-manager" "Could not create new iSCSI target"
-					return 1
-				fi
-				# set path to lvm device in the new target
-				if ! ietadm --op new --tid=$NEW_TID --lun=$IMAGE_LUN --params Path=/dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME; then
-					openqrm_post_event 0 "adapt" 3 "openqrm-lvm-manager" "Could not set Lun-path in new iSCSI target"
-					return 1
-				fi
-				# auth target
-				if ! ietadm --op new --tid=$NEW_TID --user --params IncomingUser=$LVM_IMAGE_NAME,Password=$IMAGE_PASS; then
-					openqrm_post_event 0 "adapt" 3 "openqrm-lvm-manager" "Could not set username/password in new iSCSI target"
-					return 1
-				fi
-			fi
-			;;
-
-	esac
-}
-
-
-
-
-################ lvm-aoe ###################################
-
-
-function manage_vblade() {
-
-	if [ ! -f $VBLADECONF ]; then
-		mkdir -p `dirname $VBLADECONF`
-		echo "# this is the vblade configuration file created by openQRM" > $VBLADECONF
-		echo "" >> $VBLADECONF
-	fi
-	if [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-		. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-		AOE_INTERFACE=$OPENQRM_SERVER_INTERFACE
-	else
-		. /var/openqrm/openqrm-resource.conf
-		AOE_INTERFACE=`ip a s | grep -A1 ^[0-9] | grep -v lo | grep -i -B1 $resource_mac | grep ^[0-9] | head -n1 | awk {' print $2 '} | cut -d':' -f1`
-	fi
-
-	case "$1" in
-		add)
-			if [ "$2" != "snap" ]; then
-				# create fs, currently static all ext3
-				mkfs.ext3 -F /dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME
-			fi
-			FOUND=0
-			for (( AOE_SHELF=0; $AOE_SHELF<15; AOE_SHELF = $AOE_SHELF + 1)) ; do
-				for (( AOE_SLOT=1; $AOE_SLOT<=15; AOE_SLOT = $AOE_SLOT + 1)) ; do
-					TEST=`cat $VBLADECONF | grep -v '^#' | awk {' print $2" "$3 '} | grep $AOE_SHELF" "$AOE_SLOT`
-					STATUS=$?
-					if [ $STATUS -eq 1 ]; then
-						FOUND=1
-						break;
-					fi
-				done
-				if [ $STATUS -eq 1 ]; then
-					break;
-				fi
-			done
-			echo "$AOE_INTERFACE $AOE_SHELF $AOE_SLOT /dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME $AOE_AUTHENTICATED_MAC" >> $VBLADECONF
-			sed -i '/^$/d' $VBLADECONF
-			# start vbladed
-			SCREEN_NAME=`date +%T%x | sed -e "s/://g" | sed -e "s#/##g"`
-			$RUNSCREEN -dmS $SCREEN_NAME vblade -m $AOE_AUTHENTICATED_MAC $AOE_SHELF $AOE_SLOT $AOE_INTERFACE /dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME
-			;;
-		auth)
-			AUTHENTICATED_MAC=$2
-			AOE_VOLUME_GROUP=`echo $LVM_IMAGE_ROOTDEVICE | cut -d':' -f1`
-			AOE_INTERFACE=`grep -v ^# /etc/vblade.conf | grep -w "/dev/mapper/$AOE_VOLUME_GROUP-$LVM_IMAGE_NAME" | awk '{ print $1 }'`
-			AOE_SHELF=`grep -v ^# /etc/vblade.conf | grep -w "/dev/mapper/$AOE_VOLUME_GROUP-$LVM_IMAGE_NAME" | awk '{ print $2 }'`
-			AOE_SLOT=`grep -v ^# /etc/vblade.conf | grep -w "/dev/mapper/$AOE_VOLUME_GROUP-$LVM_IMAGE_NAME" | awk '{ print $3 }'`
-			# stop + remove
-			for VBLADE_PID in `ps ax | grep vblade | grep -w "/dev/mapper/$AOE_VOLUME_GROUP-$LVM_IMAGE_NAME" | awk {' print $1 '}`; do
-				kill $VBLADE_PID
-			done
-			grep -w -v "/dev/mapper/$AOE_VOLUME_GROUP-$LVM_IMAGE_NAME" $VBLADECONF > $VBLADECONF.new
-			mv -f $VBLADECONF.new $VBLADECONF
-			sed -i '/^$/d' $VBLADECONF
-			sync
-			# add with new auth
-			echo "$AOE_INTERFACE $AOE_SHELF $AOE_SLOT /dev/mapper/$AOE_VOLUME_GROUP-$LVM_IMAGE_NAME $AUTHENTICATED_MAC" >> $VBLADECONF
-			# start vbladed
-			SCREEN_NAME=`date +%T%x | sed -e "s/://g" | sed -e "s#/##g"`
-			$RUNSCREEN -dmS $SCREEN_NAME vblade -m $AUTHENTICATED_MAC $AOE_SHELF $AOE_SLOT $AOE_INTERFACE /dev/mapper/$AOE_VOLUME_GROUP-$LVM_IMAGE_NAME
-			;;
-		remove)
-			for VBLADE_PID in `ps ax | grep vblade | grep -w $LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME | awk {' print $1 '}`; do
-				kill $VBLADE_PID
-			done
-			sync
-			grep -w -v "/dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME" $VBLADECONF > $VBLADECONF.new
-			mv -f $VBLADECONF.new $VBLADECONF
-			sed -i '/^$/d' $VBLADECONF
-			;;
-
-		adapt)
-			if ! grep -w "/dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME" $VBLADECONF | grep -v '^#'; then
-				FOUND=0
-				for (( AOE_SHELF=0; $AOE_SHELF<15; AOE_SHELF = $AOE_SHELF + 1)) ; do
-					for (( AOE_SLOT=1; $AOE_SLOT<=15; AOE_SLOT = $AOE_SLOT + 1)) ; do
-						TEST=`cat $VBLADECONF | grep -v '^#' | awk {' print $2" "$3 '} | grep $AOE_SHELF" "$AOE_SLOT`
-						STATUS=$?
-						if [ $STATUS -eq 1 ]; then
-							FOUND=1
-							break;
-						fi
-					done
-					if [ $STATUS -eq 1 ]; then
-						break;
-					fi
-				done
-				echo "$AOE_INTERFACE $AOE_SHELF $AOE_SLOT /dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME $AOE_AUTHENTICATED_MAC" >> $VBLADECONF
-				sed -i '/^$/d' $VBLADECONF
-				# start vbladed
-				SCREEN_NAME=`date +%T%x | sed -e "s/://g" | sed -e "s#/##g"`
-				$RUNSCREEN -dmS $SCREEN_NAME vblade -m $AOE_AUTHENTICATED_MAC $AOE_SHELF $AOE_SLOT $AOE_INTERFACE /dev/mapper/$LVM_STORAGE_SERVER_VOLUME_GROUP-$LVM_IMAGE_NAME
-			fi
-			;;
-
-	esac
-}
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/include/openqrm-plugin-lvm-storage-kernel-hook b/openQRM-5.3.50-CE/src/plugins/lvm-storage/include/openqrm-plugin-lvm-storage-kernel-hook
deleted file mode 100644
index 53c8be2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/include/openqrm-plugin-lvm-storage-kernel-hook
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-# this is a hook function for the kernel-creation phase
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-function lvm_storage_kernel_hook() {
-
-	local KERNEL_NAME=$1
-	local KERNEL_VERSION=$2
-	local KERNEL_LOCATION=$3
-	local KERNEL_TYPE=$4
-
-	echo "lvm-storage-plugin: Running lvm_storage_kernel_hook $KERNEL_NAME $KERNEL_VERSION $KERNEL_LOCATION $KERNEL_TYPE"
-	echo "lvm-storage-plugin: Running lvm_storage_kernel_hook $KERNEL_NAME $KERNEL_VERSION $KERNEL_LOCATION $KERNEL_TYPE" | logger
-
-	# try to find the iscsid + iscsiadm util fitting to the created kernel
-	if [ -x "$KERNEL_LOCATION/sbin/iscsid" ]; then
-		cp -a $KERNEL_LOCATION/sbin/iscsid $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsid.$KERNEL_NAME
-		echo "lvm-storage-plugin: Found iscsid at $KERNEL_LOCATION/sbin/iscsid. Coping to $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsid.$KERNEL_NAME"
-		echo "lvm-storage-plugin: Found iscsid at $KERNEL_LOCATION/sbin/iscsid. Coping to $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsid.$KERNEL_NAME" | logger
-	fi
-	if [ -x "$KERNEL_LOCATION/usr/sbin/iscsid" ]; then
-		cp -a $KERNEL_LOCATION/usr/sbin/iscsid $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsid.$KERNEL_NAME
-		echo "lvm-storage-plugin: Found iscsid at $KERNEL_LOCATION/usr/sbin/iscsid. Coping to $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsid.$KERNEL_NAME"
-		echo "lvm-storage-plugin: Found iscsid at $KERNEL_LOCATION/usr/sbin/iscsid. Coping to $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsid.$KERNEL_NAME" | logger
-	fi
-	if [ -x "$KERNEL_LOCATION/sbin/iscsiadm" ]; then
-		cp -a $KERNEL_LOCATION/sbin/iscsiadm $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsiadm.$KERNEL_NAME
-		echo "lvm-storage-plugin: Found iscsiadm at $KERNEL_LOCATION/sbin/iscsiadm. Coping to $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsiadm.$KERNEL_NAME"
-		echo "lvm-storage-plugin: Found iscsiadm at $KERNEL_LOCATION/sbin/iscsiadm. Coping to $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsiadm.$KERNEL_NAME" | logger
-	fi
-	if [ -x "$KERNEL_LOCATION/usr/bin/iscsiadm" ]; then
-		cp -a $KERNEL_LOCATION/usr/bin/iscsiadm $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsiadm.$KERNEL_NAME
-		echo "lvm-storage-plugin: Found iscsiadm at $KERNEL_LOCATION/usr/bin/iscsiadm. Coping to $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsiadm.$KERNEL_NAME"
-		echo "lvm-storage-plugin: Found iscsiadm at $KERNEL_LOCATION/usr/bin/iscsiadm. Coping to $OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/iscsiadm.$KERNEL_NAME" | logger
-	fi
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage-about.bootservice.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage-about.bootservice.class.php
deleted file mode 100644
index 4633983..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage-about.bootservice.class.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * lvm-storage-about Boot-Service
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lvm_storage_about_bootservice
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lvm_storage_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "lvm_storage_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/lvm-storage-about-bootservice.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['boot_service_title'], 'boot_service_title');
-		$t->add($this->lang['boot_service_content'], 'boot_service_content');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage-about.controller.class.php
deleted file mode 100644
index 9d52de7..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage-about.controller.class.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-/**
- * lvm-about Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class lvm_storage_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lvm_storage_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'lvm_storage_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'lvm_storage_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'lvm_storage_about_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About LVM-Storage',
-		'label' => 'About LVM-Storage',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The "LVM-Storage" plugin integrate standard Linux Systems as LVM Storage server - NFS/iSCSI/AOE.
-					The "LVM-Storage" plugin transforms a standard Linux-box into a rapid-fast-cloning storage-server
-					supporting snap-shotting for NFS-, Aoe-, and Iscsi-filesystem-images.
-					The snapshots (clones from a "golden server image") are immediatly available for deployment and
-					saving space on the storage-subsystem because just the delta of the server image is being stored.
-					   ',
-		'requirements_title' => 'Requirements',
-		'requirements_list' => '<ul><li>A resource for the LVM-Storage Storage (this can be a remote system integrated into openQRM e.g. via the "local-server" plugin or the openQRM server itself)</li>
-					<li>One (or more) lvm volume group(s) with free space dedicated for the LVM-Storage Volumes</li>
-				   <li>The following packages must be installed: nfs-common, nfs-kernel-server, screen, rsync, vblade, aoetools, iscsitarget, open-iscsi</li></ul>',
-
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-
-		'provides_title' => 'Provides',
-		'provides_list' => '<ul><li>Storage type: "Lvm Storage Server (Aoe/Nfs/Iscsi)"</li>
-					<li>Deployment types: "Lvm Aoe/Nfs/Iscsi-root deployment"</li></ul>',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Storage',
-
-		'deployment_title' => 'Deployment Type',
-		'deployment_content' => 'Network-Deployment',
-
-		'documentation_title' => 'Documentation',
-		'use_case_title' => 'Use-Case',
-		'network_deploymet' => 'Network-Deployment',
-		'doc1' => '',
-	),
-	'bootservice' => array (
-		'tab' => 'Boot-Service',
-		'label' => 'LVM-Storage Boot-Service',
-		'boot_service_title' => 'LVM-Storage Host Boot-Service',
-		'boot_service_content' => 'The LVM-Storage Plugin provides an openQRM Boot-Service.
-			This "LVM-Storage Boot-Service" is automatically downloaded and executed by the openQRM-Client on all integrated Systems.
-			The Boot-Service is located at:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/lvm-storage/web/boot-service-lvm-storage.tgz</b></i>
-			<br>
-			<br>
-			The "LVM-Storage Boot-Service contains the Client files of the LVM-Storage Plugin.<br>
-			Also a configuration file for the LVM-Storage server is included in this Boot-Service.<br>
-			<br>
-			The Boot-Service configuration can be viewed and administrated by the "openqrm" utility.<br>
-			To view the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n lvm-storage -a default</b></i>
-			<br>
-			<br>
-			To view a Boot-Service configuration of a specific appliance run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n lvm-storage -a [appliance-name]</b></i>
-			<br>
-			<br>
-			To adapt a parameter in the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n lvm-storage -a default -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			To adapt a paramter in the Boot-Service configuration of a specific appliance run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n lvm-storage -a [appliance-name] -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			In case the openmQRM Server itself is used as the LVM-Storage Storage please edit:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/lvm-storage/etc/openqrm-plugin-lvm-storage.conf</b></i>
-			<br>
-			<br>
-			and set the configuration keys.<br>
-			<br>
-			',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/lvm-storage/lang", 'lvm-storage-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/lvm-storage/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "documentation";
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-			case 'bootservice':
-				$content[] = $this->bootservice(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About LVM-Storage
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lvm-storage/class/lvm-storage-about.documentation.class.php');
-			$controller = new lvm_storage_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Boot-Service
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function bootservice( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lvm-storage/class/lvm-storage-about.bootservice.class.php');
-			$controller = new lvm_storage_about_bootservice($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['bootservice'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['bootservice']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'bootservice' );
-		$content['onclick'] = false;
-		if($this->action === 'bootservice'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage-about.documentation.class.php
deleted file mode 100644
index 2132760..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage-about.documentation.class.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * lvm-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lvm_storage_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lvm_storage_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "lvm_storage_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/lvm-storage-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['deployment_title'], 'deployment_title');
-		$t->add($this->lang['deployment_content'], 'deployment_content');
-		$t->add($this->lang['provides_title'], 'provides_title');
-		$t->add($this->lang['provides_list'], 'provides_list');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.add.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.add.class.php
deleted file mode 100644
index 36a03e1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.add.class.php
+++ /dev/null
@@ -1,356 +0,0 @@
-<?php
-/**
- * LVM-Storage Add new Volume
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lvm_storage_add
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lvm_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "lvm_storage_msg";
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'lvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'lvm_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-		$this->controller = $controller;
-		$this->response   = $response;
-		$this->openqrm    = $openqrm;
-		$this->file       = $this->openqrm->file();
-		$this->user	      = $openqrm->user();
-		$storage_id       = $this->response->html->request()->get('storage_id');
-		$storage          = new storage();
-		$resource         = new resource();
-		$deployment       = new deployment();
-		$this->volgroup   = $this->response->html->request()->get('volgroup');
-		$this->storage    = $storage->get_instance_by_id($storage_id);
-		$this->resource   = $resource->get_instance_by_id($storage->resource_id);
-		$this->deployment = $deployment->get_instance_by_id($storage->type);
-		
-		$this->response->add('storage_id', $storage_id);
-		$this->response->add('volgroup', $this->volgroup);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$this->set_max();
-		$response = $this->add();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 3) {
-				$this->controller->__reload('lv');
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&image_id='.$response->image_id
-				);
-			} else {
-				$this->response->params['reload'] = 'false';
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'volgroup', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/lvm-storage-add.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add(sprintf($this->lang['label'], $this->volgroup), 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function add() {
-
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			if($form->get_request('size') > $this->max) {
-				$form->set_error('size', sprintf($this->lang['error_size_exeeded'], $this->max));
-			}
-			if(!$form->get_errors()) {
-				$name     = $form->get_request('name');
-				$command  = $this->openqrm->get('basedir').'/plugins/lvm-storage/bin/openqrm-lvm-storage add';
-				$command .= ' -n '.$name.' -m '.$form->get_request('size');
-				$command .= ' -t '.$this->deployment->type.' -v '.$this->volgroup;
-				$command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode background';
-				if($this->deployment->type === 'lvm-iscsi-deployment') {
-					$image    = new image();
-					$command .= ' -i '.$image->generatePassword(12);
-				}
-				$statfile = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.'.$this->volgroup.'.lv.stat';
-				if (file_exists($statfile)) {
-					$lines = explode("\n", file_get_contents($statfile));
-					if(count($lines) >= 1) {
-						foreach($lines as $line) {
-							if($line !== '') {
-								$line = explode('@', $line);
-								$check = $line[1];
-								if($name === $check) {
-									$error = sprintf($this->lang['error_exists'], $name);
-								}
-							}
-						}
-					}
-				}
-				if(isset($error)) {
-					$response->error = $error;
-				} else {
-					if(file_exists($statfile)) {
-						unlink($statfile);
-					}
-					$this->resource->send_command($this->resource->ip, $command);
-					while (!file_exists($statfile)) {
-						usleep(10000); // sleep 10ms to unload the CPU
-						clearstatcache();
-					}
-					// add check that volume $name is now in the statfile
-					$created = false;
-					$volume_path = "";
-					$lines = explode("\n", $this->file->get_contents($statfile));
-					if(count($lines) >= 1) {
-						foreach($lines as $line) {
-							if($line !== '') {
-								$line = explode('@', $line);
-								$check = $line[1];
-								if($name === $check) {
-									$created = true;
-									switch($this->deployment->type) {
-										case 'lvm-aoe-deployment':
-											// for lvm-aoe deployment we need to get the shelf + slot from get_root_identifiert
-											$ident_file = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.lv.lvm-aoe-deployment.ident';
-											$get_ident_command  = $this->openqrm->get('basedir').'/plugins/lvm-storage/bin/openqrm-lvm-storage post_identifier';
-											$get_ident_command .= ' -t '.$this->deployment->type.' -v '.$this->volgroup;
-											$get_ident_command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-											$ident_file = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.lv.lvm-aoe-deployment.ident';
-											if(file_exists($ident_file)) {
-												unlink($ident_file);
-											}
-											$this->resource->send_command($this->resource->ip, $get_ident_command);
-											while (!file_exists($ident_file)) {
-												usleep(10000); // sleep 10ms to unload the CPU
-												clearstatcache();
-											}
-											$ident_lines = explode("\n", file_get_contents($ident_file));
-											if(count($ident_lines) >= 1) {
-												foreach($ident_lines as $ident_line) {
-													if($ident_line !== '') {
-														$ident_line = explode(',', $ident_line);
-														$ident_root_path = explode(':', $ident_line[1]);
-														$ident_check = $ident_root_path[1];
-														if($name === $ident_check) {
-															$volume_path = $ident_line[1];
-															$rootfstype = 'ext3';
-															break;
-														}
-													}
-												}
-											}
-											break;
-										case 'lvm-nfs-deployment':
-											$volume_path = '/'.$line[2].'/'.$line[1];
-											$rootfstype = 'nfs';
-											break;
-										case 'lvm-iscsi-deployment':
-											$volume_path = $line[2].':/dev/'.$line[1].'/1';
-											$rootfstype = 'ext3';
-											break;
-									}
-									break;
-								}
-							}
-						}
-					}
-
-					if ($created) {
-						$tables = $this->openqrm->get('table');
-					    $image_fields = array();
-					    $image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					    $image_fields['image_name'] = $name;
-					    $image_fields['image_type'] = $this->deployment->type;
-					    $image_fields['image_size'] = $form->get_request('size');
-					    $image_fields['image_rootfstype'] = $rootfstype;
-					    $image_fields['image_storageid'] = $this->storage->id;
-					    $image_fields['image_comment'] = "Image Object for volume $name";
-						$image_fields['image_rootdevice'] = $volume_path;
-					    $image = new image();
-					    $image->add($image_fields);
-						$response->msg = sprintf($this->lang['msg_added'], $name);
-						// save image id in response for the wizard
-						$response->image_id = $image_fields["image_id"];
-
-					} else {
-					    $response->msg = sprintf($this->lang['msg_add_failed'], $name);
-					}
-				}
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'add');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$d['name']['label']                             = $this->lang['form_name'];
-		$d['name']['required']                          = true;
-		$d['name']['validate']['regex']                 = '/^[a-z0-9._]+$/i';
-		$d['name']['validate']['errormsg']              = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                    = 'htmlobject_input';
-		$d['name']['object']['attrib']['id']            = 'name';
-		$d['name']['object']['attrib']['name']          = 'name';
-		$d['name']['object']['attrib']['type']          = 'text';
-		$d['name']['object']['attrib']['css']           = 'namegen';
-		$d['name']['object']['attrib']['customattribs'] = 'data-prefix="lvm" data-length="6"';
-		$d['name']['object']['attrib']['value']         = '';
-		$d['name']['object']['attrib']['maxlength']     = 50;
-
-		$d['size']['label']                         = sprintf($this->lang['form_size'], number_format($this->max, 0, '', ''));
-		$d['size']['required']                      = true;
-		$d['size']['validate']['regex']             = '/^[0-9]+$/i';
-		$d['size']['validate']['errormsg']          = sprintf($this->lang['error_size'], '0-9');
-		$d['size']['object']['type']                = 'htmlobject_input';
-		$d['size']['object']['attrib']['name']      = 'size';
-		$d['size']['object']['attrib']['type']      = 'text';
-		$d['size']['object']['attrib']['value']     = '';
-		$d['size']['object']['attrib']['maxlength'] = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Set max
-	 *
-	 * @access protected
-	 * @return bool
-	 */
-	//--------------------------------------------
-	function set_max() {
-		$statfile = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.vg.stat';
-		if (file_exists($statfile)) {
-			$lines = explode("\n", file_get_contents($statfile));
-			if(count($lines) >= 1) {
-				foreach($lines as $line) {
-					if($line !== '') {
-						$line = explode('@', $line);
-						if($line[0] === $this->volgroup) {
-							$max = $line[6]; #str_replace('.', '', $line[6]);
-							if(strpos($max, 'g') !== false) {
-								$max = str_replace('g', '', $max);
-								//$max = floor($max * (1073741824 / 1048576));
-								$max = floor(($max * 1000) * 1.0486);
-								$this->max = $max;
-								return true;
-							} else {
-								$max = str_replace('m', '', $max);
-								$max = (int)$max;
-								$this->max = $max;
-								return true;
-							}
-						}
-					}
-				}
-			} else {
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.addvg.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.addvg.class.php
deleted file mode 100644
index 6ab8fbf..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.addvg.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * lvm-Storage Add Volume Group
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-require_once($_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/device-manager/class/device-manager.addvg.class.php');
-class lvm_storage_addvg extends device_manager_addvg { }
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.api.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.api.class.php
deleted file mode 100644
index 5501a98..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.api.class.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * LVM-Storage Api
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lvm_storage_api
-{
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param object $iscsi_storage_controller
-	 */
-	//--------------------------------------------
-	function __construct($controller) {
-		$this->controller = $controller;
-		$this->user       = $this->controller->user;
-		$this->html       = $this->controller->response->html;
-		$this->response   = $this->html->response();
-		$this->file       = $this->controller->file;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function action() {
-		$action = $this->html->request()->get($this->controller->actions_name);
-		switch( $action ) {
-			case 'progress':
-				$this->progress();
-			break;
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get progress
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function progress() {
-		$name = basename($this->response->html->request()->get('name'));
-		$file = $this->controller->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$name;
-		if($this->file->exists($file)) {
-			echo $this->file->get_contents($file);
-		} else {
-			header("HTTP/1.0 404 Not Found");
-		}
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.clone.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.clone.class.php
deleted file mode 100644
index 0e0179f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.clone.class.php
+++ /dev/null
@@ -1,330 +0,0 @@
-<?php
-/**
- * LVM-Storage clone Volume
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lvm_storage_clone
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lvm_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "lvm_storage_msg";
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'lvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'lvm_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-		$this->user = $openqrm->user();
-		$this->volgroup = $this->response->html->request()->get('volgroup');
-		$this->lvol = $this->response->html->request()->get('lvol');
-
-		$storage_id       = $this->response->html->request()->get('storage_id');
-		$storage          = new storage();
-		$resource         = new resource();
-		$deployment       = new deployment();
-		$this->storage    = $storage->get_instance_by_id($storage_id);
-		$this->resource   = $resource->get_instance_by_id($storage->resource_id);
-		$this->deployment = $deployment->get_instance_by_id($storage->type);
-
-		$this->response->add('storage_id', $storage_id);
-		$this->response->add('volgroup', $this->volgroup);
-		$this->response->add('lvol', $this->lvol);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->duplicate();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 3) {
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&image_id='.$response->image_id
-				);
-			} else {
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'volgroup', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/lvm-storage-clone.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add(sprintf($this->lang['label'], $this->lvol), 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * clone
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function duplicate() {
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-
-			$storage_id = $this->response->html->request()->get('storage_id');
-			$storage    = new storage();
-			$resource   = new resource();
-			$deployment = new deployment();
-			$storage->get_instance_by_id($storage_id);
-			$resource->get_instance_by_id($storage->resource_id);
-			$deployment->get_instance_by_id($storage->type);
-
-			$name        = $form->get_request('name');
-			$command     = $this->openqrm->get('basedir').'/plugins/lvm-storage/bin/openqrm-lvm-storage clone';
-			$command    .= ' -t '.$this->deployment->type;
-			$command    .= ' -v '.$this->volgroup;
-			$command    .= ' -n '.$this->lvol;
-			$command    .= ' -m '.$this->set_max();
-			$command    .= ' -s '.$name;
-			$command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-			$command .= ' --openqrm-ui-user '.$this->user->name;
-			$command .= ' --openqrm-cmd-mode background';
-			if($this->deployment->type === 'lvm-iscsi-deployment') {
-				$image    = new image();
-				$command .= ' -i '.$image->generatePassword(12);
-			}
-
-			$statfile = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.'.$this->volgroup.'.lv.stat';
-			if (file_exists($statfile)) {
-				$lines = explode("\n", file_get_contents($statfile));
-				if(count($lines) >= 1) {
-					foreach($lines as $line) {
-						if($line !== '') {
-							$line = explode('@', $line);
-							$check = $line[1];
-							if($name === $check) {
-								$error = sprintf($this->lang['error_exists'], $name);
-							}
-						}
-					}
-				}
-			}
-			if(isset($error)) {
-				$response->error = $error;
-			} else {
-				$file = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$resource->id.'.lvm.'.$name.'.sync_progress';
-				if(file_exists($file)) {
-					unlink($file);
-				}
-				$this->resource->send_command($this->resource->ip, $command);
-				while (!file_exists($file)) {
-		  			usleep(10000); // sleep 10ms to unload the CPU
-		  			clearstatcache();
-				}
-
-
-				switch($this->deployment->type) {
-					case 'lvm-aoe-deployment':
-						// for lvm-aoe deployment we need to get the shelf + slot from get_root_identifiert
-						$ident_file = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.lv.lvm-aoe-deployment.ident';
-						$get_ident_command  = $this->openqrm->get('basedir').'/plugins/lvm-storage/bin/openqrm-lvm-storage post_identifier';
-						$get_ident_command .= ' -t '.$this->deployment->type.' -v '.$this->volgroup;
-						$get_ident_command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-						$ident_file = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.lv.lvm-aoe-deployment.ident';
-						if(file_exists($ident_file)) {
-							unlink($ident_file);
-						}
-						$this->resource->send_command($this->resource->ip, $get_ident_command);
-						while (!file_exists($ident_file)) {
-							usleep(10000); // sleep 10ms to unload the CPU
-							clearstatcache();
-						}
-						$ident_lines = explode("\n", file_get_contents($ident_file));
-						if(count($ident_lines) >= 1) {
-							foreach($ident_lines as $ident_line) {
-								if($ident_line !== '') {
-									$ident_line = explode(',', $ident_line);
-									$ident_root_path = explode(':', $ident_line[1]);
-									$ident_check = $ident_root_path[1];
-									if($name === $ident_check) {
-										$volume_path = $ident_line[1];
-										$rootfstype = 'ext3';
-										break;
-									}
-								}
-							}
-						}
-						break;
-					case 'lvm-nfs-deployment':
-						$volume_path = '/'.$this->volgroup.'/'.$name;
-						$rootfstype = 'nfs';
-						break;
-					case 'lvm-iscsi-deployment':
-						$volume_path = $this->volgroup.':/dev/'.$name.'/1';
-						$rootfstype = 'ext3';
-						break;
-				}
-
-				// get origin image object
-				$origin_image = new image();
-				$origin_image->get_instance_by_name($this->lvol);
-						
-				$tables = $this->openqrm->get('table');
-				$image_fields = array();
-				$image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$image_fields['image_name'] = $name;
-				$image_fields['image_type'] = $deployment->type;
-				$image_fields['image_version'] = $origin_image->version;
-				$image_fields['image_size'] = $origin_image->size;
-				$image_fields['image_rootfstype'] = $rootfstype;
-				$image_fields['image_storageid'] = $storage->id;
-				$image_fields['image_comment'] = "Image Object for volume $name";
-				$image_fields['image_rootdevice'] = $volume_path;
-				$image = new image();
-				$image->add($image_fields);
-
-				$response->msg = sprintf($this->lang['msg_cloned'], $this->lvol, $name);
-				// save image id in response for the wizard
-				$response->image_id = $image_fields["image_id"];
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'clone');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$d['name']['label']                             = $this->lang['form_name'];
-		$d['name']['required']                          = true;
-		$d['name']['validate']['regex']                 = '/^[a-z0-9._]+$/i';
-		$d['name']['validate']['errormsg']              = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                    = 'htmlobject_input';
-		$d['name']['object']['attrib']['name']          = 'name';
-		$d['name']['object']['attrib']['id']            = 'name';
-		$d['name']['object']['attrib']['type']          = 'text';
-		$d['name']['object']['attrib']['css']           = 'namegen';
-		$d['name']['object']['attrib']['customattribs'] = 'data-prefix="lvm" data-length="6"';
-		$d['name']['object']['attrib']['value']         = $this->lvol.'c';
-		$d['name']['object']['attrib']['maxlength']     = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Set max
-	 *
-	 * @access protected
-	 * @return bool
-	 */
-	//--------------------------------------------
-	function set_max() {
-		$vgmax = '';
-		$lvmax = '';
-		$statfile = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.'.$this->volgroup.'.lv.stat';
-		if (file_exists($statfile)) {
-			$lines = explode("\n", file_get_contents($statfile));
-			if(count($lines) >= 1) {
-				foreach($lines as $line) {
-					if($line !== '') {
-						$line = explode('@', $line);
-						if($line[1] === $this->lvol) {
-							$lvmax = str_replace('.', '', $line[4]);
-							$lvmax = str_replace('m', '', $lvmax);
-							$lvmax = (int)$lvmax / 100;
-						}
-					}
-				}
-			}
-		}
-		return $lvmax;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.controller.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.controller.class.php
deleted file mode 100644
index 205e9f9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.controller.class.php
+++ /dev/null
@@ -1,958 +0,0 @@
-<?php
-/**
- * LVM-Storage Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lvm_storage_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lvm_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "lvm_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'lvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'lvm_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array (
-		'tab' => 'Select lvm-storage',
-		'label' => 'Select lvm-storage',
-		'action_edit' => 'edit',
-		'table_name' => 'Name',
-		'table_id' => 'Id',
-		'table_recource' => 'Resource',
-		'table_type' => 'Type',
-		'table_deployment' => 'Deployment',
-		'error_no_storage' => '<b>No storage configured yet!</b><br><br>Please create a lvm Storage first!',
-		'new_storage' => 'New Storage',
-		'please_wait' => 'Loading Volume groups. Please wait ..',
-	), 
-	'edit' => array (
-		'tab' => 'Select LVM Volume group',
-		'label' => 'Select LVM Volume group on storage %s',
-		'lang_id' => 'ID',
-		'lang_name' => 'Name',
-		'lang_resource' => 'Resource',
-		'lang_state' => 'State',
-		'lang_deployment' => 'Deployment',
-		'action_edit' => 'select',
-		'action_add' => 'Add new Volume Group',
-		'action_remove' => 'remove',
-		'table_name' => 'Name',
-		'table_pv' => 'PV',
-		'table_lv' => 'LV',
-		'table_sn' => 'SN',
-		'table_attr' => 'Attr',
-		'table_vsize' => 'Vsize',
-		'table_vfree' => 'VFree',
-		'error_no_lvm' => 'Storage %s is not of type lvm-storage',
-		'please_wait' => 'Loading Volume group. Please wait ..',
-	),
-	'addvg' => array(
-		'tab' => 'Add Volume Group',
-		'label' => 'Add Volume Group to storage %s',
-		'partition' => 'Partition',
-		'name' => 'Name',
-		'extend' => 'extend partition',
-		'confirm_text' => 'All Data on %s will be erased.<br>Are you sure to continue?',
-		'msg_added' => 'Successfully added Volume Group %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..'
-	),
-	'removevg' => array(
-		'tab' => 'Remove Volume Group',
-		'label' => 'Remove Volume Group on storage %s',
-		'confirm_text' => 'Do you realy want to remove Volume Group %s?',
-		'msg_removed' => 'Successfully removed Volume Group %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..'
-	),
-	'volgroup' => array (
-		'tab' => 'Edit LVM Volume group',
-		'label' => 'Edit LVM Volume group %s on storage %s',
-		'lang_id' => 'ID',
-		'lang_name' => 'Name',
-		'lang_deployment' => 'Deployment',
-		'lang_resource' => 'Resource',
-		'lang_state' => 'State',
-		'lang_attr' => 'Attr',
-		'lang_pv' => 'PV / LV / SN',
-		'lang_size' => 'Vsize / Vfree',
-		'action_add' => 'Add new logical volume',
-		'action_remove' => 'remove',
-		'action_resize' => 'resize',
-		'action_snap' => 'snap',
-		'action_clone' => 'clone',
-		'action_add_image' => 'Add Image',
-		'action_remove_image' => 'Remove Image',
-		'action_sync_in_progress' => 'Source of synchronisation - Please wait', 
-		'action_clone_in_progress' => 'Synchronisation in progress - Please wait',
-		'action_clone_finished' => 'Syncronisation finished!',
-		'table_name' => 'Lvol',
-		'table_deployment' => 'Deployment',
-		'table_attr' => 'Attr',
-		'table_size' => 'Size',
-		'table_source' => 'Source',
-		'error_no_lvm' => 'Storage %s is not of type lvm-deployment',
-		'please_wait' => 'Loading Volume group. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'add' => array (
-		'tab' => 'Add Logical Volume',
-		'label' => 'Add Logical Volume to LVM Volume group %s',
-		'form_name' => 'Name',
-		'form_size' => 'Size (max: %s MB)',
-		'msg_added' => 'Added Logical Volume %s',
-		'msg_add_failed' => 'Failed to add Volume %s',
-		'error_exists' => 'Logical Volume %s allready exists',
-		'error_name' => 'Name must be %s',
-		'error_size' => 'Size must be %s',
-		'error_size_exeeded' => 'Size exeeds %s MB',
-		'please_wait' => 'Adding Logical Volume. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'image' => array (
-		'label' => 'Add/Remove Image for Logical Volume %s',
-		'tab' => 'Add/Remove Image',
-		'error_exists' => 'Image %s allready exists',
-		'error_image_still_in_use' => 'Image id %s is still in use by Server(s) %s',
-		'msg_added_image' => 'Added Image %s',
-		'msg_removed_image' => 'Removed Image id %s',
-		'msg_add_failed' => 'Failed to add Image id %s',
-		'please_wait' => 'Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'snap' => array (
-		'label' => 'Snap Logical Volume %s',
-		'tab' => 'Snap Logical Volume',
-		'msg_snaped' => 'Snaped %s to %s',
-		'msg_snap_failed' => 'Failed to clone Volume %s',
-		'form_name' => 'Name',
-		'form_size' => 'Size (max: %s MB)',
-		'error_exists' => 'Volume %s allready exists',
-		'error_name' => 'Name must be %s',
-		'error_size' => 'Size must be %s',
-		'error_size_exeeded' => 'Size exeeds %s MB',
-		'please_wait' => 'Snaping Logical Volume. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'clone' => array (
-		'label' => 'Clone Logical Volume %s',
-		'tab' => 'Clone Logical Volume',
-		'msg_cloned' => 'Cloned %s as %s',
-		'msg_clone_failed' => 'Failed to clone Volume %s',
-		'form_name' => 'Name',
-		'error_exists' => 'Volume %s allready exists',
-		'error_name' => 'Name must be %s',
-		'please_wait' => 'Cloning Logical Volume. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'remove' => array (
-		'label' => 'Remove Logical Volume(s)',
-		'msg_removed' => 'Removed Logical Volume %s',
-		'msg_image_still_in_use' => 'Volume %s of Image id %s is still in use by appliance(s) %s',
-		'please_wait' => 'Removing Logical Volume(s). Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'resize' => array (
-		'label' => 'Resize Logical Volume %s',
-		'tab' => 'Resize Logical Volume',
-		'size' => 'min. %s MB, max. %s MB',
-		'error_size' => 'Size must be %s',
-		'error_size_exeeded' => 'Size exeeds %s MB',
-		'error_size_undercut' => 'Size undercuts %s MB',
-		'msg_resized' => 'Resized Logical Volume %s',
-		'please_wait' => 'Resizing Logical Volume. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'custom' => array (
-		'tab' => 'Custom Volumes',
-		'label' => 'Custom Volumes',
-		'lang_id' => 'ID',
-		'lang_name' => 'Name',
-		'lang_deployment' => 'Deployment',
-		'lang_resource' => 'Resource',
-		'lang_state' => 'State',
-		'action_add' => 'Add new Custom Volume',
-		'action_remove' => 'remove',
-		'table_name' => 'Custom Images',
-		'table_initiator' => 'Initiator Name',
-		'table_target' => 'Target',
-		'table_lun' => 'Lun',
-		'table_username' => 'Username',
-		'table_export' => 'NFS Export',
-		'table_deployment' => 'Deployment',
-		'table_source' => 'Source',
-		'error_no_lvm' => 'Storage %s is not of type lvm-deployment',
-		'please_wait' => 'Loading Custom Images. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'customadd' => array (
-		'tab' => 'Add Custom Volume',
-		'label' => 'Add Custom Volume',
-		'form_name' => 'Name',
-		'form_target' => 'Target Name',
-		'form_lun' => 'Lun Number',
-		'form_initiator' => 'Initiator Name',
-		'form_username' => 'Username',
-		'form_password' => 'Password',
-		'form_export' => 'NFS Export',
-		'msg_added' => 'Added Custom Volume %s',
-		'msg_add_failed' => 'Failed to add Volume %s',
-		'error_exists' => 'Custom Volume %s allready exists',
-		'error_name' => 'Name must be %s',
-		'error_target' => 'Target Name must be %s',
-		'error_lun' => 'Lun must be %s',
-		'error_initiator' => 'Initiator Name must be %s',
-		'error_username' => 'Username must be %s',
-		'error_password' => 'Password must be %s',
-		'error_export' => 'Export must be %s',
-		'please_wait' => 'Adding Custom Volume. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'customremove' => array (
-		'label' => 'Remove Custom Volume(s)',
-		'msg_removed' => 'Removed Custom Volume %s',
-		'msg_image_still_in_use' => 'Volume %s of Image id %s is still in use by appliance(s) %s',
-		'please_wait' => 'Removing Logical Volume(s). Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/lvm-storage/lang", 'lvm-storage.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/lvm-storage/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			if($this->action === 'addvg' || $this->action === 'removevg') {
-				$this->action = 'edit';
-			} else {
-				$this->action = 'volgroup';
-			}
-		}
-		if($this->action === '') {
-			$this->action = 'select';
-		}
-		// Set response and reload statfile
-		if($this->action !== 'select') {
-			$this->response->params['storage_id'] = $this->response->html->request()->get('storage_id');
-			if($this->action !== 'remove' && $this->action !== 'addvg' && $this->action !== 'removevg' && $this->action !== 'custom' && $this->action !== 'customremove' && $this->action !== 'customadd') {
-				$this->__reload('vg');
-			}
-			if($this->action !== 'edit') {
-				$this->response->params['volgroup'] = $this->response->html->request()->get('volgroup');
-			}
-		}
-		
-		// handle custom storage
-		if($this->action === 'edit') {
-			$storage = new storage();
-			$storage->get_instance_by_id($this->response->html->request()->get('storage_id'));
-			$deployment = new deployment();
-			$deployment->get_instance_by_id($storage->type);
-			if ($deployment->name == 'custom-iscsi-deployment') {
-				$this->action = 'custom';
-			}
-			if ($deployment->name == 'custom-nfs-deployment') {
-				$this->action = 'custom';
-			}
-		}
-		
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'edit':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-			break;
-			case 'addvg':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->addvg(true);
-			break;
-			case 'removevg':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->removevg(true);
-			break;
-			case 'volgroup':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->volgroup(true);
-			break;
-			case 'add':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->volgroup(false);
-				$content[] = $this->add(true);
-			break;
-			case 'image':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->volgroup(false);
-				$content[] = $this->image(true);
-			break;
-			case 'resize':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->volgroup(false);
-				$content[] = $this->resize(true);
-			break;
-			case 'snap':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->volgroup(false);
-				$content[] = $this->snap(true);
-			break;
-			case 'clone':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->volgroup(false);
-				$content[] = $this->duplicate(true);
-			break;
-			case 'remove':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->volgroup(false);
-				$content[] = $this->remove(true);
-			break;
-			case 'custom':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->custom(true);
-			break;
-			case 'customremove':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->customremove(true);
-			break;
-			case 'customadd':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->customadd(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->rootdir.'/plugins/lvm-storage/class/lvm-storage.api.class.php');
-		$controller = new lvm_storage_api($this);
-		$controller->action();
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Select Storages of type lvm
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lvm-storage/class/lvm-storage.select.class.php');
-			$controller = new lvm_storage_select($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['select'];
-
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Edit lvm-storage
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function edit( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lvm-storage/class/lvm-storage.edit.class.php');
-			$controller                  = new lvm_storage_edit($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$controller->lang            = $this->lang['edit'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['edit']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'edit' );
-		$content['onclick'] = false;
-		if($this->action === 'edit'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add lvm volume group
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function addvg( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lvm-storage/class/lvm-storage.addvg.class.php');
-			$controller                  = new lvm_storage_addvg($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->rootdir.'/plugins/device-manager/tpl/';
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$controller->lang            = $this->lang['addvg'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['addvg']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'addvg' );
-		$content['onclick'] = false;
-		if($this->action === 'addvg'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove lvm volume group
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function removevg( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lvm-storage/class/lvm-storage.removevg.class.php');
-			$controller                  = new lvm_storage_removevg($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->rootdir.'/plugins/device-manager/tpl/';
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$controller->lang            = $this->lang['removevg'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['removevg']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'removevg' );
-		$content['onclick'] = false;
-		if($this->action === 'removevg'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit lvm volgroup
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function volgroup( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			if($this->response->html->request()->get('reload') !== 'false') {
-				$this->__reload('lv');
-			}
-			require_once($this->rootdir.'/plugins/lvm-storage/class/lvm-storage.volgroup.class.php');
-			$controller                  = new lvm_storage_volgroup($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$controller->lang            = $this->lang['volgroup'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['volgroup']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'volgroup' );
-		$content['onclick'] = false;
-		if($this->action === 'volgroup'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Add new Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function add( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lvm-storage/class/lvm-storage.add.class.php');
-			$controller                = new lvm_storage_add($this->openqrm, $this->response, $this);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['add'];
-			$controller->rootdir       = $this->rootdir;
-			$controller->prefix_tab    = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['add']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'add' );
-		$content['onclick'] = false;
-		if($this->action === 'add'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add/Remvoe Image object
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function image( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lvm-storage/class/lvm-storage.image.class.php');
-			$controller                  = new lvm_storage_image($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['image'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['image']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'image' );
-		$content['onclick'] = false;
-		if($this->action === 'image'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Remove Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function remove( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lvm-storage/class/lvm-storage.remove.class.php');
-			$controller                  = new lvm_storage_remove($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['remove'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Remove';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'remove' );
-		$content['onclick'] = false;
-		if($this->action === 'remove' || $this->action === $this->lang['volgroup']['action_remove']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Snapshot Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function snap( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lvm-storage/class/lvm-storage.snap.class.php');
-			$controller                  = new lvm_storage_snap($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['snap'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['snap']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'snap' );
-		$content['onclick'] = false;
-		if($this->action === 'snap' || $this->action === $this->lang['edit']['action_snap']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Clone Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function duplicate( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lvm-storage/class/lvm-storage.clone.class.php');
-			$controller                  = new lvm_storage_clone($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['clone'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['clone']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'clone' );
-		$content['onclick'] = false;
-		if($this->action === 'clone' || $this->action === $this->lang['edit']['action_clone']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Resize Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function resize( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lvm-storage/class/lvm-storage.resize.class.php');
-			$controller                  = new lvm_storage_resize($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['resize'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['resize']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'resize' );
-		$content['onclick'] = false;
-		if($this->action === 'resize'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Cusdtom lvm-storage
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function custom( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lvm-storage/class/lvm-storage.custom.class.php');
-			$controller                  = new lvm_storage_custom($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$controller->lang            = $this->lang['custom'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['custom']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'custom' );
-		$content['onclick'] = false;
-		if($this->action === 'custom'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-
-	
-	//--------------------------------------------
-	/**
-	 * Custom Add
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function customadd( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lvm-storage/class/lvm-storage.customadd.class.php');
-			$controller                = new lvm_storage_customadd($this->openqrm, $this->response, $this);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['customadd'];
-			$controller->rootdir       = $this->rootdir;
-			$controller->prefix_tab    = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['customadd']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'customadd' );
-		$content['onclick'] = false;
-		if($this->action === 'customadd'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Custom Remove
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function customremove( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/lvm-storage/class/lvm-storage.customremove.class.php');
-			$controller                  = new lvm_storage_customremove($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['customremove'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'customremove';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'customremove' );
-		$content['onclick'] = false;
-		if($this->action === 'customremove' || $this->action === $this->lang['volgroup']['action_remove']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Reload Exports
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function __reload($mode) {
-		$OPENQRM_SERVER_BASE_DIR = $this->openqrm->get('basedir');
-		$storage_id = $this->response->html->request()->get('storage_id');
-		$volgroup   = $this->response->html->request()->get('volgroup');
-		$storage = new storage();
-		$resource = new resource();
-		$deployment = new deployment();
-		$storage->get_instance_by_id($storage_id);
-		$resource->get_instance_by_id($storage->resource_id);
-		$deployment->get_instance_by_id($storage->type);
-
-		$command = '';
-		$file = '';
-		// reload volume group
-		if($mode === 'vg') {
-			$file = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$resource->id.'.vg.stat';
-			$command .= $OPENQRM_SERVER_BASE_DIR.'/plugins/lvm-storage/bin/openqrm-lvm-storage post_vg';
-		}
-		// reload logical volumes
-		if($mode === 'lv') {
-			$file = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$resource->id.'.'.$volgroup.'.lv.stat';
-			$command .= $OPENQRM_SERVER_BASE_DIR.'/plugins/lvm-storage/bin/openqrm-lvm-storage post_lv';
- 			$command .=  ' -v '.$volgroup.' -t '.$deployment->type;
-		}
-		$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-		$command .= ' --openqrm-ui-user '.$this->user->name;
-		$command .= ' --openqrm-cmd-mode background';
-		if(file_exists($file)) {
-			unlink($file);
-		}
-		$resource->send_command($resource->ip, $command);
-		while (!file_exists($file)) // check if the data file has been modified
-		{
-		  usleep(10000); // sleep 10ms to unload the CPU
-		  clearstatcache();
-		}
-		return true;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.custom.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.custom.class.php
deleted file mode 100644
index 565f75f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.custom.class.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/**
- * lvm-Storage Custom Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lvm_storage_custom
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lvm_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "lvm_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'lvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'lvm_identifier';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Init
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function init() {
-		$storage_id = $this->response->html->request()->get('storage_id');
-		if($storage_id === '') {
-			return false;
-		}
-		// set ENV
-		$deployment = new deployment();
-		$storage    = new storage();
-		$resource   = new resource();
-
-		$storage->get_instance_by_id($storage_id);
-		$resource->get_instance_by_id($storage->resource_id);
-		$deployment->get_instance_by_id($storage->type);
-
-		$this->resource   = $resource;
-		$this->storage    = $storage;
-		$this->deployment = $deployment;
-
-		$this->statfile = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$resource->id.'.vg.stat';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$this->init();
-		$data = $this->custom();
-		if($data !== false) {
-			$t = $this->response->html->template($this->tpldir.'/lvm-storage-custom.tpl.php');
-			$t->add($this->response->html->thisfile, "thisfile");
-			$t->add($data);
-			$t->add($this->lang['lang_id'], 'lang_id');
-			$t->add($this->lang['lang_name'], 'lang_name');
-			$t->add($this->lang['lang_resource'], 'lang_resource');
-			$t->add($this->lang['lang_deployment'], 'lang_deployment');
-			$t->add($this->lang['lang_state'], 'lang_state');
-			$t->add($this->lang['label'], 'label');
-			$t->add($this->openqrm->get('baseurl'), 'baseurl');
-			return $t;
-		} else {
-			$msg = sprintf($this->lang['error_no_lvm'], $this->response->html->request()->get('storage_id'));
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $msg)
-			);
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * custom
-	 *
-	 * @access public
-	 * @return array|false
-	 */
-	//--------------------------------------------
-	function custom() {
-		if(strpos($this->deployment->type, 'custom-') !== false) {
-			// check device-manager
-			$devicemgm = false;
-			if($this->file->exists($this->openqrm->get('webdir').'/plugins/device-manager/class/device-manager.addvg.class.php')) {
-				$devicemgm = true;
-			}
-			$resource_icon_default="/img/resource.png";
-			$storage_icon="/plugins/lvm-storage/img/plugin.png";
-			$state_icon = '<span class="pill">'.$this->resource->state.'</span>';
-			if ($this->file->exists($this->openqrm->get('webdir').$storage_icon)) {
-				$resource_icon_default=$storage_icon;
-			}
-			$resource_icon_default = $this->openqrm->get('baseurl').$resource_icon_default;
-
-			$d['state'] = $state_icon;
-		//	$d['icon'] = '<img width="24" height="24" src="'.$resource_icon_default.'">';
-			$d['resource'] = $this->resource->id.' / '.$this->resource->ip;
-			$d['deployment'] = $this->deployment->type;
-			$d['name'] = $this->storage->name;
-			$d['id'] = $this->storage->id;
-
-			$i = 0;
-			$body = array();
-			$image = new image();
-			$images = $image->display_overview(0, $image->get_count(), 'image_id', 'ASC');
-			if(count($images) >= 1) {
-				foreach($images as $k => $v) {
-					$image->get_instance_by_id($v["image_id"]);
-					if ($image->storageid == $this->storage->id) {
-						$name = $image->name;
-						$initiator = $image->get_deployment_parameter('INITIATOR');
-						$username = $image->get_deployment_parameter('USER');
-						if ($this->deployment->name == 'custom-iscsi-deployment') {
-							$root_device_arr = explode("/", $image->rootdevice);
-							$target = $root_device_arr[2];
-							$lun = $root_device_arr[3];
-						}
-						if ($this->deployment->name == 'custom-nfs-deployment') {
-							$target = $image->rootdevice;
-							$lun = 'nfs';
-						}
-
-						$body[$i] = array(
-						//	'icon' => $d['icon'],
-							'name'   => $name,
-							'target'   => $target,
-							'lun'   => $lun,
-							'initiator' => $initiator,
-							'username' => $username,
-						);
-						$i++;
-					}
-				}
-			}
-
-			$h['name']['title'] = $this->lang['table_name'];
-			$h['target']['title'] = $this->lang['table_target']." / ".$this->lang['table_export'];
-			$h['target']['sortable'] = true;
-			$h['lun']['title'] = $this->lang['table_lun'];
-			$h['lun']['sortable'] = true;
-			$h['initiator']['title'] = $this->lang['table_initiator'];
-			$h['initiator']['sortable'] = true;
-			$h['username']['title'] = $this->lang['table_username'];
-			$h['username']['sortable'] = true;
-
-			$table = $this->response->html->tablebuilder('lvm_custom', $this->response->get_array($this->actions_name, 'custom'));
-			$table->sort            = 'name';
-			$table->limit           = 10;
-			$table->offset          = 0;
-			$table->order           = 'ASC';
-			$table->max             = count($body);
-			$table->autosort        = true;
-			$table->sort_link       = false;
-			$table->id              = 'Tabelle';
-			$table->css             = 'htmlobject_table';
-			$table->border          = 1;
-			$table->cellspacing     = 0;
-			$table->cellpadding     = 3;
-			$table->form_action     = $this->response->html->thisfile;
-			$table->head            = $h;
-			$table->body            = $body;
-
-			$table->identifier          = 'name';
-			$table->identifier_name     = $this->identifier_name;
-			$table->actions_name        = $this->actions_name;
-			$table->actions             = array(array('customremove' => $this->lang['action_remove']));
-			
-			
-			$a = $this->response->html->a();
-			$a->title   = $this->lang['action_add'];
-			$a->label   = $this->lang['action_add'];
-			$a->handler = 'onclick="wait();"';
-			$a->css     = 'add';
-			$a->href    = $this->response->get_url($this->actions_name, "customadd");
-			$d['add'] = $a->get_string();
-
-			$d['table'] = $table->get_string();
-			return $d;
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.customadd.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.customadd.class.php
deleted file mode 100644
index fbd0163..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.customadd.class.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-/**
- * LVM-Storage Custom Add new Volume
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lvm_storage_customadd
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lvm_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "lvm_storage_msg";
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'lvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'lvm_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-		$this->controller = $controller;
-		$this->response   = $response;
-		$this->openqrm    = $openqrm;
-		$this->file       = $this->openqrm->file();
-		$this->user	      = $openqrm->user();
-		$storage_id       = $this->response->html->request()->get('storage_id');
-		$storage          = new storage();
-		$resource         = new resource();
-		$deployment       = new deployment();
-		$this->storage    = $storage->get_instance_by_id($storage_id);
-		$this->resource   = $resource->get_instance_by_id($storage->resource_id);
-		$this->deployment = $deployment->get_instance_by_id($storage->type);
-		$this->response->add('storage_id', $storage_id);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->customadd();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 3) {
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&image_id='.$response->image_id
-				);
-			} else {
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'custom', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/lvm-storage-customadd.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function customadd() {
-
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			
-			$name     = $form->get_request('name');
-			if ($this->deployment->name == 'custom-iscsi-deployment') {
-				$target     = $form->get_request('target');
-				$lun     = $form->get_request('lun');
-				$initiator     = $form->get_request('initiator');
-				$username     = $form->get_request('username');
-				$password     = $form->get_request('password');
-				$rootfstype = 'ext3';
-				$volume_path = '/dev/'.$target.'/'.$lun;
-			}
-			if ($this->deployment->name == 'custom-nfs-deployment') {
-				$volume_path = $form->get_request('export');
-				$rootfstype = 'nfs';
-			}			
-			// $error = sprintf($this->lang['error_exists'], $name);
-			
-			if(isset($error)) {
-				$response->error = $error;
-			} else {
-				$tables = $this->openqrm->get('table');
-				$image_fields = array();
-				$new_image_id  = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$image_fields["image_id"] = $new_image_id;
-				$image_fields['image_name'] = $name;
-				$image_fields['image_type'] = $this->deployment->type;
-				$image_fields['image_rootfstype'] = $rootfstype;
-				$image_fields['image_storageid'] = $this->storage->id;
-				$image_fields['image_comment'] = "Image Object for volume $name";
-				$image_fields['image_rootdevice'] = $volume_path;
-				$image = new image();
-				$image->add($image_fields);
-				$image->get_instance_by_id($new_image_id);
-				
-				if ($this->deployment->name == 'custom-iscsi-deployment') {
-					$image->set_deployment_parameters('INITIATOR', $initiator);
-					if (strlen($username)) {
-						$image->set_deployment_parameters('USER', $username);
-					}
-					if (strlen($password)) {
-						$image->set_deployment_parameters('PASSWORD', $password);
-					}
-				}
-				$response->msg = sprintf($this->lang['msg_added'], $name);
-				// save image id in response for the wizard
-				$response->image_id = $image_fields["image_id"];
-
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'customadd');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$d['name']['label']                             = $this->lang['form_name'];
-		$d['name']['required']                          = true;
-		$d['name']['validate']['regex']                 = '/^[a-z0-9._]+$/i';
-		$d['name']['validate']['errormsg']              = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                    = 'htmlobject_input';
-		$d['name']['object']['attrib']['id']            = 'name';
-		$d['name']['object']['attrib']['name']          = 'name';
-		$d['name']['object']['attrib']['type']          = 'text';
-		$d['name']['object']['attrib']['css']           = 'namegen';
-		$d['name']['object']['attrib']['customattribs'] = 'data-prefix="custom" data-length="6"';
-		$d['name']['object']['attrib']['value']         = '';
-		$d['name']['object']['attrib']['maxlength']     = 50;
-
-		if ($this->deployment->name == 'custom-iscsi-deployment') {
-			$d['target']['label']                             = $this->lang['form_target'];
-			$d['target']['required']                          = true;
-			$d['target']['validate']['regex']                 = '';
-			$d['target']['validate']['errormsg']              = sprintf($this->lang['error_target'], 'a-z0-9._');
-			$d['target']['object']['type']                    = 'htmlobject_input';
-			$d['target']['object']['attrib']['id']            = 'target';
-			$d['target']['object']['attrib']['name']          = 'target';
-			$d['target']['object']['attrib']['type']          = 'text';
-			$d['target']['object']['attrib']['value']         = '';
-			$d['target']['object']['attrib']['maxlength']     = 50;
-
-			$d['lun']['label']                             = $this->lang['form_lun'];
-			$d['lun']['required']                          = true;
-			$d['lun']['validate']['regex']                 = '';
-			$d['lun']['validate']['errormsg']              = sprintf($this->lang['error_lun'], 'a-z0-9._');
-			$d['lun']['object']['type']                    = 'htmlobject_input';
-			$d['lun']['object']['attrib']['id']            = 'lun';
-			$d['lun']['object']['attrib']['name']          = 'lun';
-			$d['lun']['object']['attrib']['type']          = 'text';
-			$d['lun']['object']['attrib']['value']         = '';
-			$d['lun']['object']['attrib']['maxlength']     = 5;
-
-			$d['initiator']['label']                             = $this->lang['form_initiator'];
-			$d['initiator']['required']                          = true;
-			$d['initiator']['validate']['regex']                 = '';
-			$d['initiator']['validate']['errormsg']              = sprintf($this->lang['error_initiator'], 'a-z0-9._');
-			$d['initiator']['object']['type']                    = 'htmlobject_input';
-			$d['initiator']['object']['attrib']['id']            = 'initiator';
-			$d['initiator']['object']['attrib']['name']          = 'initiator';
-			$d['initiator']['object']['attrib']['type']          = 'text';
-			$d['initiator']['object']['attrib']['value']         = '';
-			$d['initiator']['object']['attrib']['maxlength']     = 200;
-
-			$d['username']['label']                             = $this->lang['form_username'];
-			$d['username']['required']                          = false;
-			$d['username']['validate']['regex']                 = '';
-			$d['username']['validate']['errormsg']              = sprintf($this->lang['error_username'], 'a-z0-9._');
-			$d['username']['object']['type']                    = 'htmlobject_input';
-			$d['username']['object']['attrib']['id']            = 'username';
-			$d['username']['object']['attrib']['name']          = 'username';
-			$d['username']['object']['attrib']['type']          = 'text';
-			$d['username']['object']['attrib']['value']         = '';
-			$d['username']['object']['attrib']['maxlength']     = 50;
-
-			$d['password']['label']                             = $this->lang['form_password'];
-			$d['password']['required']                          = false;
-			$d['password']['validate']['regex']                 = '';
-			$d['password']['validate']['errormsg']              = sprintf($this->lang['error_password'], 'a-z0-9._');
-			$d['password']['object']['type']                    = 'htmlobject_input';
-			$d['password']['object']['attrib']['id']            = 'password';
-			$d['password']['object']['attrib']['name']          = 'password';
-			$d['password']['object']['attrib']['type']          = 'password';
-			$d['password']['object']['attrib']['value']         = '';
-			$d['password']['object']['attrib']['maxlength']     = 50;
-			
-			$d['export'] = '';
-			
-		}
-
-		if ($this->deployment->name == 'custom-nfs-deployment') {
-			$d['export']['label']                             = $this->lang['form_export'];
-			$d['export']['required']                          = true;
-			$d['export']['validate']['regex']                 = '';
-			$d['export']['validate']['errormsg']              = sprintf($this->lang['error_export'], 'a-z0-9._');
-			$d['export']['object']['type']                    = 'htmlobject_input';
-			$d['export']['object']['attrib']['id']            = 'export';
-			$d['export']['object']['attrib']['name']          = 'export';
-			$d['export']['object']['attrib']['type']          = 'text';
-			$d['export']['object']['attrib']['value']         = '';
-			$d['export']['object']['attrib']['maxlength']     = 250;
-
-			$d['target'] = '';
-			$d['lun'] = '';
-			$d['initiator'] = '';
-			$d['username'] = '';
-			$d['password'] = '';
-		}		
-		
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.customremove.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.customremove.class.php
deleted file mode 100644
index a965567..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.customremove.class.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/**
- * lvm-Storage Remove Volume(s)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lvm_storage_customremove
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lvm_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "lvm_storage_msg";
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'lvm_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'lvm_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->user = $openqrm->user();
-		$this->file = $this->openqrm->file();
-
-		$this->response->add('storage_id', $this->response->html->request()->get('storage_id'));
-		$this->response->add($this->identifier_name.'[]', '');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->customremove();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'custom', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/lvm-storage-customremove.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function customremove() {
-		$response = $this->get_response();
-		$lvols  = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		if( $lvols !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($lvols as $ex) {
-				$d['param_f'.$i]['label']                       = $ex;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $ex;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;		
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$storage    = new storage();
-				$resource   = new resource();
-				$deployment = new deployment();
-
-				$storage->get_instance_by_id($this->response->html->request()->get('storage_id'));
-				$resource->get_instance_by_id($storage->resource_id);
-				$deployment->get_instance_by_id($storage->type);
-
-				$errors     = array();
-				$message    = array();
-				foreach($lvols as $key => $lvol) {
-
-					// check if an appliance is still using the volume as an image
-					$image = new image();
-					$image->get_instance_by_name($lvol);
-
-					// check if it is still in use
-					$appliance = new appliance();
-					$appliances_using_resource = $appliance->get_ids_per_image($image->id);
-					if (count($appliances_using_resource) > 0) {
-						$appliances_using_resource_str = implode(",", $appliances_using_resource[0]);
-						$errors[] = sprintf($this->lang['msg_image_still_in_use'], $lvol, $image->id, $appliances_using_resource_str);
-					} else {
-
-						$form->remove($this->identifier_name.'['.$key.']');
-						$message[] = sprintf($this->lang['msg_removed'], $lvol);
-						$image->remove_by_name($lvol);
-					}
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'customremove');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.edit.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.edit.class.php
deleted file mode 100644
index 5a575b3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.edit.class.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-/**
- * lvm-Storage Edit Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lvm_storage_edit
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lvm_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "lvm_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'lvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'lvm_identifier';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Init
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function init() {
-		$storage_id = $this->response->html->request()->get('storage_id');
-		if($storage_id === '') {
-			return false;
-		}
-		// set ENV
-		$deployment = new deployment();
-		$storage    = new storage();
-		$resource   = new resource();
-
-		$storage->get_instance_by_id($storage_id);
-		$resource->get_instance_by_id($storage->resource_id);
-		$deployment->get_instance_by_id($storage->type);
-
-		$this->resource   = $resource;
-		$this->storage    = $storage;
-		$this->deployment = $deployment;
-
-		$this->statfile = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$resource->id.'.vg.stat';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$this->init();
-		$data = $this->edit();
-		if($data !== false) {
-			$t = $this->response->html->template($this->tpldir.'/lvm-storage-edit.tpl.php');
-			$t->add($this->response->html->thisfile, "thisfile");
-			$t->add($data);
-			$t->add($this->lang['lang_id'], 'lang_id');
-			$t->add($this->lang['lang_name'], 'lang_name');
-			$t->add($this->lang['lang_resource'], 'lang_resource');
-			$t->add($this->lang['lang_deployment'], 'lang_deployment');
-			$t->add($this->lang['lang_state'], 'lang_state');
-			$t->add(sprintf($this->lang['label'], $data['name']), 'label');
-			$t->add($this->openqrm->get('baseurl'), 'baseurl');
-			return $t;
-		} else {
-			$msg = sprintf($this->lang['error_no_lvm'], $this->response->html->request()->get('storage_id'));
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $msg)
-			);
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return array|false
-	 */
-	//--------------------------------------------
-	function edit() {
-		if(strpos($this->deployment->type, 'lvm') !== false) {
-			// check device-manager
-			$devicemgm = false;
-			if($this->file->exists($this->openqrm->get('webdir').'/plugins/device-manager/class/device-manager.addvg.class.php')) {
-				$devicemgm = true;
-			}
-			$resource_icon_default="/img/resource.png";
-			$storage_icon="/plugins/lvm-storage/img/plugin.png";
-			$state_icon = '<span class="pill">'.$this->resource->state.'</span>';
-			if ($this->file->exists($this->openqrm->get('webdir').$storage_icon)) {
-				$resource_icon_default=$storage_icon;
-			}
-			$resource_icon_default = $this->openqrm->get('baseurl').$resource_icon_default;
-
-			$d['state'] = $state_icon;
-		//	$d['icon'] = '<img width="24" height="24" src="'.$resource_icon_default.'">';
-			$d['resource'] = $this->resource->id.' / '.$this->resource->ip;
-			$d['deployment'] = $this->deployment->type;
-			$d['name'] = $this->storage->name;
-			$d['id'] = $this->storage->id;
-
-			$body = array();
-			$file = $this->statfile;
-			if(file_exists($file)) {
-				$lines = explode("\n", file_get_contents($file));
-				if(count($lines) >= 1) {
-					$i = 0;
-					foreach($lines as $line) {
-						if($line !== '') {
-							$line  = explode('@', $line);
-							$name  = substr($line[0], strripos($line[0], '/'));
-							$vsize = number_format(substr($line[5], 0, strpos($line[5], '.')), 0, '', '').' MB';
-							$vfree = str_replace('m', '', $line[6]);
-							if($vfree !== '0') {
-								$vfree = number_format(substr($line[6], 0, strpos($line[6], '.')), 0, '', '');
-							}
-							$a = $this->response->html->a();
-							$a->title   = $this->lang['action_edit'];
-							$a->label   = $this->lang['action_edit'];
-							$a->handler = 'onclick="wait();"';
-							$a->css     = 'edit';
-							$a->href    = $this->response->get_url($this->actions_name, "volgroup").'&volgroup='.$name;
-							$body[$i] = array(
-							//	'icon' => $d['icon'],
-								'name'   => $name,
-								'pv' => $line[1],
-								'lv' => $line[2],
-								'sn' => $line[3],
-								'attr' => $line[4],
-								'vsize' => $vsize,
-								'vfree' => $vfree.' MB',
-								'edit' => $a->get_string(),
-							);
-							if($devicemgm === true) {
-								if($line[2] === '0' && $line[3] === '0') {
-									$a = $this->response->html->a();
-									$a->title   = $this->lang['action_remove'];
-									$a->label   = $this->lang['action_remove'];
-									$a->handler = 'onclick="wait();"';
-									$a->css     = 'remove';
-									$a->href    = $this->response->get_url($this->actions_name, "removevg").'&volgroup='.$name;
-									$body[$i]['remove'] = $a->get_string();
-								} else {
-									$body[$i]['remove'] = '&#160;';
-								}
-							}
-							$i++;
-						}
-					}
-				}
-			}
-
-/*
-			$h['icon']['title'] = '&#160;';
-			$h['icon']['sortable'] = false;
-*/
-			$h['name']['title'] = $this->lang['table_name'];
-			$h['pv']['title'] = $this->lang['table_pv'];
-			$h['lv']['title'] = $this->lang['table_lv'];
-			$h['sn']['title'] = $this->lang['table_sn'];
-			$h['attr']['title'] = $this->lang['table_attr'];
-			$h['vsize']['title'] = $this->lang['table_vsize'];
-			$h['vfree']['title'] = $this->lang['table_vfree'];
-			$h['edit']['title'] = '&#160;';
-			$h['edit']['sortable'] = false;
-
-			if($devicemgm === true) {
-				$h['remove']['title'] = '&#160;';
-				$h['remove']['sortable'] = false;
-			}
-
-			$table = $this->response->html->tablebuilder('lvm_edit', $this->response->get_array($this->actions_name, 'edit'));
-			$table->sort            = 'name';
-			$table->limit           = 10;
-			$table->offset          = 0;
-			$table->order           = 'ASC';
-			$table->max             = count($body);
-			$table->autosort        = true;
-			$table->sort_link       = false;
-			$table->id              = 'Tabelle';
-			$table->css             = 'htmlobject_table';
-			$table->border          = 1;
-			$table->cellspacing     = 0;
-			$table->cellpadding     = 3;
-			$table->form_action     = $this->response->html->thisfile;
-			$table->head            = $h;
-			$table->body            = $body;
-
-			$d['add'] = '';
-			if($devicemgm === true) {
-				$a = $this->response->html->a();
-				$a->title   = $this->lang['action_add'];
-				$a->label   = $this->lang['action_add'];
-				$a->handler = 'onclick="wait();"';
-				$a->css     = 'add';
-				$a->href    = $this->response->get_url($this->actions_name, "addvg");
-				$d['add'] = $a->get_string();
-			}
-
-			$d['table'] = $table->get_string();
-			return $d;
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.image.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.image.class.php
deleted file mode 100644
index 813495f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.image.class.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/**
- * LVM-Storage add/remove Images
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lvm_storage_image
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lvm_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "lvm_storage_msg";
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'lvm_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'lvm_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-		$this->openqrm    = $openqrm;
-		$this->user       = $openqrm->user();
-		$storage_id       = $this->response->html->request()->get('storage_id');
-		$storage          = new storage();
-		$resource         = new resource();
-		$deployment       = new deployment();
-		$this->storage    = $storage->get_instance_by_id($storage_id);
-		$this->resource   = $resource->get_instance_by_id($storage->resource_id);
-		$this->deployment = $deployment->get_instance_by_id($storage->type);
-		$this->response->add('storage_id', $storage_id);
-		$this->volgroup   = $this->response->html->request()->get('volgroup');
-		$this->response->add('volgroup', $this->volgroup);
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->image();
-		$this->response->redirect(
-			$this->response->get_url($this->actions_name, 'volgroup', $this->message_param, $response)
-		);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add/Remove image object
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function image() {
-		$response = '';
-		$errors       = array();
-		$message      = array();
-		$image_command = $this->response->html->request()->get('image_command');
-
-		if( $image_command !== '' ) {
-			switch ($image_command) {
-				case 'add':
-					$root_device = $this->response->html->request()->get('root_device');
-					$image_name = $this->response->html->request()->get('image_name');
-
-					// check if image name is not in use yet
-					$image = new image();
-					$image->get_instance_by_name($image_name);
-					if (strlen($image->id)) {
-						$errors[] = sprintf($this->lang['error_exists'], $image_name);
-					} else {
-
-						$image_rootfstype = '';
-						// for lvm-aoe deployment we need to get the shelf + slot from get_root_identifiert
-						$ident_file = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.lvm.'.$image_name.'.adapt';
-						$get_ident_command  = $this->openqrm->get('basedir').'/plugins/lvm-storage/bin/openqrm-lvm-storage adapt';
-						$get_ident_command .= ' -n '.$image_name;
-						$get_ident_command .= ' -t '.$this->deployment->type.' -v '.$this->volgroup;
-						$get_ident_command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-						$get_ident_command .= ' --openqrm-ui-user '.$this->user->name;
-						$get_ident_command .= ' --openqrm-cmd-mode background';
-						if(file_exists($ident_file)) {
-							unlink($ident_file);
-						}
-						$this->resource->send_command($this->resource->ip, $get_ident_command);
-						while (!file_exists($ident_file)) {
-							usleep(10000); // sleep 10ms to unload the CPU
-							clearstatcache();
-						}
-						$found = false;
-						if ($this->deployment->type == 'lvm-aoe-deployment') {
-							$name = $root_device;
-							$root_device = '';
-							$ident_lines = explode("\n", file_get_contents($ident_file));
-							if(count($ident_lines) >= 1) {
-								foreach($ident_lines as $ident_line) {
-									if($ident_line !== '') {
-										$ident_line = explode(',', $ident_line);
-										$ident_root_path = explode(':', $ident_line[1]);
-										$ident_check = $ident_root_path[1];
-										if($name === $ident_check) {
-											$root_device = $ident_line[1];
-											$image_rootfstype = 'ext3';
-											$found = true;
-											break;
-										}
-									}
-								}
-							}
-						} else if ($this->deployment->type == 'lvm-iscsi-deployment') {
-							$image_rootfstype = 'ext3';
-							$found = true;
-						} else if ($this->deployment->type == 'lvm-nfs-deployment') {
-							$image_rootfstype = 'nfs';
-							$found = true;
-						}
-						if ($found) {
-							$tables = $this->openqrm->get('table');
-							$image_fields = array();
-							$image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-							$image_fields['image_name'] = $image_name;
-							$image_fields['image_type'] = $this->deployment->type;
-							$image_fields['image_rootfstype'] = $image_rootfstype;
-							$image_fields['image_storageid'] = $this->storage->id;
-							$image_fields['image_comment'] = "Image Object for volume $image_name";
-							$image_fields['image_rootdevice'] = $root_device;
-							$image = new image();
-							$image->add($image_fields);
-							$message[] = sprintf($this->lang['msg_added_image'], $image_name);
-						} else {
-							$message[] = sprintf($this->lang['msg_add_failed'], $image_name);
-						}
-					}
-					break;
-
-				case 'remove':
-					$image_id = $this->response->html->request()->get('image_id');
-					// check if image is not in use any more before removing
-					$remove_error = 0;
-					$appliance = new appliance();
-					$appliance_id_list = $appliance->get_all_ids();
-					foreach($appliance_id_list as $appliance_list) {
-						$appliance_id = $appliance_list['appliance_id'];
-						$app_image_remove_check = new appliance();
-						$app_image_remove_check->get_instance_by_id($appliance_id);
-						if ($app_image_remove_check->imageid == $image_id) {
-							$image_is_used_by_appliance .= $appliance_id." ";
-							$remove_error = 1;
-						}
-					}
-					if ($remove_error == 1) {
-						$errors[] = sprintf($this->lang['error_image_still_in_use'], $image_id, $image_is_used_by_appliance);
-					} else {
-						$image_remove = new image();
-						$image_remove->remove($image_id);
-						$message[] = sprintf($this->lang['msg_removed_image'], $image_id);
-					}
-					break;
-			}
-			if(count($errors) === 0) {
-				$response = join('<br>', $message);
-			} else {
-				$msg = array_merge($errors, $message);
-				$response = join('<br>', $msg);
-			}
-		} else {
-			$response = '';
-		}
-		return $response;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.remove.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.remove.class.php
deleted file mode 100644
index 4f09b9f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.remove.class.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-/**
- * lvm-Storage Remove Volume(s)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lvm_storage_remove
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lvm_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "lvm_storage_msg";
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'lvm_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'lvm_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->user = $openqrm->user();
-		$this->file = $this->openqrm->file();
-		$this->volgroup = $this->response->html->request()->get('volgroup');
-
-		$this->response->add('storage_id', $this->response->html->request()->get('storage_id'));
-		$this->response->add('volgroup', $this->volgroup);
-		$this->response->add($this->identifier_name.'[]', '');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->remove();
-		if(isset($response->msg)) {
-			$this->response->params['reload'] = 'false';
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'volgroup', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/lvm-storage-remove.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function remove() {
-		$response = $this->get_response();
-		$lvols  = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		if( $lvols !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($lvols as $ex) {
-				$d['param_f'.$i]['label']                       = $ex;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $ex;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;		
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$name       = $this->openqrm->admin()->name;
-				$pass       = $this->openqrm->admin()->password;
-				$storage    = new storage();
-				$resource   = new resource();
-				$deployment = new deployment();
-
-				$storage->get_instance_by_id($this->response->html->request()->get('storage_id'));
-				$resource->get_instance_by_id($storage->resource_id);
-				$deployment->get_instance_by_id($storage->type);
-
-				$errors     = array();
-				$message    = array();
-				foreach($lvols as $key => $lvol) {
-
-					// check if an appliance is still using the volume as an image
-					$image = new image();
-					$image->get_instance_by_name($lvol);
-
-					// check if it is still in use
-					$appliance = new appliance();
-					$appliances_using_resource = $appliance->get_ids_per_image($image->id);
-					if (count($appliances_using_resource) > 0) {
-						$appliances_using_resource_str = implode(",", $appliances_using_resource[0]);
-						$errors[] = sprintf($this->lang['msg_image_still_in_use'], $lvol, $image->id, $appliances_using_resource_str);
-					} else {
-
-						$command  = $this->openqrm->get('basedir').'/plugins/lvm-storage/bin/openqrm-lvm-storage remove';
-						$command .= ' -n '.$lvol;
-						$command .= ' -v '.$this->volgroup;
-						$command .= ' -t '.$deployment->type;
-						$command .= ' -u '.$name.' -p '.$pass;
-						$command .= ' --openqrm-ui-user '.$this->user->name;
-						$command .= ' --openqrm-cmd-mode background';
-
-						$file = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$resource->id.'.'.$this->volgroup.'.lv.stat';
-						if(file_exists($file)) {
-							unlink($file);
-						}
-						$resource->send_command($resource->ip, $command);
-						while (!file_exists($file)) {
-							usleep(10000); // sleep 10ms to unload the CPU
-							clearstatcache();
-						}
-
-						#$error = $resource->send_command($resource->ip, $command);
-						#if($error !== '' ) {
-						#	$errors[] = $error;
-						#} else {
-						$form->remove($this->identifier_name.'['.$key.']');
-						$message[] = sprintf($this->lang['msg_removed'], $lvol);
-						#}
-						// remove the image of the volume
-						$image->remove_by_name($lvol);
-					}
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'remove');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.removevg.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.removevg.class.php
deleted file mode 100644
index cf2f05b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.removevg.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * lvm-Storage Remove Volume Group
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-require_once($_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/device-manager/class/device-manager.removevg.class.php');
-class lvm_storage_removevg extends device_manager_removevg { }
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.resize.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.resize.class.php
deleted file mode 100644
index 8a3b158..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.resize.class.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-/**
- * lvm-Storage resize Volume
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lvm_storage_resize
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lvm_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "lvm_storage_msg";
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'lvm_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'lvm_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->user = $openqrm->user();
-		$this->file = $this->openqrm->file();
-		$this->volgroup = $this->response->html->request()->get('volgroup');
-		$this->lvol = $this->response->html->request()->get('lvol');
-
-		$storage_id       = $this->response->html->request()->get('storage_id');
-		$storage          = new storage();
-		$resource         = new resource();
-		$deployment       = new deployment();
-		$this->storage    = $storage->get_instance_by_id($storage_id);
-		$this->resource   = $resource->get_instance_by_id($storage->resource_id);
-		$this->deployment = $deployment->get_instance_by_id($storage->type);
-
-		$this->response->add('storage_id', $storage_id);
-		$this->response->add('volgroup', $this->volgroup);
-		$this->response->add('lvol', $this->lvol);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->resize();
-		if(isset($response->msg)) {
-			$this->response->params['reload'] = 'false';
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'volgroup', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/lvm-storage-resize.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add(sprintf($this->lang['label'], $this->lvol), 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * resize
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function resize() {
-		$this->set_max();
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			if($form->get_request('size') > $this->max) {
-				$form->set_error('size', sprintf($this->lang['error_size_exeeded'], number_format($this->max, 0, '', '')));
-			}
-			if($form->get_request('size') < $this->min) {
-				$form->set_error('size', sprintf($this->lang['error_size_undercut'], number_format($this->min, 0, '', '')));
-			}
-			if(!$form->get_errors()) {
-				$name        = $form->get_request('name');
-				$command     = $this->openqrm->get('basedir').'/plugins/lvm-storage/bin/openqrm-lvm-storage resize';
-				$command    .= ' -t '.$this->deployment->type;
-				$command    .= ' -v '.$this->volgroup;
-				$command    .= ' -n '.$this->lvol;
-				$command    .= ' -m '.($form->get_request('size') - $this->min);
-				$command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode background';
-				if($this->deployment->type === 'lvm-iscsi-deployment') {
-					$image    = new image();
-					$command .= ' -i '.$image->generatePassword(12);
-				}
-				$statfile = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.'.$this->volgroup.'.lv.stat';
-				if(file_exists($statfile)) {
-					unlink($statfile);
-				}
-				$this->resource->send_command($this->resource->ip, $command);
-				while (!file_exists($statfile)) {
-					usleep(10000); // sleep 10ms to unload the CPU
-					clearstatcache();
-				}
-				
-				// get origin image object
-				$origin_image = new image();
-				$origin_image->get_instance_by_name($this->lvol);
-				// set image size
-				$image_fields = array();
-				$image_fields['image_size'] = $form->get_request('size');
-				$origin_image->update($origin_image->id, $image_fields);
-				$response->msg = sprintf($this->lang['msg_resized'], $this->lvol);
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'resize');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$d['size']['label']                         = sprintf($this->lang['size'],number_format($this->min, 0, '', ''), number_format($this->max, 0, '', ''));
-		$d['size']['required']                      = true;
-		$d['size']['validate']['regex']             = '/^[0-9]+$/i';
-		$d['size']['validate']['errormsg']          = sprintf($this->lang['error_size'], '0-9');
-		$d['size']['object']['type']                = 'htmlobject_input';
-		$d['size']['object']['attrib']['name']      = 'size';
-		$d['size']['object']['attrib']['type']      = 'text';
-		$d['size']['object']['attrib']['value']     = '';
-		$d['size']['object']['attrib']['maxlength'] = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Set min and max
-	 *
-	 * @access protected
-	 */
-	//--------------------------------------------
-	function set_max() {
-		$vgmax = '';
-		$lvmax = '';
-		$statfile = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.'.$this->volgroup.'.lv.stat';
-		if (file_exists($statfile)) {
-			$lines = explode("\n", file_get_contents($statfile));
-			if(count($lines) >= 1) {
-				foreach($lines as $line) {
-					if($line !== '') {
-						$line = explode('@', $line);
-						if($line[1] === $this->lvol) {
-							$lvmax = str_replace('.', '', $line[4]);
-							$lvmax = str_replace('m', '', $lvmax);
-							$lvmax = (int)$lvmax / 100;
-							$this->min = $lvmax;
-						}
-					}
-				}
-			}
-		}
-		$statfile = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.vg.stat';
-		if (file_exists($statfile)) {
-			$lines = explode("\n", file_get_contents($statfile));
-			if(count($lines) >= 1) {
-				foreach($lines as $line) {
-					if($line !== '') {
-						$line = explode('@', $line);
-						if($line[0] === $this->volgroup) {
-							$vgmax = str_replace('.', '', $line[6]);
-							$vgmax = str_replace('m', '', $vgmax);
-							$vgmax = (int)$vgmax / 100;
-							$this->max = $vgmax + $lvmax;
-						}
-					}
-				}
-			}
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.select.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.select.class.php
deleted file mode 100644
index 8c34c05..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.select.class.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/**
- * lvm-Storage Select Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lvm_storage_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lvm_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "lvm_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'lvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'lvm_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$table = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/lvm-storage-select.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($table, 'table');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return htmlobject_tablebulider | htmlobject_div
-	 */
-	//--------------------------------------------
-	function select() {
-		// set ENV
-		$deployment = new deployment();
-		$storage    = new storage();
-		$resource   = new resource();
-
-		$type = $this->response->html->request()->get('storage_type');
-		if($type === '') {
-			$type = 'lvm-lvm-deployment';
-		}
-		$deployment->get_instance_by_type($type);
-		$storages = $storage->display_overview(0, $storage->get_count(), 'storage_id', 'ASC');
-		if(count($storages) >= 1) {
-			foreach($storages as $k => $v) {
-				$storage->get_instance_by_id($v["storage_id"]);
-				$resource->get_instance_by_id($storage->resource_id);
-				$deployment->get_instance_by_id($storage->type);
-				if($deployment->storagetype === 'lvm-storage') {
-					$resource_icon_default="/img/resource.png";
-					$storage_icon="/plugins/lvm-storage/img/plugin.png";
-					$state_icon = '<span class="pill">'.$resource->state.'</span>';
-					if ($this->file->exists($this->openqrm->get('webdir').$storage_icon)) {
-						$resource_icon_default=$storage_icon;
-					}
-					$resource_icon_default = $this->openqrm->get('baseurl').$resource_icon_default;
-					$a = $this->response->html->a();
-					$a->title   = $this->lang['action_edit'];
-					$a->label   = $this->lang['action_edit'];
-					$a->handler = 'onclick="wait();"';
-					$a->css     = 'edit';
-					if(($deployment->name === 'custom-iscsi-deployment') || ($deployment->name === 'custom-nfs-deployment')) {
-						$a->href    = $this->response->get_url($this->actions_name, "custom").'&storage_id='.$storage->id;
-					} else {
-						$a->href    = $this->response->get_url($this->actions_name, "edit").'&storage_id='.$storage->id;
-					}
-
-					$data  = '<strong>'.$this->lang['table_recource'].':</strong> '.$resource->id.' / '.$resource->ip.'<br>';
-					$data .= '<strong>'.$this->lang['table_type'].':</strong> <span class="pill">'.$deployment->storagetype.'</span><br>';
-					$data .= '<strong>'.$this->lang['table_deployment'].':</strong> '.$deployment->storagedescription.'<br>';
-
-					$b[] = array(
-						'state' => $state_icon,
-					//	'icon' => '<img width="24" height="24" src="'.$resource_icon_default.'" alt="Icon">',
-						'storage_id' => $storage->id,
-						'name' => $storage->name,
-						'storage_resource_id' => $storage->resource_id,
-						'deployment' => $deployment->storagedescription,
-						'storage_data' => $data,
-						'storage_comment' => '',
-						'edit' => $a->get_string(),
-					);
-				}
-			}
-
-			if(isset($b) && is_array($b) && count($b) >= 1) {
-				$h = array();
-				$h['state'] = array();
-				$h['state']['title'] ='&#160;';
-				$h['state']['sortable'] = false;
-/*
-				$h['icon'] = array();
-				$h['icon']['title'] ='&#160;';
-				$h['icon']['sortable'] = false;
-*/
-				$h['storage_id'] = array();
-				$h['storage_id']['title'] = $this->lang['table_id'];
-				$h['name'] = array();
-				$h['name']['title'] = $this->lang['table_name'];
-				$h['storage_resource_id'] = array();
-				$h['storage_resource_id']['title'] = $this->lang['table_recource'];
-				$h['storage_resource_id']['hidden'] = true;
-				$h['storage_data'] = array();
-				$h['storage_data']['title'] = '&#160;';
-				$h['storage_data']['sortable'] = false;
-				$h['deployment'] = array();
-				$h['deployment']['title'] = $this->lang['table_deployment'];
-				$h['deployment']['hidden'] = true;
-				$h['storage_comment'] = array();
-				$h['storage_comment']['title'] ='&#160;';
-				$h['storage_comment']['sortable'] = false;
-				$h['edit'] = array();
-				$h['edit']['title'] = '&#160;';
-				$h['edit']['sortable'] = false;
-
-				$table = $this->response->html->tablebuilder('lvm', $this->response->get_array($this->actions_name, 'select'));
-				$table->sort      = 'storage_id';
-				$table->limit     = 10;
-				$table->order     = 'ASC';
-				$table->max       = count($b);
-				$table->autosort  = false;
-				$table->sort_link = false;
-				$table->autosort  = true;
-				$table->id = 'Tabelle';
-				$table->css = 'htmlobject_table';
-				$table->border = 1;
-				$table->cellspacing = 0;
-				$table->cellpadding = 3;
-				$table->form_action = $this->response->html->thisfile;
-				$table->head = $h;
-				$table->body = $b;
-				return $table->get_string();
-			} else {
-				$a = $this->response->html->a();
-				$a->title   = $this->lang['new_storage'];
-				$a->label   = $this->lang['new_storage'];
-				$a->handler = 'onclick="wait();"';
-				$a->css     = 'add';
-				$a->href    = $this->response->html->thisfile.'?base=storage&storage_action=add';
-
-				$box = $this->response->html->div();
-				$box->id = 'Tabelle';
-				$box->css = 'htmlobject_box';
-				$content  = $this->lang['error_no_storage'].'<br><br>';
-				$content .= $a->get_string();
-				$box->add($content);
-				return $box->get_string();
-			}
-		} else {
-			$a = $this->response->html->a();
-			$a->title   = $this->lang['new_storage'];
-			$a->label   = $this->lang['new_storage'];
-			$a->handler = 'onclick="wait();"';
-			$a->css     = 'add';
-			$a->href    = $this->response->html->thisfile.'?base=storage&storage_action=add';
-
-			$box = $this->response->html->div();
-			$box->id = 'Tabelle';
-			$box->css = 'htmlobject_box';
-			$content  = $this->lang['error_no_storage'].'<br><br>';
-			$content .= $a->get_string();
-			$box->add($content);
-			return $box->get_string();
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.snap.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.snap.class.php
deleted file mode 100644
index 8f6c9b9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.snap.class.php
+++ /dev/null
@@ -1,367 +0,0 @@
-<?php
-/**
- * lvm-Storage snap Volume
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lvm_storage_snap
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lvm_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "lvm_storage_msg";
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'lvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'lvm_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-		$this->user = $openqrm->user();
-		$this->lvol = $this->response->html->request()->get('lvol');
-		$this->volgroup = $this->response->html->request()->get('volgroup');
-
-		$storage_id       = $this->response->html->request()->get('storage_id');
-		$storage          = new storage();
-		$resource         = new resource();
-		$deployment       = new deployment();
-		$this->storage    = $storage->get_instance_by_id($storage_id);
-		$this->resource   = $resource->get_instance_by_id($storage->resource_id);
-		$this->deployment = $deployment->get_instance_by_id($storage->type);
-
-		$this->response->add('storage_id', $storage_id);
-		$this->response->add('volgroup', $this->volgroup);
-		$this->response->add('lvol', $this->lvol);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$this->set_max();
-		$response = $this->snap();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 3) {
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&image_id='.$response->image_id
-				);
-			} else {
-				$this->response->params['reload'] = 'false';
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'volgroup', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/lvm-storage-snap.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add(sprintf($this->lang['label'], $this->lvol), 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * snap
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function snap() {
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			if($form->get_request('size') > $this->max) {
-				$form->set_error('size', sprintf($this->lang['error_size_exeeded'], number_format($this->max, 0, '', '')));
-			}
-			if(!$form->get_errors()) {
-				$storage_id = $this->response->html->request()->get('storage_id');
-				$storage    = new storage();
-				$resource   = new resource();
-				$deployment = new deployment();
-				$storage->get_instance_by_id($storage_id);
-				$resource->get_instance_by_id($storage->resource_id);
-				$deployment->get_instance_by_id($storage->type);
-
-				$name        = $form->get_request('name');
-				$command     = $this->openqrm->get('basedir').'/plugins/lvm-storage/bin/openqrm-lvm-storage snap';
-				$command    .= ' -t '.$this->deployment->type;
-				$command    .= ' -v '.$this->volgroup;
-				$command    .= ' -n '.$this->lvol;
-				$command    .= ' -m '.$form->get_request('size');
-				$command    .= ' -s '.$name;
-				$command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode background';
-				if($this->deployment->type === 'lvm-iscsi-deployment') {
-					$image    = new image();
-					$command .= ' -i '.$image->generatePassword(12);
-				}
-
-				$statfile = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.'.$this->volgroup.'.lv.stat';
-				if (file_exists($statfile)) {
-					$lines = explode("\n", file_get_contents($statfile));
-					if(count($lines) >= 1) {
-						foreach($lines as $line) {
-							if($line !== '') {
-								$line = explode('@', $line);
-								$check = $line[1];
-								if($name === $check) {
-									$error = sprintf($this->lang['error_exists'], $name);
-								}
-							}
-						}
-					}
-				}
-				if(isset($error)) {
-					$response->error = $error;
-				} else {
-					if(file_exists($statfile)) {
-						unlink($statfile);
-					}
-					$this->resource->send_command($this->resource->ip, $command);
-					while (!file_exists($statfile)) {
-						usleep(10000); // sleep 10ms to unload the CPU
-						clearstatcache();
-					}
-
-
-					switch($this->deployment->type) {
-						case 'lvm-aoe-deployment':
-							// for lvm-aoe deployment we need to get the shelf + slot from get_root_identifiert
-							$ident_file = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.lv.lvm-aoe-deployment.ident';
-							$get_ident_command  = $this->openqrm->get('basedir').'/plugins/lvm-storage/bin/openqrm-lvm-storage post_identifier';
-							$get_ident_command .= ' -t '.$this->deployment->type.' -v '.$this->volgroup;
-							$get_ident_command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-							$ident_file = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.lv.lvm-aoe-deployment.ident';
-							if(file_exists($ident_file)) {
-								unlink($ident_file);
-							}
-							$this->resource->send_command($this->resource->ip, $get_ident_command);
-							while (!file_exists($ident_file)) {
-								usleep(10000); // sleep 10ms to unload the CPU
-								clearstatcache();
-							}
-							$ident_lines = explode("\n", file_get_contents($ident_file));
-							if(count($ident_lines) >= 1) {
-								foreach($ident_lines as $ident_line) {
-									if($ident_line !== '') {
-										$ident_line = explode(',', $ident_line);
-										$ident_root_path = explode(':', $ident_line[1]);
-										$ident_check = $ident_root_path[1];
-										if($name === $ident_check) {
-											$volume_path = $ident_line[1];
-											$rootfstype = 'ext3';
-											break;
-										}
-									}
-								}
-							}
-							break;
-						case 'lvm-nfs-deployment':
-							$volume_path = '/'.$this->volgroup.'/'.$name;
-							$rootfstype = 'nfs';
-							break;
-						case 'lvm-iscsi-deployment':
-							$volume_path = $this->volgroup.':/dev/'.$name.'/1';
-							$rootfstype = 'ext3';
-							break;
-					}
-
-					// get origin image object
-					$origin_image = new image();
-					$origin_image->get_instance_by_name($this->lvol);
-					
-					$tables = $this->openqrm->get('table');
-					$image_fields = array();
-					$image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$image_fields['image_name'] = $name;
-					$image_fields['image_type'] = $deployment->type;
-					$image_fields['image_version'] = $origin_image->version;
-					$image_fields['image_size'] = $form->get_request('size');
-					$image_fields['image_rootfstype'] = $rootfstype;
-					$image_fields['image_storageid'] = $storage->id;
-					$image_fields['image_comment'] = "Image Object for volume $name";
-					$image_fields['image_rootdevice'] = $volume_path;
-					$image = new image();
-					$image->add($image_fields);
-
-					$response->msg = sprintf($this->lang['msg_snaped'], $this->lvol, $name);
-					// save image id in response for the wizard
-					$response->image_id = $image_fields["image_id"];
-				}
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'snap');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$d['name']['label']                             = $this->lang['form_name'];
-		$d['name']['required']                          = true;
-		$d['name']['validate']['regex']                 = '/^[a-z0-9._]+$/i';
-		$d['name']['validate']['errormsg']              = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                    = 'htmlobject_input';
-		$d['name']['object']['attrib']['name']          = 'name';
-		$d['name']['object']['attrib']['id']            = 'name';
-		$d['name']['object']['attrib']['type']          = 'text';
-		$d['name']['object']['attrib']['css']           = 'namegen';
-		$d['name']['object']['attrib']['customattribs'] = 'data-prefix="lvm" data-length="6"';
-		$d['name']['object']['attrib']['value']         = $this->lvol.'s';
-		$d['name']['object']['attrib']['maxlength']     = 50;
-
-		$d['size']['label']                         = sprintf($this->lang['form_size'], number_format($this->max, 0, '', ''));
-		$d['size']['required']                      = true;
-		$d['size']['validate']['regex']             = '/^[0-9]+$/i';
-		$d['size']['validate']['errormsg']          = sprintf($this->lang['error_size'], '0-9');
-		$d['size']['object']['type']                = 'htmlobject_input';
-		$d['size']['object']['attrib']['name']      = 'size';
-		$d['size']['object']['attrib']['type']      = 'text';
-		$d['size']['object']['attrib']['value']     = '';
-		$d['size']['object']['attrib']['maxlength'] = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Set max
-	 *
-	 * @access protected
-	 * @return bool
-	 */
-	//--------------------------------------------
-	function set_max() {
-		$vgmax = '';
-		$lvmax = '';
-		$statfile = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.'.$this->volgroup.'.lv.stat';
-		if (file_exists($statfile)) {
-			$lines = explode("\n", file_get_contents($statfile));
-			if(count($lines) >= 1) {
-				foreach($lines as $line) {
-					if($line !== '') {
-						$line = explode('@', $line);
-						if($line[1] === $this->lvol) {
-							$lvmax = str_replace('.', '', $line[4]);
-							$lvmax = str_replace('m', '', $lvmax);
-							$lvmax = (int)$lvmax / 100;
-						}
-					}
-				}
-			}
-		}
-		$statfile = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.vg.stat';
-		if (file_exists($statfile)) {
-			$lines = explode("\n", file_get_contents($statfile));
-			if(count($lines) >= 1) {
-				foreach($lines as $line) {
-					if($line !== '') {
-						$line = explode('@', $line);
-						if($line[0] === $this->volgroup) {
-							$vgmax = str_replace('.', '', $line[6]);
-							$vgmax = str_replace('m', '', $vgmax);
-							$vgmax = (int)$vgmax / 100;
-						}
-					}
-				}
-			}
-		}
-
-		if(	$vgmax < $lvmax ) {
-			$max = $vgmax;
-		} else {
-			$max = $lvmax;
-		}
-		$this->max = $max;
-		return true;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.volgroup.class.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.volgroup.class.php
deleted file mode 100644
index 26e7f23..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/class/lvm-storage.volgroup.class.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-/**
- * LVM-Storage Edit Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class lvm_storage_volgroup
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'lvm_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "lvm_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'lvm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'lvm_identifier';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-		$this->volgroup = $this->response->html->request()->get('volgroup');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Init
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function init() {
-		$storage_id = $this->response->html->request()->get('storage_id');
-		if($storage_id === '') {
-			return false;
-		}
-		// set ENV
-		$deployment = new deployment();
-		$storage    = new storage();
-		$resource   = new resource();
-
-		$storage->get_instance_by_id($storage_id);
-		$resource->get_instance_by_id($storage->resource_id);
-		$deployment->get_instance_by_id($storage->type);
-
-		$this->resource   = $resource;
-		$this->storage    = $storage;
-		$this->deployment = $deployment;
-		$this->response->add('storage_id', $storage_id);
-		$this->response->add('volgroup', $this->volgroup);
-
-		$this->statfile = $this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$resource->id.'.'.$this->volgroup.'.lv.stat';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$this->init();
-		$data = $this->edit();
-		if($data !== false) {
-			$t = $this->response->html->template($this->tpldir.'/lvm-storage-volgroup.tpl.php');
-			$t->add($this->response->html->thisfile, "thisfile");
-			$t->add($data);
-			$t->add($this->lang['lang_id'], 'lang_id');
-			$t->add($this->lang['lang_name'], 'lang_name');
-			$t->add($this->lang['lang_resource'], 'lang_resource');
-			$t->add($this->lang['lang_deployment'], 'lang_deployment');
-			$t->add($this->lang['lang_state'], 'lang_state');
-			$t->add($this->lang['lang_attr'], 'lang_attr');
-			$t->add($this->lang['lang_pv'], 'lang_pv');
-			$t->add($this->lang['lang_size'], 'lang_size');
-			$t->add(sprintf($this->lang['label'], $this->volgroup, $data['name']), 'label');
-			$t->add($this->openqrm->get('baseurl'), 'baseurl');
-			return $t;
-		} else {
-			$msg = sprintf($this->lang['error_no_lvm'], $this->response->html->request()->get('storage_id'));
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $msg)
-			);
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return array|false
-	 */
-	//--------------------------------------------
-	function edit() {
-		if(strpos($this->deployment->type, 'lvm') !== false) {
-			$resource_icon_default="/img/resource.png";
-			$storage_icon="/plugins/lvm-storage/img/plugin.png";
-			$state_icon = '<span class="pill">'.$this->resource->state.'</span>';
-			if ($this->file->exists($this->openqrm->get('webdir').$storage_icon)) {
-				$resource_icon_default=$storage_icon;
-			}
-			$resource_icon_default = $this->openqrm->get('baseurl').$resource_icon_default;
-
-			// Storage info
-			$d['state'] = $state_icon;
-		//	$d['icon'] = "<img width=24 height=24 src=$resource_icon_default>";
-			$d['resource'] = $this->resource->id.' / '.$this->resource->ip;
-			$d['name'] = $this->storage->name;
-			$d['deployment'] = $this->deployment->type;
-			$d['id'] = $this->storage->id;
-
-			// Volgroup info
-			$lines = explode("\n", file_get_contents($this->openqrm->get('basedir').'/plugins/lvm-storage/web/storage/'.$this->resource->id.'.vg.stat'));
-			foreach($lines as $line) {
-				$line = explode("@", $line);
-				if(isset($line[0]) && $line[0] === $this->volgroup) {
-					$vsize = number_format(substr($line[5], 0, strpos($line[5], '.')), 0, '', '').' MB';
-					$vfree = str_replace('m', '', $line[6]);
-					if($vfree !== '0') {
-						$vfree = substr($line[6], 0, strpos($line[6], '.'));
-					}
-					$d['volgroup_name'] = $line[0];
-					$d['volgroup_pv'] = $line[1];
-					$d['volgroup_lv'] = $line[2];
-					$d['volgroup_sn'] = $line[3];
-					$d['volgroup_attr'] = $line[4];
-					$d['volgroup_vsize'] = $vsize;
-					$d['volgroup_vfree'] = number_format($vfree, 0, '', '').' MB';
-				}
-			}
-
-			$a = '&#160';
-			if($d['volgroup_vfree'] !== '0 MB') {
-				$a = $this->response->html->a();
-				$a->label = $this->lang['action_add'];
-				$a->css   = 'add';
-				$a->href  = $this->response->get_url($this->actions_name, "add");
-			}
-			$d['add'] = $a;
-
-			$body = array();
-
-			$file = $this->statfile;
-			if(file_exists($file)) {
-				$lines = explode("\n", file_get_contents($file));
-				if(count($lines) >= 1) {
-					$disabled = array();
-					$t = $this->response->html->template($this->openqrm->get('webdir').'/js/openqrm-progressbar.js');
-					foreach($lines as $line) {
-						if($line !== '') {
-							$s    = '&#160;';
-							$c    = '&#160;';
-							$r    = '&#160;';
-							$src  = '&#160;';
-							$line = explode('@', $line);
-							$name = $line[1];
-							$mode = substr($line[3], 0, 1);
-							if ($line[4] == "clone_in_progress") {
-								// add to disabled identifier
-								$disabled[] = $name;
-								// progressbar
-								$t->add(uniqid('b'), 'id');
-								$t->add($this->openqrm->get('baseurl').'/api.php?action=plugin&plugin=lvm-storage&lvm_storage_action=progress&name='.$this->resource->id.'.lvm.'.$name.'.sync_progress', 'url');
-								$t->add($this->lang['action_clone_in_progress'], 'lang_in_progress');
-								$t->add($this->lang['action_clone_finished'], 'lang_finished');
-								$volume_size = $t->get_string();
-							} else if ($line[4] == "sync_in_progress") {
-								$volume_size = $this->lang['action_sync_in_progress'];
-								$disabled[] = $name;
-							} else {
-								$volume_size = number_format(substr($line[4], 0, strpos($line[4], '.')), 0, '', '').' MB';
-								$image_add_remove = '';
-								$deployment_type = '';
-								$image = new image();
-								$image->get_instance_by_name($name);
-								if (strlen($image->id)) {
-									if( $image->type == $this->deployment->type ) {
-										if( $line[0] === $this->deployment->type ) {
-											if($d['volgroup_vfree'] !== '0 MB' ) {
-												if($mode !== 's') {
-													$s = $this->response->html->a();
-													$s->title   = $this->lang['action_snap'];
-													$s->label   = $this->lang['action_snap'];
-													$s->handler = 'onclick="wait();"';
-													$s->css     = 'snap';
-													$s->href    = $this->response->get_url($this->actions_name, "snap").'&lvol='.$line[1];
-												} else {
-													$disabled[] = $line[5];
-													$src = $line[5];
-												}
-												if($vfree >= (int)substr($line[4], 0, strpos($line[4], '.'))) {
-													$c = $this->response->html->a();
-													$c->title   = $this->lang['action_clone'];
-													$c->label   = $this->lang['action_clone'];
-													$c->handler = 'onclick="wait();"';
-													$c->css     = 'clone';
-													$c->href    = $this->response->get_url($this->actions_name, "clone").'&lvol='.$line[1];
-												}
-											}
-											$r = $this->response->html->a();
-											$r->title   = $this->lang['action_resize'];
-											$r->label   = $this->lang['action_resize'];
-											$r->handler = 'onclick="wait();"';
-											$r->css     = 'resize';
-											$r->href    = $this->response->get_url($this->actions_name, "resize").'&lvol='.$line[1];
-											$deployment_type = $this->deployment->type;
-										} else {
-											$disabled[] = $name;
-										}
-									}
-								}
-								// create/remove image object, check if image exists
-								if (strlen($image->id)) {
-									if( $image->type != $this->deployment->type ) {
-										$deployment_type = $image->type;
-										$disabled[] = $name;
-									} else {
-										$i = $this->response->html->a();
-										$i->title   = $this->lang['action_remove_image'];
-										$i->label   = $this->lang['action_remove_image'];
-										$i->handler = 'onclick="wait();"';
-										$i->css     = 'remove';
-										$i->href    = $this->response->get_url($this->actions_name, "image").'&image_id='.$image->id.'&image_command=remove';
-										$image_add_remove = $i;
-									}
-								} else {
-									$i = $this->response->html->a();
-									$i->title   = $this->lang['action_add_image'];
-									$i->label   = $this->lang['action_add_image'];
-									$i->handler = 'onclick="wait();"';
-									$i->css     = 'add';
-									if($this->deployment->type === 'lvm-iscsi-deployment') {
-										$image_root_device = $this->volgroup.':/dev/'.$name.'/1';
-										$i->href    = $this->response->get_url($this->actions_name, "image").'&root_device='.$image_root_device.'&image_name='.$name.'&image_command=add';
-									} else if($d['deployment'] === 'lvm-aoe-deployment') {
-										$i->href    = $this->response->get_url($this->actions_name, "image").'&root_device='.$name.'&image_name='.$name.'&image_command=add';
-									} else if($d['deployment'] === 'lvm-nfs-deployment') {
-										$image_root_device = '/'.$this->volgroup.'/'.$name;
-										$i->href    = $this->response->get_url($this->actions_name, "image").'&root_device='.$image_root_device.'&image_name='.$name.'&image_command=add';
-									}
-									$disabled[] = $name;
-									$image_add_remove = $i;
-								}
-							}
-
-							$body[] = array(
-								//'icon'   => $d['icon'],
-								'deploy' => $deployment_type,
-								'name'   => $name,
-								'attr'   => $line[3],
-								'source' => $src,
-								'size'   => $volume_size,
-								'image'   => $image_add_remove,
-								'snap'   => $s,
-								'clone'  => $c,
-								'resize' => $r,
-							);
-						}
-					}
-				}
-			}
-
-/*
-			$h['icon']['title']      = '&#160;';
-			$h['icon']['sortable']   = false;
-*/
-			$h['name']['title']      = $this->lang['table_name'];
-			$h['deploy']['title']    = $this->lang['table_deployment'];
-			$h['attr']['title']      = $this->lang['table_attr'];
-			$h['source']['title']    = $this->lang['table_source'];
-			$h['size']['title']      = $this->lang['table_size'];
-			$h['image']['title']      = '&#160;';
-			$h['image']['sortable']   = false;
-			$h['snap']['title']      = '&#160;';
-			$h['snap']['sortable']   = false;
-			$h['clone']['title']     = '&#160;';
-			$h['clone']['sortable']  = false;
-			$h['resize']['title']    = '&#160;';
-			$h['resize']['sortable'] = false;
-
-			$table = $this->response->html->tablebuilder('lvm_lvols', $this->response->get_array($this->actions_name, 'volgroup'));
-			$table->sort                = 'name';
-			$table->limit               = 10;
-			$table->offset              = 0;
-			$table->order               = 'ASC';
-			$table->max                 = count($body);
-			$table->autosort            = true;
-			$table->sort_link           = false;
-			$table->id                  = 'Tabelle';
-			$table->css                 = 'htmlobject_table';
-			$table->border              = 1;
-			$table->cellspacing         = 0;
-			$table->cellpadding         = 3;
-			$table->form_action         = $this->response->html->thisfile;
-			$table->head                = $h;
-			$table->body                = $body;
-			$table->identifier          = 'name';
-			$table->identifier_name     = $this->identifier_name;
-			$table->identifier_disabled = $disabled;
-			$table->actions_name        = $this->actions_name;
-			$table->actions             = array(array('remove' => $this->lang['action_remove']));
-
-			$d['table'] = $table->get_string();
-			return $d;
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/css/lvm-storage.css b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/css/lvm-storage.css
deleted file mode 100644
index e69de29..0000000
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/image.custom-iscsi-deployment.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/image.custom-iscsi-deployment.php
deleted file mode 100644
index ef5ae93..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/image.custom-iscsi-deployment.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-
-// global event for logging
-$event = new event();
-global $event;
-
-
-function custom_iscsi_deployment_wait_for_identfile($sfile) {
-	$refresh_delay=1;
-	$refresh_loop_max=20;
-	$refresh_loop=0;
-	while (!file_exists($sfile)) {
-		sleep($refresh_delay);
-		$refresh_loop++;
-		flush();
-		if ($refresh_loop > $refresh_loop_max)  {
-			return false;
-		}
-	}
-	return true;
-}
-
-
-function get_custom_iscsi_deployment_image_rootdevice_identifier($custom_iscsi_storage_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_ADMIN;
-	global $event;
-
-	// place for the storage stat files
-	$StorageDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/lvm-storage/storage';
-	$rootdevice_identifier_array = array();
-	return $rootdevice_identifier_array;
-}
-
-function get_custom_iscsi_deployment_image_default_rootfs() {
-	return "ext3";
-}
-
-
-function get_custom_iscsi_deployment_rootfs_transfer_methods() {
-	return true;
-}
-
-function get_custom_iscsi_deployment_rootfs_set_password_method() {
-	return true;
-}
-
-function get_custom_iscsi_deployment_is_network_deployment() {
-	return true;
-}
-
-function get_custom_iscsi_deployment_local_deployment_enabled() {
-	return false;
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/image.custom-nfs-deployment.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/image.custom-nfs-deployment.php
deleted file mode 100644
index 31a1321..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/image.custom-nfs-deployment.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-
-// global event for logging
-$event = new event();
-global $event;
-
-function custom_nfs_deployment_wait_for_identfile($sfile) {
-	$refresh_delay=1;
-	$refresh_loop_max=20;
-	$refresh_loop=0;
-	while (!file_exists($sfile)) {
-		sleep($refresh_delay);
-		$refresh_loop++;
-		flush();
-		if ($refresh_loop > $refresh_loop_max)  {
-			return false;
-		}
-	}
-	return true;
-}
-
-
-function get_custom_nfs_deployment_image_rootdevice_identifier($custom_nfs_storage_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_ADMIN;
-	global $event;
-
-	// place for the storage stat files
-	$rootdevice_identifier_array = array();
-	return $rootdevice_identifier_array;
-}
-
-function get_custom_nfs_deployment_image_default_rootfs() {
-	return "nfs";
-}
-
-
-function get_custom_nfs_deployment_rootfs_transfer_methods() {
-	return true;
-}
-
-function get_custom_nfs_deployment_rootfs_set_password_method() {
-	return true;
-}
-
-function get_custom_nfs_deployment_is_network_deployment() {
-	return true;
-}
-
-function get_custom_nfs_deployment_local_deployment_enabled() {
-	return false;
-}
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/image.lvm-aoe-deployment.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/image.lvm-aoe-deployment.php
deleted file mode 100644
index 51c7410..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/image.lvm-aoe-deployment.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-
-// global event for logging
-$event = new event();
-global $event;
-
-
-function lvm_aoe_deployment_wait_for_identfile($sfile) {
-	$refresh_delay=1;
-	$refresh_loop_max=20;
-	$refresh_loop=0;
-	while (!file_exists($sfile)) {
-		sleep($refresh_delay);
-		$refresh_loop++;
-		flush();
-		if ($refresh_loop > $refresh_loop_max)  {
-			return false;
-		}
-	}
-	return true;
-}
-
-
-function get_lvm_aoe_deployment_image_rootdevice_identifier($lvm_aoe_storage_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_ADMIN;
-	global $event;
-
-	// place for the storage stat files
-	$StorageDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/lvm-storage/storage';
-	$rootdevice_identifier_array = array();
-	$storage = new storage();
-	$storage->get_instance_by_id($lvm_aoe_storage_id);
-	$storage_resource = new resource();
-	$storage_resource->get_instance_by_id($storage->resource_id);
-	$storage_resource_id = $storage_resource->id;
-	$ident_file = "$StorageDir/$storage_resource_id.lv.lvm-aoe-deployment.ident";
-	if (file_exists($ident_file)) {
-		unlink($ident_file);
-	}
-	// send command
-	$resource_command="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/bin/openqrm-lvm-storage post_identifier -t lvm-aoe-deployment -u $OPENQRM_ADMIN->name -p $OPENQRM_ADMIN->password";
-	$storage_resource->send_command($storage_resource->ip, $resource_command);
-	if (!lvm_aoe_deployment_wait_for_identfile($ident_file)) {
-		$event->log("get_image_rootdevice_identifier", $_SERVER['REQUEST_TIME'], 2, "image.lvm-aoe-deployment", "Timeout while requesting image identifier from storage id $storage->id", "", "", 0, 0, 0);
-		return;
-	}
-	$fcontent = file($ident_file);
-	foreach($fcontent as $lun_info) {
-		$tpos = strpos($lun_info, ",");
-		$timage_name = trim(substr($lun_info, 0, $tpos));
-		$troot_device = trim(substr($lun_info, $tpos+1));
-		$rootdevice_identifier_array[] = array("value" => "$troot_device", "label" => "$timage_name");
-	}
-	return $rootdevice_identifier_array;
-}
-
-
-function get_lvm_aoe_deployment_image_default_rootfs() {
-	return "ext3";
-}
-
-
-function get_lvm_aoe_deployment_rootfs_transfer_methods() {
-	return true;
-}
-
-function get_lvm_aoe_deployment_rootfs_set_password_method() {
-	return true;
-}
-
-function get_lvm_aoe_deployment_is_network_deployment() {
-	return true;
-}
-
-function get_lvm_aoe_deployment_local_deployment_enabled() {
-	return false;
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/image.lvm-iscsi-deployment.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/image.lvm-iscsi-deployment.php
deleted file mode 100644
index 511d824..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/image.lvm-iscsi-deployment.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-
-// global event for logging
-$event = new event();
-global $event;
-
-
-function lvm_iscsi_deployment_wait_for_identfile($sfile) {
-	$refresh_delay=1;
-	$refresh_loop_max=20;
-	$refresh_loop=0;
-	while (!file_exists($sfile)) {
-		sleep($refresh_delay);
-		$refresh_loop++;
-		flush();
-		if ($refresh_loop > $refresh_loop_max)  {
-			return false;
-		}
-	}
-	return true;
-}
-
-
-function get_lvm_iscsi_deployment_image_rootdevice_identifier($lvm_iscsi_storage_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_ADMIN;
-	global $event;
-
-	// place for the storage stat files
-	$StorageDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/lvm-storage/storage';
-	$rootdevice_identifier_array = array();
-	$storage = new storage();
-	$storage->get_instance_by_id($lvm_iscsi_storage_id);
-	$storage_resource = new resource();
-	$storage_resource->get_instance_by_id($storage->resource_id);
-	$storage_resource_id = $storage_resource->id;
-	$ident_file = "$StorageDir/$storage_resource_id.lv.lvm-iscsi-deployment.ident";
-	if (file_exists($ident_file)) {
-		unlink($ident_file);
-	}
-	// send command
-	$resource_command="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/bin/openqrm-lvm-storage post_identifier -t lvm-iscsi-deployment -u $OPENQRM_ADMIN->name -p $OPENQRM_ADMIN->password";
-	$storage_resource->send_command($storage_resource->ip, $resource_command);
-	if (!lvm_iscsi_deployment_wait_for_identfile($ident_file)) {
-		$event->log("get_image_rootdevice_identifier", $_SERVER['REQUEST_TIME'], 2, "image.lvm-iscsi-deployment", "Timeout while requesting image identifier from storage id $storage->id", "", "", 0, 0, 0);
-		return;
-	}
-	$fcontent = file($ident_file);
-	foreach($fcontent as $lun_info) {
-		$tpos = strpos($lun_info, ",");
-		$timage_name = trim(substr($lun_info, 0, $tpos));
-		$troot_device = trim(substr($lun_info, $tpos+1));
-		$rootdevice_identifier_array[] = array("value" => "$troot_device", "label" => "$timage_name");
-	}
-	return $rootdevice_identifier_array;
-}
-
-function get_lvm_iscsi_deployment_image_default_rootfs() {
-	return "ext3";
-}
-
-
-function get_lvm_iscsi_deployment_rootfs_transfer_methods() {
-	return true;
-}
-
-function get_lvm_iscsi_deployment_rootfs_set_password_method() {
-	return true;
-}
-
-function get_lvm_iscsi_deployment_is_network_deployment() {
-	return true;
-}
-
-function get_lvm_iscsi_deployment_local_deployment_enabled() {
-	return false;
-}
-
-function get_lvm_iscsi_deployment_is_resizable() {
-	return true;
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/image.lvm-nfs-deployment.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/image.lvm-nfs-deployment.php
deleted file mode 100644
index 1fcdffd..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/image.lvm-nfs-deployment.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-
-// global event for logging
-$event = new event();
-global $event;
-
-function lvm_nfs_deployment_wait_for_identfile($sfile) {
-	$refresh_delay=1;
-	$refresh_loop_max=20;
-	$refresh_loop=0;
-	while (!file_exists($sfile)) {
-		sleep($refresh_delay);
-		$refresh_loop++;
-		flush();
-		if ($refresh_loop > $refresh_loop_max)  {
-			return false;
-		}
-	}
-	return true;
-}
-
-
-function get_lvm_nfs_deployment_image_rootdevice_identifier($lvm_nfs_storage_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_ADMIN;
-	global $event;
-
-	// place for the storage stat files
-	$StorageDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/lvm-storage/storage';
-	$rootdevice_identifier_array = array();
-	$storage = new storage();
-	$storage->get_instance_by_id($lvm_nfs_storage_id);
-	$storage_resource = new resource();
-	$storage_resource->get_instance_by_id($storage->resource_id);
-	$storage_resource_id = $storage_resource->id;
-	$ident_file = "$StorageDir/$storage_resource_id.lv.lvm-nfs-deployment.ident";
-	if (file_exists($ident_file)) {
-		unlink($ident_file);
-	}
-	// send command
-	$resource_command="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/lvm-storage/bin/openqrm-lvm-storage post_identifier -t lvm-nfs-deployment -u $OPENQRM_ADMIN->name -p $OPENQRM_ADMIN->password";
-	$storage_resource->send_command($storage_resource->ip, $resource_command);
-	if (!lvm_nfs_deployment_wait_for_identfile($ident_file)) {
-		$event->log("get_image_rootdevice_identifier", $_SERVER['REQUEST_TIME'], 2, "image.lvm-nfs-deployment", "Timeout while requesting image identifier from storage id $storage->id", "", "", 0, 0, 0);
-		return;
-	}
-	$fcontent = file($ident_file);
-	foreach($fcontent as $lun_info) {
-		$tpos = strpos($lun_info, ",");
-		$timage_name = trim(substr($lun_info, 0, $tpos));
-		$troot_device = trim(substr($lun_info, $tpos+1));
-		$rootdevice_identifier_array[] = array("value" => "$troot_device", "label" => "$timage_name");
-	}
-	return $rootdevice_identifier_array;
-}
-
-function get_lvm_nfs_deployment_image_default_rootfs() {
-	return "nfs";
-}
-
-
-function get_lvm_nfs_deployment_rootfs_transfer_methods() {
-	return true;
-}
-
-function get_lvm_nfs_deployment_rootfs_set_password_method() {
-	return true;
-}
-
-function get_lvm_nfs_deployment_is_network_deployment() {
-	return true;
-}
-
-function get_lvm_nfs_deployment_local_deployment_enabled() {
-	return false;
-}
-
-function get_lvm_nfs_deployment_is_resizable() {
-	return true;
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/img/plugin.png
deleted file mode 100644
index 002a7e9..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/lang/de.lvm-storage-about.ini b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/lang/de.lvm-storage-about.ini
deleted file mode 100644
index 2d1e835..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/lang/de.lvm-storage-about.ini
+++ /dev/null
@@ -1,58 +0,0 @@
-[documentation]
-tab = "Über LVM-Storage"
-label = "Über LVM-Storage"
-introduction_title = "Einleitung"
-introduction_content = "Das "LVM-Storage" Plugin integriert Standard Linux Systeme als LVM Storage Server - NFS/iSCSI/AOE.
-					Das "LVM-Storage" Plugin transformiert eine Standard Linux-box in einen "rapid-fast-cloning" Storage Server
-					mit unterstützung für "snap-shotting" für NFS-, Aoe-, and iSCSI Volumes.
-					Die Snapshots (Klone von einem "golden server image") sind direkt verfügbar für weiteres Deployment
-					und sparen Speicherplatz da nur das "Delta" zu dem Original Volume gespeichert wird."
-requirements_title = "Anforderungen"
-requirements_list = "<ul><li>Eine 'Resource' für die LVM-Storage Storage<br>(dies kann ein System sein das mittels des "local-server" Plugin in openQRM eingebunden ist oder der openQRM Server selber)</li>
-					<li>Eine (oder mehere) LVM Volume Gruppen mit freiem Speicherplatz dediziert für die LVM Volumes</li>
-				   <li>Die folgenden Paket werden benötigt: nfs-common, nfs-kernel-server, screen, rsync, vblade, aoetools, iscsitarget, open-iscsi</li></ul>"
-
-tested_title = "Getestet mit"
-tested_content = "Diese Plugin ist getestet mit Debian, Ubuntu und CentOS"
-
-provides_title = "Bietet"
-provides_list = "<ul><li>Storage-Typen: 'Lvm Storage Server (Aoe/Nfs/Iscsi)'</li>
-				   <li>Deployment-Typen: 'Lvm Aoe/Nfs/Iscsi-root deployment'</li></ul>"
-type_title = "Plugin-Typ"
-type_content = "Storage"
-
-deployment_title = "Deployment-Typ"
-deployment_content = "Netzwerk-Deployment"
-
-documentation_title = "Dokumentation"
-use_case_title = "Anwendungsfall"
-network_deploymet = "Netzwerk-Deployment"
-doc1 = ""
-
-
-[bootservice]
-tab = "Boot-Service"
-label = "LVM-Storage Boot-Service"
-boot_service_title = "Information"
-boot_service_content = "Das LVM-Storage Plugin beinhaltet einen openQRM Boot-Service.
-			Dieser 'LVM-Storage Boot-Service' wird automatisch von allen in openQRM integrierten Systeme heruntergeladen und ausgeführt.
-			Der Boot-Service befindet sich unter:<br>
-			<pre>/usr/share/openqrm/plugins/lvm-storage/web/boot-service-lvm-storage.tgz</pre>
-			<br>
-			Der 'LVM-Storage Boot-Service' beinhaltet die 'Client' Dateien des LVM-Storage Plugin. Eine Konfigurationsdatei für den LVM-Storage Server ist ebenfalls enhalten.<br>
-			<br>
-			Die Boot-Service konfiguration wird mittels des 'openqrm' Kommandozeilenwerkzeugs verwaltet. Der folgende Befehl zeigt die die momentane 'default' Boot-Service Konfiguration an:<br>
-			<pre>/usr/share/openqrm/bin/openqrm boot-service view -n lvm-storage -a default</pre>
-			<br>
-			Die Boot-Service Konfiguration eines speziellen Server zeigt der folgende Befehl an:<br>
-			<pre>/usr/share/openqrm/bin/openqrm boot-service view -n lvm-storage -a [Server-name]</pre>
-			<br>
-			Der folgende Befehl passt einen Konfigurationparameter des 'default' Boot-Service an:<br>
-			<pre>/usr/share/openqrm/bin/openqrm boot-service configure -n lvm-storage -a default -k [key] -v [value]</pre>
-			<br>
-			Die Boot-Service Konfigurarationsparameter eines speziellen Server passt der folgende Befehl an:<br>
-			<pre>/usr/share/openqrm/bin/openqrm boot-service configure -n lvm-storage -a [Server-name] -k [key] -v [value]</pre>
-			<br>
-			Im Falle das der openmQRM Server selber als LVM-Storage genutzt wird werden die Konfigurationsparameter in der folgenden Datei manuell angeepasst:<br>
-			<pre>/usr/share/openqrm/plugins/lvm-storage/etc/openqrm-plugin-lvm-storage.conf</pre>"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/lang/de.lvm-storage.ini b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/lang/de.lvm-storage.ini
deleted file mode 100644
index a4f8cf6..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/lang/de.lvm-storage.ini
+++ /dev/null
@@ -1,143 +0,0 @@
-[select]
-tab = "Lvm-storage auswählen"
-label = "Lvm-storage auswählen"
-action_edit = "bearbeiten"
-table_name = "Name"
-table_id = "Id"
-table_recource = "Resource"
-table_type = "Type"
-table_deployment = "Deployment"
-error_no_storage = "<b>Keine Storage angelegt!</b><br><br>Bitte legen Sie erst eine lvm Storage an!"
-new_storage = "Neue Storage"
-please_wait = "Lade Volume groups. Bitte warten .."
-[edit]
-tab = "LVM Volume group auswählen"
-label = "LVM Volume group auf storage %s auswählen"
-lang_id = "ID"
-lang_name = "Name"
-lang_resource = "Resource"
-lang_state = "Status"
-lang_deployment = "Deployment"
-action_edit = "bearbeiten"
-action_add ="Neue Volume Group erstellen"
-action_remove ="entfernen"
-table_name = "Name"
-table_pv = "PV"
-table_lv = "LV"
-table_sn = "SN"
-table_attr = "Attr"
-table_vsize = "Vsize"
-table_vfree = "VFree"
-error_no_lvm = "Die Storage %s ist nicht vom Typ lvm-storage"
-please_wait = "Lade Volume group. Bitte warten .."
-[addvg]
-tab = "Volume Group erstellen"
-label = "Volume Group auf storage %s erstellen"
-partition = "Partition"
-name = "Name"
-extend = "Partition erweitern"
-confirm_text = "Alle Daten auf %s werden gelöscht.<br>Wirklich fortsetzen?"
-msg_added = "Volume Group %s erfolgreich erstellt"
-please_wait = "Lade Volume group. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[removevg]
-tab = "Volume Group entfernen"
-label = "Volume Group auf storage %s entfernen"
-confirm_text = "Wollen Sie die Volume Group %s wirlich entfernen?"
-msg_removed = "Volume Group %s erfolgreich entfernt"
-please_wait = "Lade Volume group. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[volgroup]
-tab = "LVM Volume group bearbeiten"
-label = "LVM Volume group %s auf storage %s bearbeiten"
-lang_id = "ID"
-lang_name = "Name"
-lang_deployment = "Deployment"
-lang_resource = "Resource"
-lang_state = "Status"
-lang_attr = "Attr"
-lang_pv = "PV / LV / SN"
-lang_size = "Vsize / Vfree"
-action_add = "Neues Logical Volume hinzufügen"
-action_remove = "löschen"
-action_resize = "Größe ändern"
-action_snap = "snap"
-action_clone = "klonen"
-action_add_image = "Image hinzufügen"
-action_remove_image = "Image entfernen"
-action_sync_in_progress = "Synchronisation läuft - Bitte warten"
-action_clone_in_progress = "Synchronisation läuft - Bitte warten"
-action_clone_finished = "Syncronisation beendet"
-table_name = "Lvol"
-table_deployment = "Deployment"
-table_attr = "Attr"
-table_size = "Size"
-table_source = "Source"
-error_no_lvm = "Storage %s ist nicht vom Typ lvm-deployment"
-please_wait = "Lade Volume group. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[add]
-tab = "Logical Volume hinzufügen"
-label = "Logical Volume zu LVM Volume group %s hinzufügen"
-form_name = "Name"
-form_size = "Größe (max: %s MB)"
-msg_added = "Logical Volume %s hinzugefügt"
-msg_add_failed = "Fehler beim anlegen des Volumes %s"
-error_exists = "Logical Volume %s besteht bereits"
-error_name = "Name darf nur %s beinhalten"
-error_size = "Größe darf nur %s beinhalten"
-error_size_exeeded = "Größe überschreitet %s MB"
-please_wait = "Füge Logical Volume hinzu. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-lang_name_generate = "Name generieren"
-[image]
-label = "Image für Logical Volume %s hinzufügen/entfernen"
-tab = "Image hinzufügen/entfernen"
-error_exists = "Image %s existiert bereits"
-error_image_still_in_use = "Image ID %s ist noch in benutztung von Server %s"
-msg_added_image = "Image %s hinzugefügt"
-msg_removed_image = "Image id %s entfernt"
-msg_add_failed = "Fehler beim anlegen des Image %s"
-please_wait = "Bitt warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[snap]
-label = "Snap Logical Volume %s"
-tab = "Snap Logical Volume"
-msg_snaped = "Snaped %s to %s"
-msg_snap_failed = "Fehler beim clonen des Volumes %s"
-form_name = "Name"
-lang_name_generate = "Name generieren"
-form_size = "Größe (max: %s MB)"
-error_exists = "Logical Volume %s besteht bereits"
-error_name = "Name darf nur %s beinhalten"
-error_size = "Größe darf nur %s beinhalten"
-error_size_exeeded = "Größe überschreitet %s MB"
-please_wait = "Snaping Logical Volume. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[clone]
-label = "Logical Volume %s klonen"
-tab = "Logical Volume klonen"
-msg_cloned = "%s als %s geklont"
-msg_clone_failed = "Fehler beim clonen des Volumes %s"
-form_name = "Name"
-lang_name_generate = "Name generieren"
-error_exists = "Logical Volume %s besteht bereits"
-error_name = "Name darf nur %s beinhalten"
-please_wait = "Klone Logical Volume. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[remove]
-label = "Logical Volume(s) löschen"
-msg_removed = "Logical Volume %s wurde gelöscht"
-msg_image_still_in_use = "Das Volume %s des Image ID %s ist noch in benutztung von Server %s"
-please_wait = "Lösche Logical Volume(s). Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[resize]
-label = "Logical Volume %s Größe ändern"
-tab = "Logical Volume Größe ändern"
-size = "min. %s MB, max. %s MB"
-error_size = "Größe darf nur %s beinhalten"
-error_size_exeeded = "Größe überschreitet %s MB"
-error_size_undercut = "Größe unterschreitet %s MB"
-msg_resized = "Logical Volume %s Größe geändert"
-please_wait = "Logical Volume Größe ändern. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/lang/en.lvm-storage-about.ini b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/lang/en.lvm-storage-about.ini
deleted file mode 100644
index b2ca065..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/lang/en.lvm-storage-about.ini
+++ /dev/null
@@ -1,59 +0,0 @@
-[documentation]
-tab = "About LVM-Storage"
-label = "About LVM-Storage"
-introduction_title = "Introduction"
-introduction_content = "The 'LVM-Storage' plugin integrate standard Linux Systems as LVM Storage server - NFS/iSCSI/AOE.
-					The 'LVM-Storage' plugin transforms a standard Linux-box into a rapid-fast-cloning storage-server
-					supporting snap-shotting for NFS-, Aoe-, and Iscsi-filesystem-images.
-					The snapshots (clones from a 'golden server image') are immediatly available for deployment and
-					saving space on the storage-subsystem because just the delta of the server image is being stored.
-					   "
-requirements_title = "Requirements"
-requirements_list = "<ul><li>A resource for the LVM-Storage Storage (this can be a remote system integrated into openQRM e.g. via the 'local-server' plugin or the openQRM server itself)</li>
-					<li>One (or more) lvm volume group(s) with free space dedicated for the LVM-Storage Volumes</li>
-				   <li>The following packages must be installed: nfs-common, nfs-kernel-server, screen, rsync, vblade, aoetools, iscsitarget, open-iscsi</li></ul>"
-
-tested_title = "Tested with"
-tested_content = "This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions."
-
-provides_title = "Provides"
-provides_list = "<ul><li>Storage type: 'Lvm Storage Server (Aoe/Nfs/Iscsi)'</li>
-					<li>Deployment types: 'Lvm Aoe/Nfs/Iscsi-root deployment'</li></ul>"
-type_title = "Plugin type"
-type_content = "Storage"
-
-deployment_title = "Deployment type"
-deployment_content = "Network deployment"
-
-documentation_title = "Documentation"
-use_case_title = "Use case"
-network_deploymet = "Network deployment"
-doc1 = ""
-
-
-[bootservice]
-tab = "Boot-Service"
-label = "LVM-Storage Boot-Service"
-boot_service_title = "Information"
-boot_service_content = "The LVM-Storage Plugin provides an openQRM Boot-Service.
-			This 'LVM-Storage Boot-Service' is automatically downloaded and executed by the openQRM-Client on all integrated Systems.
-			The Boot-Service is located at:<br>
-			<pre>/usr/share/openqrm/plugins/lvm-storage/web/boot-service-lvm-storage.tgz</pre>
-			<br>
-			The 'LVM-Storage Boot-Service contains the Client files of the LVM-Storage Plugin. Also a configuration file for the LVM-Storage server is included in this Boot-Service.<br>
-			<br>
-			The Boot-Service configuration can be viewed and administrated by the 'openqrm' utility. To view the current default Boot-Service configuration run:<br>
-			<pre>/usr/share/openqrm/bin/openqrm boot-service view -n lvm-storage -a default</pre>
-			<br>
-			To view a Boot-Service configuration of a specific Server run:<br>
-			<pre>/usr/share/openqrm/bin/openqrm boot-service view -n lvm-storage -a [Server-name]</pre>
-			<br>
-			To adapt a parameter in the current default Boot-Service configuration run:<br>
-			<pre>/usr/share/openqrm/bin/openqrm boot-service configure -n lvm-storage -a default -k [key] -v [value]</pre>
-			<br>
-			To adapt a paramter in the Boot-Service configuration of a specific Server run:<br>
-			<pre>/usr/share/openqrm/bin/openqrm boot-service configure -n lvm-storage -a [Server-name] -k [key] -v [value]</pre>
-			<br>
-			In case the openmQRM Server itself is used as the LVM-Storage Storage please edit:<br>
-			<pre>/usr/share/openqrm/plugins/lvm-storage/etc/openqrm-plugin-lvm-storage.conf</pre>
-			and set the configuration keys."
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/lang/en.lvm-storage.ini b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/lang/en.lvm-storage.ini
deleted file mode 100644
index 5167325..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/lang/en.lvm-storage.ini
+++ /dev/null
@@ -1,143 +0,0 @@
-[select]
-tab = "Select lvm-storage"
-label = "Select lvm-storage"
-action_edit = "edit"
-table_name = "Name"
-table_id = "Id"
-table_recource = "Resource"
-table_type = "Type"
-table_deployment = "Deployment"
-error_no_storage = "<b>No storage configured yet!</b><br><br>Please create a lvm Storage first!"
-new_storage = "New Storage"
-please_wait = "Loading Volume groups. Please wait .."
-[edit]
-tab = "Select LVM Volume group"
-label = "Select LVM Volume group on storage %s"
-lang_id = "ID"
-lang_name = "Name"
-lang_resource = "Resource"
-lang_state = "State"
-lang_deployment = "Deployment"
-action_edit = "select"
-action_add ="Add new Volume Group"
-action_remove ="remove"
-table_name = "Name"
-table_pv = "PV"
-table_lv = "LV"
-table_sn = "SN"
-table_attr = "Attr"
-table_vsize = "Vsize"
-table_vfree = "VFree"
-error_no_lvm = "Storage %s is not of type lvm-storage"
-please_wait = "Loading Volume group. Please wait .."
-[addvg]
-tab = "Add Volume Group"
-label = "Add Volume Group to storage %s"
-partition = "Partition"
-name = "Name"
-extend = "extend partition"
-confirm_text = "All Data on %s will be erased.<br>Are you sure to continue?"
-msg_added = "Successfully added Volume Group %s"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[removevg]
-tab = "Remove Volume Group"
-label = "Remove Volume Group on storage %s"
-confirm_text = "Do you realy want to remove Volume Group %s?"
-msg_removed = "Successfully removed Volume Group %s"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[volgroup]
-tab = "Edit LVM Volume group"
-label = "Edit LVM Volume group %s on storage %s"
-lang_id = "ID"
-lang_name = "Name"
-lang_deployment = "Deployment"
-lang_resource = "Resource"
-lang_state = "State"
-lang_attr = "Attr"
-lang_pv = "PV / LV / SN"
-lang_size = "Vsize / Vfree"
-action_add = "Add new logical volume"
-action_remove = "remove"
-action_resize = "resize"
-action_snap = "snap"
-action_clone = "clone"
-action_add_image = "Add Image"
-action_remove_image = "Remove Image"
-action_sync_in_progress = "Source of synchronisation - Please wait"
-action_clone_in_progress = "Synchronisation in progress - Please wait"
-action_clone_finished = "Syncronisation finished!"
-table_name = "Lvol"
-table_deployment = "Deployment"
-table_attr = "Attr"
-table_size = "Size"
-table_source = "Source"
-error_no_lvm = "Storage %s is not of type lvm-deployment"
-please_wait = "Loading Volume group. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[add]
-tab = "Add Logical Volume"
-label = "Add Logical Volume to LVM Volume group %s"
-form_name = "Name"
-form_size = "Size (max: %s MB)"
-msg_added = "Added Logical Volume %s"
-msg_add_failed = "Failed to add Volume %s"
-error_exists = "Logical Volume %s allready exists"
-error_name = "Name must be %s"
-error_size = "Size must be %s"
-error_size_exeeded = "Size exeeds %s MB"
-please_wait = "Adding Logical Volume. Please wait .."
-canceled = "Operation canceled. Please wait .."
-lang_name_generate = "generate name"
-[image]
-label = "Add/Remove Image for Logical Volume %s"
-tab = "Add/Remove Image"
-error_exists = "Image %s allready exists"
-error_image_still_in_use = "Image id %s is still in use by Server(s) %s"
-msg_added_image = "Added Image %s"
-msg_removed_image = "Removed Image id %s"
-msg_add_failed = "Failed to add Image id %s"
-please_wait = "Please wait .."
-canceled = "Operation canceled. Please wait .."
-[snap]
-label = "Snap Logical Volume %s"
-tab = "Snap Logical Volume"
-msg_snaped = "Snaped %s to %s"
-msg_snap_failed = "Failed to clone Volume %s"
-form_name = "Name"
-lang_name_generate = "generate name"
-form_size = "Size (max: %s MB)"
-error_exists = "Volume %s allready exists"
-error_name = "Name must be %s"
-error_size = "Size must be %s"
-error_size_exeeded = "Size exeeds %s MB"
-please_wait = "Snaping Logical Volume. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[clone]
-label = "Clone Logical Volume %s"
-tab = "Clone Logical Volume"
-msg_cloned = "Cloned %s as %s"
-msg_clone_failed = "Failed to clone Volume %s"
-form_name = "Name"
-lang_name_generate = "generate name"
-error_exists = "Volume %s allready exists"
-error_name = "Name must be %s"
-please_wait = "Cloning Logical Volume. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[remove]
-label = "Remove Logical Volume(s)"
-msg_removed = "Removed Logical Volume %s"
-msg_image_still_in_use = "Volume %s of Image id %s is still in use by Server %s"
-please_wait = "Removing Logical Volume(s). Please wait .."
-canceled = "Operation canceled. Please wait .."
-[resize]
-label = "Resize Logical Volume %s"
-tab = "Resize Logical Volume"
-size = "min. %s MB, max. %s MB"
-error_size = "Size must be %s"
-error_size_exeeded = "Size exeeds %s MB"
-error_size_undercut = "Size undercuts %s MB"
-msg_resized = "Resized Logical Volume %s"
-please_wait = "Resizing Logical Volume. Please wait .."
-canceled = "Operation canceled. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/lvm-storage-action.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/lvm-storage-action.php
deleted file mode 100644
index 080c07b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/lvm-storage-action.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/authblocker.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-// filter inputs
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-global $IMAGE_INFO_TABLE;
-global $DEPLOYMENT_INFO_TABLE;
-global $OPENQRM_SERVER_BASE_DIR;
-
-$lvm_storage_command = $request->get('lvm_storage_command');
-$lvm_image_name = $request->get('lvm_image_name');
-
-// place for the storage stat files
-$StorageDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/lvm-storage/storage';
-// global event for logging
-$event = new event();
-
-// user/role authentication
-if ($OPENQRM_USER->role != "administrator") {
-	$event->log("authorization", $_SERVER['REQUEST_TIME'], 1, "lvm-action", "Un-Authorized access to lvm-actions from $OPENQRM_USER->name", "", "", 0, 0, 0);
-	exit();
-}
-
-
-$event->log("$lvm_storage_command", $_SERVER['REQUEST_TIME'], 5, "lvm-storage-action", "Processing lvm-storage command $lvm_storage_command", "", "", 0, 0, 0);
-switch ($lvm_storage_command) {
-	case 'get_storage':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	case 'get_ident':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	case 'clone_finished':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	case 'get_sync_progress':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	case 'get_sync_finished':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		sleep(5);
-		unlink($filename);
-		break;
-
-	case 'auth_finished':
-		// remove storage-auth-blocker if existing
-		$authblocker = new authblocker();
-		$authblocker->get_instance_by_image_name($lvm_image_name);
-		if (strlen($authblocker->id)) {
-			$event->log("$lvm_storage_command", $_SERVER['REQUEST_TIME'], 5, "lvm-storage-action", "Removing authblocker for image $lvm_image_name", "", "", 0, 0, 0);
-			$authblocker->remove($authblocker->id);
-		}
-		break;
-
-	case 'set_image_size':
-		$lvm_image_name = $request->get('lvm_image_name');
-		$lvm_image_size = $request->get('lvm_image_size');
-		if($lvm_image_name !== '' && $lvm_image_size !== '') {
-			$lvm_image = new image();
-			$lvm_image->get_instance_by_name($lvm_image_name);
-			if($lvm_image->id !== '') {
-				$lvm_image->update($lvm_image->id, array('image_size' => $lvm_image_size));
-				$event->log("$lvm_storage_command", $_SERVER['REQUEST_TIME'], 5, "lvm-storage-action", "Set image size $lvm_image_size MB for image $lvm_image_name", "", "", 0, 0, 0);
-			}
-		}
-		break;
-		
-	default:
-		$event->log("$lvm_storage_command", $_SERVER['REQUEST_TIME'], 3, "lvm-storage-action", "No such lvm-storage command ($lvm_storage_command)", "", "", 0, 0, 0);
-		break;
-
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/menu.txt
deleted file mode 100644
index 8f7208e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/menu.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|Lvm-storage
-...|Volume Admin|index.php?plugin=lvm-storage|Volume Admin
-...|About|index.php?plugin=lvm-storage&controller=lvm-storage-about|How to use
-...|Config|index.php?plugin=lvm-storage&controller=lvm-storage-about&lvm_storage_about_action=bootservice|LVM Storage Boot-Service
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-aoe-deployment-auth-hook.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-aoe-deployment-auth-hook.php
deleted file mode 100644
index 74ae0f6..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-aoe-deployment-auth-hook.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/image_authentication.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-
-/**
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- */
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $IMAGE_AUTHENTICATION_TABLE;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $openqrm_server;
-$event = new event();
-global $event;
-
-
-
-	//--------------------------------------------------
-	/**
-	* authenticates the storage volume for the appliance resource
-	* <code>
-	* storage_auth_function("start", 2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_function($cmd, $appliance_id) {
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-		global $IMAGE_AUTHENTICATION_TABLE;
-		global $openqrm_server;
-
-		$appliance = new appliance();
-		$appliance->get_instance_by_id($appliance_id);
-
-		$image = new image();
-		$image->get_instance_by_id($appliance->imageid);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-		// parse the rootdevice infos
-		$ident_separate=strpos($image_rootdevice, ":");
-		$volume_group=substr($image_rootdevice, 0, $ident_separate);
-		$image_rootdevice_rest=substr($image_rootdevice, $ident_separate+1);
-		$ident_separate2=strpos($image_rootdevice_rest, ":");
-		$image_location_name=substr($image_rootdevice_rest, 0, $ident_separate2);
-		$root_device=substr($image_rootdevice_rest, $ident_separate2+1);
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		$resource = new resource();
-		$resource->get_instance_by_id($appliance->resources);
-		$resource_mac=$resource->mac;
-		$resource_ip=$resource->ip;
-
-		switch($cmd) {
-			case "start":
-				// authenticate the rootfs / needs openqrm user + pass
-				$openqrm_admin_user = new user("openqrm");
-				$openqrm_admin_user->set_user();
-
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-aoe-deployment-auth-hook.php", "Authenticating $image_name / $image_rootdevice to resource $resource_mac", "", "", 0, 0, $appliance_id);
-				$auth_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$deployment_plugin_name."/bin/openqrm-".$deployment_plugin_name." auth -n ".$image_name." -r ".$image_rootdevice." -i ".$resource_mac." -t lvm-aoe-deployment -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-				$resource->send_command($storage_ip, $auth_start_cmd);
-
-				// give time to settle restart of openqrm-exec daemon
-				sleep(3);
-
-				// authenticate the install-from-nfs export
-				$run_disable_deployment_export=0;
-				$install_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_INSTALL_FROM_NFS"));
-				if (strlen($install_from_nfs_param)) {
-
-					// storage -> resource -> auth
-					$ip_storage_id=$deployment->parse_deployment_parameter("id", $install_from_nfs_param);
-					$ip_storage_ip=$deployment->parse_deployment_parameter("ip", $install_from_nfs_param);
-					$ip_image_rootdevice=$deployment->parse_deployment_parameter("path", $install_from_nfs_param);
-
-					$ip_storage = new storage();
-					$ip_storage->get_instance_by_id($ip_storage_id);
-					$ip_storage_resource = new resource();
-					$ip_storage_resource->get_instance_by_id($ip_storage->resource_id);
-					$op_storage_ip = $ip_storage_resource->ip;
-
-					$ip_deployment = new deployment();
-					$ip_deployment->get_instance_by_id($ip_storage->type);
-					$ip_deployment_type = $ip_deployment->type;
-					$ip_deployment_plugin_name = $ip_deployment->storagetype;
-
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-aoe-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $ip_storage_id:$ip_storage_ip:$ip_image_rootdevice", "", "", 0, 0, $appliance_id);
-					$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$ip_deployment_plugin_name."/bin/openqrm-".$ip_deployment_plugin_name." auth -r ".$ip_image_rootdevice." -i ".$resource_ip." -t ".$ip_deployment_type." --openqrm-cmd-mode background";
-					$resource->send_command($ip_storage_ip, $auth_install_from_nfs_start_cmd);
-
-					$run_disable_deployment_export=1;
-				}
-
-				// authenticate the transfer-to-nfs export
-				$transfer_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_TRANSFER_TO_NFS"));
-				if (strlen($transfer_from_nfs_param)) {
-					// storage -> resource -> auth
-					$tp_storage_id=$deployment->parse_deployment_parameter("id", $transfer_from_nfs_param);
-					$tp_storage_ip=$deployment->parse_deployment_parameter("ip", $transfer_from_nfs_param);
-					$tp_image_rootdevice=$deployment->parse_deployment_parameter("path", $transfer_from_nfs_param);
-
-					$tp_storage = new storage();
-					$tp_storage->get_instance_by_id($tp_storage_id);
-					$tp_storage_resource = new resource();
-					$tp_storage_resource->get_instance_by_id($tp_storage->resource_id);
-					$op_storage_ip = $tp_storage_resource->ip;
-
-					$tp_deployment = new deployment();
-					$tp_deployment->get_instance_by_id($tp_storage->type);
-					$tp_deployment_type = $tp_deployment->type;
-					$tp_deployment_plugin_name = $tp_deployment->storagetype;
-
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-aoe-deployment-auth-hook.php", "Transfer-to-NFS: Authenticating $resource_ip on storage id $tp_storage_id:$tp_storage_ip:$tp_image_rootdevice", "", "", 0, 0, $appliance_id);
-					$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$tp_deployment_plugin_name."/bin/openqrm-".$tp_deployment_plugin_name." auth -r ".$tp_image_rootdevice." -i ".$resource_ip." -t ".$tp_deployment_type." --openqrm-cmd-mode background";
-					$resource->send_command($tp_storage_ip, $auth_install_from_nfs_start_cmd);
-
-					$run_disable_deployment_export=1;
-				}
-
-				// do we need to disable the install-from/transfer-to-nfs exports ?
-				if ($run_disable_deployment_export == 1) {
-					$image_authentication = new image_authentication();
-					$ia_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$image_auth_ar = array(
-						'ia_id' => $ia_id,
-						'ia_image_id' => $appliance->imageid,
-						'ia_resource_id' => $appliance->resources,
-						'ia_auth_type' => 1,
-					);
-					$image_authentication->add($image_auth_ar);
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-aoe-deployment-auth-hook.php", "Registered image $appliance->imageid for de-authentication the deployment exports when resource $appliance->resources is fully up.", "", "", 0, 0, $appliance_id);
-				}
-
-				break;
-
-			case "stop":
-				$image_authentication = new image_authentication();
-				$ia_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$image_auth_ar = array(
-					'ia_id' => $ia_id,
-					'ia_image_id' => $appliance->imageid,
-					'ia_resource_id' => $appliance->resources,
-					'ia_auth_type' => 0,
-				);
-				$image_authentication->add($image_auth_ar);
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-aoe-deployment-auth-hook.php", "Registered image $appliance->imageid for de-authentication the root-fs exports when resource $appliance->resources is idle again.", "", "", 0, 0, $appliance_id);
-				break;
-
-		}
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage volume for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-		// parse the rootdevice infos
-		$ident_separate=strpos($image_rootdevice, ":");
-		$volume_group=substr($image_rootdevice, 0, $ident_separate);
-		$image_rootdevice_rest=substr($image_rootdevice, $ident_separate+1);
-		$ident_separate2=strpos($image_rootdevice_rest, ":");
-		$image_location_name=substr($image_rootdevice_rest, 0, $ident_separate2);
-		$root_device=substr($image_rootdevice_rest, $ident_separate2+1);
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		$auth_stop_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$deployment_plugin_name."/bin/openqrm-".$deployment_plugin_name." auth -r ".$image_rootdevice." -i 00:00:00:00:00:00  -t lvm-aoe-deployment --openqrm-cmd-mode background";
-		$resource = new resource();
-		$resource->send_command($storage_ip, $auth_stop_cmd);
-
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage deployment volumes for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_deployment_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_deployment_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		// just for sending the commands
-		$resource = new resource();
-
-		// get install deployment params
-		$install_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_INSTALL_FROM_NFS"));
-		if (strlen($install_from_nfs_param)) {
-			// storage -> resource -> auth
-			$ip_storage_id=$deployment->parse_deployment_parameter("id", $install_from_nfs_param);
-			$ip_storage_ip=$deployment->parse_deployment_parameter("ip", $install_from_nfs_param);
-			$ip_image_rootdevice=$deployment->parse_deployment_parameter("path", $install_from_nfs_param);
-
-			$ip_storage = new storage();
-			$ip_storage->get_instance_by_id($ip_storage_id);
-			$ip_storage_resource = new resource();
-			$ip_storage_resource->get_instance_by_id($ip_storage->resource_id);
-			$op_storage_ip = $ip_storage_resource->ip;
-
-			$ip_deployment = new deployment();
-			$ip_deployment->get_instance_by_id($ip_storage->type);
-			$ip_deployment_type = $ip_deployment->type;
-			$ip_deployment_plugin_name = $ip_deployment->storagetype;
-
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-aoe-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $ip_storage_id:$ip_storage_ip:$ip_image_rootdevice", "", "", 0, 0, $appliance_id);
-			$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$ip_deployment_plugin_name."/bin/openqrm-".$ip_deployment_plugin_name." auth -r ".$ip_image_rootdevice." -i ".$OPENQRM_SERVER_IP_ADDRESS." -t ".$ip_deployment_type." --openqrm-cmd-mode background";
-			$resource->send_command($ip_storage_ip, $auth_install_from_nfs_start_cmd);
-		}
-
-		// get transfer deployment params
-		$transfer_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_TRANSFER_TO_NFS"));
-		if (strlen($transfer_from_nfs_param)) {
-			// storage -> resource -> auth
-			$tp_storage_id=$deployment->parse_deployment_parameter("id", $transfer_from_nfs_param);
-			$tp_storage_ip=$deployment->parse_deployment_parameter("ip", $transfer_from_nfs_param);
-			$tp_image_rootdevice=$deployment->parse_deployment_parameter("path", $transfer_from_nfs_param);
-
-			$tp_storage = new storage();
-			$tp_storage->get_instance_by_id($tp_storage_id);
-			$tp_storage_resource = new resource();
-			$tp_storage_resource->get_instance_by_id($tp_storage->resource_id);
-			$op_storage_ip = $tp_storage_resource->ip;
-
-			$tp_deployment = new deployment();
-			$tp_deployment->get_instance_by_id($tp_storage->type);
-			$tp_deployment_type = $tp_deployment->type;
-			$tp_deployment_plugin_name = $tp_deployment->storagetype;
-
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-aoe-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $tp_storage_id:$tp_storage_ip:$tp_image_rootdevice", "", "", 0, 0, $appliance_id);
-			$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$tp_deployment_plugin_name."/bin/openqrm-".$tp_deployment_plugin_name." auth -r ".$tp_image_rootdevice." -i ".$OPENQRM_SERVER_IP_ADDRESS." -t ".$tp_deployment_type." --openqrm-cmd-mode background";
-			$resource->send_command($tp_storage_ip, $auth_install_from_nfs_start_cmd);
-		}
-
-	}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-aoe-deployment-cloud-hook.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-aoe-deployment-cloud-hook.php
deleted file mode 100644
index 205d903..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-aoe-deployment-cloud-hook.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This file implements the cloud storage methods
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-// special cloud classes
-require_once "$RootDir/plugins/cloud/class/cloudimage.class.php";
-
-$event = new event();
-global $event;
-
-global $OPENQRM_SERVER_BASE_DIR;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $RESOURCE_INFO_TABLE;
-$BaseDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/';
-
-// ---------------------------------------------------------------------------------
-// general cloudstorage methods
-// ---------------------------------------------------------------------------------
-
-
-// clones the volume of an image
-function create_clone_lvm_aoe_deployment($cloud_image_id, $image_clone_name, $disk_size) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	global $BaseDir;
-	$event->log("create_clone", $_SERVER['REQUEST_TIME'], 5, "lvm-aoe-deployment-cloud-hook", "Creating clone of image on storage", "", "", 0, 0, 0);
-
-	// we got the cloudimage id here, get the image out of it
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image, this is already the new logical clone
-	// we just need to physical snapshot it and update the rootdevice
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-
-	// parse the volume group info in the identifier
-	$ident_separate=strpos($image_rootdevice, ":");
-	$volume_group=substr($image_rootdevice, 0, $ident_separate);
-	$image_rootdevice_rest=substr($image_rootdevice, $ident_separate+1);
-	$ident_separate2=strpos($image_rootdevice_rest, ":");
-	$image_location_name=substr($image_rootdevice_rest, 0, $ident_separate2);
-	$root_device=substr($image_rootdevice_rest, $ident_separate2+1);
-	// set default snapshot size
-	if (!strlen($disk_size)) {
-		$disk_size=5000;
-	}
-	$image_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/lvm-storage/bin/openqrm-lvm-storage snap -n ".$image_location_name." -v ".$volume_group." -t lvm-aoe-deployment -s ".$image_clone_name." -m ".$disk_size." --openqrm-cmd-mode background";
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "lvm-aoe-deployment-cloud-hook", "Running : $image_clone_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_clone_cmd);
-	// wait for clone
-	sleep(4);
-	// find the new rootdevice of the snapshot, get it via the storage-ident hook
-	$rootdevice_identifier_hook = "$BaseDir/boot-service/image.lvm-aoe-deployment.php";
-	// require once
-	require_once "$rootdevice_identifier_hook";
-	$rootdevice_identifier_arr = array();
-	$rootdevice_identifier_arr = get_lvm_aoe_deployment_image_rootdevice_identifier($image->storageid);
-	foreach($rootdevice_identifier_arr as $id) {
-		foreach($id as $aoe_identifier_string) {
-			if (strstr($aoe_identifier_string, $image_clone_name)) {
-				$aoe_clone_rootdevice_tmp=strrchr($aoe_identifier_string, ":");
-				$aoe_clone_rootdevice=trim(str_replace(":", "", $aoe_clone_rootdevice_tmp));
-				break;
-			}
-		}
-	}
-	// update the image rootdevice parameter
-	$ar_image_update = array(
-		'image_rootdevice' => "$volume_group:$image_clone_name:$aoe_clone_rootdevice",
-	);
-	$image->update($image_id, $ar_image_update);
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "lvm-aoe-deployment-cloud-hook", "Updating rootdevice of image $image_id / $image_name with $volume_group:$image_clone_name:$aoe_clone_rootdevice", "", "", 0, 0, 0);
-}
-
-
-
-// removes the volume of an image
-function remove_lvm_aoe_deployment($cloud_image_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("remove_lvm_aoe_deployment", $_SERVER['REQUEST_TIME'], 5, "lvm-aoe-deployment-cloud-hook", "Removing image on storage", "", "", 0, 0, 0);
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-
-	// parse the volume group info in the identifier
-	$ident_separate=strpos($image_rootdevice, ":");
-	$volume_group=substr($image_rootdevice, 0, $ident_separate);
-	$image_rootdevice_rest=substr($image_rootdevice, $ident_separate+1);
-	$ident_separate2=strpos($image_rootdevice_rest, ":");
-	$image_location_name=substr($image_rootdevice_rest, 0, $ident_separate2);
-	$root_device=substr($image_rootdevice_rest, $ident_separate2+1);
-	$image_remove_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/lvm-storage/bin/openqrm-lvm-storage remove -n ".$image_location_name." -v ".$volume_group." -t lvm-aoe-deployment --openqrm-cmd-mode background";
-	$event->log("remove_lvm_aoe_deployment", $_SERVER['REQUEST_TIME'], 5, "lvm-aoe-deployment-cloud-hook", "Running : $image_remove_clone_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_remove_clone_cmd);
-}
-
-
-// resizes the volume of an image
-function resize_lvm_aoe_deployment($cloud_image_id, $resize_value) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("resize_lvm_aoe_deployment", $_SERVER['REQUEST_TIME'], 5, "lvm-aoe-deployment-cloud-hook", "Resize image on storage", "", "", 0, 0, 0);
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-
-	// parse the volume group info in the identifier
-	$ident_separate=strpos($image_rootdevice, ":");
-	$volume_group=substr($image_rootdevice, 0, $ident_separate);
-	$image_rootdevice_rest=substr($image_rootdevice, $ident_separate+1);
-	$ident_separate2=strpos($image_rootdevice_rest, ":");
-	$image_location_name=substr($image_rootdevice_rest, 0, $ident_separate2);
-	$root_device=substr($image_rootdevice_rest, $ident_separate2+1);
-	$image_resize_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/lvm-storage/bin/openqrm-lvm-storage resize -n ".$image_location_name." -v ".$volume_group." -m ".$resize_value." -t lvm-aoe-deployment --openqrm-cmd-mode background";
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "lvm-aoe-deployment-cloud-hook", "Running : $image_resize_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_resize_cmd);
-}
-
-
-
-// creates a private copy of the volume of an image
-function create_private_lvm_aoe_deployment($cloud_image_id, $private_disk, $private_image_name) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("create_private_lvm_aoe_deployment", $_SERVER['REQUEST_TIME'], 5, "lvm-aoe-deployment-cloud-hook", "Creating private image on storage", "", "", 0, 0, 0);
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// create an admin user to post when cloning has finished
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-	// parse the volume group info in the identifier
-	$ident_separate=strpos($image_rootdevice, ":");
-	$volume_group=substr($image_rootdevice, 0, $ident_separate);
-	$image_rootdevice_rest=substr($image_rootdevice, $ident_separate+1);
-	$ident_separate2=strpos($image_rootdevice_rest, ":");
-	$image_location_name=substr($image_rootdevice_rest, 0, $ident_separate2);
-	$root_device=substr($image_rootdevice_rest, $ident_separate2+1);
-	$image_resize_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/lvm-storage/bin/openqrm-lvm-storage clone -n ".$image_location_name." -s ".$private_image_name." -v ".$volume_group." -m ".$private_disk." -t lvm-aoe-deployment -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "lvm-aoe-deployment-cloud-hook", "Running : $image_resize_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_resize_cmd);
-	// set the storage specific image root_device parameter
-	$new_rootdevice = str_replace($image_location_name, $private_image_name, $image->rootdevice);
-	return $new_rootdevice;
-}
-
-
-
-// ---------------------------------------------------------------------------------
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-iscsi-deployment-auth-hook.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-iscsi-deployment-auth-hook.php
deleted file mode 100644
index 5a6b97c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-iscsi-deployment-auth-hook.php
+++ /dev/null
@@ -1,342 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
- /*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/image_authentication.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-
-/**
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- */
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $IMAGE_AUTHENTICATION_TABLE;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $openqrm_server;
-$event = new event();
-global $event;
-
-
-	//--------------------------------------------------
-	/**
-	* authenticates the storage volume for the appliance resource
-	* <code>
-	* storage_auth_function("start", 2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_function($cmd, $appliance_id) {
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-		global $IMAGE_AUTHENTICATION_TABLE;
-		global $openqrm_server;
-
-		$appliance = new appliance();
-		$appliance->get_instance_by_id($appliance_id);
-
-		$image = new image();
-		$image->get_instance_by_id($appliance->imageid);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-		// parse the volume group info in the identifier
-		$ident_separate=strpos($image_rootdevice, ":");
-		$volume_group=substr($image_rootdevice, 0, $ident_separate);
-		$root_device=substr($image_rootdevice, $ident_separate);
-		$image_location=dirname($root_device);
-		$image_location_name=basename($image_location);
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		$resource = new resource();
-		$resource->get_instance_by_id($appliance->resources);
-		$resource_mac=$resource->mac;
-		$resource_ip=$resource->ip;
-
-		switch($cmd) {
-			case "start":
-				// authenticate the rootfs / needs openqrm user + pass
-				$openqrm_admin_user = new user("openqrm");
-				$openqrm_admin_user->set_user();
-
-				// generate a password for the image
-				$image_password = $image->generatePassword(12);
-				$image_deployment_parameter = $image->deployment_parameter;
-				$image->set_deployment_parameters("IMAGE_ISCSI_AUTH", $image_password);
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-iscsi-deployment-auth-hook.php", "Authenticating $image_name / $image_location_name to resource $resource_mac", "", "", 0, 0, $appliance_id);
-				$auth_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$deployment_plugin_name."/bin/openqrm-".$deployment_plugin_name." auth -n ".$image_name." -r /dev/".$volume_group."/".$image_location_name." -i ".$image_password." -t lvm-iscsi-deployment -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-				$resource->send_command($storage_ip, $auth_start_cmd);
-
-				// authenticate the install-from-nfs export
-				$run_disable_deployment_export=0;
-				$install_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_INSTALL_FROM_NFS"));
-				if (strlen($install_from_nfs_param)) {
-
-					// storage -> resource -> auth
-					$ip_storage_id=$deployment->parse_deployment_parameter("id", $install_from_nfs_param);
-					$ip_storage_ip=$deployment->parse_deployment_parameter("ip", $install_from_nfs_param);
-					$ip_image_rootdevice=$deployment->parse_deployment_parameter("path", $install_from_nfs_param);
-
-					$ip_storage = new storage();
-					$ip_storage->get_instance_by_id($ip_storage_id);
-					$ip_storage_resource = new resource();
-					$ip_storage_resource->get_instance_by_id($ip_storage->resource_id);
-					$op_storage_ip = $ip_storage_resource->ip;
-
-					$ip_deployment = new deployment();
-					$ip_deployment->get_instance_by_id($ip_storage->type);
-					$ip_deployment_type = $ip_deployment->type;
-					$ip_deployment_plugin_name = $ip_deployment->storagetype;
-
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-iscsi-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $ip_storage_id:$ip_storage_ip:$ip_image_rootdevice", "", "", 0, 0, $appliance_id);
-					$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$ip_deployment_plugin_name."/bin/openqrm-".$ip_deployment_plugin_name." auth -r ".$ip_image_rootdevice." -i ".$resource_ip." -t ".$ip_deployment_type." --openqrm-cmd-mode background";
-					$resource->send_command($ip_storage_ip, $auth_install_from_nfs_start_cmd);
-
-					$run_disable_deployment_export=1;
-				}
-
-				// authenticate the transfer-to-nfs export
-				$transfer_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_TRANSFER_TO_NFS"));
-				if (strlen($transfer_from_nfs_param)) {
-					// storage -> resource -> auth
-					$tp_storage_id=$deployment->parse_deployment_parameter("id", $transfer_from_nfs_param);
-					$tp_storage_ip=$deployment->parse_deployment_parameter("ip", $transfer_from_nfs_param);
-					$tp_image_rootdevice=$deployment->parse_deployment_parameter("path", $transfer_from_nfs_param);
-
-					$tp_storage = new storage();
-					$tp_storage->get_instance_by_id($tp_storage_id);
-					$tp_storage_resource = new resource();
-					$tp_storage_resource->get_instance_by_id($tp_storage->resource_id);
-					$op_storage_ip = $tp_storage_resource->ip;
-
-					$tp_deployment = new deployment();
-					$tp_deployment->get_instance_by_id($tp_storage->type);
-					$tp_deployment_type = $tp_deployment->type;
-					$tp_deployment_plugin_name = $tp_deployment->storagetype;
-
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-iscsi-deployment-auth-hook.php", "Transfer-to-NFS: Authenticating $resource_ip on storage id $tp_storage_id:$tp_storage_ip:$tp_image_rootdevice", "", "", 0, 0, $appliance_id);
-					$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$tp_deployment_plugin_name."/bin/openqrm-".$tp_deployment_plugin_name." auth -r ".$tp_image_rootdevice." -i ".$resource_ip." -t ".$tp_deployment_type." --openqrm-cmd-mode background";
-					$resource->send_command($tp_storage_ip, $auth_install_from_nfs_start_cmd);
-
-					$run_disable_deployment_export=1;
-				}
-
-				// do we need to disable the install-from/transfer-to-nfs exports ?
-				if ($run_disable_deployment_export == 1) {
-					$image_authentication = new image_authentication();
-					$ia_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$image_auth_ar = array(
-						'ia_id' => $ia_id,
-						'ia_image_id' => $appliance->imageid,
-						'ia_resource_id' => $appliance->resources,
-						'ia_auth_type' => 1,
-					);
-					$image_authentication->add($image_auth_ar);
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-iscsi-deployment-auth-hook.php", "Registered image $appliance->imageid for de-authentication the deployment exports when resource $appliance->resources is fully up.", "", "", 0, 0, $appliance_id);
-				}
-
-				break;
-
-			case "stop":
-				$image_authentication = new image_authentication();
-				$ia_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$image_auth_ar = array(
-					'ia_id' => $ia_id,
-					'ia_image_id' => $appliance->imageid,
-					'ia_resource_id' => $appliance->resources,
-					'ia_auth_type' => 0,
-				);
-				$image_authentication->add($image_auth_ar);
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-iscsi-deployment-auth-hook.php", "Registered image $appliance->imageid for de-authentication the root-fs exports when resource $appliance->resources is idle again.", "", "", 0, 0, $appliance_id);
-				break;
-
-		}
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage volume for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-		// generate a password for the image
-		$image_password = $image->generatePassword(12);
-		$image_deployment_parameter = $image->deployment_parameter;
-		// parse the volume group info in the identifier
-		$ident_separate=strpos($image_rootdevice, ":");
-		$volume_group=substr($image_rootdevice, 0, $ident_separate);
-		$root_device=substr($image_rootdevice, $ident_separate);
-		$image_location=dirname($root_device);
-		$image_location_name=basename($image_location);
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		$auth_stop_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$deployment_plugin_name."/bin/openqrm-".$deployment_plugin_name." auth -r /dev/".$volume_group."/".$image_location_name." -i ".$image_password." -t lvm-iscsi-deployment --openqrm-cmd-mode background";
-		$resource = new resource();
-		$resource->send_command($storage_ip, $auth_stop_cmd);
-		// and update the image params
-		$image->set_deployment_parameters("IMAGE_ISCSI_AUTH", $image_password);
-
-	}
-
-
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage deployment volumes for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_deployment_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_deployment_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		// just for sending the commands
-		$resource = new resource();
-
-		// get install deployment params
-		$install_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_INSTALL_FROM_NFS"));
-		if (strlen($install_from_nfs_param)) {
-			// storage -> resource -> auth
-			$ip_storage_id=$deployment->parse_deployment_parameter("id", $install_from_nfs_param);
-			$ip_storage_ip=$deployment->parse_deployment_parameter("ip", $install_from_nfs_param);
-			$ip_image_rootdevice=$deployment->parse_deployment_parameter("path", $install_from_nfs_param);
-
-			$ip_storage = new storage();
-			$ip_storage->get_instance_by_id($ip_storage_id);
-			$ip_storage_resource = new resource();
-			$ip_storage_resource->get_instance_by_id($ip_storage->resource_id);
-			$op_storage_ip = $ip_storage_resource->ip;
-
-			$ip_deployment = new deployment();
-			$ip_deployment->get_instance_by_id($ip_storage->type);
-			$ip_deployment_type = $ip_deployment->type;
-			$ip_deployment_plugin_name = $ip_deployment->storagetype;
-
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-iscsi-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $ip_storage_id:$ip_storage_ip:$ip_image_rootdevice", "", "", 0, 0, $appliance_id);
-			$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$ip_deployment_plugin_name."/bin/openqrm-".$ip_deployment_plugin_name." auth -r ".$ip_image_rootdevice." -i ".$OPENQRM_SERVER_IP_ADDRESS." -t ".$ip_deployment_type." --openqrm-cmd-mode background";
-			$resource->send_command($ip_storage_ip, $auth_install_from_nfs_start_cmd);
-		}
-
-		// get transfer deployment params
-		$transfer_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_TRANSFER_TO_NFS"));
-		if (strlen($transfer_from_nfs_param)) {
-			// storage -> resource -> auth
-			$tp_storage_id=$deployment->parse_deployment_parameter("id", $transfer_from_nfs_param);
-			$tp_storage_ip=$deployment->parse_deployment_parameter("ip", $transfer_from_nfs_param);
-			$tp_image_rootdevice=$deployment->parse_deployment_parameter("path", $transfer_from_nfs_param);
-
-			$tp_storage = new storage();
-			$tp_storage->get_instance_by_id($tp_storage_id);
-			$tp_storage_resource = new resource();
-			$tp_storage_resource->get_instance_by_id($tp_storage->resource_id);
-			$op_storage_ip = $tp_storage_resource->ip;
-
-			$tp_deployment = new deployment();
-			$tp_deployment->get_instance_by_id($tp_storage->type);
-			$tp_deployment_type = $tp_deployment->type;
-			$tp_deployment_plugin_name = $tp_deployment->storagetype;
-
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-iscsi-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $tp_storage_id:$tp_storage_ip:$tp_image_rootdevice", "", "", 0, 0, $appliance_id);
-			$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$tp_deployment_plugin_name."/bin/openqrm-".$tp_deployment_plugin_name." auth -r ".$tp_image_rootdevice." -i ".$OPENQRM_SERVER_IP_ADDRESS." -t ".$tp_deployment_type." --openqrm-cmd-mode background";
-			$resource->send_command($tp_storage_ip, $auth_install_from_nfs_start_cmd);
-		}
-
-	}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-iscsi-deployment-cloud-hook.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-iscsi-deployment-cloud-hook.php
deleted file mode 100644
index 484247d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-iscsi-deployment-cloud-hook.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This file implements the cloud storage methods
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-// special cloud classes
-require_once "$RootDir/plugins/cloud/class/cloudimage.class.php";
-
-$event = new event();
-global $event;
-
-global $OPENQRM_SERVER_BASE_DIR;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $RESOURCE_INFO_TABLE;
-
-
-// ---------------------------------------------------------------------------------
-// general cloudstorage methods
-// ---------------------------------------------------------------------------------
-
-
-// clones the volume of an image
-function create_clone_lvm_iscsi_deployment($cloud_image_id, $image_clone_name, $disk_size) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("create_clone", $_SERVER['REQUEST_TIME'], 5, "lvm-iscsi-deployment-cloud-hook", "Creating clone of image on storage", "", "", 0, 0, 0);
-
-	// we got the cloudimage id here, get the image out of it
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image, this is already the new logical clone
-	// we just need to physical snapshot it and update the rootdevice
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-
-	// generate a new image password for the clone
-	$image_password = $image->generatePassword(12);
-	$image->set_deployment_parameters("IMAGE_ISCSI_AUTH", $image_password);
-	// parse the volume group info in the identifier
-	$ident_separate=strpos($image_rootdevice, ":");
-	$volume_group=substr($image_rootdevice, 0, $ident_separate);
-	$root_device=substr($image_rootdevice, $ident_separate);
-	$image_location=dirname($root_device);
-	$image_location_name=basename($image_location);
-	// set default snapshot size
-	if (!strlen($disk_size)) {
-		$disk_size=5000;
-	}
-
-	// update the image rootdevice parameter
-	$ar_image_update = array(
-		'image_rootdevice' => "$volume_group:/dev/$image_clone_name/1",
-	);
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "lvm-iscsi-deployment-cloud-hook", "Updating rootdevice of image $image_id / $image_name with $volume_group:/dev/$image_clone_name/1", "", "", 0, 0, 0);
-	$image->update($image_id, $ar_image_update);
-	// send command
-	$image_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/lvm-storage/bin/openqrm-lvm-storage snap -n ".$image_location_name." -v ".$volume_group." -t lvm-iscsi-deployment -s ".$image_clone_name." -m ".$disk_size." -i ".$image_password." --openqrm-cmd-mode background";
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "lvm-iscsi-deployment-cloud-hook", "Running : $image_clone_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_clone_cmd);
-}
-
-
-
-// removes the volume of an image
-function remove_lvm_iscsi_deployment($cloud_image_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("remove_lvm_iscsi_deployment", $_SERVER['REQUEST_TIME'], 5, "lvm-iscsi-deployment-cloud-hook", "Removing image on storage", "", "", 0, 0, 0);
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// parse the volume group info in the identifier
-	$ident_separate=strpos($image_rootdevice, ":");
-	$volume_group=substr($image_rootdevice, 0, $ident_separate);
-	$root_device=substr($image_rootdevice, $ident_separate);
-	$image_location=dirname($root_device);
-	$image_location_name=basename($image_location);
-	$image_remove_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/lvm-storage/bin/openqrm-lvm-storage remove -n ".$image_location_name." -v ".$volume_group." -t lvm-iscsi-deployment --openqrm-cmd-mode background";
-	$event->log("remove_lvm_iscsi_deployment", $_SERVER['REQUEST_TIME'], 5, "lvm-iscsi-deployment-cloud-hook", "Running : $image_remove_clone_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_remove_clone_cmd);
-}
-
-
-// resizes the volume of an image
-function resize_lvm_iscsi_deployment($cloud_image_id, $resize_value) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("resize_lvm_iscsi_deployment", $_SERVER['REQUEST_TIME'], 5, "lvm-iscsi-deployment-cloud-hook", "Resize image on storage", "", "", 0, 0, 0);
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// parse the volume group info in the identifier
-	$ident_separate=strpos($image_rootdevice, ":");
-	$volume_group=substr($image_rootdevice, 0, $ident_separate);
-	$root_device=substr($image_rootdevice, $ident_separate);
-	$image_location=dirname($root_device);
-	$image_location_name=basename($image_location);
-	$image_resize_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/lvm-storage/bin/openqrm-lvm-storage resize -n ".$image_location_name." -v ".$volume_group." -m ".$resize_value." -t lvm-iscsi-deployment --openqrm-cmd-mode background";
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "lvm-iscsi-deployment-cloud-hook", "Running : $image_resize_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_resize_cmd);
-}
-
-
-
-// creates a private copy of the volume of an image
-function create_private_lvm_iscsi_deployment($cloud_image_id, $private_disk, $private_image_name) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("create_private_lvm_iscsi_deployment", $_SERVER['REQUEST_TIME'], 5, "lvm-iscsi-deployment-cloud-hook", "Creating private image on storage", "", "", 0, 0, 0);
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// create an admin user to post when cloning has finished
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-
-	// parse the volume group info in the identifier
-	$ident_separate=strpos($image_rootdevice, ":");
-	$volume_group=substr($image_rootdevice, 0, $ident_separate);
-	$root_device=substr($image_rootdevice, $ident_separate);
-	$image_location=dirname($root_device);
-	$image_location_name=basename($image_location);
-	$image_resize_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/lvm-storage/bin/openqrm-lvm-storage clone -n ".$image_location_name." -s ".$private_image_name." -v ".$volume_group." -m ".$private_disk." -t lvm-iscsi-deployment -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "lvm-iscsi-deployment-cloud-hook", "Running : $image_resize_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_resize_cmd);
-	// set the storage specific image root_device parameter
-	$new_rootdevice = str_replace($image_location_name, $private_image_name, $image->rootdevice);
-	return $new_rootdevice;
-}
-
-
-
-// ---------------------------------------------------------------------------------
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-nfs-deployment-auth-hook.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-nfs-deployment-auth-hook.php
deleted file mode 100644
index 3499577..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-nfs-deployment-auth-hook.php
+++ /dev/null
@@ -1,350 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
- /*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/image_authentication.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-
-/**
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- */
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $IMAGE_AUTHENTICATION_TABLE;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $openqrm_server;
-$event = new event();
-global $event;
-
-
-
-	//--------------------------------------------------
-	/**
-	* authenticates the storage volume for the appliance resource
-	* <code>
-	* storage_auth_function("start", 2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_function($cmd, $appliance_id) {
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-		global $IMAGE_AUTHENTICATION_TABLE;
-		global $openqrm_server;
-		global $RootDir;
-
-		$appliance = new appliance();
-		$appliance->get_instance_by_id($appliance_id);
-
-		$image = new image();
-		$image->get_instance_by_id($appliance->imageid);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		$resource = new resource();
-		$resource->get_instance_by_id($appliance->resources);
-		$resource_mac=$resource->mac;
-		$resource_ip=$resource->ip;
-
-		// this is a hook for the cloud-plugin to be able
-		// to translate the internal to the external ip address
-		// for the nfs-mount authentication
-/*        if (file_exists("$RootDir/plugins/cloud/.running")) {
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-nfs-deployment-auth-hook.php", "Found Cloud enabled and running. Checking for CloudNAT", "", "", 0, 0, $appliance_id);
-			// special clouduser class
-			require_once "$RootDir/plugins/cloud/class/cloudconfig.class.php";
-			require_once "$RootDir/plugins/cloud/class/cloudnat.class.php";
-			// check if we have to cloudnat the ip address
-			$cn_conf = new cloudconfig();
-			$cn_nat_enabled = $cn_conf->get_value(18);  // 18 is cloud_nat
-			if (!strcmp($cn_nat_enabled, "true")) {
-				$cn = new cloudnat();
-				$internal_resource_ip=$resource_ip;
-				$resource_ip = $cn->translate($resource_ip);
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-nfs-deployment-auth-hook.php", "Found CloudNAT enabled, translated $internal_resource_ip to $resource_ip", "", "", 0, 0, $appliance_id);
-			} else {
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-nfs-deployment-auth-hook.php", "Cloudnat is disabled, keeping $resource_ip", "", "", 0, 0, $appliance_id);
-			}
-		} else {
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-nfs-deployment-auth-hook.php", "Cloud is not enabled/running. Not checking for CloudNAT", "", "", 0, 0, $appliance_id);
-
-		}
-*/
-
-		switch($cmd) {
-			case "start":
-				// authenticate the rootfs / needs openqrm user + pass
-				$openqrm_admin_user = new user("openqrm");
-				$openqrm_admin_user->set_user();
-
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-nfs-deployment-auth-hook.php", "Authenticating $image_name / $image_rootdevice to resource $resource_ip", "", "", 0, 0, $appliance_id);
-				$auth_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$deployment_plugin_name."/bin/openqrm-".$deployment_plugin_name." auth -n ".$image_name." -r ".$image_rootdevice." -i ".$resource_ip." -t lvm-nfs-deployment -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-				$resource->send_command($storage_ip, $auth_start_cmd);
-
-				// authenticate the install-from-nfs export
-				$run_disable_deployment_export=0;
-				$install_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_INSTALL_FROM_NFS"));
-				if (strlen($install_from_nfs_param)) {
-
-					// storage -> resource -> auth
-					$ip_storage_id=$deployment->parse_deployment_parameter("id", $install_from_nfs_param);
-					$ip_storage_ip=$deployment->parse_deployment_parameter("ip", $install_from_nfs_param);
-					$ip_image_rootdevice=$deployment->parse_deployment_parameter("path", $install_from_nfs_param);
-
-					$ip_storage = new storage();
-					$ip_storage->get_instance_by_id($ip_storage_id);
-					$ip_storage_resource = new resource();
-					$ip_storage_resource->get_instance_by_id($ip_storage->resource_id);
-					$op_storage_ip = $ip_storage_resource->ip;
-
-					$ip_deployment = new deployment();
-					$ip_deployment->get_instance_by_id($ip_storage->type);
-					$ip_deployment_type = $ip_deployment->type;
-					$ip_deployment_plugin_name = $ip_deployment->storagetype;
-
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-nfs-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $ip_storage_id:$ip_storage_ip:$ip_image_rootdevice", "", "", 0, 0, $appliance_id);
-					$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$ip_deployment_plugin_name."/bin/openqrm-".$ip_deployment_plugin_name." auth -r ".$ip_image_rootdevice." -i ".$resource_ip." -t ".$ip_deployment_type." --openqrm-cmd-mode background";
-					$resource->send_command($ip_storage_ip, $auth_install_from_nfs_start_cmd);
-
-					$run_disable_deployment_export=1;
-				}
-
-				// authenticate the transfer-to-nfs export
-				$transfer_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_TRANSFER_TO_NFS"));
-				if (strlen($transfer_from_nfs_param)) {
-					// storage -> resource -> auth
-					$tp_storage_id=$deployment->parse_deployment_parameter("id", $transfer_from_nfs_param);
-					$tp_storage_ip=$deployment->parse_deployment_parameter("ip", $transfer_from_nfs_param);
-					$tp_image_rootdevice=$deployment->parse_deployment_parameter("path", $transfer_from_nfs_param);
-
-					$tp_storage = new storage();
-					$tp_storage->get_instance_by_id($tp_storage_id);
-					$tp_storage_resource = new resource();
-					$tp_storage_resource->get_instance_by_id($tp_storage->resource_id);
-					$op_storage_ip = $tp_storage_resource->ip;
-
-					$tp_deployment = new deployment();
-					$tp_deployment->get_instance_by_id($tp_storage->type);
-					$tp_deployment_type = $tp_deployment->type;
-					$tp_deployment_plugin_name = $tp_deployment->storagetype;
-
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-nfs-deployment-auth-hook.php", "Transfer-to-NFS: Authenticating $resource_ip on storage id $tp_storage_id:$tp_storage_ip:$tp_image_rootdevice", "", "", 0, 0, $appliance_id);
-					$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$tp_deployment_plugin_name."/bin/openqrm-".$tp_deployment_plugin_name." auth -r ".$tp_image_rootdevice." -i ".$resource_ip." -t ".$tp_deployment_type." --openqrm-cmd-mode background";
-					$resource->send_command($tp_storage_ip, $auth_install_from_nfs_start_cmd);
-
-					$run_disable_deployment_export=1;
-				}
-
-				// do we need to disable the install-from/transfer-to-nfs exports ?
-				if ($run_disable_deployment_export == 1) {
-					$image_authentication = new image_authentication();
-					$ia_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$image_auth_ar = array(
-						'ia_id' => $ia_id,
-						'ia_image_id' => $appliance->imageid,
-						'ia_resource_id' => $appliance->resources,
-						'ia_auth_type' => 1,
-					);
-					$image_authentication->add($image_auth_ar);
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-nfs-deployment-auth-hook.php", "Registered image $appliance->imageid for de-authentication the deployment exports when resource $appliance->resources is fully up.", "", "", 0, 0, $appliance_id);
-				}
-
-
-
-				break;
-			case "stop":
-				$image_authentication = new image_authentication();
-				$ia_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$image_auth_ar = array(
-					'ia_id' => $ia_id,
-					'ia_image_id' => $appliance->imageid,
-					'ia_resource_id' => $appliance->resources,
-					'ia_auth_type' => 0,
-				);
-				$image_authentication->add($image_auth_ar);
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-nfs-deployment-auth-hook.php", "Registered image $appliance->imageid for de-authentication the root-fs exports when resource $appliance->resources is idle again.", "", "", 0, 0, $appliance_id);
-				break;
-
-		}
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage volume for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		$auth_stop_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$deployment_plugin_name."/bin/openqrm-".$deployment_plugin_name." auth -r ".$image_rootdevice." -i ".$OPENQRM_SERVER_IP_ADDRESS." -t lvm-nfs-deployment --openqrm-cmd-mode background";
-		$resource = new resource();
-		$resource->send_command($storage_ip, $auth_stop_cmd);
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage deployment volumes for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_deployment_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_deployment_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		// just for sending the commands
-		$resource = new resource();
-
-		// get install deployment params
-		$install_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_INSTALL_FROM_NFS"));
-		if (strlen($install_from_nfs_param)) {
-			// storage -> resource -> auth
-			$ip_storage_id=$deployment->parse_deployment_parameter("id", $install_from_nfs_param);
-			$ip_storage_ip=$deployment->parse_deployment_parameter("ip", $install_from_nfs_param);
-			$ip_image_rootdevice=$deployment->parse_deployment_parameter("path", $install_from_nfs_param);
-
-			$ip_storage = new storage();
-			$ip_storage->get_instance_by_id($ip_storage_id);
-			$ip_storage_resource = new resource();
-			$ip_storage_resource->get_instance_by_id($ip_storage->resource_id);
-			$op_storage_ip = $ip_storage_resource->ip;
-
-			$ip_deployment = new deployment();
-			$ip_deployment->get_instance_by_id($ip_storage->type);
-			$ip_deployment_type = $ip_deployment->type;
-			$ip_deployment_plugin_name = $ip_deployment->storagetype;
-
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-nfs-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $ip_storage_id:$ip_storage_ip:$ip_image_rootdevice", "", "", 0, 0, $resource_id);
-			$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$ip_deployment_plugin_name."/bin/openqrm-".$ip_deployment_plugin_name." auth -r ".$ip_image_rootdevice." -i ".$OPENQRM_SERVER_IP_ADDRESS." -t ".$ip_deployment_type." --openqrm-cmd-mode background";
-			$resource->send_command($ip_storage_ip, $auth_install_from_nfs_start_cmd);
-		}
-
-		// get transfer deployment params
-		$transfer_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_TRANSFER_TO_NFS"));
-		if (strlen($transfer_from_nfs_param)) {
-			// storage -> resource -> auth
-			$tp_storage_id=$deployment->parse_deployment_parameter("id", $transfer_from_nfs_param);
-			$tp_storage_ip=$deployment->parse_deployment_parameter("ip", $transfer_from_nfs_param);
-			$tp_image_rootdevice=$deployment->parse_deployment_parameter("path", $transfer_from_nfs_param);
-
-			$tp_storage = new storage();
-			$tp_storage->get_instance_by_id($tp_storage_id);
-			$tp_storage_resource = new resource();
-			$tp_storage_resource->get_instance_by_id($tp_storage->resource_id);
-			$op_storage_ip = $tp_storage_resource->ip;
-
-			$tp_deployment = new deployment();
-			$tp_deployment->get_instance_by_id($tp_storage->type);
-			$tp_deployment_type = $tp_deployment->type;
-			$tp_deployment_plugin_name = $tp_deployment->storagetype;
-
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lvm-nfs-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $tp_storage_id:$tp_storage_ip:$tp_image_rootdevice", "", "", 0, 0, $resource_id);
-			$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$tp_deployment_plugin_name."/bin/openqrm-".$tp_deployment_plugin_name." auth -r ".$tp_image_rootdevice." -i ".$OPENQRM_SERVER_IP_ADDRESS." -t ".$tp_deployment_type." --openqrm-cmd-mode background";
-			$resource->send_command($tp_storage_ip, $auth_install_from_nfs_start_cmd);
-		}
-
-	}
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-nfs-deployment-cloud-hook.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-nfs-deployment-cloud-hook.php
deleted file mode 100644
index 9206d3e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/openqrm-lvm-nfs-deployment-cloud-hook.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This file implements the cloud storage methods
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-// special cloud classes
-require_once "$RootDir/plugins/cloud/class/cloudimage.class.php";
-
-$event = new event();
-global $event;
-
-global $OPENQRM_SERVER_BASE_DIR;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $RESOURCE_INFO_TABLE;
-
-
-// ---------------------------------------------------------------------------------
-// general cloudstorage methods
-// ---------------------------------------------------------------------------------
-
-
-// clones the volume of an image
-function create_clone_lvm_nfs_deployment($cloud_image_id, $image_clone_name, $disk_size) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("create_clone", $_SERVER['REQUEST_TIME'], 5, "lvm-nfs-deployment-cloud-hook", "Creating clone of image on storage", "", "", 0, 0, 0);
-
-	// we got the cloudimage id here, get the image out of it
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image, this is already the new logical clone
-	// we just need to physical snapshot it and update the rootdevice
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-
-	$full_vol_name=$image_rootdevice;
-	$vol_dir=dirname($full_vol_name);
-	$vol=str_replace("/", "", $vol_dir);
-	$image_location_name=basename($full_vol_name);
-	// set default snapshot size
-	if (!strlen($disk_size)) {
-		$disk_size=5000;
-	}
-	// update the image rootdevice parameter
-	$image->get_instance_by_id($image_id);
-	$ar_image_update = array(
-		'image_rootdevice' => "/$vol/$image_clone_name",
-	);
-	$image->update($image_id, $ar_image_update);
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "lvm-nfs-deployment-cloud-hook", "Updating rootdevice of image $image_id / $image_name with /$vol/$image_clone_name", "", "", 0, 0, 0);
-	$image_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/lvm-storage/bin/openqrm-lvm-storage snap -n ".$image_location_name." -v ".$vol." -t lvm-nfs-deployment -s ".$image_clone_name." -m ".$disk_size." --openqrm-cmd-mode background";
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "lvm-nfs-deployment-cloud-hook", "Running : $image_clone_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_clone_cmd);
-
-}
-
-
-
-// removes the volume of an image
-function remove_lvm_nfs_deployment($cloud_image_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("remove_lvm_nfs_deployment", $_SERVER['REQUEST_TIME'], 5, "lvm-nfs-deployment-cloud-hook", "Removing image on storage", "", "", 0, 0, 0);
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-
-	$full_vol_name=$image_rootdevice;
-	$vol_dir=dirname($full_vol_name);
-	$vol=str_replace("/", "", $vol_dir);
-	$image_location_name=basename($full_vol_name);
-	$image_remove_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/lvm-storage/bin/openqrm-lvm-storage remove -n ".$image_location_name." -v ".$vol." -t lvm-nfs-deployment --openqrm-cmd-mode background";
-	$event->log("remove_lvm_nfs_deployment", $_SERVER['REQUEST_TIME'], 5, "lvm-nfs-deployment-cloud-hook", "Running : $image_remove_clone_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_remove_clone_cmd);
-
-}
-
-
-// resizes the volume of an image
-function resize_lvm_nfs_deployment($cloud_image_id, $resize_value) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("resize_lvm_nfs_deployment", $_SERVER['REQUEST_TIME'], 5, "lvm-nfs-deployment-cloud-hook", "Resize image on storage", "", "", 0, 0, 0);
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-
-	$full_vol_name=$image_rootdevice;
-	$vol_dir=dirname($full_vol_name);
-	$vol=str_replace("/", "", $vol_dir);
-	$image_location_name=basename($full_vol_name);
-	$image_resize_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/lvm-storage/bin/openqrm-lvm-storage resize -n ".$image_location_name." -v ".$vol." -m ".$resize_value." -t lvm-nfs-deployment --openqrm-cmd-mode background";
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "lvm-nfs-deployment-cloud-hook", "Running : $image_resize_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_resize_cmd);
-
-}
-
-
-
-// creates a private copy of the volume of an image
-function create_private_lvm_nfs_deployment($cloud_image_id, $private_disk, $private_image_name) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("create_private_lvm_nfs_deployment", $_SERVER['REQUEST_TIME'], 5, "lvm-nfs-deployment-cloud-hook", "Creating private image on storage", "", "", 0, 0, 0);
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// create an admin user to post when cloning has finished
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-
-	$full_vol_name=$image_rootdevice;
-	$vol_dir=dirname($full_vol_name);
-	$vol=str_replace("/", "", $vol_dir);
-	$image_location_name=basename($full_vol_name);
-	$image_resize_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/lvm-storage/bin/openqrm-lvm-storage clone -n ".$image_location_name." -s ".$private_image_name." -v ".$vol." -m ".$private_disk." -t lvm-nfs-deployment -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "lvm-nfs-deployment-cloud-hook", "Running : $image_resize_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_resize_cmd);
-	// set the storage specific image root_device parameter
-	$new_rootdevice = "/".$vol."/".$private_image_name;
-	return $new_rootdevice;
-
-}
-
-
-
-// ---------------------------------------------------------------------------------
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/root-mount.custom-iscsi-deployment b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/root-mount.custom-iscsi-deployment
deleted file mode 100644
index 3c16d58..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/root-mount.custom-iscsi-deployment
+++ /dev/null
@@ -1,357 +0,0 @@
-#!/bin/bash
-# this is the root-mount initrd-service
-# which proivdes function to mount/remount the remote
-# custom-iscsi-rootfs according to the image_deployment_parameters at /mnt
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# custom-iscsi-storage
-# Required defines in the image_deploy_paramters
-#
-#
-# Optional parameters 
-#
-# IMAGE_INSTALL_FROM_NFS			- can be set to an (nfs) location from
-#									  which the image will be installed at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_TRANSFER_TO_NFS				- can be set to an (nfs) location from
-#									  which the image will be transfered to at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_INSTALL_FROM_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this
-#									  option will install the custom-iscsi-storage image on 
-#									  boot-time from the local-device
-#
-# IMAGE_TRANSFER_TO_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this option will transfrom
-#									  the custom-iscsi-storage image on boot-time to the local-device
-#
-#
-#
-# IMAGE_INSTALL_FROM_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_TRANSFER_TO_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_NFS_MOUNT_OPTIONS			- can be e.g. set to proto=tcp for the install/transform phase
-#
-#
-# get the deployment parameters from openqrm.conf
-OPENQRM_RESOURCE_PARAMETER_FILE="/var/openqrm/openqrm-resource.conf"
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-eval $image_deployment_parameter
-export OPENQRM_SERVER_BASE_DIR=$resource_basedir
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-
-# nfs-options for the install+transform phase
-if [ "$IMAGE_NFS_MOUNT_OPTIONS" != "" ]; then
-	IMAGE_NFS_MOUNT_OPTIONS=",$IMAGE_NFS_MOUNT_OPTIONS"
-fi
-# default to ext3
-if [ "$IMAGE_INSTALL_FROM_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_INSTALL_FROM_LOCAL_FS_TYPE="ext3"
-fi
-if [ "$IMAGE_TRANSFER_TO_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_TRANSFER_TO_LOCAL_FS_TYPE="ext3"
-fi
-
-# here we gather the target name + lun from the image_rootdevice
-IMAGE_TARGET=`echo $image_rootdevice | cut -d'/' -f3`
-IMAGE_LUN=`echo $image_rootdevice | cut -d'/' -f4`
-
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	export WGET="wget --no-check-certificate -q"
-else
-	export WGET="wget -q"
-fi
-
-#######################################################################
-# required functions ##################################################
-#######################################################################
-
-function mount_rootfs() {
-
-	# check to find the right binaries fitting to kernel + rootfs
-	if [ "$kernel_name" == "default" ]; then
-		# we get the default binaries
-		# get iscsid via wget from the openQRM-servers boot-service dir
-		$WGET -O /sbin/iscsid $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsid
-		$WGET -O /sbin/iscsiadm $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsiadm
-	else
-		# we try to get the binaries fitting to the kernel name
-		# -> if a special version is not available we go with the default
-		if ! $WGET -O /sbin/iscsid $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsid.$kernel_name; then
-			$WGET -O /sbin/iscsid $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsid
-		fi
-		if ! $WGET -O /sbin/iscsiadm $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsiadm.$kernel_name; then
-			$WGET -O /sbin/iscsiadm $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsiadm
-		fi
-
-	fi
-	chmod +x /sbin/iscsi*
-	mkdir -p /tmp
-
-	# load iscsi related modules
-	modprobe iscsi_tcp
-	modprobe libiscsi
-	modprobe scsi_transport_iscsi
-	modprobe scsi_mod
-	modprobe sg
-	modprobe sd_mod
-	modprobe ib_iser
-
-	# create config /etc/iscsi/iscsid.conf
-	mkdir -p /etc/iscsi/
-	cat >> /etc/iscsi/iscsid.conf << EOF
-node.startup = manual
-node.session.timeo.replacement_timeout = 120
-node.conn[0].timeo.login_timeout = 15
-node.conn[0].timeo.logout_timeout = 15
-node.conn[0].timeo.noop_out_interval = 10
-node.conn[0].timeo.noop_out_timeout = 15
-node.session.iscsi.InitialR2T = No
-node.session.iscsi.ImmediateData = Yes
-node.session.iscsi.FirstBurstLength = 262144
-node.session.iscsi.MaxBurstLength = 16776192
-node.conn[0].iscsi.MaxRecvDataSegmentLength = 65536
-EOF
-
-# add CHAP authentication if configured
-if [ "$USER" != "" ] && [ "$PASSWORD" != "" ]; then
-	echo "node.session.auth.authmethod = CHAP" >> /etc/iscsi/iscsid.conf
-	echo "node.session.auth.username = $USER" >> /etc/iscsi/iscsid.conf
-	echo "node.session.auth.password = $PASSWORD" >> /etc/iscsi/iscsid.conf
-fi
-
-	# create /etc/iscsi/initiatorname.iscsi
-	cat >> /etc/iscsi/initiatorname.iscsi << EOF
-InitiatorName=$INITIATOR
-EOF
-	# also create /etc/initiatorname.iscsi, some open-iscsi version looking for that
-	cp /etc/iscsi/initiatorname.iscsi /etc/initiatorname.iscsi
-
-	# start syslog + klogd
-	syslogd &
-	klogd&
-
-	# start iscsid
-	/sbin/iscsid &
-	sleep 2
-
-	# discover
-	echo "custom-iscsi-storage: Discoverying Iscsi-target $image_storage_server_ip:3260"
-	iscsiadm -m discovery -t sendtargets -p $image_storage_server_ip:3260
-
-	# login
-	iscsiadm -m node -T $IMAGE_TARGET -p $image_storage_server_ip:3260 --login
-
-	# let udev settle
-	sleep 4
-
-	# check that udev found the new device
-	FIND_ISCSI_BLOCK_DEVICE=`find /sys/class/iscsi_session/session*/device/target*/*/ -name block | head -n1`
-	if [ "$FIND_ISCSI_BLOCK_DEVICE" == "" ]; then
-		FIND_ISCSI_BLOCK_DEVICE=`find /sys/class/iscsi_session/session*/device/target*/*/ -name block:s* | head -n1`
-		if [ "$FIND_ISCSI_BLOCK_DEVICE" == "" ]; then
-			echo "ERROR: Udev did not detect the new device"
-			echo "ERROR: Could not look-up the Iscsi device in the sys-fs dir"
-			# give a shell for the admin
-			/bin/bash
-		fi
-	fi
-	# check for different sysfs styles
-	if [ -h $FIND_ISCSI_BLOCK_DEVICE ]; then
-		ISCSI_BLOCK_DEVICE_NAME=`readlink $FIND_ISCSI_BLOCK_DEVICE`
-		ISCSI_BLOCK_DEVICE_NAME=`basename $ISCSI_BLOCK_DEVICE_NAME`
-		echo "SUCCESS: Found $ISCSI_BLOCK_DEVICE_NAME in sys-fs (as symlink)"
-	elif [ -d $FIND_ISCSI_BLOCK_DEVICE ]; then
-		ISCSI_BLOCK_DEVICE_NAME=`ls $FIND_ISCSI_BLOCK_DEVICE`
-		echo "SUCCESS: Found $ISCSI_BLOCK_DEVICE_NAME in sys-fs (as dir)"
-	else
-		echo "ERROR: Udev did not detect the new device"
-		echo "ERROR: Could not look-up the Iscsi device in the sys-fs dir"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	# export the blockdevice name for the further functions
-	export ISCSI_BLOCK_DEVICE="/dev/$ISCSI_BLOCK_DEVICE_NAME"
-
-	# finallly mount
-	if ! mount -t $image_rootfstype $ISCSI_BLOCK_DEVICE /mnt; then
-		# in case we install from nfs we create a fs since this should be a new lun
-		if  [ "$IMAGE_INSTALL_FROM_NFS" != "" ]; then
-			echo "NOTICE: Found install-from-nfs enabled but failed mounting the rootdevice"
-			echo "NOTICE: Assuming a new (unformatted) Lun -> creating $image_rootfstype filesystem on $ISCSI_BLOCK_DEVICE"
-			mke2fs -F -j $ISCSI_BLOCK_DEVICE
-			if ! mount -t $image_rootfstype $ISCSI_BLOCK_DEVICE /mnt; then
-				echo "ERROR: Could not mount $ISCSI_BLOCK_DEVICE via iscsi"
-				# give a shell for the admin
-				/bin/bash
-			else
-				echo "custom-iscsi-storage: Mounted $ISCSI_BLOCK_DEVICE rw"
-			fi
-		else
-			echo "ERROR: Could not mount $ISCSI_BLOCK_DEVICE via iscsi"
-			# give a shell for the admin
-			/bin/bash
-		fi
-	else
-		echo "custom-iscsi-storage: Mounted $ISCSI_BLOCK_DEVICE rw"
-	fi
-
-	if  [ "$IMAGE_INSTALL_FROM_NFS" != "" ]; then
-		install_rootfs_from_nfs
-	else
-		echo "custom-iscsi-storage: Skipping install phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_NFS" != "" ]; then
-		transfer_rootfs_to_nfs
-	else
-		echo "custom-iscsi-storage: Skipping transfer-to-nfs phase"
-	fi
-	if  [ "$IMAGE_INSTALL_FROM_LOCAL" != "" ]; then
-		install_rootfs_from_local
-	else
-		echo "custom-iscsi-storage: Skipping install-from-local phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_LOCAL" != "" ]; then
-		transfer_rootfs_to_local
-	else
-		echo "custom-iscsi-storage: Skipping transfer-to-local phase"
-	fi
-
-}
-
-
-function remount_rootfs() {
-	# Debian/Ubuntu Systems want their nfs-rootfs in rw mode
-	if [ -f /mnt/etc/apt/sources.list ]; then
-		if grep ubuntu /mnt/etc/apt/sources.list >/remountlog; then
-			echo "custom-iscsi-storage: Skipping Re-mount $ISCSI_BLOCK_DEVICE ro"
-			rm -f /remountlog
-			return
-		fi
-	fi
-	REMOUNT_LOOP=0
-	# remont /mnt ro
-	while ! mount -t $image_rootfstype -o ro,remount $ISCSI_BLOCK_DEVICE /mnt; do
-		echo -n "."
-		sleep 1
-		REMOUNT_LOOP=$[ REMOUNT_LOOP + 1 ]
-		if [ "$REMOUNT_LOOP" == "10" ]; then
-			echo "ERROR: custom-iscsi-storage could not remount /mnt "
-			/bin/bash
-		fi
-	done
-	echo "custom-iscsi-storage: Re-mounted $ISCSI_BLOCK_DEVICE ro"
-
-}
-
-
-function create_fstab() {
-	rm -f $IMAGE_FSTAB
-	echo "$ISCSI_BLOCK_DEVICE   /     $image_rootfstype  defaults   0 0" >> $IMAGE_FSTAB
-}
-
-
-#######################################################################
-# optional functions ##################################################
-#######################################################################
-
-function install_rootfs_from_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f1`
-	IMAGE_INSTALL_FROM_NFS=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f2-`
-	echo "custom-iscsi-storage: Installing $resource_image from $IMAGE_INSTALL_FROM_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o ro$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_INSTALL_FROM_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "custom-iscsi-storage: Starting install-from-nfs phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "custom-iscsi-storage: Install-from-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-function transfer_rootfs_to_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f1`
-	IMAGE_TRANSFER_TO_NFS=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f2-`
-	echo "custom-iscsi-storage: Transfering $resource_image to $IMAGE_TRANSFER_TO_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o rw$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_TRANSFER_TO_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "custom-iscsi-storage: Starting transfer-to-nfs phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "custom-iscsi-storage: Transfer-to-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-function install_rootfs_from_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE -o ro $IMAGE_INSTALL_FROM_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_LOCAL / $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "custom-iscsi-storage: Starting install-to-local phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "custom-iscsi-storage: Install-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-function transfer_rootfs_to_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE -o rw $IMAGE_TRANSFER_TO_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_LOCAL / $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "custom-iscsi-storage: Starting transfer-to-local phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "custom-iscsi-storage: Transfer-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/root-mount.custom-nfs-deployment b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/root-mount.custom-nfs-deployment
deleted file mode 100644
index b542fc7..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/root-mount.custom-nfs-deployment
+++ /dev/null
@@ -1,233 +0,0 @@
-#!/bin/bash
-# this is the root-mount initrd-service
-# which proivdes function to mount/remount the remote
-# nfs-rootfs according to the image_deployment_parameters at /mnt
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# custom-nfs-storage
-# Required defines in the image_deploy_paramters
-#
-#
-# Optional parameters 
-#
-# IMAGE_INSTALL_FROM_NFS			- can be set to an (nfs) location from
-#									  which the image will be installed at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_TRANSFER_TO_NFS				- can be set to an (nfs) location from
-#									  which the image will be transfered to at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_INSTALL_FROM_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this
-#									  option will install the custom-nfs-storage image on 
-#									  boot-time from the local-device
-#
-# IMAGE_TRANSFER_TO_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this option will transfrom
-#									  the custom-nfs-storage image on boot-time to the local-device
-#
-#
-#
-# IMAGE_INSTALL_FROM_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_TRANSFER_TO_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_NFS_MOUNT_OPTIONS			- can be e.g. set to proto=tcp for the install/transform phase
-#
-# get the deployment parameters from openqrm.conf
-OPENQRM_RESOURCE_PARAMETER_FILE="/var/openqrm/openqrm-resource.conf"
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-eval $image_deployment_parameter
-export OPENQRM_SERVER_BASE_DIR=$resource_basedir
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-
-if [ "$IMAGE_NFS_MOUNT_OPTIONS" != "" ]; then
-	IMAGE_NFS_MOUNT_OPTIONS=",$IMAGE_NFS_MOUNT_OPTIONS"
-fi
-# default to ext3
-if [ "$IMAGE_INSTALL_FROM_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_INSTALL_FROM_LOCAL_FS_TYPE="ext3"
-fi
-if [ "$IMAGE_TRANSFER_TO_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_TRANSFER_TO_LOCAL_FS_TYPE="ext3"
-fi
-
-# adapt the rootdevice parameters
-IMAGE_ROOT_DIR=$image_rootdevice
-
-#######################################################################
-# required functions ##################################################
-#######################################################################
-
-function mount_rootfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-
-	if ! mount -t nfs -o rw,nolock$IMAGE_NFS_MOUNT_OPTIONS $image_storage_server_ip:$IMAGE_ROOT_DIR /mnt; then
-		echo "ERROR: Could not mount $image_storage_server_ip:$IMAGE_ROOT_DIR by nfs"
-		# give a shell for the admin
-		/bin/bash
-	else
-		echo "custom-nfs-storage: Mounted $image_storage_server_ip:$IMAGE_ROOT_DIR rw"
-	fi
-
-	if  [ "$IMAGE_INSTALL_FROM_NFS" != "" ]; then
-		install_rootfs_from_nfs
-	else
-		echo "custom-nfs-storage: Skipping install phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_NFS" != "" ]; then
-		transfer_rootfs_to_nfs
-	else
-		echo "custom-nfs-storage: Skipping transfer-to-nfs phase"
-	fi
-	if  [ "$IMAGE_INSTALL_FROM_LOCAL" != "" ]; then
-		install_rootfs_from_local
-	else
-		echo "custom-nfs-storage: Skipping install-from-local phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_LOCAL" != "" ]; then
-		transfer_rootfs_to_local
-	else
-		echo "custom-nfs-storage: Skipping transfer-to-local phase"
-	fi
-}
-
-
-function remount_rootfs() {
-
-	# Debian/Ubuntu Systems want their nfs-rootfs in rw mode
-	if [ -f /mnt/etc/apt/sources.list ]; then
-		if grep ubuntu /mnt/etc/apt/sources.list >/remountlog; then
-			echo "custom-nfs-storage: Skipping Re-mount $image_storage_server_ip:$IMAGE_ROOT_DIR ro"
-			rm -f /remountlog
-			return
-		fi
-	fi
-	# remont /mnt ro
-	while ! mount -t nfs -o ro,remount,nolock$IMAGE_NFS_MOUNT_OPTIONS $image_storage_server_ip:$IMAGE_ROOT_DIR /mnt; do
-		echo -n "."
-		sleep 1
-		REMOUNT_LOOP=$[ REMOUNT_LOOP + 1 ]
-		if [ "$REMOUNT_LOOP" == "10" ]; then
-			echo "ERROR: nfs-storage could not remount /mnt "
-			/bin/bash
-		fi
-	done
-	echo "nfs-storage: Re-mounted $image_storage_server_ip:$IMAGE_ROOT_DIR ro"
-	openqrm_portmap_stop
-
-}
-
-
-function create_fstab() {
-	rm -f $IMAGE_FSTAB
-	echo "$image_storage_server_ip:$IMAGE_ROOT_DIR   /   nfs  defaults   0 0" >> $IMAGE_FSTAB
-}
-
-
-#######################################################################
-# optional functions ##################################################
-#######################################################################
-
-function install_rootfs_from_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f1`
-	IMAGE_INSTALL_FROM_NFS=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f2-`
-	echo "custom-nfs-storage: Installing $resource_image from $IMAGE_INSTALL_FROM_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o ro$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_INSTALL_FROM_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "custom-nfs-storage: Starting install-from-nfs phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "custom-nfs-storage: Install-from-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-function transfer_rootfs_to_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f1`
-	IMAGE_TRANSFER_TO_NFS=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f2-`
-	echo "custom-nfs-storage: Transfering $resource_image to $IMAGE_TRANSFER_TO_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o rw$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_TRANSFER_TO_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "custom-nfs-storage: Starting transfer-to-nfs phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "custom-nfs-storage: Transfer-to-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-function install_rootfs_from_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE -o ro $IMAGE_INSTALL_FROM_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_LOCAL / $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "custom-nfs-storage: Starting install-to-local phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "custom-nfs-storage: Install-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-function transfer_rootfs_to_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE -o rw $IMAGE_TRANSFER_TO_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_LOCAL / $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "custom-nfs-storage: Starting transfer-to-local phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "custom-nfs-storage: Transfer-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/root-mount.lvm-aoe-deployment b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/root-mount.lvm-aoe-deployment
deleted file mode 100644
index 8697fd0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/root-mount.lvm-aoe-deployment
+++ /dev/null
@@ -1,308 +0,0 @@
-#!/bin/bash
-# this is the root-mount initrd-service
-# which proivdes function to mount/remount the remote
-# lvm-aoe-rootfs according to the image_deployment_parameters at /mnt
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# lvm-aoe-storage
-# Required defines in the image_deploy_paramters
-#
-#
-# Optional parameters 
-#
-# IMAGE_INSTALL_FROM_NFS			- can be set to an (nfs) location from
-#									  which the image will be installed at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_TRANSFER_TO_NFS				- can be set to an (nfs) location from
-#									  which the image will be transfered to at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_INSTALL_FROM_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this
-#									  option will install the lvm-aoe-storage image on 
-#									  boot-time from the local-device
-#
-# IMAGE_TRANSFER_TO_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this option will transfrom
-#									  the lvm-aoe-storage image on boot-time to the local-device
-#
-#
-#
-# IMAGE_INSTALL_FROM_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_TRANSFER_TO_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_NFS_MOUNT_OPTIONS			- can be e.g. set to proto=tcp for the install/transform phase
-#
-
-
-# get the deployment parameters from openqrm.conf
-OPENQRM_RESOURCE_PARAMETER_FILE="/var/openqrm/openqrm-resource.conf"
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-eval $image_deployment_parameter
-export OPENQRM_SERVER_BASE_DIR=$resource_basedir
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-
-# nfs-options for the install+transform phase
-if [ "$IMAGE_NFS_MOUNT_OPTIONS" != "" ]; then
-	IMAGE_NFS_MOUNT_OPTIONS=",$IMAGE_NFS_MOUNT_OPTIONS"
-fi
-# default to ext3
-if [ "$IMAGE_INSTALL_FROM_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_INSTALL_FROM_LOCAL_FS_TYPE="ext3"
-fi
-if [ "$IMAGE_TRANSFER_TO_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_TRANSFER_TO_LOCAL_FS_TYPE="ext3"
-fi
-
-VOLUME_GROUP=`echo $image_rootdevice | cut -d':' -f1`
-IMAGE_NAME=`echo $image_rootdevice | cut -d':' -f2`
-IMAGE_ROOT_DEVICE=`echo $image_rootdevice | cut -d':' -f3`
-
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	export WGET="wget --no-check-certificate -q"
-else
-	export WGET="wget -q"
-fi
-
-#######################################################################
-# required functions ##################################################
-#######################################################################
-
-function mount_rootfs() {
-
-	# get aoe-interfaces via wget from the openQRM-servers boot-service dir
-	$WGET -O /sbin/aoe-interfaces $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/aoe-interfaces
-	# get the aoe-discover via wget from the openQRM-servers boot-service dir
-	$WGET -O /sbin/aoe-discover $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/aoe-discover
-	# get the aoe-stat via wget from the openQRM-servers boot-service dir
-	$WGET -O /sbin/aoe-stat $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/aoe-stat
-	# get the aoe-mkdevs via wget from the openQRM-servers boot-service dir
-	$WGET -O /sbin/aoe-mkdevs $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/aoe-mkdevs
-	# get the aoe-mkshelf via wget from the openQRM-servers boot-service dir
-	$WGET -O /sbin/aoe-mkshelf $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/aoe-mkshelf
-	chmod +x /sbin/aoe*
-
-	# insert udev rule
-	mkdir -p /etc/udev
-	cat >> /etc/udev/rules.d/60-aoe.rules << EOF
-# aoe char devices
-SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k", GROUP="disk",
-MODE="0220"
-SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k", GROUP="disk", MODE="0440"
-SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k", GROUP="disk",
-MODE="0220"
-SUBSYSTEM=="aoe", KERNEL=="revalidate", NAME="etherd/%k", GROUP="disk",
-MODE="0220"
-# aoe block devices
-KERNEL=="etherd*", NAME="%k", GROUP="disk"
-
-EOF
-
-	# load aoe related modules
-	mkdir /dev/etherd
-	modprobe aoe
-
-	# discover
-	RESOURCE_INTERFACE=`ip a s | grep ^[0-9] | cut -d':' -f2 | awk '{ print $1 }' | grep ":oq"`
-	echo "lvm-aoe-storage: Discoverying Aoe-target $image_storage_server_ip on $RESOURCE_INTERFACE"
-	aoe-interfaces $RESOURCE_INTERFACE
-	aoe-discover
-	aoe-stat
-
-	# let udev settle
-	sleep 4
-	# let udev settle
-	sleep 4
-	while (true); do
-		if [ -e "$IMAGE_ROOT_DEVICE" ]; then
-			echo "Udev created $IMAGE_ROOT_DEVICE"
-			break
-		else
-			echo -n "."
-		fi
-		sleep 1
-	done
-
-	# finallly mount
-	if ! mount -t $image_rootfstype $IMAGE_ROOT_DEVICE /mnt; then
-		# in case we install from nfs we create a fs since this should be a new lun
-		if  [ "$IMAGE_INSTALL_FROM_NFS" != "" ]; then
-			echo "NOTICE: Found install-from-nfs enabled but failed mounting the rootdevice"
-			echo "NOTICE: Assuming a new (unformatted) Lun -> creating $image_rootfstype filesystem on $IMAGE_ROOT_DEVICE"
-			mke2fs -F -j $IMAGE_ROOT_DEVICE
-			if ! mount -t $image_rootfstype $IMAGE_ROOT_DEVICE /mnt; then
-				echo "ERROR: Could not mount $IMAGE_ROOT_DEVICE via iscsi"
-				# give a shell for the admin
-				/bin/bash
-			else
-				echo "lvm-aoe-storage: Mounted $IMAGE_ROOT_DEVICE rw"
-			fi
-		else
-			echo "ERROR: Could not mount $IMAGE_ROOT_DEVICE via aoe"
-			# give a shell for the admin
-			/bin/bash
-		fi
-	else
-		echo "lvm-aoe-storage: Mounted $IMAGE_ROOT_DEVICE rw"
-	fi
-
-	if  [ "$IMAGE_INSTALL_FROM_NFS" != "" ]; then
-		install_rootfs_from_nfs
-	else
-		echo "lvm-aoe-storage: Skipping install-to-nfs phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_NFS" != "" ]; then
-		transfer_rootfs_to_nfs
-	else
-		echo "lvm-aoe-storage: Skipping transfer-to-nfs phase"
-	fi
-	if  [ "$IMAGE_INSTALL_FROM_LOCAL" != "" ]; then
-		install_rootfs_from_local
-	else
-		echo "lvm-aoe-storage: Skipping install-from-local phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_LOCAL" != "" ]; then
-		transfer_rootfs_to_local
-	else
-		echo "lvm-aoe-storage: Skipping transfer-to-local phase"
-	fi
-
-}
-
-
-function remount_rootfs() {
-	# Debian/Ubuntu Systems want their nfs-rootfs in rw mode
-	if [ -f /mnt/etc/apt/sources.list ]; then
-		if grep ubuntu /mnt/etc/apt/sources.list >/remountlog; then
-			echo "lvm-aoe-storage: Skipping Re-mount $IMAGE_ROOT_DEVICE ro"
-			rm -f /remountlog
-			return
-		fi
-	fi
-	REMOUNT_LOOP=0
-	# remont /mnt ro
-	while ! mount -t $image_rootfstype -o ro,remount $IMAGE_ROOT_DEVICE /mnt; do
-		echo -n "."
-		sleep 1
-		REMOUNT_LOOP=$[ REMOUNT_LOOP + 1 ]
-		if [ "$REMOUNT_LOOP" == "10" ]; then
-			echo "ERROR: lvm-aoe-storage could not remount /mnt "
-			/bin/bash
-		fi
-	done
-	echo "lvm-aoe-storage: Re-mounted $IMAGE_ROOT_DEVICE ro"
-
-}
-
-
-function create_fstab() {
-	rm -f $IMAGE_FSTAB
-	echo "$IMAGE_ROOT_DEVICE   /     $image_rootfstype  defaults   0 0" >> $IMAGE_FSTAB
-}
-
-
-#######################################################################
-# optional functions ##################################################
-#######################################################################
-
-function install_rootfs_from_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f1`
-	IMAGE_INSTALL_FROM_NFS=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f2-`
-	echo "lvm-aoe-storage: Installing $resource_image from $IMAGE_INSTALL_FROM_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o ro$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_INSTALL_FROM_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "lvm-aoe-storage: Starting install-from-nfs phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "lvm-aoe-storage: Install-from-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-function transfer_rootfs_to_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f1`
-	IMAGE_TRANSFER_TO_NFS=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f2-`
-	echo "lvm-aoe-storage: Transfering $resource_image to $IMAGE_TRANSFER_TO_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o rw$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_TRANSFER_TO_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "lvm-aoe-storage: Starting transfer-to-nfs phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "lvm-aoe-storage: Transfer-to-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-
-
-function install_rootfs_from_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE -o ro $IMAGE_INSTALL_FROM_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_LOCAL / $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "lvm-aoe-storage: Starting install-from-local phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "lvm-aoe-storage: Install-from-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-function transfer_rootfs_to_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE -o rw $IMAGE_TRANSFER_TO_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_LOCAL / $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "lvm-aoe-storage: Starting transfer-to-local phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "lvm-aoe-storage: Transfer-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/root-mount.lvm-iscsi-deployment b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/root-mount.lvm-iscsi-deployment
deleted file mode 100644
index 30daa3a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/root-mount.lvm-iscsi-deployment
+++ /dev/null
@@ -1,357 +0,0 @@
-#!/bin/bash
-# this is the root-mount initrd-service
-# which proivdes function to mount/remount the remote
-# lvm-iscsi-rootfs according to the image_deployment_parameters at /mnt
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# lvm-iscsi-storage
-# Required defines in the image_deploy_paramters
-#
-#
-# Optional parameters 
-#
-# IMAGE_INSTALL_FROM_NFS			- can be set to an (nfs) location from
-#									  which the image will be installed at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_TRANSFER_TO_NFS				- can be set to an (nfs) location from
-#									  which the image will be transfered to at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_INSTALL_FROM_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this
-#									  option will install the lvm-iscsi-storage image on 
-#									  boot-time from the local-device
-#
-# IMAGE_TRANSFER_TO_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this option will transfrom
-#									  the lvm-iscsi-storage image on boot-time to the local-device
-#
-#
-#
-# IMAGE_INSTALL_FROM_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_TRANSFER_TO_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_NFS_MOUNT_OPTIONS			- can be e.g. set to proto=tcp for the install/transform phase
-#
-#
-# get the deployment parameters from openqrm.conf
-OPENQRM_RESOURCE_PARAMETER_FILE="/var/openqrm/openqrm-resource.conf"
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-eval $image_deployment_parameter
-export OPENQRM_SERVER_BASE_DIR=$resource_basedir
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-
-# nfs-options for the install+transform phase
-if [ "$IMAGE_NFS_MOUNT_OPTIONS" != "" ]; then
-	IMAGE_NFS_MOUNT_OPTIONS=",$IMAGE_NFS_MOUNT_OPTIONS"
-fi
-# default to ext3
-if [ "$IMAGE_INSTALL_FROM_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_INSTALL_FROM_LOCAL_FS_TYPE="ext3"
-fi
-if [ "$IMAGE_TRANSFER_TO_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_TRANSFER_TO_LOCAL_FS_TYPE="ext3"
-fi
-
-# here we gather the target name + lun from the image_rootdevice
-VOLUME_GROUP=`echo $image_rootdevice | cut -d':' -f1`
-IMAGE_ROOTDEVICE=`echo $image_rootdevice | cut -d':' -f2`
-IMAGE_TARGET=`echo $IMAGE_ROOTDEVICE | cut -d'/' -f3`
-IMAGE_LUN=`echo $IMAGE_ROOTDEVICE | cut -d'/' -f4`
-
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	export WGET="wget --no-check-certificate -q"
-else
-	export WGET="wget -q"
-fi
-
-#######################################################################
-# required functions ##################################################
-#######################################################################
-
-function mount_rootfs() {
-
-	# check to find the right binaries fitting to kernel + rootfs
-	if [ "$kernel_name" == "default" ]; then
-		# we get the default binaries
-		# get iscsid via wget from the openQRM-servers boot-service dir
-		$WGET -O /sbin/iscsid $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsid
-		$WGET -O /sbin/iscsiadm $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsiadm
-	else
-		# we try to get the binaries fitting to the kernel name
-		# -> if a special version is not available we go with the default
-		if ! $WGET -O /sbin/iscsid $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsid.$kernel_name; then
-			$WGET -O /sbin/iscsid $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsid
-		fi
-		if ! $WGET -O /sbin/iscsiadm $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsiadm.$kernel_name; then
-			$WGET -O /sbin/iscsiadm $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/iscsiadm
-		fi
-
-	fi
-	chmod +x /sbin/iscsi*
-	mkdir -p /tmp
-
-	# load iscsi related modules
-	modprobe iscsi_tcp
-	modprobe libiscsi
-	modprobe scsi_transport_iscsi
-	modprobe scsi_mod
-	modprobe sg
-	modprobe sd_mod
-	modprobe ib_iser
-
-	# create config /etc/iscsi/iscsid.conf
-	mkdir -p /etc/iscsi/
-	cat >> /etc/iscsi/iscsid.conf << EOF
-node.startup = manual
-node.session.timeo.replacement_timeout = 120
-node.conn[0].timeo.login_timeout = 15
-node.conn[0].timeo.logout_timeout = 15
-node.conn[0].timeo.noop_out_interval = 10
-node.conn[0].timeo.noop_out_timeout = 15
-node.session.iscsi.InitialR2T = No
-node.session.iscsi.ImmediateData = Yes
-node.session.iscsi.FirstBurstLength = 262144
-node.session.iscsi.MaxBurstLength = 16776192
-node.conn[0].iscsi.MaxRecvDataSegmentLength = 65536
-
-node.session.auth.authmethod = CHAP
-node.session.auth.username = $IMAGE_TARGET
-node.session.auth.password = $IMAGE_ISCSI_AUTH
-
-EOF
-
-	# create /etc/iscsi/initiatorname.iscsi
-	cat >> /etc/iscsi/initiatorname.iscsi << EOF
-InitiatorName=iqn.1993-08.org.debian:01:31721e7e6b8f
-EOF
-	# also create /etc/initiatorname.iscsi, some open-iscsi version looking for that
-	cp /etc/iscsi/initiatorname.iscsi /etc/initiatorname.iscsi
-
-	# start syslog + klogd
-	syslogd &
-	klogd&
-
-	# start iscsid
-	/sbin/iscsid &
-	sleep 2
-
-	# discover
-	echo "lvm-iscsi-storage: Discoverying Iscsi-target $image_storage_server_ip:3260"
-	iscsiadm -m discovery -t sendtargets -p $image_storage_server_ip:3260
-
-	# login
-	iscsiadm -m node -T $IMAGE_TARGET -p $image_storage_server_ip:3260 --login
-
-	# let udev settle
-	sleep 4
-
-	# check that udev found the new device
-	FIND_ISCSI_BLOCK_DEVICE=`find /sys/class/iscsi_session/session*/device/target*/*/ -name block | head -n1`
-	if [ "$FIND_ISCSI_BLOCK_DEVICE" == "" ]; then
-		FIND_ISCSI_BLOCK_DEVICE=`find /sys/class/iscsi_session/session*/device/target*/*/ -name block:s* | head -n1`
-		if [ "$FIND_ISCSI_BLOCK_DEVICE" == "" ]; then
-			echo "ERROR: Udev did not detect the new device"
-			echo "ERROR: Could not look-up the Iscsi device in the sys-fs dir"
-			# give a shell for the admin
-			/bin/bash
-		fi
-	fi
-	# check for different sysfs styles
-	if [ -h $FIND_ISCSI_BLOCK_DEVICE ]; then
-		ISCSI_BLOCK_DEVICE_NAME=`readlink $FIND_ISCSI_BLOCK_DEVICE`
-		ISCSI_BLOCK_DEVICE_NAME=`basename $ISCSI_BLOCK_DEVICE_NAME`
-		echo "SUCCESS: Found $ISCSI_BLOCK_DEVICE_NAME in sys-fs (as symlink)"
-	elif [ -d $FIND_ISCSI_BLOCK_DEVICE ]; then
-		ISCSI_BLOCK_DEVICE_NAME=`ls $FIND_ISCSI_BLOCK_DEVICE`
-		echo "SUCCESS: Found $ISCSI_BLOCK_DEVICE_NAME in sys-fs (as dir)"
-	else
-		echo "ERROR: Udev did not detect the new device"
-		echo "ERROR: Could not look-up the Iscsi device in the sys-fs dir"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	# export the blockdevice name for the further functions
-	export ISCSI_BLOCK_DEVICE="/dev/$ISCSI_BLOCK_DEVICE_NAME"
-
-	# finallly mount
-	if ! mount -t $image_rootfstype $ISCSI_BLOCK_DEVICE /mnt; then
-		# in case we install from nfs we create a fs since this should be a new lun
-		if  [ "$IMAGE_INSTALL_FROM_NFS" != "" ]; then
-			echo "NOTICE: Found install-from-nfs enabled but failed mounting the rootdevice"
-			echo "NOTICE: Assuming a new (unformatted) Lun -> creating $image_rootfstype filesystem on $ISCSI_BLOCK_DEVICE"
-			mke2fs -F -j $ISCSI_BLOCK_DEVICE
-			if ! mount -t $image_rootfstype $ISCSI_BLOCK_DEVICE /mnt; then
-				echo "ERROR: Could not mount $ISCSI_BLOCK_DEVICE via iscsi"
-				# give a shell for the admin
-				/bin/bash
-			else
-				echo "lvm-iscsi-storage: Mounted $ISCSI_BLOCK_DEVICE rw"
-			fi
-		else
-			echo "ERROR: Could not mount $ISCSI_BLOCK_DEVICE via iscsi"
-			# give a shell for the admin
-			/bin/bash
-		fi
-	else
-		echo "lvm-iscsi-storage: Mounted $ISCSI_BLOCK_DEVICE rw"
-	fi
-
-	if  [ "$IMAGE_INSTALL_FROM_NFS" != "" ]; then
-		install_rootfs_from_nfs
-	else
-		echo "lvm-iscsi-storage: Skipping install phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_NFS" != "" ]; then
-		transfer_rootfs_to_nfs
-	else
-		echo "lvm-iscsi-storage: Skipping transfer-to-nfs phase"
-	fi
-	if  [ "$IMAGE_INSTALL_FROM_LOCAL" != "" ]; then
-		install_rootfs_from_local
-	else
-		echo "lvm-iscsi-storage: Skipping install-from-local phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_LOCAL" != "" ]; then
-		transfer_rootfs_to_local
-	else
-		echo "lvm-iscsi-storage: Skipping transfer-to-local phase"
-	fi
-
-}
-
-
-function remount_rootfs() {
-	# Debian/Ubuntu Systems want their nfs-rootfs in rw mode
-	if [ -f /mnt/etc/apt/sources.list ]; then
-		if grep ubuntu /mnt/etc/apt/sources.list >/remountlog; then
-			echo "lvm-iscsi-storage: Skipping Re-mount $ISCSI_BLOCK_DEVICE ro"
-			rm -f /remountlog
-			return
-		fi
-	fi
-	REMOUNT_LOOP=0
-	# remont /mnt ro
-	while ! mount -t $image_rootfstype -o ro,remount $ISCSI_BLOCK_DEVICE /mnt; do
-		echo -n "."
-		sleep 1
-		REMOUNT_LOOP=$[ REMOUNT_LOOP + 1 ]
-		if [ "$REMOUNT_LOOP" == "10" ]; then
-			echo "ERROR: lvm-iscsi-storage could not remount /mnt "
-			/bin/bash
-		fi
-	done
-	echo "lvm-iscsi-storage: Re-mounted $ISCSI_BLOCK_DEVICE ro"
-
-}
-
-
-function create_fstab() {
-	rm -f $IMAGE_FSTAB
-	echo "$ISCSI_BLOCK_DEVICE   /     $image_rootfstype  defaults   0 0" >> $IMAGE_FSTAB
-}
-
-
-#######################################################################
-# optional functions ##################################################
-#######################################################################
-
-function install_rootfs_from_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f1`
-	IMAGE_INSTALL_FROM_NFS=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f2-`
-	echo "lvm-iscsi-storage: Installing $resource_image from $IMAGE_INSTALL_FROM_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o ro$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_INSTALL_FROM_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "lvm-iscsi-storage: Starting install-from-nfs phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "lvm-iscsi-storage: Install-from-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-function transfer_rootfs_to_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f1`
-	IMAGE_TRANSFER_TO_NFS=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f2-`
-	echo "lvm-iscsi-storage: Transfering $resource_image to $IMAGE_TRANSFER_TO_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o rw$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_TRANSFER_TO_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "lvm-iscsi-storage: Starting transfer-to-nfs phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "lvm-iscsi-storage: Transfer-to-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-function install_rootfs_from_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE -o ro $IMAGE_INSTALL_FROM_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_LOCAL / $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "lvm-iscsi-storage: Starting install-to-local phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "lvm-iscsi-storage: Install-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-function transfer_rootfs_to_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE -o rw $IMAGE_TRANSFER_TO_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_LOCAL / $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "lvm-iscsi-storage: Starting transfer-to-local phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "lvm-iscsi-storage: Transfer-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/root-mount.lvm-nfs-deployment b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/root-mount.lvm-nfs-deployment
deleted file mode 100644
index 547a934..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/root-mount.lvm-nfs-deployment
+++ /dev/null
@@ -1,233 +0,0 @@
-#!/bin/bash
-# this is the root-mount initrd-service
-# which proivdes function to mount/remount the remote
-# nfs-rootfs according to the image_deployment_parameters at /mnt
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# lvm-nfs-storage
-# Required defines in the image_deploy_paramters
-#
-#
-# Optional parameters 
-#
-# IMAGE_INSTALL_FROM_NFS			- can be set to an (nfs) location from
-#									  which the image will be installed at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_TRANSFER_TO_NFS				- can be set to an (nfs) location from
-#									  which the image will be transfered to at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_INSTALL_FROM_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this
-#									  option will install the lvm-nfs-storage image on 
-#									  boot-time from the local-device
-#
-# IMAGE_TRANSFER_TO_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this option will transfrom
-#									  the lvm-nfs-storage image on boot-time to the local-device
-#
-#
-#
-# IMAGE_INSTALL_FROM_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_TRANSFER_TO_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_NFS_MOUNT_OPTIONS			- can be e.g. set to proto=tcp for the install/transform phase
-#
-# get the deployment parameters from openqrm.conf
-OPENQRM_RESOURCE_PARAMETER_FILE="/var/openqrm/openqrm-resource.conf"
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-eval $image_deployment_parameter
-export OPENQRM_SERVER_BASE_DIR=$resource_basedir
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-
-if [ "$IMAGE_NFS_MOUNT_OPTIONS" != "" ]; then
-	IMAGE_NFS_MOUNT_OPTIONS=",$IMAGE_NFS_MOUNT_OPTIONS"
-fi
-# default to ext3
-if [ "$IMAGE_INSTALL_FROM_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_INSTALL_FROM_LOCAL_FS_TYPE="ext3"
-fi
-if [ "$IMAGE_TRANSFER_TO_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_TRANSFER_TO_LOCAL_FS_TYPE="ext3"
-fi
-
-# adapt the rootdevice parameters
-IMAGE_ROOT_DIR=$image_rootdevice
-
-#######################################################################
-# required functions ##################################################
-#######################################################################
-
-function mount_rootfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-
-	if ! mount -t nfs -o rw,nolock$IMAGE_NFS_MOUNT_OPTIONS $image_storage_server_ip:$IMAGE_ROOT_DIR /mnt; then
-		echo "ERROR: Could not mount $image_storage_server_ip:$IMAGE_ROOT_DIR by nfs"
-		# give a shell for the admin
-		/bin/bash
-	else
-		echo "nfs-storage: Mounted $image_storage_server_ip:$IMAGE_ROOT_DIR rw"
-	fi
-
-	if  [ "$IMAGE_INSTALL_FROM_NFS" != "" ]; then
-		install_rootfs_from_nfs
-	else
-		echo "lvm-nfs-storage: Skipping install phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_NFS" != "" ]; then
-		transfer_rootfs_to_nfs
-	else
-		echo "lvm-nfs-storage: Skipping transfer-to-nfs phase"
-	fi
-	if  [ "$IMAGE_INSTALL_FROM_LOCAL" != "" ]; then
-		install_rootfs_from_local
-	else
-		echo "lvm-nfs-storage: Skipping install-from-local phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_LOCAL" != "" ]; then
-		transfer_rootfs_to_local
-	else
-		echo "lvm-nfs-storage: Skipping transfer-to-local phase"
-	fi
-}
-
-
-function remount_rootfs() {
-
-	# Debian/Ubuntu Systems want their nfs-rootfs in rw mode
-	if [ -f /mnt/etc/apt/sources.list ]; then
-		if grep ubuntu /mnt/etc/apt/sources.list >/remountlog; then
-			echo "lvm-nfs-storage: Skipping Re-mount $image_storage_server_ip:$IMAGE_ROOT_DIR ro"
-			rm -f /remountlog
-			return
-		fi
-	fi
-	# remont /mnt ro
-	while ! mount -t nfs -o ro,remount,nolock$IMAGE_NFS_MOUNT_OPTIONS $image_storage_server_ip:$IMAGE_ROOT_DIR /mnt; do
-		echo -n "."
-		sleep 1
-		REMOUNT_LOOP=$[ REMOUNT_LOOP + 1 ]
-		if [ "$REMOUNT_LOOP" == "10" ]; then
-			echo "ERROR: nfs-storage could not remount /mnt "
-			/bin/bash
-		fi
-	done
-	echo "nfs-storage: Re-mounted $image_storage_server_ip:$IMAGE_ROOT_DIR ro"
-	openqrm_portmap_stop
-
-}
-
-
-function create_fstab() {
-	rm -f $IMAGE_FSTAB
-	echo "$image_storage_server_ip:$IMAGE_ROOT_DIR   /   nfs  defaults   0 0" >> $IMAGE_FSTAB
-}
-
-
-#######################################################################
-# optional functions ##################################################
-#######################################################################
-
-function install_rootfs_from_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f1`
-	IMAGE_INSTALL_FROM_NFS=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f2-`
-	echo "lvm-nfs-storage: Installing $resource_image from $IMAGE_INSTALL_FROM_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o ro$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_INSTALL_FROM_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "lvm-nfs-storage: Starting install-from-nfs phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "lvm-nfs-storage: Install-from-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-function transfer_rootfs_to_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f1`
-	IMAGE_TRANSFER_TO_NFS=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f2-`
-	echo "lvm-nfs-storage: Transfering $resource_image to $IMAGE_TRANSFER_TO_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o rw$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_TRANSFER_TO_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "lvm-nfs-storage: Starting transfer-to-nfs phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "lvm-nfs-storage: Transfer-to-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-function install_rootfs_from_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE -o ro $IMAGE_INSTALL_FROM_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_LOCAL / $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "lvm-nfs-storage: Starting install-to-local phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "lvm-nfs-storage: Install-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-function transfer_rootfs_to_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE -o rw $IMAGE_TRANSFER_TO_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_LOCAL / $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "lvm-nfs-storage: Starting transfer-to-local phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "lvm-nfs-storage: Transfer-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-about-bootservice.tpl.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-about-bootservice.tpl.php
deleted file mode 100644
index ec1111b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-about-bootservice.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{boot_service_title}</h3>
-		{boot_service_content}
-	</div>
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-about-documentation.tpl.php
deleted file mode 100644
index 820bb5a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-about-documentation.tpl.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{introduction_title}</h3>
-		{introduction_content}
-	
-		<h3>{provides_title}</h3>
-		{provides_list}
-	
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-
-	
-	</div>
-	<div class="span2 offset1">
-		<h3>{type_title}</h3>
-		<span class="pill">{type_content}</span>
-	
-		<h3>{deployment_title}</h3>
-		<span class="pill">{deployment_content}</span>
-	
-		<h3>{tested_title}</h3>
-		{tested_content}
-
-	</div>
-</div>
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-add.tpl.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-add.tpl.php
deleted file mode 100644
index a4f5098..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-add.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div id="form">
-	<form action="{thisfile}" method="GET">
-	{form}
-	{name}
-	{size}
-	<div id="buttons">{submit}&#160;{cancel}</div>
-</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-clone.tpl.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-clone.tpl.php
deleted file mode 100644
index 44a8a00..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-clone.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<form action="{thisfile}" method="GET">
-{form}
-	<div id="form">
-		{name}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-custom.tpl.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-custom.tpl.php
deleted file mode 100644
index 71fc7fc..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-custom.tpl.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-<div id="form">
-	<div style="width:250px;float:left;">
-		<div><b>{lang_id}</b>: {id}</div>
-		<div><b>{lang_name}</b>: {name}</div>
-		<div><b>{lang_resource}</b>: {resource}</div>
-		<div><b>{lang_deployment}</b>: {deployment}</div>
-		<div><b>{lang_state}</b>: {state}</div>
-	</div>
-	<div style="width:300px; float:right;">
-		<div>{add}</div>
-	</div>
-	<div style="clear:both; margin: 0 0 25px 0;" class="floatbreaker">&#160;</div>
-	{table}
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-customadd.tpl.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-customadd.tpl.php
deleted file mode 100644
index 5af9cdb..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-customadd.tpl.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div id="form">
-	<form action="{thisfile}" method="GET">
-	{form}
-	{name}
-	{target}
-	{lun}
-	{initiator}
-	{username}
-	{password}
-	{export}
-	<div id="buttons">{submit}&#160;{cancel}</div>
-</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-customremove.tpl.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-customremove.tpl.php
deleted file mode 100644
index b11c36e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-customremove.tpl.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}">
-	<div id="form">
-		{form}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-edit.tpl.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-edit.tpl.php
deleted file mode 100644
index 71fc7fc..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-edit.tpl.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-<div id="form">
-	<div style="width:250px;float:left;">
-		<div><b>{lang_id}</b>: {id}</div>
-		<div><b>{lang_name}</b>: {name}</div>
-		<div><b>{lang_resource}</b>: {resource}</div>
-		<div><b>{lang_deployment}</b>: {deployment}</div>
-		<div><b>{lang_state}</b>: {state}</div>
-	</div>
-	<div style="width:300px; float:right;">
-		<div>{add}</div>
-	</div>
-	<div style="clear:both; margin: 0 0 25px 0;" class="floatbreaker">&#160;</div>
-	{table}
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-remove.tpl.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-remove.tpl.php
deleted file mode 100644
index b11c36e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-remove.tpl.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}">
-	<div id="form">
-		{form}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-resize.tpl.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-resize.tpl.php
deleted file mode 100644
index 4276209..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-resize.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}">
-	<div id="form">
-		{form}
-		{size}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-select.tpl.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-select.tpl.php
deleted file mode 100644
index bd68de0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-select.tpl.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-{table}
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-snap.tpl.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-snap.tpl.php
deleted file mode 100644
index 4744c8b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-snap.tpl.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<form action="{thisfile}" method="GET">
-{form}
-	<div id="form">
-		{name}
-		{size}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-volgroup.tpl.php b/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-volgroup.tpl.php
deleted file mode 100644
index 545ee79..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lvm-storage/web/tpl/lvm-storage-volgroup.tpl.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div id="form">
-	<div style="width:280px;float:left;">
-		<div><b>{lang_id}</b>: {id}</div>
-		<div><b>{lang_name}</b>: {name}</div>
-		<div><b>{lang_resource}</b>: {resource}</div>
-		<div><b>{lang_deployment}</b>: {deployment}</div>
-		<div><b>{lang_state}</b>: {state}</div>
-	</div>
-
-	<div style="width:300px;float:left;">
-		<div><b>{lang_name}</b>: {volgroup_name}</div>
-		<div><b>{lang_attr}</b>: {volgroup_attr}</div>
-		<div><b>{lang_pv}</b>: {volgroup_pv} / {volgroup_lv} / {volgroup_sn}</div>
-		<div><b>{lang_size}</b>: {volgroup_vsize} / {volgroup_vfree}</div>
-	</div>
-
-	<div style="float:right; width:350px;">
-		<div id="add">{add}</div>
-	</div>
-	<div style="clear:both; margin: 0 0 25px 0;" class="floatbreaker">&#160;</div>
-	{table}
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/lxc/Makefile b/openQRM-5.3.50-CE/src/plugins/lxc/Makefile
deleted file mode 100644
index 6572d55..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lxc/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/lxc/etc
-	cp etc/openqrm-plugin-lxc.conf /usr/share/openqrm/plugins/lxc/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/lxc/etc/openqrm-plugin-lxc.conf b/openQRM-5.3.50-CE/src/plugins/lxc/etc/openqrm-plugin-lxc.conf
deleted file mode 100644
index d5b084b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/lxc/etc/openqrm-plugin-lxc.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Integrates <a href='http://lxc.sourceforge.net/' target='_BLANK'>LXC Linux Containers</a> as a lightweight container based Virtualization technology. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="virtualization"
diff --git a/openQRM-5.3.50-CE/src/plugins/magento/Makefile b/openQRM-5.3.50-CE/src/plugins/magento/Makefile
deleted file mode 100644
index 8ea5d05..0000000
--- a/openQRM-5.3.50-CE/src/plugins/magento/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/magento/etc
-	cp etc/openqrm-plugin-magento.conf /usr/share/openqrm/plugins/magento/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/magento/etc/openqrm-plugin-magento.conf b/openQRM-5.3.50-CE/src/plugins/magento/etc/openqrm-plugin-magento.conf
deleted file mode 100644
index c9118c4..0000000
--- a/openQRM-5.3.50-CE/src/plugins/magento/etc/openqrm-plugin-magento.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Connect openQRM Cloud to a Magento E-Commerce systems (<a href='http://www.magentocommerce.com/' target='_BLANK'>Magento</a>). <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="cloud"
diff --git a/openQRM-5.3.50-CE/src/plugins/mantis/Makefile b/openQRM-5.3.50-CE/src/plugins/mantis/Makefile
deleted file mode 100644
index faf30b9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/mantis/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/mantis/etc
-	cp etc/openqrm-plugin-mantis.conf /usr/share/openqrm/plugins/mantis/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/mantis/etc/openqrm-plugin-mantis.conf b/openQRM-5.3.50-CE/src/plugins/mantis/etc/openqrm-plugin-mantis.conf
deleted file mode 100644
index eee956f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/mantis/etc/openqrm-plugin-mantis.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Connect openQRM Cloud to a Mantis BugTracker systems (<a href='http://www.mantiscommerce.com/' target='_BLANK'>Mantis</a>). <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="cloud"
diff --git a/openQRM-5.3.50-CE/src/plugins/marketplace/Makefile b/openQRM-5.3.50-CE/src/plugins/marketplace/Makefile
deleted file mode 100644
index b6f0680..0000000
--- a/openQRM-5.3.50-CE/src/plugins/marketplace/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/marketplace/etc
-	cp etc/openqrm-plugin-marketplace.conf /usr/share/openqrm/plugins/marketplace/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/marketplace/etc/openqrm-plugin-marketplace.conf b/openQRM-5.3.50-CE/src/plugins/marketplace/etc/openqrm-plugin-marketplace.conf
deleted file mode 100644
index 5adb90f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/marketplace/etc/openqrm-plugin-marketplace.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="SaaS Marketplace for the openQRM Cloud. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="cloud"
diff --git a/openQRM-5.3.50-CE/src/plugins/nagios4/Makefile b/openQRM-5.3.50-CE/src/plugins/nagios4/Makefile
deleted file mode 100644
index fed967f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nagios4/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/nagios4/etc
-	cp etc/openqrm-plugin-nagios4.conf /usr/share/openqrm/plugins/nagios4/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/nagios4/etc/openqrm-plugin-nagios4.conf b/openQRM-5.3.50-CE/src/plugins/nagios4/etc/openqrm-plugin-nagios4.conf
deleted file mode 100644
index 438dd05..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nagios4/etc/openqrm-plugin-nagios4.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Monitor Systems and Services with <a href='http://www.nagios.org/' target='_BLANK'>Nagios</a>. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="monitoring"
diff --git a/openQRM-5.3.50-CE/src/plugins/netbond/Makefile b/openQRM-5.3.50-CE/src/plugins/netbond/Makefile
deleted file mode 100644
index 6832d9d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/netbond/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/netbond/etc
-	cp etc/openqrm-plugin-netbond.conf /usr/share/openqrm/plugins/netbond/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/netbond/etc/openqrm-plugin-netbond.conf b/openQRM-5.3.50-CE/src/plugins/netbond/etc/openqrm-plugin-netbond.conf
deleted file mode 100644
index 032cdb2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/netbond/etc/openqrm-plugin-netbond.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Consolidate (bond) network interfaces (network-deployment). <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="network"
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/Makefile b/openQRM-5.3.50-CE/src/plugins/network-manager/Makefile
deleted file mode 100644
index 65337c2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# this is the openQRM network-manager-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/network-manager* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/img
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && chmod 777 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/lang/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/bin
-	. $(OPENQRM_SERVER_CONF) && cp bin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/bin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/bin/openqrm*
-	. $(OPENQRM_SERVER_CONF) && tar -C $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager -czvf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/boot-service-network-manager.tgz include/ bin/ etc/init.d/network-manager
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/network-manager
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/network-manager/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/bin/openqrm-network-manager b/openQRM-5.3.50-CE/src/plugins/network-manager/bin/openqrm-network-manager
deleted file mode 100644
index ffdaeaf..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/bin/openqrm-network-manager
+++ /dev/null
@@ -1,511 +0,0 @@
-#!/bin/bash
-# this script automatically manages network devices
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/include/openqrm-plugin-network-manager-functions
-OPENQRM_POSTENCODE="$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-postencode"
-if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-	OPENQRM_SERVER_IP=$resource_openqrmserver
-	OPENQRM_EXEC_PORT=$resource_execdport
-elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-	openqrm_server_get_config
-	OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-	resource_id=0
-	resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-	openqrm_web_protocol=$OPENQRM_WEB_PROTOCOL
-fi
-export LANG=C
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-# let only root run this script
-WHOAMI=`whoami`
-if [ "$WHOAMI" != "root" ]; then
-	echo "ERROR: Please run this script as root!"
-	exit 6
-fi
-
-# deps installed ?
-# screen
-if ! openqrm_full_fill_os_dependency screen screen; then
-	if [ "$NON_BLOCKING" != "true" ]; then
-		openqrm_unblock_starting_queue $@
-	fi
-	exit 1
-fi
-# wget
-if ! openqrm_full_fill_os_dependency wget wget; then
-	if [ "$NON_BLOCKING" != "true" ]; then
-		openqrm_unblock_starting_queue $@
-	fi
-	exit 1
-fi
-# procmail for lockfile
-if ! openqrm_full_fill_os_dependency lockfile procmail; then
-	if [ "$NON_BLOCKING" != "true" ]; then
-		openqrm_unblock_starting_queue $@
-	fi
-	exit 1
-fi
-# bridge-utils
-if ! openqrm_full_fill_os_dependency brctl bridge-utils; then
-	if [ "$NON_BLOCKING" != "true" ]; then
-		openqrm_unblock_starting_queue $@
-	fi
-	exit 1
-fi
-# iptables
-if ! openqrm_full_fill_os_dependency iptables iptables; then
-	if [ "$NON_BLOCKING" != "true" ]; then
-		openqrm_unblock_starting_queue $@
-	fi
-	exit 1
-fi
-# dnsmasq
-if ! openqrm_full_fill_os_dependency dnsmasq dnsmasq; then
-	if [ "$NON_BLOCKING" != "true" ]; then
-		openqrm_unblock_starting_queue $@
-	fi
-	exit 1
-fi
-if [ -f /etc/debian_version ]; then
-	# vlan
-	if ! openqrm_full_fill_os_dependency vconfig vlan; then
-		if [ "$NON_BLOCKING" != "true" ]; then
-			openqrm_unblock_starting_queue $@
-		fi
-		exit 1
-	fi
-elif [ -f /etc/redhat-release ]; then
-	# vlan
-	if ! openqrm_full_fill_os_dependency vconfig vconfig; then
-		if [ "$NON_BLOCKING" != "true" ]; then
-			openqrm_unblock_starting_queue $@
-		fi
-		exit 1
-	fi
-elif [ -f /etc/SuSE-release ]; then
-	# vlan
-	if ! openqrm_full_fill_os_dependency vconfig vlan; then
-		if [ "$NON_BLOCKING" != "true" ]; then
-			openqrm_unblock_starting_queue $@
-		fi
-		exit 1
-	fi
-fi
-# load vlan kernel module
-modprobe 8021q
-
-
-function network_manager_usage() {
-	echo "Usage : $0 post_config <-u username> <-p password>"
-	echo "        $0 add_br <-b bridge-name> <-n network-card> <-i brige_ip> <-s brige_subnet> <-u username> <-p password> [-f bridge-fd ] [-h brige_hello] [-a brige_maxage] [-t brige_stp] [-m brige_mac] [-g brige_gateway] [-df dnsmasq_first_ip ] [-dl dnsmasq_last_ip ] [-v VLAN ID]"
-	echo "        $0 remove_br <-b bridge-name> <-u username> <-p password>"
-	echo ""
-	echo "Optional parameters:"
-	echo "             [--openqrm-ui-user <username>]"
-	echo "             [--openqrm-internal-cmd <true/false>]"
-	echo "             [--openqrm-cmd-mode <regular/background/fork>]"
-	exit 1
-}
-
-FULL_COMMANDLINE="$0 $@"
-NETWORK_MANAGER_MANAGER_COMMAND=$1
-shift
-
-while [ $# -ne 0 ]; do
-	case "$1" in
-		-n)
-			NETWORK_CARD=$2
-			shift
-			;;
-		-b)
-			NETWORK_BRIDGE_NAME=$2
-			shift
-			;;
-		-f)
-			NETWORK_BRIDGE_FD=$2
-			shift
-			;;
-		-h)
-			NETWORK_BRIDGE_HELLO=$2
-			shift
-			;;
-		-a)
-			NETWORK_BRIDGE_MAXAGE=$2
-			shift
-			;;
-		-t)
-			NETWORK_BRIDGE_STP=$2
-			shift
-			;;
-		-m)
-			NETWORK_BRIDGE_MAC=$2
-			shift
-			;;
-		-i)
-			NETWORK_BRIDGE_IP_ADDRESS=$2
-			shift
-			;;
-		-s)
-			NETWORK_BRIDGE_SUBNETMASK=$2
-			shift
-			;;
-		-g)
-			NETWORK_BRIDGE_GATEWAY=$2
-			shift
-			;;
-		-v)
-			NETWORK_BRIDGE_VLAN=$2
-			shift
-			;;
-		-df)
-			NETWORK_BRIDGE_DNSMASQ_IP_FIRST=$2
-			shift
-			;;
-		-dl)
-			NETWORK_BRIDGE_DNSMASQ_IP_LAST=$2
-			shift
-			;;
-		-u)
-			NETWORK_MANAGER_OPENQRM_USERNAME=$2
-			shift
-			;;
-		-p)
-			NETWORK_MANAGER_OPENQRM_PASSWORD=$2
-			shift
-			;;
-		--openqrm-ui-user)
-			OPENQRM_UI_USER=$2
-			shift
-			;;
-		--openqrm-internal-cmd)
-			OPENQRM_INTERNAL_CMD=$2
-			shift
-			;;
-		--openqrm-cmd-mode)
-			OPENQRM_CMD_MODE=$2
-			shift
-			;;
-		*)
-			if [ "$NON_BLOCKING" != "true" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			fi
-			echo "ERROR: Free commandline arguments are not allowed"
-			network_manager_manager_usage
-			exit 6
-			;;
-	esac
-	shift
-done
-
-if [ "$OPENQRM_UI_USER" != "" ]; then
-	OPENQRM_UI_USER_PARAMETER=" --openqrm-ui-user $OPENQRM_UI_USER"
-fi
-
-# main
-case "$NETWORK_MANAGER_MANAGER_COMMAND" in
-
-	post_config)
-		LOCK_TIME=`openqrm_lock_queue aquire network-manager`
-		trap "openqrm_lock_queue release network-manager $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		TMP_CONFIG=`mktemp /tmp/network-manager.XXXXXX`
-		SYSTEM_STATUS_TMP=$resource_id.network_config
-		> $SYSTEM_STATUS_TMP
-		ALL_NET_DEV_LIST=""
-		for NET_DEV in `ip a s | grep ^[0-9] | cut -d':' -f2 | awk '{ print $1 }' | grep -v lo`; do
-			ALL_NET_DEV_LIST="$ALL_NET_DEV_LIST $NET_DEV"
-			if brctl show | tail -n+2 | awk '{ print $1 }' | grep -w $NET_DEV 1>/dev/null; then
-				ATTACHED_TO=`brctl show | tail -n+2 | grep -w $NET_DEV | awk '{ print $4 }'`
-				BRIDGE_MAC=`ip a s $NET_DEV | grep -w $NET_DEV$ | grep "link/ether" | awk '{ print $2 }' | tr "[:upper:]" "[:lower:]"`
-				BRIDGE_IP_LIST=`get_ip_list_for_dev $NET_DEV`
-				echo "b@$NET_DEV@$BRIDGE_MAC@$BRIDGE_IP_LIST@$ATTACHED_TO" >> $SYSTEM_STATUS_TMP
-			else
-				NET_DEV_MAC=`ip a s $NET_DEV | grep -w $NET_DEV$ | grep "link/ether" | awk '{ print $2 }' | tr "[:upper:]" "[:lower:]"`
-				NET_DEV_IP_LIST=`get_ip_list_for_dev $NET_DEV`
-				echo "n@$NET_DEV@$NET_DEV_MAC@$NET_DEV_IP_LIST" >> $SYSTEM_STATUS_TMP
-			fi
-		done
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$NETWORK_MANAGER_OPENQRM_USERNAME --http-password=$NETWORK_MANAGER_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $SYSTEM_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/network-manager/network-manager-action.php?network_manager_command=get_network_config; then
-			openqrm_post_event 0 "post_vg" 2 "openqrm-network-manager" "Could not post the device list to the openQRM-server at $OPENQRM_SERVER_IP!"
-		fi
-		rm -f $SYSTEM_STATUS_TMP $SYSTEM_STATUS_TMP.post
-
-		openqrm_lock_queue release network-manager $LOCK_TIME
-		trap '' EXIT
-		;;
-
-	add_br)
-		RETURN_CODE=0
-		RETURN_MSG=""
-		if [ "$NETWORK_BRIDGE_NAME" == "" ] || [ "$NETWORK_CARD" == "" ] || [ "$NETWORK_BRIDGE_IP_ADDRESS" == "" ] || [ "$NETWORK_BRIDGE_SUBNETMASK" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			network_manager_usage
-		fi
-		if `brctl show | tail -n+2 | grep -w $NETWORK_BRIDGE_NAME 1>/dev/null`; then
-			RETURN_CODE=1
-			RETURN_MSG="Network bridge $NETWORK_BRIDGE_NAME already exists on resource $resource_id."
-			openqrm_post_event 0 "add_br" 3 "openqrm-network-manager" "$RETURN_MSG"
-		fi
-		# if the bridge-ports nic has already the same ip as the new vlan nic
-		if [ "$NETWORK_BRIDGE_VLAN" != "" ] && [ "$NETWORK_BRIDGE_VLAN" != "0" ]; then
-			NETWORK_CARD_CONFIG=`get_ip_list_for_dev $NETWORK_CARD`
-			NETWORK_CARD_IP_ADDRESS=`echo $NETWORK_CARD_CONFIG | cut -d'/' -f1`
-			if [ "$NETWORK_CARD_IP_ADDRESS" == "$NETWORK_BRIDGE_IP_ADDRESS" ]; then
-				openqrm_post_event 0 "add_br" 2 "openqrm-network-manager" "IP Address $NETWORK_BRIDGE_IP_ADDRESS already in use by $NETWORK_CARD on resource $resource_id."
-				RETURN_CODE=1
-				RETURN_MSG="IP Address $NETWORK_BRIDGE_IP_ADDRESS already in use by $NETWORK_CARD on resource $resource_id."
-			fi
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire network-manager`
-		trap "openqrm_lock_queue release network-manager $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		openqrm_save_network_config
-		if [ "$RETURN_CODE" == 0 ]; then
-			if [ "$NETWORK_CARD" != "" ]; then
-				ifdown $NETWORK_CARD
-			fi
-			openqrm_add_interface bridge"@"$NETWORK_BRIDGE_NAME"@"$NETWORK_CARD"@"$NETWORK_BRIDGE_FD"@"$NETWORK_BRIDGE_HELLO"@"$NETWORK_BRIDGE_MAXAGE"@"$NETWORK_BRIDGE_STP"@"$NETWORK_BRIDGE_MAC"@"$NETWORK_BRIDGE_IP_ADDRESS"@"$NETWORK_BRIDGE_SUBNETMASK"@"$NETWORK_BRIDGE_GATEWAY"@"$NETWORK_BRIDGE_VLAN"@"
-			ifdown $NETWORK_BRIDGE_NAME 2>/dev/null
-			if [ "$NETWORK_CARD" != "" ]; then
-				ifup $NETWORK_CARD
-			fi
-			# bring up the new bridge
-			if ! ifup $NETWORK_BRIDGE_NAME; then
-				openqrm_rollback_network_config
-				ifconfig $NETWORK_BRIDGE_NAME down
-				brctl delbr $NETWORK_BRIDGE_NAME
-				if [ "$NETWORK_CARD" != "" ]; then
-					ifup $NETWORK_CARD
-				fi
-				openqrm_post_event 0 "add_br" 2 "openqrm-network-manager" "Error activating bridge $NETWORK_BRIDGE_NAME. Rolling back network-configuration on resource $resource_id."
-				RETURN_CODE=1
-				RETURN_MSG="Error activating bridge $NETWORK_BRIDGE_NAME on resource $resource_id."
-			fi
-		fi
-
-		# check if the openQRM still can be reached, if not roll back
-		if [ "$RETURN_CODE" == 0 ]; then
-			if ! ping -c 1 $OPENQRM_SERVER_IP -w 5 -W 5 2>/dev/null 1>/dev/null; then
-				openqrm_rollback_network_config
-				ifconfig $NETWORK_BRIDGE_NAME down
-				brctl delbr $NETWORK_BRIDGE_NAME
-				if [ "$NETWORK_CARD" != "" ]; then
-					ifup $NETWORK_CARD
-				fi
-				openqrm_post_event 0 "add_br" 2 "openqrm-network-manager" "Error reaching openQRM Server at $OPENQRM_SERVER_IP. Rolling back network-configuration on resource $resource_id."
-				RETURN_CODE=1
-				RETURN_MSG="Error reaching openQRM Server at $OPENQRM_SERVER_IP on resource $resource_id."
-			fi
-		fi
-
-		# in case this is the openQRM Server itself and the openQRM Interface changed we need to adapt the openqrm-server.conf
-		if [ "$RETURN_CODE" == 0 ]; then
-			if [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-				if [ "$NETWORK_CARD" != "" ]; then
-					if [ "$OPENQRM_SERVER_INTERFACE" == "$NETWORK_CARD" ]; then
-						sed -i -e "s/^OPENQRM_SERVER_INTERFACE=.*/OPENQRM_SERVER_INTERFACE=\"$NETWORK_BRIDGE_NAME\"/g" $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-					fi
-				fi
-			fi
-		fi
-
-
-#		# dnsmasq - take the subnet from the bridge
-#		if [ "$RETURN_CODE" == 0 ]; then
-#			if [ "$NETWORK_BRIDGE_SUBNETMASK" != "" ] && [ "$NETWORK_BRIDGE_IP_ADDRESS" != "" ] && [ "$NETWORK_BRIDGE_DNSMASQ_IP_FIRST" != "" ] && [ "$NETWORK_BRIDGE_DNSMASQ_IP_LAST" != "" ]; then
-#				NETWORK_BRIDGE_DNSMASQ_NETWORK=`get_network_address $NETWORK_BRIDGE_IP_ADDRESS $NETWORK_BRIDGE_SUBNETMASK`
-#				# iptables masq
-#				if ! iptables -t nat -A POSTROUTING -s $NETWORK_BRIDGE_DNSMASQ_NETWORK ! -d $NETWORK_BRIDGE_DNSMASQ_NETWORK -j MASQUERADE; then
-#					RETURN_CODE=1
-#					RETURN_MSG="Error masquarading dsnmasq network $NETWORK_BRIDGE_DNSMASQ_NETWORK for $NETWORK_BRIDGE_GATEWAY for $NETWORK_BRIDGE_NAME on resource $resource_id."
-#					openqrm_post_event 0 "add_br" 3 "openqrm-network-manager" "$RETURN_MSG"
-#				fi
-#				# dnsmasq
-#				if [ "$RETURN_CODE" == 0 ]; then
-#					if ! dnsmasq --strict-order --bind-interfaces --pid-file=/var/run/dnsmasq.$NETWORK_BRIDGE_NAME.pid --listen-address $NETWORK_BRIDGE_IP_ADDRESS --dhcp-range $NETWORK_BRIDGE_DNSMASQ_IP_FIRST,$NETWORK_BRIDGE_DNSMASQ_IP_LAST --dhcp-no-override --except-interface=lo --interface=$NETWORK_BRIDGE_NAME; then
-#						RETURN_CODE=1
-#						RETURN_MSG="Error starting dsnmasq network $NETWORK_BRIDGE_DNSMASQ_NETWORK for $NETWORK_BRIDGE_GATEWAY for $NETWORK_BRIDGE_NAME on resource $resource_id."
-#						openqrm_post_event 0 "add_br" 3 "openqrm-network-manager" "$RETURN_MSG"
-#					fi
-#					echo 1 > /proc/sys/net/ipv4/ip_forward
-#				fi
-#				DNSMASQ_PID=`cat /var/run/dnsmasq.$NETWORK_BRIDGE_NAME.pid`
-#			fi
-#		fi
-
-
-
-
-		if [ "$RETURN_CODE" == 0 ]; then
-			RETURN_MSG="ok"
-		fi
-		# Send message
-		SYSTEM_STATUS_TMP=$resource_id.network_stat
-		> $SYSTEM_STATUS_TMP
-		echo $RETURN_MSG > $SYSTEM_STATUS_TMP
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$NETWORK_MANAGER_OPENQRM_USERNAME --http-password=$NETWORK_MANAGER_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $SYSTEM_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/network-manager/network-manager-action.php?network_manager_command=get_network_config; then
-			openqrm_post_event 0 "add_br" 2 "openqrm-network-manager" "Could not post the device list to the openQRM-server at $OPENQRM_SERVER_IP!"
-		fi
-		rm -f $SYSTEM_STATUS_TMP
-
-		openqrm_lock_queue release network-manager $LOCK_TIME
-		trap '' EXIT
-
-		exit $RETURN_CODE
-		;;
-
-
-	remove_br)
-		RETURN_CODE=0
-		RETURN_MSG=""
-		if [ "$NETWORK_BRIDGE_NAME" == "" ]; then
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			network_manager_usage
-		fi
-		if `! brctl show | tail -n+2 | grep -w $NETWORK_BRIDGE_NAME 1>/dev/null`; then
-			RETURN_CODE=1
-			RETURN_MSG="Network bridge $NETWORK_BRIDGE_NAME does not exists on resource $resource_id."
-			openqrm_post_event 0 "add_br" 3 "openqrm-network-manager" "$RETURN_MSG"
-		fi
-		NETWORK_CARD=`brctl show | tail -n+2 | grep -w $NETWORK_BRIDGE_NAME | awk '{ print $4 }'`
-		# if this is openQRM itself
-		if [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-			if [ "$OPENQRM_SERVER_INTERFACE" == "$NETWORK_BRIDGE_NAME" ]; then
-				if [ "$NETWORK_CARD" == "" ]; then
-					RETURN_CODE=1
-					RETURN_MSG="$NETWORK_BRIDGE_NAME is the openQRM Management Network Interface! Not remove bridge $NETWORK_BRIDGE_NAME which does not have any Interfaces attached."
-					openqrm_post_event 0 "add_br" 3 "openqrm-network-manager" "$RETURN_MSG"
-				fi
-			fi
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire network-manager`
-		trap "openqrm_lock_queue release network-manager $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		openqrm_post_event 0 "remove_br" 5 "openqrm-network-manager" "Removing network bridge $NETWORK_BRIDGE_NAME on resource $resource_id."
-		openqrm_save_network_config
-
-
-#		# clean up iptables + dnsmasq
-#		if [ "$NETWORK_CARD_IP_ADDRESS" != "" ] && [ "$NETWORK_CARD_SUBNET_MASK" != "" ]; then
-#			NETWORK_BRIDGE_DNSMASQ_NETWORK=`get_network_address $NETWORK_CARD_IP_ADDRESS $NETWORK_CARD_SUBNET_MASK`
-#			iptables -t nat -D POSTROUTING -s $NETWORK_BRIDGE_DNSMASQ_NETWORK -j MASQUERADE
-#			DNSMASQ_PID=`cat /var/run/dnsmasq.$NETWORK_BRIDGE_NAME.pid 2>/dev/null` && kill -9 $DNSMASQ_PID
-#		fi
-
-		# if network-card = attached_to apply previous ip config of the removed bridge
-		if [ "$NETWORK_CARD" != "" ]; then
-			# if it is a real phys. interface and not a VLAN nic
-			if ! echo $NETWORK_CARD | grep .[0-9]\.[0-9] 1>/dev/null; then
-				# get ip config of attached_to to apply to physical device later
-				NETWORK_CARD_CONFIG=`get_ip_list_for_dev $NETWORK_BRIDGE_NAME`
-				NETWORK_CARD_IP_ADDRESS=`echo $NETWORK_CARD_CONFIG | cut -d'/' -f1`
-				NETWORK_CARD_BROADCAST=`echo $NETWORK_CARD_CONFIG | cut -d'/' -f2`
-				NETWORK_CARD_SUBNET_MASK=`echo $NETWORK_CARD_CONFIG | cut -d'/' -f3`
-				NETWORK_CARD_GATEWAY=`route -n | grep -w ^0.0.0.0 | grep -w $NETWORK_BRIDGE_NAME | awk '{ print $2 }'`
-			fi
-		fi
-
-		# bring down the bridge and remove from config
-		ifconfig $NETWORK_BRIDGE_NAME down
-		brctl delbr $NETWORK_BRIDGE_NAME
-		openqrm_remove_interface bridge"@"$NETWORK_BRIDGE_NAME"@"$NETWORK_CARD
-		if [ "$NETWORK_CARD_IP_ADDRESS" != "" ] && [ "$NETWORK_CARD_SUBNET_MASK" != "" ]; then
-			# re-write config for nic
-			openqrm_add_interface nic"@"$NETWORK_CARD"@@@@@@@"$NETWORK_CARD_IP_ADDRESS"@"$NETWORK_CARD_SUBNET_MASK"@"$NETWORK_CARD_GATEWAY"@@"
-		fi
-		if [ "$NETWORK_CARD" != "" ]; then
-			if ! echo $NETWORK_CARD | grep .[0-9]\.[0-9] 1>/dev/null; then
-				ifdown $NETWORK_CARD
-				ifup $NETWORK_CARD
-			else
-				# remove VLAN Interface
-				ifconfig $NETWORK_CARD down
-				vconfig rem $NETWORK_CARD
-			fi
-		fi
-
-		# check if the openQRM still can be reached, if not roll back
-		if [ "$RETURN_CODE" == 0 ]; then
-			if ! ping -c 1 $OPENQRM_SERVER_IP -w 5 -W 5 2>/dev/null 1>/dev/null; then
-				if [ "$NETWORK_CARD" != "" ]; then
-					ifdown $NETWORK_CARD
-				fi
-				openqrm_rollback_network_config
-				ifup $NETWORK_BRIDGE_NAME
-				openqrm_post_event 0 "add_br" 2 "openqrm-network-manager" "Error reaching openQRM Server at $OPENQRM_SERVER_IP. Rolling back network-configuration on resource $resource_id."
-				RETURN_CODE=1
-				RETURN_MSG="Error reaching openQRM Server at $OPENQRM_SERVER_IP on resource $resource_id."
-			fi
-		fi
-
-		# in case this is the openQRM Server itself and the openQRM Interface changed we need to adapt the openqrm-server.conf
-		if [ "$RETURN_CODE" == 0 ]; then
-			if [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-				if [ "$OPENQRM_SERVER_INTERFACE" == "$NETWORK_BRIDGE_NAME" ]; then
-					if [ "$NETWORK_CARD" != "" ]; then
-						sed -i -e "s/^OPENQRM_SERVER_INTERFACE=.*/OPENQRM_SERVER_INTERFACE=\"$NETWORK_CARD\"/g" $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-					fi
-				fi
-			fi
-		fi
-
-		if [ "$RETURN_CODE" == 0 ]; then
-			RETURN_MSG="ok"
-			openqrm_post_event 0 "remove_br" 5 "openqrm-network-manager" "Removed network bridge $NETWORK_BRIDGE_NAME on resource $resource_id."
-		fi
-		# Send message
-		SYSTEM_STATUS_TMP=$resource_id.network_stat
-		> $SYSTEM_STATUS_TMP
-		echo $RETURN_MSG > $SYSTEM_STATUS_TMP
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$NETWORK_MANAGER_OPENQRM_USERNAME --http-password=$NETWORK_MANAGER_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $SYSTEM_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/network-manager/network-manager-action.php?network_manager_command=get_network_config; then
-			openqrm_post_event 0 "remove_br" 2 "openqrm-network-manager" "Could not post the device list to the openQRM-server at $OPENQRM_SERVER_IP!"
-		fi
-		rm -f $SYSTEM_STATUS_TMP
-
-		openqrm_lock_queue release network-manager $LOCK_TIME
-		trap '' EXIT
-
-		exit $RETURN_CODE
-		;;
-
-
-
-
-
-	*)
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		echo "ERROR: Free commandline arguments are not allowed!"
-		network_manager_usage
-		exit 6
-		;;
-esac
-
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/etc/init.d/network-manager b/openQRM-5.3.50-CE/src/plugins/network-manager/etc/init.d/network-manager
deleted file mode 100644
index 6fbd509..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/etc/init.d/network-manager
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-# this is the boot-service init script for the network-manager resources
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-# for including the package functions
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/include/openqrm-plugin-network-manager-functions
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-OPENQRM_SERVER_IP=$resource_openqrmserver
-
-# do not run on idle resources
-if [ "$resource_image" == "idle" ]; then
-	exit 0
-fi
-
-# also do not run before the real init of the rootfs
-# if we have this file /etc/initrd-devices.conf we are still in the initrd
-if [ -f /etc/initrd-devices.conf ]; then
-
-	# TODO: add your commands to run in the initrd-stage on a managed system (network-deployment only)
-
-	exit 0
-fi
-
-
-function device_manager_start() {
-	echo "Starting the openQRM network-manager-plugin"
-	device_manager_stop 1>/dev/null 2>&1
-}
-
-
-function device_manager_stop() {
-	echo "Stopping the openQRM network-manager-plugin"
-}
-
-
-
-
-
-case "$1" in
-	start)
-		device_manager_start
-		;;
-	stop)
-		device_manager_stop
-		;;
-	restart)
-		device_manager_stop
-		sleep 1
-		device_manager_start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/etc/init.d/openqrm-plugin-network-manager b/openQRM-5.3.50-CE/src/plugins/network-manager/etc/init.d/openqrm-plugin-network-manager
deleted file mode 100644
index 0fc3ec1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/etc/init.d/openqrm-plugin-network-manager
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/bash
-# init script for the openQRM network-manager-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/include/openqrm-plugin-network-manager-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/etc/openqrm-plugin-network-manager.conf
-openqrm_server_get_config
-export LANG=C
-# define wget to use with https
-if [ "$OPENQRM_WEB_PROTOCOL" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-
-function openqrm_plugin_device_manager_start() {
-	echo "Starting the openQRM network-manager-plugin"
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/network-manager/.running
-}
-
-
-function openqrm_plugin_device_manager_stop() {
-	echo "Stopping the openQRM network-manager-plugin"
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/network-manager/.running
-}
-
-function openqrm_plugin_device_manager_uninstall() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "network-manager: Please give a username to uninstall the plugin : "
-		read USERNAME
-		echo
-		echo -n "network-manager: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Uninstalling the openQRM network-manager-plugin"
-	openqrm_plugin_device_manager_stop
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-network-manager.tgz
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/network-manager
-}
-
-function openqrm_plugin_device_manager_init() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "network-manager: Please give a username to init the plugin : "
-		read USERNAME
-		echo
-		echo -n "network-manager: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-
-	echo "Initializing the openQRM network-manager-plugin"
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/network-manager
-	# link the boot-service
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/boot-service-network-manager.tgz $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-network-manager.tgz
-	# create storage dir for stat files
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/storage
-	chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/storage
-	echo "Order deny,allow" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/storage/.htaccess
-	echo "Deny from all" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/network-manager/web/storage/.htaccess
-
-}
-
-
-
-
-
-
-
-USER=$2
-PASS=$3
-
-case "$1" in
-	start)
-		openqrm_plugin_device_manager_start
-		;;
-	stop)
-		openqrm_plugin_device_manager_stop
-		;;
-	restart)
-		openqrm_plugin_device_manager_stop
-		sleep 1
-		openqrm_plugin_device_manager_start
-		;;
-	init)
-		openqrm_plugin_device_manager_init $USER $PASS
-		;;
-	uninstall)
-		openqrm_plugin_device_manager_uninstall $USER $PASS
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/etc/init.d/openqrm-plugin-network-manager.postinstall b/openQRM-5.3.50-CE/src/plugins/network-manager/etc/init.d/openqrm-plugin-network-manager.postinstall
deleted file mode 100644
index e9f6dcf..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/etc/init.d/openqrm-plugin-network-manager.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-network-manager postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/etc/init.d/openqrm-plugin-network-manager.preremove b/openQRM-5.3.50-CE/src/plugins/network-manager/etc/init.d/openqrm-plugin-network-manager.preremove
deleted file mode 100644
index 8b4a7b5..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/etc/init.d/openqrm-plugin-network-manager.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-network-manager preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-network-manager stop
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/etc/openqrm-plugin-network-manager.conf b/openQRM-5.3.50-CE/src/plugins/network-manager/etc/openqrm-plugin-network-manager.conf
deleted file mode 100644
index 053a968..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/etc/openqrm-plugin-network-manager.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-# this is the openQRM-plugin-network-manager info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="A Network-manager to preconfigure network-bridges."
-OPENQRM_PLUGIN_TYPE="network"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES=""
-
-# list of storage types supported by this plugin
-OPENQRM_DEVICE_MANAGER_STORAGE_TYPES="kvm-lvm-deployment, lvm-aoe-deployment, lvm-iscsi-deployment, lvm-nfs-deployment, aoe-san-deployment, iscsi-san-deployment, xen-lvm-deployment, clonezilla-deployment, openvz-deployment, lxc-lvm-deployment"
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES=""
-# dirs which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_DIRS="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/web/network-manager/ $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/etc/"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/include/openqrm-plugin-network-manager-functions b/openQRM-5.3.50-CE/src/plugins/network-manager/include/openqrm-plugin-network-manager-functions
deleted file mode 100644
index 10aa50f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/include/openqrm-plugin-network-manager-functions
+++ /dev/null
@@ -1,448 +0,0 @@
-#!/bin/bash
-# this is the functions file for the network-manager-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-INTERFACES="/etc/network/interfaces"
-NETWORK_CONFIG_DIR_RH="/etc/sysconfig/network-scripts/"
-NETWORK_CONFIG_DIR_SUSE="/etc/sysconfig/network/"
-
-
-################ common network-manager functions
-
-# logs for network-manager
-function network_manager_log() {
-	local COMPONENT=$1
-	shift
-	local MESSAGE=$@
-	logger -i -t "network-manager plug-in" "$COMPONENT : $MESSAGE"
-}
-
-
-################ network-manager functions
-
-# translates cidr to subnet mask
-function cidrtosub () {
-   set -- $(( 5 - ($1 / 8) )) 255 255 255 255 $(( (255 << (8 - ($1 % 8))) & 255 )) 0 0 0
-   [ $1 -gt 1 ] && shift $1 || shift
-   echo ${1-0}.${2-0}.${3-0}.${4-0}
-}
-
-function get_ip_list_for_dev() {
-	NW_DEV=$1
-	NET_DEV_IP_LIST=""
-	DEV_LOOP=0
-	for NET_DEV_IP in `ip addr show $NW_DEV | grep -w inet | awk '{ print $2 }'`; do
-		NET_DEV_IP=`echo $NET_DEV_IP | cut -d'/' -f1`
-		NET_DEV_IP_CONFIG=""
-		if [ "$NET_DEV_IP" != "" ]; then
-			NET_DEV_BROADCAST=`ip a s | grep -w $NET_DEV_IP | grep -w inet | awk '{ print $4 }'`
-			NET_DEV_CIDR=`ip a s | grep -w $NET_DEV_IP | grep -w inet | awk '{ print $2 }' | cut -d'/' -f2`
-			NET_DEV_SUBNETMASK=`cidrtosub $NET_DEV_CIDR`
-			NET_DEV_IP_CONFIG="$NET_DEV_IP/$NET_DEV_BROADCAST/$NET_DEV_SUBNETMASK"
-		fi
-		if [ "$DEV_LOOP" == "0" ]; then
-			NET_DEV_IP_LIST="$NET_DEV_IP_CONFIG"
-		else
-			NET_DEV_IP_LIST="$NET_DEV_IP_LIST:$NET_DEV_IP_CONFIG"
-		fi
-		DEV_LOOP=$(( $DEV_LOOP + 1 ))
-	done
-	echo $NET_DEV_IP_LIST
-}
-
-
-function get_network_address() {
-	local NIP=$1
-	local NSUB=$2
-	IFS=. read -r i1 i2 i3 i4 <<< "$NIP"
-	IFS=. read -r m1 m2 m3 m4 <<< "$NSUB"
-	printf "%d.%d.%d.%d\n" "$((i1 & m1))" "$(($i2 & m2))" "$((i3 & m3))" "$((i4 & m4))"
-}
-
-
-
-function openqrm_remove_network_interface_debian() {
-	local INTERFACE_NAME=$1
-	INTERFACE_NAME_SEQ=""
-	echo "# generated by the openQRM network-manager plugin" > $INTERFACES.new1
-	echo >> $INTERFACES.new1
-	while read line; do
-		if echo $line | grep ^# >/dev/null; then
-			continue
-		fi
-		if echo $line | grep -w ^auto >/dev/null; then
-			continue
-		fi
-		if echo $line | grep -w ^iface >/dev/null; then
-			INTERFACE_NAME_SEQ=`echo $line | grep ^iface | awk '{ print $2 }'`
-			if [ "$INTERFACE_NAME_SEQ" != "$INTERFACE_NAME" ]; then
-				if grep -w $INTERFACE_NAME_SEQ $INTERFACES | grep -w ^auto >/dev/null; then
-					echo "auto $INTERFACE_NAME_SEQ" >> $INTERFACES.new1
-				fi
-				echo "$line" >> $INTERFACES.new1
-			fi
-		else
-			if [ "$INTERFACE_NAME_SEQ" != "" ] && [ "$INTERFACE_NAME_SEQ" != "$INTERFACE_NAME" ]; then
-				echo "	$line" >> $INTERFACES.new1
-			fi
-		fi
-		if [ "$line" == "" ] && [ "$INTERFACE_NAME_SEQ" != "" ]; then
-			# config for IFACE ends here, write it
-			INTERFACE_NAME_SEQ=""
-			echo "" >> $INTERFACES.new1
-		fi
-	done < $INTERFACES
-	echo "" >> $INTERFACES.new1
-	mv -f $INTERFACES.new1 $INTERFACES
-
-}
-
-
-function openqrm_remove_network_interface_rh() {
-	local INTERFACE_NAME=$1
-	rm -f $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-}
-
-
-
-
-# add a interface
-function openqrm_add_interface() {
-	local NETWORKCONFIG=$1
-	if [ -f /etc/debian_version ]; then
-		openqrm_add_interface_debian $NETWORKCONFIG
-	elif [ -f /etc/redhat-release ]; then
-		export NETWORK_CONFIG_DIR=$NETWORK_CONFIG_DIR_RH
-		openqrm_add_interface_rh $NETWORKCONFIG
-	elif [ -f /etc/SuSE-release ]; then
-		export NETWORK_CONFIG_DIR=$NETWORK_CONFIG_DIR_SUSE
-		openqrm_add_interface_rh $NETWORKCONFIG
-	fi
-}
-
-
-# removes a bridge
-function openqrm_remove_interface() {
-	local NETWORKCONFIG=$1
-	if [ -f /etc/debian_version ]; then
-		openqrm_remove_interface_debian $NETWORKCONFIG
-	elif [ -f /etc/redhat-release ]; then
-		export NETWORK_CONFIG_DIR=$NETWORK_CONFIG_DIR_RH
-		openqrm_remove_interface_rh $NETWORKCONFIG
-	elif [ -f /etc/SuSE-release ]; then
-		export NETWORK_CONFIG_DIR=$NETWORK_CONFIG_DIR_SUSE
-		openqrm_remove_interface_rh $NETWORKCONFIG
-	fi
-}
-
-
-
-# saves the lastgood network configuration
-function openqrm_save_network_config() {
-	if [ -f /etc/debian_version ]; then
-		cp -f $INTERFACES $INTERFACES.rollback
-		return
-	fi
-	if [ -f /etc/redhat-release ]; then
-		export NETWORK_CONFIG_DIR=$NETWORK_CONFIG_DIR_RH
-	elif [ -f /etc/SuSE-release ]; then
-		export NETWORK_CONFIG_DIR=$NETWORK_CONFIG_DIR_SUSE
-	fi
-	mkdir -p $NETWORK_CONFIG_DIR/rollback
-	rm -f 	$NETWORK_CONFIG_DIR/rollback/*
-	cp -af $NETWORK_CONFIG_DIR/ifcfg* $NETWORK_CONFIG_DIR/rollback/
-}
-
-
-
-# rolls back the lastgood network configuration
-function openqrm_rollback_network_config() {
-	if [ -f /etc/debian_version ]; then
-		cp -f $INTERFACES.rollback $INTERFACES
-		return
-	fi
-	if [ -f /etc/redhat-release ]; then
-		export NETWORK_CONFIG_DIR=$NETWORK_CONFIG_DIR_RH
-	elif [ -f /etc/SuSE-release ]; then
-		export NETWORK_CONFIG_DIR=$NETWORK_CONFIG_DIR_SUSE
-	fi
-	cp -f $NETWORK_CONFIG_DIR/rollback/ifcfg* $NETWORK_CONFIG_DIR/
-}
-
-
-
-
-
-
-function openqrm_remove_interface_debian() {
-	local NETWORKCONFIG=$1
-	local INTERFACE_TYPE=`echo $NETWORKCONFIG | cut -d'@' -f1`
-	local INTERFACE_NAME=`echo $NETWORKCONFIG | cut -d'@' -f2`
-	local BRIDGE_NETWORK=`echo $NETWORKCONFIG | cut -d'@' -f3`
-	# backup + rollback
-	NOW=`date +%T%x | sed -e "s/://g" | sed -e "s#/##g"`
-	cp -f $INTERFACES $INTERFACES.$NOW
-
-	if [ "$INTERFACE_TYPE" == "bridge" ]; then
-		if [ "$BRIDGE_NETWORK" == "" ]; then
-			BRIDGE_NETWORK=`brctl show | tail -n+2 | grep -w $INTERFACE_NAME | awk '{ print $4 }'`
-		fi
-		if [ "$BRIDGE_NETWORK" != "" ]; then
-			openqrm_remove_network_interface_debian $BRIDGE_NETWORK
-		fi
-	fi
-	openqrm_remove_network_interface_debian $INTERFACE_NAME
-
-}
-
-
-
-
-function openqrm_remove_interface_rh() {
-	local NETWORKCONFIG=$1
-	local INTERFACE_TYPE=`echo $NETWORKCONFIG | cut -d'@' -f1`
-	local INTERFACE_NAME=`echo $NETWORKCONFIG | cut -d'@' -f2`
-	local BRIDGE_NETWORK=`echo $NETWORKCONFIG | cut -d'@' -f3`
-	# backup
-	NOW=`date +%T%x | sed -e "s/://g" | sed -e "s#/##g"`
-	mkdir -p $NETWORK_CONFIG_DIR/backup/$NOW
-	cp -af $NETWORK_CONFIG_DIR/ifcfg* $NETWORK_CONFIG_DIR/backup/$NOW/
-
-	if [ "$INTERFACE_TYPE" == "bridge" ]; then
-		if [ "$BRIDGE_NETWORK" == "" ]; then
-			BRIDGE_NETWORK=`brctl show | tail -n+2 | grep -w $INTERFACE_NAME | awk '{ print $4 }'`
-		fi
-		if [ "$BRIDGE_NETWORK" != "" ]; then
-			openqrm_remove_network_interface_rh $BRIDGE_NETWORK
-		fi
-	fi
-	openqrm_remove_network_interface_rh $INTERFACE_NAME
-
-}
-
-
-
-function openqrm_add_interface_debian() {
-	local NETWORKCONFIG=$1
-	local INTERFACE_TYPE=`echo $NETWORKCONFIG | cut -d'@' -f1`
-	local INTERFACE_NAME=`echo $NETWORKCONFIG | cut -d'@' -f2`
-	local BRIDGE_NETWORK=`echo $NETWORKCONFIG | cut -d'@' -f3`
-	local BRIDGE_FD=`echo $NETWORKCONFIG | cut -d'@' -f4`
-	local BRIDGE_HELLO=`echo $NETWORKCONFIG | cut -d'@' -f5`
-	local BRIDGE_MAXAGE=`echo $NETWORKCONFIG | cut -d'@' -f6`
-	local BRIDGE_STP=`echo $NETWORKCONFIG | cut -d'@' -f7`
-	local BRIDGE_MAC=`echo $NETWORKCONFIG | cut -d'@' -f8`
-	local INTERFACE_IP_ADDRESS=`echo $NETWORKCONFIG | cut -d'@' -f9`
-	local INTERFACE_SUBNETMASK=`echo $NETWORKCONFIG | cut -d'@' -f10`
-	local INTERFACE_GATEWAY=`echo $NETWORKCONFIG | cut -d'@' -f11`
-	local BRIDGE_VLAN=`echo $NETWORKCONFIG | cut -d'@' -f12`
-	# backup
-	NOW=`date +%T%x | sed -e "s/://g" | sed -e "s#/##g"`
-	cp -f $INTERFACES $INTERFACES.$NOW
-
-	if [ "$INTERFACE_TYPE" == "bridge" ]; then
-		if [ "$BRIDGE_NETWORK" == "" ]; then
-			BRIDGE_NETWORK=`brctl show | tail -n+2 | grep -w $INTERFACE_NAME | awk '{ print $4 }'`
-		fi
-		if [ "$BRIDGE_NETWORK" != "" ]; then
-			openqrm_remove_network_interface_debian $BRIDGE_NETWORK
-		fi
-		openqrm_remove_network_interface_debian $INTERFACE_NAME
-
-		# add new config
-		if [ "$BRIDGE_NETWORK" != "" ]; then
-			if [ "$BRIDGE_VLAN" != "" ]; then
-				echo "iface $BRIDGE_NETWORK.$BRIDGE_VLAN inet manual" >> $INTERFACES
-				echo "	vlan-raw-device $BRIDGE_NETWORK" >> $INTERFACES
-			else
-				echo "iface $BRIDGE_NETWORK inet manual" >> $INTERFACES
-			fi
-			echo "" >> $INTERFACES
-			NETWORK_CARD_MAC=`ip a s $BRIDGE_NETWORK | grep -w $BRIDGE_NETWORK$ | grep "link/ether" | awk '{ print $2 }' | tr "[:upper:]" "[:lower:]"`
-		fi
-		# bridge settings
-		echo "auto $INTERFACE_NAME" >> $INTERFACES
-		echo "iface $INTERFACE_NAME inet static" >> $INTERFACES
-		if [ "$INTERFACE_IP_ADDRESS" != "" ]; then
-			echo "	address $INTERFACE_IP_ADDRESS" >> $INTERFACES
-		fi
-		if [ "$INTERFACE_SUBNETMASK" != "" ]; then
-			echo "	netmask $INTERFACE_SUBNETMASK" >> $INTERFACES
-		fi
-		if [ "$INTERFACE_GATEWAY" != "" ]; then
-			echo "	gateway $INTERFACE_GATEWAY" >> $INTERFACES
-		fi
-		if [ "$BRIDGE_FD" != "" ]; then
-			echo "	bridge_fd $BRIDGE_FD" >> $INTERFACES
-		fi
-		if [ "$BRIDGE_HELLO" != "" ]; then
-			echo "	bridge_hello $BRIDGE_HELLO" >> $INTERFACES
-		fi
-		if [ "$BRIDGE_MAXAGE" != "" ]; then
-			echo "	bridge_maxage $BRIDGE_MAXAGE" >> $INTERFACES
-		fi
-		if [ "$BRIDGE_STP" != "" ]; then
-			if [ "$BRIDGE_STP" == "0" ]; then
-				STP="off"
-			else
-				STP="on"
-			fi
-			echo "	bridge_stp $STP" >> $INTERFACES
-		fi
-		# attach nic
-		if [ "$BRIDGE_NETWORK" != "" ]; then
-			if [ "$BRIDGE_VLAN" != "" ]; then
-				echo "	bridge_ports $BRIDGE_NETWORK.$BRIDGE_VLAN" >> $INTERFACES
-			else
-				echo "	bridge_ports $BRIDGE_NETWORK" >> $INTERFACES
-			fi
-		fi
-		if [ "$BRIDGE_MAC" != "" ]; then
-			if [ "$BRIDGE_MAC" == "1" ] && [ "$NETWORK_CARD_MAC" != "" ]; then
-				echo "	post-up ip link set $INTERFACE_NAME address $NETWORK_CARD_MAC" >> $INTERFACES
-			fi
-		fi
-
-	else
-		echo "auto $INTERFACE_NAME" >> $INTERFACES
-		echo "iface $INTERFACE_NAME inet static" >> $INTERFACES
-		if [ "$INTERFACE_IP_ADDRESS" != "" ]; then
-			echo "	address $INTERFACE_IP_ADDRESS" >> $INTERFACES
-		fi
-		if [ "$INTERFACE_SUBNETMASK" != "" ]; then
-			echo "	netmask $INTERFACE_SUBNETMASK" >> $INTERFACES
-		fi
-		if [ "$INTERFACE_GATEWAY" != "" ]; then
-			echo "	gateway $INTERFACE_GATEWAY" >> $INTERFACES
-		fi
-	fi
-	echo "" >> $INTERFACES
-
-
-}
-
-
-
-
-function openqrm_add_interface_rh() {
-	local NETWORKCONFIG=$1
-	local INTERFACE_TYPE=`echo $NETWORKCONFIG | cut -d'@' -f1`
-	local INTERFACE_NAME=`echo $NETWORKCONFIG | cut -d'@' -f2`
-	local BRIDGE_NETWORK=`echo $NETWORKCONFIG | cut -d'@' -f3`
-	local BRIDGE_FD=`echo $NETWORKCONFIG | cut -d'@' -f4`
-	local BRIDGE_HELLO=`echo $NETWORKCONFIG | cut -d'@' -f5`
-	local BRIDGE_MAXAGE=`echo $NETWORKCONFIG | cut -d'@' -f6`
-	local BRIDGE_STP=`echo $NETWORKCONFIG | cut -d'@' -f7`
-	local BRIDGE_MAC=`echo $NETWORKCONFIG | cut -d'@' -f8`
-	local INTERFACE_IP_ADDRESS=`echo $NETWORKCONFIG | cut -d'@' -f9`
-	local INTERFACE_SUBNETMASK=`echo $NETWORKCONFIG | cut -d'@' -f10`
-	local INTERFACE_GATEWAY=`echo $NETWORKCONFIG | cut -d'@' -f11`
-	local BRIDGE_VLAN=`echo $NETWORKCONFIG | cut -d'@' -f12`
-
-	# backup
-	NOW=`date +%T%x | sed -e "s/://g" | sed -e "s#/##g"`
-	mkdir -p $NETWORK_CONFIG_DIR/backup/$NOW
-	cp -af $NETWORK_CONFIG_DIR/ifcfg* $NETWORK_CONFIG_DIR/backup/$NOW/
-
-	if [ "$INTERFACE_TYPE" == "bridge" ]; then
-		# bridge with nic attached1
-		if [ "$BRIDGE_NETWORK" != "" ]; then
-			NETWORK_CARD_MAC=`ip a s $NETWORK_CARD | grep -w $NETWORK_CARD$ | grep "link/ether" | awk '{ print $2 }' | tr "[:upper:]" "[:lower:]"`
-			if [ "$BRIDGE_VLAN" != "" ]; then
-				echo "# VLAN Interface for bridge $INTERFACE_NAME" > $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-				echo "DEVICE=$BRIDGE_NETWORK.$BRIDGE_VLAN" >> $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-				if [ "$NETWORK_CARD_MAC" != "" ]; then
-					echo "HWADDR=$NETWORK_CARD_MAC" >> $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-				fi
-				echo "ONBOOT=yes" >> $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-				echo "HOTPLUG=no" >> $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-				echo "BOOTPROTO=none" >> $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-				echo "TYPE=Ethernet" >> $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-				echo "VLAN=yes" >> $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-				echo "BRIDGE=$INTERFACE_NAME" >> $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-			else
-				echo "# Interface for bridge $INTERFACE_NAME" > $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-				echo "DEVICE=$BRIDGE_NETWORK" >> $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-				if [ "$NETWORK_CARD_MAC" != "" ]; then
-					echo "HWADDR=$NETWORK_CARD_MAC" >> $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-				fi
-				echo "ONBOOT=yes" >> $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-				echo "TYPE=Ethernet" >> $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-				echo "IPV6INIT=no" >> $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-				echo "USERCTL=no" >> $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-				echo "BRIDGE=$INTERFACE_NAME" >> $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-			fi
-			echo "" >> $NETWORK_CONFIG_DIR/ifcfg-$BRIDGE_NETWORK
-		fi
-		# bridge settings
-		echo "DEVICE=$INTERFACE_NAME" > $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-		echo "BOOTPROTO=static" >> $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-		echo "ONBOOT=yes" >> $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-		echo "TYPE=Bridge" >> $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-		if [ "$INTERFACE_IP_ADDRESS" != "" ]; then
-			echo "IPADDR=$INTERFACE_IP_ADDRESS" >> $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-		fi
-		if [ "$INTERFACE_SUBNETMASK" != "" ]; then
-			echo "NETMASK=$INTERFACE_SUBNETMASK" >> $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-		fi
-		if [ "$INTERFACE_GATEWAY" != "" ]; then
-			echo "GATEWAY=$INTERFACE_GATEWAY" >> $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-		fi
-	#		if [ "$BRIDGE_MAC" != "" ]; then
-	#			if [ "$BRIDGE_MAC" == "1" ] && [ "$NETWORK_CARD_MAC" != "" ]; then
-	#				echo "" >> $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-	#			fi
-	#		fi
-		if [ "$BRIDGE_FD" != "" ]; then
-			echo "DELAY=$BRIDGE_FD" >> $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-		fi
-		if [ "$BRIDGE_HELLO" != "" ]; then
-			echo "HELLO=$BRIDGE_HELLO" >> $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-		fi
-		if [ "$BRIDGE_MAXAGE" != "" ]; then
-			echo "MAXAGE=$BRIDGE_MAXAGE" >> $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-		fi
-		if [ "$BRIDGE_STP" != "" ]; then
-			if [ "$BRIDGE_STP" == "0" ]; then
-				STP="no"
-			else
-				STP="yes"
-			fi
-			echo "STP=$STP" >> $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-		fi
-	else
-		# regular nic
-		echo "DEVICE=$INTERFACE_NAME" > $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-		echo "BOOTPROTO=static" >> $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-		echo "ONBOOT=yes" >> $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-		if [ "$INTERFACE_IP_ADDRESS" != "" ]; then
-			echo "IPADDR=$INTERFACE_IP_ADDRESS" >> $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-		fi
-		if [ "$INTERFACE_SUBNETMASK" != "" ]; then
-			echo "NETMASK=$INTERFACE_SUBNETMASK" >> $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-		fi
-		if [ "$INTERFACE_GATEWAY" != "" ]; then
-			echo "GATEWAY=$INTERFACE_GATEWAY" >> $NETWORK_CONFIG_DIR/ifcfg-$INTERFACE_NAME
-		fi
-	fi
-}
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager-about.controller.class.php
deleted file mode 100644
index eeb6ecf..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager-about.controller.class.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/**
- * Network-manager Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class network_manager_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'network_manager_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'network_manager_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'network_manager_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'network_manager_about_identifier';
-/**
-* path to network-managers
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About Network-manager',
-		'label' => 'About Network-manager',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The Network-manager plugin provides an easy way to configure Network Bridges. If the the plugin is enabled, functions are available when editing Servers. ',
-		'requirements_title' => 'Requirements',
-		'requirements_list' => 'none',
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Network',
-		'documentation_title' => 'Documentation',
-	),
-);
-
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/network-manager/lang", 'network-manager-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/network-manager/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About Network-manager
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/network-manager/class/network-manager-about.documentation.class.php');
-			$controller = new network_manager_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager-about.documentation.class.php
deleted file mode 100644
index 810f270..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager-about.documentation.class.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * network-manager-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class network_manager_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'network_manager_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'network_manager_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'network_manager_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'network_manager_about_identifier';
-/**
-* path to network-managers
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-		$this->basedir    = $this->openqrm->get('basedir');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_network-manager
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/network-manager-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager.add.class.php b/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager.add.class.php
deleted file mode 100644
index 3c29019..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager.add.class.php
+++ /dev/null
@@ -1,552 +0,0 @@
-<?php
-/**
- * Network Manager Add Bridge
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class network_manager_add
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'network_manager_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "network_manager_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'network_manager_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'network_manager_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-		$this->controller = $controller;
-		$this->response   = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-		$this->user = $openqrm->user();
-
-		$id = $this->response->html->request()->get('appliance_id');
-		$this->response->add('appliance_id', $id);
-
-		$appliance = new appliance();
-		$this->appliance = $appliance->get_instance_by_id($id);
-
-		$resource = new resource();
-		$this->resource = $resource->get_instance_by_id($this->appliance->resources);
-
-		$this->statfile = $this->openqrm->get('basedir').'/plugins/network-manager/web/storage/'.$this->resource->id.'.network_config';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->add();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/network-manager-add.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-
-		$t->add($this->lang['legend_bridge'], 'legend_bridge');
-		$t->add($this->lang['legend_ip'], 'legend_ip');
-		$t->add($this->lang['legend_vlan'], 'legend_vlan');
-		$t->add($this->lang['legend_dnsmasq'], 'legend_dnsmasq');
-		$t->add($response->form);
-		$t->add(sprintf($this->lang['label'], $this->appliance->name), 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function add() {
-
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-
-			$device = $form->get_request('device');
-			$vlan = $form->get_request('vlan');
-			$ip = $form->get_request('ip');
-			$gateway = $form->get_request('gateway');
-			$mask = $form->get_request('subnet');
-			$bridge_mac = $form->get_request('bridge_mac');
-			$first_ip = $form->get_request('first_ip');
-			$last_ip = $form->get_request('last_ip');
-
-			if((isset($ip) && $ip !== '') && (!isset($mask) || $mask === '')) {
-				$form->set_error("subnet", $this->lang['error_empty']);
-			}
-			if((isset($mask) && $mask !== '') && (!isset($ip) || $ip === '')) {
-				$form->set_error("ip", $this->lang['error_empty']);
-			}
-			if(
-				(isset($gateway) && $gateway !== '') && 
-				(!isset($mask) || $mask === '') && 
-				(!isset($ip) || $ip === '')
-			) {
-				$form->set_error("subnet", $this->lang['error_empty']);
-				$form->set_error("ip", $this->lang['error_empty']);
-			}
-			if(!$form->get_errors()) {
-				// check ip is valid
-				$check = array('ip', 'gateway', 'first_ip', 'last_ip');
-				foreach($check as $ipp) {
-					if(isset($ipp) && $ipp !== '') {
-						$ch = explode('.', $ipp);
-						if(count($ch) === 4) {
-							foreach($ch as $k => $v) {
-								$v = intval($v);
-								if($v > 255) {
-									$form->set_error($ip, $this->lang['error_ip'].'>255');
-									break;
-								}
-								if($k === 3) {
-									if($v === 0) {
-										$form->set_error($ip, $this->lang['error_ip'].'<1');
-										break;
-									}
-								}
-							}
-						} else {
-							$form->set_error($ip, $this->lang['error_ip'].'<4');
-						}
-					}
-				}
-				if(isset($mask) && $mask !== '') {
-					// check subnet
-					// possible values for subnetmask
-					// 0, 128, 192, 224, 240, 248, 252, 254, 255
-					// first octet not 0
-					$subnet_values = array(0,128,192,224,240,248,252,254,255);
-					$subnet = explode('.', $mask);
-					if(count($subnet) === 4) {
-						foreach($subnet as $k => $v) {
-							$v = intval($v);
-							if($k === 0) {
-								if(!in_array($v, $subnet_values) || $v === 0) {
-									$form->set_error("subnet", $this->lang['error_subnet']);
-								}
-							}
-							if($k === 1) {
-								if(!in_array($v, $subnet_values) || (intval($subnet[0]) !== 255 && $v !== 0)) {
-									$form->set_error("subnet", $this->lang['error_subnet']);
-									break;
-								}
-							}
-							if($k === 2) {
-								if(!in_array($v, $subnet_values) || (intval($subnet[1]) !== 255 && $v !== 0)) {
-									$form->set_error("subnet", $this->lang['error_subnet']);
-									break;
-								}
-							}
-							if($k === 3) {
-								if(!in_array($v, $subnet_values) || (intval($subnet[2]) !== 255 && $v !== 0)) {
-									$form->set_error("subnet", $this->lang['error_subnet']);
-								}
-							}
-						}
-					} else {
-						$form->set_error("subnet", $this->lang['error_subnet']);
-					}
-				}
-				if(isset($bridge_mac) && $bridge_mac === '1' && (!isset($device) || $device === '')) {
-						$form->set_error("device",  $this->lang['error_empty']);
-				}
-				if(isset($vlan) && $vlan !== '' && (!isset($device) || $device === '')) {
-						$form->set_error("device",  $this->lang['error_empty']);
-				}
-				if(isset($first_ip) && $first_ip !== '') {
-					if(!isset($last_ip) || $last_ip === '') {
-						$form->set_error("last_ip",  $this->lang['error_empty']);
-					}
-					if(!isset($ip) || $ip === '') {
-						$form->set_error("ip",  $this->lang['error_empty']);
-					}
-					if(!isset($subnet) || $subnet === '') {
-						$form->set_error("subnet",  $this->lang['error_empty']);
-					}
-					if(isset($last_ip) && bindec($this->__ip2bin($last_ip)) < bindec($this->__ip2bin($first_ip))) {
-						$form->set_error("last_ip",  $this->lang['error_ip']);
-					}
-				}
-				if(isset($last_ip) && $last_ip !== '') {
-					if(!isset($first_ip) || $first_ip === '') {
-						$form->set_error("first_ip",  $this->lang['error_empty']);
-					}
-				}
-			}
-
-			if(!$form->get_errors()) {
-				$command  = $this->openqrm->get('basedir').'/plugins/network-manager/bin/openqrm-network-manager add_br';
-				$command .= ' -u '.$this->openqrm->admin()->name;
-				$command .= ' -p '.$this->openqrm->admin()->password;
-				$command .= ' -b '.$form->get_request('name');
-				$command .= ' -f '.$form->get_request('bridge_fd');
-				$command .= ' -h '.$form->get_request('bridge_hello');
-				$command .= ' -a '.$form->get_request('bridge_maxage');
-				$command .= ' -t '.$form->get_request('bridge_stp');
-				$command .= ' -m '.$bridge_mac;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode regular';
-				if(isset($device) && $device !== '') {
-					$command .= ' -n '.$device;
-				}
-				if(isset($ip) && $ip !== '') {
-					$command .= ' -i '.$ip;
-				}
-				if(isset($mask) && $mask !== '') {
-					$command .= ' -s '.$mask;
-				}
-				if(isset($vlan) && $vlan !== '') {
-					$command .= ' -v '.$vlan;
-				}
-				if(isset($gateway) && $gateway !== '') {
-					$command .= ' -g '.$gateway;
-				}
-				if(isset($first_ip) && $first_ip !== '') {
-					$command .= ' -df '.$first_ip;
-				}
-				if(isset($last_ip) && $last_ip !== '') {
-					$command .= ' -dl '.$last_ip;
-				}
-				$this->controller->__reload( $this->statfile, $this->resource );
-				if ($this->file->exists($this->statfile)) {
-					$lines = explode("\n", $this->file->get_contents($this->statfile));
-					if(count($lines) >= 1) {
-						foreach($lines as $line) {
-							if($line !== '') {
-								$line = explode('@', $line);
-								$check = $line[1];
-								if($form->get_request('name') === $check) {
-									$error = sprintf($this->lang['error_exists'], $form->get_request('name'));
-								}
-							}
-						}
-					}
-				}
-				if(isset($error)) {
-					$response->error = $error;
-				} else {
-					$this->resource->send_command($this->resource->ip, $command);
-					$file = $this->openqrm->get('basedir').'/plugins/network-manager/web/storage/'.$this->resource->id.'.network_stat';
-					while (!$this->file->exists($file)) {
-						usleep(10000); // sleep 10ms to unload the CPU
-						clearstatcache();
-					}
-					$result = trim($this->file->get_contents($file));
-					if($result === 'ok') {
-						$response->msg = sprintf($this->lang['msg_added'], $form->get_request('name'));
-					}
-					else {
-						$response->error = $result;
-					}
-				}
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'add');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$d['name']['label']                         = $this->lang['form_name'];
-		$d['name']['required']                      = true;
-		$d['name']['validate']['regex']             = '/^[a-z0-9.]+$/i';
-		$d['name']['validate']['errormsg']          = sprintf($this->lang['error_name'], 'a-z0-9.');
-		$d['name']['object']['type']                = 'htmlobject_input';
-		$d['name']['object']['attrib']['title']     = $this->lang['title_name'];
-		$d['name']['object']['attrib']['id']        = 'name';
-		$d['name']['object']['attrib']['name']      = 'name';
-		$d['name']['object']['attrib']['type']      = 'text';
-		$d['name']['object']['attrib']['value']     = '';
-		$d['name']['object']['attrib']['maxlength'] = 8;
-
-		$d['ip']['label']                         = $this->lang['form_ip'];
-		$d['ip']['required']                      = true;
-		$d['ip']['validate']['regex']             = '/^[0-9.]+$/i';
-		$d['ip']['validate']['errormsg']          = $this->lang['error_ip'];
-		$d['ip']['object']['type']                = 'htmlobject_input';
-		$d['ip']['object']['attrib']['title']     = $this->lang['title_ip'];
-		$d['ip']['object']['attrib']['id']        = 'ip';
-		$d['ip']['object']['attrib']['name']      = 'ip';
-		$d['ip']['object']['attrib']['type']      = 'text';
-		$d['ip']['object']['attrib']['value']     = '';
-		$d['ip']['object']['attrib']['maxlength'] = 15;
-
-		$d['subnet']['label']                         = $this->lang['form_subnet'];
-		$d['subnet']['required']                      = true;
-		$d['subnet']['validate']['regex']             = '/^[0-9.]+$/i';
-		$d['subnet']['validate']['errormsg']          = $this->lang['error_subnet'];
-		$d['subnet']['object']['type']                = 'htmlobject_input';
-		$d['subnet']['object']['attrib']['title']     = $this->lang['title_subnet'];
-		$d['subnet']['object']['attrib']['id']        = 'subnet';
-		$d['subnet']['object']['attrib']['name']      = 'subnet';
-		$d['subnet']['object']['attrib']['type']      = 'text';
-		$d['subnet']['object']['attrib']['value']     = '';
-		$d['subnet']['object']['attrib']['maxlength'] = 15;
-
-		$d['gateway']['label']                         = $this->lang['form_gateway'];
-		$d['gateway']['validate']['regex']             = '/^[0-9.]+$/i';
-		$d['gateway']['validate']['errormsg']          = $this->lang['error_ip'];
-		$d['gateway']['object']['type']                = 'htmlobject_input';
-		$d['gateway']['object']['attrib']['title']     = $this->lang['title_gateway'];
-		$d['gateway']['object']['attrib']['id']        = 'gateway';
-		$d['gateway']['object']['attrib']['name']      = 'gateway';
-		$d['gateway']['object']['attrib']['type']      = 'text';
-		$d['gateway']['object']['attrib']['value']     = '';
-		$d['gateway']['object']['attrib']['maxlength'] = 15;
-
-		$vlan[] = array('');
-		for($i=0; $i<=100; $i++) {
-			$vlan[] = array($i);
-		}
-		$d['vlan']['label']                         = $this->lang['form_vlan'];
-		$d['vlan']['validate']['regex']             = '/^[0-9]+$/i';
-		$d['vlan']['validate']['errormsg']          = sprintf($this->lang['error_vlan'], '0-9');
-		$d['vlan']['object']['type']                = 'htmlobject_select';
-		$d['vlan']['object']['attrib']['title']     = $this->lang['title_vlan'];
-		$d['vlan']['object']['attrib']['id']        = 'vlan';
-		$d['vlan']['object']['attrib']['name']      = 'vlan';
-		$d['vlan']['object']['attrib']['index']     = array(0,0);
-		$d['vlan']['object']['attrib']['options']   = $vlan;
-		$d['vlan']['object']['attrib']['maxlength'] = 4;
-
-		for($i=0; $i<=20; $i++) {
-			$range[] = array($i);
-		}
-		$d['bridge_fd']['label']                         = $this->lang['form_bridge_fd'];
-		$d['bridge_fd']['validate']['regex']             = '/^[0-9]+$/i';
-		$d['bridge_fd']['validate']['errormsg']          = sprintf($this->lang['error_vlan'], '0-9');
-		$d['bridge_fd']['object']['type']                = 'htmlobject_select';
-		$d['bridge_fd']['object']['attrib']['title']     = $this->lang['title_bridge_fd'];
-		$d['bridge_fd']['object']['attrib']['id']        = 'bridge_fd';
-		$d['bridge_fd']['object']['attrib']['name']      = 'bridge_fd';
-		$d['bridge_fd']['object']['attrib']['index']     = array(0,0);
-		$d['bridge_fd']['object']['attrib']['options']   = $range;
-		$d['bridge_fd']['object']['attrib']['selected']  = array(0);
-		$d['bridge_fd']['object']['attrib']['maxlength'] = 4;
-
-		$d['bridge_hello']['label']                         = $this->lang['form_bridge_hello'];
-		$d['bridge_hello']['validate']['regex']             = '/^[0-9]+$/i';
-		$d['bridge_hello']['validate']['errormsg']          = sprintf($this->lang['error_vlan'], '0-9');
-		$d['bridge_hello']['object']['type']                = 'htmlobject_select';
-		$d['bridge_hello']['object']['attrib']['title']     = $this->lang['title_bridge_hello'];
-		$d['bridge_hello']['object']['attrib']['id']        = 'bridge_hello';
-		$d['bridge_hello']['object']['attrib']['name']      = 'bridge_hello';
-		$d['bridge_hello']['object']['attrib']['index']     = array(0,0);
-		$d['bridge_hello']['object']['attrib']['options']   = $range;
-		$d['bridge_hello']['object']['attrib']['selected']  = array(2);
-		$d['bridge_hello']['object']['attrib']['maxlength'] = 4;
-
-		$d['bridge_maxage']['label']                         = $this->lang['form_bridge_maxage'];
-		$d['bridge_maxage']['validate']['regex']             = '/^[0-9]+$/i';
-		$d['bridge_maxage']['validate']['errormsg']          = sprintf($this->lang['error_vlan'], '0-9');
-		$d['bridge_maxage']['object']['attrib']['title']     = $this->lang['title_bridge_maxage'];
-		$d['bridge_maxage']['object']['type']                = 'htmlobject_select';
-		$d['bridge_maxage']['object']['attrib']['id']        = 'bridge_maxage';
-		$d['bridge_maxage']['object']['attrib']['name']      = 'bridge_maxage';
-		$d['bridge_maxage']['object']['attrib']['index']     = array(0,0);
-		$d['bridge_maxage']['object']['attrib']['options']   = $range;
-		$d['bridge_maxage']['object']['attrib']['selected']  = array(12);
-		$d['bridge_maxage']['object']['attrib']['maxlength'] = 4;
-
-
-		$bool = array(array(1,'on'),array(0,'off'));
-		$d['bridge_stp']['label']                         = $this->lang['form_bridge_stp'];
-		$d['bridge_stp']['validate']['regex']             = '/^[0-9]+$/i';
-		$d['bridge_stp']['validate']['errormsg']          = sprintf($this->lang['error_vlan'], '0-9');
-		$d['bridge_stp']['object']['type']                = 'htmlobject_select';
-		$d['bridge_stp']['object']['attrib']['title']     = $this->lang['title_bridge_stp'];
-		$d['bridge_stp']['object']['attrib']['id']        = 'bridge_stp';
-		$d['bridge_stp']['object']['attrib']['name']      = 'bridge_stp';
-		$d['bridge_stp']['object']['attrib']['index']     = array(0,1);
-		$d['bridge_stp']['object']['attrib']['options']   = $bool;
-		$d['bridge_stp']['object']['attrib']['selected']  = array(0);
-		$d['bridge_stp']['object']['attrib']['maxlength'] = 4;
-
-		$d['bridge_mac']['label']                         = $this->lang['form_bridge_mac'];
-		$d['bridge_mac']['validate']['regex']             = '/^[0-9]+$/i';
-		$d['bridge_mac']['validate']['errormsg']          = sprintf($this->lang['error_vlan'], '0-9');
-		$d['bridge_mac']['object']['type']                = 'htmlobject_select';
-		$d['bridge_mac']['object']['attrib']['title']     = $this->lang['title_bridge_mac'];
-		$d['bridge_mac']['object']['attrib']['id']        = 'bridge_mac';
-		$d['bridge_mac']['object']['attrib']['name']      = 'bridge_mac';
-		$d['bridge_mac']['object']['attrib']['index']     = array(0,1);
-		$d['bridge_mac']['object']['attrib']['options']   = $bool;
-		$d['bridge_mac']['object']['attrib']['selected']  = array(0);
-		$d['bridge_mac']['object']['attrib']['maxlength'] = 4;
-
-		$d['first_ip']['label']                         = $this->lang['form_first_ip'];
-		$d['first_ip']['validate']['regex']             = '/^[0-9.]+$/i';
-		$d['first_ip']['validate']['errormsg']          = $this->lang['error_ip'];
-		$d['first_ip']['object']['type']                = 'htmlobject_input';
-		$d['first_ip']['object']['attrib']['title']     = $this->lang['title_first_ip'];
-		$d['first_ip']['object']['attrib']['id']        = 'first_ip';
-		$d['first_ip']['object']['attrib']['name']      = 'first_ip';
-		$d['first_ip']['object']['attrib']['type']      = 'text';
-		$d['first_ip']['object']['attrib']['value']     = '';
-		$d['first_ip']['object']['attrib']['maxlength'] = 15;
-
-		$d['last_ip']['label']                         = $this->lang['form_last_ip'];
-		$d['last_ip']['validate']['regex']             = '/^[0-9.]+$/i';
-		$d['last_ip']['validate']['errormsg']          = $this->lang['error_ip'];
-		$d['last_ip']['object']['type']                = 'htmlobject_input';
-		$d['last_ip']['object']['attrib']['title']     = $this->lang['title_last_ip'];
-		$d['last_ip']['object']['attrib']['id']        = 'last_ip';
-		$d['last_ip']['object']['attrib']['name']      = 'last_ip';
-		$d['last_ip']['object']['attrib']['type']      = 'text';
-		$d['last_ip']['object']['attrib']['value']     = '';
-		$d['last_ip']['object']['attrib']['maxlength'] = 15;
-
-		$this->controller->__reload( $this->statfile, $this->resource );
-		$nics[] = array('', '');
-		if ($this->file->exists($this->statfile)) {
-			$lines = explode("\n", $this->file->get_contents($this->statfile));
-			if(count($lines) >= 1) {
-				foreach($lines as $line) {
-					if($line !== '') {
-						$line = explode('@', $line);
-						if($line[0] === 'n') {
-							$nics[$line[1]] = array($line[1], $line[1]);
-						}
-						elseif($line[0] === 'b') {
-							if(isset($line[4]) && $line[4] !== '') {
-								$up[] = $line[4];
-							}
-						}
-					}
-				}
-			}
-		}
-		// remove nics in use
-		if(isset($up) && is_array($up)) {
-			foreach($up as $u) {
-				unset($nics[$u]);
-			}
-		}
-		$d['device']['label']                         = $this->lang['form_device'];
-		$d['device']['required']                      = true;
-		$d['device']['object']['type']                = 'htmlobject_select';
-		$d['device']['object']['attrib']['title']     = $this->lang['title_device'];
-		$d['device']['object']['attrib']['id']        = 'device';
-		$d['device']['object']['attrib']['name']      = 'device';
-		$d['device']['object']['attrib']['index']     = array(0,1);
-		$d['device']['object']['attrib']['options']   = $nics;
-		$d['device']['object']['attrib']['maxlength'] = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* Ip Adress to binary
-	* @access public
-	* @param string $ip
-	* @return string
-	*/
-	//--------------------------------------------------
-	function __ip2bin($ip)
-	{
-		$return = '';
-		if(!preg_match("/^\d+\.\d+\.\d+\.\d+$/", $ip)) return -1;
-		$ar = explode(".", $ip);
-		foreach($ar as $a)
-		{
-			$return .= str_pad(decbin($a), 8, 0, STR_PAD_LEFT);
-		}
-		return $return;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager.controller.class.php b/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager.controller.class.php
deleted file mode 100644
index 58c85c9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager.controller.class.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-/**
- * Network Manager Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-
-
-class network_manager_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'network_manager_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "network_manager_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'network_manager_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'network_manager_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array (
-		'tab' => 'Network Manager',
-		'label' => 'Network Devices on Server %s',
-		'action_remove' => 'remove',
-		'action_add' => 'Add new Network Bridge',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..'
-	),
-	'add' => array (
-		'tab' => 'Add Network Bridge',
-		'label' => 'Add Network Bridge on Server %s',
-		'legend_bridge' => 'Bridge',
-		'legend_ip' => 'Ip',
-		'legend_vlan' => 'Vlan',
-		'legend_dnsmasq' => 'Dnsmasq',
-		'form_name' => 'Name',
-		'form_device' => 'Device',
-		'form_ip' => 'IP',
-		'form_subnet' => 'Subnet',
-		'form_vlan' => 'Vlan',
-		'form_gateway' => 'Gateway',
-		'form_bridge_fd' => 'FD',
-		'form_bridge_hello' => 'Hello',
-		'form_bridge_maxage' => 'Maxage',
-		'form_bridge_stp' => 'Stp',
-		'form_bridge_mac' => 'Mac',
-		'form_first_ip' => 'First Ip',
-		'form_last_ip' => 'Last Ip',
-		'title_name' => 'Name',
-		'title_vlan' => 'Vlan',
-		'title_device' => 'Network Device',
-		'title_ip' => 'Ip',
-		'title_subnet' => 'Subnet',
-		'title_gateway' => 'Gateway',
-		'title_bridge_fd' => 'FD',
-		'title_bridge_hello' => 'Hello',
-		'title_bridge_maxage' => 'Maxage',
-		'title_bridge_stp' => 'Stp',
-		'title_bridge_mac' => 'Mac',
-		'title_first_ip' => 'First Ip',
-		'title_last_ip' => 'Last Ip',
-		'error_name' => 'Name must be %s only',
-		'error_exists' => 'Name %s is already in use.',
-		'error_ip' => 'IP is invalid',
-		'error_subnet' => 'Subnet is invalid',
-		'error_vlan' => 'Vlan must be %s only',
-		'error_empty' => 'Must not be empty',
-		'msg_added' => 'Successfully added bridge %s.',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..'
-	), 
-	'remove' => array (
-		'label' => 'Remove Network Bridge(s) on Server %s',
-		'msg_removed' => 'Successfully removed bridge %s.',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..'
-	), 
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/network-manager/lang", 'network-manager.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/network-manager/tpl';
-		$this->response->add('appliance_id', $this->response->html->request()->get('appliance_id'));
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "select";
-		}
-
-		if($this->action === '') {
-			$this->action = "select";
-		}
-
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'add':
-				$content[] = $this->select(false);
-				$content[] = $this->add(true);
-			break;
-			case 'remove':
-				$content[] = $this->select(false);
-				$content[] = $this->remove(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->openqrm->get('basedir').'/plugins/network-manager/web/class/network-manager.api.class.php');
-		$controller = new network_manager_api($this);
-		$controller->action();
-	}
-
-	
-	//--------------------------------------------
-	/**
-	 * Select Network Devices
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->openqrm->get('basedir').'/plugins/network-manager/web/class/network-manager.select.class.php');
-			$controller = new network_manager_select($this->openqrm, $this->response, $this);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Add new Bridge
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function add( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->openqrm->get('basedir').'/plugins/network-manager/web/class/network-manager.add.class.php');
-			$controller                  = new network_manager_add($this->openqrm, $this->response, $this);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['add'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['add']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'add' );
-		$content['onclick'] = false;
-		if($this->action === 'add'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Remove Bridge
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function remove( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->openqrm->get('basedir').'/plugins/network-manager/web/class/network-manager.remove.class.php');
-			$controller                  = new network_manager_remove($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['remove'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Remove';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'remove' );
-		$content['onclick'] = false;
-		if($this->action === 'remove'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Reload statfile
-	 *
-	 * @access protected
-	 * @return null
-	 */
-	//--------------------------------------------
-	function __reload( $statfile, $resource ) {
-		if(isset($resource) && isset($resource->state) && $resource->state === 'active') {
-			sleep(2);
-			$command = $this->openqrm->get('basedir').'/plugins/network-manager/bin/openqrm-network-manager post_config';
-			$command .= ' -u '.$this->openqrm->admin()->name;
-			$command .= ' -p '.$this->openqrm->admin()->password;
-			$command .= ' --openqrm-ui-user '.$this->user->name;
-			$command .= ' --openqrm-cmd-mode regular';
-			if($this->file->exists($statfile)) {
-				$this->file->remove($statfile);
-			}
-			$resource->send_command($resource->ip, $command);
-			while (!$this->file->exists($statfile)) // check if the data file has been modified
-			{
-				usleep(10000); // sleep 10ms to unload the CPU
-				clearstatcache();
-			}
-		}
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager.remove.class.php b/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager.remove.class.php
deleted file mode 100644
index efdba32..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager.remove.class.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-/**
- * Network Manager Remove Bridge(s)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class network_manager_remove
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'network_manager_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "network_manager_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'network_manager_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'network_manager_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm  = $openqrm;
-		$this->file     = $openqrm->file();
-		$this->user = $openqrm->user();
-
-		$id = $this->response->html->request()->get('appliance_id');
-		$this->response->add('appliance_id', $id);
-		$this->response->add($this->identifier_name.'[]', '');
-
-		$appliance = new appliance();
-		$this->appliance = $appliance->get_instance_by_id($id);
-
-		$resource = new resource();
-		$this->resource = $resource->get_instance_by_id($this->appliance->resources);
-		
-		$this->statfile = $this->openqrm->get('basedir').'/plugins/network-manager/web/storage/'.$this->resource->id.'.network_stat';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->remove();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/network-manager-remove.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add(sprintf($this->lang['label'], $this->appliance->name), 'label');
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function remove() {
-		$response = $this->get_response();
-		$bridges  = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		if( $bridges !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($bridges as $ex) {
-				$d['param_f'.$i]['label']                       = $ex;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $ex;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;		
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$errors  = array();
-				$message = array();
-				foreach($bridges as $key => $bridge) {
-					$command  = $this->openqrm->get('basedir').'/plugins/network-manager/bin/openqrm-network-manager remove_br';
-					$command .= ' -b '.$bridge;
-					$command .= ' -u '.$this->openqrm->admin()->name;
-					$command .= ' -p '.$this->openqrm->admin()->password;
-					$command .= ' --openqrm-ui-user '.$this->user->name;
-					$command .= ' --openqrm-cmd-mode regular';
-
-#echo $command.'<br>';
-
-					$file = $this->statfile;
-					if($this->file->exists($file)) {
-						$this->file->remove($file);
-					}
-					$this->resource->send_command($this->resource->ip, $command);
-					while (!$this->file->exists($file)) {
-						usleep(10000); // sleep 10ms to unload the CPU
-						clearstatcache();
-					}
-					$result = trim($this->file->get_contents($file));
-					if($result === 'ok') {
-						$form->remove($this->identifier_name.'['.$key.']');
-						$message[] = sprintf($this->lang['msg_removed'], $bridge);
-					}
-					else {
-						$errors[] = $result;
-					}
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'remove');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager.select.class.php b/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager.select.class.php
deleted file mode 100644
index 9833ef4..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/web/class/network-manager.select.class.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-/**
- * network-manager List Networkconfig
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class network_manager_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name;
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab;
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name;
-/**
-* path to tpldir
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->controller = $controller;
-		$this->file     = $this->openqrm->file();
-		$this->tpldir   = $this->rootdir.'/plugins/network-manager/tpl';
-
-		$id = $this->response->html->request()->get('appliance_id');
-		$this->response->add('appliance_id', $id);
-
-		$appliance = $this->openqrm->appliance();
-		$this->appliance = $appliance->get_instance_by_id($id);
-
-		$resource = $this->openqrm->resource();
-		$this->resource = $resource->get_instance_by_id($this->appliance->resources);
-		
-		$this->statfile = $this->openqrm->get('basedir').'/plugins/network-manager/web/storage/'.$this->resource->id.'.network_config';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->select();
-
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-			);
-		}
-		$data['add'] = $response->add;
-		$data['table'] = $response->table;
-		$data['label'] = sprintf($this->lang['label'], $this->appliance->name);
-		$data['baseurl'] = $this->openqrm->get('baseurl');
-		$t = $response->html->template($this->tpldir.'/network-manager-select.tpl.php');
-		$t->add($data);
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Ad Volume Group
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function select() {
-		$response = $this->get_response();
-
-		$b = array();
-		$identifier_disabled = array();
-		$this->controller->__reload( $this->statfile, $this->resource );
-		if ($this->file->exists($this->statfile)) {
-			$result = trim($this->file->get_contents($this->statfile));
-			$result = explode("\n", $result);
-			if(is_array($result)) {
-				$res = array();
-				foreach($result as $v) {
-					$res[] = explode('@', $v);
-				}
-				foreach ($res as $line) {
-					$up = '';
-					if($line[0] === 'n') {
-						$identifier_disabled[] = $line[1];
-						$type = 'Physical';
-					}
-					elseif($line[0] === 'b') {
-						$type = 'Bridge';
-						if(isset($line[4]) && $line[4] !== '') {
-							$up = $line[4];
-						}
-					}
-
-					$ip = '';
-					if($line[3] !== '') {
-						$tmp = explode('/', $line[3]);
-						$ip = $tmp[0];
-					}
-
-					$b[] = array(
-						'device' => $line[1],
-						'type' => $type,
-						'mac' => $line[2],
-						'ip' => $ip,
-						'up' => $up,
-					);
-				}
-			}
-		}
-
-		$h['type']['title'] ='Type';
-		$h['type']['sortable'] = true;
-		$h['device']['title'] ='Device';
-		$h['device']['sortable'] = true;
-		$h['mac']['title'] ='Mac';
-		$h['mac']['sortable'] = true;
-		$h['ip']['title'] ='IP';
-		$h['ip']['sortable'] = true;
-		$h['up']['title'] ='Interface';
-		$h['up']['sortable'] = true;
-
-		$table = $this->response->html->tablebuilder('network', $this->response->get_array($this->actions_name, 'select'));
-		$table->sort      = 'type';
-		$table->limit     = 10;
-		$table->offset    = 0;
-		$table->order     = 'ASC';
-		$table->max       = count($b);
-		$table->autosort  = true;
-		$table->sort_link = false;
-		$table->id = 'Tabelle';
-		$table->css = 'htmlobject_table';
-		$table->border = 1;
-		$table->cellspacing = 0;
-		$table->cellpadding = 3;
-		$table->form_action	= $this->response->html->thisfile;
-		$table->head = $h;
-		$table->body = $b;
-		$table->identifier = 'device';
-		$table->identifier_name = $this->identifier_name;
-		$table->identifier_disabled = $identifier_disabled;
-		$table->actions_name = $this->actions_name;
-		$table->actions = array(array('remove' => $this->lang['action_remove']));
-
-		$response->table = $table;
-		$response->add = '';
-		if(count($b) > 0) {
-			$a = $response->html->a();
-			$a->label = $this->lang['action_add'];
-			$a->css = 'add';
-			$a->href = $response->get_url($this->actions_name, 'add') ;
-			$a->handler = 'onclick="wait();"';
-			$response->add = $a;
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param enum $mode [confirm]
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response($mode = '') {
-		$response = $this->response;
-		#$form     = $response->get_form($this->actions_name, 'select');
-		#$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/css/network-manager.css b/openQRM-5.3.50-CE/src/plugins/network-manager/web/css/network-manager.css
deleted file mode 100644
index e69de29..0000000
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/network-manager/web/img/plugin.png
deleted file mode 100644
index e952cbc..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/network-manager/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/lang/de.network-manager-about.ini b/openQRM-5.3.50-CE/src/plugins/network-manager/web/lang/de.network-manager-about.ini
deleted file mode 100644
index 70fa516..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/web/lang/de.network-manager-about.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[documentation]
-tab = "Über Network-Manager"
-label = "Über Network-Manager"
-
-introduction_title = "Einleitung"
-introduction_content = "<p>Das Network-Manager-Plugin bietet einen einfachen Weg Netzwerk-Bridges zu verwalten. Wenn das Plugin aktiviert ist, stehen alle Funktionen beim Editieren eines Servers zur Verfügung.</p>"
-
-requirements_title = "Anforderungen"
-requirements_list = "keine"
-
-tested_title = "Getestet mit"
-tested_content = "<p>Dieses Plugin ist getestet mit Debian, Ubuntu und CentOS.</p>"
-
-type_title = "Plugin-Typ"
-type_content = "Netzwerk"
-
-documentation_title = "Dokumentation"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/lang/de.network-manager.ini b/openQRM-5.3.50-CE/src/plugins/network-manager/web/lang/de.network-manager.ini
deleted file mode 100644
index 430fe0d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/web/lang/de.network-manager.ini
+++ /dev/null
@@ -1,54 +0,0 @@
-[select]
-tab = "Netzwerk Manager"
-label = "Netzwerk Karten auf Server %s"
-action_remove = "entfernen"
-action_add = "Netzwerk Bridge hinzufügen"
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[add]
-tab = "Netzwerk Bridge hinzufügen"
-label = "Netzwerk Bridge auf Server %s hinzufügen"
-legend_bridge = "Bridge"
-legend_ip = "Ip"
-legend_vlan = "Vlan"
-legend_dnsmasq = "Dnsmasq"
-form_name = "Name"
-form_device = "Device"
-form_ip = "IP"
-form_subnet = "Subnet"
-form_vlan = "Vlan"
-form_gateway = "Gateway"
-form_bridge_fd = "FD"
-form_bridge_hello = "Hello"
-form_bridge_maxage = "Maxage"
-form_bridge_stp = "Stp"
-form_bridge_mac = "Mac"
-form_first_ip = "Erste Ip"
-form_last_ip = "Letzte Ip"
-title_name = "Name"
-title_vlan = "Vlan"
-title_device = "Netzwerk Karte"
-title_ip = "Ip"
-title_subnet = "Subnet"
-title_gateway = "Gateway"
-title_bridge_fd = "FD"
-title_bridge_hello = "Hello"
-title_bridge_maxage = "Maxage"
-title_bridge_stp = "Stp"
-title_bridge_mac = "Mac"
-title_first_ip = "Erste Ip"
-title_last_ip = "Letzte Ip"
-error_name = "Name darf nur %s beinhalten"
-error_exists = "Name %s wird bereits verwendet."
-error_ip = "IP ist ungültig"
-error_subnet = "Subnet ist ungültig"
-error_vlan = "Vlan darf nur %s beinhalt"
-error_empty = "Darf nicht leer sein"
-msg_added = "Bridge %s erfolgreich hinzugefügt."
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[remove]
-label = "Netzwerk Bridge(s) auf Server %s entfernen"
-msg_removed = "Bridge %s erfolgreich entfernt."
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/lang/en.network-manager-about.ini b/openQRM-5.3.50-CE/src/plugins/network-manager/web/lang/en.network-manager-about.ini
deleted file mode 100644
index be4671b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/web/lang/en.network-manager-about.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[documentation]
-tab = "About network manager"
-label = "About network manager"
-introduction_title = "Introduction"
-introduction_content = "<p>The network manager plugin provides an easy way to configure network bridges. If the the plugin is enabled, functions are available when editing servers.</p>"
-requirements_title = "Requirements"
-requirements_list = "none"
-tested_title = "Tested with"
-tested_content = "<p>This plugin is tested with Debian, Ubuntu and CentOS.</p>"
-type_title = "Plugin type"
-type_content = "Network"
-documentation_title = "Documentation"
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/lang/en.network-manager.ini b/openQRM-5.3.50-CE/src/plugins/network-manager/web/lang/en.network-manager.ini
deleted file mode 100644
index 548a459..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/web/lang/en.network-manager.ini
+++ /dev/null
@@ -1,54 +0,0 @@
-[select]
-tab = "Network Manager"
-label = "Network Devices on Server %s"
-action_remove = "remove"
-action_add = "Add new Network Bridge"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[add]
-tab = "Add Network Bridge"
-label = "Add Network Bridge on Server %s"
-legend_bridge = "Bridge"
-legend_ip = "Ip"
-legend_vlan = "Vlan"
-legend_dnsmasq = "Dnsmasq"
-form_name = "Name"
-form_device = "Device"
-form_ip = "IP"
-form_subnet = "Subnet"
-form_vlan = "Vlan"
-form_gateway = "Gateway"
-form_bridge_fd = "FD"
-form_bridge_hello = "Hello"
-form_bridge_maxage = "Maxage"
-form_bridge_stp = "Stp"
-form_bridge_mac = "Mac"
-form_first_ip = "First Ip"
-form_last_ip = "Last Ip"
-title_name = "Name"
-title_vlan = "Vlan"
-title_device = "Network Device"
-title_ip = "Ip"
-title_subnet = "Subnet"
-title_gateway = "Gateway"
-title_bridge_fd = "FD"
-title_bridge_hello = "Hello"
-title_bridge_maxage = "Maxage"
-title_bridge_stp = "Stp"
-title_bridge_mac = "Mac"
-title_first_ip = "First Ip"
-title_last_ip = "Last Ip"
-error_name = "Name must be %s only"
-error_exists = "Name %s is already in use."
-error_ip = "IP is invalid"
-error_subnet = "Subnet is invalid"
-error_vlan = "Vlan must be %s only"
-error_empty = "Must not be empty"
-msg_added = "Successfully added bridge %s."
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[remove]
-label = "Remove Network Bridge(s) on Server %s"
-msg_removed = "Successfully removed bridge %s."
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/network-manager/web/menu.txt
deleted file mode 100644
index 2766ecd..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/web/menu.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|Network-manager|index.php?plugin=network-manager&controller=network-manager-about|How to use
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/network-manager-action.php b/openQRM-5.3.50-CE/src/plugins/network-manager/web/network-manager-action.php
deleted file mode 100644
index cf8ba4c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/web/network-manager-action.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-$thisfile = basename($_SERVER['PHP_SELF']);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-$BaseDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-// filter inputs
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-$network_manager_command = $request->get('network_manager_command');
-
-global $OPENQRM_SERVER_BASE_DIR;
-
-$event = new event();
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $event;
-
-// place for the storage stat files
-$device_statdir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/network-manager/storage';
-
-
-// user/role authentication
-if ($OPENQRM_USER->role != "administrator") {
-	$event->log("authorization", $_SERVER['REQUEST_TIME'], 1, "network-manager-action", "Un-Authorized access to network-manager-actions from $OPENQRM_USER->name", "", "", 0, 0, 0);
-	exit();
-}
-
-
-// main
-$event->log("$network_manager_command", $_SERVER['REQUEST_TIME'], 5, "network-manager-action", "Processing network-manager command $network_manager_command", "", "", 0, 0, 0);
-
-	switch ($network_manager_command) {
-
-		case 'get_network_config':
-			if (!file_exists($device_statdir)) {
-				mkdir($device_statdir);
-			}
-			$filename = $device_statdir."/".$_POST['filename'];
-			$filedata = base64_decode($_POST['filedata']);
-			echo "<h1>$filename</h1>";
-			$fout = fopen($filename,"wb");
-			fwrite($fout, $filedata);
-			fclose($fout);
-			break;
-
-
-		default:
-			$event->log("$network_manager_command", $_SERVER['REQUEST_TIME'], 3, "network-manager-action", "No such event command ($network_manager_command)", "", "", 0, 0, 0);
-			break;
-
-
-	}
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/openqrm-network-manager-appliance-edit-hook.php b/openQRM-5.3.50-CE/src/plugins/network-manager/web/openqrm-network-manager-appliance-edit-hook.php
deleted file mode 100644
index 5a41362..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/web/openqrm-network-manager-appliance-edit-hook.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-function get_network_manager_appliance_edit($appliance_id, $openqrm, $response) {
-	$appliance = new appliance();
-	$appliance->get_instance_by_id($appliance_id);
-	$virtualization = new virtualization();
-	$virtualization->get_instance_by_id($appliance->virtualization);
-	// choose only not vm	
-	if(stripos($virtualization->type, '-vm-') === false) {
-		$plugin_title = "Network Manager on ".$appliance->name;
-		$a = $response->html->a();
-		$a->label = '<image height="24" width="24" alt="'.$plugin_title.'" title="'.$plugin_title.'" src="'.$openqrm->get('baseurl').'/plugins/network-manager/img/plugin.png">';
-		$a->href  = $openqrm->get('baseurl').'/index.php?base=appliance&appliance_action=load_edit&aplugin=network-manager&appliance_id='.$appliance_id;
-		return $a;
-	}
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/tpl/network-manager-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/network-manager/web/tpl/network-manager-about-documentation.tpl.php
deleted file mode 100644
index db74f20..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/web/tpl/network-manager-about-documentation.tpl.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-
-	<div class="span7">
-		<h3>{introduction_title}</h3>
-		{introduction_content}
-	
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-	</div>
-
-	<div class="span2 offset1">
-
-		<h3>{type_title}</h3>
-		<span class="pill">{type_content}</span>
-	
-		<h3>{tested_title}</h3>
-		{tested_content}
-	</div>
-
-
-</div>
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/tpl/network-manager-add.tpl.php b/openQRM-5.3.50-CE/src/plugins/network-manager/web/tpl/network-manager-add.tpl.php
deleted file mode 100644
index c4cfda0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/web/tpl/network-manager-add.tpl.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div id="form">
-	<form action="{thisfile}" method="GET">
-	{form}
-
-	<div class="row">
-		<fieldset class="span4">
-			<legend>{legend_bridge}</legend>
-			{name}
-			{bridge_fd}
-			{bridge_hello}
-			{bridge_maxage}
-			{bridge_stp}
-			{bridge_mac}
-			{device}
-		</fieldset>
-		<fieldset class="span4">
-			<legend>{legend_ip}</legend>
-			{ip}
-			{subnet}
-			{gateway}
-		</fieldset>
-	</div>
-	<div class="row">
-		<fieldset class="span4">
-			<legend>{legend_vlan}</legend>
-			{vlan}
-		</fieldset>
-		
-<!--		
-		
-		<fieldset class="span4">
-			<legend>{legend_dnsmasq}</legend>
-			{first_ip}
-			{last_ip}
-		</fieldset>
-
-//-->
-
-	</div>
-	
-	<div id="buttons" class="span2">{submit}&#160;{cancel}</div>
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/tpl/network-manager-remove.tpl.php b/openQRM-5.3.50-CE/src/plugins/network-manager/web/tpl/network-manager-remove.tpl.php
deleted file mode 100644
index 5c14fa5..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/web/tpl/network-manager-remove.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-<div id="form">
-	<form action="{thisfile}" method="POST">
-		{form}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</form>
-</div>
-
diff --git a/openQRM-5.3.50-CE/src/plugins/network-manager/web/tpl/network-manager-select.tpl.php b/openQRM-5.3.50-CE/src/plugins/network-manager/web/tpl/network-manager-select.tpl.php
deleted file mode 100644
index 18eed61..0000000
--- a/openQRM-5.3.50-CE/src/plugins/network-manager/web/tpl/network-manager-select.tpl.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div id="form">
-<div style="width:300px; float:right;">{add}</div>
-<div class="floatbreaker" style="clear:both; margin: 0 0 25px 0;">&#160;</div>
-{table}
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/Makefile b/openQRM-5.3.50-CE/src/plugins/nfs-storage/Makefile
deleted file mode 100644
index 72abcd9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-# this is the openQRM nfs-storage-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/etc/
-
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/nfs-storage $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/etc/init.d/*
-
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/include/
-
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/bin
-	. $(OPENQRM_SERVER_CONF) && cp bin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/bin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/bin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/etc/init.d/*
-
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.nfs-deployment $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/
-
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/img
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/img/
-
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/class/
-
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/lang/
-
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/css/
-
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && chmod 777 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web
-
-	. $(OPENQRM_SERVER_CONF) && tar -C $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage -czvf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/boot-service-nfs-storage.tgz include/ bin/ etc/init.d/nfs-storage etc/openqrm-plugin-nfs-storage.conf
-
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/nfs-storage
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/nfs-storage/
-
-
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/bin/openqrm-nfs-storage b/openQRM-5.3.50-CE/src/plugins/nfs-storage/bin/openqrm-nfs-storage
deleted file mode 100644
index 27605ba..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/bin/openqrm-nfs-storage
+++ /dev/null
@@ -1,483 +0,0 @@
-#!/bin/bash
-# this script automatically manages nfs
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-# unblock starting command queue early for non-blocking + ui commands
-NFS_COMMAND=$1
-if [ "$NFS_COMMAND" == "post_exports" ] || [ "$NFS_COMMAND" == "post_identifier" ] || [ "$NFS_COMMAND" == "list" ] || [ "$NFS_COMMAND" == "auth" ] || [ "$NFS_COMMAND" == "post_sync_progress" ] || [ "$NFS_COMMAND" == "post_sync_finished" ]; then
-	openqrm_unblock_starting_queue $@
-	NON_BLOCKING=true
-fi
-
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/include/openqrm-plugin-nfs-storage-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/etc/openqrm-plugin-nfs-storage.conf
-OPENQRM_POSTENCODE="$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-postencode"
-if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-	OPENQRM_SERVER_IP=$resource_openqrmserver
-	OPENQRM_EXEC_PORT=$resource_execdport
-elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-	openqrm_server_get_config
-	OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-	resource_id=0
-	resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-	openqrm_web_protocol=$OPENQRM_WEB_PROTOCOL
-fi
-export LANG=C
-# how long to wait for the volume authentication, each loop is 5 secs
-MAX_VOLUME_AUTHENTICATION_LOOP=300
-export MAX_VOLUME_AUTHENTICATION_LOOP
-# dir for progress stats
-SYNC_PROGRESS_DIR="/tmp"
-
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-# let only root run this script
-WHOAMI=`whoami`
-if [ "$WHOAMI" != "root" ]; then
-	echo "ERROR: Please run this script as root!"
-	exit 6
-fi
-
-if [ ! -d "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY" ]; then
-	mkdir -p $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY
-fi
-
-# make sure required deps are installed
-if ! check_nfs_storage_deps; then
-	if [ "$NON_BLOCKING" != "true" ]; then
-		openqrm_unblock_starting_queue $@
-	fi
-	exit 1
-fi
-
-function nfs_storage_usage() {
-	echo "Usage : $0 add/remove/clone|snap/list <-n image-name>"
-	echo "             [-s image-snapshot-name]"
-	echo "        $0 auth <-r image-rootdevice> <-i ip-address>"
-	echo "        $0 adapt <-n image-name> <-u username> <-p password>"
-	echo "        $0 post_exports <-u username> <-p password>"
-	echo "        $0 post_identifier <-u username> <-p password>"
-	echo "        $0 post_sync_progress <-n image-name> <-u username> <-p password>"
-	echo "        $0 post_sync_finished <-n image-name> <-u username> <-p password>"
-	echo ""
-	echo "Optional parameters:"
-	echo "             [--openqrm-ui-user <username>]"
-	echo "             [--openqrm-internal-cmd <true/false>]"
-	echo "             [--openqrm-cmd-mode <regular/background/fork>]"
-	exit 1
-}
-
-
-FULL_COMMANDLINE="$0 $@"
-NFS_COMMAND=$1
-shift
-
-while [ $# -ne 0 ]; do
-	case "$1" in
-		-n)
-			NFS_IMAGE_NAME=$2
-			shift
-			;;
-		-s)
-			NFS_IMAGE_SNAPSHOT_NAME=$2
-			shift
-			;;
-		-i)
-			NFS_IMAGE_AUTH_IP=$2
-			shift
-			;;
-		-r)
-			NFS_IMAGE_ROOTDEVICE=$2
-			shift
-			;;
-		-t)
-			NFS_IMAGE_TYPE=$2
-			shift
-			;;
-		-u)
-			NFS_OPENQRM_USERNAME=$2
-			shift
-			;;
-		-p)
-			NFS_OPENQRM_PASSWORD=$2
-			shift
-			;;
-		--openqrm-ui-user)
-			OPENQRM_UI_USER=$2
-			shift
-			;;
-		--openqrm-internal-cmd)
-			OPENQRM_INTERNAL_CMD=$2
-			shift
-			;;
-		--openqrm-cmd-mode)
-			OPENQRM_CMD_MODE=$2
-			shift
-			;;
-
-		*)
-			if [ "$NON_BLOCKING" != "true" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			fi
-			echo "ERROR: Free commandline arguments are not allowed"
-			nfs_storage_usage
-			exit 6
-			;;
-	esac
-	shift
-done
-
-
-
-
-# main
-if [ "$NFS_COMMAND" == "" ]; then
-	openqrm_unblock_starting_queue $FULL_COMMANDLINE
-	nfs_storage_usage
-fi
-
-if [ "$NFS_COMMAND" == "post_exports" ]  || [ "$NFS_COMMAND" == "post_identifier" ]; then
-	if [ "$NFS_OPENQRM_USERNAME" == "" ]; then
-		nfs_storage_usage
-	fi
-	if [ "$NFS_OPENQRM_PASSWORD" == "" ]; then
-		nfs_storage_usage
-	fi
-else
-	if [ "$NFS_COMMAND" != "list" ] && [ "$NFS_COMMAND" != "auth" ]; then
-		if [ "$NFS_IMAGE_NAME" == "" ]; then
-			if [ "$NON_BLOCKING" != "true" ]; then
-				openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			fi
-			nfs_storage_usage
-		fi
-	fi
-fi
-if [ "$OPENQRM_UI_USER" != "" ]; then
-	OPENQRM_UI_USER_PARAMETER=" --openqrm-ui-user $OPENQRM_UI_USER"
-fi
-
-case "$NFS_COMMAND" in 
-
-	add)
-		if [ -d "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME" ]; then
-			openqrm_post_event 0 "add" 3 "nfs-storage" "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME already exists."
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire nfs-storage`
-		trap "openqrm_lock_queue release nfs-storage $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		openqrm_post_event 0 "add" 5 "nfs-storage" "Creating NFS export for image $NFS_IMAGE_NAME."
-
-		# add to exports
-		manage_nfs add $OPENQRM_SERVER_IP
-
-		openqrm_lock_queue release nfs-storage $LOCK_TIME
-		trap '' EXIT
-
-		# in case we have a username + password post the updated list to the openQRM-server
-		if [ "$NFS_OPENQRM_USERNAME" != "" ] && [ "$NFS_OPENQRM_PASSWORD" != "" ]; then
-			$0 post_exports -u $NFS_OPENQRM_USERNAME -p $NFS_OPENQRM_PASSWORD --openqrm-internal-cmd true
-		fi
-		;;
-
-	remove)
-		# check that source fs-images exist
-		if [ ! -d "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME" ]; then
-			openqrm_post_event 0 "remove" 3 "nfs-storage" "Volume $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME does not exists!"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-		# check that it is not in use by a syncing action
-		if ls $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME/.sync_in_progress.* 1>/dev/null 2>&1; then
-			openqrm_post_event 0 "remove" 3 "nfs-storage" "Volume $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME is currently in use by a sync action!"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-		if [ -f "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME/.clone_in_progress" ]; then
-			openqrm_post_event 0 "remove" 3 "nfs-storage" "Volume $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME is currently in use by a clone action!"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire nfs-storage`
-		trap "openqrm_lock_queue release nfs-storage $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		openqrm_post_event 0 "add" 5 "nfs-storage" "Removing NFS export for image $NFS_IMAGE_NAME."
-
-		manage_nfs remove
-
-		openqrm_lock_queue release nfs-storage $LOCK_TIME
-		trap '' EXIT
-
-		if [ "$NFS_OPENQRM_USERNAME" != "" ] && [ "$NFS_OPENQRM_PASSWORD" != "" ]; then
-			$0 post_exports -u $NFS_OPENQRM_USERNAME -p $NFS_OPENQRM_PASSWORD --openqrm-internal-cmd true
-		fi
-		;;
-
-	clone|snap)
-		if [ "$NFS_IMAGE_SNAPSHOT_NAME" == "" ]; then
-			openqrm_post_event 0 "clone" 3 "nfs-storage" "No snapshot name given. Please use the -s cmdline parameter."
-			nfs_storage_usage
-		fi
-		# check that source fs-images exist
-		if [ ! -d "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME" ]; then
-			openqrm_post_event 0 "clone" 3 "nfs-storage" "Source volume $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME does not exists!"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-		if [ -f "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_SNAPSHOT_NAME/.clone_in_progress" ]; then
-			openqrm_post_event 0 "clone" 3 "nfs-storage" "There is already an active cloning action running for snapshot $NFS_IMAGE_SNAPSHOT_NAME!"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-		if [ -d "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_SNAPSHOT_NAME" ]; then
-			openqrm_post_event 0 "clone" 3 "nfs-storage" "Snapshot $NFS_IMAGE_SNAPSHOT_NAME already exists!"
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire nfs-storage`
-		trap "openqrm_lock_queue release nfs-storage $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		openqrm_post_event 0 "add" 5 "nfs-storage" "Creating snapshot from image $NFS_IMAGE_NAME -> $NFS_IMAGE_SNAPSHOT_NAME."
-		mkdir -p "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_SNAPSHOT_NAME"
-		# create lock in the origin for clone so remove is not able to remove the origin while syncing
-		touch "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME/.sync_in_progress.$NFS_IMAGE_SNAPSHOT_NAME"
-		# create long-term-action start event
-		openqrm_post_event 0 "$NFS_IMAGE_SNAPSHOT_NAME" 9 "nfs-storage" "Started to clone $NFS_IMAGE_SNAPSHOT_NAME from $NFS_IMAGE_NAME"
-
-		export ORG_IMAGE_NAME=$NFS_IMAGE_NAME
-		export NFS_IMAGE_NAME=$NFS_IMAGE_SNAPSHOT_NAME
-		manage_nfs add $OPENQRM_SERVER_IP
-		# create a lock in the new created dir for post_exports + identifier
-		touch "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME/.clone_in_progress"
-
-		openqrm_lock_queue release nfs-storage $LOCK_TIME
-		trap '' EXIT
-
-		# get a list of files to sync
-		rsync -a -vv --list-only --progress --exclude="/.sync_in_progress.*" $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$ORG_IMAGE_NAME/* $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME/ > $SYNC_PROGRESS_DIR/rsync_files.$NFS_IMAGE_NAME.log
-		> $SYNC_PROGRESS_DIR/rsync_progress.$NFS_IMAGE_NAME.log
-		# post exports early, we show the progress in the ui
-		if [ "$NFS_OPENQRM_USERNAME" != "" ] && [ "$NFS_OPENQRM_PASSWORD" != "" ]; then
-			$0 post_sync_progress -n $NFS_IMAGE_NAME -u $NFS_OPENQRM_USERNAME -p $NFS_OPENQRM_PASSWORD --openqrm-internal-cmd true &
-		fi
-		# delay start syncing
-		sleep 10
-		rsync -a --progress --exclude="/.sync_in_progress.*" $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$ORG_IMAGE_NAME/* $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME/ > $SYNC_PROGRESS_DIR/rsync_progress.$NFS_IMAGE_NAME.log
-
-		# remove lock from the origin + snapshot
-		rm -f "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$ORG_IMAGE_NAME/.sync_in_progress.$NFS_IMAGE_NAME"
-		rm -f "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME/.clone_in_progress"
-
-		# stop sync-progress monitor and send sync-finished to openQRM
-		rm -f $SYNC_PROGRESS_DIR/rsync_progress.$NFS_IMAGE_NAME.log $SYNC_PROGRESS_DIR/rsync_files.$NFS_IMAGE_NAME.log
-		$0 post_sync_finished -n $NFS_IMAGE_NAME -u $NFS_OPENQRM_USERNAME -p $NFS_OPENQRM_PASSWORD --openqrm-internal-cmd true
-		# create long-term-action finished event
-		openqrm_post_event 0 "$NFS_IMAGE_SNAPSHOT_NAME" 10 "nfs-storage" "Finished to clone $NFS_IMAGE_SNAPSHOT_NAME"
-		;;
-
-	auth)
-		if [ "$NFS_IMAGE_ROOTDEVICE" == "" ]; then
-			NFS_IMAGE_ROOTDEVICE="$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME"
-		fi
-		echo -n "Authenticating NFS export $NFS_IMAGE_ROOTDEVICE to $NFS_IMAGE_AUTH_IP"
-		if [ "$NFS_OPENQRM_USERNAME" != "" ] && [ "$NFS_OPENQRM_PASSWORD" != "" ] && [ "$NFS_IMAGE_NAME" != "" ]; then
-			MAX_AUTH_LOOP=0
-			while (true); do
-				# if this is a snapshot volume we have to wait until the sync is ready
-				if [ -d "$NFS_IMAGE_ROOTDEVICE" ] && [ ! -f "$NFS_IMAGE_ROOTDEVICE/.clone_in_progress" ]; then
-					# sync is ready
-					break
-				fi
-				sleep 5
-				if [ "$MAX_AUTH_LOOP" == "$MAX_VOLUME_AUTHENTICATION_LOOP" ]; then
-					openqrm_post_event 0 "auth" 3 "nfs-storage" "Volume $NFS_IMAGE_ROOTDEVICE does not exists, Cannot auth to $NFS_IMAGE_AUTH_IP."
-					exit 1
-				fi
-				MAX_AUTH_LOOP=$(( MAX_AUTH_LOOP + 1 ))
-			done
-		fi
-		# auth in exports
-		LOCK_TIME=`openqrm_lock_queue aquire nfs-storage`
-		trap "openqrm_lock_queue release nfs-storage $LOCK_TIME" EXIT
-
-		manage_nfs auth $NFS_IMAGE_AUTH_IP
-
-		openqrm_lock_queue release nfs-storage $LOCK_TIME
-		trap '' EXIT
-		# if we have an image name send back to openQRM that storage auth finished to remvoe the storage-auth-blocker
-		if [ "$NFS_OPENQRM_USERNAME" != "" ] && [ "$NFS_OPENQRM_PASSWORD" != "" ] && [ "$NFS_IMAGE_NAME" != "" ]; then
-			if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$NFS_OPENQRM_USERNAME --http-password=$NFS_OPENQRM_PASSWORD "$openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/nfs-storage/nfs-storage-action.php?nfs_storage_command=auth_finished&nfs_image_name=$NFS_IMAGE_NAME"; then
-				openqrm_post_event 0 "auth" 3 "nfs-storage" "Could not remove the storage-auth-blocker from openQRM at $OPENQRM_SERVER_IP."
-			fi
-			# post exports again
-			$0 post_exports -u $NFS_OPENQRM_USERNAME -p $NFS_OPENQRM_PASSWORD --openqrm-internal-cmd true
-		fi
-		;;
-
-	adapt)
-		if [ ! -d "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME" ]; then
-			openqrm_post_event 0 "adapt" 3 "nfs-storage" "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME does not exist."
-			openqrm_unblock_starting_queue $FULL_COMMANDLINE
-			exit 1
-		fi
-
-		LOCK_TIME=`openqrm_lock_queue aquire nfs-storage`
-		trap "openqrm_lock_queue release nfs-storage $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# add to exports
-		manage_nfs adapt $OPENQRM_SERVER_IP
-
-		openqrm_lock_queue release nfs-storage $LOCK_TIME
-		trap '' EXIT
-
-		STORAGE_STATUS_TMP=$resource_id.nfs.$NFS_IMAGE_NAME.adapt
-		> $STORAGE_STATUS_TMP
-		echo "$IMAGE_NAME,$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME" >> $STORAGE_STATUS_TMP
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$NFS_OPENQRM_USERNAME --http-password=$NFS_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/nfs-storage/nfs-storage-action.php?nfs_storage_command=get_ident; then
-			openqrm_post_event 0 "adapt" 3 "nfs-storage" "Could not post the nfs-export identifier to openQRM at $OPENQRM_SERVER_IP."
-		fi
-		rm -f $STORAGE_STATUS_TMP
-		rm -f $STORAGE_STATUS_TMP.post
-
-		;;
-
-	list)
-		ls $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY
-		;;
-	post_exports)
-		BACKEND_DIR_AVAIL_SPACE=`df --block-size MB $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY | grep -v Used | awk '{ print $2 }' | sed -e "s/MB//g"`
-		BACKEND_DIR_FREE_SPACE=`df --block-size MB $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY | grep -v Used | awk '{ print $4 }' | sed -e "s/MB//g"`
-		STORAGE_STATUS_TMP=$resource_id.nfs.stat
-		# send avail + free as first line, all next lines are luns
-		echo "$BACKEND_DIR_AVAIL_SPACE""@""$BACKEND_DIR_FREE_SPACE" > $STORAGE_STATUS_TMP
-		for VOLUME in `ls  $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY`; do
-			if grep -w ^$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$VOLUME /var/lib/nfs/etab 1>/dev/null; then
-				AUTHENTICATED=`grep -w ^$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$VOLUME /var/lib/nfs/etab  | awk '{ print $2 }' | cut -d'(' -f1`
-				if [ -f "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$VOLUME/.clone_in_progress" ]; then
-					echo "nfs-deployment""@""$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$VOLUME""@""$AUTHENTICATED""@""clone_in_progress" >> $STORAGE_STATUS_TMP
-				else
-					echo "nfs-deployment""@""$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$VOLUME""@""$AUTHENTICATED""@" >> $STORAGE_STATUS_TMP
-				fi
-			else
-					echo "@""$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$VOLUME""@@" >> $STORAGE_STATUS_TMP
-			fi
-		done
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$NFS_OPENQRM_USERNAME --http-password=$NFS_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/nfs-storage/nfs-storage-action.php?nfs_storage_command=get_storage; then
-			openqrm_post_event 0 "post_exports" 3 "nfs-storage" "Could not post the nfs-export status to openQRM at $OPENQRM_SERVER_IP."
-		fi
-		rm -f $STORAGE_STATUS_TMP
-		rm -f $STORAGE_STATUS_TMP.post
-		;;
-	post_identifier)
-		echo "Posting current nfs-identifier to the openQRM-server"
-		STORAGE_STATUS_TMP=$resource_id.nfs.ident
-		> $STORAGE_STATUS_TMP
-		for IMAGE_NAME_EXPORT in `cat /var/lib/nfs/etab | grep ^$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY | awk {' print $1 '} | sed -e "s/<.*>//g" | sed -e "s/(.*)//g"`; do
-			if [ ! -f "$IMAGE_NAME_EXPORT/.clone_in_progress" ]; then
-				IMAGE_NAME=`basename $IMAGE_NAME_EXPORT`
-				echo "$IMAGE_NAME,$IMAGE_NAME_EXPORT" >> $STORAGE_STATUS_TMP
-			fi
-		done
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$NFS_OPENQRM_USERNAME --http-password=$NFS_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/nfs-storage/nfs-storage-action.php?nfs_storage_command=get_ident; then
-			openqrm_post_event 0 "post_identifier" 3 "nfs-storage" "Could not post the nfs-export identifier to openQRM at $OPENQRM_SERVER_IP."
-		fi
-		rm -f $STORAGE_STATUS_TMP
-		rm -f $STORAGE_STATUS_TMP.post
-		;;
-
-	post_sync_progress)
-		echo "Posting progress of the sync action for volume $NFS_IMAGE_NAME to the openQRM-server"
-		if [ ! -f "$SYNC_PROGRESS_DIR/rsync_files.$NFS_IMAGE_NAME.log" ] || [ ! -f "$SYNC_PROGRESS_DIR/rsync_progress.$NFS_IMAGE_NAME.log" ]; then
-			openqrm_post_event 0 "clone" 3 "nfs-storage" "No sync action active for volume $NFS_IMAGE_NAME!"
-			exit 1
-		fi
-		STORAGE_STATUS_TMP=$resource_id.nfs.$NFS_IMAGE_NAME.sync_progress
-
-		while (true); do
-			# if this is a snapshot volume we have to wait until the sync is ready
-			if [ -d "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME/" ] && [ ! -f "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME/.clone_in_progress" ]; then
-				# sync is ready
-				break
-			else
-				if [ ! -f "$SYNC_PROGRESS_DIR/rsync_files.$NFS_IMAGE_NAME.log" ] || [ ! -f "$SYNC_PROGRESS_DIR/rsync_progress.$NFS_IMAGE_NAME.log" ]; then
-				    # cloning not started yet, waiting for the snapshot to appear
-				    echo "0" > $STORAGE_STATUS_TMP
-				else
-				    # get the size of all changes
-				    COMPLETE_CHANGE_SIZE=`cat $SYNC_PROGRESS_DIR/rsync_files.$NFS_IMAGE_NAME.log | wc -l`
-				    # double up to get around 100 percent
-				    COMPLETE_CHANGE_SIZE=$(( COMPLETE_CHANGE_SIZE * 2 ))
-				    PARTITIAL_CHANGE_SIZE=`cat $SYNC_PROGRESS_DIR/rsync_progress.$NFS_IMAGE_NAME.log | wc -l`
-				    if [ "$PARTITIAL_CHANGE_SIZE" == 0 ]; then
-					    PARTITIAL_CHANGE_SIZE=1
-				    fi
-				    CURRENT_SYNC_PROGRESS_IN_PERCENT=$(( COMPLETE_CHANGE_SIZE / PARTITIAL_CHANGE_SIZE ))
-				    CURRENT_SYNC_PROGRESS_IN_PERCENT=$(( 100 / CURRENT_SYNC_PROGRESS_IN_PERCENT ))
-				    # make sure to not send 100%, this is send by clone finished
-				    CURRENT_SYNC_PROGRESS_IN_PERCENT=$(( CURRENT_SYNC_PROGRESS_IN_PERCENT - 1 ))
-					if (( $CURRENT_SYNC_PROGRESS_IN_PERCENT < 0 )); then
-						CURRENT_SYNC_PROGRESS_IN_PERCENT=0
-					fi
-				    echo "$CURRENT_SYNC_PROGRESS_IN_PERCENT" > $STORAGE_STATUS_TMP
-				fi
-				if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$NFS_OPENQRM_USERNAME --http-password=$NFS_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/nfs-storage/nfs-storage-action.php?nfs_storage_command=get_sync_progress; then
-					nfs_storage_log "post_sync_progress" "Could not post the sync progress for volume $NFS_IMAGE_NAME to openQRM at $OPENQRM_SERVER_IP."
-				fi
-				rm -f $STORAGE_STATUS_TMP $STORAGE_STATUS_TMP.post
-			fi
-			sleep 2
-		done
-		;;
-
-
-	post_sync_finished)
-		echo "Posting finished for volume $NFS_IMAGE_NAME to the openQRM-server"
-		STORAGE_STATUS_TMP=$resource_id.nfs.$NFS_IMAGE_NAME.sync_progress
-		echo "100" > $STORAGE_STATUS_TMP
-		if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$NFS_OPENQRM_USERNAME --http-password=$NFS_OPENQRM_PASSWORD  --post-file=`$OPENQRM_POSTENCODE $STORAGE_STATUS_TMP` $openqrm_web_protocol://$OPENQRM_SERVER_IP/openqrm/base/plugins/nfs-storage/nfs-storage-action.php?nfs_storage_command=get_sync_finished; then
-			nfs_storage_log "post_sync_finished" "Could not post the sync progress for volume $NFS_IMAGE_NAME to openQRM at $OPENQRM_SERVER_IP."
-		fi
-		rm -f $STORAGE_STATUS_TMP $STORAGE_STATUS_TMP.post
-		;;
-
-
-
-	*)
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		nfs_storage_usage
-		;;
-
-
-esac
-
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/etc/init.d/nfs-storage b/openQRM-5.3.50-CE/src/plugins/nfs-storage/etc/init.d/nfs-storage
deleted file mode 100644
index 3b8c338..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/etc/init.d/nfs-storage
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-# this is the boot-service init script for the NFS-Storage-hosts
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/include/openqrm-plugin-nfs-storage-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/etc/openqrm-plugin-nfs-storage.conf
-
-# do not start on the intitrd
-if [ -f /etc/initrd-devices.conf ]; then
-	exit 0
-fi
-
-function nfs_storage_start() {
-	echo "Starting the openQRM nfs-storage-plugin"
-	if [ "$NFS_STORAGE_AUTO_START" == "yes" ]; then
-		if [ -x "/etc/init.d/nfs-kernel-server" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfs-kernel-server start
-			else
-				/etc/init.d/nfs-kernel-server start
-			fi
-		fi
-		if [ -x "/etc/init.d/nfs" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfs start
-			else
-				/etc/init.d/nfs start
-			fi
-		fi
-		if [ -x "/etc/init.d/nfslock" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfslock start
-			else
-				/etc/init.d/nfslock start
-			fi
-		fi
-		# for Suse
-		if [ -x /etc/init.d/nfsserver ]; then
-			/etc/init.d/nfsserver start
-		fi
-	fi
-}
-
-
-function nfs_storage_stop() {
-	echo "Stopping the openQRM nfs-storage-plugin"
-	if [ "$NFS_STORAGE_AUTO_START" == "yes" ]; then
-		if [ -x "/etc/init.d/nfs-kernel-server" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfs-kernel-server stop
-			else
-				/etc/init.d/nfs-kernel-server stop
-			fi
-		fi
-		if [ -x "/etc/init.d/nfs" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfs stop
-			else
-				/etc/init.d/nfs stop
-			fi
-		fi
-		if [ -x "/etc/init.d/nfslock" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfslock stop
-			else
-				/etc/init.d/nfslock stop
-			fi
-		fi
-		# for Suse
-		if [ -x /etc/init.d/nfsserver ]; then
-			/etc/init.d/nfsserver stop
-		fi
-	fi
-}
-
-
-
-
-
-case "$1" in
-	start)
-		nfs_storage_start
-		;;
-	stop)
-		nfs_storage_stop
-		;;
-	restart)
-		nfs_storage_stop
-		sleep 1
-		nfs_storage_start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-
-esac
-exit $?
-
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/etc/init.d/openqrm-plugin-nfs-storage b/openQRM-5.3.50-CE/src/plugins/nfs-storage/etc/init.d/openqrm-plugin-nfs-storage
deleted file mode 100644
index 62bd7c8..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/etc/init.d/openqrm-plugin-nfs-storage
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/bin/bash
-# init script for the openQRM nfs-storage-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/include/openqrm-plugin-nfs-storage-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/etc/openqrm-plugin-nfs-storage.conf
-
-
-
-function openqrm_plugin_nfs_storage_start() {
-	echo "Starting the openQRM nfs-storage-plugin"
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/nfs-storage/.running
-	
-	[[ "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY" ]] || mkdir -p $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY
-	
-	if [ "$NFS_STORAGE_AUTO_START" == "yes" ]; then
-		if [ -x "/etc/init.d/portmap" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d portmap start
-			else
-				/etc/init.d/portmap start
-			fi
-		fi
-		if [ -x "/etc/init.d/nfs-kernel-server" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfs-kernel-server start
-			else
-				/etc/init.d/nfs-kernel-server start
-			fi
-		fi
-
-
-		if [ -x "/etc/init.d/nfs" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfs start
-			else
-				/etc/init.d/nfs start
-			fi
-		fi
-		if [ -x "/etc/init.d/nfslock" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfslock start
-			else
-				/etc/init.d/nfslock start
-			fi
-		fi
-		# for Suse
-		if [ -x /etc/init.d/nfsserver ]; then
-			/etc/init.d/nfsserver start
-		fi
-	fi
-}
-
-
-function openqrm_plugin_nfs_storage_stop() {
-	echo "Stopping the openQRM nfs-storage-plugin"
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/nfs-storage/.running
-	if [ "$NFS_STORAGE_AUTO_START" == "yes" ]; then
-		if [ -x "/etc/init.d/nfs-kernel-server" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfs-kernel-server stop
-			else
-				/etc/init.d/nfs-kernel-server stop
-			fi
-		fi
-		if [ -x "/etc/init.d/portmap" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d portmap stop
-			else
-				/etc/init.d/portmap stop
-			fi
-		fi
-
-		if [ -x "/etc/init.d/nfs" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfs stop
-			else
-				/etc/init.d/nfs stop
-			fi
-		fi
-		if [ -x "/etc/init.d/nfslock" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d nfslock stop
-			else
-				/etc/init.d/nfslock stop
-			fi
-		fi
-		# for Suse
-		if [ -x /etc/init.d/nfsserver ]; then
-			/etc/init.d/nfsserver stop
-		fi
-	fi
-}
-
-
-function openqrm_plugin_nfs_storage_uninstall() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "nfs-storage: Please give a username to uninstall the plugin : "
-		read USERNAME
-		echo
-		echo -n "nfs-storage: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Uninstalling the openQRM nfs-storage-plugin"
-	openqrm_plugin_nfs_storage_stop
-	openqrm_server_remove_deployment_type $USERNAME $PASSWORD nfs-deployment
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/nfs-storage
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.nfs-deployment
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.nfs-deployment.php
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-nfs-storage.tgz
-}
-
-function openqrm_plugin_nfs_storage_init() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "nfs-storage: Please give a username to init the plugin : "
-		read USERNAME
-		echo
-		echo -n "nfs-storage: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Initializing the openQRM nfs-storage-plugin"
-	openqrm_server_add_deployment_type $USERNAME $PASSWORD nfs-deployment nfs-deployment "Nfs-root deployment" nfs-storage "NFS Storage"
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/nfs-storage
-	# linking the boot-service
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/boot-service-nfs-storage.tgz $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-nfs-storage.tgz
-	# linking the root mount hook
-	chmod +x $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/root-mount.nfs-deployment
-	ln -s $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/root-mount.nfs-deployment $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.nfs-deployment
-	# linking the image-menu
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/image.nfs-deployment.php $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.nfs-deployment.php
-	# create storage dir for stat files
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/storage
-	chmod 777 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/storage
-	echo "Order deny,allow" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/storage/.htaccess
-	echo "Deny from all" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/web/storage/.htaccess
-
-}
-
-USER=$2
-PASS=$3
-
-case "$1" in
-	start)
-		openqrm_plugin_nfs_storage_start
-		;;
-	stop)
-		openqrm_plugin_nfs_storage_stop
-		;;
-	restart)
-		openqrm_plugin_nfs_storage_stop
-		sleep 1
-		openqrm_plugin_nfs_storage_start
-		;;
-	init)
-		openqrm_plugin_nfs_storage_init $USER $PASS
-		;;
-	uninstall)
-		openqrm_plugin_nfs_storage_uninstall $USER $PASS
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/etc/init.d/openqrm-plugin-nfs-storage.postinstall b/openQRM-5.3.50-CE/src/plugins/nfs-storage/etc/init.d/openqrm-plugin-nfs-storage.postinstall
deleted file mode 100644
index 55967fb..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/etc/init.d/openqrm-plugin-nfs-storage.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-nfs-storage postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/etc/init.d/openqrm-plugin-nfs-storage.preremove b/openQRM-5.3.50-CE/src/plugins/nfs-storage/etc/init.d/openqrm-plugin-nfs-storage.preremove
deleted file mode 100644
index f1fd71e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/etc/init.d/openqrm-plugin-nfs-storage.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-nfs-storage preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-nfs-storage stop
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/etc/openqrm-plugin-nfs-storage.conf b/openQRM-5.3.50-CE/src/plugins/nfs-storage/etc/openqrm-plugin-nfs-storage.conf
deleted file mode 100644
index fff0719..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/etc/openqrm-plugin-nfs-storage.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-# this is the openQRM-plugin-nfs-storage info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-
-OPENQRM_PLUGIN_DESCRIPTION="Integrates NFS as Storage technology (network-deployment)."
-OPENQRM_PLUGIN_TYPE="storage"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES=""
-
-# The directory for the NFS exports
-OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY="/exports"
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/nfs-storage/etc/openqrm-plugin-nfs-storage.conf"
-
-# if openQRM should start/stop the storage component (yes/no), default no
-NFS_STORAGE_AUTO_START="yes"
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/include/openqrm-plugin-nfs-storage-functions b/openQRM-5.3.50-CE/src/plugins/nfs-storage/include/openqrm-plugin-nfs-storage-functions
deleted file mode 100644
index f1680db..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/include/openqrm-plugin-nfs-storage-functions
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/bin/bash
-# this is the functions file for the nfs-storage-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# some definitions
-DEFAULT_IMAGE_SIZE=5000
-NFSEXPORTS="/etc/exports"
-
-################ common nfs-storage functions
-
-# logs for nfs_storage
-function nfs_storage_log() {
-	local COMPONENT=$1
-	shift
-	local MESSAGE=$@
-	logger -i -t "nfs-storage plug-in" "$COMPONENT : $MESSAGE"
-}
-
-################ nfs-storage functions
-
-
-# deps function
-function check_nfs_storage_deps() {
-	# check and fullfill dependencies
-	# screen
-	if ! openqrm_full_fill_os_dependency screen screen; then
-		return 1
-	fi
-	if [ -x /usr/bin/screen.real ]; then
-		export RUNSCREEN="/usr/bin/screen.real"
-	else
-		export RUNSCREEN=`which screen`
-	fi
-	# wget
-	if ! openqrm_full_fill_os_dependency wget wget; then
-		return 1
-	fi
-	# procmail for lockfile
-	if ! openqrm_full_fill_os_dependency lockfile procmail; then
-		return 1
-	fi
-	# rsync
-	if ! openqrm_full_fill_os_dependency rsync rsync; then
-		return 1
-	fi
-	if [ -f /etc/debian_version ]; then
-		# nfs-kernel-server
-		if ! openqrm_full_fill_os_dependency exportfs nfs-kernel-server; then
-			return 1
-		fi
-		# nfs-common
-		if ! openqrm_full_fill_os_dependency mount.nfs nfs-common; then
-			return 1
-		fi
-	elif [ -f /etc/redhat-release ]; then
-		# nfs-utils
-		if ! openqrm_full_fill_os_dependency mount.nfs nfs-utils; then
-			return 1
-		fi
-	elif [ -f /etc/SuSE-release ]; then
-		# nfs-client
-		if ! openqrm_full_fill_os_dependency mount.nfs nfs-client; then
-			return 1
-		fi
-		# nfs-kernel-server
-		if ! openqrm_full_fill_os_dependency exportfs nfs-kernel-server; then
-			return 1
-		fi
-	fi
-
-}
-
-
-function restart_nfs() {
-	if [ -x /etc/init.d/nfs ]; then
-		/etc/init.d/nfs reload
-	elif [ -x /etc/init.d/nfs-kernel-server ]; then
-		/etc/init.d/nfs-kernel-server reload
-	elif [ -x /etc/init.d/nfsserver ]; then
-		/etc/init.d/nfsserver reload
-	else
-		exportfs -r
-	fi
-}
-
-
-
-function manage_nfs() {
-	case "$1" in
-		add)
-			OPENQRM_SERVER=$2
-			mkdir -p $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME
-			echo "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME	$OPENQRM_SERVER(rw,insecure,no_root_squash,async,no_subtree_check)" >> $NFSEXPORTS
-			sed -i '/^$/d' $NFSEXPORTS
-			restart_nfs
-			;;
-		remove)
-			# tabs and spaces
-			sed -i -e "s#^$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME .*##g" $NFSEXPORTS
-			sed -i -e "s#^$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME	.*##g" $NFSEXPORTS
-			sed -i '/^$/d' $NFSEXPORTS
-			restart_nfs
-			rm -rf $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME/*
-			rmdir $OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME
-			;;
-
-		auth)
-			AUTH_IP=$2
-			# tabs and spaces
-			sed -i -e "s#^$NFS_IMAGE_ROOTDEVICE .*#$NFS_IMAGE_ROOTDEVICE	$AUTH_IP(rw,insecure,no_root_squash,async,no_subtree_check)#g" $NFSEXPORTS
-			sed -i -e "s#^$NFS_IMAGE_ROOTDEVICE	.*#$NFS_IMAGE_ROOTDEVICE	$AUTH_IP(rw,insecure,no_root_squash,async)#g" $NFSEXPORTS
-			sed -i '/^$/d' $NFSEXPORTS
-			restart_nfs
-			;;
-
-		adapt)
-			AUTH_IP=$2
-			if ! grep -w ^$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME $NFSEXPORTS 1>/dev/null; then
-				echo "$OPENQRM_NFS_STORAGE_SERVER_IMAGE_DIRECTORY/$NFS_IMAGE_NAME	$AUTH_IP(rw,insecure,no_root_squash,async,no_subtree_check)" >> $NFSEXPORTS
-				sed -i '/^$/d' $NFSEXPORTS
-				restart_nfs
-			fi
-			;;
-
-	esac
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage-about.bootservice.class.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage-about.bootservice.class.php
deleted file mode 100644
index fd85f0e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage-about.bootservice.class.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * nfs-storage-about Boot-Service
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class nfs_storage_about_bootservice
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'nfs_storage_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "nfs_storage_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/nfs-storage-about-bootservice.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['boot_service_title'], 'boot_service_title');
-		$t->add($this->lang['boot_service_content'], 'boot_service_content');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage-about.controller.class.php
deleted file mode 100644
index 15b4515..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage-about.controller.class.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?php
-/**
- * nfs-about Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class nfs_storage_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'nfs_storage_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'nfs_storage_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'nfs_storage_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'nfs_storage_about_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About NFS-Storage',
-		'label' => 'About NFS-Storage',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The "NFS-Storage" plugin manages NFS-Server in openQRM.
-					   ',
-		'requirements_title' => 'Requirements',
-		'requirements_list' => '<li>A resource for the NFS-Storage Storage (this can be a remote system integrated into openQRM e.g. via the "local-server" plugin or the openQRM server itself)</li>
-				   <li>The following packages must be installed: nfs-common, nfs-kernel-server, screen, rsync</li>',
-
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-
-		'provides_title' => 'Provides',
-		'provides_list' => '<li>Storage type: "NFS Storage"</li>
-					<li>Deployment types: "Nfs-root deployment"</li>',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Storage',
-
-		'deployment_title' => 'Deployment Type',
-		'deployment_content' => 'Network-Deployment',
-
-		'documentation_title' => 'Documentation',
-		'use_case_title' => 'Use-Case',
-		'network_deploymet' => 'Network-Deployment',
-		'doc1' => '',
-	),
-	'bootservice' => array (
-		'tab' => 'Boot-Service',
-		'label' => 'NFS-Storage Boot-Service',
-		'boot_service_title' => 'NFS-Storage Host Boot-Service',
-		'boot_service_content' => 'The NFS-Storage Plugin provides an openQRM Boot-Service.
-			This "NFS-Storage Boot-Service" is automatically downloaded and executed by the openQRM-Client on all integrated Systems.
-			The Boot-Service is located at:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/nfs-storage/web/boot-service-nfs-storage.tgz</b></i>
-			<br>
-			<br>
-			The "NFS-Storage Boot-Service contains the Client files of the NFS-Storage Plugin.<br>
-			Also a configuration file for the NFS-Storage server is included in this Boot-Service.<br>
-			<br>
-			The Boot-Service configuration can be viewed and administrated by the "openqrm" utility.<br>
-			To view the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n nfs-storage -a default</b></i>
-			<br>
-			<br>
-			To view a Boot-Service configuration of a specific appliance run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n nfs-storage -a [appliance-name]</b></i>
-			<br>
-			<br>
-			To adapt a parameter in the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n nfs-storage -a default -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			To adapt a paramter in the Boot-Service configuration of a specific appliance run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n nfs-storage -a [appliance-name] -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			In case the openmQRM Server itself is used as the NFS-Storage Storage please edit:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/nfs-storage/etc/openqrm-plugin-nfs-storage.conf</b></i>
-			<br>
-			<br>
-			and set the configuration keys.<br>
-			<br>
-			',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/nfs-storage/lang", 'nfs-storage-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/nfs-storage/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "documentation";
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-			case 'bootservice':
-				$content[] = $this->bootservice(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About NFS-Storage
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/nfs-storage/class/nfs-storage-about.documentation.class.php');
-			$controller = new nfs_storage_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Boot-Service
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function bootservice( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/nfs-storage/class/nfs-storage-about.bootservice.class.php');
-			$controller = new nfs_storage_about_bootservice($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['bootservice'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['bootservice']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'bootservice' );
-		$content['onclick'] = false;
-		if($this->action === 'bootservice'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage-about.documentation.class.php
deleted file mode 100644
index c931bb8..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage-about.documentation.class.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * nfs-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class nfs_storage_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'nfs_storage_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "nfs_storage_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/nfs-storage-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['deployment_title'], 'deployment_title');
-		$t->add($this->lang['deployment_content'], 'deployment_content');
-		$t->add($this->lang['provides_title'], 'provides_title');
-		$t->add($this->lang['provides_list'], 'provides_list');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.add.class.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.add.class.php
deleted file mode 100644
index 1854193..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.add.class.php
+++ /dev/null
@@ -1,293 +0,0 @@
-<?php
-/**
- * NFS-Storage Add new Volume
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class nfs_storage_add
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'nfs_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "nfs_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'nfs_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'nfs_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-		$this->controller = $controller;
-		$this->response   = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-		$this->user = $openqrm->user();
-		$storage_id       = $this->response->html->request()->get('storage_id');
-		$storage          = $this->openqrm->storage();
-		$resource         = $this->openqrm->resource();
-		$deployment       = $this->openqrm->deployment();
-		$this->response->params['storage_id'] = $this->response->html->request()->get('storage_id');
-		$this->storage    = $storage->get_instance_by_id($storage_id);
-		$this->resource   = $resource->get_instance_by_id($storage->resource_id);
-		$this->deployment = $deployment->get_instance_by_id($storage->type);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$this->set_max();
-		$response = $this->add();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 3) {
-				$this->controller->reload();
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&image_id='.$response->image_id
-				);
-			} else {
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/nfs-storage-add.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function add() {
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			if($form->get_request('size') > $this->max) {
-				$form->set_error('size', sprintf($this->lang['error_size_exeeded'], number_format($this->max, 0, '', '').' MB'));
-			}
-			if(!$form->get_errors()) {
-				$name        = $form->get_request('name');
-				$command     = $this->openqrm->get('basedir')."/plugins/nfs-storage/bin/openqrm-nfs-storage add -n $name";
-				$command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode background';
-
-				$storage_id  = $this->response->html->request()->get('storage_id');
-				$storage     = $this->storage;
-				$resource    = $this->resource;
-				$storage->get_instance_by_id($storage_id);
-				$resource->get_instance_by_id($storage->resource_id);
-
-				$statfile = $this->openqrm->get('basedir').'/plugins/nfs-storage/web/storage/'.$storage->resource_id.'.nfs.stat';
-				if (file_exists($statfile)) {
-					$lines = explode("\n", file_get_contents($statfile));
-					if(count($lines) >= 1) {
-						foreach($lines as $line) {
-							if($line !== '') {
-								$line = explode('@', $line);
-								$check = basename($line[1]);
-								if($name === $check) {
-									$error = sprintf($this->lang['error_exists'], $name);
-								}
-							}
-						}
-					}
-				}
-				if(isset($error)) {
-					$response->error = $error;
-				} else {
-					if($this->file->exists($statfile)) {
-						$this->file->remove($statfile);
-					}
-					$resource->send_command($resource->ip, $command);
-					while (!$this->file->exists($statfile)) {
-						usleep(10000); // sleep 10ms to unload the CPU
-						clearstatcache();
-					}
-
-					// add check that volume $name is now in the statfile
-					$created = false;
-					$volume_path = "";
-					$lines = explode("\n", $this->file->get_contents($statfile));
-					if(count($lines) >= 1) {
-						foreach($lines as $line) {
-							if($line !== '') {
-								$line = explode('@', $line);
-								$check = basename($line[1]);
-								if($name === $check) {
-									$created = true;
-									$volume_path = $line[1];
-									break;
-								}
-							}
-						}
-					}
-
-					if ($created) {
-						$tables = $this->openqrm->get('table');
-					    $image_fields = array();
-					    $image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					    $image_fields['image_name'] = $name;
-					    $image_fields['image_type'] = $this->deployment->type;
-					    $image_fields['image_rootfstype'] = 'nfs';
-					    $image_fields['image_storageid'] = $this->storage->id;
-					    $image_fields['image_comment'] = "Image Object for volume $name";
-						$image_fields['image_rootdevice'] = $volume_path;
-						$image_fields['image_size']=0;
-					    $image = new image();
-					    $image->add($image_fields);
-						$response->msg = sprintf($this->lang['msg_added'], $name);
-						// save image id in response for the wizard
-						$response->image_id = $image_fields["image_id"];
-
-					} else {
-					    $response->msg = sprintf($this->lang['msg_add_failed'], $name);
-					}
-				}
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'add');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$d['name']['label']                             = $this->lang['form_name'];
-		$d['name']['required']                          = true;
-		$d['name']['validate']['regex']                 = '/^[a-z0-9._]+$/i';
-		$d['name']['validate']['errormsg']              = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                    = 'htmlobject_input';
-		$d['name']['object']['attrib']['id']            = 'name';
-		$d['name']['object']['attrib']['name']          = 'name';
-		$d['name']['object']['attrib']['type']          = 'text';
-		$d['name']['object']['attrib']['css']           = 'namegen';
-		$d['name']['object']['attrib']['customattribs'] = 'data-prefix="nfs_" data-length="8"';
-		$d['name']['object']['attrib']['value']         = '';
-		$d['name']['object']['attrib']['maxlength']     = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Set max
-	 *
-	 * @access protected
-	 * @return bool
-	 */
-	//--------------------------------------------
-	function set_max() {
-		$statfile = $this->openqrm->get('basedir').'/plugins/nfs-storage/web/storage/'.$this->resource->id.'.nfs.stat';
-		if (file_exists($statfile)) {
-			$lines = explode("\n", file_get_contents($statfile));
-			if(count($lines) >= 1) {
-				foreach($lines as $line) {
-					if($line !== '') {
-						$line = explode('@', $line);
-						$max = $line[1];
-						$max = (int)$max;
-						$this->max = $max;
-						return true;
-						break;
-					}
-				}
-			} else {
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.api.class.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.api.class.php
deleted file mode 100644
index b9143cf..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.api.class.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * NFS-Storage Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class nfs_storage_api
-{
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param object $nfs_storage_controller
-	 */
-	//--------------------------------------------
-	function __construct($nfs_storage_controller) {
-		$this->controller = $nfs_storage_controller;
-		$this->user       = $this->controller->user;
-		$this->html       = $this->controller->response->html;
-		$this->response   = $this->html->response();
-		$this->file       = $this->controller->file;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function action() {
-		$action = $this->html->request()->get($this->controller->actions_name);
-		switch( $action ) {
-			case 'monitor':
-				$this->monitor();
-			break;
-			case 'progress':
-				$this->progress();
-			break;
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Monitor
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function monitor() {
-		$filename     = '/etc/exports';
-		$lastmodif    = isset($_GET['timestamp']) ? $_GET['timestamp'] : 0;
-		$currentmodif = filemtime($filename);
-		while ($currentmodif <= $lastmodif) // check if the data file has been modified
-		{
-		  usleep(10000); // sleep 10ms to unload the CPU
-		  clearstatcache();
-		  $currentmodif = filemtime($filename);
-		}
-		echo 'changed';
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get progress
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function progress() {
-		$name = basename($this->response->html->request()->get('name'));
-		$file = $this->controller->openqrm->get('basedir').'/plugins/nfs-storage/web/storage/'.$name;
-		if($this->file->exists($file)) {
-			echo $this->file->get_contents($file);
-		} else {
-			header("HTTP/1.0 404 Not Found");
-		}
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.auth.class.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.auth.class.php
deleted file mode 100644
index 02c385a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.auth.class.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/**
- * NFS-Storage Auth Volume(s)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class nfs_storage_auth
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'nfs_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "nfs_storage_msg";
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'nfs_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'nfs_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->openqrm = $openqrm;
-		$this->user	    = $openqrm->user();
-		$this->file = $this->openqrm->file();
-		$this->volume = $this->response->html->request()->get('volume');
-		$this->response->params['volume'] = $this->volume;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->auth();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/nfs-storage-auth.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add(sprintf($this->lang['label'], $this->volume), 'label');
-		// explanation for auth
-		$t->add($this->lang['auth_explanation'], 'auth_explanation');
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Auth
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function auth() {
-		$response = $this->get_response();
-		$export   = $response->html->request()->get('volume');
-		$form     = $response->form;
-		if( $export !== '' ) {
-			if(!$form->get_errors() && $response->submit()) {
-				// set ENV
-				$storage_id = $this->response->html->request()->get('storage_id');
-				$storage    = new storage();
-				$resource   = new resource();
-				$storage->get_instance_by_id($storage_id);
-				$resource->get_instance_by_id($storage->resource_id);
-
-				$errors  = array();
-				$message = array();
-				$auths   = $form->get_request('ip');
-				$statfile = $this->openqrm->get('basedir').'/plugins/nfs-storage/web/storage/'.$resource->id.'.nfs.stat';
-
-				$error = '';
-				$command  = $this->openqrm->get('basedir').'/plugins/nfs-storage/bin/openqrm-nfs-storage auth';
-				$command .= ' -n '.$export.' -i '.$auths;
-				$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode background';
-				if($this->file->exists($statfile)) {
-					$this->file->remove($statfile);
-				}
-				$resource->send_command($resource->ip, $command);
-				while (!$this->file->exists($statfile)) {
-	  				usleep(10000); // sleep 10ms to unload the CPU
-	  				clearstatcache();
-				}
-				$message[] = sprintf($this->lang['msg_authd'], $export);
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'auth');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$regex_ip  = '~^([1-9]|[0-9][0-9]|[1][0-9][0-9]|[2][0-5][0-4])';
-		$regex_ip .= '\\.([0-9]|[0-9][0-9]|[1][0-9][0-9]|[2][0-5][0-5])';
-		$regex_ip .= '\\.([0-9]|[0-9][0-9]|[1][0-9][0-9]|[2][0-5][0-5])';
-		$regex_ip .= '\\.([1-9]|[0-9][0-9]|[1][0-9][0-9]|[2][0-5][0-4])+$~i';
-	
-		$d['ip']['label']                         = $this->lang['form_ip'];
-		$d['ip']['required']                      = true;
-		$d['ip']['validate']['regex']             = '/^[a-z0-9. *_-]+$/i';
-		$d['ip']['validate']['errormsg']          = $this->lang['error_ip'];
-		$d['ip']['object']['type']                = 'htmlobject_input';
-		$d['ip']['object']['attrib']['name']      = 'ip';
-		$d['ip']['object']['attrib']['type']      = 'text';
-		$d['ip']['object']['attrib']['value']     = '';
-		$d['ip']['object']['attrib']['maxlength'] = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.clone.class.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.clone.class.php
deleted file mode 100644
index b8cf1e8..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.clone.class.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-/**
- * NFS-Storage Clone Volume(s)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class nfs_storage_clone
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'nfs_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "nfs_storage_msg";
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'nfs_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'nfs_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->user = $openqrm->user();
-		$this->file = $this->openqrm->file();
-		$this->volume = $this->response->html->request()->get('volume');
-		$this->response->params['volume'] = $this->volume;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->duplicate();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 3) {
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&image_id='.$response->image_id
-				);
-			} else {
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/nfs-storage-clone.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add(sprintf($this->lang['label'], $this->volume), 'label');
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Clone
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function duplicate() {
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-
-			$storage_id = $this->response->html->request()->get('storage_id');
-			$storage    = new storage();
-			$resource   = new resource();
-			$deployment = new deployment();
-			$storage->get_instance_by_id($storage_id);
-			$resource->get_instance_by_id($storage->resource_id);
-			$deployment->get_instance_by_id($storage->type);
-
-			$name        = $form->get_request('name');
-			$command     = $this->openqrm->get('basedir').'/plugins/nfs-storage/bin/openqrm-nfs-storage clone';
-			$command    .= ' -n '.$this->volume;
-			$command    .= ' -s '.$name;
-			$command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-			$command .= ' --openqrm-ui-user '.$this->user->name;
-			$command .= ' --openqrm-cmd-mode background';
-
-			$statfile = $this->openqrm->get('basedir').'/plugins/nfs-storage/web/storage/'.$storage->resource_id.'.nfs.stat';
-			$origin_volume_path = '';
-			$volume_path = "";
-			if (file_exists($statfile)) {
-				$lines = explode("\n", file_get_contents($statfile));
-				if(count($lines) >= 1) {
-					foreach($lines as $line) {
-						if($line !== '') {
-							$line = explode('@', $line);
-							$check = basename($line[1]);
-							if($name === $check) {
-								$error = sprintf($this->lang['error_exists'], $name);
-							}
-							if ($this->volume === $check) {
-								$origin_volume_path = $line[1];
-							}
-						}
-					}
-				}
-			}
-			if (!strlen($origin_volume_path)) {
-				$error = sprintf($this->lang['msg_clone_failed'], $name);
-			} else {
-				$export_path = dirname($origin_volume_path);
-				$volume_path = $export_path.'/'.$name;
-			}
-
-			if(isset($error)) {
-				$response->error = $error;
-			} else {
-				$file = $this->openqrm->get('basedir').'/plugins/nfs-storage/web/storage/'.$resource->id.'.nfs.'.$name.'.sync_progress';
-				if($this->file->exists($file)) {
-					$this->file->remove($file);
-				}
-				$resource->send_command($resource->ip, $command);
-				while (!$this->file->exists($file)) {
-		  			usleep(10000); // sleep 10ms to unload the CPU
-		  			clearstatcache();
-				}
-
-				$tables = $this->openqrm->get('table');
-				$image_fields = array();
-				$image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$image_fields['image_name'] = $name;
-				$image_fields['image_type'] = $deployment->type;
-				$image_fields['image_rootfstype'] = 'nfs';
-				$image_fields['image_storageid'] = $storage->id;
-				$image_fields['image_comment'] = "Image Object for volume $name";
-				$image_fields['image_rootdevice'] = $volume_path;
-				$image_fields['image_size']=0;
-				$image = new image();
-				$image->add($image_fields);
-
-				$response->msg = sprintf($this->lang['msg_cloned'], $this->volume, $name);
-				// save image id in response for the wizard
-				$response->image_id = $image_fields["image_id"];
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'clone');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$d['name']['label']                         = $this->lang['form_name'];
-		$d['name']['required']                      = true;
-		$d['name']['validate']['regex']             = '/^[a-z0-9._]+$/i';
-		$d['name']['validate']['errormsg']          = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                = 'htmlobject_input';
-		$d['name']['object']['attrib']['name']      = 'name';
-		$d['name']['object']['attrib']['type']      = 'text';
-		$d['name']['object']['attrib']['value']     = $this->volume.'_clone';
-		$d['name']['object']['attrib']['maxlength'] = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.controller.class.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.controller.class.php
deleted file mode 100644
index 5c7900c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.controller.class.php
+++ /dev/null
@@ -1,578 +0,0 @@
-<?php
-/**
- * NFS-Storage Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class nfs_storage_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'nfs_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "nfs_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'nfs_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'nfs_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array (
-		'tab' => 'Select NFS-storage',
-		'label' => 'Select NFS-storage',
-		'action_edit' => 'edit',
-		'table_name' => 'Name',
-		'table_id' => 'Id',
-		'table_recource' => 'Resource',
-		'table_type' => 'Type',
-		'table_deployment' => 'Deployment',
-		'error_no_storage' => '<b>No storage configured yet!</b><br><br>Please create a NFS Storage first!',
-		'new_storage' => 'New Storage',
-		'please_wait' => 'Loading Storage. Please wait ..',
-	), 
-	'edit' => array (
-		'tab' => 'Edit NFS-storage',
-		'label' => 'NFS Volumes on storage %s',
-		'lang_id' => 'ID',
-		'lang_name' => 'Name',
-		'lang_resource' => 'Resource',
-		'lang_state' => 'State',
-		'lang_vfree' => 'Free',
-		'lang_vsize' => 'Total',
-		'lang_authenticated_to' => 'exported to',
-		'action_add' => 'Add new Volume',
-		'action_refresh' => 'Reload Page',
-		'action_manual' => 'Manual Configuration',
-		'action_clone' => 'clone',
-		'action_remove' => 'remove',
-		'action_auth' => 'auth',
-		'action_add_image' => 'Add Image',
-		'action_remove_image' => 'Remove Image',
-		'action_clone_in_progress' => 'Synchronisation in progress - Please wait',
-		'action_clone_finished' => 'Syncronisation finished!',
-		'table_name' => 'Name',
-		'table_export' => 'Export',
-		'error_no_nfs' => 'Storage %s is not of type nfs-deployment',
-		'please_wait' => 'Loading Volumes. Please wait ..',
-		'manual_configured' => 'Storage is manually configured and will not be administrated by openQRM',
-	),
-	'add' => array (
-		'tab' => 'Add NFS Volume',
-		'label' => 'Add new Volume',
-		'form_name' => 'Name',
-		'msg_added' => 'Added Volume %s',
-		'msg_add_failed' => 'Failed to add Volume %s',
-		'error_exists' => 'Volume %s already exists',
-		'error_name' => 'Name must be %s',
-		'please_wait' => 'Adding Volume. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'image' => array (
-		'label' => 'Add/Remove Image for Volume %s',
-		'tab' => 'Add/Remove Image',
-		'error_exists' => 'Image %s already exists',
-		'error_image_still_in_use' => 'Image id %s is still in use by Server(s) %s',
-		'msg_added_image' => 'Added Image %s',
-		'msg_removed_image' => 'Removed Image id %s',
-		'please_wait' => 'Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'manual' => array (
-		'tab' => 'Manual NFS Configuration',
-		'label' => 'Manual Configuration',
-		'explanation_1' => 'In case the NFS Storage server is not managed by openQRM please use this form to manually create the list of exported paths to server-images on the NFS Storage server.',
-		'explanation_2' => 'Please notice that in case a manual configuration exist openQRM will not send any automated Storage-authentication commands to this NFS Storage-server!',
-		'please_wait' => 'Saving Manual Configuration. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-		'saved' => 'Manual Configuration has been saved',
-		'error_config' => 'Error: Please use only %s for Exports',
-		'error_image_in_use' => 'Error: Image name %s for %s is already in use!',
-		'error_name_empty' => 'Error: Name is empty or a path ends with a /',
-	),
-	'clone' => array (
-		'tab' => 'Clone NFS Volume',
-		'label' => 'Clone Volume %s',
-		'form_name' => 'Name',
-		'msg_cloned' => 'Cloned %s as %s',
-		'msg_clone_failed' => 'Failed to clone Volume %s',
-		'error_exists' => 'Volume %s already exists',
-		'error_name' => 'Name must be %s',
-		'please_wait' => 'Cloning Volume. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'auth' => array (
-		'tab' => 'Authenticate NFS Volume',
-		'label' => 'Authenticate Volume %s',
-		'form_ip' => 'IP',
-		'msg_authd' => 'Authenticated volume %s',
-		'auth_explanation' => 'Please notice: Volumes which are deployed as an Image via a Server are authenticated automatically!',
-		'error_ip' => 'IP Adress is not valid',
-		'please_wait' => 'Authenticating Volume. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'remove' => array (
-		'label' => 'Remove Volume(s)',
-		'msg_removed' => 'Removed Volume %s',
-		'msg_image_still_in_use' => 'Volume %s of Image id %s is still in use by appliance(s) %s',
-		'please_wait' => 'Removing Volume(s). Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/nfs-storage/lang", 'nfs-storage.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/nfs-storage/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "edit";
-		}
-		if($this->action !== 'select') {
-			$this->response->params['storage_id'] = $this->response->html->request()->get('storage_id');
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'edit':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-			break;
-			case 'reload':
-				$this->action = 'edit';
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-				$this->reload();
-			break;
-			case 'add':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->add(true);
-			break;
-			case 'image':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->image(true);
-			break;
-			case 'remove':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->remove(true);
-			break;
-			case 'clone':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->duplicate(true);
-			break;
-			case 'auth':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->auth(true);
-			break;
-			case 'manual':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->manual(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->rootdir.'/plugins/nfs-storage/class/nfs-storage.api.class.php');
-		$controller = new nfs_storage_api($this);
-		$controller->action();
-	}
-
-	
-	//--------------------------------------------
-	/**
-	 * Select Storages of type NFS
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/nfs-storage/class/nfs-storage.select.class.php');
-			$controller = new nfs_storage_select($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Edit NFS-Storage
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function edit( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			if($this->reload()) {
-				require_once($this->rootdir.'/plugins/nfs-storage/class/nfs-storage.edit.class.php');
-				$controller                  = new nfs_storage_edit($this->openqrm, $this->response);
-				$controller->actions_name    = $this->actions_name;
-				$controller->tpldir          = $this->tpldir;
-				$controller->message_param   = $this->message_param;
-				$controller->identifier_name = $this->identifier_name;
-				$controller->prefix_tab      = $this->prefix_tab;
-				$controller->lang            = $this->lang['edit'];
-				$data = $controller->action();
-			}
-		}
-		$content['label']   = $this->lang['edit']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'edit' );
-		$content['onclick'] = false;
-		if($this->action === 'edit'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Add new Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function add( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/nfs-storage/class/nfs-storage.add.class.php');
-			$controller                = new nfs_storage_add($this->openqrm, $this->response, $this);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['add'];
-			$controller->rootdir       = $this->rootdir;
-			$controller->prefix_tab    = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['add']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'add' );
-		$content['onclick'] = false;
-		if($this->action === 'add'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add/Remvoe Image object
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function image( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/nfs-storage/class/nfs-storage.image.class.php');
-			$controller                  = new nfs_storage_image($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['image'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['image']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'image' );
-		$content['onclick'] = false;
-		if($this->action === 'image'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Remove Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function remove( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/nfs-storage/class/nfs-storage.remove.class.php');
-			$controller                  = new nfs_storage_remove($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['remove'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Remove';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'remove' );
-		$content['onclick'] = false;
-		if($this->action === 'remove' || $this->action === $this->lang['edit']['action_remove']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Clone Volume
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function duplicate( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/nfs-storage/class/nfs-storage.clone.class.php');
-			$controller                  = new nfs_storage_clone($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['clone'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['clone']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'clone' );
-		$content['onclick'] = false;
-		if($this->action === 'clone' || $this->action === $this->lang['edit']['action_clone']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Auth Volume
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function auth( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/nfs-storage/class/nfs-storage.auth.class.php');
-			$controller                  = new nfs_storage_auth($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['auth'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['auth']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'auth' );
-		$content['onclick'] = false;
-		if($this->action === 'auth' || $this->action === $this->lang['edit']['action_auth']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Manual Exports
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function manual( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/nfs-storage/class/nfs-storage.manual.class.php');
-			$controller                  = new nfs_storage_manual($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['manual'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['manual']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'manual' );
-		$content['onclick'] = false;
-		if($this->action === 'manual'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Reload Exports
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function reload() {
-		$OPENQRM_SERVER_BASE_DIR = $this->openqrm->get('basedir');
-		$command  = $OPENQRM_SERVER_BASE_DIR."/plugins/nfs-storage/bin/openqrm-nfs-storage post_exports";
-		$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-		$command .= ' --openqrm-ui-user '.$this->user->name;
-		$command .= ' --openqrm-cmd-mode background';
-		$storage_id = $this->response->html->request()->get('storage_id');
-		$storage = new storage();
-		$storage->get_instance_by_id($storage_id);
-		$resource = new resource();
-		$resource->get_instance_by_id($storage->resource_id);
-		$file = $this->openqrm->get('basedir').'/plugins/nfs-storage/web/storage/'.$resource->id.'.nfs.stat';
-		if($this->file->exists($file)) {
-			$this->file->remove($file);
-		}
-		$resource->send_command($resource->ip, $command);
-		while (!$this->file->exists($file))
-		{
-		  usleep(10000); // sleep 10ms to unload the CPU
-		  clearstatcache();
-		}
-		return true;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.edit.class.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.edit.class.php
deleted file mode 100644
index ee00920..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.edit.class.php
+++ /dev/null
@@ -1,332 +0,0 @@
-<?php
-/**
- * NFS-Storage Edit Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class nfs_storage_edit
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'nfs_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "nfs_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'nfs_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'nfs_identifier';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Init
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function init() {
-		$storage_id = $this->response->html->request()->get('storage_id');
-		if($storage_id === '') {
-			return false;
-		}
-		// set ENV
-		$deployment = new deployment();
-		$storage    = new storage();
-		$resource   = new resource();
-
-		$storage->get_instance_by_id($storage_id);
-		$resource->get_instance_by_id($storage->resource_id);
-		$deployment->get_instance_by_id($storage->type);
-
-		$this->resource   = $resource;
-		$this->storage    = $storage;
-		$this->deployment = $deployment;
-
-		if (!$this->file->exists($this->openqrm->get('basedir').'/plugins/nfs-storage/web/storage/'.$resource->id.'.nfs.stat.manual')) {
-			$this->statfile   = $this->openqrm->get('basedir').'/plugins/nfs-storage/web/storage/'.$resource->id.'.nfs.stat';
-		} else {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'manual', $this->message_param, $this->lang['manual_configured'])
-			);
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$this->init();
-		$data = $this->edit();
-		if($data !== false) {
-			$t = $this->response->html->template($this->tpldir.'/nfs-storage-edit.tpl.php');
-			$t->add($this->response->html->thisfile, "thisfile");
-			$t->add($data);
-			$t->add($this->lang['lang_id'], 'lang_id');
-			$t->add($this->lang['lang_name'], 'lang_name');
-			$t->add($this->lang['lang_resource'], 'lang_resource');
-			$t->add($this->lang['lang_state'], 'lang_state');
-			$t->add($this->lang['lang_vfree'], 'lang_vfree');
-			$t->add($this->lang['lang_vsize'], 'lang_vsize');
-			$t->add(sprintf($this->lang['label'], $data['name']), 'label');
-			return $t;
-		} else {
-			$msg = sprintf($this->lang['error_no_nfs'], $this->response->html->request()->get('storage_id'));
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $msg)
-			);
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return array|false
-	 */
-	//--------------------------------------------
-	function edit() {
-
-		if($this->deployment->type === 'nfs-deployment') {
-			$resource_icon_default="/img/resource.png";
-			$storage_icon="/plugins/nfs-storage/img/plugin.png";
-			if ($this->file->exists($this->openqrm->get('webdir').$storage_icon)) {
-				$resource_icon_default=$storage_icon;
-			}
-			$resource_icon_default = $this->openqrm->get('baseurl').$resource_icon_default;
-
-			$d['state'] = '<span class="pill">'.$this->resource->state.'</span>';
-			$d['icon'] = '<img width="24" height="24" src="'.$resource_icon_default.'">';
-			$d['resource'] = $this->resource->id.' / '.$this->resource->ip;
-			$d['name'] = $this->storage->name;
-			$d['id'] = $this->storage->id;
-
-			$a = $this->response->html->a();
-			$a->label = $this->lang['action_manual'];
-			$a->css   = 'add';
-			$a->href  = $this->response->get_url($this->actions_name, "manual");
-			$d['manual'] = $a->get_string();
-
-			$a = $this->response->html->a();
-			$a->label = $this->lang['action_add'];
-			$a->css   = 'add';
-			$a->href  = $this->response->get_url($this->actions_name, "add");
-			$d['add'] = $a->get_string();
-
-			$body = array();
-			$identifier_disabled = array();
-			$file = $this->statfile;
-			if(file_exists($file)) {				
-				$lines = explode("\n", file_get_contents($file));
-				if(count($lines) >= 1) {
-					$i = 0;
-					$t = $this->response->html->template($this->openqrm->get('webdir').'/js/openqrm-progressbar.js');
-					foreach($lines as $line) {
-						if($line !== '') {
-							$line = explode('@', $line);
-							if($i === 0) {
-								$d['vsize'] = number_format($line[0], 0, '', '').' MB';
-								$d['vfree'] = number_format($line[1], 0, '', '').' MB';
-							} else {
-								$name = basename($line[1]);
-								$export = $line[1];
-								$authenticated = @$line[2];
-								$clone_status = @$line[3];
-								$auth_link = '&#160;';
-								$clone_link = '&#160;';
-								$image_add_remove = '';
-								$deployment_type = '';
-								$image = new image($this->deployment->type);
-								$image->get_instance_by_name($name);
-								if (strlen($image->id)) {
-									if( $image->type == $this->deployment->type ) {
-										if( $line[0] === $this->deployment->type ) {
-											if($d['vfree'] !== '0 MB' ) {
-												$a = $this->response->html->a();
-												$a->title   = $this->lang['action_clone'];
-												$a->label   = $this->lang['action_clone'];
-												$a->handler = 'onclick="wait();"';
-												$a->css     = 'clone';
-												$a->href    = $this->response->get_url($this->actions_name, "clone").'&volume='.$name;
-												$clone_link = $a->get_string();
-											}
-											$a = $this->response->html->a();
-											$a->title   = $this->lang['action_auth'];
-											$a->label   = $this->lang['action_auth'];
-											$a->handler = 'onclick="wait();"';
-											$a->css     = 'edit';
-											$a->href    = $this->response->get_url($this->actions_name, "auth").'&volume='.$name;							
-											$auth_link = $a->get_string();
-										} else {
-											$identifier_disabled[] = $name;
-										}
-									}
-								}
-								// create/remove image object, check if image exists
-								$deployment_type = $this->deployment->type;
-								$image = new image($this->deployment->type);
-								$image->get_instance_by_name($name);
-								if (strlen($image->id)) {
-									if( $image->type != $this->deployment->type ) {
-										$deployment_type = $image->type;
-										$identifier_disabled[] = $name;
-										error_log("nfs storage type: disabled: ".$image->type." != ".$this->deployment->type);
-									} else {
-										$i = $this->response->html->a();
-										$i->title   = $this->lang['action_remove_image'];
-										$i->label   = $this->lang['action_remove_image'];
-										$i->handler = 'onclick="wait();"';
-										$i->css     = 'edit';
-										$i->href    = $this->response->get_url($this->actions_name, "image").'&image_id='.$image->id.'&image_command=remove';
-										$image_add_remove = $i;
-									}
-								} else {
-									$i = $this->response->html->a();
-									$i->title   = $this->lang['action_add_image'];
-									$i->label   = $this->lang['action_add_image'];
-									$i->handler = 'onclick="wait();"';
-									$i->css     = 'edit';
-									if($this->deployment->type === 'nfs-deployment') {
-										$i->href    = $this->response->get_url($this->actions_name, "image").'&root_device='.$export.'&image_name='.$name.'&image_command=add';
-									}
-									$identifier_disabled[] = $name;
-									$image_add_remove = $i;
-								}
-
-								$export = '';
-								if ($authenticated != '') {
-									$export = $this->lang['lang_authenticated_to']." ".$authenticated;
-								}
-
-								if ($clone_status == "clone_in_progress") {
-									// add to disabled identifier
-									$identifier_disabled[] = $name;
-									$auth_link = "&#160;";
-									$clone_link = "&#160;";
-									$image_add_remove = '&#160;';
-									// progressbar
-									$t->add(uniqid('b'), 'id');
-									$t->add($this->openqrm->get('baseurl').'/api.php?action=plugin&plugin=nfs-storage&nfs_storage_action=progress&name='.$this->resource->id.'.nfs.'.$name.'.sync_progress', 'url');
-									$t->add($this->lang['action_clone_in_progress'], 'lang_in_progress');
-									$t->add($this->lang['action_clone_finished'], 'lang_finished');
-									$export = $t->get_string();
-								}
-
-								$body[] = array(
-									'icon' => $d['icon'],
-									'name'   => $name,
-									'export'   => $export,
-									'image' => $image_add_remove,
-									'auth' => $auth_link,
-									'clone' => $clone_link,
-								);
-							}
-						}
-						$i++;
-					}
-				}
-			}
-
-			$h['icon'] = array();
-			$h['icon']['title'] = '&#160;';
-			$h['icon']['sortable'] = false;
-			$h['name'] = array();
-			$h['name']['title'] = $this->lang['table_name'];
-			$h['export'] = array();
-			$h['export']['title'] = $this->lang['table_export'];
-			$h['image'] = array();
-			$h['image']['title'] = '&#160;';
-			$h['image']['sortable'] = false;
-			$h['auth']['title'] = '&#160;';
-			$h['auth']['sortable'] = false;
-			$h['clone']['title'] = '&#160;';
-			$h['clone']['sortable'] = false;
-
-			$table = $this->response->html->tablebuilder('nfs_edit', $this->response->get_array($this->actions_name, 'edit'));
-			$table->sort            = 'name';
-			$table->limit           = 10;
-			$table->offset          = 0;
-			$table->order           = 'ASC';
-			$table->max             = count($body);
-			$table->autosort        = true;
-			$table->sort_link       = false;
-			$table->id              = 'Tabelle';
-			$table->css             = 'htmlobject_table';
-			$table->border          = 1;
-			$table->cellspacing     = 0;
-			$table->cellpadding     = 3;
-			$table->form_action	    = $this->response->html->thisfile;
-			$table->head            = $h;
-			$table->body            = $body;
-			$table->identifier      = 'name';
-			$table->identifier_name = $this->identifier_name;
-			$table->identifier_disabled = $identifier_disabled;
-			$table->actions_name    = $this->actions_name;
-			$table->actions         = array(array('remove' => $this->lang['action_remove']));
-
-			$d['table'] = $table->get_string();
-			return $d;
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.image.class.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.image.class.php
deleted file mode 100644
index d5ed294..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.image.class.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * NFS-Storage add/remove Images
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class nfs_storage_image
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'nfs_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "nfs_storage_msg";
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'nfs_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'nfs_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-		$this->openqrm    = $openqrm;
-		$this->user       = $openqrm->user();
-		$storage_id       = $this->response->html->request()->get('storage_id');
-		$storage          = new storage();
-		$resource         = new resource();
-		$deployment       = new deployment();
-		$this->storage    = $storage->get_instance_by_id($storage_id);
-		$this->resource   = $resource->get_instance_by_id($storage->resource_id);
-		$this->deployment = $deployment->get_instance_by_id($storage->type);
-		$this->response->add('storage_id', $storage_id);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->image();
-		$this->response->params['reload'] = 'false';
-		$this->response->redirect(
-			$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response)
-		);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add/Remove image object
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function image() {
-		$response = '';
-		$errors       = array();
-		$message      = array();
-		$image_command = $this->response->html->request()->get('image_command');
-
-		if( $image_command !== '' ) {
-			switch ($image_command) {
-				case 'add':
-					$root_device = $this->response->html->request()->get('root_device');
-					$image_name = $this->response->html->request()->get('image_name');
-
-					// check if image name is not in use yet
-					$image = new image($this->deployment->type);
-					$image->get_instance_by_name($image_name);
-					if (strlen($image->id)) {
-						$errors[] = sprintf($this->lang['error_exists'], $image_name);
-					} else {
-						$ident_file = $this->openqrm->get('basedir').'/plugins/nfs-storage/web/storage/'.$this->resource->id.'.nfs.'.$image_name.'.adapt';
-						$get_ident_command  = $this->openqrm->get('basedir').'/plugins/nfs-storage/bin/openqrm-nfs-storage adapt';
-						$get_ident_command    .= ' -n '.$image_name;
-						$get_ident_command    .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-						$get_ident_command .= ' --openqrm-ui-user '.$this->user->name;
-						$get_ident_command .= ' --openqrm-cmd-mode background';
-						if(file_exists($ident_file)) {
-							unlink($ident_file);
-						}
-						$this->resource->send_command($this->resource->ip, $get_ident_command);
-						while (!file_exists($ident_file)) {
-							usleep(10000); // sleep 10ms to unload the CPU
-							clearstatcache();
-						}
-						unlink($ident_file);
-						$tables = $this->openqrm->get('table');
-						$image_fields = array();
-						$image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-						$image_fields['image_name'] = $image_name;
-						$image_fields['image_type'] = $this->deployment->type;
-						$image_fields['image_rootfstype'] = 'nfs';
-						$image_fields['image_storageid'] = $this->storage->id;
-						$image_fields['image_comment'] = "Image Object for volume $image_name";
-						$image_fields['image_rootdevice'] = $root_device;
-						$image = new image();
-						$image->add($image_fields);
-						$message[] = sprintf($this->lang['msg_added_image'], $image_name);
-					}
-					break;
-
-				case 'remove':
-					$image_id = $this->response->html->request()->get('image_id');
-					// check if image is not in use any more before removing
-					$remove_error = 0;
-					$appliance = new appliance();
-					$appliance_id_list = $appliance->get_all_ids();
-					foreach($appliance_id_list as $appliance_list) {
-						$appliance_id = $appliance_list['appliance_id'];
-						$app_image_remove_check = new appliance();
-						$app_image_remove_check->get_instance_by_id($appliance_id);
-						if ($app_image_remove_check->imageid == $image_id) {
-							$image_is_used_by_appliance .= $appliance_id." ";
-							$remove_error = 1;
-						}
-					}
-					if ($remove_error == 1) {
-						$errors[] = sprintf($this->lang['error_image_still_in_use'], $image_id, $image_is_used_by_appliance);
-					} else {
-						$image_remove = new image();
-						$image_remove->remove($image_id);
-						$message[] = sprintf($this->lang['msg_removed_image'], $image_id);
-					}
-					break;
-			}
-			if(count($errors) === 0) {
-				$response = join('<br>', $message);
-			} else {
-				$msg = array_merge($errors, $message);
-				$response = join('<br>', $msg);
-			}
-		} else {
-			$response = '';
-		}
-		return $response;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.manual.class.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.manual.class.php
deleted file mode 100644
index a5027c0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.manual.class.php
+++ /dev/null
@@ -1,273 +0,0 @@
-<?php
-/**
- * NFS-Storage Manual Configuration
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class nfs_storage_manual
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'nfs_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "nfs_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'nfs_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'nfs_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->user	    = $openqrm->user();
-		$this->file = $this->openqrm->file();
-		$this->storage = $this->response->html->request()->get('storage_id');
-		$this->response->params['storage_id'] = $this->storage;
-		
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->add();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'manual', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/nfs-storage-manual.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add($this->lang);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function add() {
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			$config     = $form->get_request('config');
-			$storage_id = $this->response->html->request()->get('storage_id');
-			$storage    = new storage();
-			$resource   = new resource();
-			$storage->get_instance_by_id($storage_id);
-			$resource->get_instance_by_id($storage->resource_id);
-			$file = $this->openqrm->get('basedir')."/plugins/nfs-storage/web/storage/".$resource->id.".nfs.stat.manual";
-			$image = new image();
-			$error = '';
-			// get old data
-			$old = array();
-			if($this->file->exists($file)) {
-				$old = $this->file->get_contents($file);
-				$old = str_replace("\r\n", "\n", $old);
-				$old = explode("\n", $old);
-			}
-			if(isset($config) && $config !== '') {
-				$new = str_replace("\r\n", "\n", $config);
-				$new = explode("\n", $new);
-				$new = array_unique($new);
-				// sync old and new values
-				foreach($old as $v) {
-					if(!in_array($v, $new)) {
-						$name = substr($v, strrpos($v, '/')+1);
-						if(isset($name) && $name !== '' && $name !== false) {
-							$current = $image->get_instance_by_name($name);
-							if(isset($current) && $current->name === $name) {
-								$image->remove($current->id);
-							}
-						}
-					}
-					else if(in_array($v, $new)) {
-						unset($new[array_search($v, $new)]);
-					}
-				}
-				// add new values to images
-				foreach($new as $v) {
-					$name = substr($v, strrpos($v, '/')+1);
-					if(isset($name) && $name !== '' && $name !== false) {
-						$current = $image->get_instance_by_name($name);
-						if(isset($current) && $current->name === $name) {
-								$error[] = sprintf($this->lang['error_image_in_use'], $name, $v);
-						}
-						else if($v !== '') {
-							$tables = $this->openqrm->get('table');
-							$f['image_id'] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-							$f['image_name'] = $name;
-							$f['image_type'] = 'nfs-deployment';
-							$f['image_rootfstype'] = 'nfs';
-							$f['image_rootdevice'] = $v;
-							$f['image_storageid'] = $this->storage;
-							$f['image_comment'] = 'Manually added nfs export';
-							$image->add($f);
-						}
-					}
-					else if ((!isset($name) || $name === '' || $name === false) && $v !== '') {
-						$error[] = $this->lang['error_name_empty'];
-					}
-				}
-				// handle config file
-				if($error === '') {
-					if (!$handle = fopen($file, 'w+')) {
-						$error = "Cannot open file ($file)";
-					}
-					if (fwrite($handle, $config) === FALSE) {
-						$error = "Cannot write to file ($file)";
-					}		
-					if($error !== '') {
-						$response->error = $error;
-					} else {
-						$response->msg = $this->lang['saved'];
-					}
-				} else {
-					if(is_array($error)) {
-						$response->error = implode('<br>', $error);
-					}
-					else if(is_string($error)) {
-						$response->error = $error;
-					}
-				}
-			} else {
-				// remove old values from image table
-				foreach($old as $v) {
-					if(!in_array($v, $new)) {
-						$name = substr($v, strrpos($v, '/')+1);
-						if(isset($name) && $name !== '' && $name !== false) {
-							$current = $image->get_instance_by_name($name);
-							if(isset($current) && $current->name === $name) {
-								$image->remove($current->id);
-							}
-						}
-					}
-				}
-				if($this->file->exists($file)) {
-					$error = $this->file->remove($file);
-				}
-				if(count($old) > 1) {
-					$response->msg = $this->lang['saved'];
-				} else {
-					$response->msg = '';
-				}
-			}
-		}
-		else if($form->get_errors()) {
-			$response->error = implode('<br>', $form->get_errors());
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'manual');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$storage_id  = $this->storage;
-		$storage     = new storage();
-		$resource    = new resource();
-		$storage->get_instance_by_id($storage_id);
-		$resource->get_instance_by_id($storage->resource_id);
-		$file = $this->openqrm->get('basedir')."/plugins/nfs-storage/web/storage/".$resource->id.".nfs.stat.manual";
-
-		$d['config']['label']                    = 'Exports';
-		$d['config']['validate']['regex']        = '~^[\r\na-z0-9/._-]+$~i';
-		$d['config']['validate']['errormsg']     = sprintf($this->lang['error_config'], 'a-z0-9/._-');	
-		$d['config']['object']['type']           = 'htmlobject_textarea';
-		$d['config']['object']['attrib']['name'] = 'config';
-		if($this->file->exists($file)) {
-			$d['config']['object']['attrib']['value'] = $this->file->get_contents($file);
-		}
-
-		$form->add($d);
-		$form->display_errors = false;
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.remove.class.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.remove.class.php
deleted file mode 100644
index 80e6911..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.remove.class.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-/**
- * NFS-Storage Remove Volume(s)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class nfs_storage_remove
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'nfs_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "nfs_storage_msg";
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'nfs_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'nfs_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->user	    = $openqrm->user();
-		$this->file = $this->openqrm->file();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->remove();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/nfs-storage-remove.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function remove() {
-		$response = $this->get_response();
-		$exports  = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		if( $exports !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($exports as $ex) {
-				$d['param_f'.$i]['label']                       = $ex;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $ex;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;		
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$storage_id = $this->response->html->request()->get('storage_id');
-				$name       = $this->openqrm->admin()->name;
-				$pass       = $this->openqrm->admin()->password;
-				$storage    = new storage();
-				$resource   = new resource();
-				$errors     = array();
-				$message    = array();
-				foreach($exports as $key => $export) {
-
-					// check if an appliance is still using the volume as an image
-					$image = new image();
-					$image->get_instance_by_name($export);
-
-					// check if it is still in use
-					$appliance = new appliance();
-					$appliances_using_resource = $appliance->get_ids_per_image($image->id);
-					if (count($appliances_using_resource) > 0) {
-						$appliances_using_resource_str = implode(",", $appliances_using_resource[0]);
-						$errors[] = sprintf($this->lang['msg_image_still_in_use'], $export, $image->id, $appliances_using_resource_str);
-					} else {
-						$storage->get_instance_by_id($storage_id);
-						$resource->get_instance_by_id($storage->resource_id);
-						$command  = $this->openqrm->get('basedir').'/plugins/nfs-storage/bin/openqrm-nfs-storage remove -n '.$export;
-						$command .= ' -u '.$name.' -p '.$pass;
-						$command .= ' --openqrm-ui-user '.$this->user->name;
-						$command .= ' --openqrm-cmd-mode background';
-
-						$file = $this->openqrm->get('basedir').'/plugins/nfs-storage/web/storage/'.$resource->id.'.nfs.stat';
-						if($this->file->exists($file)) {
-							$this->file->remove($file);
-						}
-						$resource->send_command($resource->ip, $command);
-						while (!$this->file->exists($file)) {
-							usleep(10000); // sleep 10ms to unload the CPU
-							clearstatcache();
-						}
-
-						#$error = $resource->send_command($resource->ip, $command);
-						#if($error !== '' ) {
-						#	$errors[] = $error;
-						#} else {
-						$form->remove($this->identifier_name.'['.$key.']');
-						$message[] = sprintf($this->lang['msg_removed'], $export);
-						// remove the image of the volume
-						$image->remove_by_name($export);
-
-						#}
-					}
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'remove');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.select.class.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.select.class.php
deleted file mode 100644
index 5a08798..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/class/nfs-storage.select.class.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-/**
- * NFS-Storage Select Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class nfs_storage_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'nfs_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "nfs_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'nfs_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'nfs_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$table = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/nfs-storage-select.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($table, 'table');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return htmlobject_tablebulider | htmlobject_div
-	 */
-	//--------------------------------------------
-	function select() {
-		// set ENV
-		$deployment = new deployment();
-		$storage    = new storage();
-		$resource   = new resource();
-
-		$deployment->get_instance_by_type("nfs-deployment");
-		$table = $this->response->html->tablebuilder('nfs', $this->response->get_array($this->actions_name, 'select'));
-		$table->sort      = 'storage_id';
-		$table->limit     = 10;
-		$table->offset    = 0;
-		$table->order     = 'ASC';
-		$table->max       = $storage->get_count_per_type($deployment->id);
-		$table->autosort  = false;
-		$table->sort_link = false;
-		$table->init();
-		$storages = $storage->display_overview_per_type($deployment->id, $table->offset, $table->limit, $table->sort, $table->order);
-
-		if(count($storages) >= 1) {
-			foreach($storages as $k => $v) {
-				$storage->get_instance_by_id($v["storage_id"]);
-				$resource->get_instance_by_id($storage->resource_id);
-				$deployment->get_instance_by_id($storage->type);
-				$resource_icon_default="/img/resource.png";
-				$storage_icon="/plugins/nfs-storage/img/plugin.png";
-				$state_icon = '<span class="pill">'.$resource->state.'</span>';
-				if ($this->file->exists($this->openqrm->get('webdir').$storage_icon)) {
-					$resource_icon_default=$storage_icon;
-				}
-				$resource_icon_default = $this->openqrm->get('baseurl').$resource_icon_default;
-
-				$a = $this->response->html->a();
-				$a->title   = $this->lang['action_edit'];
-				$a->label   = $this->lang['action_edit'];
-				$a->handler = 'onclick="wait();"';
-				$a->css     = 'edit';
-				$a->href    = $this->response->get_url($this->actions_name, "edit").'&storage_id='.$storage->id;
-
-				$data  = '<strong>'.$this->lang['table_recource'].':</strong> '.$resource->id.' / '.$resource->ip.'<br>';
-				$data .= '<strong>'.$this->lang['table_type'].':</strong> <span class="pill">'.$deployment->type.'</span><br>';
-				$data .= '<strong>'.$this->lang['table_deployment'].':</strong> '.$deployment->storagedescription.'<br>';
-
-				$b[] = array(
-					'state' => $state_icon,
-				//	'icon' => '<img width="24" height="24" src="'.$resource_icon_default.'" alt="Icon">',
-					'storage_id' => $storage->id,
-					'storage_name' => $storage->name,
-					'storage_resource_id' => $storage->resource_id,
-					'storage_data' => $data,
-					'storage_comment' => '',
-					'storage_edit' => $a->get_string(),
-				);
-			}
-
-			$h = array();
-			$h['state'] = array();
-			$h['state']['title'] ='&#160;';
-			$h['state']['sortable'] = false;
-			/*
-			$h['icon'] = array();
-			$h['icon']['title'] ='&#160;';
-			*/
-			
-			$h['icon']['sortable'] = false;
-			$h['storage_id'] = array();
-			$h['storage_id']['title'] = $this->lang['table_id'];
-			$h['storage_name'] = array();
-			$h['storage_name']['title'] = $this->lang['table_name'];
-			$h['storage_resource_id'] = array();
-			$h['storage_resource_id']['title'] = $this->lang['table_recource'];
-			$h['storage_resource_id']['hidden'] = true;
-			$h['storage_data'] = array();
-			$h['storage_data']['title'] = '&#160;';
-			$h['storage_data']['sortable'] = false;
-			$h['storage_comment'] = array();
-			$h['storage_comment']['title'] ='&#160;';
-			$h['storage_comment']['sortable'] = false;
-			$h['storage_edit'] = array();
-			$h['storage_edit']['title'] = '&#160;';
-			$h['storage_edit']['sortable'] = false;
-
-			$table->id = 'Tabelle';
-			$table->css = 'htmlobject_table';
-			$table->border = 1;
-			$table->cellspacing = 0;
-			$table->cellpadding = 3;
-			$table->form_action	= $this->response->html->thisfile;
-			$table->head = $h;
-			$table->body = $b;
-			$table->limit_select = array(
-				array("value" => 10, "text" => 10),
-				array("value" => 20, "text" => 20),
-				array("value" => 30, "text" => 30),
-				array("value" => 40, "text" => 40),
-				array("value" => 50, "text" => 50),
-			);
-			return $table->get_string();
-		} else {
-			$a = $this->response->html->a();
-			$a->title   = $this->lang['new_storage'];
-			$a->label   = $this->lang['new_storage'];
-			$a->handler = 'onclick="wait();"';
-			$a->css     = 'add';
-			$a->href    = $this->response->html->thisfile.'?base=storage&storage_action=add';
-
-			$box = $this->response->html->div();
-			$box->id = 'Tabelle';
-			$box->css = 'htmlobject_box';
-			$content  = $this->lang['error_no_storage'].'<br><br>';
-			$content .= $a->get_string();
-			$box->add($content);
-			return $box->get_string();
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/css/nfs-storage.css b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/css/nfs-storage.css
deleted file mode 100644
index 87106d6..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/css/nfs-storage.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Manual Config */
-#form.manualconfig .htmlobject_box .left {
-	display: none;
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/image.nfs-deployment.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/image.nfs-deployment.php
deleted file mode 100644
index daf75c5..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/image.nfs-deployment.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-
-// global event for logging
-$event = new event();
-global $event;
-
-
-function nfs_deployment_wait_for_identfile($sfile) {
-	$refresh_delay=1;
-	$refresh_loop_max=20;
-	$refresh_loop=0;
-	while (!file_exists($sfile)) {
-		sleep($refresh_delay);
-		$refresh_loop++;
-		flush();
-		if ($refresh_loop > $refresh_loop_max)  {
-			return false;
-		}
-	}
-	return true;
-}
-
-
-function get_nfs_deployment_image_rootdevice_identifier($nfs_storage_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_ADMIN;
-	global $event;
-
-	// place for the storage stat files
-	$StorageDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/nfs-storage/storage';
-	$rootdevice_identifier_array = array();
-	$storage = new storage();
-	$storage->get_instance_by_id($nfs_storage_id);
-	$storage_resource = new resource();
-	$storage_resource->get_instance_by_id($storage->resource_id);
-	$storage_resource_id = $storage_resource->id;
-	$ident_file = "$StorageDir/$storage_resource_id.nfs.ident";
-	$statfile_manual="$StorageDir/".$storage_resource_id.".nfs.stat.manual";
-	// manual configured ?
-	if (file_exists($statfile_manual)) {
-		$fcontent = file($statfile_manual);
-		foreach($fcontent as $lun_info) {
-			$troot_device = trim($lun_info);
-			$rootdevice_identifier_array[] = array("value" => "$troot_device", "label" => "$troot_device");
-		}
-	} else {
-		if (file_exists($ident_file)) {
-			unlink($ident_file);
-		}
-		// send command
-		$resource_command=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/nfs-storage/bin/openqrm-nfs-storage post_identifier -u ".$OPENQRM_ADMIN->name." -p ".$OPENQRM_ADMIN->password." --openqrm-cmd-mode background";
-		$storage_resource->send_command($storage_resource->ip, $resource_command);
-		if (!nfs_deployment_wait_for_identfile($ident_file)) {
-			$event->log("get_image_rootdevice_identifier", $_SERVER['REQUEST_TIME'], 2, "image.nfs-deployment", "Timeout while requesting image identifier from storage id $storage->id", "", "", 0, 0, 0);
-			return;
-		}
-		$fcontent = file($ident_file);
-		foreach($fcontent as $lun_info) {
-			$tpos = strpos($lun_info, ",");
-			$timage_name = trim(substr($lun_info, 0, $tpos));
-			$troot_device = trim(substr($lun_info, $tpos+1));
-			$rootdevice_identifier_array[] = array("value" => "$troot_device", "label" => "$timage_name");
-		}
-	}
-	return $rootdevice_identifier_array;
-}
-
-
-
-function get_nfs_deployment_image_default_rootfs() {
-	return "nfs";
-}
-
-function get_nfs_deployment_rootfs_transfer_methods() {
-	return true;
-}
-
-function get_nfs_deployment_rootfs_set_password_method() {
-	return true;
-}
-
-function get_nfs_deployment_is_network_deployment() {
-	return true;
-}
-
-function get_nfs_deployment_local_deployment_enabled() {
-	return false;
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/img/plugin.png
deleted file mode 100644
index 1f3663e..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/lang/de.nfs-storage-about.ini b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/lang/de.nfs-storage-about.ini
deleted file mode 100644
index 067c158..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/lang/de.nfs-storage-about.ini
+++ /dev/null
@@ -1,67 +0,0 @@
-[documentation]
-tab = "Über NFS-Storage"
-label = "Über NFS-Storage"
-introduction_title = "Einleitung"
-introduction_content = "Das 'NFS-Storage' Plugin verwaltet NFS Server."
-requirements_title = "Anforderungen"
-requirements_list = "<ul><li>Eine 'Resource' für die NFS-Storage Storage<br>(dies kann ein System sein das mittels des "local-server" Plugin in openQRM eingebunden ist oder der openQRM Server selber)</li>
-				   <li>Die folgenden Paket werden benötigt: nfs-common, nfs-kernel-server, screen, rsync</li></ul>"
-
-provides_title = "Bietet"
-provides_list = "<ul><li>Storage Typen: 'NFS Storage'</li>
-				   <li>Deployment types: 'Nfs-root deployment'</li></ul>"
-type_title = "Plugin Typ"
-type_content = "Storage"
-
-tested_title = "Testet mit"
-tested_content = "Diese Plugin ist getestet mit Debian, Ubuntu und CentOS Linux Distributionen"
-
-deployment_title = "Deployment Typ"
-deployment_content = "Netzwerk-Deployment"
-
-documentation_title = "Dokumentation"
-use_case_title = "Anwendungsfall"
-network_deploymet = "Netzwerk-Deployment"
-doc1 = ""
-
-
-[bootservice]
-tab = "Boot-Service"
-label = "NFS-Storage Boot-Service"
-boot_service_title = "NFS-Storage Boot-Service"
-boot_service_content = "Das NFS-Storage Plugin beinhaltet einen openQRM Boot-Service.
-			Dieser 'NFS-Storage Boot-Service' wird automatisch von allen in openQRM integrierten Systeme heruntergeladen und ausgeführt.
-			Der Boot-Service befindet sich unter:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/nfs-storage/web/boot-service-nfs-storage.tgz</b></i>
-			<br>
-			<br>
-			Der 'NFS-Storage Boot-Service' beinhaltet die 'Client' Dateien des NFS-Storage Plugin.<br>
-			Eine Konfigurationsdatei für den NFS-Storage Server ist ebenfalls enhalten.<br>
-			<br>
-			Die Boot-Service konfiguration wird mittels des 'openqrm' Kommandozeilenwerkzeugs verwaltet.<br>
-			Der folgende Befehl zeigt die die momentane 'default' Boot-Service Konfiguration an:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n nfs-storage -a default</b></i>
-			<br>
-			<br>
-			Die Boot-Service Konfiguration eines speziellen Server zeigt der folgende Befehl an:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n nfs-storage -a [Server-name]</b></i>
-			<br>
-			<br>
-			Der folgende Befehl passt einen Konfigurationparameter des 'default' Boot-Service an:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n nfs-storage -a default -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			Die Boot-Service Konfigurarationsparameter eines speziellen Server passt der folgende Befehl an:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n nfs-storage -a [Server-name] -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			Im Falle das der openmQRM Server selber als NFS-Storage genutzt wird werden die Konfigurationsparameter in der folgenden Datei manuell angeepasst:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/nfs-storage/etc/openqrm-plugin-nfs-storage.conf</b></i>
-			<br><br>"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/lang/de.nfs-storage.ini b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/lang/de.nfs-storage.ini
deleted file mode 100644
index 5ba0f07..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/lang/de.nfs-storage.ini
+++ /dev/null
@@ -1,93 +0,0 @@
-[select]
-tab = "NFS-storage auswählen"
-label = "NFS-storage auswählen"
-action_edit = "bearbeiten"
-table_name = "Name"
-table_id = "Id"
-table_recource = "Resource"
-table_type = "Typ"
-table_deployment = "Deployment"
-error_no_storage = "<b>Keine Storage angelegt!</b><br><br>Bitte legen Sie erst eine NFS Storage an!"
-new_storage = "Neue Storage"
-please_wait = "Lade Storage. Bitte warten .."
-[edit]
-tab = "NFS-storage bearbeiten"
-label = "NFS Volumes auf Storage %s"
-lang_id = "ID"
-lang_name = "Name"
-lang_resource = "Resource"
-lang_state = "Status"
-lang_vfree = "Frei"
-lang_vsize = "Gesamt"
-lang_authenticated_to = "freigegeben für"
-action_add = "Neues Volume anlegen"
-action_refresh = "Reload Page"
-action_manual = "Manuelle Konfiguration"
-action_remove = "löschen"
-action_auth = "Berechtigung"
-action_clone = "klonen"
-action_add_image = "Image hinzufügen"
-action_remove_image = "Image entfernen"
-action_clone_in_progress = "Syncronisation in Bearbeitung - Bitte warten"
-action_clone_finished = "Syncronisation beendet!"
-table_name = "Name"
-table_export = "Export"
-error_no_nfs = "Storage %s ist nicht vom nfs-deployment"
-please_wait = "Lade Volumes. Bitte warten .."
-manual_configured = "Storage ist manuell konfiguriert und wird nicht von openQRM verwaltet!"
-[add]
-tab = "Neues NFS Volume"
-label = "Neues NFS Volume anlegen"
-form_name = "Name"
-msg_added = "Volume %s angelegt"
-msg_add_failed = "Fehler beim anlegen des Volumes %s"
-error_exists = "Volume %s besteht bereits"
-error_name = "Name darf nur %s beinhalten"
-please_wait = "Erstelle Volume. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-lang_name_generate = "Name generieren"
-[image]
-label = "Image für Volume %s hinzufügen/entfernen"
-tab = "Image hinzufügen/entfernen"
-error_exists = "Image %s existiert bereits"
-error_image_still_in_use = "Image ID %s ist noch in benutztung von Server %s"
-msg_added_image = "Image %s hinzugefügt"
-msg_removed_image = "Image id %s entfernt"
-please_wait = "Bitt warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[manual]
-tab = "Manuelle NFS Konfiguration"
-label = "Manuelle NFS Konfiguration"
-explanation_1 = "Wenn der NFS Storage Server nicht von openQRM verwaltet wird, verwenden Sie bitte dieses Formular um die Liste der manuell angelegten Export Pfade zu den Server Images der NFS Storage ein zu tragen."
-explanation_2 = "Bitte beachten Sie, dass im Falle einer manuellen Konfiguration openQRM keine automatisierten Storage-authentication Kommandos an diesen NFS Storage Server sendet!"
-please_wait = "Speichere manuelle NFS Konfiguration. Please wait .."
-canceled = "Operation abgebrochen. Bitte warten .."
-saved = "Manuelle NFS Konfiguration wurde gespeichert"
-error_config = "Fehler: Bitte verwenden Sie nur %s für Exports"
-error_image_in_use = "Fehler: Image Name %s für %s wird bereits verwendet!"
-error_name_empty = "Fehler: Name ist leer oder ein Pfad endet mit einem /"
-[clone]
-tab = "Volume(s) klonen"
-label = "Volume(s) klonen"
-form_name = "Name"
-msg_cloned = "Klone %s als %s"
-msg_clone_failed = "Fehler beim klonen des Volumes %s"
-error_exists = "Volume %s besteht bereits"
-error_name = "Name darf nur %s beinhalten"
-please_wait = "Klone Volume(s). Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[auth]
-tab = "Volume(s) Berechtigung"
-label = "Volume(s) Berechtigung"
-form_ip = "IP"
-msg_authd = "Setze Berechtigung für Volume %s auf %s"
-auth_explanation = "Bitte beachten Sie das Volumes, die als Images eines Server gestartet werden, automatisch authentifiziert werden!"
-error_ip = "IP Adresse ist ungültig"
-please_wait = "Setzte Berechtigung für Volume(s). Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[remove]
-label = "Volume(s) löschen"
-msg_removed = "Volume %s gelöscht"
-msg_image_still_in_use = "Das Volume %s des Image ID %s ist noch in benutztung von Server %s"
-please_wait = "Lösche Volume(s). Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/lang/en.nfs-storage-about.ini b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/lang/en.nfs-storage-about.ini
deleted file mode 100644
index ce1f800..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/lang/en.nfs-storage-about.ini
+++ /dev/null
@@ -1,70 +0,0 @@
-[documentation]
-tab = "About NFS-Storage"
-label = "About NFS-Storage"
-introduction_title = "Introduction"
-introduction_content = "The 'NFS-Storage' plugin manages NFS-Server in openQRM.
-					   "
-requirements_title = "Requirements"
-requirements_list = "<ul><li>A resource for the NFS-Storage Storage (this can be a remote system integrated into openQRM e.g. via the 'local-server' plugin or the openQRM server itself)</li>
-				   <li>The following packages must be installed: nfs-common, nfs-kernel-server, screen, rsync</li></ul>"
-
-tested_title = "Tested with"
-tested_content = "This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions."
-
-provides_title = "Provides"
-provides_list = "<ul><li>Storage type: 'NFS Storage'</li>
-					<li>Deployment types: 'Nfs-root deployment'</li></ul>"
-type_title = "Plugin Type"
-type_content = "Storage"
-
-deployment_title = "Deployment Type"
-deployment_content = "Network-Deployment"
-
-documentation_title = "Documentation"
-use_case_title = "Use-Case"
-network_deploymet = "Network-Deployment"
-doc1 = ""
-
-
-[bootservice]
-tab = "Boot-Service"
-label = "NFS-Storage Boot-Service"
-boot_service_title = "NFS-Storage Host Boot-Service"
-boot_service_content = "The NFS-Storage Plugin provides an openQRM Boot-Service.
-			This 'NFS-Storage Boot-Service' is automatically downloaded and executed by the openQRM-Client on all integrated Systems.
-			The Boot-Service is located at:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/nfs-storage/web/boot-service-nfs-storage.tgz</b></i>
-			<br>
-			<br>
-			The 'NFS-Storage Boot-Service contains the Client files of the NFS-Storage Plugin.<br>
-			Also a configuration file for the NFS-Storage server is included in this Boot-Service.<br>
-			<br>
-			The Boot-Service configuration can be viewed and administrated by the 'openqrm' utility.<br>
-			To view the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n nfs-storage -a default</b></i>
-			<br>
-			<br>
-			To view a Boot-Service configuration of a specific Server run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service view -n nfs-storage -a [Server-name]</b></i>
-			<br>
-			<br>
-			To adapt a parameter in the current default Boot-Service configuration run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n nfs-storage -a default -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			To adapt a paramter in the Boot-Service configuration of a specific Server run:<br>
-			<br>
-				<i><b>/usr/share/openqrm/bin/openqrm boot-service configure -n nfs-storage -a [Server-name] -k [key] -v [value]</b></i>
-			<br>
-			<br>
-			In case the openmQRM Server itself is used as the NFS-Storage Storage please edit:<br>
-			<br>
-				<i><b>/usr/share/openqrm/plugins/nfs-storage/etc/openqrm-plugin-nfs-storage.conf</b></i>
-			<br>
-			<br>
-			and set the configuration keys.<br>
-			<br>"
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/lang/en.nfs-storage.ini b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/lang/en.nfs-storage.ini
deleted file mode 100644
index 08a9ebb..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/lang/en.nfs-storage.ini
+++ /dev/null
@@ -1,93 +0,0 @@
-[select]
-tab = "Select NFS-storage"
-label = "Select NFS-storage"
-action_edit = "edit"
-table_name = "Name"
-table_id = "Id"
-table_recource = "Resource"
-table_type = "Type"
-table_deployment = "Deployment"
-error_no_storage = "<b>No storage configured yet!</b><br><br>Please create a NFS Storage first!"
-new_storage = "New Storage"
-please_wait = "Loading Storage. Please wait .."
-[edit]
-tab = "Edit NFS-storage"
-label = "NFS Volumes on storage %s"
-lang_id = "ID"
-lang_name = "Name"
-lang_resource = "Resource"
-lang_state = "State"
-lang_vfree = "Free"
-lang_vsize = "Total"
-lang_authenticated_to = "exported to"
-action_add = "Add new Volume"
-action_refresh = "Reload Page"
-action_manual = "Manual Configuration"
-action_clone = "clone"
-action_remove = "remove"
-action_auth = "auth"
-action_add_image = "Add Image"
-action_remove_image = "Remove Image"
-action_clone_in_progress = "Synchronisation in progress - Please wait"
-action_clone_finished = "Syncronisation finished!"
-table_name = "Name"
-table_export = "Export"
-error_no_nfs = "Storage %s is not of type nfs-deployment"
-please_wait = "Loading Volumes. Please wait .."
-manual_configured = "Storage is manually configured and will not be administrated by openQRM"
-[add]
-tab = "Add NFS Volume"
-label = "Add new Volume"
-form_name = "Name"
-msg_added = "Added Volume %s"
-msg_add_failed = "Failed to add Volume %s"
-error_exists = "Volume %s already exists"
-error_name = "Name must be %s"
-please_wait = "Adding Volume. Please wait .."
-canceled = "Operation canceled. Please wait .."
-lang_name_generate = "generate name"
-[image]
-label = "Add/Remove Image for Volume %s"
-tab = "Add/Remove Image"
-error_exists = "Image %s already exists"
-error_image_still_in_use = "Image id %s is still in use by Server(s) %s"
-msg_added_image = "Added Image %s"
-msg_removed_image = "Removed Image id %s"
-please_wait = "Please wait .."
-canceled = "Operation canceled. Please wait .."
-[manual]
-tab = "Manual NFS Configuration"
-label = "Manual Configuration"
-explanation_1 = "In case the NFS Storage server is not managed by openQRM please use this form to manually create the list of exported paths to server-images on the NFS Storage server."
-explanation_2 = "Please notice that in case a manual configuration exist openQRM will not send any automated Storage-authentication commands to this NFS Storage-server!"
-please_wait = "Saving Manual Configuration. Please wait .."
-canceled = "Operation canceled. Please wait .."
-saved = "Manual Configuration has been saved"
-error_config = "Error: Please use only %s for Exports"
-error_image_in_use = "Error: Image name %s for %s is allready in use!"
-error_name_empty = "Error: Name is empty or a path ends with a /"
-[clone]
-tab = "Clone NFS Volume"
-label = "Clone Volume %s"
-form_name = "Name"
-msg_cloned = "Cloned %s as %s"
-msg_clone_failed = "Failed to clone Volume %s"
-error_exists = "Volume %s already exists"
-error_name = "Name must be %s"
-please_wait = "Cloning Volume. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[auth]
-tab = "Authenticate NFS Volume"
-label = "Authenticate Volume %s"
-form_ip = "IP"
-msg_authd = "Authenticated volume %s"
-auth_explanation = "Please notice: Volumes which are deployed as an Image via a Server are authenticated automatically!"
-error_ip = "IP Adress is not valid"
-please_wait = "Authenticating Volume. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[remove]
-label = "Remove Volume(s)"
-msg_removed = "Removed Volume %s"
-msg_image_still_in_use = "Volume %s of Image id %s is still in use by Server %s"
-please_wait = "Removing Volume(s). Please wait .."
-canceled = "Operation canceled. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/menu.txt
deleted file mode 100644
index 562868b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/menu.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# 
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|Nfs-Storage
-...|Volume Admin|index.php?plugin=nfs-storage|NFS Storage Manager
-...|About|index.php?plugin=nfs-storage&controller=nfs-storage-about|How to use
-...|Config|index.php?plugin=nfs-storage&controller=nfs-storage-about&nfs_storage_about_action=bootservice|NFS Storage Boot-Service
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/nfs-storage-action.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/nfs-storage-action.php
deleted file mode 100644
index fee5cda..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/nfs-storage-action.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/authblocker.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-// filter inputs
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-global $IMAGE_INFO_TABLE;
-global $DEPLOYMENT_INFO_TABLE;
-global $OPENQRM_SERVER_BASE_DIR;
-
-$nfs_storage_command = $request->get('nfs_storage_command');
-$nfs_image_name = $request->get('nfs_image_name');
-
-// place for the storage stat files
-$StorageDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/nfs-storage/storage';
-// global event for logging
-$event = new event();
-
-// user/role authentication
-if ($OPENQRM_USER->role != "administrator") {
-	$event->log("authorization", $_SERVER['REQUEST_TIME'], 1, "nfs-action", "Un-Authorized access to nfs-actions from $OPENQRM_USER->name", "", "", 0, 0, 0);
-	exit();
-}
-
-$event->log("$nfs_storage_command", $_SERVER['REQUEST_TIME'], 5, "nfs-storage-action", "Processing nfs-storage command $nfs_storage_command", "", "", 0, 0, 0);
-switch ($nfs_storage_command) {
-	case 'get_storage':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	case 'get_ident':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	case 'get_sync_progress':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		break;
-
-	case 'get_sync_finished':
-		if (!file_exists($StorageDir)) {
-			mkdir($StorageDir);
-		}
-		$filename = $StorageDir."/".$_POST['filename'];
-		$filedata = base64_decode($_POST['filedata']);
-		echo "<h1>$filename</h1>";
-		$fout = fopen($filename,"wb");
-		fwrite($fout, $filedata);
-		fclose($fout);
-		sleep(5);
-		unlink($filename);
-		break;
-
-	case 'auth_finished':
-		// remove storage-auth-blocker if existing
-		$authblocker = new authblocker();
-		$authblocker->get_instance_by_image_name($nfs_image_name);
-		if (strlen($authblocker->id)) {
-			$event->log('auth_finished', $_SERVER['REQUEST_TIME'], 5, "nfs-storage-action", "Removing authblocker for image $nfs_image_name", "", "", 0, 0, 0);
-			$authblocker->remove($authblocker->id);
-		}
-		break;
-
-	default:
-		$event->log("$nfs_storage_command", $_SERVER['REQUEST_TIME'], 3, "nfs-storage-action", "No such nfs-storage command ($nfs_storage_command)", "", "", 0, 0, 0);
-		break;
-
-
-}
-?>
-
-</body>
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/openqrm-nfs-deployment-auth-hook.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/openqrm-nfs-deployment-auth-hook.php
deleted file mode 100644
index cc1669d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/openqrm-nfs-deployment-auth-hook.php
+++ /dev/null
@@ -1,365 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/image_authentication.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/authblocker.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-
-/**
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- */
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $IMAGE_AUTHENTICATION_TABLE;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $openqrm_server;
-$event = new event();
-global $event;
-
-
-
-	//--------------------------------------------------
-	/**
-	* authenticates the storage volume for the appliance resource
-	* <code>
-	* storage_auth_function("start", 2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_function($cmd, $appliance_id) {
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-		global $IMAGE_AUTHENTICATION_TABLE;
-		global $openqrm_server;
-		global $RootDir;
-
-		$appliance = new appliance();
-		$appliance->get_instance_by_id($appliance_id);
-
-		$image = new image();
-		$image->get_instance_by_id($appliance->imageid);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		$resource = new resource();
-		$resource->get_instance_by_id($appliance->resources);
-		$resource_ip=$resource->ip;
-
-		// this is a hook for the cloud-plugin to be able
-		// to translate the internal to the external ip address
-		// for the nfs-mount authentication
-  /*      if (file_exists("$RootDir/plugins/cloud/.running")) {
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-nfs-deployment-auth-hook.php", "Found Cloud enabled and running. Checking for CloudNAT", "", "", 0, 0, $appliance_id);
-			// special clouduser class
-			require_once "$RootDir/plugins/cloud/class/cloudconfig.class.php";
-			require_once "$RootDir/plugins/cloud/class/cloudnat.class.php";
-			// check if we have to cloudnat the ip address
-			$cn_conf = new cloudconfig();
-			$cn_nat_enabled = $cn_conf->get_value(18);  // 18 is cloud_nat
-			if (!strcmp($cn_nat_enabled, "true")) {
-				$cn = new cloudnat();
-				$internal_resource_ip=$resource_ip;
-				$resource_ip = $cn->translate($resource_ip);
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-nfs-deployment-auth-hook.php", "Found CloudNAT enabled, translated $internal_resource_ip to $resource_ip", "", "", 0, 0, $appliance_id);
-			} else {
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-nfs-deployment-auth-hook.php", "Cloudnat is disabled, keeping $resource_ip", "", "", 0, 0, $appliance_id);
-			}
-
-		} else {
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-nfs-deployment-auth-hook.php", "Cloud is not enabled/running. Not checking for CloudNAT", "", "", 0, 0, $appliance_id);
-
-		}
-*/
-
-		// manual configured ?
-		$StorageDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/nfs-storage/storage';
-		$statfile_manual="$StorageDir/".$storage_resource->id.".nfs.stat.manual";
-		if (file_exists($statfile_manual)) {
-			// remove storage-auth-blocker if existing
-			$authblocker = new authblocker();
-			$authblocker->get_instance_by_image_name($image_name);
-			if (strlen($authblocker->id)) {
-				$event->log('storage_auth_function', $_SERVER['REQUEST_TIME'], 5, "openqrm-nfs-deployment-auth-hook.php", "Removing authblocker for image $image_name", "", "", 0, 0, 0);
-				$authblocker->remove($authblocker->id);
-			}
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-nfs-deployment-auth-hook.php", "NFS Storage $storage->id is manually configured. Skipping automatic authentication hook ...", "", "", 0, 0, $appliance_id);
-			return;
-		}
-
-
-		switch($cmd) {
-			case "start":
-				// authenticate the rootfs / needs openqrm user + pass
-				$openqrm_admin_user = new user("openqrm");
-				$openqrm_admin_user->set_user();
-
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-nfs-deployment-auth-hook.php", "Authenticating $image_name to resource $resource_ip", "", "", 0, 0, $appliance_id);
-				$auth_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$deployment_plugin_name."/bin/openqrm-".$deployment_plugin_name." auth -n ".$image_name." -r ".$image_rootdevice." -i ".$resource_ip." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-				$resource->send_command($storage_ip, $auth_start_cmd);
-
-				// authenticate the install-from-nfs export
-				$run_disable_deployment_export=0;
-				$install_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_INSTALL_FROM_NFS"));
-				if (strlen($install_from_nfs_param)) {
-
-					// storage -> resource -> auth
-					$ip_storage_id=$deployment->parse_deployment_parameter("id", $install_from_nfs_param);
-					$ip_storage_ip=$deployment->parse_deployment_parameter("ip", $install_from_nfs_param);
-					$ip_image_rootdevice=$deployment->parse_deployment_parameter("path", $install_from_nfs_param);
-
-					$ip_storage = new storage();
-					$ip_storage->get_instance_by_id($ip_storage_id);
-					$ip_storage_resource = new resource();
-					$ip_storage_resource->get_instance_by_id($ip_storage->resource_id);
-					$op_storage_ip = $ip_storage_resource->ip;
-
-					$ip_deployment = new deployment();
-					$ip_deployment->get_instance_by_id($ip_storage->type);
-					$ip_deployment_type = $ip_deployment->type;
-					$ip_deployment_plugin_name = $ip_deployment->storagetype;
-
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-nfs-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $ip_storage_id:$ip_storage_ip:$ip_image_rootdevice", "", "", 0, 0, $appliance_id);
-					$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$ip_deployment_plugin_name."/bin/openqrm-".$ip_deployment_plugin_name." auth -r ".$ip_image_rootdevice." -i ".$resource_ip." -t ".$ip_deployment_type." --openqrm-cmd-mode background";
-					$resource->send_command($ip_storage_ip, $auth_install_from_nfs_start_cmd);
-
-					$run_disable_deployment_export=1;
-				}
-
-				// authenticate the transfer-to-nfs export
-				$transfer_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_TRANSFER_TO_NFS"));
-				if (strlen($transfer_from_nfs_param)) {
-					// storage -> resource -> auth
-					$tp_storage_id=$deployment->parse_deployment_parameter("id", $transfer_from_nfs_param);
-					$tp_storage_ip=$deployment->parse_deployment_parameter("ip", $transfer_from_nfs_param);
-					$tp_image_rootdevice=$deployment->parse_deployment_parameter("path", $transfer_from_nfs_param);
-
-					$tp_storage = new storage();
-					$tp_storage->get_instance_by_id($tp_storage_id);
-					$tp_storage_resource = new resource();
-					$tp_storage_resource->get_instance_by_id($tp_storage->resource_id);
-					$op_storage_ip = $tp_storage_resource->ip;
-
-					$tp_deployment = new deployment();
-					$tp_deployment->get_instance_by_id($tp_storage->type);
-					$tp_deployment_type = $tp_deployment->type;
-					$tp_deployment_plugin_name = $tp_deployment->storagetype;
-
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-nfs-deployment-auth-hook.php", "Transfer-to-NFS: Authenticating $resource_ip on storage id $tp_storage_id:$tp_storage_ip:$tp_image_rootdevice", "", "", 0, 0, $appliance_id);
-					$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$tp_deployment_plugin_name."/bin/openqrm-".$tp_deployment_plugin_name." auth -r ".$tp_image_rootdevice." -i ".$resource_ip." -t ".$tp_deployment_type." --openqrm-cmd-mode background";
-					$resource->send_command($tp_storage_ip, $auth_install_from_nfs_start_cmd);
-
-					$run_disable_deployment_export=1;
-				}
-
-				// do we need to disable the install-from/transfer-to-nfs exports ?
-				if ($run_disable_deployment_export == 1) {
-					$image_authentication = new image_authentication();
-					$ia_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$image_auth_ar = array(
-						'ia_id' => $ia_id,
-						'ia_image_id' => $appliance->imageid,
-						'ia_resource_id' => $appliance->resources,
-						'ia_auth_type' => 1,
-					);
-					$image_authentication->add($image_auth_ar);
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-nfs-deployment-auth-hook.php", "Registered image $appliance->imageid for de-authentication the deployment exports when resource $appliance->resources is fully up.", "", "", 0, 0, $appliance_id);
-				}
-
-
-				break;
-
-			case "stop":
-				$image_authentication = new image_authentication();
-				$ia_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$image_auth_ar = array(
-					'ia_id' => $ia_id,
-					'ia_image_id' => $appliance->imageid,
-					'ia_resource_id' => $appliance->resources,
-					'ia_auth_type' => 0,
-				);
-				$image_authentication->add($image_auth_ar);
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-nfs-deployment-auth-hook.php", "Registered image $appliance->imageid for de-authentication the root-fs exports when resource $appliance->resources is idle again.", "", "", 0, 0, $appliance_id);
-				break;
-
-		}
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage volume for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		$auth_stop_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$deployment_plugin_name."/bin/openqrm-".$deployment_plugin_name." auth -r ".$image_rootdevice." -i ".$OPENQRM_SERVER_IP_ADDRESS." --openqrm-cmd-mode background";
-		$resource = new resource();
-		$resource->send_command($storage_ip, $auth_stop_cmd);
-
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage deployment volumes for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_deployment_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_deployment_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		// just for sending the commands
-		$resource = new resource();
-
-		// get install deployment params
-		$install_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_INSTALL_FROM_NFS"));
-		if (strlen($install_from_nfs_param)) {
-			// storage -> resource -> auth
-			$ip_storage_id=$deployment->parse_deployment_parameter("id", $install_from_nfs_param);
-			$ip_storage_ip=$deployment->parse_deployment_parameter("ip", $install_from_nfs_param);
-			$ip_image_rootdevice=$deployment->parse_deployment_parameter("path", $install_from_nfs_param);
-
-			$ip_storage = new storage();
-			$ip_storage->get_instance_by_id($ip_storage_id);
-			$ip_storage_resource = new resource();
-			$ip_storage_resource->get_instance_by_id($ip_storage->resource_id);
-			$op_storage_ip = $ip_storage_resource->ip;
-
-			$ip_deployment = new deployment();
-			$ip_deployment->get_instance_by_id($ip_storage->type);
-			$ip_deployment_type = $ip_deployment->type;
-			$ip_deployment_plugin_name = $ip_deployment->storagetype;
-
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-nfs-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $ip_storage_id:$ip_storage_ip:$ip_image_rootdevice", "", "", 0, 0, $appliance_id);
-			$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$ip_deployment_plugin_name."/bin/openqrm-".$ip_deployment_plugin_name." auth -r ".$ip_image_rootdevice." -i ".$OPENQRM_SERVER_IP_ADDRESS." -t ".$ip_deployment_type." --openqrm-cmd-mode background";
-			$resource->send_command($ip_storage_ip, $auth_install_from_nfs_start_cmd);
-		}
-
-		// get transfer deployment params
-		$transfer_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_TRANSFER_TO_NFS"));
-		if (strlen($transfer_from_nfs_param)) {
-			// storage -> resource -> auth
-			$tp_storage_id=$deployment->parse_deployment_parameter("id", $transfer_from_nfs_param);
-			$tp_storage_ip=$deployment->parse_deployment_parameter("ip", $transfer_from_nfs_param);
-			$tp_image_rootdevice=$deployment->parse_deployment_parameter("path", $transfer_from_nfs_param);
-
-			$tp_storage = new storage();
-			$tp_storage->get_instance_by_id($tp_storage_id);
-			$tp_storage_resource = new resource();
-			$tp_storage_resource->get_instance_by_id($tp_storage->resource_id);
-			$op_storage_ip = $tp_storage_resource->ip;
-
-			$tp_deployment = new deployment();
-			$tp_deployment->get_instance_by_id($tp_storage->type);
-			$tp_deployment_type = $tp_deployment->type;
-			$tp_deployment_plugin_name = $tp_deployment->storagetype;
-
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-nfs-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $tp_storage_id:$tp_storage_ip:$tp_image_rootdevice", "", "", 0, 0, $appliance_id);
-			$auth_install_from_nfs_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/".$tp_deployment_plugin_name."/bin/openqrm-".$tp_deployment_plugin_name." auth -r ".$tp_image_rootdevice." -i ".$OPENQRM_SERVER_IP_ADDRESS." -t ".$tp_deployment_type." --openqrm-cmd-mode background";
-			$resource->send_command($tp_storage_ip, $auth_install_from_nfs_start_cmd);
-		}
-
-	}
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/openqrm-nfs-deployment-cloud-hook.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/openqrm-nfs-deployment-cloud-hook.php
deleted file mode 100644
index 564e4bf..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/openqrm-nfs-deployment-cloud-hook.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This file implements the cloud storage methods
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-// special cloud classes
-require_once "$RootDir/plugins/cloud/class/cloudimage.class.php";
-
-$event = new event();
-global $event;
-
-global $OPENQRM_SERVER_BASE_DIR;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $RESOURCE_INFO_TABLE;
-
-
-// ---------------------------------------------------------------------------------
-// general cloudstorage methods
-// ---------------------------------------------------------------------------------
-
-
-// clones the volume of an image
-function create_clone_nfs_deployment($cloud_image_id, $image_clone_name, $disk_size) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("create_clone", $_SERVER['REQUEST_TIME'], 5, "nfs-deployment-cloud-hook", "Creating clone of image on storage", "", "", 0, 0, 0);
-
-	// we got the cloudimage id here, get the image out of it
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image, this is already the new logical clone
-	// we just need to physical snapshot it and update the rootdevice
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// nfs-storage
-	$export_dir=dirname($image_rootdevice);
-	$image_location_name=basename($image_rootdevice);
-	// update the image rootdevice parameter
-	$image->get_instance_by_id($image_id);
-	$ar_image_update = array(
-		'image_rootdevice' => "$export_dir/$image_clone_name",
-	);
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "nfs-deployment-cloud-hook", "Updating rootdevice of image $image_id / $image_name with $export_dir/$image_clone_name", "", "", 0, 0, 0);
-	$image->update($image_id, $ar_image_update);
-	// send command
-	$image_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/nfs-storage/bin/openqrm-nfs-storage snap -n ".$image_location_name." -s ".$image_clone_name." --openqrm-cmd-mode background";
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "nfs-deployment-cloud-hook", "Running : $image_clone_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_clone_cmd);
-}
-
-
-
-// removes the volume of an image
-function remove_nfs_deployment($cloud_image_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("remove_nfs_deployment", $_SERVER['REQUEST_TIME'], 5, "nfs-deployment-cloud-hook", "Removing image on storage", "", "", 0, 0, 0);
-
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// nfs-storage
-	$image_location_name=basename($image_rootdevice);
-	$image_remove_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/nfs-storage/bin/openqrm-nfs-storage remove -n ".$image_location_name." --openqrm-cmd-mode background";
-	$event->log("remove_nfs_deployment", $_SERVER['REQUEST_TIME'], 5, "nfs-deployment-cloud-hook", "Running : $image_remove_clone_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_remove_clone_cmd);
-}
-
-
-// resizes the volume of an image
-function resize_nfs_deployment($cloud_image_id, $resize_value) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("resize_nfs_deployment", $_SERVER['REQUEST_TIME'], 2, "nfs-deployment-cloud-hook", "Resize image is not supported for nfs-storage!", "", "", 0, 0, 0);
-}
-
-
-
-// creates a private copy of the volume of an image
-function create_private_nfs_deployment($cloud_image_id, $private_disk, $private_image_name) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("create_private_nfs_deployment", $_SERVER['REQUEST_TIME'], 2, "nfs-deployment-cloud-hook", "Creating private image is not supported for nfs-storage!", "", "", 0, 0, 0);
-}
-
-
-
-// ---------------------------------------------------------------------------------
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/root-mount.nfs-deployment b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/root-mount.nfs-deployment
deleted file mode 100644
index dc3447d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/root-mount.nfs-deployment
+++ /dev/null
@@ -1,235 +0,0 @@
-#!/bin/bash
-# this is the root-mount initrd-service
-# which proivdes function to mount/remount the remote
-# nfs-rootfs according to the image_deployment_parameters at /mnt
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# nfs-storage
-# Required defines in the image_deploy_paramters
-#
-#
-# Optional parameters 
-#
-# IMAGE_INSTALL_FROM_NFS			- can be set to an (nfs) location from
-#									  which the image will be installed at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_TRANSFER_TO_NFS				- can be set to an (nfs) location from
-#									  which the image will be transfered to at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_INSTALL_FROM_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this
-#									  option will install the nfs-storage image on 
-#									  boot-time from the local-device
-#
-# IMAGE_TRANSFER_TO_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this option will transfrom
-#									  the nfs-storage image on boot-time to the local-device
-#
-#
-#
-# IMAGE_INSTALL_FROM_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_TRANSFER_TO_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_NFS_MOUNT_OPTIONS			- can be e.g. set to proto=tcp for the install/transform phase
-#
-
-# get the deployment parameters from openqrm.conf
-OPENQRM_RESOURCE_PARAMETER_FILE="/var/openqrm/openqrm-resource.conf"
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-eval $image_deployment_parameter
-export OPENQRM_SERVER_BASE_DIR=$resource_basedir
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-
-if [ "$IMAGE_NFS_MOUNT_OPTIONS" != "" ]; then
-	IMAGE_NFS_MOUNT_OPTIONS=",$IMAGE_NFS_MOUNT_OPTIONS"
-fi
-# default to ext3
-if [ "$IMAGE_INSTALL_FROM_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_INSTALL_FROM_LOCAL_FS_TYPE="ext3"
-fi
-if [ "$IMAGE_TRANSFER_TO_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_TRANSFER_TO_LOCAL_FS_TYPE="ext3"
-fi
-
-# adapt the rootdevice parameters
-IMAGE_ROOT_DIR=$image_rootdevice
-
-#######################################################################
-# required functions ##################################################
-#######################################################################
-
-function mount_rootfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-
-	if ! mount -t nfs -o rw,nolock$IMAGE_NFS_MOUNT_OPTIONS $image_storage_server_ip:$IMAGE_ROOT_DIR /mnt; then
-		echo "ERROR: Could not mount $image_storage_server_ip:$IMAGE_ROOT_DIR by nfs"
-		# give a shell for the admin
-		/bin/bash
-	else
-		echo "nfs-storage: Mounted $image_storage_server_ip:$IMAGE_ROOT_DIR rw"
-	fi
-
-	if  [ "$IMAGE_INSTALL_FROM_NFS" != "" ]; then
-		install_rootfs_from_nfs
-	else
-		echo "nfs-storage: Skipping install phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_NFS" != "" ]; then
-		transfer_rootfs_to_nfs
-	else
-		echo "nfs-storage: Skipping transfer-to-nfs phase"
-	fi
-	if  [ "$IMAGE_INSTALL_FROM_LOCAL" != "" ]; then
-		install_rootfs_from_local
-	else
-		echo "nfs-storage: Skipping install-from-local phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_LOCAL" != "" ]; then
-		transfer_rootfs_to_local
-	else
-		echo "nfs-storage: Skipping transfer-to-local phase"
-	fi
-}
-
-
-function remount_rootfs() {
-
-	# Debian/Ubuntu Systems want their nfs-rootfs in rw mode
-	if [ -f /mnt/etc/apt/sources.list ]; then
-		if grep ubuntu /mnt/etc/apt/sources.list >/remountlog; then
-			echo "nfs-storage: Skipping Re-mount $image_storage_server_ip:$IMAGE_ROOT_DIR ro"
-			rm -f /remountlog
-			return
-		fi
-	fi
-
-	# remont /mnt ro
-	while ! mount -t nfs -o ro,remount,nolock$IMAGE_NFS_MOUNT_OPTIONS $image_storage_server_ip:$IMAGE_ROOT_DIR /mnt; do
-		echo -n "."
-		sleep 1
-		REMOUNT_LOOP=$[ REMOUNT_LOOP + 1 ]
-		if [ "$REMOUNT_LOOP" == "10" ]; then
-			echo "ERROR: nfs-storage could not remount /mnt "
-			/bin/bash
-		fi
-	done
-	echo "nfs-storage: Re-mounted $image_storage_server_ip:$IMAGE_ROOT_DIR ro"
-	openqrm_portmap_stop
-
-}
-
-
-function create_fstab() {
-	rm -f $IMAGE_FSTAB
-	echo "$image_storage_server_ip:$IMAGE_ROOT_DIR   /   nfs  defaults   0 0" >> $IMAGE_FSTAB
-}
-
-
-#######################################################################
-# optional functions ##################################################
-#######################################################################
-
-function install_rootfs_from_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f1`
-	IMAGE_INSTALL_FROM_NFS=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f2-`
-	echo "nfs-storage: Installing $resource_image from $IMAGE_INSTALL_FROM_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o ro$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_INSTALL_FROM_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "nfs-storage: Starting install-from-nfs phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "nfs-storage: Install-from-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-function transfer_rootfs_to_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f1`
-	IMAGE_TRANSFER_TO_NFS=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f2-`
-	echo "nfs-storage: Transfering $resource_image to $IMAGE_TRANSFER_TO_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o rw$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_TRANSFER_TO_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "nfs-storage: Starting transfer-to-nfs phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "nfs-storage: Transfer-to-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-function install_rootfs_from_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE -o ro $IMAGE_INSTALL_FROM_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_LOCAL / $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "nfs-storage: Starting install-to-local phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "nfs-storage: Install-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-function transfer_rootfs_to_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE -o rw $IMAGE_TRANSFER_TO_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_LOCAL / $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "nfs-storage: Starting transfer-to-local phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "nfs-storage: Transfer-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-about-bootservice.tpl.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-about-bootservice.tpl.php
deleted file mode 100644
index be1595a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-about-bootservice.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-
-<h2>{label}</h2>
-<div class="row">
-	<div class="span7">
-		<h3>{boot_service_title}</h3>
-		{boot_service_content}
-	</div>
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-about-documentation.tpl.php
deleted file mode 100644
index ccf3483..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-about-documentation.tpl.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-
-<h2>{label}</h2>
-<div class="row">
-	<div class="span7">
-		<h3>{introduction_title}</h3>
-		{introduction_content}
-	
-		<h3>{provides_title}</h3>
-		{provides_list}
-	
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-
-	</div>
-	<div class="span2 offset1">
-		<h3>{type_title}</h3>
-		<span class="pill">{type_content}</span>
-
-		<h3>{deployment_title}</h3>
-		<span class="pill">{deployment_content}</span>
-
-		<h3>{tested_title}</h3>
-		{tested_content}
-		
-	</div>
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-add.tpl.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-add.tpl.php
deleted file mode 100644
index 3378427..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-add.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}" method="GET">
-{form}
-<div id="form">
-	{name}
-	<div id="buttons">{submit}&#160;{cancel}</div>
-</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-auth.tpl.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-auth.tpl.php
deleted file mode 100644
index ec9ba32..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-auth.tpl.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-<form action="{thisfile}">
-
-	<div id="form">
-	<b>{auth_explanation}</b>
-	<br><br>
-	{form}
-	{ip}
-	<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-clone.tpl.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-clone.tpl.php
deleted file mode 100644
index 850e7ce..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-clone.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-<form action="{thisfile}">
-	<div id="form">
-		{form}
-		{name}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-edit.tpl.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-edit.tpl.php
deleted file mode 100644
index 79f6f43..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-edit.tpl.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-<div class="row">
-	<div class="span2">
-		<strong>{lang_id}</strong>: {id}<br>
-		<strong>{lang_name}</strong>: {name}<br>
-		<strong>{lang_resource}</strong>: {resource}<br>
-		<strong>{lang_state}</strong>: {state}<br>
-		
-	</div>
-	<div class="span2">
-		<strong>{lang_vsize} / {lang_vfree}</strong>: {vsize} / {vfree}
-	</div>
-	<div class="span6">
-		<span class="pull-right">
-			{add}<br>
-			{manual}
-		</span>
-	</div>
-</div>
-<hr>
-<div class="row">
-	<div class="span10">
-		{table}		
-	</div>
-</div>
-
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-manual.tpl.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-manual.tpl.php
deleted file mode 100644
index d824cb1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-manual.tpl.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-<form action="{thisfile}" method="POST">
-	<div id="form" class="manualconfig">
-	<p style="width:400px;margin: 0 0 10px 0;">{explanation_1}</p>
-	<p style="width:400px;margin: 0 0 20px 0;font-weight: bold;">{explanation_2}</p>
-	{form}
-	{config}
-	<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-remove.tpl.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-remove.tpl.php
deleted file mode 100644
index 957ed31..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-remove.tpl.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-<form action="{thisfile}">
-	<div id="form">
-		{form}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-select.tpl.php b/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-select.tpl.php
deleted file mode 100644
index c7c3dc9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/nfs-storage/web/tpl/nfs-storage-select.tpl.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-<div class="row">
-	<div class="span10">
-		{table}		
-	</div>
-</div>
-
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/Makefile b/openQRM-5.3.50-CE/src/plugins/novnc/Makefile
deleted file mode 100644
index d799416..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-# this is the openQRM novnc-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-export NOVNC_SOURCE_CONF=$(shell pwd)/etc/openqrm-plugin-novnc.conf
-
-
-configure:
-
-compile:
-	../../make-assistant openqrm_cache_or_download kanaka-noVNC etc/build.conf/novnc.conf
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/bin
-	. $(OPENQRM_SERVER_CONF) && cp bin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/bin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/bin/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/novnc $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/httpdocs
-	. $(OPENQRM_SERVER_CONF) && cp httpdocs/*.html $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/httpdocs/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/httpdocs/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/web/img
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/web/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/web/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/web/lang/
-	. $(OPENQRM_SERVER_CONF) && . etc/build.conf/novnc.conf && if ! tar -C $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/ -xzf $$OPENQRM_BUILD_TMP_DIR/openqrm-build/kanaka-noVNC/source/kanaka-noVNC-$$OPENQRM_SOURCE_VERSION.tar.gz 2>/dev/null; then tar -C $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/ -xzf ../../$$OPENQRM_BUILD_TMP_DIR/openqrm-build/kanaka-noVNC/source/kanaka-noVNC-$$OPENQRM_SOURCE_VERSION.tar.gz; fi
-	. $(OPENQRM_SERVER_CONF) && . etc/build.conf/novnc.conf && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/vncclient && mv $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/kanaka-noVNC-$$OPENQRM_SOURCE_SUB_VERSION $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/vncclient
-	. $(OPENQRM_SERVER_CONF) && . etc/build.conf/novnc.conf && cp -f $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/vncclient/include/black.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/vncclient/include/plain.css
-	. $(OPENQRM_SERVER_CONF) && . etc/build.conf/novnc.conf && tar -C $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc -czf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/web/boot-service-novnc.tgz include/ etc/init.d/novnc etc/openqrm-plugin-novnc.conf
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/novnc
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/novnc/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/bin/openqrm-novnc-manager b/openQRM-5.3.50-CE/src/plugins/novnc/bin/openqrm-novnc-manager
deleted file mode 100644
index 177a9a9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/bin/openqrm-novnc-manager
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/bin/bash
-# this script automatically manages novnc
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/include/openqrm-plugin-novnc-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/etc/openqrm-plugin-novnc.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-openqrm_server_get_config
-export resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-export LANG=C
-
-# unblock starting command queue early for non-blocking + ui commands
-openqrm_unblock_starting_queue $@
-
-# novnc defines
-NOVNC_WEBSERVER_PORT_RANGE_START=6000
-NOVNC_WEBSOCKET_PORT_RANGE_START=6800
-
-if [ -x /usr/bin/screen.real ]; then
-	RUNSCREEN="/usr/bin/screen.real"
-else
-	RUNSCREEN=`which screen`
-fi
-
-
-# debug
-echo "!!!! running: $0 $@" | logger
-
-
-function novnc_manager_usage() {
-	echo "Usage : $0 remoteconsole"
-	exit 1
-}
-
-FULL_COMMANDLINE="$0 $@"
-NOVNC_MANAGER_COMMAND=$1
-shift
-
-while [ $# -ne 0 ]; do
-	case "$1" in
-		-n)
-			VM_NAME=$2
-			shift
-			;;
-		-d)
-			NOVNC_PROXY_PORT=$2
-			shift
-			;;
-		-m)
-			VM_MAC=$2
-			shift
-			;;
-		-v)
-			VM_VNC_PORT_NUMBER=$2
-			shift
-			;;
-		-i)
-			VM_HOST_IP=$2
-			shift
-			;;
-		--openqrm-ui-user)
-			OPENQRM_UI_USER=$2
-			shift
-			;;
-		--openqrm-internal-cmd)
-			OPENQRM_INTERNAL_CMD=$2
-			shift
-			;;
-		--openqrm-cmd-mode)
-			OPENQRM_CMD_MODE=$2
-			shift
-			;;
-		*)
-			echo "ERROR: Free commandline arguments are not allowed"
-			novnc_manager_usage
-			exit 6
-			;;
-	esac
-	shift
-done
-
-
-# main
-case "$NOVNC_MANAGER_COMMAND" in
-	remoteconsole)
-		# remove all not active zombies
-		kill -9 `ps ax | grep python | grep defunct | grep 'Z+' | awk '{ print $1 }'` 1>/dev/null 2>&1
-		# calculate the web + proxy port
-		NOVNC_WEBSERVER_PORT=$(( NOVNC_WEBSERVER_PORT_RANGE_START + NOVNC_PROXY_PORT ))
-		NOVNC_WEBSOCKET_PORT=$(( NOVNC_WEBSOCKET_PORT_RANGE_START + NOVNC_PROXY_PORT ))
-		VM_VNC_PORT=$(( VM_VNC_PORT_NUMBER + 5900 ))
-
-		for NOVNC_WSPROXYPID in `ps ax | grep wsproxy.py | grep -i -v screen | grep -w "$VM_HOST_IP:$VM_VNC_PORT"  | grep -v grep | awk {' print $1 '}`; do
-			kill $NOVNC_WSPROXYPID
-			kill -9 $NOVNC_WSPROXYPID 2>/dev/null
-		done
-		for NOVNC_WSPROXYPID in `ps ax | grep wsproxy.py | grep -i screen | grep -w "$VM_HOST_IP:$VM_VNC_PORT"  | grep -v grep | awk {' print $1 '}`; do
-			kill $NOVNC_WSPROXYPID
-			kill -9 $NOVNC_WSPROXYPID 2>/dev/null
-		done
-		$RUNSCREEN -wipe 1>/dev/null 2>&1
-
-		# start new screen session
-		SCREEN_NAME="NOVNC.$VM_NAME.$VM_HOST_IP.$VM_VNC_PORT_NUMBER"
-		cd $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/vncclient
-
-		NOVNC_KEY=/usr/share/openqrm/etc/ssl/private/openqrm-private.key
-		NOVNC_CERT=/usr/share/openqrm/etc/ssl/cert/openqrm.crt
-		NOVNC_DOCS=$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/httpdocs
-		if [ -f $NOVNC_KEY -a -f $NOVNC_CERT ]; then
-			$RUNSCREEN -dmS $SCREEN_NAME python utils/wsproxy.py --web $NOVNC_DOCS --idle-timeout=90 --cert=$NOVNC_CERT --key=$NOVNC_KEY $NOVNC_WEBSERVER_PORT $VM_HOST_IP:$VM_VNC_PORT
-		else
-			$RUNSCREEN -dmS $SCREEN_NAME python utils/wsproxy.py --web $NOVNC_DOCS --idle-timeout=90 $NOVNC_WEBSERVER_PORT $VM_HOST_IP:$VM_VNC_PORT
-		fi
-		cd - 1>/dev/null
-		;;
-
-	disable-remoteconsole)
-		# remove all not active zombies
-		kill -9 `ps ax | grep python | grep defunct | grep 'Z+' | awk '{ print $1 }'` 1>/dev/null 2>&1
-		# calculate the web + proxy port
-		#NOVNC_WEBSERVER_PORT=$(( NOVNC_WEBSERVER_PORT_RANGE_START + NOVNC_PROXY_PORT ))
-		#NOVNC_WEBSOCKET_PORT=$(( NOVNC_WEBSOCKET_PORT_RANGE_START + NOVNC_PROXY_PORT ))
-		VM_VNC_PORT=$(( VM_VNC_PORT_NUMBER + 5900 ))
-
-		for NOVNC_WSPROXYPID in `ps ax | grep wsproxy.py | grep -i -v screen | grep -w "$VM_HOST_IP:$VM_VNC_PORT"  | grep -v grep | awk {' print $1 '}`; do
-			kill $NOVNC_WSPROXYPID
-			kill -9 $NOVNC_WSPROXYPID 2>/dev/null
-		done
-		for NOVNC_WSPROXYPID in `ps ax | grep wsproxy.py | grep -i screen | grep -w "$VM_HOST_IP:$VM_VNC_PORT"  | grep -v grep | awk {' print $1 '}`; do
-			kill $NOVNC_WSPROXYPID
-			kill -9 $NOVNC_WSPROXYPID 2>/dev/null
-		done
-		$RUNSCREEN -wipe 1>/dev/null 2>&1
-		exit 0
-		;;
-
-	*)
-		echo "ERROR: Free commandline arguments are not allowed"
-		novnc_manager_usage
-		exit 6
-		;;
-esac
-
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/etc/build.conf/novnc.conf b/openQRM-5.3.50-CE/src/plugins/novnc/etc/build.conf/novnc.conf
deleted file mode 100644
index 78828fe..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/etc/build.conf/novnc.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# Below the download locations for third-party components are defined
-# openqrm-plugin-novnc-components.tgz provides a stripped ajaxterm and a
-# static compiled pound as the reverse ssl-proxy
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="v0.4-137-g85e8991"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/plugins/novnc/kanaka-noVNC-$OPENQRM_SOURCE_VERSION.tar.gz"
-OPENQRM_SOURCE_BINARY_RESULT=""
-OPENQRM_SOURCE_SUB_VERSION="85e8991"
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/etc/init.d/novnc b/openQRM-5.3.50-CE/src/plugins/novnc/etc/init.d/novnc
deleted file mode 100644
index 7f8ef33..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/etc/init.d/novnc
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-# this is the boot-service init script for the novnc resources
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-# for including the package functions
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/include/openqrm-plugin-novnc-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/etc/openqrm-plugin-novnc.conf
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-# do not run on idle resources
-if [ "$resource_image" == "idle" ]; then
-	exit 0
-fi
-# also do not run before the real init of the rootfs
-# if we have this file /etc/initrd-devices.conf we are still in the initrd
-if [ -f /etc/initrd-devices.conf ]; then
-	exit 0
-fi
-
-
-function novnc_start() {
-	echo "Starting the openQRM novnc-plugin"
-	novnc_stop 1>/dev/null 2>&1
-	return 0
-}
-
-
-function novnc_stop() {
-	echo "Stopping the openQRM novnc-plugin"
-	return 0
-}
-
-
-
-case "$1" in
-	start)
-		novnc_start
-		;;
-	stop)
-		novnc_stop
-		;;
-	restart)
-		novnc_stop
-		sleep 1
-		novnc_start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|createcert}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/etc/init.d/openqrm-plugin-novnc b/openQRM-5.3.50-CE/src/plugins/novnc/etc/init.d/openqrm-plugin-novnc
deleted file mode 100644
index 959774c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/etc/init.d/openqrm-plugin-novnc
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/bash
-# init script for the openQRM novnc plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/include/openqrm-plugin-novnc-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/etc/openqrm-plugin-novnc.conf
-# for the post-event to work
-openqrm_server_get_config
-OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-resource_id=0
-resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-# which screen binary to use
-if [ -x /usr/bin/screen.real ]; then
-	RUNSCREEN="/usr/bin/screen.real"
-else
-	RUNSCREEN=`which screen`
-fi
-
-
-function openqrm_plugin_novnc_start() {
-	echo "Starting the openQRM novnc-plugin"
-	local CURRENTDIR=`pwd`
-	openqrm_plugin_novnc_stop 1>/dev/null 2>&1
-
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/novnc/.running
-	return 0
-}
-
-function openqrm_plugin_novnc_stop() {
-	echo "Stopping the openQRM novnc-plugin"
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/novnc/.running
-	return 0
-}
-
-
-function openqrm_plugin_novnc_init() {
-	echo "Initializing the openQRM novnc-plugin"
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/novnc
-	# link the boot-service
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/web/boot-service-novnc.tgz $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-novnc.tgz
-	# link novnc client js files
-	mkdir -p $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/novnc/novncjs
-	for j in $(ls $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/vncclient/include | grep "[.|-]js"); do
-		ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/vncclient/include/$j $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/novnc/novncjs/$j
-	done
-	# link novnc client font files
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/vncclient/include/Orbitron700.ttf $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/novnc/novncjs/Orbitron700.ttf
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/vncclient/include/Orbitron700.woff $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/novnc/novncjs/Orbitron700.woff
-	# link novnc client image files
-	for i in $(ls $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/vncclient/images); do
-		ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/vncclient/images/$i $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/novnc/img/$i
-	done
-	##### cloud
-	if [ -d $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web ]; then
-		mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/novncjs
-		for j in $(ls $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/vncclient/include | grep "[.|-]js"); do
-			ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/vncclient/include/$j $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/novncjs/$j
-		done
-		ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/vncclient/include/Orbitron700.ttf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/novncjs/Orbitron700.ttf
-		ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/vncclient/include/Orbitron700.woff $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/novncjs/Orbitron700.woff
-	fi
-	return 0
-}
-
-
-function openqrm_plugin_novnc_uninstall() {
-	echo "Uninstalling the openQRM novnc-plugin"
-	openqrm_plugin_novnc_stop
-	# remove bootservice
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-novnc.tgz
-	# unlinking the web dir
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/novnc
-	##### cloud
-	if [ -d $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/novncjs ]; then
-		rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/cloud/cloud-portal/web/novncjs
-	fi
-}
-
-
-case "$1" in
-	start)
-		openqrm_plugin_novnc_start
-		;;
-	stop)
-		openqrm_plugin_novnc_stop
-		;;
-	restart)
-		openqrm_plugin_novnc_stop
-		sleep 1
-		openqrm_plugin_novnc_start
-		;;
-	init)
-		openqrm_plugin_novnc_init
-		;;
-	uninstall)
-		openqrm_plugin_novnc_uninstall
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall|createcert}"
-		exit 1
-
-esac
-exit $?
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/etc/init.d/openqrm-plugin-novnc.postinstall b/openQRM-5.3.50-CE/src/plugins/novnc/etc/init.d/openqrm-plugin-novnc.postinstall
deleted file mode 100644
index 6c8d923..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/etc/init.d/openqrm-plugin-novnc.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-novnc postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/etc/init.d/openqrm-plugin-novnc.preremove b/openQRM-5.3.50-CE/src/plugins/novnc/etc/init.d/openqrm-plugin-novnc.preremove
deleted file mode 100644
index 60e2100..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/etc/init.d/openqrm-plugin-novnc.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-novnc preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-novnc stop
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/etc/openqrm-plugin-novnc.conf b/openQRM-5.3.50-CE/src/plugins/novnc/etc/openqrm-plugin-novnc.conf
deleted file mode 100644
index e2a6a15..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/etc/openqrm-plugin-novnc.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# this is the openQRM-plugin-novnc info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openssl, screen, python3-openssl, openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openssl, screen, pyOpenSSL, openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openssl, screen, python-pyOpenSSL, openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="Integrates <a href='http://kanaka.github.com/noVNC/' target='_BLANK'>NoVNC</a> providing a remote web-console for Virtual Machines and Physical Systems."
-OPENQRM_PLUGIN_TYPE="management"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES=""
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/etc/openqrm-plugin-novnc.conf"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/httpdocs/novncsslcheck.html b/openQRM-5.3.50-CE/src/plugins/novnc/httpdocs/novncsslcheck.html
deleted file mode 100644
index 2316b46..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/httpdocs/novncsslcheck.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html>
-<head>
-<title>noVNC SSL check ...</title>
-</head>
-<body>
-SSL certificate check ok
-<script type="text/javascript">
-window.onload = function() {
-	self.focus();
-	if(opener) {
-		try {
-			window.opener.postMessage('Message from noVNC SSL check popup!', '*');
-		}
-		catch(e) {
-			try {
-				window.opener.postMessagePassthrough("Message from noVNC SSL check popup! " + new Date());
-			}
-			catch(e) {}
-		}
-	}
-	self.close();
-}
-</script>
-</body>
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/include/openqrm-plugin-novnc-functions b/openQRM-5.3.50-CE/src/plugins/novnc/include/openqrm-plugin-novnc-functions
deleted file mode 100644
index 8825032..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/include/openqrm-plugin-novnc-functions
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-# this is the functions file for the novnc-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	echo "ERROR: Please export OPENQRM_SERVER_BASE_DIR before sourcing $0"
-	exit 1
-fi
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/novnc/etc/openqrm-plugin-novnc.conf
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc-about.controller.class.php
deleted file mode 100644
index 49d5d62..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc-about.controller.class.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/**
- * novnc-about Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class novnc_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'novnc_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'novnc_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'novnc_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'novnc_about_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About NoVNC',
-		'label' => 'About NoVNC',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The NoVNC Plugin integrates <a href="http://kanaka.github.com/noVNC/" target="_BLANK">NoVNC</a> into openQRM.
-			It provides a remote console login to the openQRM Server and the managed Systems through the Web Interface.
-			No manual configuration is needed.',
-
-		'requirements_title' => 'Requirements',
-		'requirements_list' => '<li>none</li>',
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-		'provides_title' => 'Provides',
-		'provides_list' => '<li>NoVNC Login through the openQRM Web Interface</li>',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Management',
-		'documentation_title' => 'Documentation',
-		'use_case_title' => 'Use-Case',
-	),
-	'usage' => array (
-		'tab' => 'About NoVNC',
-		'label' => 'NoVNC Use-Cases',
-	),
-
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/novnc/lang", 'novnc-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/novnc/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "documentation";
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-			case 'bootservice':
-				$content[] = $this->bootservice(true);
-			break;
-			case 'vms':
-				$content[] = $this->vms(true);
-			break;
-			case 'usage':
-				$content[] = $this->usage(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About NoVNC
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/novnc/class/novnc-about.documentation.class.php');
-			$controller = new novnc_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Boot-Service
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function bootservice( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/novnc/class/novnc-about.bootservice.class.php');
-			$controller = new novnc_about_bootservice($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['bootservice'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['bootservice']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'bootservice' );
-		$content['onclick'] = false;
-		if($this->action === 'bootservice'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-
-	//--------------------------------------------
-	/**
-	 * About NoVNC VM management
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function vms( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/novnc/class/novnc-about.vms.class.php');
-			$controller = new novnc_about_vms($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['vms'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['vms']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'vms' );
-		$content['onclick'] = false;
-		if($this->action === 'vms'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-	//--------------------------------------------
-	/**
-	 * About NoVNC Use-Cases
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function usage( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/novnc/class/novnc-about.usage.class.php');
-			$controller = new novnc_about_usage($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['usage'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['usage']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'usage' );
-		$content['onclick'] = false;
-		if($this->action === 'usage'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc-about.documentation.class.php
deleted file mode 100644
index e53d688..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc-about.documentation.class.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * novnc-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class novnc_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'novnc_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "novnc_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-		$this->basedir    = $this->openqrm->get('basedir');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/novnc-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['provides_title'], 'provides_title');
-		$t->add($this->lang['provides_list'], 'provides_list');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc.api.class.php b/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc.api.class.php
deleted file mode 100644
index 11a80a4..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc.api.class.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * novnc Api
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-class novnc_api
-{
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param object $controller
-	 */
-	//--------------------------------------------
-	function __construct($controller) {
-		$this->controller = $controller;
-		$this->user       = $this->controller->user;
-		$this->html       = $this->controller->response->html;
-		$this->response   = $this->html->response();
-		$this->file       = $this->controller->file;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function action() {
-		$action = $this->response->html->request()->get($this->controller->actions_name);
-		switch( $action ) {
-			case 'console':
-				$this->console();
-			break;
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Console
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function console() {
-		$_REQUEST[$this->controller->actions_name] = 'console';
-		$role  = $this->controller->openqrm->role($this->response);
-		$controller = $role->check_permission($this->controller);
-
-		if(is_object($controller)) {
-			$data = $controller->get_string();
-		} else {
-			$data = $controller;
-		}
-
-		$css = $this->file->get_contents($this->controller->openqrm->get('basedir').'/plugins/novnc/web/css/novnc.css');
-		$css = str_replace('../novncjs/Orbitron700.woff', $this->controller->jsurl.'Orbitron700.woff', $css);
-		$css = str_replace('../novncjs/Orbitron700.ttf', $this->controller->jsurl.'Orbitron700.ttf', $css);
-		echo '<!DOCTYPE html>';
-		echo '<html>';
-		echo '<head>';
-		echo '<title>openQRM Server</title>';
-		echo '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
-		echo '<style type="text/css">'.$css.'</style>';
-		echo '<style type="text/css">';
-		echo 'html { font-family: Arial,sans-serif; font-size: 13px;}';
-		echo 'body { margin: 0; padding: 0; }';
-		echo '.novncpage { margin: 0; }';
-		echo ' #detachbutton { display: none; }';
-		echo '</style>';
-		echo '</head>';
-		echo '<body>';
-		echo $data;
-		echo '</body>';
-		echo '</html>';
-	}
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc.console.class.php b/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc.console.class.php
deleted file mode 100644
index 0e11f31..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc.console.class.php
+++ /dev/null
@@ -1,477 +0,0 @@
-<?php
-/**
- * novnc Console
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-
-class novnc_console
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'novnc_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'novnc_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'novnc_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'novnc_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-/**
-* url for images
-* @access public
-* @var string
-*/
-var $imgurl = '/openqrm/base/plugins/novnc/img/';
-/**
-* url for js
-* @access public
-* @var string
-*/
-var $jsurl = '/openqrm/base/plugins/novnc/novncjs/';
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file                     = $openqrm->file();
-		$this->openqrm                  = $openqrm;
-		$this->user                     = $openqrm->user();
-		if($this->response->html->request()->get('appliance_id') !== '') {
-			$this->appliance_id = $this->response->html->request()->get('appliance_id');
-		}
-		else if($this->response->html->request()->get('resource_id') !== '') {
-			$this->resource_id = $this->response->html->request()->get('resource_id');
-		}
-		if($this->response->html->request()->get('vncport') !== '') {
-			$this->vncport = $this->response->html->request()->get('vncport');
-		}
-		if($this->response->html->request()->get('vnchost') !== '') {
-			$this->vnchost = $this->response->html->request()->get('vnchost');
-		}
-		$this->response->add('appliance_id', $this->response->html->request()->get('appliance_id'));
-		$this->response->add('resource_id', $this->response->html->request()->get('resource_id'));
-		$this->response->add('vncport', $this->response->html->request()->get('vncport'));
-		$this->response->add('vnchost', $this->response->html->request()->get('vnchost'));
-
-		$this->event = $this->openqrm->event();
-		$this->openqrm_server = $this->openqrm->server();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->console();
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Console
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function console() {
-		$response = '';
-		if(isset($this->appliance_id)) {
-			$appliance = $this->openqrm->appliance();
-			$appliance->get_instance_by_id($this->appliance_id);
-			$resource = $this->openqrm->resource();
-			$resource->get_instance_by_id($appliance->resources);
-		} 
-		else if(isset($this->resource_id)) {
-			$resource = $this->openqrm->resource();
-			$resource->get_instance_by_id($this->resource_id);
-		}
-
-		// handle missing resource
-		if($resource->id !== '') {
-			$virtualization = $this->openqrm->virtualization();
-			$virtualization->get_instance_by_id($resource->vtype);
-			$vtype = $virtualization->get_plugin_name();
-			if ($resource->vname == '') {
-				$vm_name = $resource->hostname;
-			} else {
-				$vm_name = $resource->vname;
-			}
-			// vnc port set via request?
-			if(isset($this->vncport)) {
-				$vncport = $this->vncport;
-			} else {
-				$vncport = $this->__vmlist($resource->id, $vm_name, $vtype);
-			}
-			// host as parameter ?
-			if(isset($this->vnchost)) {
-				$vncserverip = $this->vnchost;
-			} else {
-				$vncserver = $this->openqrm->resource();
-				$vncserver->get_instance_by_id($resource->vhostid);
-				$vncserverip = $vncserver->ip;
-			}
-			// check if vncport is an array, if yes it contains server:port infos
-			if (is_array($vncport)) {
-				$vncserverip = $vncport['vncserverip'];
-				$vncport = $vncport['vncport'];
-			}
-			// check if vncport already contains server:port infos
-			$colon = strpos($vncport, ':');
-			if ($colon !== false) {
-				$vnc_info_arr = explode(":", $vncport);
-				$vncserverip = $vnc_info_arr[0];
-				$vncport = $vnc_info_arr[1];
-			}
-			if(($vncport !== '') && ($vncserverip != '')) {
-				// get array position of $resource->id as webproxy port
-				$list = $resource->get_list();
-				$proxyport = ''; 
-				foreach($list as $key => $value) {
-					if(isset($value['resource_id']) && $value['resource_id'] == $resource->id) {
-						// set the port, avoid zero
-						$proxyport = $key+1; 
-						break;
-					}
-				}
-				$vnc = $this->__proxy($vncserverip, $vncport, $proxyport, $resource->mac, $vm_name);
-				$tpl = $this->openqrm->get('basedir').'/plugins/novnc/web/tpl/novnc-console.tpl.php';
-				$t = $this->response->html->template($tpl);
-				if(isset($this->appliance_id)) {
-					$t->add('api.php?action=plugin&plugin=novnc&controller=novnc&novnc_action=console&appliance_id='.$this->appliance_id , 'url');
-				}
-				else if(isset($this->resource_id)) {
-					$t->add('api.php?action=plugin&plugin=novnc&controller=novnc&novnc_action=console&resource_id='.$this->resource_id , 'url');
-				}
-				$t->add($this->imgurl,'imgurl');
-				$t->add($this->jsurl,'jsurl');
-				$t->add($this->lang['lang_detach'],'lang_detach');
-				$t->add($vnc['host'],'host');
-				$t->add($vnc['port'],'port');
-				$resourceinfo = $resource->hostname.' / '.$resource->ip;
-				if(isset($this->vncport)) {
-					$vp = $this->vncport + 5900;
-					$resourceinfo .= ':'.$vp;
-				}
-				$t->add('Resource: '.$resourceinfo,'resource');
-				$t->add($this->lang);
-			} else {
-				$t = $this->response->html->div();
-				$t->style = 'margin: 25px 0 0 15px;';
-				$t->add(sprintf($this->lang['error_no_port'], $resource->hostname));
-			}
-		} else {
-			$t = $this->response->html->box();
-			$t->style = 'margin: 25px 0 0 15px;';
-			$t->label = sprintf($this->lang['error_no_port'], '');
-			$t->add('');
-		}
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get VM list 
-	 *
-	 * @access private
-	 * @param string $id host id
-	 * @param string $vm vm name
-	 * @param string $vtype
-	 * @return string
-	 */
-	//--------------------------------------------
-	function __vmlist($id, $vm, $vtype) {
-		$port     = '';
-		$basedir  = $this->openqrm->get('basedir');
-		$vm_resource = $this->openqrm->resource();
-		$vm_resource->get_instance_by_id($id);
-		$resource = $this->openqrm->resource();
-		$resource->get_instance_by_id($vm_resource->vhostid);
-
-		switch ($vtype) {
-
-			case 'kvm':
-				if ($vm_resource->vnc != '') {
-					return $vm_resource->vnc;
-				}
-				$file = $basedir.'/plugins/'.$vtype.'/web/'.$vtype.'-stat/'.$resource->id.'.vm_list';
-				if($this->file->exists($file)) {
-					$this->file->remove($file);
-				}
-				$command  = $basedir.'/plugins/'.$vtype.'/bin/openqrm-'.$vtype.'-vm post_vm_list';
-				$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode regular';
-				$resource->send_command($resource->ip, $command);
-				while (!$this->file->exists($file)) // check if the data file has been modified
-				{
-					usleep(10000); // sleep 10ms to unload the CPU
-					clearstatcache();
-				}
-				if($this->file->exists($file)) {
-					$lines   = explode("\n", $this->file->get_contents($file));
-					foreach($lines as $line) {
-						if($line !== '') {
-							$line = explode('@', $line);
-							if($line[1] === $vm) {
-								$tmp  = explode(':',$line[5]);
-								$port = $tmp[1];
-								// update vnc in resource
-								if ($vm_resource->vnc == '') {
-									$resource_fields["resource_vnc"] = $port;
-									$resource_fields["resource_vname"] = $vm;
-									$vm_resource->update_info($id, $resource_fields);
-								}
-								break;
-							}
-						}
-					}
-				}
-				return $port;
-				break;
-
-			case 'vmware-esx':
-
-				// make sure vnc is enabled in the Hosts firewall
-				$command  = $this->openqrm->get('basedir')."/plugins/vmware-esx/bin/openqrm-vmware-esx-vm enable_vnc -i ".$resource->ip;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode background';
-				$this->openqrm_server->send_command($command, NULL, true);
-				sleep(5);
-
-				if ($vm_resource->vnc != '') {
-					return $vm_resource->vnc;
-				}
-				$file = $basedir.'/plugins/'.$vtype.'/web/'.$vtype.'-stat/'.$resource->ip.'.'.$vm.'.vm_config';
-				if($this->file->exists($file)) {
-					$this->file->remove($file);
-				}
-				$command  = $basedir.'/plugins/'.$vtype.'/bin/openqrm-'.$vtype.'-vm post_vm_config';
-				$command .= ' -i '.$resource->ip.' -n '.$vm;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode regular';
-				$this->openqrm_server->send_command($command, NULL, true);
-				while (!$this->file->exists($file)) // check if the data file has been modified
-				{
-					usleep(10000); // sleep 10ms to unload the CPU
-					clearstatcache();
-				}
-				if($this->file->exists($file)) {
-					$data = openqrm_parse_conf($file);
-					if (!isset($data['OPENQRM_VMWARE_ESX_VM_VNC_PORT'])) {
-						return;
-					}
-					$tport = $data['OPENQRM_VMWARE_ESX_VM_VNC_PORT'];
-					if ($tport > 0) {
-						$tport = $tport - 5900;
-						// $this->event->log("console", $_SERVER['REQUEST_TIME'], 2, "novnc.console.class.php", "NoVNC FILE $file EXISTS port $tport !", "", "", 0, 0, 0);
-						// update vnc in resource
-						if ($vm_resource->vnc == '') {
-							$resource_fields["resource_vnc"] = $tport;
-							$resource_fields["resource_vname"] = $vm;
-							$vm_resource->update_info($id, $resource_fields);
-						}
-						return $tport;
-					} else {
-						return;
-					}
-				}
-				return;
-				break;
-
-				
-			case 'xen':
-				if ($vm_resource->vnc != '') {
-					return $vm_resource->vnc;
-				}
-				$file = $basedir.'/plugins/'.$vtype.'/web/'.$vtype.'-stat/'.$resource->id.'.'.$vm.'.vm_config';
-				if($this->file->exists($file)) {
-					$this->file->remove($file);
-				}
-				
-				$command  = $basedir.'/plugins/'.$vtype.'/bin/openqrm-'.$vtype.'-vm post_vm_config';
-				$command .= ' -n '.$vm;
-				$command .= ' -u '.$this->openqrm->admin()->name.' -p '.$this->openqrm->admin()->password;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode regular';
-				$resource->send_command($resource->ip, $command);
-				while (!$this->file->exists($file)) // check if the data file has been modified
-				{
-					usleep(10000); // sleep 10ms to unload the CPU
-					clearstatcache();
-				}
-				if($this->file->exists($file)) {
-					$data = openqrm_parse_conf($file);
-					if (!isset($data['OPENQRM_XEN_VM_VNC'])) {
-						return;
-					}
-					$tport = $data['OPENQRM_XEN_VM_VNC'];
-					if ($tport > 0) {
-						// $this->event->log("console", $_SERVER['REQUEST_TIME'], 2, "novnc.console.class.php", "NoVNC FILE $file EXISTS port $tport !", "", "", 0, 0, 0);
-						// update vnc in resource
-						if ($vm_resource->vnc == '') {
-							$resource_fields["resource_vnc"] = $tport;
-							$resource_fields["resource_vname"] = $vm;
-							$vm_resource->update_info($id, $resource_fields);
-						}
-						return $tport;
-					} else {
-						return;
-					}
-				}
-				break;
-				
-			case 'vmware-vsphere':
-				if ($vm_resource->vnc != '') {
-					return $vm_resource->vnc;
-				}
-				
-				$file = $basedir.'/plugins/'.$vtype.'/web/'.$vtype.'-stat/'.$resource->ip.'.'.$vm.'.vm_config';
-				if($this->file->exists($file)) {
-					$this->file->remove($file);
-				}
-				$command  = $basedir.'/plugins/'.$vtype.'/bin/openqrm-'.$vtype.'-vm post_vm_config';
-				$command .= ' -i '.$resource->ip.' -n '.$vm;
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode regular';
-				$this->openqrm_server->send_command($command, NULL, true);
-				while (!$this->file->exists($file)) // check if the data file has been modified
-				{
-					usleep(10000); // sleep 10ms to unload the CPU
-					clearstatcache();
-				}
-				$vm_configuration = array();
-				if($this->file->exists($file)) {
-					$lines = explode("\n", file_get_contents($file));
-					if(count($lines) >= 1) {
-						foreach($lines as $line) {
-							if($line !== '') {
-								$vm_configuration = $this->openqrm->string_to_array($line, '|', '=');
-								$vnc_arr = array();
-								$vncport = $vm_configuration['vncport'] - 5900;
-								$vnc_arr['vncport'] = $vncport;
-								$vnc_arr['vncserverip'] = $vm_configuration['hostip'];
-								// update vnc in resource
-								if ($vm_resource->vnc == '') {
-									$resource_fields["resource_vnc"] = $vm_configuration['hostip'].":".$vncport;
-									$vm_resource->update_info($id, $resource_fields);
-								}
-								return $vnc_arr;
-							}
-						}
-					}
-				}
-				return;
-				break;
-
-			case 'amazon':
-				if ($vm_resource->vnc != '') {
-					return $vm_resource->vnc;
-				} else {
-					$resource_fields["resource_vnc"] = $vm_resource->ip.":5900";
-					$vm_resource->update_info($id, $resource_fields);
-					return $vm_resource->ip.":5900";
-				}
-				break;
-				
-				
-			default:
-				$this->event->log("console", $_SERVER['REQUEST_TIME'], 2, "novnc.console.class.php", "NoVNC console for VM type ".$vtype." is not yet supported!", "", "", 0, 0, 0);
-				break;
-
-		}
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Start the proxy
-	 *
-	 * @access private
-	 * @param string $vnchostip
-	 * @param string $vncport
-	 * @param string $proxy_port
-	 * @param string $vm_mac
-	 * @param string $resource_name
-	 * @return array
-	 */
-	//--------------------------------------------
-	function __proxy($vnchostip, $vncport, $proxy_port, $vm_mac, $resource_name) {
-		//$OPENQRM_SERVER_IP_ADDRESS = $this->openqrm_server->get_ip_address();
-		$OPENQRM_SERVER_IP_ADDRESS = $_SERVER["SERVER_NAME"];
-		$novnc_web_port_range_start = 6000;
-		$novnc_proxy_port_range_start = 6800;
-		// start the novnc proxy
-		$command  = $this->openqrm->get('basedir')."/plugins/novnc/bin/openqrm-novnc-manager remoteconsole";
-		$command .= " -n ".$resource_name;
-		$command .= " -d ".$proxy_port;
-		$command .= " -m ".$vm_mac;
-		$command .= " -i ".$vnchostip;
-		$command .= " -v ".$vncport;
-		$command .= ' --openqrm-ui-user '.$this->user->name;
-		$command .= ' --openqrm-cmd-mode regular';
-
-		$this->openqrm_server->send_command($command, NULL, true);
-		// calcualte the web + proxy port
-		$novnc_web_port = $novnc_web_port_range_start + $proxy_port;
-		$novnc_proxy_port = $novnc_proxy_port_range_start + $proxy_port;
-		return array('port' => $novnc_web_port, 'host' => $OPENQRM_SERVER_IP_ADDRESS);
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc.controller.class.php b/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc.controller.class.php
deleted file mode 100644
index 41079bb..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc.controller.class.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-/**
- * noVNC Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class novnc_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'novnc_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "novnc_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'novnc_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'novnc_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'login' => array (
-		'tab' => 'NoVNC Login',
-		'label' => 'NoVNC Login to %s',
-		'login_msg' => 'Login to appliance %s',
-		'form_port' => 'VNC Port',
-		'info' => 'openQRM could not determine the VNC port to set up the proxy. Please type in the 2 last bits of the port e.g. 01, 10 or 45 and submit the form.',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'console' => array (
-		'lang_Ctrl-Alt-Del' => 'Send Ctrl-Alt-Del',
-		'lang_clipboard' => 'Clipboard',
-		'lang_settings' => 'Settings',
-		'lang_connect' => 'Connect',
-		'lang_disconnect' => 'Disconnect',
-		'lang_host' => 'Host',
-		'lang_port' => 'Port',
-		'lang_password' => 'Password',
-		'lang_encrypt' => 'Encrypt',
-		'lang_true_color' => 'True Color',
-		'lang_local_cursor' => 'Local Cursor',
-		'lang_clip' => 'Clip to Window',
-		'lang_shared_mode' => 'Shared Mode',
-		'lang_view_only' => 'View Only',
-		'lang_timeout' => 'Connect Timeout (s)',
-		'lang_apply' => 'Apply',
-		'lang_clear' => 'Clear',
-		'lang_error_js_disabled' => 'Error: Javascript is disabled',
-		'lang_ssl_check' => 'Checking SSL certificate ..',
-		'lang_detach' => 'Detach window',
-		'error_no_port' => 'Error: Could not determain vnc port for Resource %s',
-		'please_wait' => 'Loading'
-	),
-
-);
-/**
-* url for images
-* @access public
-* @var string
-*/
-var $imgurl = '/openqrm/base/plugins/novnc/img/';
-/**
-* url for js
-* @access public
-* @var string
-*/
-var $jsurl = '/openqrm/base/plugins/novnc/novncjs/';
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->basedir  = $this->openqrm->get('basedir');
-		$this->tpldir   = $this->rootdir.'/plugins/novnc/tpl';
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/novnc/lang", 'novnc.ini');
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "login";
-		}
-
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'login':
-				$content[] = $this->login(true);
-			break;
-			case 'console':
-				$content[] = $this->console(true);
-			break;
-		}
-
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->basedir.'/plugins/novnc/web/class/novnc.api.class.php');
-		$controller = new novnc_api($this);
-		$controller->action();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Login appliance (resource)
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function login( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->basedir.'/plugins/novnc/web/class/novnc.login.class.php');
-			$controller = new novnc_login($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$controller->lang            = $this->lang['login'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['login']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'login' );
-		$content['onclick'] = false;
-		if($this->action === 'login'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Open Console
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function console( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->basedir.'/plugins/novnc/web/class/novnc.console.class.php');
-			$controller = new novnc_console($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$controller->imgurl          = $this->imgurl;
-			$controller->jsurl           = $this->jsurl;
-			$controller->lang            = $this->lang['console'];
-			$data = $controller->action();
-		}
-		$content['label']   = 'noVNC';
-		$content['value']   = $data;
-		if($data instanceof htmlobject_template || $data instanceof htmlobject_box) {
-			$content['hidden']  = true;
-		}
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'console' );
-		$content['onclick'] = false;
-		if($this->action === 'console'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc.login.class.php b/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc.login.class.php
deleted file mode 100644
index 87e6af3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/web/class/novnc.login.class.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/**
- * novnc Select
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class novnc_login
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'novnc_action';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'novnc_identifier';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "novnc_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'novnc_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-		$this->user     = $openqrm->user();
-		$this->basedir  = $this->openqrm->get('basedir');
-		$this->webdir   = $this->openqrm->get('webdir');
-		$this->appliance_id = $this->response->html->request()->get('appliance_id');
-		$this->response->add('appliance_id', $this->appliance_id);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->login();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'console', $this->message_param, $response->msg).$response->parameters
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/novnc-login.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['info'], "info");
-		$t->add($response->form);
-		$t->add(sprintf($this->lang['label'], $response->appliance->name), 'label');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return array
-	 */
-	//--------------------------------------------
-	function login() {
-		
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			if(!$form->get_errors()) {
-				$port = $form->get_request('port');
-				$appliance = new appliance();
-				$resource = new resource();
-				$appliance->get_instance_by_id($this->appliance_id);
-				$resource->get_instance_by_id($appliance->resources);
-				$response->msg = sprintf($this->lang['login_msg'], $appliance->name);
-				$response->parameters = '&resource_id='.$resource->id.'&vncport='.$port;
-			}
-		}
-		return $response;
-	}
-
-	
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'login');
-		$appliance = $this->openqrm->appliance();
-		$appliance->get_instance_by_id($this->appliance_id);
-		$response->appliance = $appliance;
-		
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$d['port']['label']                         = $this->lang['form_port'];
-		$d['port']['required']                      = true;
-		$d['port']['object']['type']                = 'htmlobject_input';
-		$d['port']['object']['attrib']['name']      = 'port';
-		$d['port']['object']['attrib']['size']      = 5;
-		$d['port']['object']['attrib']['maxlength'] = 2;
-		$d['port']['object']['attrib']['minlength'] = 2;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-	
-	
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/css/novnc.css b/openQRM-5.3.50-CE/src/plugins/novnc/web/css/novnc.css
deleted file mode 100644
index f5a5400..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/web/css/novnc.css
+++ /dev/null
@@ -1,426 +0,0 @@
-.novncpage {
-	margin: 0 0 0 -14px;
-}
-.novncpage .noscript {
-	width: 250px;
-	position: absolute;
-	top: 40px;
-	left: 0;
-	background: #FFFFDF;
-	text-align: center;
-}
-.novncpage input[type=image] {
-	width: 16px;
-	height: 16px;
-}
-
-#noVNC_login .htmlobject_box .left {
-	width: 80px;
-}
-#noVNC_login .htmlobject_box .right input {
-	width: 40px;
-}
-
-#resourceInfo {
-	position: absolute;
-	top: 10px;
-	left: 5px;
-	background: transparent;
-}
-#noVNC_controls td {
-	margin: 0px;
-	padding: 2px 0px 0px 0px;
-	vertical-align: top;
-}
-#noVNC_controls td input {
-	margin: 0px 0px 0px 15px;
-	padding: 2px;
-}
-#noVNC_controls td #noVNC_connect_button {
-	margin: 15px 2px 0px 0px;
-}
-#noVNC_controls td #noVNC_password {
-	vertical-align: middle;
-	height: auto;
-}
-#noVNC_settings input {
-	vertical-align: middle;
-	margin: 0 5px 0 0;
-}
-#noVNC_settings label {
-	margin: 0 0 0 0;
-}
-#noVNC_settings #noVNC_apply {
-	margin: 15px 2px 0px 0px;
-}
-
-#noVNC_host {
-  width:150px;
-}
-#noVNC_port {
-  width: 80px;
-}
-#noVNC_password {
-  width: 150px;
-}
-#noVNC_encrypt {
-}
-#noVNC_connectTimeout {
-  width: 30px;
-}
-#noVNC_path {
-  width: 100px;
-}
-#noVNC_connect_button {
-	width: 110px;
-	float:right;
-}
-#noVNC_view_drag_button {
-  display: none;
-}
-#sendCtrlAltDelButton {
-  display: none;
-}
-#noVNC_mobile_buttons {
-  display: none;
-}
-
-.noVNC-buttons-left {
-  float: left;
-  padding-left:10px;
-  padding-top:4px;
-}
-
-.noVNC-buttons-right {
-	position: absolute;
-	top: 0;
-	right: 10px;
-	padding-right:10px;
-	padding-top:4px;
-}
-
-#noVNC_status_bar {
-  display: block;
-  margin-top: 0px;
-  padding: 0px;
-}
-
-#noVNC_status_bar div {
-  font-size: 12px;
-  padding-top: 4px;
-  width:100%;
-}
-
-#noVNC_status {
-  height:20px;
-  text-align: center;
-	margin: 10px 0 0 0;
-}
-#noVNC_settings_menu {
-  margin: 3px;
-  text-align: left;
-}
-#noVNC_settings_menu ul {
-  list-style: none;
-  margin: 0px;
-  padding: 0px;
-}
-
-#noVNC_apply {
-  float:right;
-}
-
-.noVNC_status_normal {
-  background: #eee;
-}
-.noVNC_status_error {
-  background: #f44;
-}
-.noVNC_status_warn {
-  background: #ff4;
-}
-
-/* Do not set width/height for VNC_screen or VNC_canvas or incorrect
- * scaling will occur. Canvas resizes to remote VNC settings */
-#noVNC_screen_pad {
-  margin: 0px;
-  padding: 0px;
-  height: 33px;
-}
-#noVNC_screen {
-  text-align: center;
-  display: table;
-  width:100%;
-  height:100%;
-  background-color:#313131;
-  border-bottom-right-radius: 800px 600px;
-  /*border-top-left-radius: 800px 600px;*/
-}
-#noVNC_container {
-  margin: 0px;
-  padding: 0px;
-}
-#noVNC_canvas {
-  margin: 0px;
-  padding: 10px;
-  left: 0px;
-  background: black;
-}
-
-#VNC_clipboard_clear_button {
-  float:right;
-}
-#VNC_clipboard_text {
-  font-size: 11px;
-}
-
-#noVNC_clipboard_clear_button {
-  float:right;
-}
-
-/*Bubble contents divs*/
-#noVNC_settings {
-  display:none;
-  margin-top:42px;
-  right:10px;
-  position:absolute;
-}
-
-#noVNC_controls {
-  display:none;
-  margin-top:42px;
-  right:12px;
-  position:absolute;
-}
-#noVNC_controls.top:after  {
-  right:15px;
-}
-
-#noVNC_description {
-  display:none;
-  position:absolute;
-
-  margin-top:42px;
-  right:20px;
-  left:20px;
-  padding:15px;
-  color:#000;
-  background:#eee; /* default background for browsers without gradient support */
-
-  border:2px solid #E0E0E0;
-  -webkit-border-radius:10px;
-  -moz-border-radius:10px;
-  border-radius:10px;
-}
-
-#noVNC_clipboard {
-  display:none;
-  margin-top:42px;
-  right:30px;
-  position:absolute;
-}
-#noVNC_clipboard.top:after {
-  right:55px;
-}
-
-#keyboardinput {
-  width:1px;
-  height:1px;
-  background-color:#fff;
-  color:#fff;
-  border:0;
-  position: relative;
-  left: -40px;
-  z-index: -1;
-}
-
-.noVNC_status_warn {
-  background-color:yellow;
-}
-
-/*
- * Advanced Styling
- */
-
-/* Control bar */
-#noVNC-control-bar {
-  position:absolute;
-  background: #ddd; /* Old browsers */
-  display:block;
-  height:33px;
-  left:0 !important;
-  top:0 !important;
-  width:100%;
-  z-index:200;
-}
-
-.noVNC_status_button {
-  padding: 4px 4px;
-  vertical-align: middle;
-  border:1px solid #869dbc;
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
-  background: #b2bdcd; /* Old browsers */
-  background: -moz-linear-gradient(top, #b2bdcd 0%, #899cb3 49%, #7e93af 51%, #6e84a3 100%); /* FF3.6+ */
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#b2bdcd), color-stop(49%,#899cb3), color-stop(51%,#7e93af), color-stop(100%,#6e84a3)); /* Chrome,Safari4+ */
-  background: -webkit-linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* Chrome10+,Safari5.1+ */
-  background: -o-linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* Opera11.10+ */
-  background: -ms-linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* IE10+ */
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#b2bdcd', endColorstr='#6e84a3',GradientType=0 ); /* IE6-9 */
-  background: linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* W3C */
-  /*box-shadow:inset 0.4px 0.4px 0.4px #000000;*/
-}
-
-.noVNC_status_button_selected {
-  padding: 4px 4px;
-  vertical-align: middle;
-  border:1px solid #4366a9;
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  background: #779ced; /* Old browsers */
-  background: -moz-linear-gradient(top, #779ced 0%, #3970e0 49%, #2160dd 51%, #2463df 100%); /* FF3.6+ */
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#779ced), color-stop(49%,#3970e0), color-stop(51%,#2160dd), color-stop(100%,#2463df)); /* Chrome,Safari4+ */
-  background: -webkit-linear-gradient(top, #779ced 0%,#3970e0 49%,#2160dd 51%,#2463df 100%); /* Chrome10+,Safari5.1+ */
-  background: -o-linear-gradient(top, #779ced 0%,#3970e0 49%,#2160dd 51%,#2463df 100%); /* Opera11.10+ */
-  background: -ms-linear-gradient(top, #779ced 0%,#3970e0 49%,#2160dd 51%,#2463df 100%); /* IE10+ */
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#779ced', endColorstr='#2463df',GradientType=0 ); /* IE6-9 */
-  background: linear-gradient(top, #779ced 0%,#3970e0 49%,#2160dd 51%,#2463df 100%); /* W3C */
- /*box-shadow:inset 0.4px 0.4px 0.4px #000000;*/
-}
-
-
-/*Settings Bubble*/
-.triangle-right {
-  position:relative;
-  padding:15px;
-  margin:1em 0 3em;
-  color:#fff;
-  background:#fff; /* default background for browsers without gradient support */
-  /* css3 */
-  /*background:-webkit-gradient(linear, 0 0, 0 100%, from(#2e88c4), to(#075698));
-  background:-moz-linear-gradient(#2e88c4, #075698);
-  background:-o-linear-gradient(#2e88c4, #075698);
-  background:linear-gradient(#2e88c4, #075698);*/
-  -webkit-border-radius:10px;
-  -moz-border-radius:10px;
-  border-radius:10px;
-  color:#000;
-  border:2px solid #E0E0E0;
-}
-
-.triangle-right.top:after {
-  border-color: transparent #E0E0E0;
-  border-width: 20px 20px 0 0;
-  bottom: auto;
-  left: auto;
-  right: 50px;
-  top: -20px;
-}
-
-.triangle-right:after {
-  content:"";
-  position:absolute;
-  bottom:-20px; /* value = - border-top-width - border-bottom-width */
-  left:50px; /* controls horizontal position */
-  border-width:20px 0 0 20px; /* vary these values to change the angle of the vertex */
-  border-style:solid;
-  border-color:#E0E0E0 transparent;
-  /* reduce the damage in FF3.0 */
-  display:block;
-  width:0;
-}
-
-.triangle-right.top:after {
-  top:-42px; /* value = - border-top-width - border-bottom-width */
-  right:50px; /* controls horizontal position */
-  bottom:auto;
-  left:auto;
-  border-width:40px 40px 0 0; /* vary these values to change the angle of the vertex */
-  border-color:transparent #E0E0E0;
-}
-
-/*Default noVNC logo.*/
-/* From: http://fonts.googleapis.com/css?family=Orbitron:700 */
-@font-face {
-  font-family: 'Orbitron';
-  font-style: normal;
-  font-weight: 700;
-  src: local('?'), url('../novncjs/Orbitron700.woff') format('woff'),
-                   url('../novncjs/Orbitron700.ttf') format('truetype');
-}
-
-#noVNC_logo {
-  margin-top: 80px;
-  margin-bottom: 90px;
-  margin-left: 20px;
-  color:yellow;
-  text-align:left;
-  font-family: 'Orbitron', 'OrbitronTTF', sans-serif;
-  line-height:90%;
-  text-shadow:
-       5px 5px 0 #000,
-      -1px -1px 0 #000,
-       1px -1px 0 #000,
-      -1px 1px 0 #000,
-       1px 1px 0 #000;
-}
-
-
-#noVNC_logo span{
-  color:green;
-}
-
-/* ----------------------------------------
- * Media sizing
- * ----------------------------------------
- */
-
-
-.noVNC_status_button {
-  font-size: 12px;
-}
-
-#noVNC_clipboard_text {
-  width: 500px;
-}
-
-#noVNC_logo {
-  font-size: 180px;
-}
-
-@media screen and (min-width: 481px) and (max-width: 640px) {
-  .noVNC_status_button {
-    font-size: 10px;
-  }
-  #noVNC_clipboard_text {
-    width: 410px;
-  }
-  #noVNC_logo {
-    font-size: 150px;
-  }
-}
-
-@media screen and (min-width: 321px) and (max-width: 480px) {
-  .noVNC_status_button {
-    font-size: 10px;
-  }
-  #noVNC_clipboard_text {
-    width: 250px;
-  }
-  #noVNC_logo {
-    font-size: 110px;
-  }
-}
-
-@media screen and (max-width: 320px) {
-  .noVNC_status_button {
-    font-size: 9px;
-  }
-  #noVNC_clipboard_text {
-    width: 220px;
-  }
-  #noVNC_logo {
-    font-size: 90px;
-  }
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/img/glyphicons_349_fullscreen.png b/openQRM-5.3.50-CE/src/plugins/novnc/web/img/glyphicons_349_fullscreen.png
deleted file mode 100644
index 4cedb02..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/novnc/web/img/glyphicons_349_fullscreen.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/novnc/web/img/plugin.png
deleted file mode 100644
index 40f8920..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/novnc/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/lang/de.novnc-about.ini b/openQRM-5.3.50-CE/src/plugins/novnc/web/lang/de.novnc-about.ini
deleted file mode 100644
index 969492f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/web/lang/de.novnc-about.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-[documentation]
-tab = "Über NoVNC"
-label = "Über NoVNC"
-introduction_title = "Einleitung"
-introduction_content = "Das NoVNC-Plugin integriert <a href='http://kanaka.github.com/noVNC/' target='_blank'>NoVNC</a> und bietet einen 'remote Console' VNC-Zugang zu den von openQRM verwalteten Systemen über die Benutzeroberfläche. Manuelle Konfiguration ist nicht nötig."
-
-requirements_title = "Anforderungen"
-requirements_list = "keine"
-tested_title = "Getestet"
-tested_content = "Dieses Plugin ist getestet mit Debian, Ubuntu und CentOS."
-
-provides_title = "Bietet"
-provides_list = "VNC-Zugang eingebettet in die openQRM Web Benutzeroberfläche"
-
-type_title = "Plugin Typ"
-type_content = "Management"
-
-documentation_title = "Dokumentation"
-use_case_title = "Anwendungsfall"
-
-
-[usage]
-tab = "About NoVNC"
-label = "NoVNC-Anwendungsfälle"
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/lang/de.novnc.ini b/openQRM-5.3.50-CE/src/plugins/novnc/web/lang/de.novnc.ini
deleted file mode 100644
index 7a8867d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/web/lang/de.novnc.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[login]
-tab = "NoVNC Login"
-label = "NoVNC Login auf %s"
-form_port = "Port"
-info = "openQRM konnte den VNV Port zur Einstellung des Proxies nicht ermitteln. Bitte geben Sie die letzten 2 bit des Ports z.B. 01, 10 oder 45 ein, und senden Sie das Formular ab."
-login_msg = "Einloggen auf den Server %s"
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[console]
-lang_Ctrl-Alt-Del = "Sende Strg-Alt-Entf"
-lang_clipboard = "Zwischenablage"
-lang_settings = "Einstellungen"
-lang_connect = "Verbinden"
-lang_disconnect = "Trennen"
-lang_host = "Host"
-lang_port = "Port"
-lang_password = "Passwort"
-lang_encrypt = "Verschlüsseln"
-lang_true_color = "True Color"
-lang_local_cursor = "Lokaler Cursor"
-lang_clip = "An Fenster anpassen"
-lang_shared_mode = "Geteilte Verbindung"
-lang_view_only = "Nur Anzeigen"
-lang_timeout = "Verbindungs Timeout (s)"
-lang_apply = "Anwenden"
-lang_clear = "Clear"
-lang_error_js_disabled = "Fehler: Javascript ist abgestellt"
-lang_ssl_check = "Prüfe SSL Zertifikat .."
-lang_detach = "Neues Fenster"
-error_no_port = "Fehler: Vnc Port für Ressource %s konnte nicht ermittelt werden."
-please_wait = "Lade" 
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/lang/en.novnc-about.ini b/openQRM-5.3.50-CE/src/plugins/novnc/web/lang/en.novnc-about.ini
deleted file mode 100644
index 4c706d3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/web/lang/en.novnc-about.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[documentation]
-tab = "About NoVNC"
-label = "About NoVNC"
-introduction_title = "Introduction"
-introduction_content = "The NoVNC plugin integrates <a href='http://kanaka.github.com/noVNC/' target='_blank'>NoVNC</a> into openQRM. It provides a remote console login to the openQRM Server and the managed Systems through the Web Interface. No manual configuration is needed."
-
-requirements_title = "Requirements"
-requirements_list = "none"
-
-tested_title = "Tested with"
-tested_content = "This plugin is tested with the Debian, Ubuntu and CentOS distribution."
-
-provides_title = "Provides"
-provides_list = "NoVNC login through the openQRM web interface"
-
-type_title = "Plugin Type"
-type_content = "Management"
-
-documentation_title = "Documentation"
-
-use_case_title = "Use case"
-
-[usage]
-tab = "About NoVNC"
-label = "NoVNC use cases"
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/lang/en.novnc.ini b/openQRM-5.3.50-CE/src/plugins/novnc/web/lang/en.novnc.ini
deleted file mode 100644
index 20ebbbf..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/web/lang/en.novnc.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[login]
-tab = "NoVNC Login"
-label = "NoVNC Login to %s"
-login_msg = "Login to Server %s"
-form_port = "VNC Port"
-info = "openQRM could not determine the VNC port to set up the proxy. Please type in the 2 last bits of the port e.g. 01, 10 or 45 and submit the form."
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[console]
-lang_Ctrl-Alt-Del = "Send Ctrl-Alt-Del"
-lang_clipboard = "Clipboard"
-lang_settings = "Settings"
-lang_connect = "Connect"
-lang_disconnect = "Disconnect"
-lang_host = "Host"
-lang_port = "Port"
-lang_password = "Password"
-lang_encrypt = "Encrypt"
-lang_true_color = "True Color"
-lang_local_cursor = "Local Cursor"
-lang_clip = "Clip to Window"
-lang_shared_mode = "Shared Mode"
-lang_view_only = "View Only"
-lang_timeout = "Connect Timeout (s)"
-lang_apply = "Apply"
-lang_clear = "Clear"
-lang_error_js_disabled = "Error: Javascript is disabled"
-lang_ssl_check = "Checking SSL certificate .."
-lang_detach = "Detach window"
-error_no_port = "Error: Could not determain vnc port for Resource %s"
-please_wait = "Loading"
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/novnc/web/menu.txt
deleted file mode 100644
index 09361e8..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/web/menu.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|NoVNC|index.php?plugin=novnc&controller=novnc-about|How to use
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/openqrm-novnc-appliance-link-hook.php b/openQRM-5.3.50-CE/src/plugins/novnc/web/openqrm-novnc-appliance-link-hook.php
deleted file mode 100644
index 995b04e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/web/openqrm-novnc-appliance-link-hook.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-// error_reporting(E_ALL);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/htmlobjects/htmlobject.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-function get_novnc_appliance_link($appliance_id) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-
-	$p_appliance = new appliance();
-	$p_appliance->get_instance_by_id($appliance_id);
-	$p_resource = new resource();
-	$p_resource->get_instance_by_id($p_appliance->resources);
-	$virtualization = new virtualization();
-	$virtualization->get_instance_by_id($p_appliance->virtualization);
-
-	$html = new htmlobject($OPENQRM_SERVER_BASE_DIR.'/openqrm/web/base/class/htmlobjects');
-	$a = $html->a();
-	$a->label = 'noVNC';
-	$a->css = 'badge';
-	$a->handler = 'onclick="wait();"';
-
-	$plugin_link = '';
-	if (strstr($p_appliance->state, "active")) {
-		if(strstr($virtualization->type, '-vm-')) {
-			$a->href = '/openqrm/base/index.php?plugin=novnc&controller=novnc&novnc_action=console&appliance_id='.$p_appliance->id;
-		} else {
-			$a->href = '/openqrm/base/index.php?plugin=novnc&controller=novnc&novnc_action=login&appliance_id='.$p_appliance->id;
-		}
-		$plugin_link = $a;
-	}
-	else if ($p_resource->id === '0') {
-		$a->href = '/openqrm/base/index.php?plugin=novnc&controller=novnc&novnc_action=login&appliance_id='.$p_appliance->id;
-		$plugin_link = $a;
-	}
-	return $plugin_link;
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/openqrm-novnc-remote-console-hook.php b/openQRM-5.3.50-CE/src/plugins/novnc/web/openqrm-novnc-remote-console-hook.php
deleted file mode 100644
index 77b4ecf..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/web/openqrm-novnc-remote-console-hook.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-// error_reporting(E_ALL);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/htmlobjects/htmlobject.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-$event = new event();
-global $event;
-
-function openqrm_novnc_remote_console($resource_id, $vncport = NULL, $vnchost = NULL) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-
-	$add_param = '';
-	if (isset($vncport)) {
-		$add_param .=  "&vncport=$vncport";
-		
-	}
-	if (isset($vnchost)) {
-		$add_param .= "&vnchost=$vnchost";
-	}
-	
-	$html = new htmlobject($OPENQRM_SERVER_BASE_DIR.'/openqrm/web/base/class/htmlobjects');
-	$a = $html->a();
-	$a->label = 'noVNC';
-	$a->css = 'badge';
-	$a->href = '/openqrm/base/index.php?plugin=novnc&controller=novnc&novnc_action=console&resource_id='.$resource_id.$add_param;
-	$a->handler = 'onclick="wait();"';
-
-	return $a;
-}
-
-
-
-// this functions implements the stop action for the vnc remote console
-// deprecated - stop implemented via timeout
-function openqrm_novnc_disable_remote_console($vncserver, $vncport, $vm_res_id, $vm_mac, $resource_name) {
-	#global $event;
-	#global $OPENQRM_SERVER_BASE_DIR;
-	#// stop the novnc proxy
-	#$novnc_stop_command = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/novnc/bin/openqrm-novnc-manager disable-remoteconsole -n ".$resource_name." -d ".$vm_res_id." -m ".$vm_mac." -i ".$vncserver." -v ".$vncport;
-	#$output = shell_exec($novnc_stop_command);
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/tpl/novnc-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/novnc/web/tpl/novnc-about-documentation.tpl.php
deleted file mode 100644
index 9179dd7..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/web/tpl/novnc-about-documentation.tpl.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-
-	<div class="span7">
-
-		<h3>{introduction_title}</h3>
-		{introduction_content}
-
-		<h3>{provides_title}</h3>
-		{provides_list}
-
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-	</div>
-	
-	
-	<div class="span2 offset1">
-		<h3>{type_title}</h3>
-		<span class="pill">{type_content}</span>
-
-		<h3>{tested_title}</h3>
-		{tested_content}
-	</div>
-</div>
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/tpl/novnc-console.tpl.php b/openQRM-5.3.50-CE/src/plugins/novnc/web/tpl/novnc-console.tpl.php
deleted file mode 100644
index 58fc170..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/web/tpl/novnc-console.tpl.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<script>
-var INCLUDE_URI = '{jsurl}';
-function receiveMessage(event)
-{
-	window.setTimeout("dislayControls()", 100);
-}
-// IE postMessage callback
-function postMessagePassthrough(s){
-	window.setTimeout("dislayControls()", 100);
-}
-// delay the popup
-function pausecomp(ms) {
-	ms += new Date().getTime();
-	while (new Date() < ms){}
-}
-pausecomp(2000);
-// 
-if(window.location.protocol == 'https:') {
-	if(window.addEventListener) {
-		window.addEventListener("message", receiveMessage, false);
-	} 
-	else if(window.attachEvent) {
-		window.attachEvent('onmessage',receiveMessage);
-	}
-	var windowName = 'userConsole'; 
-	var popUp = window.open('https://{host}:{port}/novncsslcheck.html?__' + new Date(), windowName, 'width=600, height=600, left=24, top=24, scrollbars, resizable');
-	if (popUp == null || typeof(popUp)=='undefined') { 	
-		alert('Please disable your pop-up blocker and reload page.'); 
-	}
-} else {
-	window.onload = function() {
-		dislayControls();
-	}
-}
-function dislayControls()
-{
-	document.getElementById('sslcheck').style.display = 'none';
-}
-</script>
-
-<div class="novncpage" style="position:relative;">
-
-
-	<div id="noVNC-control-bar">
-		<div id="noVNC-menu-bar" style="display:none;">
-		</div>
-		<!--noVNC Mobile Device only Buttons-->
-		<div class="noVNC-buttons-left">
-			<input type="image" src="{imgurl}drag.png"
-				id="noVNC_view_drag_button" class="noVNC_status_button"
-				title="Move/Drag Viewport" alt="drag">
-			<div id="noVNC_mobile_buttons">
-				<input type="image" src="{imgurl}mouse_none.png"
-					id="noVNC_mouse_button0" class="noVNC_status_button" alt="mouse0">
-				<input type="image" src="{imgurl}mouse_left.png"
-					id="noVNC_mouse_button1" class="noVNC_status_button" alt="mouse1">
-				<input type="image" src="{imgurl}mouse_middle.png"
-					id="noVNC_mouse_button2" class="noVNC_status_button" alt="mouse2">
-				<input type="image" src="{imgurl}mouse_right.png"
-					id="noVNC_mouse_button4" class="noVNC_status_button" alt="keyboard">
-				<input type="image" src="{imgurl}keyboard.png"
-					id="showKeyboard" class="noVNC_status_button"
-					title="Show Keyboard" alt="keyboard">
-				<input type="text" autocapitalize="off" autocorrect="off"
-					id="keyboardinput" class="">
-				<div id="noVNC_extra_keys">
-					<input type="image" src="{imgurl}showextrakeys.png"
-						id="showExtraKeysButton"
-						class="noVNC_status_button" alt="keys">
-					<input type="image" src="{imgurl}ctrl.png"
-						id="toggleCtrlButton"
-						class="noVNC_status_button" alt="crtl">
-					<input type="image" src="{imgurl}alt.png"
-						id="toggleAltButton"
-						class="noVNC_status_button" alt="alt">
-					<input type="image" src="{imgurl}tab.png"
-						id="sendTabButton"
-						class="noVNC_status_button" alt="tab">
-					<input type="image" src="{imgurl}esc.png"
-						id="sendEscButton"
-						class="noVNC_status_button" alt="esc">
-				</div>
-			</div>
-		</div>
-
-		<div id="resourceInfo">{resource}</div>
-		<div id="noVNC_status">{please_wait}</div>
-
-		<!--noVNC Buttons-->
-		<div class="noVNC-buttons-right">
-			<input type="image" src="{imgurl}glyphicons_349_fullscreen.png"
-				 id="detachbutton" class="noVNC_status_button"
-				title="{lang_detach}" onclick="popUp();" alt="{lang_detach}" />
-			<input type="image" src="{imgurl}ctrlaltdel.png"
-				 id="sendCtrlAltDelButton" class="noVNC_status_button"
-				title="{lang_Ctrl-Alt-Del}" alt="{lang_Ctrl-Alt-Del}" />
-			<input type="image" src="{imgurl}clipboard.png"
-				id="clipboardButton" class="noVNC_status_button"
-				title="{lang_clipboard}" alt="{lang_clipboard}" />
-			<input type="image" src="{imgurl}settings.png"
-				id="settingsButton" class="noVNC_status_button"
-				title="{lang_settings}" alt="{lang_settings}" />
-			<input type="image" src="{imgurl}connect.png"
-				id="connectButton" class="noVNC_status_button"
-				title="{lang_connect}" alt="{lang_connect}" />
-			<input type="image" src="{imgurl}disconnect.png"
-				id="disconnectButton" class="noVNC_status_button"
-				title="{lang_disconnect}" alt="{lang_disconnect}" />
-		</div>
-
-		<!-- Description Panel -->
-		<!-- Shown by default when hosted at for kanaka.github.com -->
-		<div id="noVNC_description" style="display:none;" class="">
-			noVNC is a browser based VNC client implemented using HTML5 Canvas
-			and WebSockets. You will either need a VNC server with WebSockets
-			support (such as <a href="http://libvncserver.sourceforge.net/">libvncserver</a>)
-			or you will need to use
-			<a href="https://github.com/kanaka/websockify">websockify</a>
-			to bridge between your browser and VNC server. See the noVNC
-			<a href="https://github.com/kanaka/noVNC">README</a>
-			and <a href="http://kanaka.github.com/noVNC">website</a>
-			for more information.
-			<br />
-			<input id="descriptionButton" type="button" value="Close">
-		</div>
-
-		<!-- Clipboard Panel -->
-		<div id="noVNC_clipboard" class="triangle-right top">
-			<textarea id="noVNC_clipboard_text" rows=5>
-			</textarea>
-			<br />
-			<input id="noVNC_clipboard_clear_button" type="button"
-				value="{lang_clear}">
-		</div>
-
-		<!-- Settings Panel -->
-		<div id="noVNC_settings" class="triangle-right top">
-			<div id="noVNC_settings_menu">
-				<input id="noVNC_encrypt" type="hidden">
-				<label><input id="noVNC_true_color" type="checkbox"> {lang_true_color}</label>
-				<label><input id="noVNC_cursor" type="checkbox"> {lang_local_cursor}</label>
-				<label><input id="noVNC_clip" type="checkbox"> {lang_clip}</label>
-				<label><input id="noVNC_shared" type="checkbox"> {lang_shared_mode}</label>
-				<label><input id="noVNC_view_only" type="checkbox"> {lang_view_only}</label>
-				<label><input id="noVNC_connectTimeout" type="text"> {lang_timeout}</label>
-
-				<input id="noVNC_path" type="text" value="websockify" style="display: none;">
-				<input id="noVNC_repeaterID" type="text" value="" style="display: none;">
-				<select id="noVNC_stylesheet" name="vncStyle" style="display: none;">
-					<option value="default">default</option>
-				</select>
-				<select id="noVNC_logging" name="vncLogging" style="display: none;"></select>
-
-				<input type="button" id="noVNC_apply" value="{lang_apply}">
-			</div>
-		</div>
-
-		<!-- Connection Panel -->
-		<div id="noVNC_controls" class="triangle-right top" style="visibility:visible;">
-			<table>
-				<tr><td><label for="noVNC_host"><strong>{lang_host} </strong></label></td><td><input id="noVNC_host"></td></tr>
-				<tr><td><label for="noVNC_port"><strong>{lang_port} </strong></label></td><td><input id="noVNC_port"></td></tr>
-				<tr><td><label for="noVNC_password"><strong>{lang_password} </strong></label></td><td><input id="noVNC_password" type="password"></td></tr>
-				<tr><td>&#160;</td><td><input id="noVNC_connect_button" type="button" value="{lang_connect}"></td></tr>
-			</table>
-		</div>
-
-	</div> <!-- End of noVNC-control-bar -->
-
-	<noscript><div class="noscript">{lang_error_js_disabled}</div></noscript>
-
-	<div id="sslcheck" style="display:none;padding: 45px 0 5px 0;text-align: center;">{lang_ssl_check}</div>
-	<script>
-		if(window.location.protocol == 'https:') {
-			document.getElementById('sslcheck').style.display = 'block';
-		}
-	</script>
-
-	<div id="noVNC_screen" style="visibility:visible;">
-		<div id="noVNC_screen_pad"></div>
-		<h1 id="noVNC_logo"><span>no</span><br />VNC</h1>
-		<!-- HTML5 Canvas -->
-		<div id="noVNC_container">
-			<canvas id="noVNC_canvas" width="640" height="20">
-						Canvas not supported.
-			</canvas>
-		</div>
-	</div>
-
-	<div id="noVNC_popup_status_panel" class=""></div>
-
-	<script src="{jsurl}util.js"></script>
-	<script src="{jsurl}ui.js"></script>
-	<script>
-		window.onload = function() {
-			UI.updateSetting('host', '{host}');
-			UI.updateSetting('port', '{port}');
-			UI.updateSetting('connectTimeout', '20');
-		}
-	</script>
-
-
-	<script>
-		function popUp() {
-			path = "{url}";
-			noVncWindow = window.open(path, "noVnc_{port}", "titlebar=no, location=no, scrollbars=yes, width=800, height=500, left=50, top=50");
-			noVncWindow.focus();
-		}
-	</script>
-
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/novnc/web/tpl/novnc-login.tpl.php b/openQRM-5.3.50-CE/src/plugins/novnc/web/tpl/novnc-login.tpl.php
deleted file mode 100644
index d8668ef..0000000
--- a/openQRM-5.3.50-CE/src/plugins/novnc/web/tpl/novnc-login.tpl.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-
-<h2>{label}</h2>
-<div id="noVNC_login">
-	<form action="{thisfile}" method="POST">
-		{form}
-		<div class="span3">{info}</div>
-		<div style="line-height:0px;height:0px;clear:both;" class="floatbreaker">&#160;</div>
-		<div class="span3" style="margin-top: 10px;">{port}</div>
-		<div style="line-height:0px;height:0px;clear:both;" class="floatbreaker">&#160;</div>
-		<div id="buttons">{submit}</div>
-	</form>
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/openstack/Makefile b/openQRM-5.3.50-CE/src/plugins/openstack/Makefile
deleted file mode 100644
index 50d2d97..0000000
--- a/openQRM-5.3.50-CE/src/plugins/openstack/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/openstack/etc
-	cp etc/openqrm-plugin-openstack.conf /usr/share/openqrm/plugins/openstack/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/openstack/etc/openqrm-plugin-openstack.conf b/openQRM-5.3.50-CE/src/plugins/openstack/etc/openqrm-plugin-openstack.conf
deleted file mode 100644
index ab4b5e1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/openstack/etc/openqrm-plugin-openstack.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="OpenStack Cloud Integratiom - <a href='https://www.openstack.org/' target='_BLANK'>OpenStack Private Cloud</a>. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="cloud"
diff --git a/openQRM-5.3.50-CE/src/plugins/openvswitch-manager/Makefile b/openQRM-5.3.50-CE/src/plugins/openvswitch-manager/Makefile
deleted file mode 100644
index 657a56d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/openvswitch-manager/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/openvswitch-manager/etc
-	cp etc/openqrm-plugin-openvswitch-manager.conf /usr/share/openqrm/plugins/openvswitch-manager/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/openvswitch-manager/etc/openqrm-plugin-openvswitch-manager.conf b/openQRM-5.3.50-CE/src/plugins/openvswitch-manager/etc/openqrm-plugin-openvswitch-manager.conf
deleted file mode 100644
index 6b8291d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/openvswitch-manager/etc/openqrm-plugin-openvswitch-manager.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="An Openvswitch-manager to create and configure virtual network switches. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="network"
diff --git a/openQRM-5.3.50-CE/src/plugins/opsi/Makefile b/openQRM-5.3.50-CE/src/plugins/opsi/Makefile
deleted file mode 100644
index fce972b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/opsi/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/opsi/etc
-	cp etc/openqrm-plugin-opsi.conf /usr/share/openqrm/plugins/opsi/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/opsi/etc/openqrm-plugin-opsi.conf b/openQRM-5.3.50-CE/src/plugins/opsi/etc/openqrm-plugin-opsi.conf
deleted file mode 100644
index 5f3e6c7..0000000
--- a/openQRM-5.3.50-CE/src/plugins/opsi/etc/openqrm-plugin-opsi.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Integrates <a href='http://www.opsi.org' target='_BLANK'>Opsi</a> Install Server for automatic Windows deployments (local-deployment). <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="deployment"
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/Makefile b/openQRM-5.3.50-CE/src/plugins/puppet/Makefile
deleted file mode 100644
index 9b6eac2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# this is the openQRM puppet-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/puppet* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/default
-	. $(OPENQRM_SERVER_CONF) && cp -aR etc/default/* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/default/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/svn-hook
-	. $(OPENQRM_SERVER_CONF) && cp -aR etc/svn-hook/*.tmpl $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/svn-hook/
-	. $(OPENQRM_SERVER_CONF) && rm -rf `find $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/default/ -name .svn`
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/cron.d
-	. $(OPENQRM_SERVER_CONF) && cp -aR etc/cron.d/*.cron $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/cron.d/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/install/openstack
-	. $(OPENQRM_SERVER_CONF) && cp -aR etc/install/openstack/openstack* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/install/openstack/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/img
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && chmod 777 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/lang/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/bin
-	. $(OPENQRM_SERVER_CONF) && cp bin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/bin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/bin/openqrm*
-	. $(OPENQRM_SERVER_CONF) && tar -C $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet -czvf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/boot-service-puppet.tgz include/ bin/ etc/init.d/puppet
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/puppet
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/puppet/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/bin/openqrm-puppet-manager b/openQRM-5.3.50-CE/src/plugins/puppet/bin/openqrm-puppet-manager
deleted file mode 100644
index db54bb3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/bin/openqrm-puppet-manager
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/bash
-# this script automatically manages puppet
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/include/openqrm-plugin-puppet-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/openqrm-plugin-puppet.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-openqrm_server_get_config
-export resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-export LANG=C
-
-# let only root run this script
-WHOAMI=`whoami`
-if [ "$WHOAMI" != "root" ]; then
-	echo "ERROR: Please run this script as root!"
-	exit 6
-fi
-
-# the puppet plugin depends on dns working so it needs the dns plugin available+enabled
-# puppet autosigning needs a domain name. This we get from the dns-plugin config
-if [ ! -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/openqrm-plugin-dns.conf ]; then
-	openqrm_unblock_starting_queue $@
-	echo "ERROR: The openQRM puppet-plugin depends on the dns-plugin. Please enable the dns-plugin first!"
-	openqrm_post_event 0 "puppet-plugin" 3 "puppet-plugin" "The openQRM puppet-plugin depends on the dns-plugin. Please enable the dns-plugin first!"
-	exit 1
-fi
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/openqrm-plugin-dns.conf
-
-function puppet_manager_usage() {
-	echo "Usage : $0"
-	exit 1
-}
-
-PUPPETCA=`which puppetca`
-if [ "$PUPPETCA" == "" ]; then
-	PUPPETCA_CLEAN_CMD="puppet cert clean"
-else
-	PUPPETCA_CLEAN_CMD="$PUPPETCA --clean"
-fi
-
-
-FULL_COMMANDLINE="$0 $@"
-PUPPET_MANAGER_COMMAND=$1
-# main
-case "$PUPPET_MANAGER_COMMAND" in 
-	start)
-		APPLIANCE_ID=$2
-		APPLIANCE_NAME=$3
-		APPLIANCE_IP=$4
-		openqrm_post_event 0 "start" 5 "openqrm-puppet-manager" "Appliance $APPLIANCE_NAME id $APPLIANCE_ID starting with ip-address $APPLIANCE_IP."
-
-		LOCK_TIME=`openqrm_lock_queue aquire puppet`
-		trap "openqrm_lock_queue release puppet $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		$PUPPETCA_CLEAN_CMD $APPLIANCE_NAME.$OPENQRM_SERVER_DOMAIN 2>&1 | logger
-
-		openqrm_lock_queue release puppet $LOCK_TIME
-		trap '' EXIT
-		;;
-	stop)
-		APPLIANCE_ID=$2
-		APPLIANCE_NAME=$3
-		APPLIANCE_IP=$4
-		openqrm_post_event 0 "stop" 5 "openqrm-puppet-manager" "Appliance $APPLIANCE_NAME id $APPLIANCE_ID stopping with ip-address $APPLIANCE_IP."
-
-		LOCK_TIME=`openqrm_lock_queue aquire puppet`
-		trap "openqrm_lock_queue release puppet $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		$PUPPETCA_CLEAN_CMD $APPLIANCE_NAME.$OPENQRM_SERVER_DOMAIN 2>&1 | logger
-
-		openqrm_lock_queue release puppet $LOCK_TIME
-		trap '' EXIT
-		;;
-	auto_sign_false)
-		openqrm_post_event 0 "auto_sign_false" 5 "openqrm-puppet-manager" "Stopping automatic signing of puppet-ca's."
-
-		LOCK_TIME=`openqrm_lock_queue aquire puppet`
-		trap "openqrm_lock_queue release puppet $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		rm -f /etc/puppet/autosign.conf
-
-		openqrm_lock_queue release puppet $LOCK_TIME
-		trap '' EXIT
-		;;
-	auto_sign_true)
-		openqrm_post_event 0 "auto_sign_false" 5 "openqrm-puppet-manager" "Started automatic signing of puppet-ca's."
-
-		LOCK_TIME=`openqrm_lock_queue aquire puppet`
-		trap "openqrm_lock_queue release puppet $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		echo "*.$OPENQRM_SERVER_DOMAIN" > /etc/puppet/autosign.conf
-
-		openqrm_lock_queue release puppet $LOCK_TIME
-		trap '' EXIT
-		;;
-	*)
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		echo "ERROR: Free commandline arguments are not allowed!"
-		puppet_manager_usage
-		exit 6
-		;;
-esac
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/bin/openqrm-puppetm-config b/openQRM-5.3.50-CE/src/plugins/puppet/bin/openqrm-puppetm-config
deleted file mode 100644
index a5e2a0f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/bin/openqrm-puppetm-config
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-# this script gets activated via cron to sequentially check 
-# if there are new config updates in the svn repo
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-SVN_COMMIT_MESSAGE="Automatically updated through openQRM puppet plugin"
-CUR=`pwd`
-export LANGUAGE=C
-export LANG=C
-export LC_ALL=C
-
-PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-export PATH
-
-# here it commits any changes made through the web-interface
-cd $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/puppet/
-# remove deleted files
-for pfile in `find /etc/puppet/ | grep -v svn | grep -v autosign.conf | sed -e "s#/etc/puppet/##g"`; do 
-	if [ ! -f $pfile ] && [ ! -d $pfile ]; then
-		svn del $pfile | logger
-	fi
-
-done
-# add new files
-svn add `find | grep -v svn` | logger
-# commit
-svn commit -m "$SVN_COMMIT_MESSAGE" . | logger
-# update eventual changes from external
-svn update . | logger
-
-# here it updates the puppet configuration from the svn repo
-cd /etc/puppet
-CURRENT_REVISION=`svn up . | grep revision | awk {' print $3 '}`
-cd $CUR
-
-# check if we need to reload the puppetmaster
-if [ ! -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet-svn-version ]; then
-	LAST_REVISION=0
-else
-	LAST_REVISION=`cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet-svn-version`
-fi
-
-if [ "$CURRENT_REVISION" == "$LAST_REVISION" ]; then
-	echo "No changes in puppet-config repo" | logger
-else
-	# restart the puppetmasterd, we experienced that it is not robust refreshing its config
-	if [ -x "/etc/init.d/puppetmaster" ]; then
-		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-			invoke-rc.d puppetmaster stop 1>/dev/null 2>&1
-		else
-			/etc/init.d/puppetmaster stop 1>/dev/null 2>&1
-		fi
-		sleep 2
-	fi
-	kill `ps ax | grep puppetmaster | grep -v grep | awk {' print $1 '}` 2>/dev/null
-	kill `ps ax | grep "puppet master" | grep -v grep | awk {' print $1 '}` 2>/dev/null
-	sleep 2
-	kill -9 `ps ax | grep puppetmaster | grep -v grep | awk {' print $1 '}` 2>/dev/null
-	kill -9 `ps ax | grep "puppet master" | grep -v grep | awk {' print $1 '}` 2>/dev/null
-	if which puppetmasterd 1>/dev/null 2>&1; then
-		rm -f /var/run/puppet/puppetmasterd.pid
-		screen -dmS puppetmasterd puppetmasterd -v -d -l syslog
-	elif puppet help | grep master 1>/dev/null 2>&1; then
-		puppet master
-	else
-		echo "ERROR: Could not start Puppet master" | logger
-	fi
-	# update the revision file
-	echo "$CURRENT_REVISION" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet-svn-version
-fi
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/cron.d/openqrm-puppetm-config.cron b/openQRM-5.3.50-CE/src/plugins/puppet/etc/cron.d/openqrm-puppetm-config.cron
deleted file mode 100644
index acb4a20..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/cron.d/openqrm-puppetm-config.cron
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-MAILTO=""
-* * * * * root @@OPENQRM_SERVER_BASE_DIR@@/openqrm/plugins/puppet/bin/openqrm-puppetm-config
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/fileserver.conf b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/fileserver.conf
deleted file mode 100644
index 19cccda..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/fileserver.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file consists of arbitrarily named sections/modules
-# defining where files are served from and to whom
-
-# Define a section 'files'
-# Adapt the allow/deny settings to your needs. Order
-# for allow/deny does not matter, allow always takes precedence
-# over deny
-[files]
-  path /etc/puppet/files
-#  allow *.example.com
-#  deny *.evil.example.com
-#  allow 192.168.0.0/24
-
-[plugins]
-#  allow *.example.com
-#  deny *.evil.example.com
-#  allow 192.168.0.0/24
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/appliances/default.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/appliances/default.pp
deleted file mode 100644
index 261a92b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/appliances/default.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-# to make puppetmaster happy to include the appliance dir
-
-class appliance-default {
-			exec { "echo":
-				refreshonly => true,
-			}
-}
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/apache-server.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/apache-server.pp
deleted file mode 100644
index 74ba66f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/apache-server.pp
+++ /dev/null
@@ -1,85 +0,0 @@
-
-class apache-server {
-
-	case "$lsbdistid" {
-		Debian: {
-			package { "apache2": ensure => installed }
-			exec { "reload-apache2":
-				command => "/etc/init.d/apache2 reload",
-				refreshonly => true,
-			}
-			exec { "force-reload-apache2":
-				command => "/etc/init.d/apache2 force-reload",
-				refreshonly => true,
-			}
-			# We want to make sure that Apache2 is running.
-			service { "apache2":
-				ensure => running,
-				hasstatus => true,
-				hasrestart => true,
-				require => Package["apache2"],
-			}
-		}
-		Ubuntu: {
-			package { "apache2": ensure => installed }
-			exec { "reload-apache2":
-				command => "/etc/init.d/apache2 reload",
-				refreshonly => true,
-			}
-			exec { "force-reload-apache2":
-				command => "/etc/init.d/apache2 force-reload",
-				refreshonly => true,
-			}
-			# We want to make sure that Apache2 is running.
-			service { "apache2":
-				ensure => running,
-				hasstatus => true,
-				hasrestart => true,
-				require => Package["apache2"],
-			}
-		}
-		CentOS: {
-			package { "httpd": ensure => installed }
-			exec { "reload-httpd":
-				command => "/etc/init.d/httpd reload",
-				refreshonly => true,
-			}
-			exec { "force-reload-httpd":
-				command => "/etc/init.d/httpd force-reload",
-				refreshonly => true,
-			}
-			# We want to make sure that httpd is running.
-			service { "httpd":
-				ensure => running,
-				hasstatus => true,
-				hasrestart => true,
-				require => Package["httpd"],
-			}
-		}
-
-		Fedora: {
-			package { "httpd": ensure => installed }
-			exec { "reload-httpd":
-				command => "/etc/init.d/httpd reload",
-				refreshonly => true,
-			}
-			exec { "force-reload-httpd":
-				command => "/etc/init.d/httpd force-reload",
-				refreshonly => true,
-			}
-			# We want to make sure that httpd is running.
-			service { "httpd":
-				ensure => running,
-				hasstatus => true,
-				hasrestart => true,
-				require => Package["httpd"],
-			}
-		}
-
-
-
-
-
-	}
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/docker-container.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/docker-container.pp
deleted file mode 100644
index b60c6fe..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/docker-container.pp
+++ /dev/null
@@ -1,66 +0,0 @@
-
-class docker-container {
-
-	case "$lsbdistid" {
-		Debian: {
-			package { "docker.io": ensure => installed }
-			service { "docker.io":
-				ensure => running,
-				hasstatus => true,
-				hasrestart => true,
-				require => Package["docker.io"],
-			}
-			exec { "reload-dockerui":
-				command => "/usr/share/openqrm/plugins/docker/etc/init.d/docker restart",
-				refreshonly => true,
-			}
-
-		}
-		Ubuntu: {
-			package { "docker.io": ensure => installed }
-			service { "docker.io":
-				ensure => running,
-				hasstatus => true,
-				hasrestart => true,
-				require => Package["docker.io"],
-			}
-			exec { "reload-dockerui":
-				command => "/usr/share/openqrm/plugins/docker/etc/init.d/docker restart",
-				refreshonly => true,
-			}
-		}
-		CentOS: {
-			package { "docker": ensure => installed }
-			service { "docker":
-				ensure => running,
-				hasstatus => true,
-				hasrestart => true,
-				require => Package["docker"],
-			}
-			exec { "reload-dockerui":
-				command => "/usr/share/openqrm/plugins/docker/etc/init.d/docker restart",
-				refreshonly => true,
-			}
-		}
-
-		Fedora: {
-			package { "docker": ensure => installed }
-			service { "docker":
-				ensure => running,
-				hasstatus => true,
-				hasrestart => true,
-				require => Package["docker"],
-			}
-			exec { "reload-dockerui":
-				command => "/usr/share/openqrm/plugins/docker/etc/init.d/docker restart",
-				refreshonly => true,
-			}
-		}
-
-
-
-
-
-	}
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/mysql-client.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/mysql-client.pp
deleted file mode 100644
index 9fa3717..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/mysql-client.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-
-class mysql-client {
-	case "$lsbdistid" {
-		Debian: {
-			package { "mysql-client": ensure => installed }
-		}
-		Ubuntu: {
-			package { "mysql-client": ensure => installed }
-		}
-		CentOS: {
-			package { "mysql": ensure => installed }
-		}
-		Fedora: {
-			package { "mysql": ensure => installed }
-		}
-	}
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/mysql-server.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/mysql-server.pp
deleted file mode 100644
index 57132dc..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/mysql-server.pp
+++ /dev/null
@@ -1,41 +0,0 @@
-
-class mysql-server {
-
-	case "$lsbdistid" {
-		Debian: {
-			package { "mysql-server": ensure => installed }
-			package { "mysql-common": ensure => installed }
-			package { "mysql-client": ensure => installed }
-			service { mysql:
-				ensure    => running,
-				subscribe => [Package[mysql-server]],
-			}
-		}
-		Ubuntu: {
-			package { "mysql-server": ensure => installed }
-			package { "mysql-common": ensure => installed }
-			package { "mysql-client": ensure => installed }
-			service { mysql:
-				ensure    => running,
-				subscribe => [Package[mysql-server]],
-			}
-		}
-		CentOS: {
-			package { "mysql-server": ensure => installed }
-			package { "mysql": ensure => installed }
-			service { mysqld:
-				ensure    => running,
-				subscribe => [Package[mysql-server]],
-			}
-		}
-		Fedora: {
-			package { "mysql-server": ensure => installed }
-			package { "mysql": ensure => installed }
-			service { mysqld:
-				ensure    => running,
-				subscribe => [Package[mysql-server]],
-			}
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/openstack-all-in-one.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/openstack-all-in-one.pp
deleted file mode 100644
index 45eb831..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/openstack-all-in-one.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-# This is the OpenStack all-in-one recipe
-# It installs all OpenStack compontents on a single system
-# The following install configuration can be set through the
-# server capabilities field as space separated key=value pairs
-# HOST_IP
-# FLOATING_RANGE
-# FIXED_RANGE
-# FIXED_NETWORK_SIZE
-# FLAT_INTERFACE
-# ADMIN_PASSWORD
-# MYSQL_PASSWORD
-# RABBIT_PASSWORD
-# SERVICE_PASSWORD
-# SERVICE_TOKEN
-# e.g.
-# HOST_IP=192.168.88.135 FLOATING_RANGE=192.168.88.0/27 FIXED_RANGE=10.20.10.0/24 FLAT_INTERFACE=eth0 ADMIN_PASSWORD=openqrm MYSQL_PASSWORD=openqrm RABBIT_PASSWORD=openqrm SERVICE_PASSWORD=openqrm SERVICE_TOKEN=openqrm
-
-class openstack-all-in-one {
-	exec { "/usr/bin/wget -O /tmp/openstack-install http://openqrm/openqrm/boot-service/puppet/openstack-all-in-one && chmod +x /tmp/openstack-install && /tmp/openstack-install":
-		creates => "/opt/stack",
-	}
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/osupdate.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/osupdate.pp
deleted file mode 100644
index 00d5a45..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/osupdate.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-
-class osupdate {
-	case "$lsbdistid" {
-		Debian: {
-			exec { "/usr/bin/apt-get -y update":
-				refreshonly => true,
-			}
-		}
-		Ubuntu: {
-			exec { "/usr/bin/apt-get -y update":
-				refreshonly => true,
-			}
-		}
-		CentOS: {
-			exec { "/usr/bin/yum -y update":
-				refreshonly => true,
-			}
-		}
-		Fedora: {
-			exec { "/usr/bin/yum -y update":
-				refreshonly => true,
-			}
-		}
-
-
-
-
-	}
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/php.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/php.pp
deleted file mode 100644
index 903a1d1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/php.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-
-class php {
-	case "$lsbdistid" {
-		Debian: {
-			package { [ "php5", "php5-cli", "libapache2-mod-php5", "php5-mysql" ]: ensure => installed }
-		}
-		Ubuntu: {
-			package { [ "php5", "php5-cli", "libapache2-mod-php5", "php5-mysql" ]: ensure => installed }
-		}
-		CentOS: {
-			package { [ "php", "php-common", "mod_php", "php-cli", "php-mysql" ]: ensure => installed }
-		}
-		Fedora: {
-			package { [ "php", "php-common", "php-cli", "php-mysql" ]: ensure => installed }
-		}
-
-
-
-	}
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/server.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/server.pp
deleted file mode 100644
index f05854b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/server.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-
-class server {
-	include ssh-server
-	include osupdate
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/ssh-server.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/ssh-server.pp
deleted file mode 100644
index ef128a4..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/ssh-server.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-
-class ssh-server {
-	case "$lsbdistid" {
-		Debian: {
-			package { ssh: ensure => installed }
-			service { ssh:
-				ensure    => running,
-				subscribe => [Package[ssh]],
-			}
-		}
-		Ubuntu: {
-			package { ssh: ensure => installed }
-			service { ssh:
-				ensure    => running,
-				subscribe => [Package[ssh]],
-			}
-		}
-		CentOS: {
-			package { openssh-server: ensure => installed }
-			service { sshd:
-				ensure    => running,
-				subscribe => [Package[openssh-server]],
-			}
-		}
-		Fedora: {
-			package { openssh-server: ensure => installed }
-			service { sshd:
-				ensure    => running,
-				subscribe => [Package[openssh-server]],
-			}
-		}
-
-
-
-
-	}
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/webmin-server.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/webmin-server.pp
deleted file mode 100644
index 9a6d674..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/classes/webmin-server.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-
-class webmin-server {
-
-	case "$lsbdistid" {
-		Debian: {
-			package { "webmin": ensure => installed }
-			# We want to make sure that webmin is running.
-			service { "webmin":
-				ensure => running,
-				hasstatus => true,
-				hasrestart => true,
-				require => Package["webmin"],
-			}
-		}
-		Ubuntu: {
-			package { "webmin": ensure => installed }
-			# We want to make sure that webmin is running.
-			service { "webmin":
-				ensure => running,
-				hasstatus => true,
-				hasrestart => true,
-				require => Package["webmin"],
-			}
-		}
-		CentOS: {
-			exec { "/usr/bin/wget -O /tmp/webmin.rpm http://downloads.sourceforge.net/webadmin/webmin-1.450-1.noarch.rpm && /bin/rpm --import http://www.webmin.com/jcameron-key.asc && /usr/bin/yum -y localinstall /tmp/webmin.rpm && /bin/rm -f /tmp/webmin.rpm":
-				unless => "/bin/touch /etc/init.d/webmin && /etc/init.d/webmin status",
-			}		
-		}
-
-		Fedora: {
-			exec { "/usr/bin/wget -O /tmp/webmin.rpm http://downloads.sourceforge.net/webadmin/webmin-1.450-1.noarch.rpm && /bin/rpm --import http://www.webmin.com/jcameron-key.asc && /usr/bin/yum -y localinstall /tmp/webmin.rpm && /bin/rm -f /tmp/webmin.rpm":
-				unless => "/bin/touch /etc/init.d/webmin && /etc/init.d/webmin status",
-			}		
-		}
-
-
-
-
-
-	}
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/basic-server.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/basic-server.pp
deleted file mode 100644
index abfd361..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/basic-server.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-# A basic server profile
-
-class basic-server {
-	include server
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/database-server.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/database-server.pp
deleted file mode 100644
index d131fbb..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/database-server.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-# A data-base server configuration (Mysql)
-
-class database-server {
-	include server
-	include mysql-server
-}
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/docker.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/docker.pp
deleted file mode 100644
index 164c638..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/docker.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-# Docker Container
-
-class docker {
-	include docker-container
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/lamp.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/lamp.pp
deleted file mode 100644
index 7b99368..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/lamp.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-# A LAMP setup (Linux/Apache/Mysql/Php)
-
-class lamp {
-	include server
-	include apache-server
-	include php
-	include mysql-server
-}
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/openstack.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/openstack.pp
deleted file mode 100644
index c01b92c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/openstack.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# OpenStack private Cloud
-
-class openstack {
-	include openstack-all-in-one
-}
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/webmin.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/webmin.pp
deleted file mode 100644
index 33b6c00..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/webmin.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-# has webmin installed and running
-
-class webmin {
-	include server
-	include webmin-server
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/webserver.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/webserver.pp
deleted file mode 100644
index e282d66..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/groups/webserver.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-# A basic webserver profile (Apache)
-
-class webserver {
-	include server
-	include apache-server
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/site.pp b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/site.pp
deleted file mode 100644
index dd28cb6..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/manifests/site.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/puppet/manifests/site.pp
-
-import "classes/*.pp"
-import "groups/*.pp"
-import "appliances/*.pp"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/puppet.conf b/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/puppet.conf
deleted file mode 100644
index 01e92a1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/default/puppet.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[main]
-logdir=/var/log/puppet
-vardir=/var/lib/puppet
-ssldir=/var/lib/puppet/ssl
-rundir=/var/run/puppet
-factpath=$vardir/lib/facter
-pluginsync=true
-
-[puppetmasterd]
-templatedir=/var/lib/puppet/templates
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/init.d/openqrm-plugin-puppet b/openQRM-5.3.50-CE/src/plugins/puppet/etc/init.d/openqrm-plugin-puppet
deleted file mode 100644
index 8711c04..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/init.d/openqrm-plugin-puppet
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/bash
-# init script for the openQRM puppet-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/include/openqrm-plugin-puppet-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/openqrm-plugin-puppet.conf
-openqrm_server_get_config
-export resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-export LANG=C
-# define wget to use with https
-if [ "$OPENQRM_WEB_PROTOCOL" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-
-function openqrm_plugin_puppet_start() {
-	echo "Starting the openQRM puppet-plugin"
-	stop_puppet
-	stop_puppet_master
-	openqrm_chkconfig del puppet
-	openqrm_chkconfig del puppetmaster
-	start_puppet_master
-	start_puppet
-	# linking further install scripts
-	mkdir -p $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/puppet/
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/install/openstack/openstack-all-in-one $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/puppet/openstack-all-in-one
-
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/puppet/.running
-}
-
-
-function openqrm_plugin_puppet_stop() {
-	echo "Stopping the openQRM puppet-plugin"
-	stop_puppet
-	stop_puppet_master
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/puppet/.running
-}
-
-function openqrm_plugin_puppet_uninstall() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "puppet: Please give a username to uninstall the plugin : "
-		read USERNAME
-		echo
-		echo -n "puppet: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Uninstalling the openQRM puppet-plugin"
-	openqrm_plugin_puppet_stop
-
-	# remove from cron
-	rm -f /etc/cron.d/openqrm-puppetm-config
-	if [ -x "/etc/init.d/cron" ]; then
-		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-			invoke-rc.d cron reload
-		else
-			/etc/init.d/cron reload
-		fi
-	elif [ -x /etc/init.d/crond ]; then
-		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-			invoke-rc.d crond reload
-		else
-			/etc/init.d/crond reload
-		fi
-	else
-		echo "Could not find cron init script in /etc/init.d/. Please reload cron manually!"
-	fi
-
-	# removing the puppet tables
-	if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$USERNAME --http-password=$PASSWORD "$OPENQRM_WEB_PROTOCOL://$resource_openqrmserver/openqrm/base/plugins/puppet/puppet-action.php?puppet_command=uninstall"; then
-		puppet_manager_log uninstall "ERROR: Could not drop the puppet-plugin tables in the database!"
-		return 1
-	fi
-	# restore orgigin puppet dir
-	if [ -d /etc/puppet.openqrm-puppet-plugin.bak ]; then
-		rm -rf /etc/puppet
-		cp -aR /etc/puppet.openqrm-puppet-plugin.bak /etc/puppet
-	fi
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/puppet
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-puppet.tgz
-	rm -rf $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/puppet
-	rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet
-}
-
-function openqrm_plugin_puppet_init() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "puppet: Please give a username to init the plugin : "
-		read USERNAME
-		echo
-		echo -n "puppet: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-
-	# the puppet plugin depends on dns working so it needs the dns plugin available+enabled
-	# puppet autosigning needs a domain name. This we get from the dns-plugin config
-	if [ ! -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/openqrm-plugin-dns.conf ]; then
-		echo "ERROR: The openQRM puppet-plugin depends on the dns-plugin. Please enable the dns-plugin first!"
-		openqrm_post_event 0 "puppet-plugin" 3 "puppet-plugin" "The openQRM puppet-plugin depends on the dns-plugin. Please enable the dns-plugin first!"
-		return 1
-	fi
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/dns/etc/openqrm-plugin-dns.conf
-
-	CURRENTD=`pwd`
-	echo "Initializing the openQRM puppet-plugin"
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/puppet
-	# link the boot-service
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/boot-service-puppet.tgz $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-puppet.tgz
-	# linking further install scripts
-	mkdir -p $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/puppet/
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/install/openstack/openstack-all-in-one $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/puppet/openstack-all-in-one
-
-	# creating the tables
-	if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$USERNAME --http-password=$PASSWORD "$OPENQRM_WEB_PROTOCOL://$resource_openqrmserver/openqrm/base/plugins/puppet/puppet-action.php?puppet_command=init&puppet_domain=$OPENQRM_SERVER_DOMAIN"; then
-		puppet_manager_log init "ERROR: Could not create the puppet-plugin tables in the database!"
-		return 1
-	fi
-
-	# creating the svn dir at /etc/puppet to store the puppet configuration
-	# backup orgigin puppet dir first
-	if [ ! -d /etc/puppet.openqrm-puppet-plugin.bak ]; then
-		mv /etc/puppet /etc/puppet.openqrm-puppet-plugin.bak
-	fi
-	# create the svn dir
-	rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/default/files
-	svnadmin create $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet
-	svn import -q $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/default/ file://$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet/ -m "initial import"
-	# and import to /etc/puppet
-	rm -rf /etc/puppet/*
-	rm -rf /etc/puppet/.svn
-	mkdir -p /etc/puppet
-	cd /etc/puppet
-	svn co -q file://$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet/ .
-	# also co the files for the web-dir
-	rm -rf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/puppet/
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/puppet/
-	cd $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/puppet/
-	svn co -q file://$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet/ .
-	chmod -R 777 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/web/puppet/
-	# setup access through ssh+svn
-	rm -f $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet/conf/svnserve.conf
-	echo "[general]" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet/conf/svnserve.conf
-	echo "anon-access = read" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet/conf/svnserve.conf
-	echo "auth-access = write" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet/conf/svnserve.conf
-	echo "realm = openQRM Puppet configuration" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet/conf/svnserve.conf
-	echo "password-db = passwd" >> $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet/conf/svnserve.conf
-	chmod -R 777 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet/db
-	cd $CURRENTD
-	# configure autosigning
-	echo "*.$OPENQRM_SERVER_DOMAIN" > /etc/puppet/autosign.conf
-	# create cron job which will update the svn repo with files which were added by the web gui
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/cron.d/openqrm-puppetm-config.cron | \
-		sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" > /etc/cron.d/openqrm-puppetm-config
-	if [ -x "/etc/init.d/cron" ]; then
-		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-			invoke-rc.d cron reload
-		else
-			/etc/init.d/cron reload
-		fi
-	elif [ -x /etc/init.d/crond ]; then
-		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-			invoke-rc.d crond reload
-		else
-			/etc/init.d/crond reload
-		fi
-	else
-		echo "Could not find cron init script in /etc/init.d/. Please reload cron manually!"
-	fi
-	# create svn post-commit hook to immediately update the puppet configuration
-	cat $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/svn-hook/post-commit.tmpl | \
-		sed -e "s#@@OPENQRM_SERVER_BASE_DIR@@#$OPENQRM_SERVER_BASE_DIR#g" > $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet/hooks/post-commit
-	chmod 755 $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/etc/puppet/hooks/post-commit
-
-	# eventually clean up old ssl dir before starting
-	rm -rf /var/lib/puppet/ssl/*
-	rm -rf /var/lib/puppet/yaml/node/*
-	rm -rf /var/lib/puppet/yaml/facts/*
-
-}
-
-
-
-
-
-
-
-USER=$2
-PASS=$3
-
-case "$1" in
-	start)
-		openqrm_plugin_puppet_start
-		;;
-	stop)
-		openqrm_plugin_puppet_stop
-		;;
-	restart)
-		openqrm_plugin_puppet_stop
-		sleep 1
-		openqrm_plugin_puppet_start
-		;;
-	init)
-		openqrm_plugin_puppet_init $USER $PASS
-		;;
-	uninstall)
-		openqrm_plugin_puppet_uninstall $USER $PASS
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/init.d/openqrm-plugin-puppet.postinstall b/openQRM-5.3.50-CE/src/plugins/puppet/etc/init.d/openqrm-plugin-puppet.postinstall
deleted file mode 100644
index b9714a5..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/init.d/openqrm-plugin-puppet.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-puppet postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/init.d/openqrm-plugin-puppet.preremove b/openQRM-5.3.50-CE/src/plugins/puppet/etc/init.d/openqrm-plugin-puppet.preremove
deleted file mode 100644
index 982e587..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/init.d/openqrm-plugin-puppet.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-puppet preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-puppet stop
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/init.d/puppet b/openQRM-5.3.50-CE/src/plugins/puppet/etc/init.d/puppet
deleted file mode 100644
index 26c5382..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/init.d/puppet
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-# this is the boot-service init script for the puppet resources
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-# for including the package functions
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/include/openqrm-plugin-puppet-functions
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-OPENQRM_SERVER_IP=$resource_openqrmserver
-LOCKFILE=/var/lock/openqrm-puppet
-
-# do not run on idle resources
-if [ "$resource_image" == "idle" ]; then
-	exit 0
-fi
-
-# set the hostname early 
-hostname $appliance_name
-
-# also do not run before the real init of the rootfs
-# if we have this file /etc/initrd-devices.conf we are still in the initrd
-if [ -f /etc/initrd-devices.conf ]; then
-	exit 0
-fi
-if [ -f /etc/debian_version ]; then
-	echo "$appliance_name" > /etc/hostname
-elif [ -f /etc/redhat-release ]; then
-	sed -i -e "s#HOSTNAME=.*#HOSTNAME=$appliance_name#g" /etc/sysconfig/network
-elif [ -f /etc/SuSE-release ]; then
-	echo "$appliance_name" > /etc/HOSTNAME
-fi
-
-
-function puppet_start() {
-	if [ -e "$LOCKFILE" ]; then
-		echo "puppet already started for the first time"
-	else
-		touch $LOCKFILE
-		# clean up eventual left-overs, be sure we get signed
-		rm -rf /etc/puppet/ssl/* /var/lib/puppet/ssl/* /var/lib/puppet/state/*
-		openqrm_chkconfig del puppet
-	fi
-
-	echo "Starting the openQRM puppet-plugin"
-	if ! which puppet 1>/dev/null 2>&1; then
-		export FORCE_INSTALL=true
-		openqrm_install_os_dependency puppet
-	fi
-	puppet_stop 1>/dev/null 2>&1
-	start_puppet
-}
-
-
-function puppet_stop() {
-	echo "Stopping the openQRM puppet-plugin"
-	stop_puppet
-}
-
-
-
-
-
-case "$1" in
-	start)
-		puppet_start
-		;;
-	stop)
-		puppet_stop
-		;;
-	restart)
-		puppet_stop
-		sleep 1
-		puppet_start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/install/openstack/openstack-all-in-one b/openQRM-5.3.50-CE/src/plugins/puppet/etc/install/openstack/openstack-all-in-one
deleted file mode 100644
index a536d88..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/install/openstack/openstack-all-in-one
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/bash
-# this script automatically installs openstack all-in-one
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-echo "puppet: starting openstack all-in-one installation" | logger
-
-# static defines + defaults
-DEFAULT_NIC="eth0"
-DEFAULT_FLOAT_SUBNET=27
-DEFAULT_EXTERNAL_SUBNET="24"
-DEFAULT_EXTERNAL_NETWORK="10.11.12.0"
-DEFAULT_FIXED_EXTERNAL_NETWORK_SIZE="256"
-LOCALRC=/home/stack/devstack/localrc
-RELEASE="icehouse"
-DEFAULT_ADMIN_PASSWORD="openqrm"
-DEFAULT_MYSQL_PASSWORD="openqrm"
-DEFAULT_RABBIT_PASSWORD="openqrm"
-DEFAULT_SERVICE_PASSWORD="openqrm"
-DEFAULT_SERVICE_TOKEN="openqrm"
-
-OPENQRM_RESOURCE_PARAMETER_FILE="/var/openqrm/openqrm-resource.conf"
-if [ ! -f "$OPENQRM_RESOURCE_PARAMETER_FILE" ]; then
-	echo "WARNING: Could not find $OPENQRM_RESOURCE_PARAMETER_FILE configuration. Installing openstack with defaults!" | logger
-	FLAT_INTERFACE=$DEFAULT_NIC
-	HOST_IP=`ip a s $FLAT_INTERFACE | grep -w $FLAT_INTERFACE$ | grep -w inet | awk '{ print $2 }' | cut -d'/' -f1`
-	if [ "$HOST_IP" == "" ]; then
-		HOST_IP=`ip a s | grep "$FLAT_INTERFACE:oq" | awk '{ print $2 }' | cut -d'/' -f1`
-		if [ "$HOST_IP" == "" ]; then
-			echo "ERROR: Could not find out ip address of nic $FLAT_INTERFACE" | logger
-			exit 1
-		fi
-	fi
-	FLOAT_NET=`echo $HOST_IP | cut -d'.' -f1-3`
-	FLOAT_NET=$FLOAT_NET".0"
-	FLOATING_RANGE=$FLOAT_NET/$DEFAULT_FLOAT_SUBNET
-	FIXED_RANGE="$DEFAULT_EXTERNAL_NETWORK/$DEFAULT_EXTERNAL_SUBNET"
-	FIXED_NETWORK_SIZE=$DEFAULT_FIXED_EXTERNAL_NETWORK_SIZE
-	# openstack credentials
-	ADMIN_PASSWORD=$DEFAULT_ADMIN_PASSWORD
-	MYSQL_PASSWORD=$DEFAULT_MYSQL_PASSWORD
-	RABBIT_PASSWORD=$DEFAULT_RABBIT_PASSWORD
-	SERVICE_PASSWORD=$DEFAULT_SERVICE_PASSWORD
-	SERVICE_TOKEN=$DEFAULT_SERVICE_TOKEN
-else
-	echo "puppet: Found $OPENQRM_RESOURCE_PARAMETER_FILE" | logger
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-	eval $appliance_capabilities
-fi
-
-# check parameters
-
-
-if [ "$HOST_IP" == "" ]; then
-	HOST_IP=$resource_ip
-fi
-if [ "$FLOATING_RANGE" == "" ]; then
-	FLOAT_NET=`echo $HOST_IP | cut -d'.' -f1-3`
-	FLOAT_NET=$FLOAT_NET".0"
-	FLOATING_RANGE=$FLOAT_NET/$DEFAULT_FLOAT_SUBNET
-fi
-
-if [ "$FIXED_RANGE" == "" ]; then
-	FIXED_RANGE="$DEFAULT_EXTERNAL_NETWORK/$DEFAULT_EXTERNAL_SUBNET"
-fi
-if [ "$FIXED_NETWORK_SIZE" == "" ]; then
-	FIXED_NETWORK_SIZE=$DEFAULT_FIXED_EXTERNAL_NETWORK_SIZE
-fi
-if [ "$FLAT_INTERFACE" == "" ]; then
-	FLAT_INTERFACE=`ip a s | grep -B2 -w $HOST_IP | grep ^[0-9] | awk '{ print $2 }' | cut -d':' -f1`
-	if [ "$FLAT_INTERFACE" == "" ]; then
-		echo "ERROR: Could not find out interface for ip address $HOST_IP" | logger
-		exit 1
-	fi
-fi
-if [ "$ADMIN_PASSWORD" == "" ]; then
-	ADMIN_PASSWORD=$DEFAULT_ADMIN_PASSWORD
-fi
-if [ "$MYSQL_PASSWORD" == "" ]; then
-	MYSQL_PASSWORD=$DEFAULT_MYSQL_PASSWORD
-fi
-if [ "$RABBIT_PASSWORD" == "" ]; then
-	RABBIT_PASSWORD=$DEFAULT_RABBIT_PASSWORD
-fi
-if [ "$SERVICE_PASSWORD" == "" ]; then
-	SERVICE_PASSWORD=$DEFAULT_SERVICE_PASSWORD
-fi
-if [ "$SERVICE_TOKEN" == "" ]; then
-	SERVICE_TOKEN=$DEFAULT_SERVICE_TOKEN
-fi
-
-
-echo "puppet: Preparing environment for openstack installation" | logger
-
-# main
-if ! grep ^stack /etc/passwd 1>/dev/null; then
-	echo "adding user stack"
-	adduser --disabled-password --gecos "" stack
-fi
-if ! which sudo 1>/dev/null; then
-	apt-get install sudo -y
-fi
-if ! which git 1>/dev/null; then
-	apt-get install git -y
-fi
-if ! grep ^stack /etc/sudoers 1>/dev/null; then
-	echo "stack ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
-fi
-
-echo "puppet: checking out openstack from git" | logger
-
-# checkout openstack
-echo "checking out devstack"
-su - stack -c "git clone https://github.com/openstack-dev/devstack.git"
-echo "switching to $RELEASE release"
-su - stack -c "cd devstack; git checkout stable/$RELEASE"
-# create localrc config
-echo "puppet: creating localrc for custom openstack installation" | logger
-> $LOCALRC
-echo "HOST_IP=$HOST_IP" >> $LOCALRC
-echo "FLOATING_RANGE=$FLOATING_RANGE" >> $LOCALRC
-echo "FIXED_RANGE=$FIXED_RANGE" >> $LOCALRC
-echo "FIXED_NETWORK_SIZE=$FIXED_NETWORK_SIZE" >> $LOCALRC
-echo "FLAT_INTERFACE=$FLAT_INTERFACE" >> $LOCALRC
-echo "ADMIN_PASSWORD=$ADMIN_PASSWORD" >> $LOCALRC
-echo "MYSQL_PASSWORD=$MYSQL_PASSWORD" >> $LOCALRC
-echo "RABBIT_PASSWORD=$RABBIT_PASSWORD" >> $LOCALRC
-echo "SERVICE_PASSWORD=$SERVICE_PASSWORD" >> $LOCALRC
-echo "SERVICE_TOKEN=$SERVICE_TOKEN" >> $LOCALRC
-echo "LOGFILE=/home/stack/stack.sh.log" >> $LOCALRC
-chown stack:stack $LOCALRC
-# ran stack.sh
-echo "puppet: running openstack installation now" | logger
-su - stack -c "cd devstack; ./stack.sh"
-echo "puppet: finished setting up openstack"  | logger
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/openqrm-plugin-puppet.conf b/openQRM-5.3.50-CE/src/plugins/puppet/etc/openqrm-plugin-puppet.conf
deleted file mode 100644
index 98b6797..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/openqrm-plugin-puppet.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# this is the openQRM-plugin-puppet info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen, puppet, puppet-master, subversion"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen, puppet-server, subversion"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen, subversion"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="Integrates <a href='http://puppetlabs.com/' target='_BLANK'>Puppet</a> for fully automated Configuration Management and Application deployment."
-OPENQRM_PLUGIN_TYPE="deployment"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES="dns"
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES=""
-# dirs which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_DIRS="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/web/puppet/ $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/etc/"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/etc/svn-hook/post-commit.tmpl b/openQRM-5.3.50-CE/src/plugins/puppet/etc/svn-hook/post-commit.tmpl
deleted file mode 100644
index a5010ce..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/etc/svn-hook/post-commit.tmpl
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the openQRM Enterprise Server and Client License, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: http://openqrm-enterprise.com/license
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-cd @@OPENQRM_SERVER_BASE_DIR@@/openqrm/plugins/puppet/web/puppet; svn up 1> /var/log/puppet-commit.log 2>&1
-cd /etc/puppet; svn up 1> /var/log/puppet-commit.log 2>&1
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/include/openqrm-plugin-puppet-functions b/openQRM-5.3.50-CE/src/plugins/puppet/include/openqrm-plugin-puppet-functions
deleted file mode 100644
index 1f6287e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/include/openqrm-plugin-puppet-functions
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-# this is the functions file for the puppet-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-################ common puppet functions
-
-# logs for puppet
-function puppet_manager_log() {
-	local COMPONENT=$1
-	shift
-	local MESSAGE=$@
-	logger -i -t "puppet plug-in" "$COMPONENT : $MESSAGE"
-}
-
-
-################ puppet functions
-
-function stop_puppet() {
-	if [ -x "/etc/init.d/puppet" ]; then
-		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-			invoke-rc.d puppet stop 1>/dev/null 2>&1
-		else
-			/etc/init.d/puppet stop 1>/dev/null 2>&1
-		fi
-		sleep 2
-	fi
-	if [ -x "/etc/init.d/puppetqd" ]; then
-		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-			invoke-rc.d puppetqd stop 1>/dev/null 2>&1
-		else
-			/etc/init.d/puppetqd stop 1>/dev/null 2>&1
-		fi
-		sleep 2
-	fi
-
-	kill `ps ax | grep puppetd | grep -v grep | awk {' print $1 '}` 2>/dev/null
-	kill `ps ax | grep "puppet agent" | grep -v grep | awk {' print $1 '}` 2>/dev/null
-	sleep 2
-	kill -9 `ps ax | grep puppetd | grep -v grep | awk {' print $1 '}` 2>/dev/null
-	kill -9 `ps ax | grep "puppet agent" | grep -v grep | awk {' print $1 '}` 2>/dev/null
-}
-
-function stop_puppet_master() {
-	if [ -x "/etc/init.d/puppetmaster" ]; then
-		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-			invoke-rc.d puppetmaster stop 1>/dev/null 2>&1
-		else
-			/etc/init.d/puppetmaster stop 1>/dev/null 2>&1
-		fi
-		sleep 2
-	fi
-	kill `ps ax | grep puppetmaster | grep -v grep | awk {' print $1 '}` 2>/dev/null
-	kill `ps ax | grep "puppet master" | grep -v grep | awk {' print $1 '}` 2>/dev/null
-	sleep 2
-	kill -9 `ps ax | grep puppetmaster | grep -v grep | awk {' print $1 '}` 2>/dev/null
-	kill -9 `ps ax | grep "puppet master" | grep -v grep | awk {' print $1 '}` 2>/dev/null
-}
-
-function start_puppet() {
-	if which puppetd 1>/dev/null 2>&1; then
-		puppetd -v -d -D -l syslog
-	elif puppet help | grep agent 1>/dev/null 2>&1; then
-		puppet agent
-	else
-		echo "ERROR: Could not start Puppet agent"
-	fi
-}
-
-function start_puppet_master() {
-	if which puppetmasterd 1>/dev/null 2>&1; then
-		puppetmasterd -v -d -l syslog
-	elif puppet help | grep master 1>/dev/null 2>&1; then
-		puppet master
-	else
-		echo "ERROR: Could not start Puppet master"
-	fi
-}
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet-about.controller.class.php
deleted file mode 100644
index c3cd49a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet-about.controller.class.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Puppet Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class puppet_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'puppet_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'puppet_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'puppet_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'puppet_about_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About Puppet',
-		'label' => 'About Puppet',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The Puppet plugin provides automated configuration-management for Appliances in openQRM.
-			It seamlessly integrates <a href="http://projects.puppetlabs.com/projects/puppet" target="_BLANK">Puppet</a> within the openQRM GUI and assists to put specific Appliances into pre-made or custom Puppet-classes.
-			By enabling the plugin the puppet-environment (server and client) is pre-configured and initialyzed automatically according to best-practice experiences e.g. by keeping the puppet-configuration within a svn-repsitory.
-			The puppet-configuration is organized in "classes", "goups" and "appliances".
-			Custom custom classes can be added to the class-directory.
-			Classes should be combined to "groups" these will be automatically displayed in the puppet-plugin.
-			The puppet-configuration repository is also available for external svn clients.
-			To check out the puppet-repo please run<br><br>:',
-		'introduction_title1' => 'Assigning Applications to Appliances',
-		'introduction_content1' => '<ol><li>Go to the "Appliances" in the puppet-plugin menu</li>
-			<li>Select an Appliance to be configured via puppet</li>
-			<li>Select the puppet-groups the appliance should belong to</li></ol>
-			Within short time the puppet-server will distribute the new configuration to the Appliance automatically.',
-		'requirements_title' => 'Requirements',
-		'requirements_list' => '<li>The Puppet Plugin depends on the DNS Plugin! Please make sure to have the DNS Plugin enabled and started before.</li>',
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-		'provides_title' => 'Provides',
-		'provides_list' => '<li>Automated configuration-management for Appliances in openQRM</li>',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Deployment',
-		'documentation_title' => 'Documentation',
-		'use_case_title' => 'Use-Case',
-	),
-);
-
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/puppet/lang", 'puppet-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/puppet/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About Puppet
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/puppet/class/puppet-about.documentation.class.php');
-			$controller = new puppet_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet-about.documentation.class.php
deleted file mode 100644
index 7112f9b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet-about.documentation.class.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * puppet-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class puppet_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'puppet_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "puppet_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-		$this->basedir    = $this->openqrm->get('basedir');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$svn_co_command = "svn co svn+ssh://[user]@[openqrm-server-ip]".$this->basedir."/openqrm/plugins/puppet/etc/puppet/";
-		$t = $this->response->html->template($this->tpldir.'/puppet-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['provides_title'], 'provides_title');
-		$t->add($this->lang['provides_list'], 'provides_list');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($svn_co_command, 'introduction_command');
-		$t->add($this->lang['introduction_title1'], 'introduction_title1');
-		$t->add($this->lang['introduction_content1'], 'introduction_content1');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet.class.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet.class.php
deleted file mode 100644
index 5c79a20..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet.class.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This class represents a puppet user in openQRM
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/folder.class.php";
-require_once "$RootDir/class/file.class.php";
-require_once "$RootDir/plugins/puppet/class/puppetconfig.class.php";
-
-$event = new event();
-global $event;
-
-$puppet_group_dir = "$RootDir/plugins/puppet/puppet/manifests/groups";
-global $puppet_group_dir;
-$puppet_appliance_dir = "$RootDir/plugins/puppet/puppet/manifests/appliances";
-global $puppet_appliance_dir;
-$PUPPET_CONFIG_TABLE="puppet_config";
-global $PUPPET_CONFIG_TABLE;
-
-class puppet {
-
-		function __construct() {
-			$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-			$this->group_dir = $RootDir.'/plugins/puppet/puppet/manifests/groups';
-			$this->appliance_dir = $RootDir.'/plugins/puppet/puppet/manifests/appliances';
-			$this->event = new event();
-		}
-
-// ---------------------------------------------------------------------------------
-// general puppetconfig methods
-// ---------------------------------------------------------------------------------
-
-
-function get_available_groups() {
-	$app_dir = new folder();
-	$app_dir->getFolderContent($this->group_dir);
-	$puppet_groups = array();
-	$puppet_groups = $app_dir->files;
-	$puppet_group_array = array();
-	foreach($puppet_groups as $puppet) {
-		$puppet_group = str_replace(".pp", "", $puppet->name);
-		$puppet_group_array[] .= $puppet_group;
-	}
-	sort($puppet_group_array);
-	return $puppet_group_array;
-}
-
-
-
-function get_group_info($group_name) {
-
-	$filename = $this->group_dir."/$group_name.pp";
-	if (file_exists($filename)) {
-		if (!$handle = fopen($filename, 'r')) {
-			$this->event->log("get_group_info", $_SERVER['REQUEST_TIME'], 2, "puppet.class.php", "Cannot open file ($filename)", "", "", 0, 0, 0);
-			exit;
-		}
-		while (!feof($handle)) {
-			$info = fgets($handle, 4096);
-			if (strstr($info, "#")) {
-				$info = str_replace("#", "", $info);
-				fclose($handle);
-				return $info;
-			}
-		}
-	}
-}
-
-
-
-function get_supported_os($group_name) {
-	$filename = $this->group_dir."/$group_name.pp";
-	if (file_exists($filename)) {
-		if (!$handle = fopen($filename, 'r')) {
-			$this->event->log("get_supported_os", $_SERVER['REQUEST_TIME'], 2, "puppet.class.php", "Cannot open file ($filename)", "", "", 0, 0, 0);
-			exit;
-		}
-		while (!feof($handle)) {
-			$os_version = fgets($handle, 4096);
-			if (strstr($os_version, "# os:")) {
-				$os_version = str_replace("# os:", "", $os_version);
-				fclose($handle);
-				$os_version_arr = explode(",", $os_version);
-				return $os_version_arr;
-			}
-		}
-	}
-}
-
-
-function get_domain() {
-	$puppetconfig = new puppetconfig();
-	$puppet_domain = $puppetconfig->get_value(2);  // 2 is the domain-name
-	return $puppet_domain;
-}
-
-
-
-function set_groups($appliance_name, $puppet_group_array) {
-	$puppet_domain = $this->get_domain();
-	$filename = $this->appliance_dir."/$appliance_name.$puppet_domain.pp";
-	if (!$handle = fopen($filename, 'w+')) {
-		$this->event->log("set_groups", $_SERVER['REQUEST_TIME'], 2, "puppet.class.php", "Cannot open file ($filename)", "", "", 0, 0, 0);
-		exit;
-	}
-	// header
-	fwrite($handle, "\nnode '$appliance_name.$puppet_domain' {\n");
-	// body with groups
-	foreach($puppet_group_array as $puppet_group) {
-		$puppet_include = "     include $puppet_group\n";
-		fwrite($handle, $puppet_include);
-	}
-	// base
-	fwrite($handle, "}\n\n");
-	fclose($handle);
-}
-
-
-function get_groups($appliance_name) {
-	$puppet_group_array = array();
-	$puppet_domain = $this->get_domain();
-	$filename = $this->appliance_dir."/$appliance_name.$puppet_domain.pp";
-
-	if (file_exists($filename)) {
-		if (!$handle = fopen($filename, 'r')) {
-			$this->event->log("get_groups", $_SERVER['REQUEST_TIME'], 2, "puppet.class.php", "Cannot open file ($filename)", "", "", 0, 0, 0);
-			exit;
-		}
-		while (!feof($handle)) {
-			$buffer = fgets($handle, 4096);
-			if (strstr($buffer, "include")) {
-				$buffer = str_replace("include", "", $buffer);
-				$buffer = trim($buffer);
-				$puppet_group_array[] .= $buffer;
-			}
-		}
-		fclose($handle);
-	}
-
-
-	return $puppet_group_array;
-}
-
-function remove_appliance($appliance_name) {
-	$puppet_domain = $this->get_domain();
-	$filename = $this->appliance_dir."/$appliance_name.$puppet_domain.pp";
-	if (file_exists($filename)) {
-		unlink($filename);
-	}
-}
-
-
-// ---------------------------------------------------------------------------------
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet.config.class.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet.config.class.php
deleted file mode 100644
index 87bec37..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet.config.class.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/**
- * puppet config
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class puppet_config
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'puppet_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "puppet_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'puppet_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'puppet_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->tpldir   = $this->rootdir.'/plugins/puppet/tpl';
-
-		require_once($this->rootdir.'/plugins/puppet/class/puppetconfig.class.php');
-		$this->puppetconfig = new puppetconfig();
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action() {
-
-		$response = $this->config();
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		if(isset($response->msg)) {
-			$response->redirect(
-					$response->get_url($this->actions_name, 'config', $this->message_param, $response->msg)
-			);
-		}
-		$data['please_wait'] = $this->lang['please_wait'];
-		$data['prefix_tab'] = $this->prefix_tab;
-		$data['label'] = sprintf($this->lang['label']);
-		$data['baseurl'] = $this->openqrm->get('baseurl');
-		$data['thisfile']    = $response->html->thisfile;
-		$t = $response->html->template($this->tpldir.'/puppet-config.tpl.php');
-		$t->add($response->form);
-		$t->add($data);
-		$t->group_elements(array('param_' => 'form', 'f_' => 'fields'));
-
-		return $t;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function config() {
-		$response = $this->get_response();
-		$form = $response->form;
-		if(!$form->get_errors() && $response->submit()) {
-			$request = $form->get_request();
-			foreach($request as $k => $v) {
-				$fields['cc_key'] = $k;
-				foreach($v as $id => $value) {
-					$fields['cc_id'] = $id;
-					$fields['cc_value'] = $value;
-				}
-				$this->puppetconfig->remove($fields['cc_id']);
-				$this->puppetconfig->add($fields);
-			}
-			$response->msg = $this->lang['msg_updated'];
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-
-		$response = $this->response;
-		$form     = $response->get_form($this->actions_name, 'config');
-		$fields = $this->puppetconfig->display_overview(0, 10000, 'cc_id', 'ASC');
-		$i = 0;
-		foreach($fields as $k => $v) {
-			$d['f_'.$i]['label']                         = $v['cc_key'];
-			$d['f_'.$i]['required']                      = true;
-			$d['f_'.$i]['object']['type']                = 'htmlobject_input';
-			$d['f_'.$i]['object']['attrib']['name']      = $v['cc_key'].'['.$v['cc_id'].']';
-			$d['f_'.$i]['object']['attrib']['value']     = $v['cc_value'];
-			$d['f_'.$i]['object']['attrib']['maxlength'] = 50;
-			$i++;
-		}
-		$form->add($d);
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$response->form = $form;
-		return $response;
-
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet.controller.class.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet.controller.class.php
deleted file mode 100644
index 8c9750a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet.controller.class.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-/**
- * Puppet Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class puppet_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'puppet_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "puppet_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'puppet_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'puppet_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array(
-		'tab' => 'Appliances',
-		'label' => 'Puppet Appliances',
-		'id' => 'ID',
-		'appliance' => 'Appliance',
-		'name' => 'Name',
-		'resource' => 'Resource',
-		'groups' => 'Groups',
-		'action_edit' => 'edit',
-		'please_wait' => 'Loading. Please wait ..',
-	),
-	'edit' => array(
-		'tab' => 'Edit',
-		'label' => 'Puppet groups for appliance %s',
-		'msg_updated' => 'Updated appliance %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..'
-	),
-	'config' => array(
-		'tab' => 'Config',
-		'label' => 'Configure Puppet',
-		'msg_updated' => 'Updated Puppet Config',
-		'please_wait' => 'Loading. Please wait ..',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/puppet/lang", 'puppet.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/puppet/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = 'select';
-		}
-
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			default:
-			case 'select':
-				$content[] = $this->select(true);
-				$content[] = $this->config(false);
-			break;
-			case 'edit':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-				$content[] = $this->config(false);
-			break;
-			case 'config':
-				$content[] = $this->select(false);
-				$content[] = $this->config(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->auto_tab = false;
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select appliance
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/puppet/class/puppet.select.class.php');
-			$controller = new puppet_select($this->openqrm, $this->response);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit appliance 
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function edit( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/puppet/class/puppet.edit.class.php');
-			$controller = new puppet_edit($this->openqrm, $this->response);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['edit'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['edit']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'edit' );
-		$content['onclick'] = false;
-		if($this->action === 'edit'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Configure Puppet
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function config( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/puppet/class/puppet.config.class.php');
-			$controller = new puppet_config($this->openqrm, $this->response);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['config'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['config']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'config' );
-		$content['onclick'] = false;
-		if($this->action === 'config'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet.edit.class.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet.edit.class.php
deleted file mode 100644
index e4d8177..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet.edit.class.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/**
- * puppet Appliance
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class puppet_edit
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'puppet_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "puppet_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'puppet_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'puppet_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('basedir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->tpldir   = $this->rootdir.'/plugins/puppet/web/tpl';
-
-		require_once($this->rootdir.'/plugins/puppet/web/class/puppet.class.php');
-		$this->puppet = new puppet();
-
-		$id = $this->response->html->request()->get('appliance_id');
-		$this->response->add('appliance_id', $id);
-
-		$appliance = $this->openqrm->appliance();
-		$this->appliance = $appliance->get_instance_by_id($id);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action() {
-
-		$response = $this->edit();
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		if(isset($response->msg)) {
-			$response->redirect(
-					$response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		$data['canceled'] = $this->lang['canceled'];
-		$data['please_wait'] = $this->lang['please_wait'];
-		$data['prefix_tab'] = $this->prefix_tab;
-		$data['label'] = sprintf($this->lang['label'], $this->appliance->name);
-		$data['baseurl'] = $this->openqrm->get('baseurl');
-		$data['thisfile']    = $response->html->thisfile;
-		$t = $response->html->template($this->tpldir.'/puppet-edit.tpl.php');
-		$t->add($response->form);
-		$t->add($data);
-		$t->group_elements(array('param_' => 'form', 'input_' => 'input'));
-
-		return $t;
-
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function edit() {
-		$response = $this->get_response();
-		$form = $response->form;
-		if(!$form->get_errors() && $response->submit()) {
-			$groups = $form->get_request('groups');
-			$this->puppet->remove_appliance($this->appliance->name);
-			if(is_array($groups)) {
-				$this->puppet->set_groups($this->appliance->name, $groups);
-			}
-			$response->msg = sprintf($this->lang['msg_updated'], $this->appliance->name);
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param enum $mode [select|edit]
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-
-		$response = $this->response;
-		$form     = $response->get_form($this->actions_name, 'edit');
-		$selected = $this->puppet->get_groups($this->appliance->name);
-		$groups   = $this->puppet->get_available_groups();
-
-		$i = 0;
-		foreach($groups as $v) {
-			$d['input_'.$i]['label']                     = '<b>'.$v.'</b> <i>('.$this->puppet->get_group_info($v).')</i>';
-			$d['input_'.$i]['object']['type']            = 'htmlobject_input';
-			$d['input_'.$i]['object']['attrib']['type']  = 'checkbox';
-			$d['input_'.$i]['object']['attrib']['name']  = 'groups[]';
-			$d['input_'.$i]['object']['attrib']['value'] = $v;
-			if(in_array($v, $selected)) {
-				$d['input_'.$i]['object']['attrib']['checked'] = true;
-			}
-			$i++;
-		}
-		$form->add($d);
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$response->form = $form;
-		return $response;
-
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet.select.class.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet.select.class.php
deleted file mode 100644
index 3c441ca..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppet.select.class.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/**
- * puppet Appliance
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class puppet_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'puppet_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "puppet_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'puppet_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'puppet_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->tpldir   = $this->rootdir.'/plugins/puppet/tpl';
-
-		require_once($this->openqrm->get('basedir').'/plugins/puppet/web/class/puppet.class.php');
-		$this->puppet = new puppet();
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$response = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/puppet-select.tpl.php');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->table, 'table');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function select() {
-		$response = $this->response;
-		$appliance = new appliance();
-
-		$table = $this->response->html->tablebuilder('puppet', $this->response->get_array($this->actions_name, 'select'));
-		$table->offset = 0;
-		$table->sort = 'appliance_id';
-		$table->limit = 10;
-		$table->order = 'ASC';
-		$table->max   = $appliance->get_count();
-
-		$table->init();
-
-		$h['appliance_id']['title']    = $this->lang['id'];
-		$h['appliance_id']['sortable'] = true;
-		$h['appliance_id']['hidden']   = true;
-
-		$h['appliance']['title']    = $this->lang['appliance'];
-		$h['appliance']['sortable'] = false;
-
-		$h['appliance_name']['title']    = $this->lang['name'];
-		$h['appliance_name']['sortable'] = true;
-		$h['appliance_name']['hidden']   = true;
-
-		$h['appliance_resources']['title']    = $this->lang['resource'];
-		$h['appliance_resources']['sortable'] = true;
-		$h['appliance_resources']['hidden']   = true;
-
-
-		$h['groups']['title']    = $this->lang['groups'];
-		$h['groups']['sortable'] = false;
-		$h['action']['title']    = '&#160;';
-		$h['action']['sortable'] = false;
-
-		$result = $appliance->display_overview($table->offset, $table->limit, $table->sort, $table->order);
-		$b = array();
-		foreach($result as $k => $v) {
-
-			$resource = new resource();
-			$resource = $resource->get_instance_by_id($v['appliance_resources']);
-
-			$tmp = array();
-			$tmp['appliance_id'] = $v['appliance_id'];
-			$tmp['appliance_name'] = $v['appliance_name'];
-			$tmp['appliance_resources'] = $v['appliance_resources'];
-			$tmp['appliance']  = '<b>'.$this->lang['id'].':</b> '.$v['appliance_id'].'<br>';
-			$tmp['appliance'] .= '<b>'.$this->lang['name'].':</b> '.$v['appliance_name'].'<br>';
-			$tmp['appliance'] .= '<b>'.$this->lang['resource'].':</b> '.$resource->id.' / '.$resource->ip.'<br>';
-
-			$groups = $this->puppet->get_groups($v['appliance_name']);
-			$tmp['groups'] = implode(', ', $groups);
-
-			$a          = $response->html->a();
-			$a->href    = $response->get_url($this->actions_name, 'edit' ).'&appliance_id='.$v['appliance_id'];
-			$a->label   = $this->lang['action_edit'];
-			$a->title   = $this->lang['action_edit'];
-			$a->css     = 'edit';				
-			$a->handler = 'onclick="wait();"';
-			$tmp['action'] = $a->get_string();
-
-			$b[] = $tmp;
-		}
-
-		$table->css          = 'htmlobject_table';
-		$table->border       = 0;
-		$table->id           = 'Tabelle';
-		$table->form_action	 = $this->response->html->thisfile;
-		$table->head         = $h;
-		$table->body         = $b;
-		$table->sort_params  = $response->get_string( $this->actions_name, 'select' );
-		$table->sort_form    = true;
-		$table->sort_link    = false;
-		$table->autosort     = false;
-		$table->limit_select = array(
-				array("value" => 10, "text" => 10),
-				array("value" => 20, "text" => 20),
-				array("value" => 30, "text" => 30),
-				array("value" => 40, "text" => 40),
-				array("value" => 50, "text" => 50),
-				);
-		$response->table = $table;
-		return $response;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppetconfig.class.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppetconfig.class.php
deleted file mode 100644
index d708afd..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/class/puppetconfig.class.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This class represents a puppet user in openQRM
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/kernel.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-
-$PUPPET_CONFIG_TABLE="puppet_config";
-global $PUPPET_CONFIG_TABLE;
-$event = new event();
-global $event;
-
-class puppetconfig {
-
-var $id = '';
-var $key = '';
-var $value = '';
-
-	function __construct() {
-		$this->puppet_config_table = "puppet_config";
-		$this->event = new event();
-	}
-
-
-// ---------------------------------------------------------------------------------
-// methods to create an instance of a puppetconfig object filled from the db
-// ---------------------------------------------------------------------------------
-
-// returns an appliance from the db selected by id or name
-function get_instance($id, $name) {
-	$db=openqrm_get_db_connection();
-	if ("$id" != "") {
-		$puppetconfig_array = $db->Execute("select * from ".$this->puppet_config_table." where cc_id=$id");
-	} else if ("$name" != "") {
-		$puppetconfig_array = $db->Execute("select * from ".$this->puppet_config_table." where cc_key='$name'");
-	} else {
-		$this->event->log("get_instance", $_SERVER['REQUEST_TIME'], 2, "puppetconfig.class.php", "Could not create instance of puppetconfig without data", "", "", 0, 0, 0);
-		return;
-	}
-
-	foreach ($puppetconfig_array as $index => $puppetconfig) {
-		$this->id = $puppetconfig["cc_id"];
-		$this->key = $puppetconfig["cc_key"];
-		$this->value = $puppetconfig["cc_value"];
-	}
-	return $this;
-}
-
-// returns an appliance from the db selected by id
-function get_instance_by_id($id) {
-	$this->get_instance($id, "");
-	return $this;
-}
-
-// returns an appliance from the db selected by key
-function get_instance_by_key($name) {
-	$this->get_instance("", $name);
-	return $this;
-}
-
-
-// ---------------------------------------------------------------------------------
-// general puppetconfig methods
-// ---------------------------------------------------------------------------------
-
-
-
-
-// checks if given puppetconfig id is free in the db
-function is_id_free($puppetconfig_id) {
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select cc_id from ".$this->puppet_config_table." where cc_id=$puppetconfig_id");
-	if (!$rs)
-		$this->event->log("is_id_free", $_SERVER['REQUEST_TIME'], 2, "puppetconfig.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	if ($rs->EOF) {
-		return true;
-	} else {
-		return false;
-	}
-}
-
-
-// adds puppetconfig to the database
-function add($puppetconfig_fields) {
-	if (!is_array($puppetconfig_fields)) {
-		$this->event->log("add", $_SERVER['REQUEST_TIME'], 2, "puppetconfig.class.php", "coulduser_field not well defined", "", "", 0, 0, 0);
-		return 1;
-	}
-	// set stop time and status to now
-	$now=$_SERVER['REQUEST_TIME'];
-	$db=openqrm_get_db_connection();
-	$result = $db->AutoExecute($this->puppet_config_table, $puppetconfig_fields, 'INSERT');
-	if (! $result) {
-		$this->event->log("add", $_SERVER['REQUEST_TIME'], 2, "puppetconfig.class.php", "Failed adding new puppetconfig to database", "", "", 0, 0, 0);
-	}
-}
-
-
-
-// removes puppetconfig from the database
-function remove($puppetconfig_id) {
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("delete from ".$this->puppet_config_table." where cc_id=$puppetconfig_id");
-}
-
-// removes puppetconfig from the database by key
-function remove_by_name($puppetconfig_key) {
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("delete from ".$this->puppet_config_table." where cc_key='$puppetconfig_key'");
-}
-
-
-// returns puppetconfig value by puppetconfig_id
-function get_value($puppetconfig_id) {
-	$db=openqrm_get_db_connection();
-	$puppetconfig_set = $db->Execute("select cc_value from ".$this->puppet_config_table." where cc_id=$puppetconfig_id");
-	if (!$puppetconfig_set) {
-		$this->event->log("get_name", $_SERVER['REQUEST_TIME'], 2, "puppetconfig.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		if (!$puppetconfig_set->EOF) {
-			return $puppetconfig_set->fields["cc_value"];
-		} else {
-			return "";
-		}
-	}
-}
-
-
-// sets a  puppetconfig value by puppetconfig_id
-function set_value($puppetconfig_id, $puppetconfig_value) {
-	$db=openqrm_get_db_connection();
-	$puppetconfig_set = $db->Execute("update ".$this->puppet_config_table." set cc_value=\"$puppetconfig_value\" where cc_id=$puppetconfig_id");
-	if (!$puppetconfig_set) {
-		$this->event->log("get_name", $_SERVER['REQUEST_TIME'], 2, "puppetconfig.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	}
-}
-
-
-// returns the number of puppetconfigs for an puppetconfig type
-function get_count() {
-	$count=0;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select count(cc_id) as num from ".$this->puppet_config_table);
-	if (!$rs) {
-		print $db->ErrorMsg();
-	} else {
-		$count = $rs->fields["num"];
-	}
-	return $count;
-}
-
-
-
-// returns a list of all puppetconfig names
-function get_list() {
-	$query = "select cc_id, cc_value from ".$this->puppet_config_table;
-	$puppetconfig_name_array = array();
-	$puppetconfig_name_array = openqrm_db_get_result_double ($query);
-	return $puppetconfig_name_array;
-}
-
-
-// returns a list of all puppetconfig ids
-function get_all_ids() {
-	$puppetconfig_list = array();
-	$query = "select cc_id from ".$this->puppet_config_table;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute($query);
-	if (!$rs)
-		$this->event->log("get_list", $_SERVER['REQUEST_TIME'], 2, "puppetconfig.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	while (!$rs->EOF) {
-		$puppetconfig_list[] = $rs->fields;
-		$rs->MoveNext();
-	}
-	return $puppetconfig_list;
-
-}
-
-
-
-
-// displays the puppetconfig-overview
-function display_overview($offset, $limit, $sort, $order) {
-	$db=openqrm_get_db_connection();
-	$recordSet = $db->SelectLimit("select * from ".$this->puppet_config_table." order by $sort $order", $limit, $offset);
-	$puppetconfig_array = array();
-	if (!$recordSet) {
-		$this->event->log("display_overview", $_SERVER['REQUEST_TIME'], 2, "puppetconfig.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		while (!$recordSet->EOF) {
-			array_push($puppetconfig_array, $recordSet->fields);
-			$recordSet->MoveNext();
-		}
-		$recordSet->Close();
-	}
-	return $puppetconfig_array;
-}
-
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/css/puppet.css b/openQRM-5.3.50-CE/src/plugins/puppet/web/css/puppet.css
deleted file mode 100644
index 37c7b46..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/css/puppet.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.htmlobject_table .appliance {
-	width: 350px;
-}
-.htmlobject_table .action {
-	width: 120px;
-	text-align: right;
-}
-
-
-
-
-
-#puppet_groups .htmlobject_box .left {
-	float: right;
-	text-align: left;
-	width: 600px;
-}
-#puppet_groups .htmlobject_box .right {
-	width: 30px;
-	float: right;
-	padding: 4px 0 0 0;
-}
-#buttons {
-	margin: 10px 0 0 0;
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/puppet/web/img/plugin.png
deleted file mode 100644
index e969688..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/puppet/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/lang/de.puppet-about.ini b/openQRM-5.3.50-CE/src/plugins/puppet/web/lang/de.puppet-about.ini
deleted file mode 100644
index 140958d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/lang/de.puppet-about.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-[documentation]
-tab = "Über Puppet"
-label = "Über Puppet"
-introduction_title = "Einleitung"
-introduction_content = "Das Puppet-Plugin bietet automatisches Konfiguration-Managment (Applikations-Deployment plus Vorkonfiguration) für Server in openQRM. Es integriert  <a href='http://projects.puppetlabs.com/projects/puppet' target='_BLANK'>Puppet</a> in den openQRM-Server und erlaubt die Provisionierung spezifischer Applikationen mittels einfacher Zuordnung von Puppet-Klassen.</p>
-	<p>Das Puppet-Plugin beinhaltet einen nach 'best-practise' konfigurierten Puppet-Server und -Client. Die Puppet-Klassen (Rezepte) werden dabei automatisch in einem Subversion-Repository abgelegt. Die Puppet-Konfiguration ist in Server, Gruppen und Klassen organisiert. Eigene Klassen werden dem <code>class</code> Verzeichnis hinzugefügt. Klassen werden dann zu 'Gruppen' (groups) kombiniert, die direkt Server in der openQRM-Benutzeroberfläche zugeordnet werden können. Der Inhalt des 'Gruppen' (groups) Verzeichnis wird automatisch in der UI dargestellt.	Das Puppet-Plugin beinhaltet einige vorgefertigte Puppet-Klassen und -Gruppen wie z.B. 
-	<ul>
-		<li>basic-server</li>
-		<li>webserver</li>
-		<li>database-server</li>
-		<li>lamp</li>
-	</ul>
-	Diese vordefinierten Klassen und Gruppen können selbstverständlich nach eigenen Bedürfnissen angepasst werden. Das Puppet Konfigurations-Repository von openQRM ist auch für externe Subversion Clients verfügbar unter:"
-
-introduction_title1 = "Applikationen den Server zuordnen"
-introduction_content1 = "<ol>
-					<li>Klicken Sie auf 'Server' im Puppet-plugin Menu</li>
-					<li>Wählen Sie einen Server die von Puppet verwaltet werden soll</li>
-					<li>Wählen Sie die Puppet Gruppen zu denen der Server gehören soll</li>
-				</ol>
-				Innerhalb kürzester Zeit wird der Puppet-Server die neue Konfiguration automatisch auf die Server angewenden."
-requirements_title = "Anforderungen"
-requirements_list = "Das Puppet-Plugin ist abhängig vom DNS-Plugin. Bitte vergewissern Sie sich, dass das DNS-Plugin vor dem Puppet-Plugin gestartet wurde."
-tested_title = "Getestet mit"
-tested_content = "Dieses Plugin ist getestet mit Debian, Ubuntu und CentOS"
-
-provides_title = "Bietet"
-provides_list = "Automatisches Konfigurations-Managment für Server in openQRM"
-
-type_title = "Plugin-Typ"
-type_content = "<span class="pill">Deployment</span>"
-
-documentation_title = "Dokumentation"
-use_case_title = "Anwendungsfall"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/lang/de.puppet.ini b/openQRM-5.3.50-CE/src/plugins/puppet/web/lang/de.puppet.ini
deleted file mode 100644
index 9c59e0e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/lang/de.puppet.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[select]
-tab = "Server"
-label = "Puppet Server"
-id = "ID"
-appliance = "Server"
-name = "Name"
-resource = "Resource"
-groups = "Gruppe"
-action_edit = "bearbeiten"
-please_wait = "Lade. Bitte warten .."
-[edit]
-tab = "Bearbeiten"
-label = "Puppet Gruppen für Server %s"
-puppet_groups = "Puppet Gruppen"
-msg_updated = "Server %s aktuallisiert"
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[config]
-tab = "Einstellungen"
-label = "Puppet Einstellungen"
-msg_updated = "Puppet Einstellungen aktuallisiert"
-please_wait = "Lade. Bitte warten .."
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/lang/en.puppet-about.ini b/openQRM-5.3.50-CE/src/plugins/puppet/web/lang/en.puppet-about.ini
deleted file mode 100644
index 12b51ae..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/lang/en.puppet-about.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-[documentation]
-tab = "About Puppet"
-label = "About Puppet"
-introduction_title = "Introduction"
-introduction_content = "<p>The puppet plugin provides automated configuration management for servers in openQRM. It seamlessly integrates <a href='http://projects.puppetlabs.com/projects/puppet' target='_blank'>puppet</a> within the openQRM GUI and assists to put specific server into pre-made or custom puppet classes.</p>
-			<p>By enabling the plugin the puppet environment (server and client) is pre-configured and initialized automatically according to best-practice experiences e.g. by keeping the puppet configuration within a svn repository.</p>
-			<p>The puppet configuration is organized in 'classes' 'groups' and 'Server'. Custom custom classes can be added to the class-directory. Classes should be combined to 'groups' these will be automatically displayed in the puppet plugin.</p>
-			<p>The puppet configuration repository is also available for external svn clients. To check out the puppet repository please run:"
-introduction_title1 = "Assigning applications to server"
-introduction_content1 = "<ol><li>Go to the 'Server' in the puppet plugin menu</li>
-							<li>Select an server to be configured via puppet</li>
-							<li>Select the puppet groups the server should belong to</li>
-						</ol>
-						Within short time the puppet server will distribute the new configuration to the server automatically."
-
-requirements_title = "Requirements"
-requirements_list = "The puppet plugin depends on the DNS plugin! Please make sure to have the DNS plugin enabled and started before."
-
-tested_title = "Tested with"
-tested_content = "This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions."
-
-provides_title = "Provides"
-provides_list = "Automated configuration management for Server in openQRM"
-
-type_title = "Plugin type"
-type_content = "Deployment"
-
-documentation_title = "Documentation"
-use_case_title = "Use case"
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/lang/en.puppet.ini b/openQRM-5.3.50-CE/src/plugins/puppet/web/lang/en.puppet.ini
deleted file mode 100644
index 0cf2534..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/lang/en.puppet.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[select]
-tab = "Server"
-label = "Puppet Server"
-id = "ID"
-appliance = "Server"
-name = "Name"
-resource = "Resource"
-groups = "Groups"
-action_edit = "edit"
-please_wait = "Loading. Please wait .."
-[edit]
-tab = "Edit"
-label = "Puppet groups for Server %s"
-puppet_groups = "Puppet Groups"
-msg_updated = "Updated Server %s"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[config]
-tab = "Config"
-label = "Configure Puppet"
-msg_updated = "Updated Puppet Config"
-please_wait = "Loading. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/puppet/web/menu.txt
deleted file mode 100644
index 635eca3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/menu.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|Puppet
-...|Appliances|index.php?plugin=puppet|Apply Puppet Classes to Appliances
-...|Configuration|index.php?plugin=puppet&puppet_action=config|Configure Puppet
-...|About|index.php?plugin=puppet&controller=puppet-about|How to use
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/openqrm-puppet-appliance-edit-hook.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/openqrm-puppet-appliance-edit-hook.php
deleted file mode 100644
index 2914687..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/openqrm-puppet-appliance-edit-hook.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-function get_puppet_appliance_edit($appliance_id, $openqrm, $response) {
-	$appliance = new appliance();
-	$appliance->get_instance_by_id($appliance_id);
-	$plugin_title = "Configure Application on Appliance ".$appliance->name;
-
-	$a = $response->html->a();
-	$a->label = '<image height="24" width="24" alt="'.$plugin_title.'" title="'.$plugin_title.'" src="'.$openqrm->get('baseurl').'/plugins/puppet/img/plugin.png">';
-	$a->href = $openqrm->get('baseurl').'/index.php?base=appliance&appliance_action=load_edit&aplugin=puppet&puppet_action=edit&appliance_id='.$appliance_id;
-	return $a;
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/openqrm-puppet-appliance-hook.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/openqrm-puppet-appliance-hook.php
deleted file mode 100644
index 15411c0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/openqrm-puppet-appliance-hook.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-
-
-function openqrm_puppet_appliance($cmd, $appliance_fields) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	$appliance_id=$appliance_fields["appliance_id"];
-	$appliance_name=$appliance_fields["appliance_name"];
-	$resource = new resource();
-	$resource->get_instance_by_id($appliance_fields["appliance_resources"]);
-	$appliance_ip=$resource->ip;
-	// check appliance values, maybe we are in update and they are incomplete
-	if (($resource->id == "-1") || ($resource->id == "")) {
-		return;
-	}
-
-
-	$event->log("openqrm_new_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-puppet-appliance-hook.php", "Handling $cmd event $appliance_id/$appliance_name/$appliance_ip", "", "", 0, 0, $appliance_id);
-	switch($cmd) {
-		case "start":
-			$openqrm_server = new openqrm_server();
-			$openqrm_server->send_command("$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/bin/openqrm-puppet-manager start $appliance_id $appliance_name $appliance_ip --openqrm-cmd-mode background");
-			break;
-		case "stop":
-			$openqrm_server = new openqrm_server();
-			$openqrm_server->send_command("$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/bin/openqrm-puppet-manager stop $appliance_id $appliance_name $appliance_ip --openqrm-cmd-mode background");
-			break;
-
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/openqrm-puppet-cloud-application-hook.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/openqrm-puppet-cloud-application-hook.php
deleted file mode 100644
index e8d0743..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/openqrm-puppet-cloud-application-hook.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once $RootDir."/include/user.inc.php";
-require_once $RootDir."/class/event.class.php";
-require_once $RootDir."/class/resource.class.php";
-require_once $RootDir."/class/openqrm_server.class.php";
-require_once $RootDir."/include/openqrm-server-config.php";
-require_once $RootDir."/plugins/puppet/class/puppet.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-
-
-// cloud hook to get the available application groups
-function openqrm_puppet_get_cloud_applications() {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-
-	$puppet_group_list = array();
-	$puppet = new puppet();
-	$puppet_group_array = $puppet->get_available_groups();
-	foreach ($puppet_group_array as $index => $puppet_app) {
-		$puppet_group_list[] = "puppet/".$puppet_app;
-	}
-	return $puppet_group_list;
-}
-
-
-
-// cloud hook to get the supported os version by application
-function openqrm_puppet_get_supported_os_version($application) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	$puppet = new puppet();
-	$puppet_os_array = $puppet->get_supported_os($application);
-	return $puppet_os_array;
-}
-
-
-
-// cloud hook to set applications for a cloud server
-function openqrm_puppet_set_cloud_applications($appliance_name, $application_array) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	$puppet = new puppet();
-	$puppet->set_groups($appliance_name, $application_array);
-}
-
-
-// cloud hook to remove applications from a cloud server
-function openqrm_puppet_remove_cloud_applications($appliance_name) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	$puppet = new puppet();
-	$puppet->remove_appliance($appliance_name);
-}
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/openqrm-puppet-cloud-product-hook.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/openqrm-puppet-cloud-product-hook.php
deleted file mode 100644
index 04f31a0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/openqrm-puppet-cloud-product-hook.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once $RootDir."/plugins/puppet/class/puppet.class.php";
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $IMAGE_AUTHENTICATION_TABLE;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $openqrm_server;
-$event = new event();
-global $event;
-
-
-
-function openqrm_puppet_cloud_product($cmd, $cloud_hook_config) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RootDir;
-
-	$openqrm_server = new openqrm_server();
-
-	$event->log("openqrm_puppet_cloud_product", $_SERVER['REQUEST_TIME'], 5, "openqrm-puppet-cloud-product-hook.php", "Handling ".$cmd." event", "", "", 0, 0, 0);
-	switch($cmd) {
-			case "add":
-				$event->log("openqrm_puppet_cloud_product", $_SERVER['REQUEST_TIME'], 5, "openqrm-puppet-cloud-product-hook.php", "Handling cloud-product ".$cmd." event", "", "", 0, 0, 0);
-				// create application products
-				$next_sort_id = 0;
-				$db=openqrm_get_db_connection();
-				$puppet = new puppet();
-				$puppet_group_array = $puppet->get_available_groups();
-				foreach ($puppet_group_array as $index => $puppet_app) {
-					$event->log("openqrm_puppet_cloud_product", $_SERVER['REQUEST_TIME'], 5, "openqrm-puppet-cloud-product-hook.php", "Adding application ".$puppet_app." as cloud-product", "", "", 0, 0, 0);
-					$cloud_product_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$create_application_cloudselector_config = "insert into cloud_selector (id, type, sort_id, quantity, price, name, description, state) VALUES (".$cloud_product_id.", 'application', ".$next_sort_id.", 'puppet/".$puppet_app."', 1, '".$puppet_app."', '".$puppet_app." via puppet', 1);";
-					$recordSet = $db->Execute($create_application_cloudselector_config);
-					$next_sort_id++;
-				}
-				break;
-				
-			case "remove":
-				$cloud_product_class = $RootDir."/plugins/cloud/class/cloudselector.class.php";
-				if (file_exists($cloud_product_class)) {
-					require_once $cloud_product_class;
-					$cloud_selector = new cloudselector();
-					$cloud_selector_id_ar = $cloud_selector->get_all_ids();
-					foreach ($cloud_selector_id_ar as $key => $value) {
-						$id = $value['id'];
-						$cloud_selector->get_instance_by_id($id);
-						$pos = strpos($cloud_selector->quantity, 'puppet/');
-						if ($pos !== false) {
-							$event->log("openqrm_puppet_cloud_product", $_SERVER['REQUEST_TIME'], 5, "openqrm-puppet-cloud-product-hook.php", "Removing application ".$cloud_selector->quantity." from cloud-products", "", "", 0, 0, 0);
-							$cloud_selector->remove($id);
-						}
-					}
-				}
-				break;
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/openqrm-puppet-resource-hook.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/openqrm-puppet-resource-hook.php
deleted file mode 100644
index dd10a04..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/openqrm-puppet-resource-hook.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-
-
-function openqrm_puppet_resource($cmd, $resource_fields) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	$resource_id=$resource_fields["resource_id"];
-	if ($resource_id == '') {
-	    $event->log("openqrm_puppet_resource", $_SERVER['REQUEST_TIME'], 5, "openqrm_puppet_resource.php", "Not handling ".$cmd." - empty resource-id", "", "", 0, 0, 0);
-	    return;
-	}
-	$resource = new resource();
-	$resource->get_instance_by_id($resource_id);
-	$resource_ip=$resource->ip;
-	$resource_name=$resource->hostname;
-
-	$event->log("openqrm_puppet_resource", $_SERVER['REQUEST_TIME'], 5, "openqrm-puppet-resource-hook.php", "Handling $cmd event $resource_id/$resource_name/$resource_ip", "", "", 0, 0, $resource_id);
-
-	// we do only care if we serving an appliance
-	$appliance = new appliance();
-	$appliance_record_set = array();
-	$appliance_id_array = array();
-	$appliance_record_set = $appliance->get_all_ids();
-	// the appliance_array from getlist is a 2-dimensional array
-	foreach ($appliance_record_set as $index => $appliance_id_array) {
-
-		foreach ($appliance_id_array as $index => $id) {
-			$tapp = new appliance();
-			$tapp->get_instance_by_id($id);
-			$tapp_state = $tapp->state;
-			$tapp_resources = $tapp->resources;
-
-			if (!strcmp($tapp_state, "active")) {
-
-				if ($tapp_resources == $resource_id) {
-					// we found the resources active appliance, running the cmd
-
-					$appliance_name = $tapp->name;
-					switch($cmd) {
-						case "start":
-							$openqrm_server = new openqrm_server();
-							$openqrm_server->send_command("$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/bin/openqrm-puppet-manager start $id $appliance_name $resource_ip --openqrm-cmd-mode background");
-							break;
-						case "stop":
-							$openqrm_server = new openqrm_server();
-							$openqrm_server->send_command("$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/puppet/bin/openqrm-puppet-manager stop $id $appliance_name $resource_ip --openqrm-cmd-mode background");
-							break;
-					}
-				}
-			}
-		}
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/puppet-action.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/puppet-action.php
deleted file mode 100644
index 02b6ad4..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/puppet-action.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-$thisfile = basename($_SERVER['PHP_SELF']);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-$BaseDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/';
-$PuppetDir = $_SERVER["DOCUMENT_ROOT"].'/puppet-portal/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-// filter inputs
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-
-$cloud_product_hook = $RootDir.'/plugins/puppet/openqrm-puppet-cloud-product-hook.php';
-$cloud_selector_class = $RootDir.'/plugins/cloud/class/cloudselector.class.php';
-
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-$puppet_command = $request->get('puppet_command');
-$puppet_domain = $request->get('puppet_domain');
-
-
-// special puppet classes
-require_once "$RootDir/plugins/puppet/class/puppetconfig.class.php";
-global $PUPPET_USER_TABLE;
-global $PUPPET_REQUEST_TABLE;
-
-global $OPENQRM_SERVER_BASE_DIR;
-$refresh_delay=5;
-
-$event = new event();
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $event;
-
-
-// user/role authentication
-if ($OPENQRM_USER->role != "administrator") {
-	$event->log("authorization", $_SERVER['REQUEST_TIME'], 1, "puppet-action", "Un-Authorized access to puppet-actions from $OPENQRM_USER->name", "", "", 0, 0, 0);
-	exit();
-}
-
-
-// gather request parameter in array
-foreach ($_REQUEST as $key => $value) {
-	if (strncmp($key, "cr_", 3) == 0) {
-		$request_fields[$key] = $value;
-	}
-}
-
-
-
-// main
-$event->log("$puppet_command", $_SERVER['REQUEST_TIME'], 5, "puppet-action", "Processing puppet command $puppet_command", "", "", 0, 0, 0);
-
-	switch ($puppet_command) {
-
-		case 'init':
-			// this command creates the following table
-			//
-			// -> puppetconfig
-			// cc_id BIGINT
-			// cc_key VARCHAR(50)
-			// cc_value VARCHAR(50)
-
-			$create_puppet_config = "create table puppet_config(cc_id BIGINT, cc_key VARCHAR(50), cc_value VARCHAR(50))";
-			$db=openqrm_get_db_connection();
-			$recordSet = $db->Execute($create_puppet_config);
-			// create the default configuration
-			$create_default_puppet_config1 = "insert into puppet_config(cc_id, cc_key, cc_value) values (1, 'ca_auto_sign', 'true')";
-			$create_default_puppet_config2 = "insert into puppet_config(cc_id, cc_key, cc_value) values (2, 'domain_name', '".$puppet_domain."')";
-			$recordSet = $db->Execute($create_default_puppet_config1);
-			$recordSet = $db->Execute($create_default_puppet_config2);
-			$db->Close();
-			
-			if (file_exists($cloud_product_hook)) {
-				require_once $cloud_product_hook;
-				openqrm_puppet_cloud_product("add", NULL);
-			}
-			break;
-
-		case 'uninstall':
-			$drop_puppet_config = "drop table puppet_config";
-			$db=openqrm_get_db_connection();
-			$recordSet = $db->Execute($drop_puppet_config);
-			$db->Close();
-			
-			if (file_exists($cloud_product_hook)) {
-				require_once $cloud_product_hook;
-				openqrm_puppet_cloud_product("remove", NULL);
-			}
-			break;
-
-
-		default:
-			$event->log("$puppet_command", $_SERVER['REQUEST_TIME'], 3, "puppet-action", "No such event command ($puppet_command)", "", "", 0, 0, 0);
-			break;
-
-
-	}
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/tpl/puppet-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/tpl/puppet-about-documentation.tpl.php
deleted file mode 100644
index f17797c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/tpl/puppet-about-documentation.tpl.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-
-	<div class="span7">
-
-		<h3>{introduction_title}</h3>
-		{introduction_content}
-		<pre>{introduction_command}</pre>
-	
-		<h3>{introduction_title1}</h3>
-		{introduction_content1}
-	
-		<h3>{provides_title}</h3>
-		{provides_list}
-	
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-	</div>
-
-	<div class="span2 offset1">
-		<h3>{type_title}</h3>
-		<span class="pill">{type_content}</span>
-	
-		<h3>{tested_title}</h3>
-		{tested_content}
-	</div>
-
-
-</div>
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/tpl/puppet-apply.tpl.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/tpl/puppet-apply.tpl.php
deleted file mode 100644
index 278d22a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/tpl/puppet-apply.tpl.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>Apply Puppet Classes II</h2>
-
-<h4>Please Select the Puppet-groups for the appliance {appliance_name}</h4>
-<br>
-{puppet_groups_table}
-<a href="puppet-manager.php"><- back</a>
-<br>
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/tpl/puppet-config.tpl.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/tpl/puppet-config.tpl.php
deleted file mode 100644
index f9bf3ac..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/tpl/puppet-config.tpl.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-
-<div id="form">
-	<form action="{thisfile}" method="POST">
-	{form}
-	{fields}
-	<br>
-	{submit}
-	</form>
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/tpl/puppet-edit.tpl.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/tpl/puppet-edit.tpl.php
deleted file mode 100644
index 268154c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/tpl/puppet-edit.tpl.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div id="puppet_groups">
-	<form action="{thisfile}" method="POST">
-	{form}
-	<div style="float:left;margin: 0 0 0 20px">{input}</div>
-	<div style="line-height:0px;height:0px;clear:both;" class="floatbreaker">&#160;</div>
-	<div id="buttons">{submit}&#160;{cancel}</div>
-	</form>
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/puppet/web/tpl/puppet-select.tpl.php b/openQRM-5.3.50-CE/src/plugins/puppet/web/tpl/puppet-select.tpl.php
deleted file mode 100644
index bd68de0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/puppet/web/tpl/puppet-select.tpl.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-{table}
diff --git a/openQRM-5.3.50-CE/src/plugins/role-administration/Makefile b/openQRM-5.3.50-CE/src/plugins/role-administration/Makefile
deleted file mode 100644
index e47bf5e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/role-administration/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/role-administration/etc
-	cp etc/openqrm-plugin-role-administration.conf /usr/share/openqrm/plugins/role-administration/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/role-administration/etc/openqrm-plugin-role-administration.conf b/openQRM-5.3.50-CE/src/plugins/role-administration/etc/openqrm-plugin-role-administration.conf
deleted file mode 100644
index 77f3a25..0000000
--- a/openQRM-5.3.50-CE/src/plugins/role-administration/etc/openqrm-plugin-role-administration.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Role-administration provides permission management for openQRM Administrator Usergroups. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="management"
diff --git a/openQRM-5.3.50-CE/src/plugins/sanboot-storage/Makefile b/openQRM-5.3.50-CE/src/plugins/sanboot-storage/Makefile
deleted file mode 100644
index e16b489..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sanboot-storage/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/sanboot-storage/etc
-	cp etc/openqrm-plugin-sanboot-storage.conf /usr/share/openqrm/plugins/sanboot-storage/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/sanboot-storage/etc/openqrm-plugin-sanboot-storage.conf b/openQRM-5.3.50-CE/src/plugins/sanboot-storage/etc/openqrm-plugin-sanboot-storage.conf
deleted file mode 100644
index 3a12bad..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sanboot-storage/etc/openqrm-plugin-sanboot-storage.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Integrates <a href='http://etherboot.org/wiki/start' target='_BLANK'>gPXE</a> to boot Windows Systems directly from an iSCSI or AOE SAN (network-deployment) <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="storage"
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/Makefile b/openQRM-5.3.50-CE/src/plugins/sshterm/Makefile
deleted file mode 100644
index 31c0e34..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# this is the openQRM sshterm-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-	../../make-assistant openqrm_cache_or_download sshterm etc/build.conf/sshterm.conf
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/sshterm $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/etc/build.conf
-	. $(OPENQRM_SERVER_CONF) && cp etc/build.conf/sshterm*.conf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/etc/build.conf/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web/img
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web/css/
-
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web/js
-	. $(OPENQRM_SERVER_CONF) && cp web/js/*.js $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web/js/
-
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web/lang/
-	. $(OPENQRM_SERVER_CONF) && . etc/build.conf/sshterm.conf && if ! tar -C $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/ -xzf $$OPENQRM_BUILD_TMP_DIR/openqrm-build/sshterm/source/ajaxterm-$$OPENQRM_SOURCE_VERSION.tar.gz 2>/dev/null; then tar -C $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/ -xzf ../../$$OPENQRM_BUILD_TMP_DIR/openqrm-build/sshterm/source/ajaxterm-$$OPENQRM_SOURCE_VERSION.tar.gz; fi
-	. $(OPENQRM_SERVER_CONF) && tar -C $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm -czf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web/boot-service-sshterm.tgz include/ etc/init.d/sshterm etc/openqrm-plugin-sshterm.conf ajaxterm
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/sshterm
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/sshterm/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/etc/build.conf/sshterm.conf b/openQRM-5.3.50-CE/src/plugins/sshterm/etc/build.conf/sshterm.conf
deleted file mode 100644
index 85fe6c4..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/etc/build.conf/sshterm.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# Below the download locations for third-party components are defined
-# openqrm-plugin-sshterm-components.tgz provides a stripped ajaxterm and a
-# static compiled pound as the reverse ssl-proxy
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SOURCE_VERSION="2.1"
-#OPENQRM_SOURCE_DOWNLOAD="http://web-shell.googlecode.com/files/WebShell-$OPENQRM_SOURCE_VERSION.zip"
-OPENQRM_SOURCE_DOWNLOAD="http://support.openqrm-enterprise.com/openqrm-build/5.3/plugins/sshterm/ajaxterm-$OPENQRM_SOURCE_VERSION.tar.gz"
-OPENQRM_SOURCE_BINARY_RESULT=""
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/etc/init.d/openqrm-plugin-sshterm b/openQRM-5.3.50-CE/src/plugins/sshterm/etc/init.d/openqrm-plugin-sshterm
deleted file mode 100644
index c261630..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/etc/init.d/openqrm-plugin-sshterm
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/bash
-# init script for the openQRM sshterm plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/include/openqrm-plugin-sshterm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/etc/openqrm-plugin-sshterm.conf
-# for the post-event to work
-openqrm_server_get_config
-OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-resource_id=0
-resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-# which screen binary to use
-if [ -x /usr/bin/screen.real ]; then
-	RUNSCREEN="/usr/bin/screen.real"
-else
-	RUNSCREEN=`which screen`
-fi
-
-
-function openqrm_plugin_sshterm_start() {
-	echo "Starting the openQRM sshterm-plugin"
-	local CURRENTDIR=`pwd`
-	openqrm_plugin_sshterm_stop 1>/dev/null 2>&1
-	# generate cert
-	cd $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/ajaxterm/
-
-	if [ ! -f /root/.ajaxterm/ajaxterm.pem ]; then
-		umask 077
-		mkdir -p /root/.ajaxterm/
-		openssl req  -config "make_certificate.cfg" -keyout "/root/.ajaxterm/ajaxterm.pem" -newkey rsa:1024 -nodes -x509 -days 365 -out "/root/.ajaxterm/ajaxterm.pem"
-	fi
-	# patch SocketServer.py for python 2.7
-	# webshell/python bug http://code.google.com/p/web-shell/issues/detail?id=67&q=2.7
-	if [ -f /usr/lib/python2.7/SocketServer.py ]; then
-		if [ ! -f /usr/lib/python2.7/SocketServer.py.openqrm-backup ]; then
-			cp -f /usr/lib/python2.7/SocketServer.py /usr/lib/python2.7/SocketServer.py.openqrm-backup
-		fi
-		# pls preserve the line breaks in the following sed command
-		if ! grep openQRM /usr/lib/python2.7/SocketServer.py 1>/dev/null; then
-			sed -i -e 's/request.shutdown(socket.SHUT_WR)/request.shutdown(socket.SHUT_WR)\
-		# openQRM: fix for webshell in combination with python 2\.7\
-        except TypeError:\
-            request.shutdown()\
-/' /usr/lib/python2.7/SocketServer.py
-		fi
-	fi
-	# start the ajaxterm
-	SCREEN_NAME=`date +%T%x | sed -e "s/://g" | sed -e "s#/##g"`
-	$RUNSCREEN -dmS $SCREEN_NAME ./ajaxterm.py --host=0.0.0.0 --port=$OPENQRM_PLUGIN_WEBSHELL_PORT  --cert=/root/.ajaxterm/ajaxterm.pem
-	cd $CURRENTDIR
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/sshterm/.running
-	return 0
-}
-
-function openqrm_plugin_sshterm_stop() {
-	echo "Stopping the openQRM sshterm-plugin"
-	AJAXTERM_PID=`ps ax | grep ajaxterm.py | grep -v grep | awk {' print $1 '}`
-	for PID in $AJAXTERM_PID; do
-		kill $PID
-	done
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/sshterm/.running
-	return 0
-}
-
-
-function openqrm_plugin_sshterm_init() {
-	echo "Initializing the openQRM sshterm-plugin"
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/sshterm
-	# link the boot-service
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/web/boot-service-sshterm.tgz $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-sshterm.tgz
-	return 0
-}
-
-
-function openqrm_plugin_sshterm_uninstall() {
-	echo "Uninstalling the openQRM sshterm-plugin"
-	openqrm_plugin_sshterm_stop
-	# remove bootservice
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-sshterm.tgz
-	# unlinking the web dir
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/sshterm
-}
-
-
-case "$1" in
-	start)
-		openqrm_plugin_sshterm_start
-		;;
-	stop)
-		openqrm_plugin_sshterm_stop
-		;;
-	restart)
-		openqrm_plugin_sshterm_stop
-		sleep 1
-		openqrm_plugin_sshterm_start
-		;;
-	init)
-		openqrm_plugin_sshterm_init
-		;;
-	uninstall)
-		openqrm_plugin_sshterm_uninstall
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall|createcert}"
-		exit 1
-
-esac
-exit $?
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/etc/init.d/openqrm-plugin-sshterm.postinstall b/openQRM-5.3.50-CE/src/plugins/sshterm/etc/init.d/openqrm-plugin-sshterm.postinstall
deleted file mode 100644
index 6d28dbc..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/etc/init.d/openqrm-plugin-sshterm.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-sshterm postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/etc/init.d/openqrm-plugin-sshterm.preremove b/openQRM-5.3.50-CE/src/plugins/sshterm/etc/init.d/openqrm-plugin-sshterm.preremove
deleted file mode 100644
index 66c5ab1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/etc/init.d/openqrm-plugin-sshterm.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-sshterm preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-sshterm stop
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/etc/init.d/sshterm b/openQRM-5.3.50-CE/src/plugins/sshterm/etc/init.d/sshterm
deleted file mode 100644
index e86393a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/etc/init.d/sshterm
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/bash
-# this is the boot-service init script for the sshterm resources
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-# for including the package functions
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/include/openqrm-plugin-sshterm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/etc/openqrm-plugin-sshterm.conf
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-# do not run on idle resources
-if [ "$resource_image" == "idle" ]; then
-	exit 0
-fi
-# also do not run before the real init of the rootfs
-# if we have this file /etc/initrd-devices.conf we are still in the initrd
-if [ -f /etc/initrd-devices.conf ]; then
-	exit 0
-fi
-
-
-function sshterm_start() {
-	echo "Starting the openQRM sshterm-plugin"
-	local CURRENTDIR=`pwd`
-	sshterm_stop 1>/dev/null 2>&1
-	if ! which screen 1>/dev/null; then
-		export FORCE_INSTALL=true
-		openqrm_install_os_dependency screen
-	fi
-	if ! which openssl 1>/dev/null; then
-		export FORCE_INSTALL=true
-		openqrm_install_os_dependency openssl
-	fi
-	if [ -x /usr/bin/screen.real ]; then
-		RUNSCREEN="/usr/bin/screen.real"
-	else
-		RUNSCREEN=`which screen`
-	fi
-	if [ -f /etc/debian_version ]; then
-		if ! dpkg-query -s python3-openssl 1>/dev/null 2>&1; then
-			export FORCE_INSTALL=true
-			openqrm_install_os_dependency python3-openssl
-		fi
-	elif [ -f /etc/redhat-release ]; then
-		if ! rpm -q pyOpenSSL 1>/dev/null 2>&1; then
-			export FORCE_INSTALL=true
-			openqrm_install_os_dependency pyOpenSSL
-		fi
-	elif [ -f /etc/SuSE-release ]; then
-		if ! rpm -q python3-openssl 1>/dev/null 2>&1; then
-			export FORCE_INSTALL=true
-			openqrm_install_os_dependency python3-openssl
-		fi
-	fi
-	# generate cert
-	cd $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/ajaxterm/
-	if [ ! -f /root/.ajaxterm/ajaxterm.pem ]; then
-		umask 077
-		mkdir -p /root/.ajaxterm/
-		openssl req  -config "make_certificate.cfg" -keyout "/root/.ajaxterm/ajaxterm.pem" -newkey rsa:1024 -nodes -x509 -days 365 -out "/root/.ajaxterm/ajaxterm.pem"
-	fi
-	# patch SocketServer.py for python 2.7
-	# webshell/python bug http://code.google.com/p/web-shell/issues/detail?id=67&q=2.7
-	if [ -f /usr/lib/python2.7/SocketServer.py ]; then
-		if [ ! -f /usr/lib/python2.7/SocketServer.py.openqrm-backup ]; then
-			cp -f /usr/lib/python2.7/SocketServer.py /usr/lib/python2.7/SocketServer.py.openqrm-backup
-		fi
-		# pls preserve the line breaks in the following sed command
-		if ! grep openQRM /usr/lib/python2.7/SocketServer.py 1>/dev/null; then
-			sed -i -e 's/request.shutdown(socket.SHUT_WR)/request.shutdown(socket.SHUT_WR)\
-		# openQRM: fix for webshell in combination with python 2\.7\
-        except TypeError:\
-            request.shutdown()\
-/' /usr/lib/python2.7/SocketServer.py
-		fi
-	fi
-	# apply css
-	SCREEN_NAME=`date +%T%x | sed -e "s/://g" | sed -e "s#/##g"`
-	$RUNSCREEN -dmS $SCREEN_NAME ./ajaxterm.py --host=0.0.0.0 --port=$OPENQRM_PLUGIN_WEBSHELL_PORT  --cert=/root/.ajaxterm/ajaxterm.pem
-	cd $CURRENTDIR
-	return 0
-}
-
-
-function sshterm_stop() {
-	echo "Stopping the openQRM sshterm-plugin"
-	AJAXTERM_PID=`ps ax | grep ajaxterm.py | grep -v grep | awk {' print $1 '}`
-	for PID in $AJAXTERM_PID; do
-		kill $PID
-	done
-}
-
-
-
-case "$1" in
-	start)
-		sshterm_start
-		;;
-	stop)
-		sshterm_stop
-		;;
-	restart)
-		sshterm_stop
-		sleep 1
-		sshterm_start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|createcert}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/etc/openqrm-plugin-sshterm.conf b/openQRM-5.3.50-CE/src/plugins/sshterm/etc/openqrm-plugin-sshterm.conf
deleted file mode 100644
index e0fe595..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/etc/openqrm-plugin-sshterm.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-# this is the openQRM-plugin-sshterm info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openssl, screen, python3-openssl, openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openssl, screen, pyOpenSSL, openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openssl, screen, python-pyOpenSSL, openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="Integrates <a href='http://web-shell.googlecode.com/' target='_BLANK'>WebShell</a> providing a secure login to the openQRM-server and the managed resources through the Web-interface."
-OPENQRM_PLUGIN_TYPE="management"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES=""
-
-# define which port to use for the ajaxterm reverse proxy
-OPENQRM_PLUGIN_WEBSHELL_PORT=8022
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/etc/openqrm-plugin-sshterm.conf"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/include/openqrm-plugin-sshterm-functions b/openQRM-5.3.50-CE/src/plugins/sshterm/include/openqrm-plugin-sshterm-functions
deleted file mode 100644
index a8eacff..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/include/openqrm-plugin-sshterm-functions
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-# this is the functions file for the sshterm-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	echo "ERROR: Please export OPENQRM_SERVER_BASE_DIR before sourcing $0"
-	exit 1
-fi
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/etc/openqrm-plugin-sshterm.conf
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/include/openqrm-sshterm-css.template b/openQRM-5.3.50-CE/src/plugins/sshterm/include/openqrm-sshterm-css.template
deleted file mode 100644
index d45fac2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/include/openqrm-sshterm-css.template
+++ /dev/null
@@ -1,142 +0,0 @@
-body {
-margin:25px 25px 25px 25px;
-padding:0;
-background:#141414;
-color:#fff;
-}
-
-.container {
-margin:0 auto 0 auto;
-width:480px;
-float:left;
-}
-
-#term {
-position:absolute;
-margin:25px 25px 25px 25px;
-padding:0;
-minimum-height:264px;
-font:16px Andale Mono, monospace;
-white-space:pre;
-background:#DDDDDD;
-}
-
-span.ul { text-decoration: underline; }
-
-span.f0 { color: #000000; }
-span.f1 { color: #c00006; }
-span.f2 { color: #1bc806; }
-span.f3 { color: #c3c609; }
-span.f4 { color: #0000c2; }
-span.f5 { color: #bf00c2; }
-span.f6 { color: #19c4c2; }
-span.f7 { color: #f2f2f2; }
-span.fc { color: transparent; }	/* Concealed */
-span.fe { color: #000000; }		/* Negative fg */
-span.ff { color: #000000; }		/* Default fg */
-
-span.b0 { background-color: #000000; }
-span.b1 { background-color: #cc2300; }
-span.b2 { background-color: #00cc00; }
-span.b3 { background-color: #cccc00; }
-span.b4 { background-color: #0e2acc; }
-span.b5 { background-color: #cc34cc; }
-span.b6 { background-color: #00cccc; }
-span.b7 { background-color: #f5f5f5; }
-span.bc { background-color: #555555; }		/* Cursor */
-span.be { background-color: transparent; }	/* Default bg */
-span.bf { background-color: #ffffff; }		/* Negative bg */
-
-.olCtrl {
-display:none;
-position:absolute;
-top:0px;
-}
-.olAlert {
-display:none;
-position:absolute;
-top:0px;
-margin:78px 0 0 110px;
-width:260px;
-height:66px;
-padding:42px 0 0px 0;
-color:#fff;
-text-align:center;
-font:24px sans-serif;
-background:#141414;
-opacity:0.7;
-}
-
-.hd {
-width:480px;
-height:64px;
-}
-.h {
-float:left;
-width:60px;
-height:30px;
-margin:10px 0 0 0;
-padding:8px 0 0 0;
-font:12px sans-serif;
-text-align:center;
-color:#fff;
-cursor:pointer;
-}
-.hr {
-margin:0 10px 0 0;
-float:right;
-}
-.hb {
-margin:10px 0 0 10px;
-padding:8px 0 0 3px;
-background:url('back.png') no-repeat;
-}
-.hscroll {
-background:url('head.png') no-repeat -180px 0;
-}
-
-.kd {
-height:50px;
-}
-.k {
-float:left;
-height:36px;
-margin:25px 25px 25px 25px;
-padding:14px 0 0 0;
-background:url('cell.png') no-repeat top right;
-cursor:pointer;
-font:22px sans-serif;
-color:#fff;
-text-align:center;
-}
-.k0 {
-width:48px;
-background:url('cell.png') no-repeat top right;
-}
-.k0s {
-width:48px;
-background:url('cells.png') no-repeat top right;
-}
-.k6 {
-width:80px;
-background:url('cell.png') no-repeat top right;
-}
-.k6s {
-width:80px;
-background:url('cells.png') no-repeat top right;
-}
-.k2 {
-width:400px;
-background:url('cell.png') no-repeat top right;
-}
-
-.t {
-width:399px;
-margin:-4px 0 0 0;
-padding:4px 0 4px 0;
-background:#000;
-border:0;
-font:22px sans-serif;
-color:#fff;
-opacity:0.5;
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/web/class/sshterm-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/sshterm/web/class/sshterm-about.controller.class.php
deleted file mode 100644
index 1a313db..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/web/class/sshterm-about.controller.class.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/**
- * sshterm-about Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class sshterm_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'sshterm_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'sshterm_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'sshterm_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'sshterm_about_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About SshTerm',
-		'label' => 'About SshTerm',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The SshTerm Plugin integrates <a href="http://web-shell.googlecode.com" target="_BLANK">WebShell</a> into openQRM.
-			It provides a secure login to the openQRM Server and the managed Systems through the Web Interface.
-			No manual configuration is needed.',
-
-		'requirements_title' => 'Requirements',
-		'requirements_list' => 'none',
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-		'provides_title' => 'Provides',
-		'provides_list' => 'SSH Login through the openQRM Web Interface',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Management',
-		'documentation_title' => 'Documentation',
-		'use_case_title' => 'Use-Case',
-	),
-	'usage' => array (
-		'tab' => 'About SshTerm',
-		'label' => 'SshTerm Use-Cases',
-	),
-
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/sshterm/lang", 'sshterm-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/sshterm/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "documentation";
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-			case 'bootservice':
-				$content[] = $this->bootservice(true);
-			break;
-			case 'vms':
-				$content[] = $this->vms(true);
-			break;
-			case 'usage':
-				$content[] = $this->usage(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About SshTerm
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/sshterm/class/sshterm-about.documentation.class.php');
-			$controller = new sshterm_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Boot-Service
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function bootservice( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/sshterm/class/sshterm-about.bootservice.class.php');
-			$controller = new sshterm_about_bootservice($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['bootservice'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['bootservice']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'bootservice' );
-		$content['onclick'] = false;
-		if($this->action === 'bootservice'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-
-	//--------------------------------------------
-	/**
-	 * About SshTerm VM management
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function vms( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/sshterm/class/sshterm-about.vms.class.php');
-			$controller = new sshterm_about_vms($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['vms'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['vms']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'vms' );
-		$content['onclick'] = false;
-		if($this->action === 'vms'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-	//--------------------------------------------
-	/**
-	 * About SshTerm Use-Cases
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function usage( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/sshterm/class/sshterm-about.usage.class.php');
-			$controller = new sshterm_about_usage($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['usage'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['usage']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'usage' );
-		$content['onclick'] = false;
-		if($this->action === 'usage'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/web/class/sshterm-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/sshterm/web/class/sshterm-about.documentation.class.php
deleted file mode 100644
index db0ff9d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/web/class/sshterm-about.documentation.class.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * sshterm-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class sshterm_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'sshterm_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "sshterm_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-		$this->basedir    = $this->openqrm->get('basedir');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/sshterm-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['provides_title'], 'provides_title');
-		$t->add($this->lang['provides_list'], 'provides_list');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/web/class/sshterm.controller.class.php b/openQRM-5.3.50-CE/src/plugins/sshterm/web/class/sshterm.controller.class.php
deleted file mode 100644
index b9fab84..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/web/class/sshterm.controller.class.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/**
- * SSHTerm Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class sshterm_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'sshterm_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "sshterm_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'sshterm_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'sshterm_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array (
-		'tab' => 'SSH Login',
-		'label' => 'SSH Login',
-		'action_login' => 'login',
-		'table_login' => 'SSH Login',
-		'table_state' => 'State',
-		'table_id' => 'Id',
-		'table_name' => 'Name',
-		'table_type' => 'Type',
-		'table_kernel' => 'Kernel',
-		'table_image' => 'Image',
-		'table_resource' => 'Resource',
-		'table_deployment' => 'Deployment',
-		'please_wait' => 'Loading. Please wait ..',
-	),
-	'login' => array (
-		'tab' => 'SSH Login',
-		'label' => 'SSH Login',
-		'login_msg' => 'Login to appliance %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->basedir  = $this->openqrm->get('basedir');
-		$this->tpldir   = $this->rootdir.'/plugins/sshterm/tpl';
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/sshterm/lang", 'sshterm.ini');
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "select";
-		}
-
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-		}
-
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Select Appliance
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/sshterm/class/sshterm.select.class.php');
-			$controller = new sshterm_select($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$controller->lang            = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/web/class/sshterm.select.class.php b/openQRM-5.3.50-CE/src/plugins/sshterm/web/class/sshterm.select.class.php
deleted file mode 100644
index e54c50a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/web/class/sshterm.select.class.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/**
- * sshterm Select
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class sshterm_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'sshterm_action';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'sshterm_identifier';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "sshterm_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'sshterm_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-		$this->user     = $openqrm->user();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$data = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/sshterm-select.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($data);
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select() {
-
-		$h = array();
-		$h['appliance_state']['title'] ='&#160;';
-		$h['appliance_state']['sortable'] = false;
-/*
-		$h['appliance_icon']['title'] ='&#160;';
-		$h['appliance_icon']['sortable'] = false;
-*/
-		$h['appliance_id']['title'] = $this->lang['table_id'];
-		$h['appliance_name']['title'] = $this->lang['table_name'];
-		$h['appliance_values']['title'] = '&#160;';
-		$h['appliance_values']['sortable'] = false;
-		$h['login']['title'] ='&#160;';
-		$h['login']['sortable'] = false;
-
-		// use the appliance link hook
-		require_once $this->openqrm->get('webdir')."/plugins/sshterm/openqrm-sshterm-appliance-link-hook.php";
-
-		$appliance = new appliance();
-		$params  = $this->response->get_array($this->actions_name, 'select');
-		$b       = array();
-
-		$table = $this->response->html->tablebuilder('login', $params);
-		$table->offset = 0;
-		$table->sort = 'appliance_id';
-		$table->limit = 10;
-		$table->order = 'ASC';
-		$table->init();
-
-		$appliances = $appliance->display_overview($table->offset, 100000, $table->sort, $table->order);
-		foreach ($appliances as $index => $appliance_db) {
-			$appliance = new appliance();
-			$appliance->get_instance_by_id($appliance_db["appliance_id"]);
-
-			$resource = new resource();
-			$resource->get_instance_by_id($appliance->resources);
-
-			$kernel = new kernel();
-			$kernel->get_instance_by_id($appliance_db["appliance_kernelid"]);
-			
-			$image = new image();
-			$image->get_instance_by_id($appliance_db["appliance_imageid"]);
-			
-			$virtualization = new virtualization();
-			$virtualization->get_instance_by_id($appliance_db["appliance_virtualization"]);
-			
-			$resource_icon_default="/openqrm/base/img/appliance.png";
-			$active_state_icon="active";
-			$inactive_state_icon="inactive";
-			$login = '';
-			if ($appliance->stoptime == 0 || $appliance->resources == 0)  {
-				$state_icon=$active_state_icon;
-				// login
-				$login = get_sshterm_appliance_link($appliance->id);
-				if(is_object($login)) {
-					$login = $login->get_string();
-				}
-			} else {
-				$state_icon=$inactive_state_icon;
-				$login = '';
-			}
-			$str = '<strong>Kernel:</strong> '.$kernel->name.'<br>
-					<strong>Image:</strong> '.$image->name.'<br>
-					<strong>Resource:</strong> '.$resource->id." / ".$resource->ip.'<br>
-					<strong>Type:</strong> <span class="pill">'.$virtualization->name."</span>";
-			
-			$state_pill = $this->response->html->span();
-			$state_pill->css= "pill";
-			$state_pill->add($state_icon);
-			
-			$b[] = array(
-				'appliance_state' => $state_pill->get_string(),
-			//	'appliance_icon' => "<img width=24 height=24 src=$resource_icon_default>",
-				'appliance_id' => $appliance->id,
-				'appliance_name' => $appliance->name,
-				'appliance_values' => $str,
-				'login' => $login,
-			);
-		}
-
-		$table->id = 'Tabelle';
-		$table->css = 'htmlobject_table';
-		$table->border = 1;
-		$table->cellspacing = 0;
-		$table->cellpadding = 3;
-		$table->form_action = $this->response->html->thisfile;
-		$table->autosort = true;
-		$table->sort_link = false;
-		$table->max = count($b);
-		$table->head = $h;
-		$table->body = $b;
-		$table->limit_select = array(
-			array("value" => 5, "text" => 5),
-			array("value" => 10, "text" => 10),
-			array("value" => 20, "text" => 20),
-			array("value" => 30, "text" => 30),
-			array("value" => 50, "text" => 50),
-			array("value" => 100, "text" => 100),
-		);
-
-		$d = array();
-		$d['table']  = $table;
-		return $d;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/web/css/sshterm.css b/openQRM-5.3.50-CE/src/plugins/sshterm/web/css/sshterm.css
deleted file mode 100644
index e69de29..0000000
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/sshterm/web/img/plugin.png
deleted file mode 100644
index a4deeea..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/sshterm/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/web/js/sshterm.js b/openQRM-5.3.50-CE/src/plugins/sshterm/web/js/sshterm.js
deleted file mode 100644
index 3d3e21c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/web/js/sshterm.js
+++ /dev/null
@@ -1,5 +0,0 @@
-function open_sshterm(url, title, left, top) {
-
-	sshterm_window = window.open(url, title, "width=900,height=520,scrollbars=1,left=" + left + ",top=" + top);
-	open_sshterm.focus();
-}
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/web/lang/de.sshterm-about.ini b/openQRM-5.3.50-CE/src/plugins/sshterm/web/lang/de.sshterm-about.ini
deleted file mode 100644
index 42aee9e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/web/lang/de.sshterm-about.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-[documentation]
-tab = "Über SshTerm"
-label = "Über SshTerm"
-introduction_title = "Einleitung"
-introduction_content = "Das SshTerm-Plugin integriert <a href='http://web-shell.googlecode.com' target='_blank'>WebShell</a> und bietet einen sicheren, verschlüsselten SSH-Zugang zu den von openQRM verwalteten Systemen. Manuelle Konfiguration ist nicht nötig."
-
-requirements_title = "Anforderungen"
-requirements_list = "keine"
-tested_title = "Getestet mit"
-tested_content = "Diese Plugin ist getestet mit Debian, Ubuntu und CentOS"
-
-provides_title = "Bietet"
-provides_list = "SSH-Zugang eingebettet in openQRM."
-
-type_title = "Plugin Typ"
-type_content = "Management"
-
-documentation_title = "Dokumentation"
-use_case_title = "Anwendungsfall"
-
-
-[usage]
-tab = "About SshTerm"
-label = "SshTerm Anwendungsfälle"
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/web/lang/de.sshterm.ini b/openQRM-5.3.50-CE/src/plugins/sshterm/web/lang/de.sshterm.ini
deleted file mode 100644
index 0c519d3..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/web/lang/de.sshterm.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[select]
-tab = "SSH Login"
-label = "SSH Login"
-action_login = "login"
-table_login = "SSH Login"
-table_state = "Status"
-table_id = "Id"
-table_name = "Name"
-table_type = "Type"
-table_kernel = "Kernel"
-table_image = "Image"
-table_resource = "Ressource"
-table_deployment = "Deployment"
-please_wait = "Lade. Bitte warten .."
-[login]
-tab = "SSH Login"
-label = "SSH Login"
-login_msg = "Einloggen auf den Server %s"
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/web/lang/en.sshterm-about.ini b/openQRM-5.3.50-CE/src/plugins/sshterm/web/lang/en.sshterm-about.ini
deleted file mode 100644
index 832f8bd..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/web/lang/en.sshterm-about.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-[documentation]
-tab = "About SshTerm"
-label = "About SshTerm"
-introduction_title = "Introduction"
-introduction_content = "The SshTerm Plugin integrates <a href='http://web-shell.googlecode.com' target='_BLANK'>WebShell</a> into openQRM.
-			It provides a secure login to the openQRM Server and the managed Systems through the Web Interface.
-			No manual configuration is needed."
-
-requirements_title = "Requirements"
-requirements_list = "none"
-
-tested_title = "Tested with"
-tested_content = "This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions."
-
-provides_title = "Provides"
-provides_list = "SSH Login through the openQRM Web Interface"
-
-type_title = "Plugin type"
-type_content = "Management"
-
-documentation_title = "Documentation"
-use_case_title = "Use-Case"
-
-
-[usage]
-tab = "About SshTerm"
-label = "SshTerm use cases"
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/web/lang/en.sshterm.ini b/openQRM-5.3.50-CE/src/plugins/sshterm/web/lang/en.sshterm.ini
deleted file mode 100644
index e1372dd..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/web/lang/en.sshterm.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[select]
-tab = "SSH Login"
-label = "SSH Login"
-action_login = "login"
-table_login = "SSH Login"
-table_state = "State"
-table_id = "Id"
-table_name = "Name"
-table_type = "Type"
-table_kernel = "Kernel"
-table_image = "Image"
-table_resource = "Resource"
-table_deployment = "Deployment"
-please_wait = "Loading. Please wait .."
-[login]
-tab = "SSH Login"
-label = "SSH Login"
-login_msg = "Login to Server %s"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/sshterm/web/menu.txt
deleted file mode 100644
index 1466e08..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/web/menu.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|SSHTerm
-...|SSHTerm|index.php?plugin=sshterm&controller=sshterm|SSHTerm
-...|About|index.php?plugin=sshterm&controller=sshterm-about|How to use
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/web/openqrm-sshterm-appliance-link-hook.php b/openQRM-5.3.50-CE/src/plugins/sshterm/web/openqrm-sshterm-appliance-link-hook.php
deleted file mode 100644
index 5b82f9b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/web/openqrm-sshterm-appliance-link-hook.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/htmlobjects/htmlobject.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-
-
-function get_sshterm_appliance_link($appliance_id) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-
-	$p_appliance = new appliance();
-	$p_appliance->get_instance_by_id($appliance_id);
-	$p_resource = new resource();
-	$p_resource->get_instance_by_id($p_appliance->resources);
-	// get the parameters from the plugin config file
-	$OPENQRM_PLUGIN_SSHTERM_CONFIG_FILE="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/sshterm/etc/openqrm-plugin-sshterm.conf";
-	$store = openqrm_parse_conf($OPENQRM_PLUGIN_SSHTERM_CONFIG_FILE);
-	extract($store);
-	$sshterm_login_ip = $p_resource->ip;
-	$sshterm_window = 'window'.str_replace('.','',$sshterm_login_ip);
-	$sshterm_login_url="https://$sshterm_login_ip:$OPENQRM_PLUGIN_WEBSHELL_PORT";
-
-	$html = new htmlobject($OPENQRM_SERVER_BASE_DIR.'/openqrm/web/base/class/htmlobjects');
-	$a = $html->a();
-	$a->label = 'SSHTerm';
-	$a->css = 'badge';
-	$a->href = '#';
-	$a->handler = 'onclick="sshwindow = window.open(\''.$sshterm_login_url.'\',\''.$sshterm_window.'\', \'location=0,status=0,scrollbars=yes,resizable=yes,width=972,height=500,left=100,top=100,screenX=400,screenY=100\'); sshwindow.focus(); return false;"';
-
-	$plugin_link = '';
-	if (strstr($p_appliance->state, "active")) {
-		$plugin_link = $a;
-	}
-	if ($p_resource->id == 0) {
-		$plugin_link = $a;
-	}
-	if ($p_resource->id == '') {
-		$plugin_link = "";
-	}
-
-	return $plugin_link;
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/web/openqrm-sshterm-dashboard-quicklink-hook.php b/openQRM-5.3.50-CE/src/plugins/sshterm/web/openqrm-sshterm-dashboard-quicklink-hook.php
deleted file mode 100644
index ff8c10d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/web/openqrm-sshterm-dashboard-quicklink-hook.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-function get_sshterm_dashboard_quicklink($html) {
-	// create <i> tag for button icon	
-	$quicklink_icon = $html->i();
-	$quicklink_icon->css = 'glyphicons-icon keyboard-wireless';
-
-/*	
-	// create <span> tag for the colored corner
-	$quicklink_corner = $html->span();
-	$quicklink_corner->css = 'corner corner-orange';
-	
-	// create <label> tag for label in the corner
-	$quicklink_corner_label = $html->label();
-	$quicklink_corner_label->add('23');
-*/	
-	// create <span class="label"> for the button label
-	$quicklink_label = $html->span();
-	$quicklink_label->add('SSH Manager');
-	$quicklink_label->css = 'label';
-	
-	// create <a> tag and add the above created elements
-	$quicklink = $html->a();
-//	$quicklink->label = $quicklink_icon->get_string() . $quicklink_label->get_string() . $quicklink_corner->get_string() . $quicklink_corner_label->get_string();
-	$quicklink->label = $quicklink_icon->get_string() . $quicklink_label->get_string();
-	$quicklink->css = 'btn quicklink sshterm-quicklink';
-	$quicklink->href = 'index.php?plugin=sshterm&controller=sshterm';
-
-	return $quicklink;
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/web/tpl/sshterm-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/sshterm/web/tpl/sshterm-about-documentation.tpl.php
deleted file mode 100644
index 179d0ce..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/web/tpl/sshterm-about-documentation.tpl.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div class="row">
-	<div class="span7">
-			<h3>{introduction_title}</h3>
-			{introduction_content}
-
-			<h3>{provides_title}</h3>
-			{provides_list}
-
-			<h3>{requirements_title}</h3>
-			{requirements_list}
-
-	</div>
-	<div class="span2 offset1">
-		
-		<h3>{type_title}</h3>
-		<span class="pill">{type_content}</span>
-
-		<h3>{tested_title}</h3>
-		{tested_content}
-	</div>
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/sshterm/web/tpl/sshterm-select.tpl.php b/openQRM-5.3.50-CE/src/plugins/sshterm/web/tpl/sshterm-select.tpl.php
deleted file mode 100644
index 04d5ec2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/sshterm/web/tpl/sshterm-select.tpl.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-		{table}
-	</div>
-	<div class="span2 offset1">
-		<h3>Info</h3>
-		<p>The SshTerm Plugin integrates <code><a href='http://web-shell.googlecode.com' target='_blank'>WebShell</a></code> into openQRM. It provides a secure login to the openQRM Server and the managed Systems through the Web Interface.
-		</p>
-	
-	</div>
-</div>
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/support/Makefile b/openQRM-5.3.50-CE/src/plugins/support/Makefile
deleted file mode 100644
index 3c3c310..0000000
--- a/openQRM-5.3.50-CE/src/plugins/support/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/support/etc
-	cp etc/openqrm-plugin-support.conf /usr/share/openqrm/plugins/support/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/support/etc/openqrm-plugin-support.conf b/openQRM-5.3.50-CE/src/plugins/support/etc/openqrm-plugin-support.conf
deleted file mode 100644
index ad238bd..0000000
--- a/openQRM-5.3.50-CE/src/plugins/support/etc/openqrm-plugin-support.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Support by <a href='http://www.openqrm-enterprise.com/' target='_BLANK'>openQRM Enterprise</a>. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="misc"
diff --git a/openQRM-5.3.50-CE/src/plugins/template/Makefile b/openQRM-5.3.50-CE/src/plugins/template/Makefile
deleted file mode 100644
index 6429387..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# this is the openQRM template-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/template* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web/img
-#	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web/js
-	. $(OPENQRM_SERVER_CONF) && cp web/js/*.js $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web/js/
-	. $(OPENQRM_SERVER_CONF) && chmod 777 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web/lang/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/bin
-	. $(OPENQRM_SERVER_CONF) && cp bin/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/bin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/bin/openqrm*
-	. $(OPENQRM_SERVER_CONF) && tar -C $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template -czvf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web/boot-service-template.tgz include/ bin/ etc/init.d/template
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/template
-#	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/template/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/template/bin/openqrm-template-manager b/openQRM-5.3.50-CE/src/plugins/template/bin/openqrm-template-manager
deleted file mode 100644
index 2192bae..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/bin/openqrm-template-manager
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-# this script automatically manages template
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../../../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/include/openqrm-plugin-template-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/etc/openqrm-plugin-template.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-openqrm_server_get_config
-export resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-export LANG=C
-
-# let only root run this script
-WHOAMI=`whoami`
-if [ "$WHOAMI" != "root" ]; then
-	echo "ERROR: Please run this script as root!"
-	exit 6
-fi
-
-function template_manager_usage() {
-	echo "Usage : $0"
-	exit 1
-}
-
-
-FULL_COMMANDLINE="$0 $@"
-TEMPLATE_MANAGER_COMMAND=$1
-# main
-case "$TEMPLATE_MANAGER_COMMAND" in 
-	start)
-		APPLIANCE_ID=$2
-		APPLIANCE_NAME=$3
-		APPLIANCE_IP=$4
-		openqrm_post_event 0 "start" 5 "openqrm-template-manager" "Appliance $APPLIANCE_NAME id $APPLIANCE_ID starting with ip-address $APPLIANCE_IP."
-
-		LOCK_TIME=`openqrm_lock_queue aquire template`
-		trap "openqrm_lock_queue release template $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# TODO: add your own commands here
-
-		openqrm_lock_queue release template $LOCK_TIME
-		trap '' EXIT
-		;;
-	stop)
-		APPLIANCE_ID=$2
-		APPLIANCE_NAME=$3
-		APPLIANCE_IP=$4
-		openqrm_post_event 0 "stop" 5 "openqrm-template-manager" "Appliance $APPLIANCE_NAME id $APPLIANCE_ID stopping with ip-address $APPLIANCE_IP."
-
-		LOCK_TIME=`openqrm_lock_queue aquire template`
-		trap "openqrm_lock_queue release template $LOCK_TIME" EXIT
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-
-		# TODO: add your own commands here
-
-		openqrm_lock_queue release template $LOCK_TIME
-		trap '' EXIT
-		;;
-	*)
-		openqrm_unblock_starting_queue $FULL_COMMANDLINE
-		echo "ERROR: Free commandline arguments are not allowed!"
-		template_manager_usage
-		exit 6
-		;;
-esac
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/etc/init.d/openqrm-plugin-template b/openQRM-5.3.50-CE/src/plugins/template/etc/init.d/openqrm-plugin-template
deleted file mode 100644
index 02ae459..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/etc/init.d/openqrm-plugin-template
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/bash
-# init script for the openQRM template-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/include/openqrm-plugin-template-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/etc/openqrm-plugin-template.conf
-openqrm_server_get_config
-export LANG=C
-# define wget to use with https
-if [ "$OPENQRM_WEB_PROTOCOL" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-
-function openqrm_plugin_template_start() {
-	echo "Starting the openQRM template-plugin"
-
-	# TODO: add your commands here for the Plugin start
-
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/template/.running
-}
-
-
-function openqrm_plugin_template_stop() {
-	echo "Stopping the openQRM template-plugin"
-
-	# TODO: add your commands here for the Plugin stop
-
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/template/.running
-}
-
-function openqrm_plugin_template_uninstall() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "template: Please give a username to uninstall the plugin : "
-		read USERNAME
-		echo
-		echo -n "template: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Uninstalling the openQRM template-plugin"
-	openqrm_plugin_template_stop
-
-	# removing the template tables
-	if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$USERNAME --http-password=$PASSWORD "$OPENQRM_WEB_PROTOCOL://localhost/openqrm/base/plugins/template/template-action.php?template_command=uninstall"; then
-		template_manager_log uninstall "ERROR: Could not drop the template-plugin tables in the database!"
-		exit 1
-	fi
-
-	# TODO: add your commands here for the Plugin disable (uninstall)
-
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-template.tgz
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/template
-}
-
-function openqrm_plugin_template_init() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "template: Please give a username to init the plugin : "
-		read USERNAME
-		echo
-		echo -n "template: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-
-	echo "Initializing the openQRM template-plugin"
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/template
-	# link the boot-service
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/web/boot-service-template.tgz $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/boot-service-template.tgz
-
-	# creating the tables
-	if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$USERNAME --http-password=$PASSWORD "$OPENQRM_WEB_PROTOCOL://localhost/openqrm/base/plugins/template/template-action.php?template_command=init&template_domain=$OPENQRM_SERVER_DOMAIN"; then
-		template_manager_log init "ERROR: Could not create the template-plugin tables in the database!"
-		exit 1
-	fi
-
-	# TODO: add your commands here for the Plugin enable (init)
-
-
-}
-
-
-
-
-
-
-
-USER=$2
-PASS=$3
-
-case "$1" in
-	start)
-		openqrm_plugin_template_start
-		;;
-	stop)
-		openqrm_plugin_template_stop
-		;;
-	restart)
-		openqrm_plugin_template_stop
-		sleep 1
-		openqrm_plugin_template_start
-		;;
-	init)
-		openqrm_plugin_template_init $USER $PASS
-		;;
-	uninstall)
-		openqrm_plugin_template_uninstall $USER $PASS
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/etc/init.d/openqrm-plugin-template.postinstall b/openQRM-5.3.50-CE/src/plugins/template/etc/init.d/openqrm-plugin-template.postinstall
deleted file mode 100644
index 830474c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/etc/init.d/openqrm-plugin-template.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-template postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/template/etc/init.d/openqrm-plugin-template.preremove b/openQRM-5.3.50-CE/src/plugins/template/etc/init.d/openqrm-plugin-template.preremove
deleted file mode 100644
index b7feb13..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/etc/init.d/openqrm-plugin-template.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-template preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-template stop
diff --git a/openQRM-5.3.50-CE/src/plugins/template/etc/init.d/template b/openQRM-5.3.50-CE/src/plugins/template/etc/init.d/template
deleted file mode 100644
index 94bee70..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/etc/init.d/template
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-# this is the boot-service init script for the template resources
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-# for including the package functions
-export OPENQRM_SOURCE_DIR="$OPENQRM_SERVER_BASE_DIR/openqrm/"
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-package-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/include/openqrm-plugin-template-functions
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-OPENQRM_SERVER_IP=$resource_openqrmserver
-
-# do not run on idle resources
-if [ "$resource_image" == "idle" ]; then
-	exit 0
-fi
-
-# also do not run before the real init of the rootfs
-# if we have this file /etc/initrd-devices.conf we are still in the initrd
-if [ -f /etc/initrd-devices.conf ]; then
-
-	# TODO: add your commands to run in the initrd-stage on a managed system (network-deployment only)
-
-	exit 0
-fi
-
-
-function template_start() {
-	echo "Starting the openQRM template-plugin"
-	template_stop 1>/dev/null 2>&1
-
-	# TODO: add your commands to in the init phase on a managed system
-
-}
-
-
-function template_stop() {
-	echo "Stopping the openQRM template-plugin"
-
-	# TODO: add your commands to in the init phase on a managed system
-
-}
-
-
-
-
-
-case "$1" in
-	start)
-		template_start
-		;;
-	stop)
-		template_stop
-		;;
-	restart)
-		template_stop
-		sleep 1
-		template_start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/etc/openqrm-plugin-template.conf b/openQRM-5.3.50-CE/src/plugins/template/etc/openqrm-plugin-template.conf
deleted file mode 100644
index c6b4f80..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/etc/openqrm-plugin-template.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# this is the openQRM-plugin-template info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server, screen"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="A Template for Plugin-Development providing a complete Skeleton for a new Plugin."
-OPENQRM_PLUGIN_TYPE="misc"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES=""
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES=""
-# dirs which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_DIRS="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/web/template/ $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/etc/"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/include/openqrm-plugin-template-functions b/openQRM-5.3.50-CE/src/plugins/template/include/openqrm-plugin-template-functions
deleted file mode 100644
index f70bc62..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/include/openqrm-plugin-template-functions
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-# this is the functions file for the template-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-################ common template functions
-
-# logs for template
-function template_manager_log() {
-	local COMPONENT=$1
-	shift
-	local MESSAGE=$@
-	logger -i -t "template plug-in" "$COMPONENT : $MESSAGE"
-}
-
-
-################ template functions
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/include/openqrm-plugin-template-kernel-hook b/openQRM-5.3.50-CE/src/plugins/template/include/openqrm-plugin-template-kernel-hook
deleted file mode 100644
index f7f974c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/include/openqrm-plugin-template-kernel-hook
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-# this is a hook function for the kernel-creation phase
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-function template_kernel_hook() {
-
-	local KERNEL_NAME=$1
-	local KERNEL_VERSION=$2
-	local KERNEL_LOCATION=$3
-	local KERNEL_TYPE=$4
-
-	echo "template-plugin: Running template_kernel_hook $KERNEL_NAME $KERNEL_VERSION $KERNEL_LOCATION $KERNEL_TYPE"
-	echo "template-plugin: Running template_kernel_hook $KERNEL_NAME $KERNEL_VERSION $KERNEL_LOCATION $KERNEL_TYPE" | logger
-
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/class/template-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/template/web/class/template-about.controller.class.php
deleted file mode 100644
index 5420ed8..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/class/template-about.controller.class.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
- * Template Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class template_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'template_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'template_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'template_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'template_about_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About Template',
-		'label' => 'About Template',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The Template plugin provides ... ',
-		'introduction_title1' => 'Assigning Appliances',
-		'introduction_content1' => '',
-		'requirements_title' => 'Requirements',
-		'requirements_list' => '',
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-		'provides_title' => 'Provides',
-		'provides_list' => '',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Deployment',
-		'documentation_title' => 'Documentation',
-		'use_case_title' => 'Use-Case',
-	),
-);
-
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/template/lang", 'template-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/template/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About Template
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/template/class/template-about.documentation.class.php');
-			$controller = new template_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/class/template-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/template/web/class/template-about.documentation.class.php
deleted file mode 100644
index ce0c846..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/class/template-about.documentation.class.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * template-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class template_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'template_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "template_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-		$this->basedir    = $this->openqrm->get('basedir');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$svn_co_command = "";
-		$t = $this->response->html->template($this->tpldir.'/template-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['provides_title'], 'provides_title');
-		$t->add($this->lang['provides_list'], 'provides_list');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($svn_co_command, 'introduction_command');
-		$t->add($this->lang['introduction_title1'], 'introduction_title1');
-		$t->add($this->lang['introduction_content1'], 'introduction_content1');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/class/template.class.php b/openQRM-5.3.50-CE/src/plugins/template/web/class/template.class.php
deleted file mode 100644
index 02e936c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/class/template.class.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This class represents a template user in openQRM
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/folder.class.php";
-require_once "$RootDir/class/file.class.php";
-require_once "$RootDir/plugins/template/class/templateconfig.class.php";
-
-$event = new event();
-global $event;
-
-$template_group_dir = "$RootDir/plugins/template/template/manifests/groups";
-global $template_group_dir;
-$template_appliance_dir = "$RootDir/plugins/template/template/manifests/appliances";
-global $template_appliance_dir;
-$TEMPLATE_CONFIG_TABLE="template_config";
-global $TEMPLATE_CONFIG_TABLE;
-
-class template {
-
-		function __construct() {
-			$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-			$this->group_dir = $RootDir.'/plugins/template/template/manifests/groups';
-			$this->appliance_dir = $RootDir.'/plugins/template/template/manifests/appliances';
-			$this->event = new event();
-		}
-
-// ---------------------------------------------------------------------------------
-// general templateconfig methods
-// ---------------------------------------------------------------------------------
-
-
-function get_available_groups() {
-	$template_group_array = array();
-	return $template_group_array;
-}
-
-
-
-function get_group_info($group_name) {
-
-	$filename = $this->group_dir."/$group_name.pp";
-	if (file_exists($filename)) {
-		if (!$handle = fopen($filename, 'r')) {
-			$this->event->log("get_group_info", $_SERVER['REQUEST_TIME'], 2, "template.class.php", "Cannot open file ($filename)", "", "", 0, 0, 0);
-			exit;
-		}
-		while (!feof($handle)) {
-			$info = fgets($handle, 4096);
-			if (strstr($info, "#")) {
-				$info = str_replace("#", "", $info);
-				fclose($handle);
-				return $info;
-			}
-		}
-	}
-
-
-}
-
-
-
-function get_domain() {
-	$templateconfig = new templateconfig();
-	$template_domain = $templateconfig->get_value(2);  // 2 is the domain-name
-	return $template_domain;
-}
-
-
-
-function set_groups($appliance_name, $template_group_array) {
-	$template_domain = $this->get_domain();
-	$filename = $this->appliance_dir."/$appliance_name.$template_domain.pp";
-	if (!$handle = fopen($filename, 'w+')) {
-		$this->event->log("set_groups", $_SERVER['REQUEST_TIME'], 2, "template.class.php", "Cannot open file ($filename)", "", "", 0, 0, 0);
-		exit;
-	}
-	// header
-	fwrite($handle, "\nnode '$appliance_name.$template_domain' {\n");
-	// body with groups
-	foreach($template_group_array as $template_group) {
-		$template_include = "     include $template_group\n";
-		fwrite($handle, $template_include);
-	}
-	// base
-	fwrite($handle, "}\n\n");
-	fclose($handle);
-}
-
-
-function get_groups($appliance_name) {
-	$template_group_array = array();
-	$template_domain = $this->get_domain();
-	$filename = $this->appliance_dir."/$appliance_name.$template_domain.pp";
-
-	if (file_exists($filename)) {
-		if (!$handle = fopen($filename, 'r')) {
-			$this->event->log("get_groups", $_SERVER['REQUEST_TIME'], 2, "template.class.php", "Cannot open file ($filename)", "", "", 0, 0, 0);
-			exit;
-		}
-		while (!feof($handle)) {
-			$buffer = fgets($handle, 4096);
-			if (strstr($buffer, "include")) {
-				$buffer = str_replace("include", "", $buffer);
-				$buffer = trim($buffer);
-				$template_group_array[] .= $buffer;
-			}
-		}
-		fclose($handle);
-	}
-
-
-	return $template_group_array;
-}
-
-function remove_appliance($appliance_name) {
-	$template_domain = $this->get_domain();
-	$filename = $this->appliance_dir."/$appliance_name.$template_domain.pp";
-	if (file_exists($filename)) {
-		unlink($filename);
-	}
-}
-
-
-// ---------------------------------------------------------------------------------
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/class/template.config.class.php b/openQRM-5.3.50-CE/src/plugins/template/web/class/template.config.class.php
deleted file mode 100644
index c9e7eaf..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/class/template.config.class.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/**
- * template config
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class template_config
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'template_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "template_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'template_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'template_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->tpldir   = $this->rootdir.'/plugins/template/tpl';
-
-		require_once($this->openqrm->get('basedir').'/plugins/template/web/class/templateconfig.class.php');
-		$this->templateconfig = new templateconfig();
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action() {
-
-		$response = $this->config();
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		if(isset($response->msg)) {
-			$response->redirect(
-					$response->get_url($this->actions_name, 'config', $this->message_param, $response->msg)
-			);
-		}
-		$data['please_wait'] = $this->lang['please_wait'];
-		$data['prefix_tab'] = $this->prefix_tab;
-		$data['label'] = sprintf($this->lang['label']);
-		$data['baseurl'] = $this->openqrm->get('baseurl');
-		$data['thisfile']    = $response->html->thisfile;
-		$t = $response->html->template($this->tpldir.'/template-config.tpl.php');
-		$t->add($response->form);
-		$t->add($data);
-		$t->group_elements(array('param_' => 'form', 'f_' => 'fields'));
-
-		return $t;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function config() {
-		$response = $this->get_response();
-		$form = $response->form;
-		if(!$form->get_errors() && $response->submit()) {
-			$request = $form->get_request();
-			foreach($request as $k => $v) {
-				$fields['cc_key'] = $k;
-				foreach($v as $id => $value) {
-					$fields['cc_id'] = $id;
-					$fields['cc_value'] = $value;
-				}
-				$this->templateconfig->remove($fields['cc_id']);
-				$this->templateconfig->add($fields);
-			}
-			$response->msg = $this->lang['msg_updated'];
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-
-		$response = $this->response;
-		$form     = $response->get_form($this->actions_name, 'config');
-		$fields = $this->templateconfig->display_overview(0, 10000, 'cc_id', 'ASC');
-		$i = 0;
-		foreach($fields as $k => $v) {
-			$d['f_'.$i]['label']                         = $v['cc_key'];
-			$d['f_'.$i]['required']                      = true;
-			$d['f_'.$i]['object']['type']                = 'htmlobject_input';
-			$d['f_'.$i]['object']['attrib']['name']      = $v['cc_key'].'['.$v['cc_id'].']';
-			$d['f_'.$i]['object']['attrib']['value']     = $v['cc_value'];
-			$d['f_'.$i]['object']['attrib']['maxlength'] = 50;
-			$i++;
-		}
-		$form->add($d);
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$response->form = $form;
-		return $response;
-
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/class/template.controller.class.php b/openQRM-5.3.50-CE/src/plugins/template/web/class/template.controller.class.php
deleted file mode 100644
index 8b4df65..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/class/template.controller.class.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-/**
- * Template Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class template_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'template_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "template_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'template_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'template_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array(
-		'tab' => 'Appliances',
-		'label' => 'Template Appliances',
-		'id' => 'ID',
-		'appliance' => 'Appliance',
-		'name' => 'Name',
-		'resource' => 'Resource',
-		'groups' => 'Groups',
-		'action_edit' => 'edit',
-		'please_wait' => 'Loading. Please wait ...',
-	),
-	'edit' => array(
-		'tab' => 'Edit',
-		'label' => 'Template groups for appliance %s',
-		'template_groups' => 'Template Groups',
-		'msg_updated' => 'Updated appliance %s',
-		'please_wait' => 'Loading. Please wait ...',
-		'canceled' => 'Operation canceled. Please wait ...'
-	),
-	'config' => array(
-		'tab' => 'Config',
-		'label' => 'Configure Template',
-		'msg_updated' => 'Updated Template Config',
-		'please_wait' => 'Loading. Please wait ...',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/template/lang", 'template.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/template/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = 'select';
-		}
-
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			default:
-			case 'config':
-				$content[] = $this->config(true);
-				$content[] = $this->select(false);
-			break;
-			case 'select':
-				$content[] = $this->config(false);
-				$content[] = $this->select(true);
-			break;
-			case 'edit':
-				$content[] = $this->config(false);
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/template/class/template.select.class.php');
-			$controller = new template_select($this->openqrm, $this->response);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Config
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function config( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/template/class/template.config.class.php');
-			$controller = new template_config($this->openqrm, $this->response);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['config'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['config']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'config' );
-		$content['onclick'] = false;
-		if($this->action === 'config'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function edit( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/template/class/template.edit.class.php');
-			$controller = new template_edit($this->openqrm, $this->response);
-			$controller->actions_name  = $this->actions_name;
-			$controller->tpldir        = $this->tpldir;
-			$controller->message_param = $this->message_param;
-			$controller->lang          = $this->lang['edit'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['edit']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'edit' );
-		$content['onclick'] = false;
-		if($this->action === 'edit'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/class/template.edit.class.php b/openQRM-5.3.50-CE/src/plugins/template/web/class/template.edit.class.php
deleted file mode 100644
index 351b99f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/class/template.edit.class.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/**
- * template Appliance
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class template_edit
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'template_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "template_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'template_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'template_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->tpldir   = $this->rootdir.'/plugins/template/tpl';
-
-		require_once($this->openqrm->get('basedir').'/plugins/template/web/class/template.class.php');
-		$this->template = new template();
-
-		$id = $this->response->html->request()->get('appliance_id');
-		$this->response->add('appliance_id', $id);
-
-		$appliance = new appliance();
-		$this->appliance = $appliance->get_instance_by_id($id);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action() {
-
-		$response = $this->edit();
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		if(isset($response->msg)) {
-			$response->redirect(
-					$response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		$data['canceled'] = $this->lang['canceled'];
-		$data['please_wait'] = $this->lang['please_wait'];
-		$data['prefix_tab'] = $this->prefix_tab;
-		$data['label'] = sprintf($this->lang['label'], $this->appliance->name);
-		$data['baseurl'] = $this->openqrm->get('baseurl');
-		$data['thisfile']    = $response->html->thisfile;
-		$t = $response->html->template($this->tpldir.'/template-edit.tpl.php');
-		$t->add($response->form);
-		$t->add($data);
-		$t->group_elements(array('param_' => 'hidden_fields'));
-
-		return $t;
-
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function edit() {
-		$response = $this->get_response();
-		$form = $response->form;
-		if(!$form->get_errors() && $response->submit()) {
-			$groups = $form->get_request('groups');
-			$this->template->remove_appliance($this->appliance->name);
-			if(!in_array('{empty}', $groups)) {
-				$this->template->set_groups($this->appliance->name, $groups);
-			}
-			$response->msg = sprintf($this->lang['msg_updated'], $this->appliance->name);
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param enum $mode [select|edit]
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-
-		$response = $this->response;
-		$form     = $response->get_form($this->actions_name, 'edit');
-		$selected = $this->template->get_groups($this->appliance->name);
-		$groups   = $this->template->get_available_groups();
-
-		$select = array('{empty}', '&#160;');
-		foreach($groups as $v) {
-			$o = $response->html->option();
-			$o->value = $v;
-			$o->label = $v;
-			$o->title = $this->template->get_group_info($v);
-			$select[] = $o;
-		}
-		$d['select']['label']                        = $this->lang['template_groups'];
-		$d['select']['object']['type']               = 'htmlobject_select';
-		$d['select']['object']['attrib']['name']     = 'groups[]';
-		$d['select']['object']['attrib']['index']    = array(0,1);
-		$d['select']['object']['attrib']['multiple'] = true;
-		$d['select']['object']['attrib']['css']      = 'template_select';
-		$d['select']['object']['attrib']['options']  = $select;
-		$d['select']['object']['attrib']['selected'] = $selected;
-		$form->add($d);
-		
-		$customLink = $this->response->html->a();
-		$customLink->label = 'my custom button';
-		$customLink->name = 'my custom button';			// not used but needs to be set for htmlobject compatibility
-		$customLink->css = 'btn edit';
-		$form->add($customLink, 'my_custom_link');
-
-
-
-		// Create a form row with label and 2 inputfield on one row
-		// 1. Create a $box
-
-		$box = $this->response->html->div();
-		$box->name = 'unnamed';								// needed, if box should contain a row label
-
-		$input = $this->response->html->input();
-		$input->name = 'my-input';
-		$input->css = 'input-large';
-		$input->setAttributes('placeholder="custom placeholder"');
-
-		$box->add($input);
-
-		$input2 = $this->response->html->input();
-		$input2->name = 'my-input2';
-		$input2->css = 'input-mini';
-		
-		$box->add($input2);
-		
-		$g['bla']['label'] = 'Form row';				// if box has no name, this labels will not be shown in the interface
-		$g['bla']['object'] = $box;
-		
-		$form->add($g);
-
-//		$this->response->html->debug();
-		
-		
-		$submit = $form->get_elements('submit');
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$form->add($submit, 'cancel');
-
-		$response->form = $form;
-		return $response;
-
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/class/template.select.class.php b/openQRM-5.3.50-CE/src/plugins/template/web/class/template.select.class.php
deleted file mode 100644
index 83542df..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/class/template.select.class.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/**
- * template Appliance
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class template_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'template_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "template_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'template_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'template_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->tpldir   = $this->rootdir.'/plugins/template/tpl';
-
-		require_once($this->openqrm->get('basedir').'/plugins/template/web/class/template.class.php');
-		$this->template = new template();
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$response = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/template-select.tpl.php');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->table, 'table');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function select() {
-		$response = $this->response;
-		$appliance = new appliance();
-
-		$table = $this->response->html->tablebuilder('template', $this->response->get_array($this->actions_name, 'select'));
-		$table->offset = 0;
-		$table->sort = 'appliance_id';
-		$table->limit = 10;
-		$table->order = 'ASC';
-		$table->max   = $appliance->get_count();
-
-		$table->init();
-
-		$h['appliance_id']['title']    = $this->lang['id'];
-		$h['appliance_id']['sortable'] = true;
-		$h['appliance_id']['hidden']   = true;
-
-		$h['appliance']['title']    = $this->lang['appliance'];
-		$h['appliance']['sortable'] = false;
-
-		$h['appliance_name']['title']    = $this->lang['name'];
-		$h['appliance_name']['sortable'] = true;
-		$h['appliance_name']['hidden']   = true;
-
-		$h['appliance_resources']['title']    = $this->lang['resource'];
-		$h['appliance_resources']['sortable'] = true;
-		$h['appliance_resources']['hidden']   = true;
-
-
-		$h['groups']['title']    = $this->lang['groups'];
-		$h['groups']['sortable'] = false;
-		$h['edit']['title']    = '&#160;';
-		$h['edit']['sortable'] = false;
-
-		$result = $appliance->display_overview($table->offset, $table->limit, $table->sort, $table->order);
-		$b = array();
-		foreach($result as $k => $v) {
-
-			$resource = new resource();
-			$resource = $resource->get_instance_by_id($v['appliance_resources']);
-
-			$tmp = array();
-			$tmp['appliance_id'] = $v['appliance_id'];
-			$tmp['appliance_name'] = $v['appliance_name'];
-			$tmp['appliance_resources'] = $v['appliance_resources'];
-			$tmp['appliance']  = '<b>'.$this->lang['id'].':</b> '.$v['appliance_id'].'<br>';
-			$tmp['appliance'] .= '<b>'.$this->lang['name'].':</b> '.$v['appliance_name'].'<br>';
-			$tmp['appliance'] .= '<b>'.$this->lang['resource'].':</b> '.$resource->id.' / '.$resource->ip.'<br>';
-
-			$groups = $this->template->get_groups($v['appliance_name']);
-			$tmp['groups'] = implode(', ', $groups);
-
-			$a          = $response->html->a();
-			$a->href    = $response->get_url($this->actions_name, 'edit' ).'&appliance_id='.$v['appliance_id'];
-			$a->label   = $this->lang['action_edit'];
-			$a->title   = $this->lang['action_edit'];
-			$a->setAttributes('data-message="'.$this->lang['please_wait'].'"');
-			$a->css     = 'edit';				
-			$tmp['edit'] = $a->get_string();
-
-			$b[] = $tmp;
-		}
-
-		$table->css          = 'htmlobject_table';
-		$table->border       = 0;
-		$table->id           = 'Tabelle';
-		$table->form_action	 = $this->response->html->thisfile;
-		$table->head         = $h;
-		$table->body         = $b;
-		$table->sort_params  = $response->get_string( $this->actions_name, 'select' );
-		$table->sort_form    = true;
-		$table->sort_link    = false;
-		$table->autosort     = false;
-		$table->limit_select = array(
-				array("value" => 10, "text" => 10),
-				array("value" => 20, "text" => 20),
-				array("value" => 30, "text" => 30),
-				array("value" => 40, "text" => 40),
-				array("value" => 50, "text" => 50),
-				);
-		$response->table = $table;
-		return $response;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/class/templateconfig.class.php b/openQRM-5.3.50-CE/src/plugins/template/web/class/templateconfig.class.php
deleted file mode 100644
index 7b69a6c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/class/templateconfig.class.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This class represents a template user in openQRM
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/kernel.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-
-$TEMPLATE_CONFIG_TABLE="template_config";
-global $TEMPLATE_CONFIG_TABLE;
-$event = new event();
-global $event;
-
-class templateconfig {
-
-var $id = '';
-var $key = '';
-var $value = '';
-
-	function __construct() {
-		$this->template_config_table = "template_config";
-		$this->event = new event();
-	}
-
-
-// ---------------------------------------------------------------------------------
-// methods to create an instance of a templateconfig object filled from the db
-// ---------------------------------------------------------------------------------
-
-// returns an appliance from the db selected by id or name
-function get_instance($id, $name) {
-	$db=openqrm_get_db_connection();
-	if ("$id" != "") {
-		$templateconfig_array = $db->Execute("select * from ".$this->template_config_table." where cc_id=$id");
-	} else if ("$name" != "") {
-		$templateconfig_array = $db->Execute("select * from ".$this->template_config_table." where cc_key='$name'");
-	} else {
-		$this->event->log("get_instance", $_SERVER['REQUEST_TIME'], 2, "templateconfig.class.php", "Could not create instance of templateconfig without data", "", "", 0, 0, 0);
-		return;
-	}
-
-	foreach ($templateconfig_array as $index => $templateconfig) {
-		$this->id = $templateconfig["cc_id"];
-		$this->key = $templateconfig["cc_key"];
-		$this->value = $templateconfig["cc_value"];
-	}
-	return $this;
-}
-
-// returns an appliance from the db selected by id
-function get_instance_by_id($id) {
-	$this->get_instance($id, "");
-	return $this;
-}
-
-// returns an appliance from the db selected by key
-function get_instance_by_key($name) {
-	$this->get_instance("", $name);
-	return $this;
-}
-
-
-// ---------------------------------------------------------------------------------
-// general templateconfig methods
-// ---------------------------------------------------------------------------------
-
-
-
-
-// checks if given templateconfig id is free in the db
-function is_id_free($templateconfig_id) {
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select cc_id from ".$this->template_config_table." where cc_id=$templateconfig_id");
-	if (!$rs)
-		$this->event->log("is_id_free", $_SERVER['REQUEST_TIME'], 2, "templateconfig.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	if ($rs->EOF) {
-		return true;
-	} else {
-		return false;
-	}
-}
-
-
-// adds templateconfig to the database
-function add($templateconfig_fields) {
-	if (!is_array($templateconfig_fields)) {
-		$this->event->log("add", $_SERVER['REQUEST_TIME'], 2, "templateconfig.class.php", "coulduser_field not well defined", "", "", 0, 0, 0);
-		return 1;
-	}
-	// set stop time and status to now
-	$now=$_SERVER['REQUEST_TIME'];
-	$db=openqrm_get_db_connection();
-	$result = $db->AutoExecute($this->template_config_table, $templateconfig_fields, 'INSERT');
-	if (! $result) {
-		$this->event->log("add", $_SERVER['REQUEST_TIME'], 2, "templateconfig.class.php", "Failed adding new templateconfig to database", "", "", 0, 0, 0);
-	}
-}
-
-
-
-// removes templateconfig from the database
-function remove($templateconfig_id) {
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("delete from ".$this->template_config_table." where cc_id=$templateconfig_id");
-}
-
-// removes templateconfig from the database by key
-function remove_by_name($templateconfig_key) {
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("delete from ".$this->template_config_table." where cc_key='$templateconfig_key'");
-}
-
-
-// returns templateconfig value by templateconfig_id
-function get_value($templateconfig_id) {
-	$db=openqrm_get_db_connection();
-	$templateconfig_set = $db->Execute("select cc_value from ".$this->template_config_table." where cc_id=$templateconfig_id");
-	if (!$templateconfig_set) {
-		$this->event->log("get_name", $_SERVER['REQUEST_TIME'], 2, "templateconfig.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		if (!$templateconfig_set->EOF) {
-			return $templateconfig_set->fields["cc_value"];
-		} else {
-			return "";
-		}
-	}
-}
-
-
-// sets a  templateconfig value by templateconfig_id
-function set_value($templateconfig_id, $templateconfig_value) {
-	$db=openqrm_get_db_connection();
-	$templateconfig_set = $db->Execute("update ".$this->template_config_table." set cc_value=\"$templateconfig_value\" where cc_id=$templateconfig_id");
-	if (!$templateconfig_set) {
-		$this->event->log("get_name", $_SERVER['REQUEST_TIME'], 2, "templateconfig.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	}
-}
-
-
-// returns the number of templateconfigs for an templateconfig type
-function get_count() {
-	$count=0;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select count(cc_id) as num from ".$this->template_config_table);
-	if (!$rs) {
-		print $db->ErrorMsg();
-	} else {
-		$count = $rs->fields["num"];
-	}
-	return $count;
-}
-
-
-
-// returns a list of all templateconfig names
-function get_list() {
-	$query = "select cc_id, cc_value from ".$this->template_config_table;
-	$templateconfig_name_array = array();
-	$templateconfig_name_array = openqrm_db_get_result_double ($query);
-	return $templateconfig_name_array;
-}
-
-
-// returns a list of all templateconfig ids
-function get_all_ids() {
-	$templateconfig_list = array();
-	$query = "select cc_id from ".$this->template_config_table;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute($query);
-	if (!$rs)
-		$this->event->log("get_list", $_SERVER['REQUEST_TIME'], 2, "templateconfig.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	while (!$rs->EOF) {
-		$templateconfig_list[] = $rs->fields;
-		$rs->MoveNext();
-	}
-	return $templateconfig_list;
-
-}
-
-
-
-
-// displays the templateconfig-overview
-function display_overview($offset, $limit, $sort, $order) {
-	$db=openqrm_get_db_connection();
-	$recordSet = $db->SelectLimit("select * from ".$this->template_config_table." order by $sort $order", $limit, $offset);
-	$templateconfig_array = array();
-	if (!$recordSet) {
-		$this->event->log("display_overview", $_SERVER['REQUEST_TIME'], 2, "templateconfig.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		while (!$recordSet->EOF) {
-			array_push($templateconfig_array, $recordSet->fields);
-			$recordSet->MoveNext();
-		}
-		$recordSet->Close();
-	}
-	return $templateconfig_array;
-}
-
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/css/template.css b/openQRM-5.3.50-CE/src/plugins/template/web/css/template.css
deleted file mode 100644
index e69de29..0000000
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/image.template-deployment.php b/openQRM-5.3.50-CE/src/plugins/template/web/image.template-deployment.php
deleted file mode 100644
index 9d5f6c0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/image.template-deployment.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-
-// global event for logging
-$event = new event();
-global $event;
-
-function template_deployment_wait_for_identfile($sfile) {
-	$refresh_delay=1;
-	$refresh_loop_max=20;
-	$refresh_loop=0;
-	while (!file_exists($sfile)) {
-		sleep($refresh_delay);
-		$refresh_loop++;
-		flush();
-		if ($refresh_loop > $refresh_loop_max)  {
-			return false;
-		}
-	}
-	return true;
-}
-
-
-function get_template_deployment_image_rootdevice_identifier($lvm_nfs_storage_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_ADMIN;
-	global $event;
-
-	// place for the storage stat files
-	$StorageDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/plugins/template_deployment/storage';
-	$rootdevice_identifier_array = array();
-	$storage = new storage();
-	$storage->get_instance_by_id($lvm_nfs_storage_id);
-	$storage_resource = new resource();
-	$storage_resource->get_instance_by_id($storage->resource_id);
-	$storage_resource_id = $storage_resource->id;
-	$ident_file = "$StorageDir/$storage_resource_id.lv.template_deployment.ident";
-	if (file_exists($ident_file)) {
-		unlink($ident_file);
-	}
-	// send command
-	$resource_command=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/template_deployment/bin/openqrm-template_deployment post_identifier -u ".$OPENQRM_ADMIN->name." -p ".$OPENQRM_ADMIN->password." --openqrm-cmd-mode background";
-	$storage_resource->send_command($storage_resource->ip, $resource_command);
-	if (!template_deployment_wait_for_identfile($ident_file)) {
-		$event->log("get_image_rootdevice_identifier", $_SERVER['REQUEST_TIME'], 2, "image.lvm-nfs-deployment", "Timeout while requesting image identifier from storage id $storage->id", "", "", 0, 0, 0);
-		return;
-	}
-	$fcontent = file($ident_file);
-	foreach($fcontent as $lun_info) {
-		$tpos = strpos($lun_info, ":");
-		$timage_name = trim(substr($lun_info, 0, $tpos));
-		$troot_device = trim(substr($lun_info, $tpos+1));
-		$rootdevice_identifier_array[] = array("value" => "$troot_device", "label" => "$timage_name");
-	}
-	return $rootdevice_identifier_array;
-}
-
-function get_template_deployment_image_default_rootfs() {
-	return "ext3";
-}
-
-function get_template_deployment_rootfs_transfer_methods() {
-	return false;
-}
-
-function get_template_deployment_rootfs_set_password_method() {
-	return true;
-}
-
-function get_template_deployment_is_network_deployment() {
-	return false;
-}
-
-function get_template_deployment_local_deployment_enabled() {
-	return false;
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/js/template.js b/openQRM-5.3.50-CE/src/plugins/template/web/js/template.js
deleted file mode 100644
index e69de29..0000000
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/lang/de.template-about.ini b/openQRM-5.3.50-CE/src/plugins/template/web/lang/de.template-about.ini
deleted file mode 100644
index 553da55..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/lang/de.template-about.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[documentation]
-tab = "Über Template"
-label = "Über Template"
-introduction_title = "Einleitung"
-introduction_content = "Das Template-Plugin bietet .... <br><br>"
-
-introduction_title1 = "Server zuordnen"
-introduction_content1 = ""
-requirements_title = "Anforderungen"
-requirements_list = ""
-tested_title = "Kompatibilität"
-tested_content = "Dieses Plugin ist getestet mit Debian-, Ubuntu- und CentOS-Linux-Distributionen"
-
-provides_title = "Bietet"
-provides_list = ""
-
-type_title = "Plugin-Typ"
-type_content = "Deployment"
-
-documentation_title = "Dokumentation"
-use_case_title = "Anwendungsfall"
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/lang/de.template.ini b/openQRM-5.3.50-CE/src/plugins/template/web/lang/de.template.ini
deleted file mode 100644
index 715d8d2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/lang/de.template.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[select]
-tab = "Server"
-label = "Template-Server"
-id = "ID"
-Server = "Server"
-name = "Name"
-resource = "Resource"
-groups = "Gruppe"
-action_edit = "bearbeiten"
-please_wait = "Dies ist eine individuelle Nachricht für die openqrm.wait()-Methode"
-[edit]
-tab = "Bearbeiten"
-label = "Template-Gruppen für Server %s"
-template_groups = "Template-Gruppen"
-msg_updated = "Server %s aktuallisiert"
-please_wait = "Lade. Bitte warten ..."
-canceled = "Operation abgebrochen. Bitte warten ..."
-[config]
-tab = "Einstellungen"
-label = "Template-Einstellungen"
-msg_updated = "Template-Einstellungen aktualisiert"
-please_wait = "Lade. Bitte warten ..."
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/lang/en.template-about.ini b/openQRM-5.3.50-CE/src/plugins/template/web/lang/en.template-about.ini
deleted file mode 100644
index 9498607..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/lang/en.template-about.ini
+++ /dev/null
@@ -1,68 +0,0 @@
-[documentation]
-tab = "About Template"
-label = "About Template"
-
-introduction_title = "Introduction"
-introduction_content = "<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>"
-introduction_title1 = "Assigning Server"
-introduction_content1 = "<p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
-
-<pre>multiline code blocks should be wrapped in &lt;pre&gt; tags</pre>
-
-<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo <code>inline code should be wrapped in &lt;code&gt; tags</code> dolores et ea rebum. Stet clita kasd  gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
-
-<p><span class=\"pill orange\">Hint</span> For lager code blocks you may choose to add the class <code>.pre-scrollable</code>. This limits the height of the code block to 350px and adds scrolling.</p>
-
-<pre class=\"pre-scrollable\">
-//--------------------------------------------
-/**
- * Action
- *
- * @access public
- * @return htmlobject_template
- */
-//--------------------------------------------
-function action() {
-	$svn_co_command = "";
-	$t = $this->response->html->template($this->tpldir.'/template-about-documentation.tpl.php');
-	$t->add($this->response->html->thisfile, "thisfile");
-	$t->add($this->lang['label'], 'label');
-	$t->add($this->lang['type_title'], 'type_title');
-	$t->add($this->lang['type_content'], 'type_content');
-	$t->add($this->lang['tested_title'], 'tested_title');
-	$t->add($this->lang['tested_content'], 'tested_content');
-	$t->add($this->lang['provides_title'], 'provides_title');
-	$t->add($this->lang['provides_list'], 'provides_list');
-	$t->add($this->lang['introduction_title'], 'introduction_title');
-	$t->add($this->lang['introduction_content'], 'introduction_content');
-	$t->add($svn_co_command, 'introduction_command');
-	$t->add($this->lang['introduction_title1'], 'introduction_title1');
-	$t->add($this->lang['introduction_content1'], 'introduction_content1');
-	$t->add($this->lang['requirements_title'], 'requirements_title');
-	$t->add($this->lang['requirements_list'], 'requirements_list');
-	$t->add($this->openqrm->get('baseurl'), 'baseurl');
-	return $t;
-}
-</pre>
-
-"
-
-requirements_title = "Requirements"
-requirements_list = "<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr dolore magna aliquyam erat, sed diam voluptua.
-<ul>
-	<li>At vero eos et accusam et justo duo dolores et ea rebum</li>
-	<li>Lorem ipsum dolor sit amet, consetetur</li>
-</ul>
-Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>"
-
-tested_title = "Tested with"
-tested_content = "This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions."
-
-provides_title = "Provides"
-provides_list = "<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>"
-
-type_title = "Plugin type"
-type_content = "<span class='pill'>Deployment</span>"
-
-documentation_title = "Documentation"
-use_case_title = "Use-case"
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/lang/en.template.ini b/openQRM-5.3.50-CE/src/plugins/template/web/lang/en.template.ini
deleted file mode 100644
index a29ac0f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/lang/en.template.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[select]
-tab = "Server"
-label = "Template server"
-id = "ID"
-Server = "Server"
-name = "Name"
-resource = "Resource"
-groups = "Groups"
-action_edit = "edit"
-please_wait = "This is a custom openqrm.wait() select view message."
-[edit]
-tab = "Edit"
-label = "Template groups for server %s"
-template_groups = "Template groups"
-msg_updated = "Updated Server %s"
-please_wait = "This is a custom openqrm.wait() message."
-canceled = "Operation canceled. Please wait ..."
-[config]
-tab = "Config"
-label = "Configure Template"
-msg_updated = "Updated template configuration"
-please_wait = "This is a custom openqrm.wait() message."
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/template/web/menu.txt
deleted file mode 100644
index cf43ad4..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/menu.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|Template
-...|Appliances|index.php?plugin=template&template_action=select|Apply Template Classes to Appliances
-...|Configuration|index.php?plugin=template|Configure Template
-...|About|index.php?plugin=template&controller=template-about|How to use
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-appliance-edit-hook.php b/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-appliance-edit-hook.php
deleted file mode 100644
index a2a13ec..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-appliance-edit-hook.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/htmlobjects/htmlobject.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-
-
-function get_template_appliance_edit($appliance_id) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-
-	$appliance = new appliance();
-	$appliance->get_instance_by_id($appliance_id);
-	$plugin_title = "Configure Application on Appliance ".$appliance->name;
-	$plugin_link = "/openqrm/base/index.php?plugin=template&appliance_id=".$appliance_id."&template_action=edit";
-
-	$html = new htmlobject($OPENQRM_SERVER_BASE_DIR.'/openqrm/web/base/class/htmlobjects');
-	$a = $html->a();
-	$a->label = '<image height="24" width="24" alt="'.$plugin_title.'" title="'.$plugin_title.'" src="/openqrm/base/plugins/template/img/plugin.png">';
-	$a->href = $plugin_link;
-	$a->handler = '';
-
-	return $a;
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-appliance-hook.php b/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-appliance-hook.php
deleted file mode 100644
index e64036c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-appliance-hook.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-
-
-function openqrm_template_appliance($cmd, $appliance_fields) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	$appliance_id=$appliance_fields["appliance_id"];
-	$appliance_name=$appliance_fields["appliance_name"];
-	$resource = new resource();
-	$resource->get_instance_by_id($appliance_fields["appliance_resources"]);
-	$appliance_ip=$resource->ip;
-	// check appliance values, maybe we are in update and they are incomplete
-	if (($resource->id == "-1") || ($resource->id == "")) {
-		return;
-	}
-
-
-	$event->log("openqrm_new_appliance", $_SERVER['REQUEST_TIME'], 5, "openqrm-template-appliance-hook.php", "Handling $cmd event $appliance_id/$appliance_name/$appliance_ip", "", "", 0, 0, $appliance_id);
-	switch($cmd) {
-		case "start":
-			$openqrm_server = new openqrm_server();
-			$openqrm_server->send_command($OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/template/bin/openqrm-template-manager start ".$appliance_id." ".$appliance_name." ".$appliance_ip." --openqrm-cmd-mode background");
-			break;
-		case "stop":
-			$openqrm_server = new openqrm_server();
-			$openqrm_server->send_command($OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/template/bin/openqrm-template-manager stop ".$appliance_id." ".$appliance_name." ".$appliance_ip." --openqrm-cmd-mode background");
-			break;
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-appliance-link-hook.php b/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-appliance-link-hook.php
deleted file mode 100644
index efa26b6..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-appliance-link-hook.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/htmlobjects/htmlobject.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-
-
-function get_template_appliance_link($appliance_id) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-
-	$p_appliance = new appliance();
-	$p_appliance->get_instance_by_id($appliance_id);
-	$p_resource = new resource();
-	$p_resource->get_instance_by_id($p_appliance->resources);
-
-	$html = new htmlobject($OPENQRM_SERVER_BASE_DIR.'/openqrm/web/base/class/htmlobjects');
-	$a = $html->a();
-	$a->label = 'Template';
-	$a->css = 'badge';
-	$a->href = '#';
-	$a->handler = 'onclick="window.open(\'Template-URL\',\'\', \'location=0,status=0,scrollbars=1,width=1150,height=800,left=50,top=50,screenX=50,screenY=50\');return false;"';
-
-	$plugin_link = '';
-	if (strstr($p_appliance->state, "active")) {
-		$plugin_link = $a;
-	}
-	if ($p_resource->id == 0) {
-		$plugin_link = $a;
-	}
-	if ($p_resource->id == '') {
-		$plugin_link = "";
-	}
-
-	return $plugin_link;
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-cloud-hook.php b/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-cloud-hook.php
deleted file mode 100644
index 5409893..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-cloud-hook.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This file implements the virtual machine abstraction in the cloud of openQRM
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-
-$event = new event();
-global $event;
-
-global $OPENQRM_SERVER_BASE_DIR;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $RESOURCE_INFO_TABLE;
-
-// ---------------------------------------------------------------------------------
-// general template cloudvm methods
-// ---------------------------------------------------------------------------------
-
-
-// creates a vm 
-function create_template_vm($host_resource_id, $name, $mac, $memory, $cpu, $swap, $additional_nic_str, $vncpassword, $source_image_id, $size, $cu_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("create_template_vm", $_SERVER['REQUEST_TIME'], 5, "template-cloud-hook", "Creating template VM $name on Host resource $host_resource_id", "", "", 0, 0, 0);
-	// start the vm on the host
-	$host_resource = new resource();
-	$host_resource->get_instance_by_id($host_resource_id);
-	// we need to have an openQRM server object too since some of the
-	// virtualization commands are sent from openQRM directly
-	$openqrm = new openqrm_server();
-	// send command to create vm
-	$vm_create_cmd = "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/bin/openqrm-template-vm create -n ".$name." -m ".$mac." -i 0.0.0.0 ".$additional_nic_str." --openqrm-cmd-mode background";
-	$host_resource->send_command($host_resource->ip, $vm_create_cmd);
-	$event->log("create_template_vm", $_SERVER['REQUEST_TIME'], 5, "template-cloud-hook", "Running $vm_create_cmd", "", "", 0, 0, 0);
-}
-
-
-
-// removes a cloud vm
-function remove_template_vm($host_resource_id, $name, $mac, $cu_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	// remove the vm from host
-	$host_resource = new resource();
-	$host_resource->get_instance_by_id($host_resource_id);
-	$event->log("remove_template_vm", $_SERVER['REQUEST_TIME'], 5, "template-cloud-hook", "Removing OpenVZ VM $name/$mac from Host resource $host_resource_id", "", "", 0, 0, 0);
-	// we need to have an openQRM server object too since some of the
-	// virtualization commands are sent from openQRM directly
-	$openqrm = new openqrm_server();
-	// send command to create the vm on the host
-	$vm_remove_cmd = "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/template/bin/openqrm-template-vm delete -n ".$name." --openqrm-cmd-mode background";
-	$event->log("remove_template_vm", $_SERVER['REQUEST_TIME'], 5, "template-cloud-hook", "Running $vm_remove_cmd", "", "", 0, 0, 0);
-	$host_resource->send_command($host_resource->ip, $vm_remove_cmd);
-}
-
-
-
-
-// ---------------------------------------------------------------------------------
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-dashboard-quicklink-hook.php b/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-dashboard-quicklink-hook.php
deleted file mode 100644
index 57b46ae..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-dashboard-quicklink-hook.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-function get_template_dashboard_quicklink($html) {
- 	global $OPENQRM_SERVER_BASE_DIR;
-
-	// creade <i> tag for button icon	
-	$quicklink_icon = $html->i();
-	$quicklink_icon->css = 'glyphicons-icon beer';
-
-/*	
-	// create <span> tag for the colored corner
-	$quicklink_corner = $html->span();
-	$quicklink_corner->css = 'corner corner-orange';
-	
-	// create <label> tag for label in the corner
-	$quicklink_corner_label = $html->label();
-	$quicklink_corner_label->add('23');
-*/	
-	// create <span class="label"> for the button label
-	$quicklink_label = $html->span();
-	$quicklink_label->add('Demolink');
-	$quicklink_label->css = 'label';
-	
-	// create <a> tag and add the above created elements
-	$quicklink = $html->a();
-//	$quicklink->label = $quicklink_icon->get_string() . $quicklink_label->get_string() . $quicklink_corner->get_string() . $quicklink_corner_label->get_string();
-	$quicklink->label = $quicklink_icon->get_string() . $quicklink_label->get_string();
-	$quicklink->css = 'btn quicklink template-quicklink';
-	$quicklink->href = 'index.php?plugin=template&template_action=select';
-
-	return $quicklink;
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-deployment-auth-hook.php b/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-deployment-auth-hook.php
deleted file mode 100644
index 897ac1a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-deployment-auth-hook.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
- /*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/image_authentication.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-
-/**
- * @package openQRM
- * @author OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- * @version 1.0
- */
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $IMAGE_AUTHENTICATION_TABLE;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $openqrm_server;
-$event = new event();
-global $event;
-
-
-
-	//--------------------------------------------------
-	/**
-	* authenticates the storage volume for the appliance resource
-	* <code>
-	* storage_auth_function("start", 2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_function($cmd, $appliance_id) {
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-		global $IMAGE_AUTHENTICATION_TABLE;
-		global $openqrm_server;
-		global $RootDir;
-
-		$appliance = new appliance();
-		$appliance->get_instance_by_id($appliance_id);
-
-		$image = new image();
-		$image->get_instance_by_id($appliance->imageid);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		$resource = new resource();
-		$resource->get_instance_by_id($appliance->resources);
-		$resource_mac=$resource->mac;
-		$resource_ip=$resource->ip;
-
-		// For template vms we assume that the image is located on the vm-host
-		// so we send the auth command to the vm-host instead of the image storage.
-		// This enables using a SAN backend with dedicated volumes per vm-host which all
-		// contain all "golden-images" which are used for snapshotting.
-		// We do this to overcome the current lvm limitation of not supporting cluster-wide snapshots
-		$vm_host_resource = new resource();
-		$vm_host_resource->get_instance_by_id($resource->vhostid);
-		if ($vm_host_resource->id != $storage_resource->id) {
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lxc-lvm-deployment-auth-hook.php", "Appliance $appliance_id image IS NOT available on this template host, $storage_resource->id not equal $vm_host_resource->id !! Assuming SAN Backend", "", "", 0, 0, $appliance_id);
-		} else {
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lxc-lvm-deployment-auth-hook.php", "Appliance $appliance_id image IS available on this template host, $storage_resource->id equal $vm_host_resource->id", "", "", 0, 0, $appliance_id);
-		}
-
-		switch($cmd) {
-			case "start":
-				// authenticate the rootfs / needs openqrm user + pass
-				$openqrm_admin_user = new user("openqrm");
-				$openqrm_admin_user->set_user();
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-lxc-lvm-deployment-auth-hook.php", "Authenticating ".$image_name." / ".$image_rootdevice." on ".$vm_host_resource->ip." to resource ".$resource_ip.".", "", "", 0, 0, $appliance_id);
-				$auth_start_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/template/bin/openqrm-template auth -n ".$image_name." -r ".$image_rootdevice." -i ".$resource_ip." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-				$resource->send_command($vm_host_resource->ip, $auth_start_cmd);
-				break;
-		}
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage volume for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage deployment volumes for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_deployment_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_deployment_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-
-	}
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-deployment-cloud-hook.php b/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-deployment-cloud-hook.php
deleted file mode 100644
index cfc3edc..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-deployment-cloud-hook.php
+++ /dev/null
@@ -1,375 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This file implements the cloud storage methods
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-// special cloud classes
-require_once "$RootDir/plugins/cloud/class/cloudimage.class.php";
-
-$event = new event();
-global $event;
-
-global $OPENQRM_SERVER_BASE_DIR;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $RESOURCE_INFO_TABLE;
-
-
-// ---------------------------------------------------------------------------------
-// general cloudstorage methods
-// ---------------------------------------------------------------------------------
-
-
-// clones the volume of an image
-function create_clone_template_deployment($cloud_image_id, $image_clone_name, $disk_size) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("create_clone", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Creating clone of image on storage", "", "", 0, 0, 0);
-	// we got the cloudimage id here, get the image out of it
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image, this is already the new logical clone
-	// we just need to physical snapshot it and update the rootdevice
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// template_deployment
-	$image->get_instance_by_id($image_id);
-	// parse the volume group info in the identifier
-	$volume_group_location=dirname($image_rootdevice);
-	$volume_group=basename($volume_group_location);
-	$image_location_name=basename($image_rootdevice);
-	// set default snapshot size
-	if (!strlen($disk_size)) {
-		$disk_size=5000;
-	}
-	// update the image rootdevice parameter
-	$ar_image_update = array(
-		'image_rootdevice' => "/dev/$volume_group/$image_clone_name",
-	);
-
-	// For template vms we assume that the image is located on the vm-host
-	// so we send the auth command to the vm-host instead of the image storage.
-	// This enables using a SAN backend with dedicated volumes per vm-host which all
-	// contain all "golden-images" which are used for snapshotting.
-	// We do this to overcome the current lvm limitation of not supporting cluster-wide snapshots
-	// get the vm resource
-	$vm_resource = new resource();
-	$vm_resource->get_instance_by_id($cloudimage->resource_id);
-	// get the openvz host
-	$vm_host_resource = new resource();
-	$vm_host_resource->get_instance_by_id($vm_resource->vhostid);
-	// san backend ?
-	if ($vm_host_resource->id != $resource->id) {
-		$event->log("create_clone_template_deployment", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Image $image_id IS NOT available on this template host, $resource->id not equal $vm_host_resource->id !! Assuming SAN Backend", "", "", 0, 0, $appliance_id);
-		// update the image storage id with the vm-host-resource
-		$image_deployment = new deployment();
-		$image_deployment->get_instance_by_type($image_type);
-		// loop over all storage id from type $image_type
-		$found_image_storage=0;
-		$storage_list_by_type = new storage();
-		$storage_id_list_by_type = $storage_list_by_type->get_ids_by_storage_type($image_deployment->id);
-		foreach($storage_id_list_by_type as $storage_id_list) {
-			$storage_id = $storage_id_list['storage_id'];
-			$tstorage = new storage();
-			$tstorage->get_instance_by_id($storage_id);
-			if ($tstorage->resource_id == $vm_host_resource->id) {
-				// re-create update array + new storage id
-				$ar_image_update = array(
-					'image_rootdevice' => "/dev/$volume_group/$image_clone_name",
-					'image_storageid' => $tstorage->id,
-				);
-				$event->log("create_clone_template_deployment", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Updating Image $image_id / $image_name with storage id $tstorage->id", "", "", 0, 0, $appliance_id);
-				$found_image_storage=1;
-				break;
-			}
-		}
-		if ($found_image_storage == 0) {
-			$event->log("create_clone_template_deployment", $_SERVER['REQUEST_TIME'], 2, "template_deployment-cloud-hook", "SETUP ERROR: Could not find a storage server type $image_type using resource $vm_host_resource->id. Please create one!", "", "", 0, 0, $appliance_id);
-			$event->log("create_clone_template_deployment", $_SERVER['REQUEST_TIME'], 2, "template_deployment-cloud-hook", "SETUP ERROR: Not cloning image $image_id", "", "", 0, 0, $appliance_id);
-			return;
-		}
-
-	} else {
-		$event->log("create_clone_template_deployment", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Image $image_id IS available on this template host, $resource->id equal $vm_host_resource->id", "", "", 0, 0, $appliance_id);
-	}
-
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Updating rootdevice of image $image_id / $image_name with /dev/$volume_group/$image_clone_name", "", "", 0, 0, 0);
-	$image->update($image_id, $ar_image_update);
-	$image_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/template/bin/openqrm-template snap -n ".$image_location_name." -v ".$volume_group." -s ".$image_clone_name." -m ".$disk_size." --openqrm-cmd-mode background";
-	$event->log("cloud", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Running on $vm_host_resource->ip : $image_clone_cmd", "", "", 0, 0, 0);
-	$resource->send_command($vm_host_resource->ip, $image_clone_cmd);
-}
-
-
-
-// removes the volume of an image
-function remove_template_deployment($cloud_image_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("remove_template_deployment", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Removing image on storage", "", "", 0, 0, 0);
-	// we got the cloudimage id here, get the image out of it
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// parse the volume group info in the identifier
-	$volume_group_location=dirname($image_rootdevice);
-	$volume_group=basename($volume_group_location);
-	$image_location_name=basename($image_rootdevice);
-
-	// For template vms we assume that the image is located on the vm-host
-	// so we send the auth command to the vm-host instead of the image storage.
-	// This enables using a SAN backend with dedicated volumes per vm-host which all
-	// contain all "golden-images" which are used for snapshotting.
-	// We do this to overcome the current lvm limitation of not supporting cluster-wide snapshots
-	//
-	// Still we need to send the remove command to the storage resource since the
-	// create-phase automatically adapted the image->storageid, we cannot use the vm-resource here
-	// because cloudimage->resource_id will be set to -1 when the cloudapp is in paused/resize/private state
-	//
-	if ($cloudimage->resource_id > 0) {
-		$vm_resource = new resource();
-		$vm_resource->get_instance_by_id($cloudimage->resource_id);
-		// get the openvz host
-		$vm_host_resource = new resource();
-		$vm_host_resource->get_instance_by_id($vm_resource->vhostid);
-		// san backend ?
-		if ($vm_host_resource->id != $resource->id) {
-			$event->log("remove_template_deployment", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Image $image_id IS NOT available on this template host, $resource->id not equal $vm_host_resource->id !! Assuming SAN Backend", "", "", 0, 0, $appliance_id);
-		} else {
-			$event->log("remove_template_deployment", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Image $image_id IS available on this template host, $resource->id equal $vm_host_resource->id", "", "", 0, 0, $appliance_id);
-		}
-	}
-
-	$image_remove_clone_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/template/bin/openqrm-template remove -n ".$image_location_name." -v ".$volume_group." --openqrm-cmd-mode background";
-	$event->log("remove_template_deployment", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Running on $vm_host_resource->ip : $image_remove_clone_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_remove_clone_cmd);
-}
-
-
-// resizes the volume of an image
-function resize_template_deployment($cloud_image_id, $resize_value) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("resize_template_deployment", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Resize image on storage", "", "", 0, 0, 0);
-	// we got the cloudimage id here, get the image out of it
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// parse the volume group info in the identifier
-	$volume_group_location=dirname($image_rootdevice);
-	$volume_group=basename($volume_group_location);
-	$image_location_name=basename($image_rootdevice);
-
-	// For template vms we assume that the image is located on the vm-host
-	// so we send the auth command to the vm-host instead of the image storage.
-	// This enables using a SAN backend with dedicated volumes per vm-host which all
-	// contain all "golden-images" which are used for snapshotting.
-	// We do this to overcome the current lvm limitation of not supporting cluster-wide snapshots
-	//
-	// Still we need to send the remove command to the storage resource since the
-	// create-phase automatically adapted the image->storageid, we cannot use the vm-resource here
-	// because cloudimage->resource_id will be set to -1 when the cloudapp is in paused/resize/private state
-	//
-	if ($cloudimage->resource_id > 0) {
-		$vm_resource = new resource();
-		$vm_resource->get_instance_by_id($cloudimage->resource_id);
-		// get the openvz host
-		$vm_host_resource = new resource();
-		$vm_host_resource->get_instance_by_id($vm_resource->vhostid);
-		// san backend ?
-		if ($vm_host_resource->id != $resource->id) {
-			$event->log("resize_template_deployment", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Image $image_id IS NOT available on this template host, $resource->id not equal $vm_host_resource->id !! Assuming SAN Backend", "", "", 0, 0, $appliance_id);
-		} else {
-			$event->log("resize_template_deployment", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Image $image_id IS available on this template host, $resource->id equal $vm_host_resource->id", "", "", 0, 0, $appliance_id);
-		}
-	}
-
-	$image_resize_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/template/bin/openqrm-template resize -n ".$image_location_name." -v ".$volume_group." -m ".$resize_value." --openqrm-cmd-mode background";
-	$event->log("resize_template_deployment", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Running : $image_resize_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_resize_cmd);
-}
-
-
-
-// creates a private copy of the volume of an image
-function create_private_template_deployment($cloud_image_id, $private_disk, $private_image_name) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("create_private_template_deployment", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Creating private image on storage", "", "", 0, 0, 0);
-	// we got the cloudimage id here, get the image out of it
-	$cloudimage = new cloudimage();
-	$cloudimage->get_instance_by_id($cloud_image_id);
-	// get image
-	$image = new image();
-	$image->get_instance_by_id($cloudimage->image_id);
-	$image_id = $image->id;
-	$image_name = $image->name;
-	$image_type = $image->type;
-	$image_version = $image->version;
-	$image_rootdevice = $image->rootdevice;
-	$image_rootfstype = $image->rootfstype;
-	$image_storageid = $image->storageid;
-	$image_isshared = $image->isshared;
-	$image_comment = $image->comment;
-	$image_capabilities = $image->capabilities;
-	$image_deployment_parameter = $image->deployment_parameter;
-
-	// get image storage
-	$storage = new storage();
-	$storage->get_instance_by_id($image_storageid);
-	$storage_resource_id = $storage->resource_id;
-	// get storage resource
-	$resource = new resource();
-	$resource->get_instance_by_id($storage_resource_id);
-	$resource_id = $resource->id;
-	$resource_ip = $resource->ip;
-	// create an admin user to post when cloning has finished
-	$openqrm_admin_user = new user("openqrm");
-	$openqrm_admin_user->set_user();
-	// parse the volume group info in the identifier
-	$volume_group_location=dirname($image_rootdevice);
-	$volume_group=basename($volume_group_location);
-	$image_location_name=basename($image_rootdevice);
-
-	// For template vms we assume that the image is located on the vm-host
-	// so we send the auth command to the vm-host instead of the image storage.
-	// This enables using a SAN backend with dedicated volumes per vm-host which all
-	// contain all "golden-images" which are used for snapshotting.
-	// We do this to overcome the current lvm limitation of not supporting cluster-wide snapshots
-	//
-	// Still we need to send the remove command to the storage resource since the
-	// create-phase automatically adapted the image->storageid, we cannot use the vm-resource here
-	// because cloudimage->resource_id will be set to -1 when the cloudapp is in paused/resize/private state
-	//
-	if ($cloudimage->resource_id > 0) {
-		$vm_resource = new resource();
-		$vm_resource->get_instance_by_id($cloudimage->resource_id);
-		// get the openvz host
-		$vm_host_resource = new resource();
-		$vm_host_resource->get_instance_by_id($vm_resource->vhostid);
-		// san backend ?
-		if ($vm_host_resource->id != $resource->id) {
-			$event->log("create_private_template_deployment", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Image $image_id IS NOT available on this template host, $resource->id not equal $vm_host_resource->id !! Assuming SAN Backend", "", "", 0, 0, $appliance_id);
-		} else {
-			$event->log("create_private_template_deployment", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Image $image_id IS available on this template host, $resource->id equal $vm_host_resource->id", "", "", 0, 0, $appliance_id);
-		}
-	}
-
-	$image_resize_cmd=$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/template/bin/openqrm-template clone -n ".$image_location_name." -s ".$private_image_name." -v ".$volume_group." -m ".$private_disk." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background";
-	$event->log("create_private_template_deployment", $_SERVER['REQUEST_TIME'], 5, "template_deployment-cloud-hook", "Running : $image_resize_cmd", "", "", 0, 0, 0);
-	$resource->send_command($resource_ip, $image_resize_cmd);
-	// set the storage specific image root_device parameter
-	$new_rootdevice = str_replace($image_location_name, $private_image_name, $image->rootdevice);
-	return $new_rootdevice;
-}
-
-
-
-// ---------------------------------------------------------------------------------
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-ha-cmd-hook.php b/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-ha-cmd-hook.php
deleted file mode 100644
index da4ef89..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-ha-cmd-hook.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This file implements the virtual machine abstraction in the cloud of openQRM
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-
-$event = new event();
-global $event;
-
-global $OPENQRM_SERVER_BASE_DIR;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $RESOURCE_INFO_TABLE;
-
-// ---------------------------------------------------------------------------------
-// general template_deployment cloudvm methods
-// ---------------------------------------------------------------------------------
-
-
-// creates a vm
-function create_template_deployment_vm($host_resource_id, $name, $mac, $memory, $cpu, $swap, $additional_nic_str, $origin_resource_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$event->log("create_template_deployment_vm", $_SERVER['REQUEST_TIME'], 5, "template_deployment-ha-hook", "Creating OpenVZ-Storage VM $name on Host resource $host_resource_id", "", "", 0, 0, 0);
-	// start the vm on the host
-	$host_resource = new resource();
-	$host_resource->get_instance_by_id($host_resource_id);
-	// we need to have an openQRM server object too since some of the
-	// virtualization commands are sent from openQRM directly
-	$openqrm = new openqrm_server();
-	// send command to create vm
-	$vm_create_cmd = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/template_deployment/bin/openqrm-template_deployment-vm create -n ".$name." -m ".$mac." -i 0.0.0.0 ".$additional_nic_str." --openqrm-cmd-mode background";
-	$host_resource->send_command($host_resource->ip, $vm_create_cmd);
-	$event->log("create_template_deployment_vm", $_SERVER['REQUEST_TIME'], 5, "template_deployment-ha-hook", "Running $vm_create_cmd", "", "", 0, 0, 0);
-}
-
-
-
-// fences a vm
-function fence_template_deployment_vm($host_resource_id, $mac) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-
-	// fences the vm on its host
-	$host_resource = new resource();
-	$host_resource->get_instance_by_id($host_resource_id);
-	$event->log("fence_template_deployment_vm", $_SERVER['REQUEST_TIME'], 5, "template_deployment-ha-hook", "Fencing OpenVZ VM $mac from Host resource $host_resource_id", "", "", 0, 0, 0);
-	// we need to have an openQRM server object too since some of the
-	// virtualization commands are sent from openQRM directly
-	$openqrm = new openqrm_server();
-	// send command to fence the vm on the host
-	$vm_fence_cmd =$OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/template_deployment/bin/openqrm-template_deployment-vm fence -m ".$mac." --openqrm-cmd-mode background";
-	$event->log("fence_template_deployment_vm", $_SERVER['REQUEST_TIME'], 5, "template_deployment-ha-hook", "Running $vm_fence_cmd", "", "", 0, 0, 0);
-	$host_resource->send_command($host_resource->ip, $vm_fence_cmd);
-}
-
-
-
-
-// ---------------------------------------------------------------------------------
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-resource-hook.php b/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-resource-hook.php
deleted file mode 100644
index 8c64b38..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-resource-hook.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-
-
-function openqrm_template_resource($cmd, $resource_fields) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	$resource_id=$resource_fields["resource_id"];
-	$resource = new resource();
-	$resource->get_instance_by_id($resource_id);
-	$resource_ip=$resource->ip;
-	$resource_name=$resource->hostname;
-
-	$event->log("openqrm_template_resource", $_SERVER['REQUEST_TIME'], 5, "openqrm-template-resource-hook.php", "Handling $cmd event $resource_id/$resource_name/$resource_ip", "", "", 0, 0, $resource_id);
-
-	// we do only care if we serving an appliance
-	$appliance = new appliance();
-	$appliance_record_set = array();
-	$appliance_id_array = array();
-	$appliance_record_set = $appliance->get_all_ids();
-	// the appliance_array from getlist is a 2-dimensional array
-	foreach ($appliance_record_set as $index => $appliance_id_array) {
-
-		foreach ($appliance_id_array as $index => $id) {
-			$tapp = new appliance();
-			$tapp->get_instance_by_id($id);
-			$tapp_state = $tapp->state;
-			$tapp_resources = $tapp->resources;
-
-			if (!strcmp($tapp_state, "active")) {
-
-				if ($tapp_resources == $resource_id) {
-					// we found the resources active appliance, running the cmd
-
-					$appliance_name = $tapp->name;
-					switch($cmd) {
-						case "start":
-							$openqrm_server = new openqrm_server();
-							$openqrm_server->send_command($OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/template/bin/openqrm-template-manager start ".$id." ".$appliance_name." ".$resource_ip." --openqrm-cmd-mode background");
-							break;
-						case "stop":
-							$openqrm_server = new openqrm_server();
-							$openqrm_server->send_command($OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/template/bin/openqrm-template-manager stop ".$id." ".$appliance_name." ".$resource_ip." --openqrm-cmd-mode background");
-							break;
-					}
-				}
-			}
-		}
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-resource-virtual-command-hook.php b/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-resource-virtual-command-hook.php
deleted file mode 100644
index c03d24e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/openqrm-template-resource-virtual-command-hook.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-
-
-function openqrm_template_deployment_resource_virtual_command($cmd, $resource_fields) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-
-	$resource_id = $resource_fields["resource_id"];
-	$resource = new resource();
-	$resource->get_instance_by_id($resource_id);
-	$host_resource = new resource();
-	$host_resource->get_instance_by_id($resource->vhostid);
-	$event->log("openqrm_template_deployment_resource_virtual_command", $_SERVER['REQUEST_TIME'], 5, "openqrm-template_deployment-resource-virtual-command-hook.php", "Handling $cmd command of resource $resource->id on host $host_resource->id", "", "", 0, 0, 0);
-
-	switch($cmd) {
-		case "reboot":
-			$event->log("openqrm_template_deployment_resource_virtual_command", $_SERVER['REQUEST_TIME'], 5, "openqrm-template_deployment-resource-virtual-command-hook.php", "Handling $cmd command", "", "", 0, 0, 0);
-			$virtual_command = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/template_deployment/bin/openqrm-template_deployment-vm restart_by_mac -m ".$resource->mac." -d noop --openqrm-cmd-mode background";
-			// reboot conflicts with appliance stop, commented out for now
-			//$host_resource->send_command($host_resource->ip, $virtual_command);
-			break;
-		case "halt":
-			$event->log("openqrm_template_deployment_resource_virtual_command", $_SERVER['REQUEST_TIME'], 5, "openqrm-template_deployment-resource-virtual-command-hook.php", "Handling $cmd command", "", "", 0, 0, 0);
-			$virtual_command = $OPENQRM_SERVER_BASE_DIR."/openqrm/plugins/template_deployment/bin/openqrm-template_deployment-vm stop_by_mac -m ".$resource->mac." --openqrm-cmd-mode background";
-			$host_resource->send_command($host_resource->ip, $virtual_command);
-			break;
-
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/template-action.php b/openQRM-5.3.50-CE/src/plugins/template/web/template-action.php
deleted file mode 100644
index e7d4b51..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/template-action.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-$thisfile = basename($_SERVER['PHP_SELF']);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-$BaseDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/';
-$TemplateDir = $_SERVER["DOCUMENT_ROOT"].'/template-portal/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-// filter inputs
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-$template_command = $request->get('template_command');
-$template_domain = $request->get('template_domain');
-
-// special template classes
-require_once "$RootDir/plugins/template/class/templateconfig.class.php";
-global $TEMPLATE_USER_TABLE;
-global $TEMPLATE_REQUEST_TABLE;
-
-global $OPENQRM_SERVER_BASE_DIR;
-$refresh_delay=5;
-
-$event = new event();
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $event;
-
-// user/role authentication
-if ($OPENQRM_USER->role != "administrator") {
-	$event->log("authorization", $_SERVER['REQUEST_TIME'], 1, "template-action", "Un-Authorized access to template-actions from $OPENQRM_USER->name", "", "", 0, 0, 0);
-	exit();
-}
-
-
-// gather request parameter in array
-foreach ($_REQUEST as $key => $value) {
-	if (strncmp($key, "cr_", 3) == 0) {
-		$request_fields[$key] = $value;
-	}
-}
-
-
-
-// main
-$event->log("$template_command", $_SERVER['REQUEST_TIME'], 5, "template-action", "Processing template command $template_command", "", "", 0, 0, 0);
-
-	switch ($template_command) {
-
-		case 'init':
-			// this command creates the following table
-			//
-			// -> templateconfig
-			// cc_id BIGINT
-			// cc_key VARCHAR(50)
-			// cc_value VARCHAR(50)
-
-			$create_template_config = "create table template_config(cc_id BIGINT, cc_key VARCHAR(50), cc_value VARCHAR(50))";
-			$db=openqrm_get_db_connection();
-			$recordSet = $db->Execute($create_template_config);
-			// create the default configuration
-			$create_default_template_config1 = "insert into template_config(cc_id, cc_key, cc_value) values (1, 'ca_auto_sign', 'true')";
-			$create_default_template_config2 = "insert into template_config(cc_id, cc_key, cc_value) values (2, 'domain_name', '".$template_domain."')";
-			$recordSet = $db->Execute($create_default_template_config1);
-			$recordSet = $db->Execute($create_default_template_config2);
-			$db->Close();
-			break;
-
-		case 'uninstall':
-			$drop_template_config = "drop table template_config";
-			$db=openqrm_get_db_connection();
-			$recordSet = $db->Execute($drop_template_config);
-			$db->Close();
-			break;
-
-
-		default:
-			$event->log("$template_command", $_SERVER['REQUEST_TIME'], 3, "template-action", "No such event command ($template_command)", "", "", 0, 0, 0);
-			break;
-
-
-	}
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/tpl/template-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/template/web/tpl/template-about-documentation.tpl.php
deleted file mode 100644
index c89d96e..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/tpl/template-about-documentation.tpl.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>							<!-- first headline should be h2 -->
-
-<div class="row">							<!-- start content row: provides 10 grid columns-->
-	<div class="span6">						<!-- first column: spans over 6 grid columns -->
-		
-		<h3>{introduction_title}</h3>		<!-- wrap title in html tag locally -->
-		{introduction_content}				<!-- markup for text content need to be done in the language file -->
-		{introduction_command}
-		
-		<h3>{introduction_title1}</h3>
-		{introduction_content1}
-
-		<h3>{provides_title}</h3>
-		{provides_list}
-	
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-	
-	</div>
-
-	<div class="span3 offset1">				<!-- first column: spans over 3 grid columns, 1 column offset -->
-		<h3>{type_title}</h3>
-		{type_content}
-	
-		<h3>{tested_title}</h3>
-		{tested_content}
-	</div>
-</div>
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/tpl/template-apply.tpl.php b/openQRM-5.3.50-CE/src/plugins/template/web/tpl/template-apply.tpl.php
deleted file mode 100644
index df78bb5..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/tpl/template-apply.tpl.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>Apply Template Classes II</h2>
-
-<h2>Please Select the Template-groups for the appliance {appliance_name}</h2>
-<p>
-	{template_groups_table}
-	<a href="template-manager.php"><- back</a>
-</p>
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/tpl/template-config.tpl.php b/openQRM-5.3.50-CE/src/plugins/template/web/tpl/template-config.tpl.php
deleted file mode 100644
index ce8c219..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/tpl/template-config.tpl.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span6">
-		<form action="{thisfile}" method="post">
-			{form}
-			{fields}
-			<br>
-			{submit}
-		</form>
-	</div>
-	
-	<div class="span3 offset1">
-		<h3 class="first">Additional info <small>with examples</small></h3>
-		<p>Use this column to add additional info to this view. You may use all markup as described in the UI development guide.</p>
-		<p><span class="pill orange">Hint</span> You may want to show some <code>inline code</code>.</p>
-	</div>
-</div>
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/tpl/template-edit.tpl.php b/openQRM-5.3.50-CE/src/plugins/template/web/tpl/template-edit.tpl.php
deleted file mode 100644
index 2b4ec2c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/tpl/template-edit.tpl.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-
-<!-- uncomment this to see all available markers for this view -->
-<!-- {?} -->
-
-<h2>{label}</h2>
-
-<form action="{thisfile}" method="POST">
-	{hidden_fields}
-	{select}
-	{bla}
-	{my_custom_link}
-	{submit}&#160;{cancel}
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/template/web/tpl/template-select.tpl.php b/openQRM-5.3.50-CE/src/plugins/template/web/tpl/template-select.tpl.php
deleted file mode 100644
index 4b688fa..0000000
--- a/openQRM-5.3.50-CE/src/plugins/template/web/tpl/template-select.tpl.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-
-	<div id="form" class="span7">
-		<div class="row">
-			
-			<div class="span3">
-				<h3 class="first">Add multi column content</h3>
-				<p>Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt</p>
-				
-				<p>
-					<a href="#" class="btn edit" data-message="This is my custom wait() message">action button</a>
-					<a href="#" class="btn clone">action button</a>
-					<a href="#" class="btn console">action button</a>
-					<a href="#" class="btn remove">action button</a>
-				</p>
-			</div>
-			<div class="span4">
-				<h3 class="first">And awesome tables</h3>
-				<p>
-					<table class="table table-condensed table-striped">
-						<tr>
-							<th>#</th>
-							<th>Name</th>
-							<th>Value</th>
-						</tr>
-						<tr>
-							<td class="text-right">1</td>
-							<td>some name</td>
-							<td class="text-right">1.234</td>
-						</tr>
-						<tr>
-							<td class="text-right">2</td>
-							<td>some name</td>
-							<td class="text-right">1.234</td>
-						</tr>
-
-						<tr>
-							<td class="text-right">3</td>
-							<td>some name</td>
-							<td class="text-right">1.234</td>
-						</tr>
-
-						<tr>
-							<td class="text-right">4</td>
-							<td>some name</td>
-							<td class="text-right">1.234</td>
-						</tr>
-
-					</table>
-				
-				</p>
-			</div>
-		
-		</div>
-		
-		<h3>Action table</h3>
-		{table}
-		
-	</div>
-	
-	<div class="span2 offset1">
-		
-		<h3 class="first">Additional info <small>with examples</small></h3>
-		<p>Use this column to add additional info to this view. You may use all markup as described in the UI development guide.</p>
-		<p><span class="pill orange">Hint</span> You may want to show some <code>inline code</code> or definition lists</p>
-		
-		<hr> <!-- Use HR tag to add a visual divider -->
-		<h3>Some definitions</h3>
-		<dl>
-			<dt>Term</dt>
-			<dd>Definition content. Lorem ipsum dolor sadipscing elit</dd>
-			<dt>Term</dt>
-			<dd>Definition content. Lorem ipsum dolor sit.</dd>
-			<dt>Term</dt>
-			<dd>Definition content. Lorem ipsum dolor sit amet, consetetur sadipscing elit.</dd>
-		</dl>
-
-	</div>
-	
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/tftpd/Makefile b/openQRM-5.3.50-CE/src/plugins/tftpd/Makefile
deleted file mode 100644
index f07430a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tftpd/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# this is the openQRM tftpd-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/web/img
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/web/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/web/lang/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/web/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/web/tpl/
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/tftpd
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/tftpd/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/tftpd/etc/init.d/openqrm-plugin-tftpd b/openQRM-5.3.50-CE/src/plugins/tftpd/etc/init.d/openqrm-plugin-tftpd
deleted file mode 100644
index a60a382..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tftpd/etc/init.d/openqrm-plugin-tftpd
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/bash
-# init script for the openQRM tftpd-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/include/openqrm-plugin-tftpd-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/etc/openqrm-plugin-tftpd.conf
-
-function openqrm_plugin_tftpd_start() {
-	echo "Starting the openQRM tftpd-plugin"
-	openqrm_plugin_tftpd_stop 1>/dev/null 2>&1
-	# check pmtu
-	openqrm_plugin_tftpd_update_pmtu
-
-	# start tftp service
-#	/usr/sbin/in.tftpd -l -4 -s $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/
-	/usr/sbin/in.tftpd --secure -B 1468 -l -4 -s $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/tftpd/.running
-}
-
-
-function openqrm_plugin_tftpd_stop() {
-	echo "Stopping the openQRM tftpd-plugin"
-	killall in.tftpd 1>/dev/null 2>&1
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/tftpd/.running
-}
-
-function openqrm_plugin_tftpd_uninstall() {
-	echo "Uninstalling the openQRM tftpd-plugin"
-	openqrm_plugin_tftpd_stop
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/tftpd
-}
-
-function openqrm_plugin_tftpd_init() {
-	echo "Initializing the openQRM tftpd-plugin"
-	# make sure tftp is not running already
-	if [ -f /etc/debian_version ]; then
-		if [ -x "/etc/init.d/tftpd-hpa" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d tftpd-hpa stop
-			else
-				/etc/init.d/tftpd-hpa stop
-			fi
-		fi
-		# empty config to avoid start at init
-		if [ -f /etc/default/tftpd-hpa ]; then
-			mv -f /etc/default/tftpd-hpa /etc/default/tftpd-hpa.disabled
-		fi
-		update-rc.d -f tftpd-hpa remove
-		# inetd ?
-		if [ -f /etc/inetd.conf ]; then
-			sed -i -e "s/^tftp/#tftp/g" /etc/inetd.conf
-			INETDPID=`ps ax | grep inetd | grep -v grep | awk {' print $1 '}`
-			kill -HUP $INETDPID 1>/dev/null 2>&1
-		fi
-	fi
-	if [ -f /etc/xinetd.d/tftp ]; then
-		sed -i -e "s/disable.*/disable = yes/" /etc/xinetd.d/tftp
-		sed -i -e "s/Disable.*/Disable = yes/" /etc/xinetd.d/tftp
-		if [ -x "/etc/init.d/xinetd" ]; then
-			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d xinetd restart
-			else
-				/etc/init.d/xinetd restart
-			fi
-    		fi
-	fi
-
-	# need to copy pxelinux.0 to the tftpboot dir
-	# sym-linking it does not work because the tftpd-server does not support symlinks
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/boot
-        if [ ! -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.0 ]; then
-            if [ -f /usr/lib/syslinux/pxelinux.0 ]; then
-                #echo ".found: /usr/lib/syslinux/pxelinux.0"
-                cp -a /usr/lib/syslinux/pxelinux.0 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.0
-            elif [ -f /usr/share/syslinux/pxelinux.0 ]; then
-                #echo ".found: /usr/share/syslinux/pxelinux.0"
-                cp -a /usr/share/syslinux/pxelinux.0 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.0
-            elif [ -f /usr/lib/PXELINUX/pxelinux.0 ]; then
-                #echo ".found: /usr/lib/PXELINUX/pxelinux.0"
-                cp -a /usr/lib/PXELINUX/pxelinux.0 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/pxelinux.0
-            else
-		openqrm_post_event 0 "tftpd-plugin" 3 "tftpd-plugin" "Could not find syslinux pxelinux.0 file!"
-            fi
-	fi
-        # pxelinux.0 needs ldlinux.c32 module
-        if [ ! -f $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/ldlinux.c32 ]; then
-            if [ -f /usr/lib/syslinux/modules/bios/ldlinux.c32 ]; then
-                cp -a /usr/lib/syslinux/modules/bios/ldlinux.c32 $OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/ldlinux.c32
-            fi
-        fi
-        
-
-
-
-
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/tftpd
-}
-
-
-case "$1" in
-	start)
-		openqrm_plugin_tftpd_start
-		;;
-	stop)
-		openqrm_plugin_tftpd_stop
-		;;
-	restart)
-		openqrm_plugin_tftpd_stop
-		sleep 1
-		openqrm_plugin_tftpd_start
-		;;
-	init)
-		openqrm_plugin_tftpd_init
-		;;
-	uninstall)
-		openqrm_plugin_tftpd_uninstall
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/tftpd/etc/init.d/openqrm-plugin-tftpd.postinstall b/openQRM-5.3.50-CE/src/plugins/tftpd/etc/init.d/openqrm-plugin-tftpd.postinstall
deleted file mode 100644
index d5bd657..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tftpd/etc/init.d/openqrm-plugin-tftpd.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-tftpd postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/tftpd/etc/init.d/openqrm-plugin-tftpd.preremove b/openQRM-5.3.50-CE/src/plugins/tftpd/etc/init.d/openqrm-plugin-tftpd.preremove
deleted file mode 100644
index 4c3cb82..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tftpd/etc/init.d/openqrm-plugin-tftpd.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-tftpd preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-tftpd stop
diff --git a/openQRM-5.3.50-CE/src/plugins/tftpd/etc/openqrm-plugin-tftpd.conf b/openQRM-5.3.50-CE/src/plugins/tftpd/etc/openqrm-plugin-tftpd.conf
deleted file mode 100644
index d7d6961..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tftpd/etc/openqrm-plugin-tftpd.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-# this is the openQRM-plugin-tftpd info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="tftpd-hpa, openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="tftp-server, openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="tftp, openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="Automatic managed tftpd server providing the pxe/tftp network-deployment environment (in combination with the dhcpd-plugin)."
-OPENQRM_PLUGIN_TYPE="network"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES="dhcpd"
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tftpd/etc/openqrm-plugin-tftpd.conf"
-# dirs which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_DIRS="$OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot/"
diff --git a/openQRM-5.3.50-CE/src/plugins/tftpd/include/openqrm-plugin-tftpd-functions b/openQRM-5.3.50-CE/src/plugins/tftpd/include/openqrm-plugin-tftpd-functions
deleted file mode 100644
index df0c7d9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tftpd/include/openqrm-plugin-tftpd-functions
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-# this is the functions file for the tftpd-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-
-function openqrm_plugin_tftpd_update_pmtu() {
-	#if pmtu is disabled we want to reenable it so tftp trasfer don't get stuck
-	#if the are mtu problems on the network.
-	pmtu_disable_status=$(cat /proc/sys/net/ipv4/ip_no_pmtu_disc)
-	if [ "$pmtu_disable_status" != "0" ] ; then
-		cat 0 > /proc/sys/net/ipv4/ip_no_pmtu_disc
-	fi
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/tftpd/web/class/tftpd-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/tftpd/web/class/tftpd-about.controller.class.php
deleted file mode 100644
index a4c6f80..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tftpd/web/class/tftpd-about.controller.class.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-/**
- * tftpd-about Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class tftpd_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'tftpd_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'tftpd_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'tftpd_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'tftpd_about_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About TFTPD',
-		'label' => 'About TFTPD',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The tftpd plugin automatically manages network-boot (network-deployment) for the resources managed by openQRM.
-			Some of the dynamic deployment methods in openQRM are based on network-booting (PXE) a TFTPD server is a fundamental service to server the operation-system files via the network.
-			An automatic configured TFTPD server is provided by this plugin.
-			No manual configuration is needed. It automatically starts up the tftpd-service during start-up of the plugin.
-			The TFTPD server directory is located at:',
-
-		'requirements_title' => 'Requirements',
-		'requirements_list' => '<li>none</li>',
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-		'provides_title' => 'Provides',
-		'provides_list' => '<li>Network-boot environment for the openQRM Management network</li>',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Network',
-		'documentation_title' => 'Documentation',
-		'use_case_title' => 'Use-Case',
-	),
-	'usage' => array (
-		'tab' => 'About TFTPD',
-		'label' => 'TFTPD Use-Cases',
-	),
-
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/tftpd/lang", 'tftpd-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/tftpd/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "documentation";
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-			case 'bootservice':
-				$content[] = $this->bootservice(true);
-			break;
-			case 'vms':
-				$content[] = $this->vms(true);
-			break;
-			case 'usage':
-				$content[] = $this->usage(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About TFTPD
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/tftpd/class/tftpd-about.documentation.class.php');
-			$controller = new tftpd_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Boot-Service
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function bootservice( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/tftpd/class/tftpd-about.bootservice.class.php');
-			$controller = new tftpd_about_bootservice($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['bootservice'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['bootservice']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'bootservice' );
-		$content['onclick'] = false;
-		if($this->action === 'bootservice'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-
-	//--------------------------------------------
-	/**
-	 * About TFTPD VM management
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function vms( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/tftpd/class/tftpd-about.vms.class.php');
-			$controller = new tftpd_about_vms($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['vms'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['vms']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'vms' );
-		$content['onclick'] = false;
-		if($this->action === 'vms'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-	//--------------------------------------------
-	/**
-	 * About TFTPD Use-Cases
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function usage( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/tftpd/class/tftpd-about.usage.class.php');
-			$controller = new tftpd_about_usage($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['usage'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['usage']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'usage' );
-		$content['onclick'] = false;
-		if($this->action === 'usage'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/tftpd/web/class/tftpd-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/tftpd/web/class/tftpd-about.documentation.class.php
deleted file mode 100644
index bea9f6f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tftpd/web/class/tftpd-about.documentation.class.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * tftpd-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class tftpd_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'tftpd_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "tftpd_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-		$this->basedir    = $this->openqrm->get('basedir');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/tftpd-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['provides_title'], 'provides_title');
-		$t->add($this->lang['provides_list'], 'provides_list');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->basedir."/tftpboot/", 'config_file');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/tftpd/web/css/tftpd.css b/openQRM-5.3.50-CE/src/plugins/tftpd/web/css/tftpd.css
deleted file mode 100644
index 0562222..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tftpd/web/css/tftpd.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/*-Icon classes ----- */
-a.graphs {
-	padding: 0;
-	border: 0px none;
-	width: 32px;
-	height: 32px;
-	display:block;
-	text-align: center;
-	text-decoration: none;
-	line-height: 0px;
-	overflow: hidden;
-	color: transparent;
-}
-a.graphs {
-	background: url('/openqrm/base/plugins/tftpd/img/plugin.png') no-repeat center top;
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/tftpd/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/tftpd/web/img/plugin.png
deleted file mode 100644
index ed0c513..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/tftpd/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/tftpd/web/lang/de.tftpd-about.ini b/openQRM-5.3.50-CE/src/plugins/tftpd/web/lang/de.tftpd-about.ini
deleted file mode 100644
index 646122d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tftpd/web/lang/de.tftpd-about.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[documentation]
-tab = "Über TFTPD"
-label = "Über TFTPD"
-introduction_title = "Einleitung"
-introduction_content = "<p>Das TFTPD-Plugin stellt eine Netzwerk-Boot-Umgebung (Netzwerk-Deployment) für die verwalteten Systeme bereit. Da einige Deployment-Methoden von openQRM mittels Netzwerk-Boot (PXE) arbeiten ist ein TFTPD-Server ein fundamentaler Dienst um Betriebssysteme (z.b. zur Installation) an startende System über das Netzwerk bereitzustellen.</p>
-	<p>Ein automatisch konfigurierter TFTPD-Server wird von diesem Plugin bereitgestellt. Manuelle Konfiguration ist nicht nötig. Das Plugin startet den TFTPD-Dienst während das Plugin startet. Das TFTPD-Server-Verzeichnis befindet sich unter:</p>"
-
-requirements_title = "Anforderungen"
-requirements_list = "keine"
-
-tested_title = "Getestet mit"
-tested_content = "Dieses Plugin ist getestet mit Debian, Ubuntu und CentOS"
-
-provides_title = "Bietet"
-provides_list = "Netzwerk-Boot-Umgebung (Netzwerk-Deployment) für das openQRM-Verwaltungsnetzwerk."
-
-type_title = "Plugin-Typ"
-type_content = "<span class=\"pill\">Netzwerk</span>"
-
-documentation_title = "Dokumentation"
-
-use_case_title = "Anwendungsfall"
-
-[usage]
-tab = "Über TFTPD"
-label = "TFTPD-Anwendungsfälle"
diff --git a/openQRM-5.3.50-CE/src/plugins/tftpd/web/lang/en.tftpd-about.ini b/openQRM-5.3.50-CE/src/plugins/tftpd/web/lang/en.tftpd-about.ini
deleted file mode 100644
index 966bbcd..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tftpd/web/lang/en.tftpd-about.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[documentation]
-tab = "About TFTPD"
-label = "About TFTPD"
-introduction_title = "Introduction"
-introduction_content = "<p>The tftpd plugin automatically manages network boot (network deployment) for the resources managed by openQRM. Some of the dynamic deployment methods in openQRM are based on network booting (PXE). A TFTPD server is a fundamental service to server the operation system files via the network.</p>
-	<p>An automatic configured TFTPD server is provided by this plugin. No manual configuration is needed. It automatically starts up the tftpd-service during start-up of the plugin. The TFTPD server directory is located at:</p>"
-
-requirements_title = "Requirements"
-requirements_list = "none"
-
-tested_title = "Tested with"
-tested_content = "This plugin is tested with Debian, Ubuntu and CentOS."
-
-provides_title = "Provides"
-provides_list = "Network boot environment for the openQRM management network"
-
-type_title = "Plugin type"
-type_content = "<span class=\"pill\">Network</span>"
-
-documentation_title = "Documentation"
-
-use_case_title = "Use case"
-
-[usage]
-tab = "About TFTPD"
-label = "TFTPD use cases"
diff --git a/openQRM-5.3.50-CE/src/plugins/tftpd/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/tftpd/web/menu.txt
deleted file mode 100644
index a74efb8..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tftpd/web/menu.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|Tftpd|index.php?plugin=tftpd&controller=tftpd-about|How to use
diff --git a/openQRM-5.3.50-CE/src/plugins/tftpd/web/openqrm-tftpd-resource-hook.php b/openQRM-5.3.50-CE/src/plugins/tftpd/web/openqrm-tftpd-resource-hook.php
deleted file mode 100644
index 843328a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tftpd/web/openqrm-tftpd-resource-hook.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $OPENQRM_SERVER_IP_ADDRESS;
-$event = new event();
-global $event;
-
-
-
-function openqrm_tftpd_resource($cmd, $resource_fields) {
-	global $event;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_SERVER_IP_ADDRESS;
-	global $OPENQRM_EXEC_PORT;
-	$resource_id=$resource_fields["resource_id"];
-	$resource_ip=$resource_fields["resource_ip"];
-	$resource_mac=$resource_fields["resource_mac"];
-	$event->log("openqrm_new_resource", $_SERVER['REQUEST_TIME'], 5, "openqrm-tftpd-resource-hook.php", "Handling $cmd event $resource_id/$resource_ip/$resource_mac", "", "", 0, 0, $resource_id);
-	switch($cmd) {
-		case "remove":
-			// we remove the pxe config file; the database removal is handled in the resource class
-			$openqrm_server = new openqrm_server();
-			$openqrm_server->send_command("openqrm_remove_resource $resource_id $resource_mac");
-			break;
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/tftpd/web/tpl/tftpd-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/tftpd/web/tpl/tftpd-about-documentation.tpl.php
deleted file mode 100644
index fba42c9..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tftpd/web/tpl/tftpd-about-documentation.tpl.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="row">
-	<div class="span7">
-	
-		<h3>{introduction_title}</h3>
-		{introduction_content}
-		<pre>{config_file}</pre>
-	
-		<h3>{provides_title}</h3>
-		{provides_list}
-	
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-	</div>
-
-	<div class="span2 offset1">
-	
-		<h3>{type_title}</h3>
-		<span class="pill">{type_content}</span>
-	
-		<h3>{tested_title}</h3>
-		{tested_content}
-	</div>
-</div>
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/Makefile b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/Makefile
deleted file mode 100644
index 652075f..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# this is the openQRM tmpfs-storage-plugin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/etc
-	. $(OPENQRM_SERVER_CONF) && cp etc/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/etc/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/etc/init.d
-	. $(OPENQRM_SERVER_CONF) && cp etc/init.d/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/etc/init.d/ && chmod 700 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/include
-	. $(OPENQRM_SERVER_CONF) && cp include/openqrm* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web
-	. $(OPENQRM_SERVER_CONF) && cp web/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.tmpfs-deployment $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web/
-	. $(OPENQRM_SERVER_CONF) && cp web/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web/class
-	. $(OPENQRM_SERVER_CONF) && cp web/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web/class/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web/css
-	. $(OPENQRM_SERVER_CONF) && cp web/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web/lang
-	. $(OPENQRM_SERVER_CONF) && cp web/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web/lang/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web/img
-	. $(OPENQRM_SERVER_CONF) && cp web/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web/tpl
-	. $(OPENQRM_SERVER_CONF) && cp web/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web/tpl/
-	. $(OPENQRM_SERVER_CONF) && chmod 777 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web
-	# menu icons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/tmpfs-storage
-	. $(OPENQRM_SERVER_CONF) && cp web/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/tmpfs-storage/
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/etc/init.d/openqrm-plugin-tmpfs-storage b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/etc/init.d/openqrm-plugin-tmpfs-storage
deleted file mode 100644
index fafddc6..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/etc/init.d/openqrm-plugin-tmpfs-storage
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/bash
-# init script for the openQRM tmpfs-storage-plugin
-#
-# This file is part of openQRM.
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SERVER_BASE_DIR=$(pushd $(dirname $0)/../../../../.. > /dev/null; echo $PWD; popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/include/openqrm-plugin-tmpfs-storage-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/etc/openqrm-plugin-tmpfs-storage.conf
-
-# get the ip config
-openqrm_server_get_config
-export resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-export LANG=C
-# define wget to use with https
-if [ "$OPENQRM_WEB_PROTOCOL" == "https" ]; then
-	WGET_NO_CERT_CHECK="--no-check-certificate"
-fi
-
-
-function openqrm_plugin_tmpfs_storage_start() {
-	openqrm_plugin_tmpfs_storage_stop 1>/dev/null 2>&1
-	echo "Starting the openQRM tmpfs-storage-plugin"
-	touch $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/tmpfs-storage/.running
-}
-
-
-function openqrm_plugin_tmpfs_storage_stop() {
-	echo "Stopping the openQRM tmpfs-storage-plugin"
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/tmpfs-storage/.running
-}
-
-function openqrm_plugin_tmpfs_storage_uninstall() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "tmpfs-storage: Please give a username to uninstall the plugin : "
-		read USERNAME
-		echo
-		echo -n "tmpfs-storage: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Uninstalling the openQRM tmpfs-storage-plugin"
-	openqrm_plugin_tmpfs_storage_stop
-	# drop the table
-	if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$USERNAME --http-password=$PASSWORD "$OPENQRM_WEB_PROTOCOL://$resource_openqrmserver/openqrm/base/plugins/tmpfs-storage/tmpfs-storage-action.php?tmpfs_storage_command=uninstall"; then
-		tmpfs-storage_log init "ERROR: Could not drop the tmpfs-storage-plugin tables in the database!"
-		return 1
-	fi
-	openqrm_server_remove_deployment_type $USERNAME $PASSWORD tmpfs-deployment
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/tmpfs-storage
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.tmpfs-deployment
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.tmpfs-deployment.php
-
-}
-
-function openqrm_plugin_tmpfs_storage_init() {
-	local USERNAME=$1
-	local PASSWORD=$2
-	if [ "$USERNAME" == "" ] && [ "$PASSWORD" == "" ]; then
-		echo -n "tmpfs-storage: Please give a username to init the plugin : "
-		read USERNAME
-		echo
-		echo -n "tmpfs-storage: Please give the password for user $USERNAME : "
-		read PASSWORD
-		echo
-	fi
-	echo "Initializing the openQRM tmpfs-storage-plugin"
-	openqrm_server_add_deployment_type $USERNAME $PASSWORD tmpfs-deployment tmpfs-deployment "Tmpfs-root deployment" tmpfs-storage "temporary In-Memory Storage"
-	# linking the web dir
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/base/plugins/tmpfs-storage
-	# linking the root mount hook
-	
-	chmod +x $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web/root-mount.tmpfs-deployment
-	rm -f $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.tmpfs-deployment
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web/root-mount.tmpfs-deployment $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/root-mount.tmpfs-deployment
-	
-	# linking the default image-parameters
-	ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/web/image.tmpfs-deployment.php $OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm/boot-service/image.tmpfs-deployment.php
-
-	# creating the table
-	if ! wget -q $WGET_NO_CERT_CHECK -O /dev/null --http-user=$USERNAME --http-password=$PASSWORD "$OPENQRM_WEB_PROTOCOL://$resource_openqrmserver/openqrm/base/plugins/tmpfs-storage/tmpfs-storage-action.php?tmpfs_storage_command=init"; then
-		tmpfs-storage_log init "ERROR: Could not create the tmpfs-storage-plugin tables in the database!"
-		return 1
-	fi
-
-}
-
-USER=$2
-PASS=$3
-
-case "$1" in
-	start)
-		openqrm_plugin_tmpfs_storage_start
-		;;
-	stop)
-		openqrm_plugin_tmpfs_storage_stop
-		;;
-	restart)
-		openqrm_plugin_tmpfs_storage_stop
-		sleep 1
-		openqrm_plugin_tmpfs_storage_start
-		;;
-	init)
-		openqrm_plugin_tmpfs_storage_init $USER $PASS
-		;;
-	uninstall)
-		openqrm_plugin_tmpfs_storage_uninstall $USER $PASS
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|init|uninstall}"
-		exit 1
-
-esac
-exit $?
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/etc/init.d/openqrm-plugin-tmpfs-storage.postinstall b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/etc/init.d/openqrm-plugin-tmpfs-storage.postinstall
deleted file mode 100644
index 52529db..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/etc/init.d/openqrm-plugin-tmpfs-storage.postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-tmpfs-storage postinstall script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/etc/init.d/openqrm-plugin-tmpfs-storage.preremove b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/etc/init.d/openqrm-plugin-tmpfs-storage.preremove
deleted file mode 100644
index ee51824..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/etc/init.d/openqrm-plugin-tmpfs-storage.preremove
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# this is the openqrm-plugin-tmpfs-storage preremove script
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-`dirname $0`/openqrm-plugin-tmpfs-storage stop
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/etc/openqrm-plugin-tmpfs-storage.conf b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/etc/openqrm-plugin-tmpfs-storage.conf
deleted file mode 100644
index f227267..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/etc/openqrm-plugin-tmpfs-storage.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-# this is the openQRM-plugin-tmpfs-storage info file
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_PLUGIN_VERSION="5.3.2.1"
-
-# Those items setting up the dependencies for the package
-if [ -f /etc/debian_version ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/redhat-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-elif [ -f /etc/SuSE-release ]; then
-	OPENQRM_PLUGIN_DEPENDENCIES="openqrm-server"
-	OPENQRM_PLUGIN_BUILD_REQUIREMENTS=""
-fi
-
-OPENQRM_PLUGIN_DESCRIPTION="Deploys Physical Systems and Virtual Machines 'in-Memory' (network-deployment)."
-OPENQRM_PLUGIN_TYPE="storage"
-# openQRM plugin-dependencies - the following plugins must be enabled
-OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES="dhcpd, tftpd"
-
-# files which should be taken to the state backup
-OPENQRM_PLUGIN_STATE_FILES="$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/tmpfs-storage/etc/openqrm-plugin-tmpfs-storage.conf"
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/include/openqrm-plugin-tmpfs-storage-functions b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/include/openqrm-plugin-tmpfs-storage-functions
deleted file mode 100644
index 202fc0b..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/include/openqrm-plugin-tmpfs-storage-functions
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-# this is the functions file for the tmpfs-storage-plugin
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-
-
-################ common tmpfs-storage functions
-
-
-################ tmpfs-storage functions
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage-about.controller.class.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage-about.controller.class.php
deleted file mode 100644
index 2e489e0..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage-about.controller.class.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
- * tmpfs-about Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-
-class tmpfs_storage_about_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'tmpfs_storage_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'tmpfs_storage_about_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'tmpfs_storage_about_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'tmpfs_storage_about_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'documentation' => array (
-		'tab' => 'About TmpFs-Storage',
-		'label' => 'About TmpFs-Storage',
-		'introduction_title' => 'Introduction',
-		'introduction_content' => 'The "TmpFs-Storage" plugin provisions server in memeory (tmpfs).',
-		'requirements_title' => 'Requirements',
-		'requirements_list' => 'A resource for the TmpFs-Storage Storage (this can be a remote system integrated into openQRM e.g. via the "local-server" plugin or the openQRM server itself)',
-
-		'tested_title' => 'Tested with',
-		'tested_content' => 'This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions.',
-
-		'provides_title' => 'Provides',
-		'provides_list' => '<ul><li>Storage type: "TmpFs Storage"</li><li>Deployment types: "Tmpfs-root deployment"</li></ul>',
-		'type_title' => 'Plugin Type',
-		'type_content' => 'Storage',
-
-		'deployment_title' => 'Deployment Type',
-		'deployment_content' => 'Network-Deployment',
-
-		'documentation_title' => 'Documentation',
-		'use_case_title' => 'Use-Case',
-		'network_deploymet' => 'Network-Deployment',
-		'doc1' => '',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/tmpfs-storage/lang", 'tmpfs-storage-about.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/tmpfs-storage/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		}
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "documentation";
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'documentation':
-				$content[] = $this->documentation(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * About TmpFs-Storage
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function documentation( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/tmpfs-storage/class/tmpfs-storage-about.documentation.class.php');
-			$controller = new tmpfs_storage_about_documentation($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['documentation'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['documentation']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'documentation' );
-		$content['onclick'] = false;
-		if($this->action === 'documentation'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage-about.documentation.class.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage-about.documentation.class.php
deleted file mode 100644
index 9b36132..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage-about.documentation.class.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * tmpfs-about Documentation
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class tmpfs_storage_about_documentation
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'tmpfs_storage_about_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "tmpfs_storage_about_msg";
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/tmpfs-storage-about-documentation.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['type_title'], 'type_title');
-		$t->add($this->lang['type_content'], 'type_content');
-		$t->add($this->lang['tested_title'], 'tested_title');
-		$t->add($this->lang['tested_content'], 'tested_content');
-		$t->add($this->lang['deployment_title'], 'deployment_title');
-		$t->add($this->lang['deployment_content'], 'deployment_content');
-		$t->add($this->lang['provides_title'], 'provides_title');
-		$t->add($this->lang['provides_list'], 'provides_list');
-		$t->add($this->lang['introduction_title'], 'introduction_title');
-		$t->add($this->lang['introduction_content'], 'introduction_content');
-		$t->add($this->lang['requirements_title'], 'requirements_title');
-		$t->add($this->lang['requirements_list'], 'requirements_list');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage-volume.class.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage-volume.class.php
deleted file mode 100644
index 515140d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage-volume.class.php
+++ /dev/null
@@ -1,355 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-	$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-	require_once "$RootDir/include/openqrm-server-config.php";
-	require_once "$RootDir/include/openqrm-database-functions.php";
-	require_once "$RootDir/class/event.class.php";
-
-/**
- * This class represents an tmpfs_storage_volume object
- *
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- */
-
-
-class tmpfs_storage_volume
-{
-
-/**
-* tmpfs_storage_volume id
-* @access protected
-* @var int
-*/
-var $id = '';
-/**
-* tmpfs_storage_volume name
-* @access protected
-* @var string
-*/
-var $name = '';
-/**
-* tmpfs_storage_volume size
-* @access protected
-* @var string
-*/
-var $size = '';
-/**
-* tmpfs_storage_volume description
-* @access protected
-* @var string
-*/
-var $description = '';
-
-
-/**
-* name of database table
-* @access protected
-* @var string
-*/
-var $_db_table;
-/**
-* path to openqrm basedir
-* @access protected
-* @var string
-*/
-var $_base_dir;
-/**
-* event object
-* @access protected
-* @var object
-*/
-var $_event;
-
-	//--------------------------------------------------
-	/**
-	* Constructor
-	*/
-	//--------------------------------------------------
-	function tmpfs_storage_volume() {
-		$this->init();
-	}
-
-	//--------------------------------------------------
-	/**
-	* init storage environment
-	* @access public
-	*/
-	//--------------------------------------------------
-	function init() {
-		global $OPENQRM_SERVER_BASE_DIR;
-		$this->_event = new event();
-		$this->_db_table = "tmpfs_storage_volumes";
-		$this->_base_dir = $OPENQRM_SERVER_BASE_DIR;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an instance of an tmpfs_storage_volume object from db
-	* @access public
-	* @param int $id
-	* @param string $name
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance($id, $name) {
-		$tmpfs_storage_volume_array = array();
-		$db=openqrm_get_db_connection();
-		if ("$id" != "") {
-			$tmpfs_storage_volume_array = $db->Execute("select * from ".$this->_db_table." where tmpfs_storage_volume_id=".$id);
-		} else if ("$name" != "") {
-			$tmpfs_storage_volume_array = $db->Execute("select * from ".$this->_db_table." where tmpfs_storage_volume_name='".$name."'");
-		}
-		foreach ($tmpfs_storage_volume_array as $index => $tmpfs_storage_volume) {
-			$this->id = $tmpfs_storage_volume["tmpfs_storage_volume_id"];
-			$this->name = $tmpfs_storage_volume["tmpfs_storage_volume_name"];
-			$this->size = $tmpfs_storage_volume["tmpfs_storage_volume_size"];
-			$this->description = $tmpfs_storage_volume["tmpfs_storage_volume_description"];
-		}
-		return $this;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an instance of an tmpfs_storage_volume by id
-	* @access public
-	* @param int $id
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance_by_id($id) {
-		$this->get_instance($id, "");
-		return $this;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an instance of an tmpfs_storage_volume by name
-	* @access public
-	* @param int $name
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance_by_name($name) {
-		$this->get_instance("", $name);
-		return $this;
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* add a new tmpfs_storage_volume
-	* @access public
-	* @param array $tmpfs_storage_volume_fields
-	*/
-	//--------------------------------------------------
-	function add($tmpfs_storage_volume_fields) {
-		if (!is_array($tmpfs_storage_volume_fields)) {
-			$this->_event->log("add", $_SERVER['REQUEST_TIME'], 2, "tmpfs-storage-volume.class.php", "Fields not well defined", "", "", 0, 0, 0);
-			return 1;
-		}
-		$db=openqrm_get_db_connection();
-		$result = $db->AutoExecute($this->_db_table, $tmpfs_storage_volume_fields, 'INSERT');
-		if (! $result) {
-			$this->_event->log("add", $_SERVER['REQUEST_TIME'], 2, "tmpfs-storage-volume.class.php", "Failed adding new tmpfs_storage_volume to database", "", "", 0, 0, 0);
-		}
-	}
-
-	//--------------------------------------------------
-	/**
-	* update an tmpfs_storage_volume
-	* <code>
-	* $fields = array();
-	* $fields['tmpfs_storage_volume_name'] = 'somename';
-	* $fields['tmpfs_storage_volume_uri'] = 'some-uri';
-	* $tmpfs_storage_volume = new tmpfs_storage_volume();
-	* $tmpfs_storage_volume->update(1, $fields);
-	* </code>
-	* @access public
-	* @param int $tmpfs_storage_volume_id
-	* @param array $tmpfs_storage_volume_fields
-	* @return bool
-	*/
-	//--------------------------------------------------
-	function update($tmpfs_storage_volume_id, $tmpfs_storage_volume_fields) {
-		if ($tmpfs_storage_volume_id < 0 || ! is_array($tmpfs_storage_volume_fields)) {
-			$this->_event->log("update", $_SERVER['REQUEST_TIME'], 2, "tmpfs-storage-volume.class.php", "Unable to update tmpfs_storage_volume $tmpfs_storage_volume_id", "", "", 0, 0, 0);
-			return 1;
-		}
-		$db=openqrm_get_db_connection();
-		unset($tmpfs_storage_volume_fields["tmpfs_storage_volume_id"]);
-		$result = $db->AutoExecute($this->_db_table, $tmpfs_storage_volume_fields, 'UPDATE', "tmpfs_storage_volume_id = $tmpfs_storage_volume_id");
-		if (! $result) {
-			$this->_event->log("update", $_SERVER['REQUEST_TIME'], 2, "tmpfs-storage-volume.class.php", "Failed updating tmpfs_storage_volume $tmpfs_storage_volume_id", "", "", 0, 0, 0);
-		}
-	}
-
-	//--------------------------------------------------
-	/**
-	* remove an tmpfs_storage_volume by id
-	* @access public
-	* @param int $tmpfs_storage_volume_id
-	*/
-	//--------------------------------------------------
-	function remove($tmpfs_storage_volume_id) {
-		// remove from db
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from ".$this->_db_table." where tmpfs_storage_volume_id=".$tmpfs_storage_volume_id);
-	}
-
-	//--------------------------------------------------
-	/**
-	* remove an tmpfs_storage_volume by name
-	* @access public
-	* @param string $tmpfs_storage_volume_name
-	*/
-	//--------------------------------------------------
-	function remove_by_name($tmpfs_storage_volume_name) {
-		// remove from db
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from ".$this->_db_table." where tmpfs_storage_volume_name='".$tmpfs_storage_volume_name."'");
-
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* get tmpfs_storage_volume name by id
-	* @access public
-	* @param int $tmpfs_storage_volume_id
-	* @return string
-	*/
-	//--------------------------------------------------
-	function get_name($tmpfs_storage_volume_id) {
-		$db=openqrm_get_db_connection();
-		$tmpfs_storage_volume_set = $db->Execute("select tmpfs_storage_volume_name from ".$this->_db_table." where tmpfs_storage_volume_id=".$tmpfs_storage_volume_id);
-		if (!$tmpfs_storage_volume_set) {
-			$this->_event->log("get_name", $_SERVER['REQUEST_TIME'], 2, "tmpfs-storage-volume.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			if (!$tmpfs_storage_volume_set->EOF) {
-				return $tmpfs_storage_volume_set->fields["tmpfs_storage_volume_name"];
-			} else {
-				return "not found";
-			}
-		}
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of all tmpfs_storage_volume names
-	* <code>
-	* $tmpfs_storage_volume = new tmpfs_storage_volume();
-	* $arr = $tmpfs_storage_volume->get_list();
-	* // $arr[0]['value']
-	* // $arr[0]['label']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_list() {
-		$query = "select tmpfs_storage_volume_id, tmpfs_storage_volume_name from ".$this->_db_table." order by tmpfs_storage_volume_id ASC";
-		$tmpfs_storage_volume_name_array = array();
-		$tmpfs_storage_volume_name_array = openqrm_db_get_result_double ($query);
-		return $tmpfs_storage_volume_name_array;
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of all tmpfs_storage_volume ids
-	* <code>
-	* $tmpfs_storage_volume = new tmpfs_storage_volume();
-	* $arr = $tmpfs_storage_volume->get_ids();
-	* // $arr['value']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_ids() {
-		$tmpfs_storage_volume_array = array();
-		$query = "select tmpfs_storage_volume_id from ".$this->_db_table;
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute($query);
-		if (!$rs)
-			$event->log("get_list", $_SERVER['REQUEST_TIME'], 2, "tmpfs-storage-volume.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		else
-		while (!$rs->EOF) {
-			$tmpfs_storage_volume_array[] = $rs->fields;
-			$rs->MoveNext();
-		}
-		return $tmpfs_storage_volume_array;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get number of tmpfs_storage_volume accounts
-	* @access public
-	* @return int
-	*/
-	//--------------------------------------------------
-	function get_count() {
-		$count=0;
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("select count(tmpfs_storage_volume_id) as num from ".$this->_db_table);
-		if (!$rs) {
-			$this->_event->log("get_count", $_SERVER['REQUEST_TIME'], 2, "tmpfs-storage-volume.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			$count = $rs->fields["num"];
-		}
-		return $count;
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of tmpfs_storage_volumes
-	* @access public
-	* @param int $offset
-	* @param int $limit
-	* @param string $sort
-	* @param enum $order [ASC/DESC]
-	* @return array
-	*/
-	//--------------------------------------------------
-	function display_overview($offset, $limit, $sort, $order) {
-		$db=openqrm_get_db_connection();
-		$recordSet = $db->SelectLimit("select * from ".$this->_db_table." order by $sort $order", $limit, $offset);
-		$tmpfs_storage_volume_array = array();
-		if (!$recordSet) {
-			$this->_event->log("display_overview", $_SERVER['REQUEST_TIME'], 2, "tmpfs-storage-volume.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			while (!$recordSet->EOF) {
-				array_push($tmpfs_storage_volume_array, $recordSet->fields);
-				$recordSet->MoveNext();
-			}
-			$recordSet->Close();
-		}
-		return $tmpfs_storage_volume_array;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.add.class.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.add.class.php
deleted file mode 100644
index e116051..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.add.class.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-/**
- * TmpFs-Storage Add new Volume
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class tmpfs_storage_add
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'tmpfs_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "tmpfs_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'tmpfs_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'tmpfs_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response, $controller) {
-		$this->controller = $controller;
-		$this->response   = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-		$this->user = $openqrm->user();
-		$storage_id       = $this->response->html->request()->get('storage_id');
-		$storage          = $this->openqrm->storage();
-		$resource         = $this->openqrm->resource();
-		$deployment       = $this->openqrm->deployment();
-		$this->response->params['storage_id'] = $this->response->html->request()->get('storage_id');
-		$this->storage    = $storage->get_instance_by_id($storage_id);
-		$this->resource   = $resource->get_instance_by_id($storage->resource_id);
-		$this->deployment = $deployment->get_instance_by_id($storage->type);
-		require_once($this->openqrm->get('basedir').'/plugins/tmpfs-storage/web/class/tmpfs-storage-volume.class.php');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->add();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 3) {
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&image_id='.$response->image_id
-				);
-			} else {
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/tmpfs-storage-add.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add($this->lang['lang_name_generate'], 'lang_name_generate');
-		$t->add($this->lang['label'], 'label');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function add() {
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			if(!$form->get_errors()) {
-				$name        = $form->get_request('name');
-				$size        = $form->get_request('size');
-				$description = $form->get_request('description');
-
-				// check if volume / image name is aleady existing
-				$image_check = new image();
-				$image_check->get_instance_by_name($name);
-				if (isset($image_check->id) && $image_check->id > 0) {
-					$error = sprintf($this->lang['error_image_exists'], $name);
-				}
-
-				$tmpfs_storage_volume = new tmpfs_storage_volume();
-				$tmpfs_storage_volume->get_instance_by_name($name);
-				if (isset($tmpfs_storage_volume->id) && $tmpfs_storage_volume->id > 0) {
-					$error = sprintf($this->lang['error_exists'], $name);
-				}
-
-				if(isset($error)) {
-					$response->error = $error;
-				} else {
-					// add volume
-					$volume_fields = array();
-					$volume_fields["tmpfs_storage_volume_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$volume_fields['tmpfs_storage_volume_name'] = $name;
-					$volume_fields['tmpfs_storage_volume_size'] = $size;
-					$volume_fields['tmpfs_storage_volume_description'] = $description;
-					$tmpfs_storage_volume->add($volume_fields);
-					// add image
-					$tables = $this->openqrm->get('table');
-					$image_fields = array();
-					$image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$image_fields['image_name'] = $name;
-					$image_fields['image_type'] = $this->deployment->type;
-					$image_fields['image_rootfstype'] = 'tmpfs';
-					$image_fields['image_storageid'] = $this->storage->id;
-					$image_fields['image_comment'] = "Image Object for volume $name";
-					$image_fields['image_rootdevice'] = $size;
-					$image_fields['image_size'] = $size;
-					$image = new image();
-					$image->add($image_fields);
-					$response->msg = sprintf($this->lang['msg_added'], $name);
-					// save image id in response for the wizard
-					$response->image_id = $image_fields["image_id"];
-				}
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'add');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$volume_size_arr[] = array("256", "256 MB");
-		$volume_size_arr[] = array("512", "512 MB");
-		$volume_size_arr[] = array("768", "768 MB");
-		$volume_size_arr[] = array("1024", "1 GB");
-		$volume_size_arr[] = array("2048", "2 GB");
-		$volume_size_arr[] = array("3072", "3 GB");
-		$volume_size_arr[] = array("4096", "4 GB");
-		$volume_size_arr[] = array("8192", "8 GB");
-		$volume_size_arr[] = array("16384", "16 GB");
-		$volume_size_arr[] = array("32768", "32 GB");
-		$volume_size_arr[] = array("65536", "64 GB");
-
-		$d['name']['label']                             = $this->lang['form_name'];
-		$d['name']['required']                          = true;
-		$d['name']['validate']['regex']                 = '/^[a-z0-9._]+$/i';
-		$d['name']['validate']['errormsg']              = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                    = 'htmlobject_input';
-		$d['name']['object']['attrib']['name']          = 'name';
-		$d['name']['object']['attrib']['id']            = 'name';
-		$d['name']['object']['attrib']['type']          = 'text';
-		$d['name']['object']['attrib']['css']           = 'namegen';
-		$d['name']['object']['attrib']['customattribs'] = 'data-prefix="tmpfs_" data-length="8"';
-		$d['name']['object']['attrib']['value']         = '';
-		$d['name']['object']['attrib']['maxlength']     = 50;
-
-		$d['size']['label']                         = $this->lang['form_size'];
-		$d['size']['object']['type']                = 'htmlobject_select';
-		$d['size']['object']['attrib']['name']      = 'size';
-		$d['size']['object']['attrib']['index']     = array(0,1);
-		$d['size']['object']['attrib']['options']   = $volume_size_arr;
-
-		$d['description']['label']                         = $this->lang['form_description'];
-		$d['description']['required']                      = true;
-		$d['description']['validate']['regex']             = '/^[a-z 0-9._]+$/i';
-		$d['description']['validate']['errormsg']          = sprintf($this->lang['error_description'], 'a-z 0-9._');
-		$d['description']['object']['type']                = 'htmlobject_input';
-		$d['description']['object']['attrib']['name']      = 'description';
-		$d['description']['object']['attrib']['type']      = 'text';
-		$d['description']['object']['attrib']['value']     = '';
-		$d['description']['object']['attrib']['maxlength'] = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.clone.class.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.clone.class.php
deleted file mode 100644
index daf558a..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.clone.class.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
- * TmpFs-Storage Clone Volume(s)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class tmpfs_storage_clone
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'tmpfs_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "tmpfs_storage_msg";
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'tmpfs_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'tmpfs_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->user = $openqrm->user();
-		$this->file = $this->openqrm->file();
-		$this->volume = $this->response->html->request()->get('volume');
-		$this->response->params['volume'] = $this->volume;
-		require_once($this->openqrm->get('basedir').'/plugins/tmpfs-storage/web/class/tmpfs-storage-volume.class.php');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->duplicate();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 3) {
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&image_id='.$response->image_id
-				);
-			} else {
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/tmpfs-storage-clone.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['form_add'], 'form_add');
-		$t->add(sprintf($this->lang['label'], $this->volume), 'label');
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Clone
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function duplicate() {
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-
-			$storage_id = $this->response->html->request()->get('storage_id');
-			$storage    = new storage();
-			$resource   = new resource();
-			$deployment = new deployment();
-			$storage->get_instance_by_id($storage_id);
-			$resource->get_instance_by_id($storage->resource_id);
-			$deployment->get_instance_by_id($storage->type);
-			$name        = $form->get_request('name');
-
-			// check if volume / image name is aleady existing
-			$image_check = new image();
-			$image_check->get_instance_by_name($name);
-			if (isset($image_check->id) && $image_check->id > 0) {
-				$error = sprintf($this->lang['error_image_exists'], $name);
-			}
-
-			$tmpfs_storage_volume = new tmpfs_storage_volume();
-			$tmpfs_storage_volume->get_instance_by_name($name);
-			if (isset($tmpfs_storage_volume->id) && $tmpfs_storage_volume->id > 0) {
-				$error = sprintf($this->lang['error_exists'], $name);
-			}
-
-			if(isset($error)) {
-				$response->error = $error;
-			} else {
-				// add volume
-				$tmpfs_storage_volume->get_instance_by_name($this->volume);
-				$volume_fields = array();
-				$volume_fields["tmpfs_storage_volume_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$volume_fields['tmpfs_storage_volume_name'] = $name;
-				$volume_fields['tmpfs_storage_volume_size'] = $tmpfs_storage_volume->size;
-				$volume_fields['tmpfs_storage_volume_description'] = $tmpfs_storage_volume->description;
-				$tmpfs_storage_volume->add($volume_fields);
-				// add image
-				$tables = $this->openqrm->get('table');
-				$image_fields = array();
-				$image_fields["image_id"] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$image_fields['image_name'] = $name;
-				$image_fields['image_type'] = $deployment->type;
-				$image_fields['image_rootfstype'] = 'tmpfs';
-				$image_fields['image_storageid'] = $storage->id;
-				$image_fields['image_comment'] = "Image Object for volume $name";
-				$image_fields['image_rootdevice'] = $tmpfs_storage_volume->size;
-				$image_fields['image_size'] = $tmpfs_storage_volume->size;
-				$image = new image();
-				$image->add($image_fields);
-
-				$response->msg = sprintf($this->lang['msg_cloned'], $this->volume, $name);
-				// save image id in response for the wizard
-				$response->image_id = $image_fields["image_id"];
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'clone');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$d['name']['label']                             = $this->lang['form_name'];
-		$d['name']['required']                          = true;
-		$d['name']['validate']['regex']                 = '/^[a-z0-9._]+$/i';
-		$d['name']['validate']['errormsg']              = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                    = 'htmlobject_input';
-		$d['name']['object']['attrib']['name']          = 'name';
-		$d['name']['object']['attrib']['id']            = 'name';
-		$d['name']['object']['attrib']['type']          = 'text';
-		$d['name']['object']['attrib']['css']           = 'namegen';
-		$d['name']['object']['attrib']['customattribs'] = 'data-prefix="tmpfs_" data-length="8"';
-		$d['name']['object']['attrib']['value']         = $this->volume.'_clone';
-		$d['name']['object']['attrib']['maxlength']     = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.controller.class.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.controller.class.php
deleted file mode 100644
index 1808b01..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.controller.class.php
+++ /dev/null
@@ -1,393 +0,0 @@
-<?php
-/**
- * TmpFs-Storage Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class tmpfs_storage_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'tmpfs_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "tmpfs_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'tmpfs_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'tmpfs_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array (
-		'tab' => 'Select TmpFs-storage',
-		'label' => 'Select TmpFs-storage',
-		'action_edit' => 'edit',
-		'table_name' => 'Name',
-		'table_id' => 'Id',
-		'table_recource' => 'Resource',
-		'table_type' => 'Type',
-		'table_deployment' => 'Deployment',
-		'error_no_storage' => '<b>No storage configured yet!</b><br><br>Please create a TmpFs Storage first!',
-		'new_storage' => 'New Storage',
-		'please_wait' => 'Loading Storage. Please wait ..',
-	), 
-	'edit' => array (
-		'tab' => 'Edit TmpFs-storage',
-		'label' => 'TmpFs Volumes on storage %s',
-		'lang_id' => 'ID',
-		'lang_name' => 'Name',
-		'lang_resource' => 'Resource',
-		'lang_state' => 'State',
-		'lang_vfree' => 'Free',
-		'lang_vsize' => 'Total',
-		'action_add' => 'Add new Volume',
-		'action_refresh' => 'Reload Page',
-		'action_manual' => 'Manual Configuration',
-		'action_clone' => 'clone',
-		'action_remove' => 'remove',
-		'action_auth' => 'auth',
-		'action_clone_in_progress' => 'Synchronisation in progress - Please wait',
-		'action_clone_finished' => 'Syncronisation finished!',
-		'table_name' => 'Name',
-		'table_id' => 'ID',
-		'table_size' => 'Size',
-		'table_description' => 'Description',
-		'error_no_tmpfs' => 'Storage %s is not of type tmpfs-deployment',
-		'please_wait' => 'Loading Volumes. Please wait ..',
-		'manual_configured' => 'Storage is manually configured and can not be be edited by openQRM',
-	),
-	'add' => array (
-		'tab' => 'Add TmpFs Volume',
-		'label' => 'Add new Volume',
-		'form_name' => 'Name',
-		'form_size' => 'Size',
-		'form_description' => 'Description',
-		'msg_added' => 'Added Volume %s',
-		'msg_add_failed' => 'Failed to add Volume %s',
-		'error_exists' => 'Volume %s already exists',
-		'error_image_exists' => 'Image with name %s already exists',
-		'error_name' => 'Name must be %s',
-		'error_description' => 'Description must be %s',
-		'please_wait' => 'Adding Volume. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'clone' => array (
-		'tab' => 'Clone TmpFs Volume',
-		'label' => 'Clone Volume %s',
-		'form_add' => 'New TmpFs Volume',
-		'form_name' => 'Name',
-		'msg_cloned' => 'Cloned %s as %s',
-		'msg_clone_failed' => 'Failed to clone Volume %s',
-		'error_exists' => 'Volume %s already exists',
-		'error_name' => 'Name must be %s',
-		'please_wait' => 'Cloning Volume. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'remove' => array (
-		'label' => 'Remove Volume(s)',
-		'msg_removed' => 'Removed Volume %s',
-		'msg_image_still_in_use' => 'Volume %s of Image id %s is still in use by appliance(s) %s',
-		'please_wait' => 'Removing Volume(s). Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/tmpfs-storage/lang", 'tmpfs-storage.ini');
-		$this->tpldir   = $this->rootdir.'/plugins/tmpfs-storage/tpl';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "edit";
-		}
-		if($this->action !== 'select') {
-			$this->response->params['storage_id'] = $this->response->html->request()->get('storage_id');
-		}
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'edit':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-			break;
-			case 'add':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->add(true);
-			break;
-			case 'remove':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->remove(true);
-			break;
-			case 'clone':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(false);
-				$content[] = $this->duplicate(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->rootdir.'/plugins/tmpfs-storage/class/tmpfs-storage.api.class.php');
-		$controller = new tmpfs_storage_api($this);
-		$controller->action();
-	}
-
-	
-	//--------------------------------------------
-	/**
-	 * Select Storages of type TmpFs
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/tmpfs-storage/class/tmpfs-storage.select.class.php');
-			$controller = new tmpfs_storage_select($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->lang            = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Edit TmpFs-Storage
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function edit( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-		    require_once($this->rootdir.'/plugins/tmpfs-storage/class/tmpfs-storage.edit.class.php');
-		    $controller                  = new tmpfs_storage_edit($this->openqrm, $this->response);
-		    $controller->actions_name    = $this->actions_name;
-		    $controller->tpldir          = $this->tpldir;
-		    $controller->message_param   = $this->message_param;
-		    $controller->identifier_name = $this->identifier_name;
-		    $controller->prefix_tab      = $this->prefix_tab;
-		    $controller->lang            = $this->lang['edit'];
-			$controller->rootdir         = $this->rootdir;
-		    $data = $controller->action();
-		}
-		$content['label']   = $this->lang['edit']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'edit' );
-		$content['onclick'] = false;
-		if($this->action === 'edit'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Add new Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function add( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-		    require_once($this->rootdir.'/plugins/tmpfs-storage/class/tmpfs-storage.add.class.php');
-		    $controller                = new tmpfs_storage_add($this->openqrm, $this->response, $this);
-		    $controller->actions_name  = $this->actions_name;
-		    $controller->tpldir        = $this->tpldir;
-		    $controller->message_param = $this->message_param;
-		    $controller->lang          = $this->lang['add'];
-		    $controller->rootdir       = $this->rootdir;
-		    $controller->prefix_tab    = $this->prefix_tab;
-		    $data = $controller->action();
-		}
-		$content['label']   = $this->lang['add']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'add' );
-		$content['onclick'] = false;
-		if($this->action === 'add'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Remove Export
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function remove( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-		    require_once($this->rootdir.'/plugins/tmpfs-storage/class/tmpfs-storage.remove.class.php');
-		    $controller                  = new tmpfs_storage_remove($this->openqrm, $this->response);
-		    $controller->actions_name    = $this->actions_name;
-		    $controller->tpldir          = $this->tpldir;
-		    $controller->message_param   = $this->message_param;
-		    $controller->identifier_name = $this->identifier_name;
-		    $controller->lang            = $this->lang['remove'];
-		    $controller->rootdir         = $this->rootdir;
-		    $controller->prefix_tab      = $this->prefix_tab;
-		    $data = $controller->action();
-		}
-		$content['label']   = 'Remove';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'remove' );
-		$content['onclick'] = false;
-		if($this->action === 'remove'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Clone Volume
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function duplicate( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-		    require_once($this->rootdir.'/plugins/tmpfs-storage/class/tmpfs-storage.clone.class.php');
-		    $controller                  = new tmpfs_storage_clone($this->openqrm, $this->response);
-		    $controller->actions_name    = $this->actions_name;
-		    $controller->tpldir          = $this->tpldir;
-		    $controller->message_param   = $this->message_param;
-		    $controller->identifier_name = $this->identifier_name;
-		    $controller->lang            = $this->lang['clone'];
-		    $controller->rootdir         = $this->rootdir;
-		    $controller->prefix_tab      = $this->prefix_tab;
-		    $data = $controller->action();
-		}
-		$content['label']   = $this->lang['clone']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'clone' );
-		$content['onclick'] = false;
-		if($this->action === 'clone' || $this->action === $this->lang['edit']['action_clone']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.edit.class.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.edit.class.php
deleted file mode 100644
index 2488c33..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.edit.class.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-/**
- * TmpFs-Storage Edit Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class tmpfs_storage_edit
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'tmpfs_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "tmpfs_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'tmpfs_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'tmpfs_identifier';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-		require_once($this->openqrm->get('basedir').'/plugins/tmpfs-storage/web/class/tmpfs-storage-volume.class.php');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Init
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function init() {
-		$storage_id = $this->response->html->request()->get('storage_id');
-		if($storage_id === '') {
-			return false;
-		}
-		// set ENV
-		$deployment = new deployment();
-		$storage    = new storage();
-		$resource   = new resource();
-
-		$storage->get_instance_by_id($storage_id);
-		$resource->get_instance_by_id($storage->resource_id);
-		$deployment->get_instance_by_id($storage->type);
-
-		$this->resource   = $resource;
-		$this->storage    = $storage;
-		$this->deployment = $deployment;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$this->init();
-		$data = $this->edit();
-		if($data !== false) {
-			$t = $this->response->html->template($this->tpldir.'/tmpfs-storage-edit.tpl.php');
-			$t->add($this->response->html->thisfile, "thisfile");
-			$t->add($data);
-			$t->add($this->lang['lang_id'], 'lang_id');
-			$t->add($this->lang['lang_name'], 'lang_name');
-			$t->add($this->lang['lang_resource'], 'lang_resource');
-			$t->add($this->lang['lang_state'], 'lang_state');
-			$t->add($this->lang['lang_vfree'], 'lang_vfree');
-			$t->add($this->lang['lang_vsize'], 'lang_vsize');
-			$t->add(sprintf($this->lang['label'], $data['name']), 'label');
-			return $t;
-		} else {
-			$msg = sprintf($this->lang['error_no_tmpfs'], $this->response->html->request()->get('storage_id'));
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $msg)
-			);
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return array|false
-	 */
-	//--------------------------------------------
-	function edit() {
-		if($this->deployment->type === 'tmpfs-deployment') {
-			$resource_icon_default="/img/resource.png";
-			$storage_icon="/plugins/tmpfs-storage/img/plugin.png";
-			$state_icon = $this->openqrm->get('baseurl')."/img/".$this->resource->state.".png";
-			if ($this->file->exists($this->openqrm->get('webdir').$storage_icon)) {
-				$resource_icon_default=$storage_icon;
-			}
-			$resource_icon_default = $this->openqrm->get('baseurl').$resource_icon_default;
-
-			$d['state'] = '<img width="24" height="24" src="'.$state_icon.'">';
-			$d['icon'] = '<img width="24" height="24" src="'.$resource_icon_default.'">';
-			$d['resource'] = $this->resource->id.' / '.$this->resource->ip;
-			$d['name'] = $this->storage->name;
-			$d['id'] = $this->storage->id;
-
-			$a = $this->response->html->a();
-			$a->label = $this->lang['action_add'];
-			$a->css   = 'add';
-			$a->handler = 'onclick="wait();"';
-			$a->href  = $this->response->get_url($this->actions_name, "add");
-			$d['add'] = $a->get_string();
-
-			$body = array();
-			$identifier_disabled = array();
-
-			$table = $this->response->html->tablebuilder('tmpfs_edit', $this->response->get_array($this->actions_name, 'edit'));
-			$table->sort            = 'tmpfs_storage_volume_id';
-			$table->limit           = 10;
-			$table->offset          = 0;
-			$table->order           = 'ASC';
-			$table->sort_link       = false;
-			$table->init();
-
-			$tmpfs_storage_volume = new tmpfs_storage_volume();
-			$tmpfs_storage_volume_arr = $tmpfs_storage_volume->display_overview(0, 10000, $table->sort, $table->order);
-			if(count($tmpfs_storage_volume_arr) >= 1) {
-				foreach($tmpfs_storage_volume_arr as $k => $v) {
-
-					$c = $this->response->html->a();
-					$c->title   = $this->lang['action_clone'];
-					$c->label   = $this->lang['action_clone'];
-					$c->handler = 'onclick="wait();"';
-					$c->css     = 'clone';
-					$c->href    = $this->response->get_url($this->actions_name, "clone").'&volume='.$v['tmpfs_storage_volume_name'];
-
-					$body[] = array(
-						'icon' => $d['icon'],
-						'tmpfs_storage_volume_id' => $v['tmpfs_storage_volume_id'],
-						'tmpfs_storage_volume_name' => $v['tmpfs_storage_volume_name'],
-						'tmpfs_storage_volume_size' => $v['tmpfs_storage_volume_size'],
-						'description' => $v['tmpfs_storage_volume_description'],
-						'clone' => $c,
-					);
-				}
-			}
-
-			$h['icon']['title'] = '&#160;';
-			$h['icon']['sortable'] = false;
-			$h['tmpfs_storage_volume_id']['title'] = $this->lang['table_id'];
-			$h['tmpfs_storage_volume_name']['title'] = $this->lang['table_name'];
-			$h['tmpfs_storage_volume_size']['title'] = $this->lang['table_size'];
-			$h['description']['title'] = $this->lang['table_description'];
-			$h['description']['sortable'] = false;
-			$h['clone']['title'] = '&#160;';
-			$h['clone']['sortable'] = false;
-
-			$table->max                 = count($tmpfs_storage_volume_arr);
-			$table->id                  = 'Tabelle';
-			$table->css                 = 'htmlobject_table';
-			$table->border              = 1;
-			$table->cellspacing         = 0;
-			$table->cellpadding         = 3;
-			$table->form_action         = $this->response->html->thisfile;
-			$table->form_method         = 'GET';
-			$table->head                = $h;
-			$table->body                = $body;
-			$table->autosort            = true;
-			$table->identifier          = 'tmpfs_storage_volume_name';
-			$table->identifier_name     = $this->identifier_name;
-			$table->identifier_disabled = $identifier_disabled;
-			$table->actions_name        = $this->actions_name;
-			$table->actions             = array(array('remove' => $this->lang['action_remove']));
-
-			$d['table'] = $table->get_string();
-			return $d;
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.remove.class.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.remove.class.php
deleted file mode 100644
index 4c491ab..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.remove.class.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
- * TmpFs-Storage Remove Volume(s)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class tmpfs_storage_remove
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'tmpfs_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "tmpfs_storage_msg";
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'tmpfs_identifier';
-/**
-* openqrm rootdir
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'tmpfs_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-		require_once($this->openqrm->get('basedir').'/plugins/tmpfs-storage/web/class/tmpfs-storage-volume.class.php');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->remove();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'edit', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/tmpfs-storage-remove.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function remove() {
-		$response = $this->get_response();
-		$volume_names  = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		if( $volume_names !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($volume_names as $ex) {
-				$d['param_f'.$i]['label']                       = $ex;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $ex;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;		
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$storage_id = $this->response->html->request()->get('storage_id');
-				$storage    = new storage();
-				$resource   = new resource();
-				$errors     = array();
-				$message    = array();
-				foreach($volume_names as $key => $volume_name) {
-
-					// check if an appliance is still using the volume as an image
-					$image = new image();
-					$image->get_instance_by_name($volume_name);
-
-					// check if it is still in use
-					$appliance = new appliance();
-					$appliances_using_resource = $appliance->get_ids_per_image($image->id);
-					if (count($appliances_using_resource) > 0) {
-						$appliances_using_resource_str = implode(",", $appliances_using_resource[0]);
-						$errors[] = sprintf($this->lang['msg_image_still_in_use'], $volume_name, $image->id, $appliances_using_resource_str);
-					} else {
-						// remove volume
-						$tmpfs_storage_volume = new tmpfs_storage_volume();
-						$tmpfs_storage_volume->remove_by_name($volume_name);
-						// remove the image of the volume
-						$image->remove_by_name($volume_name);
-
-						$form->remove($this->identifier_name.'['.$key.']');
-						$message[] = sprintf($this->lang['msg_removed'], $volume_name);
-
-					}
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'remove');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.select.class.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.select.class.php
deleted file mode 100644
index 11a8cee..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/class/tmpfs-storage.select.class.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-/**
- * TmpFs-Storage Select Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class tmpfs_storage_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'tmpfs_storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "tmpfs_storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'tmpfs_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'tmpfs_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm = $openqrm;
-		$this->file = $this->openqrm->file();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$table = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/tmpfs-storage-select.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($table, 'table');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return htmlobject_tablebulider | htmlobject_div
-	 */
-	//--------------------------------------------
-	function select() {
-		// set ENV
-		$deployment = new deployment();
-		$storage    = new storage();
-		$resource   = new resource();
-
-		$deployment->get_instance_by_type("tmpfs-deployment");
-		$table = $this->response->html->tablebuilder('tmpfs', $this->response->get_array($this->actions_name, 'select'));
-		$table->sort      = 'storage_id';
-		$table->limit     = 10;
-		$table->offset    = 0;
-		$table->order     = 'ASC';
-		$table->max       = $storage->get_count_per_type($deployment->id);
-		$table->autosort  = false;
-		$table->sort_link = false;
-		$table->init();
-		$storages = $storage->display_overview_per_type($deployment->id, $table->offset, $table->limit, $table->sort, $table->order);
-
-		if(count($storages) >= 1) {
-			foreach($storages as $k => $v) {
-				$storage->get_instance_by_id($v["storage_id"]);
-				$resource->get_instance_by_id($storage->resource_id);
-				$deployment->get_instance_by_id($storage->type);
-				$resource_icon_default="/img/resource.png";
-				$storage_icon="/plugins/tmpfs-storage/img/plugin.png";
-				$state_icon = $this->openqrm->get('baseurl')."/img/".$resource->state.".png";
-				if ($this->file->exists($this->openqrm->get('webdir').$storage_icon)) {
-					$resource_icon_default=$storage_icon;
-				}
-				$resource_icon_default = $this->openqrm->get('baseurl').$resource_icon_default;
-
-				$a = $this->response->html->a();
-				$a->title   = $this->lang['action_edit'];
-				$a->label   = $this->lang['action_edit'];
-				$a->handler = 'onclick="wait();"';
-				$a->css     = 'edit';
-				$a->href    = $this->response->get_url($this->actions_name, "edit").'&storage_id='.$storage->id;
-
-				$data  = '<b>'.$this->lang['table_recource'].':</b> '.$resource->id.' / '.$resource->ip.'<br>';
-				$data .= '<b>'.$this->lang['table_type'].':</b> '.$deployment->type.'<br>';
-				$data .= '<b>'.$this->lang['table_deployment'].':</b> '.$deployment->storagedescription.'<br>';
-
-				$b[] = array(
-					'state' => '<img width="24" height="24" src="'.$state_icon.'" alt="State">',
-					'icon' => '<img width="24" height="24" src="'.$resource_icon_default.'" alt="Icon">',
-					'storage_id' => $storage->id,
-					'storage_name' => $storage->name,
-					'storage_resource_id' => $storage->resource_id,
-					'storage_data' => $data,
-					'storage_comment' => '',
-					'storage_edit' => $a->get_string(),
-				);
-			}
-
-			$h = array();
-			$h['state'] = array();
-			$h['state']['title'] ='&#160;';
-			$h['state']['sortable'] = false;
-			$h['icon'] = array();
-			$h['icon']['title'] ='&#160;';
-			$h['icon']['sortable'] = false;
-			$h['storage_id'] = array();
-			$h['storage_id']['title'] = $this->lang['table_id'];
-			$h['storage_name'] = array();
-			$h['storage_name']['title'] = $this->lang['table_name'];
-			$h['storage_resource_id'] = array();
-			$h['storage_resource_id']['title'] = $this->lang['table_recource'];
-			$h['storage_resource_id']['hidden'] = true;
-			$h['storage_data'] = array();
-			$h['storage_data']['title'] = '&#160;';
-			$h['storage_data']['sortable'] = false;
-			$h['storage_comment'] = array();
-			$h['storage_comment']['title'] ='&#160;';
-			$h['storage_comment']['sortable'] = false;
-			$h['storage_edit'] = array();
-			$h['storage_edit']['title'] = '&#160;';
-			$h['storage_edit']['sortable'] = false;
-
-			$table->id = 'Tabelle';
-			$table->css = 'htmlobject_table';
-			$table->border = 1;
-			$table->cellspacing = 0;
-			$table->cellpadding = 3;
-			$table->form_action	= $this->response->html->thisfile;
-			$table->head = $h;
-			$table->body = $b;
-			$table->limit_select = array(
-				array("value" => 10, "text" => 10),
-				array("value" => 20, "text" => 20),
-				array("value" => 30, "text" => 30),
-				array("value" => 40, "text" => 40),
-				array("value" => 50, "text" => 50),
-			);
-			return $table->get_string();
-		} else {
-			$a = $this->response->html->a();
-			$a->title   = $this->lang['new_storage'];
-			$a->label   = $this->lang['new_storage'];
-			$a->handler = 'onclick="wait();"';
-			$a->css     = 'add';
-			$a->href    = $this->response->html->thisfile.'?base=storage&storage_action=add';
-
-			$box = $this->response->html->div();
-			$box->id = 'Tabelle';
-			$box->css = 'htmlobject_box';
-			$content  = $this->lang['error_no_storage'].'<br><br>';
-			$content .= $a->get_string();
-			$box->add($content);
-			return $box->get_string();
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/css/tmpfs-storage.css b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/css/tmpfs-storage.css
deleted file mode 100644
index e69de29..0000000
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/image.tmpfs-deployment.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/image.tmpfs-deployment.php
deleted file mode 100644
index 91cc924..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/image.tmpfs-deployment.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-global $OPENQRM_SERVER_BASE_DIR;
-
-// global event for logging
-$event = new event();
-global $event;
-
-
-
-function get_tmpfs_deployment_image_rootdevice_identifier($tmpfs_storage_id) {
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_USER;
-	global $event;
-
-	$rootdevice_identifier_array = array();
-	$rootdevice_identifier_array[] = array("value" => "500", "label" => "500MB tmpfs");
-	$rootdevice_identifier_array[] = array("value" => "1000", "label" => "1GB tmpfs");
-	$rootdevice_identifier_array[] = array("value" => "2000", "label" => "2GB tmpfs");
-	$rootdevice_identifier_array[] = array("value" => "5000", "label" => "5GB tmpfs");
-	return $rootdevice_identifier_array;
-
-}
-
-function get_tmpfs_deployment_image_default_rootfs() {
-	return "ext3";
-}
-
-function get_tmpfs_deployment_rootfs_transfer_methods() {
-	return true;
-}
-
-function get_tmpfs_deployment_rootfs_set_password_method() {
-	return true;
-}
-
-function get_tmpfs_deployment_is_network_deployment() {
-	return true;
-}
-
-function get_tmpfs_deployment_local_deployment_enabled() {
-	return false;
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/img/plugin.png b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/img/plugin.png
deleted file mode 100644
index 04f47a8..0000000
Binary files a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/lang/de.tmpfs-storage-about.ini b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/lang/de.tmpfs-storage-about.ini
deleted file mode 100644
index 0eab1b7..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/lang/de.tmpfs-storage-about.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[documentation]
-tab = "Über TmpFs-Storage"
-label = "Über TmpFs-Storage"
-introduction_title = "Einleitung"
-introduction_content = "Das 'TmpFs-Storage' Plugin verwaltet TmpFs Server."
-requirements_title = "Anforderungen"
-requirements_list = "Eine 'Resource' für die TmpFs-Storage Storage<br>(dies kann ein System sein das mittels des "local-server" Plugin in openQRM eingebunden ist oder der openQRM Server selber)"
-
-tested_title = "Testet mit"
-tested_content = "Diese Plugin ist getestet mit Debian, Ubuntu und CentOS Linux Distributionen"
-
-provides_title = "Bietet"
-provides_list = "<ul><li>Storage Typen: 'TmpFs Storage'</li>
-				   <li>Deployment types: 'TmpFs-root deployment'</li></ul>"
-type_title = "Plugin Typ"
-type_content = "Storage"
-
-deployment_title = "Deployment Typ"
-deployment_content = "Netzwerk-Deployment"
-
-documentation_title = "Dokumentation"
-use_case_title = "Anwendungsfall"
-network_deploymet = "Netzwerk-Deployment"
-doc1 = ""
-
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/lang/de.tmpfs-storage.ini b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/lang/de.tmpfs-storage.ini
deleted file mode 100644
index c6e507d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/lang/de.tmpfs-storage.ini
+++ /dev/null
@@ -1,70 +0,0 @@
-[select]
-tab = "TmpFs-storage auswählen"
-label = "TmpFs-storage auswählen"
-action_edit = "bearbeiten"
-table_name = "Name"
-table_id = "Id"
-table_recource = "Resource"
-table_type = "Typ"
-table_deployment = "Deployment"
-error_no_storage = "<b>Keine Storage angelegt!</b><br><br>Bitte legen Sie erst eine TmpFs Storage an!"
-new_storage = "Neue Storage"
-please_wait = "Lade Storage. Bitte warten .."
-[edit]
-tab = "TmpFs-storage bearbeiten"
-label = "TmpFs Volumes auf Storage %s"
-lang_id = "ID"
-lang_name = "Name"
-lang_resource = "Resource"
-lang_state = "Status"
-lang_vfree = "Frei"
-lang_vsize = "Gesamt"
-action_add = "Neues Volume anlegen"
-action_refresh = "Reload Page"
-action_manual = "Manuelle Konfiguration"
-action_clone = "klonen"
-action_remove = "löschen"
-action_auth = "Berechtigung"
-action_clone_in_progress = "Syncronisation in Bearbeitung - Bitte warten"
-action_clone_finished = "Syncronisation beendet!"
-table_name = "Name"
-table_id = "ID"
-table_size = "Grösse"
-table_description = "Bescreibung"
-error_no_tmpfs = "Storage %s ist nicht vom Typ tmpfs-deployment"
-please_wait = "Lade Volumes. Bitte warten .."
-manual_configured = "Storage ist manuell konfiguriert und kann nicht von openQRM verwaltet werden!"
-[add]
-tab = "Neues TmpFs Volume"
-label = "Neues TmpFs Volume anlegen"
-form_add = "Neues TmpFs Volume"
-form_name = "Name"
-form_size = "Grösse"
-form_description = "Beschreibung"
-lang_name_generate = "Name generieren"
-msg_added = "Volume %s angelegt"
-msg_add_failed = "Fehler beim anlegen des Volumes %s"
-error_exists = "Volume %s besteht bereits"
-error_image_exists = "Image mit Namen %s besteht bereits"
-error_name = "Name darf nur %s beinhalten"
-error_description = "Beschreibung darf nur %s beinhalten"
-please_wait = "Erstelle Volume. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[clone]
-tab = "Volume klonen"
-label = "Volume klonen"
-form_add = "Neues TmpFs Volume"
-form_name = "Name"
-lang_name_generate = "Name generieren"
-msg_cloned = "Klone %s als %s"
-msg_clone_failed = "Fehler beim klonen des Volumes %s"
-error_exists = "Volume %s besteht bereits"
-error_name = "Name darf nur %s beinhalten"
-please_wait = "Klone Volume(s). Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-[remove]
-label = "Volume(s) löschen"
-msg_removed = "Volume %s gelöscht"
-msg_image_still_in_use = "Das Volume %s des Image ID %s ist noch in benutztung von Server %s"
-please_wait = "Lösche Volume(s). Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/lang/en.tmpfs-storage-about.ini b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/lang/en.tmpfs-storage-about.ini
deleted file mode 100644
index 4b0bea7..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/lang/en.tmpfs-storage-about.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[documentation]
-tab = "About TmpFs-Storage"
-label = "About TmpFs-Storage"
-introduction_title = "Introduction"
-introduction_content = "The 'TmpFs-Storage' plugin provisions server in memeory (tmpfs)."
-requirements_title = "Requirements"
-requirements_list = "A resource for the TmpFs-Storage Storage (this can be a remote system integrated into openQRM e.g. via the 'local-server' plugin or the openQRM server itself)"
-
-tested_title = "Tested with"
-tested_content = "This plugin is tested with the Debian, Ubuntu and CentOS Linux distributions."
-
-provides_title = "Provides"
-provides_list = "<ul><li>Storage type: 'TmpFs Storage'</li><li>Deployment types: 'Tmpfs-root deployment'</li></ul>"
-type_title = "Plugin Type"
-type_content = "Storage"
-
-deployment_title = "Deployment Type"
-deployment_content = "Network-Deployment"
-
-documentation_title = "Documentation"
-use_case_title = "Use-Case"
-network_deploymet = "Network-Deployment"
-doc1 = ""
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/lang/en.tmpfs-storage.ini b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/lang/en.tmpfs-storage.ini
deleted file mode 100644
index 6fbaad5..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/lang/en.tmpfs-storage.ini
+++ /dev/null
@@ -1,70 +0,0 @@
-[select]
-tab = "Select TmpFs-storage"
-label = "Select TmpFs-storage"
-action_edit = "edit"
-table_name = "Name"
-table_id = "Id"
-table_recource = "Resource"
-table_type = "Type"
-table_deployment = "Deployment"
-error_no_storage = "<b>No storage configured yet!</b><br><br>Please create a TmpFs Storage first!"
-new_storage = "New Storage"
-please_wait = "Loading Storage. Please wait .."
-[edit]
-tab = "Edit TmpFs-storage"
-label = "TmpFs Volumes on storage %s"
-lang_id = "ID"
-lang_name = "Name"
-lang_resource = "Resource"
-lang_state = "State"
-lang_vfree = "Free"
-lang_vsize = "Total"
-action_add = "Add new Volume"
-action_refresh = "Reload Page"
-action_manual = "Manual Configuration"
-action_clone = "clone"
-action_remove = "remove"
-action_auth = "auth"
-action_clone_in_progress = "Synchronisation in progress - Please wait"
-action_clone_finished = "Syncronisation finished!"
-table_name = "Name"
-table_id = "ID"
-table_size = "Size"
-table_description = "Description"
-error_no_tmpfs = "Storage %s is not of type tmpfs-deployment"
-please_wait = "Loading Volumes. Please wait .."
-manual_configured = "Storage is manually configured and can not be be edited by openQRM"
-[add]
-tab = "Add TmpFs Volume"
-label = "Add new Volume"
-form_add = "New TmpFs Volume"
-form_name = "Name"
-form_size = "Size"
-form_description = "Description"
-lang_name_generate = "generate name"
-msg_added = "Added Volume %s"
-msg_add_failed = "Failed to add Volume %s"
-error_exists = "Volume %s already exists"
-error_image_exists = "Image with name %s already exists"
-error_name = "Name must be %s"
-error_description = "Description must be %s"
-please_wait = "Adding Volume. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[clone]
-tab = "Clone TmpFs Volume"
-label = "Clone Volume %s"
-form_add = "New TmpFs Volume"
-form_name = "Name"
-lang_name_generate = "generate name"
-msg_cloned = "Cloned %s as %s"
-msg_clone_failed = "Failed to clone Volume %s"
-error_exists = "Volume %s already exists"
-error_name = "Name must be %s"
-please_wait = "Cloning Volume. Please wait .."
-canceled = "Operation canceled. Please wait .."
-[remove]
-label = "Remove Volume(s)"
-msg_removed = "Removed Volume %s"
-msg_image_still_in_use = "Volume %s of Image id %s is still in use by Server %s"
-please_wait = "Removing Volume(s). Please wait .."
-canceled = "Operation canceled. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/menu.txt b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/menu.txt
deleted file mode 100644
index f2bc510..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/menu.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-..|Tmpfs-Storage
-...|Volume Admin|index.php?plugin=tmpfs-storage|TmpFs Storage Manager
-...|About|index.php?plugin=tmpfs-storage&controller=tmpfs-storage-about|How to use
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/openqrm-tmpfs-deployment-auth-hook.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/openqrm-tmpfs-deployment-auth-hook.php
deleted file mode 100644
index e1f8e5d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/openqrm-tmpfs-deployment-auth-hook.php
+++ /dev/null
@@ -1,329 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/image_authentication.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/authblocker.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/openqrm-server-config.php";
-
-/**
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- */
-
-
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-global $IMAGE_AUTHENTICATION_TABLE;
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $openqrm_server;
-$event = new event();
-global $event;
-
-
-
-	//--------------------------------------------------
-	/**
-	* authenticates the storage volume for the appliance resource
-	* <code>
-	* storage_auth_function("start", 2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_function($cmd, $appliance_id) {
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-		global $IMAGE_AUTHENTICATION_TABLE;
-		global $openqrm_server;
-
-		$appliance = new appliance();
-		$appliance->get_instance_by_id($appliance_id);
-
-		$image = new image();
-		$image->get_instance_by_id($appliance->imageid);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		$resource = new resource();
-		$resource->get_instance_by_id($appliance->resources);
-		$resource_mac=$resource->mac;
-		$resource_ip=$resource->ip;
-
-		switch($cmd) {
-			case "start":
-					// remove storage-auth-blocker if existing
-					$authblocker = new authblocker();
-					$authblocker->get_instance_by_image_name($image_name);
-					if (strlen($authblocker->id)) {
-						$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-tmpfs-deployment-auth-hook.php", "Removing authblocker for image $image_name", "", "", 0, 0, 0);
-						$authblocker->remove($authblocker->id);
-					}
-					// authenticate the install-from-nfs export
-					$run_disable_deployment_export=0;
-					$install_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_INSTALL_FROM_NFS"));
-					if (strlen($install_from_nfs_param)) {
-
-					// storage -> resource -> auth
-					$ip_storage_id=$deployment->parse_deployment_parameter("id", $install_from_nfs_param);
-					$ip_storage_ip=$deployment->parse_deployment_parameter("ip", $install_from_nfs_param);
-					$ip_image_rootdevice=$deployment->parse_deployment_parameter("path", $install_from_nfs_param);
-
-					$ip_storage = new storage();
-					$ip_storage->get_instance_by_id($ip_storage_id);
-					$ip_storage_resource = new resource();
-					$ip_storage_resource->get_instance_by_id($ip_storage->resource_id);
-					$op_storage_ip = $ip_storage_resource->ip;
-
-					$ip_deployment = new deployment();
-					$ip_deployment->get_instance_by_id($ip_storage->type);
-					$ip_deployment_type = $ip_deployment->type;
-					$ip_deployment_plugin_name = $ip_deployment->storagetype;
-
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-tmpfs-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $ip_storage_id:$ip_storage_ip:$ip_image_rootdevice", "", "", 0, 0, $appliance_id);
-
-					$auth_install_from_nfs_start_cmd = "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$ip_deployment_plugin_name/bin/openqrm-$ip_deployment_plugin_name auth -r $ip_image_rootdevice -i $resource_ip -t $ip_deployment_type";
-					//$resource->send_command($ip_storage_ip, $auth_install_from_nfs_start_cmd);
-					
-					// $run_disable_deployment_export=1;
-					$run_disable_deployment_export=0;
-
-					
-				}
-
-				// authenticate the transfer-to-nfs export
-				$transfer_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_TRANSFER_TO_NFS"));
-				if (strlen($transfer_from_nfs_param)) {
-					// storage -> resource -> auth
-					$tp_storage_id=$deployment->parse_deployment_parameter("id", $transfer_from_nfs_param);
-					$tp_storage_ip=$deployment->parse_deployment_parameter("ip", $transfer_from_nfs_param);
-					$tp_image_rootdevice=$deployment->parse_deployment_parameter("path", $transfer_from_nfs_param);
-
-					$tp_storage = new storage();
-					$tp_storage->get_instance_by_id($tp_storage_id);
-					$tp_storage_resource = new resource();
-					$tp_storage_resource->get_instance_by_id($tp_storage->resource_id);
-					$op_storage_ip = $tp_storage_resource->ip;
-
-					$tp_deployment = new deployment();
-					$tp_deployment->get_instance_by_id($tp_storage->type);
-					$tp_deployment_type = $tp_deployment->type;
-					$tp_deployment_plugin_name = $tp_deployment->storagetype;
-
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-tmpfs-deployment-auth-hook.php", "Transfer-to-NFS: Authenticating $resource_ip on storage id $tp_storage_id:$tp_storage_ip:$tp_image_rootdevice", "", "", 0, 0, $appliance_id);
-
-					$auth_install_from_nfs_start_cmd = "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$tp_deployment_plugin_name/bin/openqrm-$tp_deployment_plugin_name auth -r $tp_image_rootdevice -i $resource_ip -t $tp_deployment_type";
-					//$resource->send_command($tp_storage_ip, $auth_install_from_nfs_start_cmd);
-					
-					//$run_disable_deployment_export=1;
-					$run_disable_deployment_export=0;
-
-				}
-
-				// do we need to disable the install-from/transfer-to-nfs exports ?
-				if ($run_disable_deployment_export == 1) {
-					$image_authentication = new image_authentication();
-					$ia_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$image_auth_ar = array(
-						'ia_id' => $ia_id,
-						'ia_image_id' => $appliance->imageid,
-						'ia_resource_id' => $appliance->resources,
-						'ia_auth_type' => 1,
-					);
-					$image_authentication->add($image_auth_ar);
-					$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-tmpfs-deployment-auth-hook.php", "Registered image $appliance->imageid for de-authentication the deployment exports when resource $appliance->resources is fully up.", "", "", 0, 0, $appliance_id);
-				}
-
-				break;
-
-			case "stop":
-				$image_authentication = new image_authentication();
-				$ia_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$image_auth_ar = array(
-					'ia_id' => $ia_id,
-					'ia_image_id' => $appliance->imageid,
-					'ia_resource_id' => $appliance->resources,
-					'ia_auth_type' => 0,
-				);
-				$image_authentication->add($image_auth_ar);
-				$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-tmpfs-deployment-auth-hook.php", "Registered image $appliance->imageid for de-authentication the root-fs exports when resource $appliance->resources is idle again.", "", "", 0, 0, $appliance_id);
-				break;
-
-		}
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage volume for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-		// generate a password for the image
-		$image_password = $image->generatePassword(12);
-		$image_deployment_parameter = $image->deployment_parameter;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		// nothing todo
-
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* de-authenticates the storage deployment volumes for the appliance resource
-	* (runs via the image_authentication class)
-	* <code>
-	* storage_auth_deployment_stop(2);
-	* </code>
-	* @access public
-	*/
-	//--------------------------------------------------
-	function storage_auth_deployment_stop($image_id) {
-
-		global $event;
-		global $OPENQRM_SERVER_BASE_DIR;
-		global $OPENQRM_SERVER_IP_ADDRESS;
-		global $OPENQRM_EXEC_PORT;
-
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name=$image->name;
-		$image_rootdevice=$image->rootdevice;
-
-		$storage = new storage();
-		$storage->get_instance_by_id($image->storageid);
-		$storage_resource = new resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-		$storage_ip = $storage_resource->ip;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-
-		// just for sending the commands
-		$resource = new resource();
-
-		// get install deployment params
-		$install_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_INSTALL_FROM_NFS"));
-		if (strlen($install_from_nfs_param)) {
-			// storage -> resource -> auth
-			$ip_storage_id=$deployment->parse_deployment_parameter("id", $install_from_nfs_param);
-			$ip_storage_ip=$deployment->parse_deployment_parameter("ip", $install_from_nfs_param);
-			$ip_image_rootdevice=$deployment->parse_deployment_parameter("path", $install_from_nfs_param);
-
-			$ip_storage = new storage();
-			$ip_storage->get_instance_by_id($ip_storage_id);
-			$ip_storage_resource = new resource();
-			$ip_storage_resource->get_instance_by_id($ip_storage->resource_id);
-			$op_storage_ip = $ip_storage_resource->ip;
-
-			$ip_deployment = new deployment();
-			$ip_deployment->get_instance_by_id($ip_storage->type);
-			$ip_deployment_type = $ip_deployment->type;
-			$ip_deployment_plugin_name = $ip_deployment->storagetype;
-
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-tmpfs-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $ip_storage_id:$ip_storage_ip:$ip_image_rootdevice", "", "", 0, 0, $appliance_id);
-			$auth_install_from_nfs_start_cmd = "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$ip_deployment_plugin_name/bin/openqrm-$ip_deployment_plugin_name auth -r $ip_image_rootdevice -i $OPENQRM_SERVER_IP_ADDRESS -t $ip_deployment_type";
-//			$resource->send_command($ip_storage_ip, $auth_install_from_nfs_start_cmd);
-		}
-
-		// get transfer deployment params
-		$transfer_from_nfs_param = trim($image->get_deployment_parameter("IMAGE_TRANSFER_TO_NFS"));
-		if (strlen($transfer_from_nfs_param)) {
-			// storage -> resource -> auth
-			$tp_storage_id=$deployment->parse_deployment_parameter("id", $transfer_from_nfs_param);
-			$tp_storage_ip=$deployment->parse_deployment_parameter("ip", $transfer_from_nfs_param);
-			$tp_image_rootdevice=$deployment->parse_deployment_parameter("path", $transfer_from_nfs_param);
-
-			$tp_storage = new storage();
-			$tp_storage->get_instance_by_id($tp_storage_id);
-			$tp_storage_resource = new resource();
-			$tp_storage_resource->get_instance_by_id($tp_storage->resource_id);
-			$op_storage_ip = $tp_storage_resource->ip;
-
-			$tp_deployment = new deployment();
-			$tp_deployment->get_instance_by_id($tp_storage->type);
-			$tp_deployment_type = $tp_deployment->type;
-			$tp_deployment_plugin_name = $tp_deployment->storagetype;
-
-			$event->log("storage_auth_function", $_SERVER['REQUEST_TIME'], 5, "openqrm-tmpfs-deployment-auth-hook.php", "Install-from-NFS: Authenticating $resource_ip on storage id $tp_storage_id:$tp_storage_ip:$tp_image_rootdevice", "", "", 0, 0, $appliance_id);
-			$auth_install_from_nfs_start_cmd = "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins/$tp_deployment_plugin_name/bin/openqrm-$tp_deployment_plugin_name auth -r $tp_image_rootdevice -i $OPENQRM_SERVER_IP_ADDRESS -t $tp_deployment_type";
-//			$resource->send_command($tp_storage_ip, $auth_install_from_nfs_start_cmd);
-		}
-
-	}
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/root-mount.tmpfs-deployment b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/root-mount.tmpfs-deployment
deleted file mode 100644
index b310fda..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/root-mount.tmpfs-deployment
+++ /dev/null
@@ -1,298 +0,0 @@
-#!/bin/bash
-# this is the root-mount initrd-service
-# which proivdes function to mount/remount the remote
-# iscsi-rootfs according to the image_deployment_parameters at /mnt
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# tmpfs-storage
-# Required defines in the image_deploy_paramters
-#
-#
-# Optional parameters 
-#
-# IMAGE_INSTALL_FROM_NFS			- can be set to an (nfs) location from
-#									  which the image will be installed at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_TRANSFER_TO_NFS				- can be set to an (nfs) location from
-#									  which the image will be transfered to at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_INSTALL_FROM_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this
-#									  option will install the tmpfs-storage image on 
-#									  boot-time from the local-device
-#
-# IMAGE_TRANSFER_TO_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this option will transfrom
-#									  the tmpfs-storage image on boot-time to the local-device
-#
-#
-#
-# IMAGE_INSTALL_FROM_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_TRANSFER_TO_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_NFS_MOUNT_OPTIONS			- can be e.g. set to proto=tcp for the install/transform phase
-#
-
-# get the deployment parameters from openqrm.conf
-OPENQRM_RESOURCE_PARAMETER_FILE="/var/openqrm/openqrm-resource.conf"
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-eval $image_deployment_parameter
-export OPENQRM_SERVER_BASE_DIR=$resource_basedir
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-
-# nfs-options for the install+transform phase
-if [ "$IMAGE_NFS_MOUNT_OPTIONS" != "" ]; then
-	IMAGE_NFS_MOUNT_OPTIONS=",$IMAGE_NFS_MOUNT_OPTIONS"
-fi
-# default to ext3
-if [ "$IMAGE_INSTALL_FROM_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_INSTALL_FROM_LOCAL_FS_TYPE="ext3"
-fi
-if [ "$IMAGE_TRANSFER_TO_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_TRANSFER_TO_LOCAL_FS_TYPE="ext3"
-fi
-
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	export WGET="wget --no-check-certificate -q"
-else
-	export WGET="wget -q"
-fi
-
-
-# size from the root-device identifer
-IMAGE_SIZE=$image_rootdevice"M"
-
-# easy way to increase your tmpfs
-#IMAGE_SIZE=4096M
-
-
-# temp download dir
-TMP_IMAGE_SIZE=1024M
-
-
-
-#######################################################################
-# required functions ##################################################
-#######################################################################
-
-function mount_rootfs() {
-
-	mkdir -p /mnt
-	mount -t tmpfs -o rw,size=$IMAGE_SIZE none /mnt
-	echo "tmpfs-storage: Mounted tmpfs at /mnt rw using $IMAGE_SIZE of memory"
-
-	if  [ "$IMAGE_INSTALL_FROM_NFS" != "" ]; then
-		install_rootfs_from_nfs
-	else
-		echo "tmpfs-storage: Skipping install phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_NFS" != "" ]; then
-		transfer_rootfs_to_nfs
-	else
-		echo "tmpfs-storage: Skipping transfer-to-nfs phase"
-	fi
-	if  [ "$IMAGE_INSTALL_FROM_LOCAL" != "" ]; then
-		install_rootfs_from_local
-	else
-		echo "tmpfs-storage: Skipping install-from-local phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_LOCAL" != "" ]; then
-		transfer_rootfs_to_local
-	else
-		echo "tmpfs-storage: Skipping transfer-to-local phase"
-	fi
-}
-
-
-function remount_rootfs() {
-
-	# Debian/Ubuntu Systems want their nfs-rootfs in rw mode
-	if [ -f /mnt/etc/apt/sources.list ]; then
-		if grep ubuntu /mnt/etc/apt/sources.list >/remountlog; then
-			echo "tempfs-storage: Skipping Re-mount $IMAGE_SIZE ro"
-			rm -f /remountlog
-			return
-		fi
-	fi
-
-	mount -o remount,ro,size=$IMAGE_SIZE /mnt
-	echo "tmpfs-storage: Re-mounted tmpfs ro"
-}
-
-
-function create_fstab() {
-	rm -f $IMAGE_FSTAB
-	echo "none   /     tmpfs  defaults   0 0" >> $IMAGE_FSTAB
-}
-
-
-#######################################################################
-# optional functions ##################################################
-#######################################################################
-
-function install_rootfs_from_nfs() {
-	
-	echo "!! starting install from nfs for tempfs !!"
-	INSTALLED_THROUGH_HTTP=false
-	INSTALL_TEMPLATE_NAME=`basename $IMAGE_INSTALL_FROM_NFS`
-	mkdir -p /mnt2
-	mount -t tmpfs -o rw,size=$TMP_IMAGE_SIZE none /mnt2
-
-	echo "!! mounted temporary 2. tempfs"
-	if $WGET -O /mnt2/image.tgz $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/tmpfs/$INSTALL_TEMPLATE_NAME.tgz; then
-		echo "!! downloaded $INSTALL_TEMPLATE_NAME from $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/tmpfs/$INSTALL_TEMPLATE_NAME.tgz !!"
-		if tar -C /mnt -xzf /mnt2/image.tgz; then
-			echo "!! unpacked $INSTALL_TEMPLATE_NAME.tgz"
-			INSTALLED_THROUGH_HTTP=true
-			echo "HTTP" > /mnt/installed_from
-		fi
-	fi
-
-	umount /mnt2
-	rmdir /mnt2
-
-	if [ -e /mnt/etc/network/interfaces.$appliance_name ]; then
-		cp -f /mnt/etc/network/interfaces.$appliance_name /mnt/etc/network/interfaces
-		
-		# get the new interface up, had to specify interfaces file as not in / still in /mnt
-		#ifup -a -i /mnt/etc/network/interfaces
-		
-		## mount additional fstab-static entries
-		#mount wont work, still in /mnt
-		#mount -a
-	fi
-
-        echo "tmpfs-storage: Adding hostname $appliance_name to /etc/hostname"
-        echo "$appliance_name" > /mnt/etc/hostname
-
-	if [ "$INSTALLED_THROUGH_HTTP" == "true" ]; then
-	
-		##kill drop bear
-                        killall dropbear 1>/dev/null 2>&1
-                        for OPENQRM_DROPBEAR_PID in `ps ax 2>/dev/null | grep dropbear | grep -v grep | awk {' print $1 '}`; do
-                                echo "Killing Dropbear PID: $OPENQRM_DROPBEAR_PID"
-                                /bin/kill $OPENQRM_DROPBEAR_PID
-                        done
-		##end kill drop bear
-	
-	
-		echo "NFS" > /mnt/installed_from
-		return 0
-	fi
-
-	echo "!! Install from http failed! Installing from NFS !!"
-
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f1`
-	IMAGE_INSTALL_FROM_NFS=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f2-`
-
-	echo "tmpfs-storage: Installing $resource_image from $IMAGE_INSTALL_FROM_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o ro$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_INSTALL_FROM_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-
-	echo "tmpfs-storage: Starting install-from-nfs phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-
-	echo "tmpfs-storage: Install-from-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	if [ -e /mnt/etc/network/interfaces.$appliance_name ]; then
-		cp -f /mnt/etc/network/interfaces.$appliance_name /mnt/etc/network/interfaces
-		# get the new interface up
-		ifup -a
-		# mount additional fstab-static entries
-		mount -a
-	fi
-
-	echo "tmpfs-storage: Adding hostname $appliance_name to /etc/hostname"
-	echo "$appliance_name" > /mnt/etc/hostname
-
-	openqrm_portmap_stop
-	echo "NFS" > /mnt/installed_from 
-}
-
-
-function transfer_rootfs_to_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f1`
-	IMAGE_TRANSFER_TO_NFS=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f2-`
-	echo "tmpfs-storage: Transfering $resource_image to $IMAGE_TRANSFER_TO_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o rw$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_TRANSFER_TO_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "tmpfs-storage: Starting transfer-to-nfs phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "tmpfs-storage: Transfer-to-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-function install_rootfs_from_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE -o ro $IMAGE_INSTALL_FROM_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_LOCAL / $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "tmpfs-storage: Starting install-to-local phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "tmpfs-storage: Install-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-function transfer_rootfs_to_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE -o rw $IMAGE_TRANSFER_TO_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_LOCAL / $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "tmpfs-storage: Starting transfer-to-local phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "tmpfs-storage: Transfer-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/root-mount.tmpfs-deployment.org b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/root-mount.tmpfs-deployment.org
deleted file mode 100644
index b310fda..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/root-mount.tmpfs-deployment.org
+++ /dev/null
@@ -1,298 +0,0 @@
-#!/bin/bash
-# this is the root-mount initrd-service
-# which proivdes function to mount/remount the remote
-# iscsi-rootfs according to the image_deployment_parameters at /mnt
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-# tmpfs-storage
-# Required defines in the image_deploy_paramters
-#
-#
-# Optional parameters 
-#
-# IMAGE_INSTALL_FROM_NFS			- can be set to an (nfs) location from
-#									  which the image will be installed at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_TRANSFER_TO_NFS				- can be set to an (nfs) location from
-#									  which the image will be transfered to at
-#									  deployment time
-#									  syntax is : storage_id:ip_of_nfs-server:path_to_target_image
-#
-# IMAGE_INSTALL_FROM_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this
-#									  option will install the tmpfs-storage image on 
-#									  boot-time from the local-device
-#
-# IMAGE_TRANSFER_TO_LOCAL			- set to a local harddisk device (e.g. /dev/hda1) this option will transfrom
-#									  the tmpfs-storage image on boot-time to the local-device
-#
-#
-#
-# IMAGE_INSTALL_FROM_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_TRANSFER_TO_LOCAL_FS_TYPE	- set to a local harddisk device fs-type (e.g. ext3)
-#
-# IMAGE_NFS_MOUNT_OPTIONS			- can be e.g. set to proto=tcp for the install/transform phase
-#
-
-# get the deployment parameters from openqrm.conf
-OPENQRM_RESOURCE_PARAMETER_FILE="/var/openqrm/openqrm-resource.conf"
-. $OPENQRM_RESOURCE_PARAMETER_FILE
-eval $image_deployment_parameter
-export OPENQRM_SERVER_BASE_DIR=$resource_basedir
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-
-# nfs-options for the install+transform phase
-if [ "$IMAGE_NFS_MOUNT_OPTIONS" != "" ]; then
-	IMAGE_NFS_MOUNT_OPTIONS=",$IMAGE_NFS_MOUNT_OPTIONS"
-fi
-# default to ext3
-if [ "$IMAGE_INSTALL_FROM_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_INSTALL_FROM_LOCAL_FS_TYPE="ext3"
-fi
-if [ "$IMAGE_TRANSFER_TO_LOCAL_FS_TYPE" == "" ]; then
-	IMAGE_TRANSFER_TO_LOCAL_FS_TYPE="ext3"
-fi
-
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	export WGET="wget --no-check-certificate -q"
-else
-	export WGET="wget -q"
-fi
-
-
-# size from the root-device identifer
-IMAGE_SIZE=$image_rootdevice"M"
-
-# easy way to increase your tmpfs
-#IMAGE_SIZE=4096M
-
-
-# temp download dir
-TMP_IMAGE_SIZE=1024M
-
-
-
-#######################################################################
-# required functions ##################################################
-#######################################################################
-
-function mount_rootfs() {
-
-	mkdir -p /mnt
-	mount -t tmpfs -o rw,size=$IMAGE_SIZE none /mnt
-	echo "tmpfs-storage: Mounted tmpfs at /mnt rw using $IMAGE_SIZE of memory"
-
-	if  [ "$IMAGE_INSTALL_FROM_NFS" != "" ]; then
-		install_rootfs_from_nfs
-	else
-		echo "tmpfs-storage: Skipping install phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_NFS" != "" ]; then
-		transfer_rootfs_to_nfs
-	else
-		echo "tmpfs-storage: Skipping transfer-to-nfs phase"
-	fi
-	if  [ "$IMAGE_INSTALL_FROM_LOCAL" != "" ]; then
-		install_rootfs_from_local
-	else
-		echo "tmpfs-storage: Skipping install-from-local phase"
-	fi
-	if  [ "$IMAGE_TRANSFER_TO_LOCAL" != "" ]; then
-		transfer_rootfs_to_local
-	else
-		echo "tmpfs-storage: Skipping transfer-to-local phase"
-	fi
-}
-
-
-function remount_rootfs() {
-
-	# Debian/Ubuntu Systems want their nfs-rootfs in rw mode
-	if [ -f /mnt/etc/apt/sources.list ]; then
-		if grep ubuntu /mnt/etc/apt/sources.list >/remountlog; then
-			echo "tempfs-storage: Skipping Re-mount $IMAGE_SIZE ro"
-			rm -f /remountlog
-			return
-		fi
-	fi
-
-	mount -o remount,ro,size=$IMAGE_SIZE /mnt
-	echo "tmpfs-storage: Re-mounted tmpfs ro"
-}
-
-
-function create_fstab() {
-	rm -f $IMAGE_FSTAB
-	echo "none   /     tmpfs  defaults   0 0" >> $IMAGE_FSTAB
-}
-
-
-#######################################################################
-# optional functions ##################################################
-#######################################################################
-
-function install_rootfs_from_nfs() {
-	
-	echo "!! starting install from nfs for tempfs !!"
-	INSTALLED_THROUGH_HTTP=false
-	INSTALL_TEMPLATE_NAME=`basename $IMAGE_INSTALL_FROM_NFS`
-	mkdir -p /mnt2
-	mount -t tmpfs -o rw,size=$TMP_IMAGE_SIZE none /mnt2
-
-	echo "!! mounted temporary 2. tempfs"
-	if $WGET -O /mnt2/image.tgz $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/tmpfs/$INSTALL_TEMPLATE_NAME.tgz; then
-		echo "!! downloaded $INSTALL_TEMPLATE_NAME from $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/tmpfs/$INSTALL_TEMPLATE_NAME.tgz !!"
-		if tar -C /mnt -xzf /mnt2/image.tgz; then
-			echo "!! unpacked $INSTALL_TEMPLATE_NAME.tgz"
-			INSTALLED_THROUGH_HTTP=true
-			echo "HTTP" > /mnt/installed_from
-		fi
-	fi
-
-	umount /mnt2
-	rmdir /mnt2
-
-	if [ -e /mnt/etc/network/interfaces.$appliance_name ]; then
-		cp -f /mnt/etc/network/interfaces.$appliance_name /mnt/etc/network/interfaces
-		
-		# get the new interface up, had to specify interfaces file as not in / still in /mnt
-		#ifup -a -i /mnt/etc/network/interfaces
-		
-		## mount additional fstab-static entries
-		#mount wont work, still in /mnt
-		#mount -a
-	fi
-
-        echo "tmpfs-storage: Adding hostname $appliance_name to /etc/hostname"
-        echo "$appliance_name" > /mnt/etc/hostname
-
-	if [ "$INSTALLED_THROUGH_HTTP" == "true" ]; then
-	
-		##kill drop bear
-                        killall dropbear 1>/dev/null 2>&1
-                        for OPENQRM_DROPBEAR_PID in `ps ax 2>/dev/null | grep dropbear | grep -v grep | awk {' print $1 '}`; do
-                                echo "Killing Dropbear PID: $OPENQRM_DROPBEAR_PID"
-                                /bin/kill $OPENQRM_DROPBEAR_PID
-                        done
-		##end kill drop bear
-	
-	
-		echo "NFS" > /mnt/installed_from
-		return 0
-	fi
-
-	echo "!! Install from http failed! Installing from NFS !!"
-
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f1`
-	IMAGE_INSTALL_FROM_NFS=`echo $IMAGE_INSTALL_FROM_NFS | cut -d':' -f2-`
-
-	echo "tmpfs-storage: Installing $resource_image from $IMAGE_INSTALL_FROM_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o ro$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_INSTALL_FROM_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-
-	echo "tmpfs-storage: Starting install-from-nfs phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-
-	echo "tmpfs-storage: Install-from-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	if [ -e /mnt/etc/network/interfaces.$appliance_name ]; then
-		cp -f /mnt/etc/network/interfaces.$appliance_name /mnt/etc/network/interfaces
-		# get the new interface up
-		ifup -a
-		# mount additional fstab-static entries
-		mount -a
-	fi
-
-	echo "tmpfs-storage: Adding hostname $appliance_name to /etc/hostname"
-	echo "$appliance_name" > /mnt/etc/hostname
-
-	openqrm_portmap_stop
-	echo "NFS" > /mnt/installed_from 
-}
-
-
-function transfer_rootfs_to_nfs() {
-	modprobe sunrpc 1>/dev/null 2>&1
-	modprobe lockd 1>/dev/null 2>&1
-	modprobe nfs 1>/dev/null 2>&1
-	rm -rf /dev/null
-	mknod -m 666 /dev/null c 1 3
-	openqrm_portmap_start
-	STORAGE_ID=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f1`
-	IMAGE_TRANSFER_TO_NFS=`echo $IMAGE_TRANSFER_TO_NFS | cut -d':' -f2-`
-	echo "tmpfs-storage: Transfering $resource_image to $IMAGE_TRANSFER_TO_NFS ($STORAGE_ID)"
-	mkdir -p /mnt2
-	if ! mount -t nfs -o rw$IMAGE_NFS_MOUNT_OPTIONS $IMAGE_TRANSFER_TO_NFS /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_NFS by nfs"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "tmpfs-storage: Starting transfer-to-nfs phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "tmpfs-storage: Transfer-to-nfs phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-	openqrm_portmap_stop
-}
-
-
-function install_rootfs_from_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE -o ro $IMAGE_INSTALL_FROM_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_INSTALL_FROM_LOCAL / $IMAGE_INSTALL_FROM_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "tmpfs-storage: Starting install-to-local phase. This can take a while ...."
-	rsync -aq /mnt2/* /mnt/
-	echo "tmpfs-storage: Install-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-function transfer_rootfs_to_local() {
-	modprobe ext3 1>/dev/null 2>&1
-	mkdir -p /mnt2
-	if ! mount -t $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE -o rw $IMAGE_TRANSFER_TO_LOCAL /mnt2; then
-		echo "ERROR: Could not mount $IMAGE_TRANSFER_TO_LOCAL / $IMAGE_TRANSFER_TO_LOCAL_FS_TYPE"
-		# give a shell for the admin
-		/bin/bash
-	fi
-	echo "tmpfs-storage: Starting transfer-to-local phase. This can take a while ...."
-	rsync -aq /mnt/* /mnt2/
-	echo "tmpfs-storage: Transfer-to-local phase finished. Continuing boot-up"
-	umount /mnt2
-	rmdir /mnt2
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tmpfs-storage-action.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tmpfs-storage-action.php
deleted file mode 100644
index 1be43ca..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tmpfs-storage-action.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// error_reporting(E_ALL);
-$thisfile = basename($_SERVER['PHP_SELF']);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-$BaseDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-// filter inputs
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-$event = new event();
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $event;
-
-// user/role authentication
-if ($OPENQRM_USER->role != "administrator") {
-	$event->log("authorization", $_SERVER['REQUEST_TIME'], 1, "tmpfs-storage-action", "Un-Authorized access to tmpfs-storage-actions from $OPENQRM_USER->name", "", "", 0, 0, 0);
-	exit();
-}
-// get command
-$tmpfs_storage_command = $request->get('tmpfs_storage_command');
-
-// main
-$event->log("$tmpfs_storage_command", $_SERVER['REQUEST_TIME'], 5, "tmpfs-storage-action", "Processing nagios3 command $tmpfs_storage_command", "", "", 0, 0, 0);
-switch ($tmpfs_storage_command) {
-
-	case 'init':
-		// this command creates the following tables
-		// -> tmpfs_storage_volumes
-		// tmpfs_storage_volume_id BIGINT
-		// tmpfs_storage_volume_name VARCHAR(50)
-		// tmpfs_storage_volume_size VARCHAR(50)
-		// tmpfs_storage_volume_description VARCHAR(255)
-		$create_tmpfs_storage_volume_table = "create table tmpfs_storage_volumes(tmpfs_storage_volume_id BIGINT, tmpfs_storage_volume_name VARCHAR(50), tmpfs_storage_volume_size VARCHAR(50), tmpfs_storage_volume_description VARCHAR(255))";
-		$db=openqrm_get_db_connection();
-		$recordSet = $db->Execute($create_tmpfs_storage_volume_table);
-
-		$db->Close();
-		break;
-
-	case 'uninstall':
-		$drop_tmpfs_storage_volume_table = "drop table tmpfs_storage_volumes";
-		$db=openqrm_get_db_connection();
-		$recordSet = $db->Execute($drop_tmpfs_storage_volume_table);
-		$db->Close();
-		break;
-
-
-	default:
-		$event->log("$tmpfs_storage_command", $_SERVER['REQUEST_TIME'], 3, "tmpfs-storage-action", "No such event command ($tmpfs_storage_command)", "", "", 0, 0, 0);
-		break;
-
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-about-documentation.tpl.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-about-documentation.tpl.php
deleted file mode 100644
index 65a3311..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-about-documentation.tpl.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div class="row">
-	<div class="span7">
-		<h3>{introduction_title}</h3>
-		{introduction_content}
-		
-		<h3>{provides_title}</h3>
-		{provides_list}
-		
-		<h3>{requirements_title}</h3>
-		{requirements_list}
-		
-	</div>
-	<div class="span2 offset1">
-		<h3>{type_title}</h3>
-		<span class="pill">{type_content}</span>
-	
-		<h3>{deployment_title}</h3>
-		{deployment_content}
-	
-		<h3>{tested_title}</h3>
-		{tested_content}
-
-	</div>
-</div>
-
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-add.tpl.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-add.tpl.php
deleted file mode 100644
index 4e526d1..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-add.tpl.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}" method="GET">
-	{form}
-	<div id="form">
-		{name}
-		{size}
-		{description}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-clone.tpl.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-clone.tpl.php
deleted file mode 100644
index 329822d..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-clone.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-<form action="{thisfile}">
-	{form}
-	<div id="form">
-		{name}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-edit.tpl.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-edit.tpl.php
deleted file mode 100644
index 5574425..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-edit.tpl.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-
-<div id="form">
-	<div style="width:250px;float:left;">
-		<div><b>{lang_id}</b>: {id}</div>
-		<div><b>{lang_name}</b>: {name}</div>
-		<div><b>{lang_resource}</b>: {resource}</div>
-		<div><b>{lang_state}</b>: {state}</div>
-	</div>
-
-	<div style="width:300px;float:left;">
-		<br>
-	</div>
-
-	<div style="width:250px;float:right;">
-		<div>{add}</div>
-	</div>
-	<div style="clear:both; margin: 0 0 25px 0;" class="floatbreaker">&#160;</div>
-	{table}
-</div>
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-remove.tpl.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-remove.tpl.php
deleted file mode 100644
index cafa6a6..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-remove.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-
-<form action="{thisfile}">
-	<div id="form">
-		{form}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-select.tpl.php b/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-select.tpl.php
deleted file mode 100644
index 111f228..0000000
--- a/openQRM-5.3.50-CE/src/plugins/tmpfs-storage/web/tpl/tmpfs-storage-select.tpl.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-{table}
diff --git a/openQRM-5.3.50-CE/src/plugins/vmware-esx/Makefile b/openQRM-5.3.50-CE/src/plugins/vmware-esx/Makefile
deleted file mode 100644
index 9c7adb2..0000000
--- a/openQRM-5.3.50-CE/src/plugins/vmware-esx/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/vmware-esx/etc
-	cp etc/openqrm-plugin-vmware-esx.conf /usr/share/openqrm/plugins/vmware-esx/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/vmware-esx/etc/openqrm-plugin-vmware-esx.conf b/openQRM-5.3.50-CE/src/plugins/vmware-esx/etc/openqrm-plugin-vmware-esx.conf
deleted file mode 100644
index 741fe91..0000000
--- a/openQRM-5.3.50-CE/src/plugins/vmware-esx/etc/openqrm-plugin-vmware-esx.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Integrates the <a href='http://www.vmware.com/' target='_BLANK'>VMware-ESX</a> Virtualization Technology. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="virtualization"
diff --git a/openQRM-5.3.50-CE/src/plugins/vmware-vsphere/Makefile b/openQRM-5.3.50-CE/src/plugins/vmware-vsphere/Makefile
deleted file mode 100644
index ff176f4..0000000
--- a/openQRM-5.3.50-CE/src/plugins/vmware-vsphere/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/vmware-vsphere/etc
-	cp etc/openqrm-plugin-vmware-vsphere.conf /usr/share/openqrm/plugins/vmware-vsphere/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/vmware-vsphere/etc/openqrm-plugin-vmware-vsphere.conf b/openQRM-5.3.50-CE/src/plugins/vmware-vsphere/etc/openqrm-plugin-vmware-vsphere.conf
deleted file mode 100644
index 77d6980..0000000
--- a/openQRM-5.3.50-CE/src/plugins/vmware-vsphere/etc/openqrm-plugin-vmware-vsphere.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Integrates the <a href='http://www.vmware.com/' target='_BLANK'>VMware-VSPHERE</a> Virtualization Technology. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="virtualization"
diff --git a/openQRM-5.3.50-CE/src/plugins/wakeuponlan/Makefile b/openQRM-5.3.50-CE/src/plugins/wakeuponlan/Makefile
deleted file mode 100644
index 1ffaac5..0000000
--- a/openQRM-5.3.50-CE/src/plugins/wakeuponlan/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/wakeuponlan/etc
-	cp etc/openqrm-plugin-wakeuponlan.conf /usr/share/openqrm/plugins/wakeuponlan/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/wakeuponlan/etc/openqrm-plugin-wakeuponlan.conf b/openQRM-5.3.50-CE/src/plugins/wakeuponlan/etc/openqrm-plugin-wakeuponlan.conf
deleted file mode 100644
index 688a709..0000000
--- a/openQRM-5.3.50-CE/src/plugins/wakeuponlan/etc/openqrm-plugin-wakeuponlan.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Automatically controls the power status of physical systems via the <a href='http://en.wikipedia.org/wiki/Wake-on-LAN' target='_BLANK'>Wake-on-LAN (WOL)</a> technology. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="network"
diff --git a/openQRM-5.3.50-CE/src/plugins/windows/Makefile b/openQRM-5.3.50-CE/src/plugins/windows/Makefile
deleted file mode 100644
index 2d2e002..0000000
--- a/openQRM-5.3.50-CE/src/plugins/windows/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/windows/etc
-	cp etc/openqrm-plugin-windows.conf /usr/share/openqrm/plugins/windows/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/windows/etc/openqrm-plugin-windows.conf b/openQRM-5.3.50-CE/src/plugins/windows/etc/openqrm-plugin-windows.conf
deleted file mode 100644
index fd1a49c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/windows/etc/openqrm-plugin-windows.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Support for the Windows Operating System in openQRM. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="deployment"
diff --git a/openQRM-5.3.50-CE/src/plugins/xen/Makefile b/openQRM-5.3.50-CE/src/plugins/xen/Makefile
deleted file mode 100644
index b048f16..0000000
--- a/openQRM-5.3.50-CE/src/plugins/xen/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/xen/etc
-	cp etc/openqrm-plugin-xen.conf /usr/share/openqrm/plugins/xen/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/xen/etc/openqrm-plugin-xen.conf b/openQRM-5.3.50-CE/src/plugins/xen/etc/openqrm-plugin-xen.conf
deleted file mode 100644
index 92ed02c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/xen/etc/openqrm-plugin-xen.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Integrates the <a href='http://xen.org/' target='_BLANK'>Xen</a> Virtualization Technology. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="virtualization"
diff --git a/openQRM-5.3.50-CE/src/plugins/zabbix/Makefile b/openQRM-5.3.50-CE/src/plugins/zabbix/Makefile
deleted file mode 100644
index 124fa5c..0000000
--- a/openQRM-5.3.50-CE/src/plugins/zabbix/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-configure:
-compile:
-install:
-	mkdir -p /usr/share/openqrm/plugins/zabbix/etc
-	cp etc/openqrm-plugin-zabbix.conf /usr/share/openqrm/plugins/zabbix/etc/
-uninstall:
-clean:
-all:
diff --git a/openQRM-5.3.50-CE/src/plugins/zabbix/etc/openqrm-plugin-zabbix.conf b/openQRM-5.3.50-CE/src/plugins/zabbix/etc/openqrm-plugin-zabbix.conf
deleted file mode 100644
index 1139af8..0000000
--- a/openQRM-5.3.50-CE/src/plugins/zabbix/etc/openqrm-plugin-zabbix.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENQRM_PLUGIN_DESCRIPTION="Monitor systems and services with <a href='http://www.zabbix.com/' target='_BLANK'>Zabbix</a>. <br>This plugin is only available in the openQRM Enterprise version!<br>Please check <a href='https://openqrm-enterprise.com' target='_BLANK'>https://openqrm-enterprise.com</a>"
-OPENQRM_PLUGIN_TYPE="monitoring"
diff --git a/openQRM-5.3.50-CE/src/rpm/HOWTO b/openQRM-5.3.50-CE/src/rpm/HOWTO
deleted file mode 100644
index 44fdb9a..0000000
--- a/openQRM-5.3.50-CE/src/rpm/HOWTO
+++ /dev/null
@@ -1,27 +0,0 @@
-
-HOWTO create openqrm RPM packages from SVN:
-
----
-1. check out via svn
-
-svn co https://openqrm.svn.sourceforge.net/svnroot/openqrm openqrm
-
-
----
-2. create rpm package
-
-cd openqrm/trunk/src
-make rpm
-
----
-3. Finished.
-
-You now have source and binary packages.
-
-Source RPM packag is located in SRPMS directory.
-Binary packages are located in RPMS/<$arch/
-
-
-Martin Alfke
-<tuxmea@users.sourceforge.net>
-
diff --git a/openQRM-5.3.50-CE/src/rpm/README b/openQRM-5.3.50-CE/src/rpm/README
deleted file mode 100644
index 9dccd2c..0000000
--- a/openQRM-5.3.50-CE/src/rpm/README
+++ /dev/null
@@ -1,4 +0,0 @@
-
-This directory holds the spec file templates for rpm package building
-
-----
diff --git a/openQRM-5.3.50-CE/src/rpm/openqrm.spec b/openQRM-5.3.50-CE/src/rpm/openqrm.spec
deleted file mode 100644
index cfd1b5d..0000000
--- a/openQRM-5.3.50-CE/src/rpm/openqrm.spec
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-Name: OPENQRM_PACKAGE_NAME
-Summary: OPENQRM_PACKAGE_NAME
-Version: OPENQRM_PACKAGE_VERSION
-Release: OPENQRM_PACKAGE_DISTRIBUTION
-License: OPENQRM_PACKAGE_LICENSE
-Group: Networking/Admin
-AutoReqProv: no
-Source: OPENQRM_PACKAGE_NAME-OPENQRM_PACKAGE_VERSION.tgz
-Prefix: /
-BuildRoot: /tmp/openqrm-packaging/OPENQRM_PACKAGE_NAME
-Requires : OPENQRM_PACKAGE_DEPENDENCIES
-BuildRequires: OPENQRM_SERVER_BUILD_REQUIREMENTS
-Conflicts: OPENQRM_PACKAGE_CONFLICTS
-%description
-openQRM is the next generation data-center management platform.
-
-%files
-%defattr(-,root,root)
-/usr/share/openqrm/*
-
-%prep
-%setup
-
-%build
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/share
-make install DESTINATION_DIR=$RPM_BUILD_ROOT
-OPENQRM_BUILD_POSTINSTALL
-
-%pre
-if [ -x "OPENQRM_PACKAGE_PREINSTALL_SCRIPT" ]; then OPENQRM_PACKAGE_PREINSTALL; fi
-
-%post
-OPENQRM_PACKAGE_POSTINSTALL
-
-%preun
-OPENQRM_PACKAGE_PREREMOVE
-
-%postun
-if [ ! -f "/usr/share/openqrm/package-update.state" ]; then rm -rf /usr/share/openqrm; rm -f /etc/init.d/openqrm; fi
-if [ -f "/usr/share/openqrm/package-update.state" ]; then rm -f /usr/share/openqrm/package-update.state; /etc/init.d/openqrm start; fi
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-make clean
diff --git a/openQRM-5.3.50-CE/src/sbin/Makefile b/openQRM-5.3.50-CE/src/sbin/Makefile
deleted file mode 100644
index 6f3c85b..0000000
--- a/openQRM-5.3.50-CE/src/sbin/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# this is the openQRM sbin Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/sbin
-	. $(OPENQRM_SERVER_CONF) && cp -a openqrm-exec $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/
-	. $(OPENQRM_SERVER_CONF) && cp -a openqrm-cmd-queue $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/
-	. $(OPENQRM_SERVER_CONF) && cp -a openqrm-rabbitmq-cmd-queue $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/
-	. $(OPENQRM_SERVER_CONF) && cp -a openqrm-monitord $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/
-	. $(OPENQRM_SERVER_CONF) && cp -a openqrm-postencode $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/
-	. $(OPENQRM_SERVER_CONF) && cp -a openqrm-crypt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm*
-
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/*
-	. $(OPENQRM_SERVER_CONF) && rmdir $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/sbin
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
-	
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/sbin/openqrm-cmd-queue b/openQRM-5.3.50-CE/src/sbin/openqrm-cmd-queue
deleted file mode 100644
index ce6f86e..0000000
--- a/openQRM-5.3.50-CE/src/sbin/openqrm-cmd-queue
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/bin/bash
-#  openQRM-cmd-queue read queued commands and runs them
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../..
-	OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-fi
-export OPENQRM_SERVER_BASE_DIR
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-OPENQRM_COMMAND_QUEUE="$OPENQRM_SERVER_BASE_DIR/openqrm/var/spool/"
-# get config for posting events
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-openqrm_server_get_config
-OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-resource_id=0
-resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-OPENQRM_QUEUEING_DELAY=0.5
-SEQ=1
-RETRY=3
-RETRY_DELAY=10
-# defines how long commands are allowed to run
-DEFAULT_CMD_TIMEOUT=$OPENQRM_DEFAULT_CMD_TIMEOUT
-
-function cmd_queue_log() {
-	local PRIO=$1
-	shift
-	local CQLOG=$@
-	echo "openQRM-cmd-queu $PRIO : $CQLOG" | logger
-}
-
-
-function cmd_timeout() {
-	[ $# -eq 2 ] || cmd_queue_log ERROR "cmd_timeout takes 2 arguments"
-	sleep_time=$1
-	command=$2
-	$command &
-	cmd_pid=$!
-	( sleep $sleep_time && kill $cmd_pid && cmd_queue_log ERROR "Killed $command due to timeout $sleep_time exceeded" ) &
-	killer_pid=$!
-	wait $cmd_pid &> /dev/null
-	wait_status=$?
-	if [ $wait_status == 0 ]; then
-		disown $killer_pid
-		kill $killer_pid &> /dev/null
-	else
-		kill `ps ax | grep dbclient | grep dropbear_rsa_host_key | awk {' print $1 '}` 2>/dev/null
-	fi
-	return $wait_status
-}
-
-# dir to store the failed cmds for the ui
-if [ ! -d "$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors" ]; then
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors
-	chmod -R 777 $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors
-fi
-
-cd $OPENQRM_COMMAND_QUEUE
-while (true); do
-	for OPENQRM_COMMAND_FILE in `ls -tr --time-style=full-iso openqrm-queue* 2>/dev/null`; do
-		chmod +x $OPENQRM_COMMAND_FILE
-		COMMAND_TOKEN=`echo $OPENQRM_COMMAND_FILE | cut -d'.' -f2`
-		TIMEOUT_TOKEN=`echo $OPENQRM_COMMAND_FILE | cut -d'.' -f3`
-		if [ "$TIMEOUT_TOKEN" == "" ]; then
-			CMD_TIMEOUT=$DEFAULT_CMD_TIMEOUT
-			cmd_queue_log NOTICE "Running $COMMAND_TOKEN with default cmd-timeout $CMD_TIMEOUT"
-		else
-			CMD_TIMEOUT=$TIMEOUT_TOKEN
-			cmd_queue_log NOTICE "Running $COMMAND_TOKEN with custom cmd-timeout $CMD_TIMEOUT"
-		fi
-		OPENQRM_COMMAND=`cat $OPENQRM_COMMAND_FILE | sed -e 's/-u [^ ]* /-u xxxxxxxx /g' -e 's/-p [^ ]*/-p xxxxxxxx /g'`
-		cmd_queue_log NOTICE "Running $COMMAND_TOKEN : $OPENQRM_COMMAND"
-		cmd_timeout $CMD_TIMEOUT ./$OPENQRM_COMMAND_FILE 2>ouput.$COMMAND_TOKEN
-		COMMAND_RES=$?
-		if [ "$COMMAND_RES" != "0" ]; then
-			# check if we should retry
-			if [ "$OPENQRM_CMD_QUEUE_RETRY" == "true" ]; then
-				# put it in the failed queue
-				mv -f $OPENQRM_COMMAND_FILE failed-cmd.1.$COMMAND_TOKEN
-				OPENQRM_COMMAND_OUTPUT=`cat ouput.$COMMAND_TOKEN`
-				cmd_queue_log WARNING "Command with token $FAILED_COMMAND_TOKEN failed : $OPENQRM_COMMAND  ----- $OPENQRM_COMMAND_OUTPUT"
-			else
-				cmd_queue_log ERROR "Command with token $COMMAND_TOKEN failed : $OPENQRM_COMMAND  ----- $OPENQRM_COMMAND_OUTPUT"
-				openqrm_post_event 0 "base-engine" 2 "openqrm-cmd-queue" "ERROR running token $COMMAND_TOKEN"
-				# move to event errors for debug
-				mv -f $OPENQRM_COMMAND_FILE $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors/$COMMAND_TOKEN.cmd
-				mv -f ouput.$COMMAND_TOKEN $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors/$COMMAND_TOKEN.out
-				chmod -R 777 $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors/$COMMAND_TOKEN.*
-			fi
-		else
-			rm -f $OPENQRM_COMMAND_FILE
-		fi
-		rm -f ouput.$COMMAND_TOKEN
-	done
-	SEQ=$(( SEQ + 1 ))
-
-	# check the failed queue
-	if [ "$SEQ" == "$RETRY_DELAY" ]; then
-		for FAILED_OPENQRM_COMMAND_FILE in `ls -tr --time-style=full-iso failed-cmd* 2>/dev/null`; do
-			chmod +x $FAILED_OPENQRM_COMMAND_FILE
-			FAILED_COMMAND_RETRY_COUNT=`echo $FAILED_OPENQRM_COMMAND_FILE | cut -d'.' -f2`
-			FAILED_COMMAND_TOKEN=`echo $FAILED_OPENQRM_COMMAND_FILE | cut -d'.' -f3`
-			FAILED_TIMEOUT_TOKEN=`echo $FAILED_OPENQRM_COMMAND_FILE | cut -d'.' -f4`
-			if [ "$FAILED_TIMEOUT_TOKEN" == "" ]; then
-				CMD_TIMEOUT=$DEFAULT_CMD_TIMEOUT
-				cmd_queue_log NOTICE "Running failed $COMMAND_TOKEN with default cmd-timeout $CMD_TIMEOUT"
-			else
-				CMD_TIMEOUT=$FAILED_TIMEOUT_TOKEN
-				cmd_queue_log NOTICE "Running failed $COMMAND_TOKEN with custom cmd-timeout $CMD_TIMEOUT"
-			fi
-			FAILED_OPENQRM_COMMAND=`cat $FAILED_OPENQRM_COMMAND_FILE | sed -e 's/-u [^ ]* /-u xxxxxxxx /g' -e 's/-p [^ ]*/-p xxxxxxxx /g'`
-			cmd_queue_log NOTICE "$FAILED_COMMAND_RETRY_COUNT. retry for Command $FAILED_COMMAND_TOKEN : $FAILED_OPENQRM_COMMAND"
-			cmd_timeout $CMD_TIMEOUT ./$FAILED_OPENQRM_COMMAND_FILE 2>ouput.$FAILED_COMMAND_TOKEN
-			FAILED_COMMAND_RES=$?
-			if [ "$FAILED_COMMAND_RES" != "0" ]; then
-				FAILED_OPENQRM_COMMAND_OUTPUT=`cat ouput.$FAILED_COMMAND_TOKEN`
-				if [ "$FAILED_COMMAND_RETRY_COUNT" == "$RETRY" ]; then
-					# too many retries, remove the cmd and log the error + debug
-					cmd_queue_log ERROR "Command $FAILED_COMMAND_TOKEN failed for $RETRY. retries : $FAILED_OPENQRM_COMMAND"
-					openqrm_post_event 0 "base-engine" 2 "openqrm-cmd-queue" "ERROR running token $FAILED_COMMAND_TOKEN"
-					# move to event errors for debug
-					mv -f $FAILED_OPENQRM_COMMAND_FILE $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors/$FAILED_COMMAND_TOKEN.cmd
-					mv -f ouput.$FAILED_COMMAND_TOKEN $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors/$FAILED_COMMAND_TOKEN.out
-					chmod -R 777 $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors/$FAILED_COMMAND_TOKEN.*
-				else
-					# put it in the failed queue again
-					NEXT_FAILED_COMMAND_RETRY_COUNT=$(( FAILED_COMMAND_RETRY_COUNT + 1 ))
-					mv -f $FAILED_OPENQRM_COMMAND_FILE failed-cmd.$NEXT_FAILED_COMMAND_RETRY_COUNT.$FAILED_COMMAND_TOKEN
-					cmd_queue_log WARNING "$FAILED_COMMAND_RETRY_COUNT. retry failed for Command $FAILED_COMMAND_TOKEN : $FAILED_OPENQRM_COMMAND ----- $FAILED_OPENQRM_COMMAND_OUTPUT"
-				fi
-			else
-				rm -f $FAILED_OPENQRM_COMMAND_FILE
-			fi
-			rm -f ouput.$FAILED_COMMAND_TOKEN
-		done
-		SEQ=1
-	fi
-	sleep $OPENQRM_QUEUEING_DELAY
-done
-
diff --git a/openQRM-5.3.50-CE/src/sbin/openqrm-crypt b/openQRM-5.3.50-CE/src/sbin/openqrm-crypt
deleted file mode 100644
index 870d896..0000000
--- a/openQRM-5.3.50-CE/src/sbin/openqrm-crypt
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/perl -w
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-use strict;
-my ($plain) = @ARGV;
-my $itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-my $salt;
-for (1..2) { $salt .= substr $itoa64, rand(length($itoa64)), 1; }
-my $password = crypt($plain, $salt);
-
-print "<\?php\n";
-print "\$thisfile = basename(\$_SERVER['PHP_SELF']);\n";
-print "echo \"$password\";\n";
-print "unlink(\$thisfile);\n";
-print "\?>\n";
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/sbin/openqrm-exec b/openQRM-5.3.50-CE/src/sbin/openqrm-exec
deleted file mode 100644
index 022bbb7..0000000
--- a/openQRM-5.3.50-CE/src/sbin/openqrm-exec
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/bash
-#  openQRM-exec, an openQRM-util for remote exection of openQRM-commands
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../..
-	OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-fi
-export OPENQRM_SERVER_BASE_DIR
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-DB_IDLE=0
-DB_TIMEOUT=10
-OPENQRM_COMMAND_QUEUE="$OPENQRM_SERVER_BASE_DIR/openqrm/var/spool/openqrm-queue"
-WHOAMI=`whoami`
-OQLOCKFILE="$OPENQRM_SERVER_BASE_DIR/openqrm/var/lock/openqrm-queue"
-
-
-
-function lockit() {
-	LOCKLOOP=0
-	MAXLOCKLOOP=4
-	while (:); do
-		if ( set -o noclobber; echo "locked" > "$OQLOCKFILE") 2> /dev/null; then
-			trap 'rm -f "$OQLOCKFILE"; exit $?' INT TERM EXIT
-			break
-		else
-			LOCKLOOP=$(( LOCKLOOP + 1 ))
-			if (( $LOCKLOOP > $MAXLOCKLOOP )); then
-				unlockit
-			fi
-		fi
-		sleep 1
-	done
-}
-
-function unlockit() {
-	rm -f "$OQLOCKFILE"
-}
-
-
-
-# parse commandline args
-while [ $# -ne 0 ]; do
-	case "$1" in
-		-i)
-			RESOURCE_IP=$2
-			shift
-			;;
-		-t)
-			COMMAND_TOKEN=$2
-			shift
-			;;
-		-l)
-			COMMAND_LOCAL=$2
-			shift
-			;;
-		-c)
-			shift
-			OPENQRM_COMMAND=$@
-			shift
-			;;
-	esac
-	shift
-done
-# checks
-if [ "$RESOURCE_IP" == "0.0.0.0" ]; then
-	echo "openQRM-exec ERROR: Not running command on invalid ip address 0.0.0.0" | logger
-	exit 0
-fi
-if [ "$RESOURCE_IP" == "" ]; then
-	echo "openQRM-exec ERROR: Not running command on empty ip address" | logger
-	exit 0
-fi
-# run
-if [ "$COMMAND_LOCAL" == "true" ]; then
-	FULL_COMMAND="$OPENQRM_SERVER_BASE_DIR/openqrm/bin/openqrm-cmd $OPENQRM_COMMAND"
-else
-	FULL_COMMAND="dbclient -K $DB_TIMEOUT -y -i $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear/dropbear_rsa_host_key -p $OPENQRM_EXEC_PORT root@$RESOURCE_IP \"$OPENQRM_SERVER_BASE_DIR/openqrm/bin/openqrm-cmd $OPENQRM_COMMAND\""
-fi
-# echo "openQRM engine (as $WHOAMI) queuing : $FULL_COMMAND" | logger
-lockit
-echo "$FULL_COMMAND" >> $OPENQRM_COMMAND_QUEUE.$COMMAND_TOKEN
-sleep 0.1
-unlockit
-
diff --git a/openQRM-5.3.50-CE/src/sbin/openqrm-monitord b/openQRM-5.3.50-CE/src/sbin/openqrm-monitord
deleted file mode 100644
index ad3f9ec..0000000
--- a/openQRM-5.3.50-CE/src/sbin/openqrm-monitord
+++ /dev/null
@@ -1,249 +0,0 @@
-#!/bin/bash
-# openqrm-monitord, a openQRM daemon for gathering system statistics
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SBIN_DIR=`dirname $0`
-OPENQRM_BASE_DIR=`pushd $OPENQRM_SBIN_DIR/.. 1>/dev/null && pwd && popd 1>/dev/null`
-OPENQRM_EVENT="statistics"
-OPENQRM_ACTIVE_STATE="active"
-OPENQRM_STARTING_STATE="starting"
-
-# check if running on the server or on a managed resource
-if [ -f "$OPENQRM_BASE_DIR/include/openqrm-server-functions" ]; then
-	# we are running on the server
-	. $OPENQRM_BASE_DIR/include/openqrm-functions
-	. $OPENQRM_BASE_DIR/include/openqrm-server-functions
-	export resource_id=0
-	export resource_senddelay=10
-	export resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-	export SERVER_PROTOCOL=$OPENQRM_WEB_PROTOCOL
-	export resource_mac=`ip a s $OPENQRM_SERVER_INTERFACE | grep -w $OPENQRM_SERVER_INTERFACE$ | grep "link/ether" | awk '{ print $2 }'`
-else
-	# we are running on a managed resource
-	export OPENQRM_SERVER_BASE_DIR=$OPENQRM_BASE_DIR
-	. $OPENQRM_BASE_DIR/include/openqrm-functions
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-	export SERVER_PROTOCOL=$openqrm_web_protocol
-fi
-# define wget to use with https
-if [ "$SERVER_PROTOCOL" == "https" ]; then
-	export WGET="wget --no-check-certificate -q -O /dev/null"
-	if [ "$resource_id" == "0" ]; then
-		export WGET="wget --bind-address=$OPENQRM_SERVER_IP_ADDRESS --no-check-certificate -q -O /dev/null"
-	fi
-else
-	export WGET="wget -q -O /dev/null"
-	if [ "$resource_id" == "0" ]; then
-		export WGET="wget --bind-address=$OPENQRM_SERVER_IP_ADDRESS -q -O /dev/null"
-	fi
-fi
-# set timeout
-export WGET="$WGET -T 300 -t 1"
-
-
-# local used functions
-function send_info() {
-	if [ -f /etc/initrd-devices.conf ] && [ "$image_type" != "ram" ]; then
-		current_state=`urlencodestring $OPENQRM_STARTING_STATE`
-	else
-		current_state=`urlencodestring $OPENQRM_ACTIVE_STATE`
-	fi
-
-	current_event=`urlencodestring $OPENQRM_EVENT`
-	MESSAGEDATA="resource_id=$resource_id&resource_uptime=$current_uptime&resource_cpunumber=$current_cpu_number&resource_cpuspeed=$current_cpu_speed&resource_cpumodel=$current_cpu_model&resource_memtotal=$current_mem_total&resource_memused=$current_mem_used&resource_swaptotal=$current_swap_total&resource_swapused=$current_swap_used&resource_hostname=$current_hostname&resource_load=$current_cpu_load&resource_nics=$current_nic_count&resource_state=$current_state&resource_event=$current_event";
-	# add mac of openQRM to messagedata
-	if [ "$resource_id" == "0" ]; then
-		MESSAGEDATA=$MESSAGEDATA"&resource_mac=$resource_mac"
-	fi
-	OPENQRM_RESOURCE_INFO_URL="$SERVER_PROTOCOL://$resource_openqrmserver/openqrm/action/resource-monitor.php?resource_command=update_info&$MESSAGEDATA"
-	$WGET "$OPENQRM_RESOURCE_INFO_URL"
-}
-
-
-# converts bytes to mega-bytes
-function bytes_to_mega() {
-	echo $1 | awk '{printf("%.0f",  $1 /  1024/ 1024)}'
-}
-
-
-# statistic gathering functions
-
-# uptime
-function find_uptime() {
-	if [ -f /proc/uptime ]; then
-		current_uptime=`cat /proc/uptime | cut -d'.' -f 1`
-	fi
-	if [ -z "$current_uptime" ]; then
-		current_uptime=0
-	fi
-}
-
-
-
-# cpu_number
-function find_cpu_number() {
-	if [ -f /proc/stat ]; then
-		current_cpu_number=`grep '^cpu[0-9]' /proc/stat | wc -l`
-		current_cpu_number=${current_cpu_number// /}
-	fi
-	if [ -z "$current_cpu_number" ]; then
-		current_cpu_number=0
-	fi
-}
-
-# cpu_speed
-function find_cpu_speed() {
-	if [ -f /proc/cpuinfo ]; then
-		current_cpu_speed=(`cat /proc/cpuinfo | grep "cpu.*MHz"`)
-		current_cpu_speed=${current_cpu_speed[3]/\.*/}
-	fi
-	if [ -z "$current_cpu_speed" ]; then
-		current_cpu_speed=0
-	fi
-}
-
-
-# cpu_model
-function find_cpu_model() {
-	if [ -f /proc/cpuinfo ]; then
-		current_cpu_model=`cat /proc/cpuinfo | grep "model.*name" | head -n 1 | tr -s ' ' | cut -d' ' -f 3-`
-		current_cpu_model=`urlencodestring $current_cpu_model`
-	fi
-	if [ -z "$current_cpu_model" ]; then
-		current_cpu_model=0
-	fi
-}
-
-# how many nics we have
-function find_nics() {
-	local BR=""
-	for b in `brctl show | grep -v STP | awk {' print $1 '}`; do BR="$BR $b"; done
-	for i in `ip a s | grep ^[0-9] | cut -d':' -f2 | awk '{ print $1 }' | grep -v lo | grep -v tap`; do
-		if ! echo $BR | grep $i 1>/dev/null; then
-				current_nic_count=$(( current_nic_count + 1 ))
-		fi
-	done
-	if [ -z "$current_nic_count" ]; then
-			current_nic_count=0
-	fi
-}
-
-# mem_total
-function find_mem_total() {
-	if [ -f /proc/meminfo ]; then
-		current_mem_total=`cat /proc/meminfo | awk '/MemTotal:/ { print int($2/1024) };'`
-	fi
-}
-
-# mem_used
-function find_mem_used() {
-	if [ -f /proc/meminfo ]; then
-		if [ -z "$current_mem_total" ]; then
-			current_mem_total=`cat /proc/meminfo | awk '/MemTotal:/ { print int($2/1024) };'`
-		fi
-		current_mem_free=`cat /proc/meminfo | awk '/MemFree:/ { print int($2/1024) };'`
-		current_mem_used=$((current_mem_total - current_mem_free))
-	fi
-	if [ -z "$current_mem_used" ]; then
-		current_mem_used=0
-	fi
-}
-
-
-# swap_total
-function find_swap_total() {
-	if [ -f /proc/meminfo ]; then
-		current_swap_total=`cat /proc/meminfo | awk '/SwapTotal:/ { print int($2/1024) };'`
-	fi
-}
-
-# swap_used
-function find_swap_used() {
-	if [ -f /proc/meminfo ]; then
-		if [ -z "$current_swap_total" ]; then
-			current_swap_total=`cat /proc/meminfo | awk '/SwapTotal:/ { print int($2/1024) };'`
-		fi
-		current_swap_free=`cat /proc/meminfo | awk '/SwapFree:/ { print int($2/1024) };'`
-		current_swap_used=$((current_swap_total - current_swap_free))
-	fi
-	if [ -z "$current_swap_used" ]; then
-		current_swap_used=0
-	fi
-}
-
-# hostname
-function find_hostname() {
-	current_hostname=`hostname`
-	current_hostname=`urlencodestring $current_hostname`
-	if [ -z "$current_hostname" ]; then
-		current_hostname=0
-	fi
-}
-
-
-
-# cpu_load
-function find_cpu_load() {
-	if [ -f /proc/loadavg ]; then
-		current_cpu_load=`cat /proc/loadavg | cut -d' ' -f 1`
-	fi
-	if [ -z "$current_cpu_load" ]; then
-		current_cpu_load=0
-	fi
-}
-
-
-# start after /proc is mounted
-while [ ! -f /proc/cpuinfo ]; do
-	sleep 5
-done
-
-# gathering the static values
-echo "$0: Gathering resources-information" | logger
-# cpu_number
-find_cpu_number
-# cpu_speed
-find_cpu_speed
-# cpu_model
-find_cpu_model
-# mem_total
-find_mem_total
-# nics
-find_nics
-
-# main loop
-while (true); do
-	# uptime
-	find_uptime
-	# mem_used
-	find_mem_used
-	# swap_total
-	find_swap_total
-	# swap_used
-	find_swap_used
-	# hostname
-	find_hostname
-	# cpu_load
-	find_cpu_load
-	# sending statistics
-	send_info
-	# delay
-	sleep $resource_senddelay
-done
-# never reached
-exit 0
-
-
diff --git a/openQRM-5.3.50-CE/src/sbin/openqrm-postencode b/openQRM-5.3.50-CE/src/sbin/openqrm-postencode
deleted file mode 100644
index 27e8891..0000000
--- a/openQRM-5.3.50-CE/src/sbin/openqrm-postencode
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-import sys, urllib, base64
-input_filename = sys.argv[1]
-postwad_filename = input_filename + ".post"
-datawad = base64.encodestring(file(input_filename, "rb").read())
-postwad = urllib.urlencode({"filedata":datawad, "filename":input_filename})
-file(postwad_filename, "wb").write(postwad)
-print postwad_filename
diff --git a/openQRM-5.3.50-CE/src/sbin/openqrm-rabbitmq-cmd-queue b/openQRM-5.3.50-CE/src/sbin/openqrm-rabbitmq-cmd-queue
deleted file mode 100644
index ca009b8..0000000
--- a/openQRM-5.3.50-CE/src/sbin/openqrm-rabbitmq-cmd-queue
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/env python
-#  openQRM-rabbitmq-cmd-queue read queued commands and runs them
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-import pika
-import subprocess
-import syslog
-import os
-import sys
-import time
-
-
-try:
-	os.environ["RABBITMQ_QUEUE_NAME"]
-except KeyError:
-	print "Please set the environment variable RABBITMQ_QUEUE_NAME"
-	sys.exit(1)
-
-try:
-	os.environ["RABBITMQ_SERVER"]
-except KeyError:
-	print "Please set the environment variable RABBITMQ_SERVER"
-	sys.exit(1)
-
-try:
-	os.environ["RABBITMQ_PASSWORD"]
-except KeyError:
-	print "Please set the environment variable RABBITMQ_PASSWORD"
-	sys.exit(1)
-
-
-RECONNECTDELAY=10
-RABBITMQ_SERVER = os.environ["RABBITMQ_SERVER"]
-RABBITMQ_PASSWORD = os.environ["RABBITMQ_PASSWORD"]
-RABBITMQ_QUEUE_NAME = os.environ["RABBITMQ_QUEUE_NAME"]
-RABBITMQ_QUEUE_NAME_UI = RABBITMQ_QUEUE_NAME + ".ui"
-
-credentials = pika.PlainCredentials('openqrm', RABBITMQ_PASSWORD)
-parameters = pika.ConnectionParameters(RABBITMQ_SERVER, 5671, '/', credentials, ssl=True)
-
-def run_command(n):
-	t = '';
-	p = subprocess.Popen(n, shell=True, stdout=subprocess.PIPE)
-	while True:
-		line = p.stdout.readline()
-		if not line:
-			break
-		t = t + line;
-	return t
-
-def on_request(ch, method, props, body):
-    n = str(body)
-    print "Received  (%s)"  % (n,)
-    print "reply to %s" % props.reply_to
-    print "id %s" % props.correlation_id
-    syslog.syslog( 'rabbitmq-queue running: %s' % n )
-    response = run_command(n)
-
-    ch.basic_publish(exchange='',
-                     routing_key=props.reply_to,
-                     properties=pika.BasicProperties(correlation_id = \
-                                                     props.correlation_id),
-                     body=str(response))
-    ch.basic_ack(delivery_tag = method.delivery_tag)
-
-
-while True:
-        try:
-			connection = pika.BlockingConnection(parameters)
-			channel = connection.channel()
-			channel.queue_declare(queue=RABBITMQ_QUEUE_NAME)
-			channel.queue_declare(queue=RABBITMQ_QUEUE_NAME_UI)
-			channel.basic_qos(prefetch_count=1)
-			channel.basic_consume(on_request, queue=RABBITMQ_QUEUE_NAME)
-			channel.basic_consume(on_request, queue=RABBITMQ_QUEUE_NAME_UI)
-			syslog.syslog('openqrm-rabbitmq-cmd-queue: Awaiting RPC requests' )
-			print " [x] Awaiting RPC requests"
-			channel.start_consuming()
-
-        except:
-			print "openqrm-rabbitmq-cmd-queue: Connection lost! Reconnecting in %s" % RECONNECTDELAY
-			syslog.syslog('openqrm-rabbitmq-cmd-queue: Connection lost! Reconnecting in %s' % RECONNECTDELAY )
-			time.sleep(RECONNECTDELAY)
-
diff --git a/openQRM-5.3.50-CE/src/tftpboot/Makefile b/openQRM-5.3.50-CE/src/tftpboot/Makefile
deleted file mode 100644
index 19efae8..0000000
--- a/openQRM-5.3.50-CE/src/tftpboot/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# this is the openQRM tftpboot Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../etc/openqrm-server.conf
-
-configure:
-
-compile:
-
-install:
-
-uninstall:
-	@. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/tftpboot
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
-	
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/web/Makefile b/openQRM-5.3.50-CE/src/web/Makefile
deleted file mode 100644
index a82f1ab..0000000
--- a/openQRM-5.3.50-CE/src/web/Makefile
+++ /dev/null
@@ -1,276 +0,0 @@
-# this is the openQRM web Makefile
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export OPENQRM_SERVER_CONF=$(shell pwd)/../etc/openqrm-server.conf
-
-configure:
-
-compile:
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_get_htmlobjects
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_get_adodb
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_get_jquery_bundle
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_get_js_interface
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_get_jqclock
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_get_phplib
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_get_treemenu_js
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_get_treemenu_icons
-
-install:
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web
-	. $(OPENQRM_SERVER_CONF) && cp *.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/
-
-	# action
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/action
-	. $(OPENQRM_SERVER_CONF) && cp action/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/action/
-
-	# base
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base
-	. $(OPENQRM_SERVER_CONF) && cp base/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/
-
-	# base/include
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/include
-	. $(OPENQRM_SERVER_CONF) && cp base/include/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/include/
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_install_adodb
-
-	# base/js
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/js
-	. $(OPENQRM_SERVER_CONF) && cp base/js/*.js $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/js/
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_install_jquery_bundle
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_install_js_interface
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_install_jqclock
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_install_treemenu_js
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_install_treemenu_icons
-
-	# base/class
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/class
-	. $(OPENQRM_SERVER_CONF) && cp base/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/class/
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_install_phplib
-
-	# base/class/htmlobjects
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/class/htmlobjects
-	. $(OPENQRM_SERVER_CONF) && ../make-assistant openqrm_install_htmlobjects
-
-	# base/lang
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/lang
-	. $(OPENQRM_SERVER_CONF) && cp base/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/lang/
-
-	# base/tpl
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/tpl
-	. $(OPENQRM_SERVER_CONF) && cp base/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/tpl/
-
-	# base/css
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/css
-	. $(OPENQRM_SERVER_CONF) && cp base/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/css/bootstrap
-	. $(OPENQRM_SERVER_CONF) && cp base/css/bootstrap/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/css/bootstrap/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/css/bootstrap/img
-	. $(OPENQRM_SERVER_CONF) && cp base/css/bootstrap/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/css/bootstrap/img/
-
-	# base/fonts
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/fonts
-	. $(OPENQRM_SERVER_CONF) && cp base/fonts/*.eot $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/fonts/
-	. $(OPENQRM_SERVER_CONF) && cp base/fonts/*.otf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/fonts/
-	. $(OPENQRM_SERVER_CONF) && cp base/fonts/*.svg $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/fonts/
-	. $(OPENQRM_SERVER_CONF) && cp base/fonts/*.ttf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/fonts/
-	. $(OPENQRM_SERVER_CONF) && cp base/fonts/*.woff $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/fonts/
-
-	# base/img/glyphicons
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/glyphicons
-	. $(OPENQRM_SERVER_CONF) && cp base/img/glyphicons/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/glyphicons/
-	. $(OPENQRM_SERVER_CONF) && cp base/img/glyphicons/*.svg $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/glyphicons/
-
-	# base/img/glyphicons/halflings
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/glyphicons/halflings
-	. $(OPENQRM_SERVER_CONF) && cp base/img/glyphicons/halflings/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/glyphicons/halflings/
-	. $(OPENQRM_SERVER_CONF) && cp base/img/glyphicons/halflings/*.svg $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/glyphicons/halflings/
-
-	# base/img/menu
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu
-	. $(OPENQRM_SERVER_CONF) && cp base/img/plugin.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/
-	. $(OPENQRM_SERVER_CONF) && cp base/img/datacenter.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/
-	. $(OPENQRM_SERVER_CONF) && cp base/img/image.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/
-	. $(OPENQRM_SERVER_CONF) && cp base/img/kernel.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/
-	. $(OPENQRM_SERVER_CONF) && cp base/img/resource.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/
-	. $(OPENQRM_SERVER_CONF) && cp base/img/storage.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/
-	. $(OPENQRM_SERVER_CONF) && cp base/img/active.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/
-	. $(OPENQRM_SERVER_CONF) && cp base/img/transition.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/
-	. $(OPENQRM_SERVER_CONF) && cp base/img/error.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/
-	. $(OPENQRM_SERVER_CONF) && cp base/img/unknown.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/
-	. $(OPENQRM_SERVER_CONF) && cp base/img/idle.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/
-	. $(OPENQRM_SERVER_CONF) && cp base/img/add.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/
-	. $(OPENQRM_SERVER_CONF) && cp base/img/appliance.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/menu/
-	. $(OPENQRM_SERVER_CONF) && cp base/img/*.gif $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/
-	. $(OPENQRM_SERVER_CONF) && cp base/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/
-	. $(OPENQRM_SERVER_CONF) && cp base/img/*.ico $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/img/
-
-	# base/server
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server
-
-	# base/server/aa_server
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/aa_server
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/aa_server/class
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/aa_server/css
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/aa_server/lang
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/aa_server/tpl
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/aa_server/js
-	. $(OPENQRM_SERVER_CONF) && cp base/server/aa_server/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/aa_server/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/aa_server/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/aa_server/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/aa_server/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/aa_server/class/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/aa_server/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/aa_server/css/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/aa_server/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/aa_server/lang/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/aa_server/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/aa_server/tpl/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/aa_server/js/*.js $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/aa_server/js/
-
-	# base/server/resource
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/resource
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/resource/class
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/resource/css
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/resource/lang
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/resource/tpl
-	. $(OPENQRM_SERVER_CONF) && cp base/server/resource/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/resource/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/resource/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/resource/class/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/resource/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/resource/css/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/resource/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/resource/lang/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/resource/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/resource/tpl/
-
-	# base/server/user
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/user
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/user/class
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/user/css
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/user/lang
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/user/tpl
-	. $(OPENQRM_SERVER_CONF) && cp base/server/user/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/user/class/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/user/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/user/css/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/user/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/user/lang/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/user/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/user/tpl/
-
-	# base/server/image
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/image
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/image/class
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/image/css
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/image/lang
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/image/tpl
-	. $(OPENQRM_SERVER_CONF) && cp base/server/image/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/image/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/image/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/image/class/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/image/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/image/css/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/image/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/image/lang/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/image/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/image/tpl/
-
-	# base/server/appliance
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/appliance
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/appliance/class
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/appliance/css
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/appliance/lang
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/appliance/tpl
-	. $(OPENQRM_SERVER_CONF) && cp base/server/appliance/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/appliance/class/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/appliance/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/appliance/css/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/appliance/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/appliance/lang/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/appliance/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/appliance/tpl/
-
-	# base/server/storage
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/storage
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/storage/class
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/storage/css
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/storage/lang
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/storage/tpl
-	. $(OPENQRM_SERVER_CONF) && cp base/server/storage/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/storage/class/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/storage/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/storage/css/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/storage/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/storage/tpl/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/storage/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/storage/lang/
-
-	# base/server/kernel
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/kernel
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/kernel/class
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/kernel/css
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/kernel/lang
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/kernel/tpl
-	. $(OPENQRM_SERVER_CONF) && cp base/server/kernel/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/kernel/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/kernel/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/kernel/class/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/kernel/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/kernel/css/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/kernel/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/kernel/lang/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/kernel/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/kernel/tpl/
-
-	# base/server/event
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/class
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/css
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/img
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/lang
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/tpl
-	. $(OPENQRM_SERVER_CONF) && cp base/server/event/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/class/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/event/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/css/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/event/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/tpl/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/event/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/lang/
-	#. $(OPENQRM_SERVER_CONF) && cp base/server/event/img/*.* $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/img/
-
-	# base/server/zz_documentation
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/zz_documentation
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/zz_documentation/class
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/zz_documentation/css
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/zz_documentation/lang
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/zz_documentation/img
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/zz_documentation/tpl
-	. $(OPENQRM_SERVER_CONF) && cp base/server/zz_documentation/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/zz_documentation/class/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/zz_documentation/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/zz_documentation/css/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/zz_documentation/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/zz_documentation/lang/
-	. $(OPENQRM_SERVER_CONF) && cp base/server/zz_documentation/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/zz_documentation/tpl/
-
-	# base/plugins/aa_plugins
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/aa_plugins
-	. $(OPENQRM_SERVER_CONF) && cp base/plugins/aa_plugins/*.txt $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/aa_plugins/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/aa_plugins/css
-	. $(OPENQRM_SERVER_CONF) && cp base/plugins/aa_plugins/css/*.css $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/aa_plugins/css/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/aa_plugins/class
-	. $(OPENQRM_SERVER_CONF) && cp base/plugins/aa_plugins/class/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/aa_plugins/class/
-	#. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/aa_plugins/img
-	#. $(OPENQRM_SERVER_CONF) && cp base/plugins/aa_plugins/img/*.png $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/aa_plugins/img/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/aa_plugins/lang
-	. $(OPENQRM_SERVER_CONF) && cp base/plugins/aa_plugins/lang/*.ini $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/aa_plugins/lang/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/aa_plugins/tpl
-	. $(OPENQRM_SERVER_CONF) && cp base/plugins/aa_plugins/tpl/*.php $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/plugins/aa_plugins/tpl/
-
-	echo "Creating the openqrm-client boot-service package"
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/bin
-	. $(OPENQRM_SERVER_CONF) && cp -a ../bin/openqrm-cmd $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/bin/
-	. $(OPENQRM_SERVER_CONF) && cp -a ../bin/openqrm-rabbitmq-cmd-queue-ctl $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/bin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/bin/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/sbin
-	. $(OPENQRM_SERVER_CONF) && cp -a ../sbin/openqrm* $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/sbin/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/sbin/*
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/include
-	. $(OPENQRM_SERVER_CONF) && cp -a ../include/openqrm-functions $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/include/
-	. $(OPENQRM_SERVER_CONF) && cp -a ../include/openqrm-package-functions $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/include/
-	. $(OPENQRM_SERVER_CONF) && mkdir -p $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/etc/init.d/
-	. $(OPENQRM_SERVER_CONF) && cp -a ../etc/init.d/openqrm-client $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/etc/init.d/
-	. $(OPENQRM_SERVER_CONF) && cp -a ../etc/systemd $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/etc/
-	. $(OPENQRM_SERVER_CONF) && chmod +x $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/etc/init.d/*
-	. $(OPENQRM_SERVER_CONF) && tar -C 	$$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/ -czf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/openqrm-client.tgz `echo $$OPENQRM_RESOURCE_BASE_DIR | cut -d'/' -f2-`
-	. $(OPENQRM_SERVER_CONF) && chmod 744 $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/openqrm-client.tgz
-	rm -rf $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client
-	
-uninstall:
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_WEBSERVER_DOCUMENT_ROOT/openqrm
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web/*
-	. $(OPENQRM_SERVER_CONF) && rm -rf $(DESTINATION_DIR)$$OPENQRM_SERVER_BASE_DIR/openqrm/web
-
-clean:
-
-realclean:	clean
-
-all:	configure compile
-	
-.PHONY: all configure compile install uninstall clean realclean
diff --git a/openQRM-5.3.50-CE/src/web/action/resource-monitor.php b/openQRM-5.3.50-CE/src/web/action/resource-monitor.php
deleted file mode 100644
index 37b31e9..0000000
--- a/openQRM-5.3.50-CE/src/web/action/resource-monitor.php
+++ /dev/null
@@ -1,236 +0,0 @@
-
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once $RootDir."/include/openqrm-database-functions.php";
-require_once $RootDir."/class/resource.class.php";
-require_once $RootDir."/class/image.class.php";
-require_once $RootDir."/class/image_authentication.class.php";
-require_once $RootDir."/class/kernel.class.php";
-require_once $RootDir."/class/plugin.class.php";
-require_once $RootDir."/class/event.class.php";
-require_once $RootDir."/class/openqrm_server.class.php";
-require_once $RootDir.'/server/aa_server/class/datacenter.class.php';
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-// filter inputs
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-global $RESOURCE_INFO_TABLE;
-
-$source_ip = $_SERVER["REMOTE_ADDR"];
-$resource_id = $request->get('resource_id');
-$resource_command = $request->get('resource_command');
-$resource_mac = $request->get('resource_mac');
-$resource_ip = $request->get('resource_ip');
-$resource_subnet = $request->get('resource_subnet');
-$resource_state = $request->get('resource_state');
-$resource_event = $request->get('resource_event');
-foreach ($_REQUEST as $key => $value) {
-	if (strncmp($key, "resource_", 9) == 0) {
-		$resource_fields[$key] = $request->get($key);
-	}
-}
-
-if(@$resource_fields["resource_command"]){
-	unset($resource_fields["resource_command"]);
-}
-
-// set lastgood
-$resource_lastgood = $_SERVER['REQUEST_TIME'];
-$resource_fields["resource_lastgood"]=$resource_lastgood;
-
-// gather for event vars
-$event_name = $request->get('event_name');
-$event_priority = $request->get('event_priority');
-$event_source = $request->get('event_source');
-$event_description = $request->get('event_description');
-
-
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-
-$event = new event();
-
-
-switch ($resource_command) {
-
-	// get_parameter requires :
-	// resource_mac
-	default:
-	case 'get_parameter':
-		// if resource-id = -1 we add a new resource first
-		if ($resource_id == "-1") {
-			// check if resource already exists
-			$resource = new resource();
-			if (!$resource->exists($resource_mac)) {
-				// add resource
-				$new_resource_id=(int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$resource->id = $new_resource_id;
-				// 	check if resource_id is free
-				if (!$resource->is_id_free($resource->id)) {
-					$event->log("get_parameter", $_SERVER['REQUEST_TIME'], 3, "resource-monitor", "Given resource id $resource->id is already in use!", "", "", 0, 1, $resource->id);
-					echo "Given resource id $resource->id is already in use!";
-					exit();
-				}
-				$event->log("get_parameter", $_SERVER['REQUEST_TIME'], 5, "resource-monitor", "Adding new resource $new_resource_id ($resource_mac)", "", "", 0, 1, $resource->id);
-				# send add resource to openQRM-server
-				$openqrm_server->send_command("openqrm_server_add_resource $new_resource_id $resource_mac $resource_ip");
-				# add resource to db
-				$resource_fields["resource_id"]=$new_resource_id;
-				$resource_fields["resource_localboot"]=0;
-				$resource_fields["resource_vtype"]=1;
-				$resource_fields["resource_vhostid"]=$new_resource_id;
-				$resource_fields["resource_subnet"]=$resource_subnet;
-				$resource->add($resource_fields);
-			}
-		}
-		if (strlen($resource_mac)) {
-			$resource = new resource();
-			$resource->get_instance_by_mac("$resource_mac");
-			// update the resource parameter in any way
-			$resource->update_info($resource->id, $resource_fields);
-			$resource->get_parameter($resource->id);
-		} else if (strlen($resource_id)) {
-			$resource = new resource();
-			$resource->get_instance_by_id($resource_id);
-			// update the resource parameter in any way
-			$resource->update_info($resource->id, $resource_fields);
-			$resource->get_parameter($resource->id);
-		}
-		exit();
-		break;
-
-	// update_info requires :
-	// resource_id
-	// array of resource_fields
-	case 'update_info':
-		$resource = new resource();
-		if (strlen($resource_id)) {
-			$resource->get_instance_by_id($resource_id);
-			if (!strcmp($resource->event, "reboot")) {
-					// we do not accept this stats since the resource will be rebooted
-					// reset the events field
-					$resource_reboot_fields=array();
-					// change lastgood
-					$resource_reboot_fields["resource_lastgood"]=-1;
-					$resource_reboot_fields["resource_state"]="transition";
-					$resource_reboot_fields["resource_event"]="reboot1";
-					$event->log("update_info", $_SERVER['REQUEST_TIME'], 5, "resource-monitor", "Rejecting statistics from rebooting resource $resource_id (1)", "", "", 0, 0, $resource_id);
-					$resource->update_info($resource_id, $resource_reboot_fields);
-			} else if (!strcmp($resource->event, "reboot1")) {
-					$resource_reboot_fields=array();
-					// change lastgood
-					$resource_reboot_fields["resource_lastgood"]=-1;
-					$resource_reboot_fields["resource_state"]="transition";
-					$resource_reboot_fields["resource_event"]="reboot2";
-					$event->log("update_info", $_SERVER['REQUEST_TIME'], 5, "resource-monitor", "Rejecting statistics from rebooting resource $resource_id (2)", "", "", 0, 0, $resource_id);
-					$resource->update_info($resource_id, $resource_reboot_fields);
-			} else if (!strcmp($resource->event, "reboot2")) {
-					$resource_reboot_fields=array();
-					// change lastgood
-					$resource_reboot_fields["resource_lastgood"]=-1;
-					$resource_reboot_fields["resource_state"]="transition";
-					$resource_reboot_fields["resource_event"]="reboot3";
-					$event->log("update_info", $_SERVER['REQUEST_TIME'], 5, "resource-monitor", "Rejecting statistics from rebooting resource $resource_id (3)", "", "", 0, 0, $resource_id);
-					$resource->update_info($resource_id, $resource_reboot_fields);
-		   } else if (!strcmp($resource->event, "reboot3")) {
-					$resource_reboot_fields=array();
-					// change lastgood
-					$resource_reboot_fields["resource_lastgood"]=-1;
-					$resource_reboot_fields["resource_state"]="transition";
-					$resource_reboot_fields["resource_event"]="reboot4";
-					$event->log("update_info", $_SERVER['REQUEST_TIME'], 5, "resource-monitor", "Rejecting statistics from rebooting resource $resource_id (4)", "", "", 0, 0, $resource_id);
-					$resource->update_info($resource_id, $resource_reboot_fields);
-		   } else if (!strcmp($resource->event, "reboot4")) {
-					$resource_reboot_fields=array();
-					// change lastgood
-					$resource_reboot_fields["resource_lastgood"]=-1;
-					$resource_reboot_fields["resource_state"]="transition";
-					$resource_reboot_fields["resource_event"]="";
-					$event->log("update_info", $_SERVER['REQUEST_TIME'], 5, "resource-monitor", "Rejecting statistics from rebooting resource $resource_id (5)", "", "", 0, 0, $resource_id);
-					$resource->update_info($resource_id, $resource_reboot_fields);
-			} else {
-				// $event->log("update_info", $_SERVER['REQUEST_TIME'], 5, "resource-monitor", "Processing statistics from resource $resource_id", "", "", 0, 0, $resource_id);
-				$resource->update_info($resource_id, $resource_fields);
-			}
-		}
-
-
-		// in case the openQRM-server sends its stats we check
-		// the states of all resources
-		if (("$resource_id" == "0") && ("$OPENQRM_SERVER_IP_ADDRESS" == "$source_ip")){
-			// $event->log("update_info", $_SERVER['REQUEST_TIME'], 5, "resource-monitor", "Checking states of all resources", "", "", 0, 0, 0);
-			$resource->check_all_states();
-
-			// check if there are any image_authentications to manage
-			$image_auth = new image_authentication();
-			$image_auth->check_all_image_authentication();
-
-			// gather stats
-			$datacenter = new datacenter();
-			$datacenter->statistics();
-			
-			// here a plugin hook for things which needs to be done periodically
-			$plugin = new plugin();
-			$enabled_plugins = $plugin->enabled();
-
-			foreach ($enabled_plugins as $index => $plugin_name) {
-				$plugin_monitor_hook = "$RootDir/plugins/$plugin_name/openqrm-$plugin_name-monitor-hook.php";
-				if (file_exists($plugin_monitor_hook)) {
-					// $event->log("plugin_monitor_hook", $_SERVER['REQUEST_TIME'], 5, "resource-monitor.php", "Found plugin $plugin_name handling monitor event.", "", "", 0, 0, $resource_id);
-					require_once "$plugin_monitor_hook";
-					$monitor_function="openqrm_"."$plugin_name"."_monitor";
-					$monitor_function=str_replace("-", "_", $monitor_function);
-					$monitor_function();
-				}
-			}
-
-		}
-		exit();
-		break;
-
-	// update_status requires :
-	// resource_id
-	// resource_state
-	// resource_event
-	case 'update_status':
-		if (strlen($resource_id)) {
-			$resource = new resource();
-			$resource->update_status($resource_id, $resource_state, $resource_event);
-		}
-		exit();
-		break;
-
-	// post_event requires :
-	// resource_id
-	// event_name
-	// event_priority
-	// event_source
-	// event_description
-	case 'post_event':
-		if (strlen($resource_id)) {
-			$event->log($event_name, $_SERVER['REQUEST_TIME'], $event_priority, $event_source, $event_description, "", "", 0, 0, 0);
-		}
-		exit();
-		break;
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/web/base/api.php b/openQRM-5.3.50-CE/src/web/base/api.php
deleted file mode 100644
index 18e900d..0000000
--- a/openQRM-5.3.50-CE/src/web/base/api.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once($RootDir.'/class/openqrm.controller.class.php');
-if (!file_exists('unconfigured')) {
-	require_once($RootDir.'/include/user.inc.php');
-}
-$controller = new openqrm_controller();
-$controller->api();
diff --git a/openQRM-5.3.50-CE/src/web/base/class/appliance.class.php b/openQRM-5.3.50-CE/src/web/base/class/appliance.class.php
deleted file mode 100644
index fcf6502..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/appliance.class.php
+++ /dev/null
@@ -1,1075 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-// This class represents a applicance managed by openQRM
-// The applicance abstrations consists of the combination of 
-// - 1 boot-image (kernel.class)
-// - 1 (or more) server-filesystem/rootfs (image.class)
-// - requirements (cpu-number, cpu-speed, memory needs, etc)
-// - configuration (clustered, high-available, deployment type, etc)
-// - available and required resources (resource.class)
-
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once $RootDir."/include/openqrm-database-functions.php";
-require_once $RootDir."/class/resource.class.php";
-require_once $RootDir."/class/virtualization.class.php";
-require_once $RootDir."/class/image.class.php";
-require_once $RootDir."/class/deployment.class.php";
-require_once $RootDir."/class/kernel.class.php";
-require_once $RootDir."/class/plugin.class.php";
-require_once $RootDir."/class/event.class.php";
-require_once $RootDir."/class/authblocker.class.php";
-
-global $APPLIANCE_INFO_TABLE;
-$event = new event();
-global $event;
-
-$appliance_start_timeout=360;
-global $appliance_start_timeout;
-
-class appliance {
-
-var $id = '';
-var $name = '';
-var $kernelid = '';
-var $imageid = '';
-var $starttime = '';
-var $stoptime = '';
-var $cpunumber = '';
-var $cpuspeed = '';
-var $cpumodel = '';
-var $memtotal = '';
-var $swaptotal = '';
-var $nics = '';
-var $capabilities = '';
-var $cluster = '';
-var $ssi = '';
-var $resources = '';
-var $highavailable = '';
-var $virtual = '';
-var $virtualization = '';
-var $virtualization_host = '';
-var $state = '';
-var $comment = '';
-var $wizard = '';
-var $event = '';
-
-
-
-// ---------------------------------------------------------------------------------
-// methods to create an instance of an appliance object filled from the db
-// ---------------------------------------------------------------------------------
-
-// returns an appliance from the db selected by id or name
-function get_instance($id, $name) {
-	global $APPLIANCE_INFO_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	if ("$id" != "") {
-		$appliance_array = $db->Execute("select * from $APPLIANCE_INFO_TABLE where appliance_id=$id");
-	} else if ("$name" != "") {
-		$appliance_array = $db->Execute("select * from $APPLIANCE_INFO_TABLE where appliance_name='$name'");
-	} else {
-		$error = '';
-		foreach(debug_backtrace() as $key => $msg) {
-			if($key === 1) {
-				$error .= '( '.basename($msg['file']).' '.$msg['line'].' )';
-			}
-			syslog(LOG_ERR, $msg['function'].'() '.basename($msg['file']).':'.$msg['line']);
-		}
-		$event->log("get_instance", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "Could not create instance of appliance without data ".$error, "", "", 0, 0, 0);
-		return;
-	}
-	foreach ($appliance_array as $index => $appliance) {
-		$this->id = $appliance["appliance_id"];
-		$this->name = $appliance["appliance_name"];
-		$this->kernelid = $appliance["appliance_kernelid"];
-		$this->imageid = $appliance["appliance_imageid"];
-		$this->starttime = $appliance["appliance_starttime"];
-		$this->stoptime = $appliance["appliance_stoptime"];
-		$this->cpunumber = $appliance["appliance_cpunumber"];
-		$this->cpuspeed = $appliance["appliance_cpuspeed"];
-		$this->cpumodel = $appliance["appliance_cpumodel"];
-		$this->memtotal = $appliance["appliance_memtotal"];
-		$this->swaptotal = $appliance["appliance_swaptotal"];
-		$this->nics = $appliance["appliance_nics"];
-		$this->capabilities = $appliance["appliance_capabilities"];
-		$this->cluster = $appliance["appliance_cluster"];
-		$this->ssi = $appliance["appliance_ssi"];
-		$this->resources = $appliance["appliance_resources"];
-		$this->highavailable = $appliance["appliance_highavailable"];
-		$this->virtual = $appliance["appliance_virtual"];
-		$this->virtualization = $appliance["appliance_virtualization"];
-		$this->virtualization_host = $appliance["appliance_virtualization_host"];
-		$this->state = $appliance["appliance_state"];
-		$this->comment = $appliance["appliance_comment"];
-		$this->wizard = $appliance["appliance_wizard"];
-		$this->event = $appliance["appliance_event"];
-	}
-	return $this;
-}
-
-// returns an appliance from the db selected by id
-function get_instance_by_id($id) {
-	$this->get_instance($id, "");
-	return $this;
-}
-
-// returns an appliance from the db selected by iname
-function get_instance_by_name($name) {
-	$this->get_instance("", $name);
-	return $this;
-}
-
-// special get_instance by virtualilzation type and resource
-// avoiding performance loss by looping over all appliances
-// returns an appliance from the db selected by id or name
-function get_instance_by_virtualization_and_resource($virtualization_id, $resource_id) {
-	global $APPLIANCE_INFO_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	if (($resource_id == "") || ($virtualization_id == "")) {
-		$event->log("get_instance_by_virtualization_and_resource", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "Could not create instance of appliance without data", "", "", 0, 0, 0);
-		return;
-	}
-
-	$appliance_array = $db->Execute("select * from ".$APPLIANCE_INFO_TABLE." where appliance_virtualization='".$virtualization_id."' and appliance_resources=".$resource_id);
-	foreach ($appliance_array as $index => $appliance) {
-		$this->id = $appliance["appliance_id"];
-		$this->name = $appliance["appliance_name"];
-		$this->kernelid = $appliance["appliance_kernelid"];
-		$this->imageid = $appliance["appliance_imageid"];
-		$this->starttime = $appliance["appliance_starttime"];
-		$this->stoptime = $appliance["appliance_stoptime"];
-		$this->cpunumber = $appliance["appliance_cpunumber"];
-		$this->cpuspeed = $appliance["appliance_cpuspeed"];
-		$this->cpumodel = $appliance["appliance_cpumodel"];
-		$this->memtotal = $appliance["appliance_memtotal"];
-		$this->swaptotal = $appliance["appliance_swaptotal"];
-		$this->nics = $appliance["appliance_nics"];
-		$this->capabilities = $appliance["appliance_capabilities"];
-		$this->cluster = $appliance["appliance_cluster"];
-		$this->ssi = $appliance["appliance_ssi"];
-		$this->resources = $appliance["appliance_resources"];
-		$this->highavailable = $appliance["appliance_highavailable"];
-		$this->virtual = $appliance["appliance_virtual"];
-		$this->virtualization = $appliance["appliance_virtualization"];
-		$this->virtualization_host = $appliance["appliance_virtualization_host"];
-		$this->state = $appliance["appliance_state"];
-		$this->comment = $appliance["appliance_comment"];
-		$this->wizard = $appliance["appliance_wizard"];
-		$this->event = $appliance["appliance_event"];
-	}
-	return $this;
-}
-
-
-
-// ---------------------------------------------------------------------------------
-// general appliance methods
-// ---------------------------------------------------------------------------------
-
-
-
-
-// checks if given appliance id is free in the db
-function is_id_free($appliance_id) {
-	global $APPLIANCE_INFO_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select appliance_id from $APPLIANCE_INFO_TABLE where appliance_id=$appliance_id");
-	if (!$rs)
-		$event->log("is_id_free", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "is_id_free: ".$db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	if ($rs->EOF) {
-		return true;
-	} else {
-		return false;
-	}
-}
-
-
-// adds appliance to the database
-function add($appliance_fields) {
-	global $APPLIANCE_INFO_TABLE;
-	global $event;
-	global $RootDir;
-	if (!is_array($appliance_fields)) {
-		$event->log("add", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "Appliance_field not well defined", "", "", 0, 0, 0);
-		return 1;
-	}
-	// set stop time and status to now
-	$now=$_SERVER['REQUEST_TIME'];
-	$appliance_fields['appliance_stoptime']=$now;
-	$appliance_fields['appliance_state']='stopped';
-	$db=openqrm_get_db_connection();
-	$result = $db->AutoExecute($APPLIANCE_INFO_TABLE, $appliance_fields, 'INSERT');
-	if (! $result) {
-		$event->log("add", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "Failed adding new appliance to database", "", "", 0, 0, 0);
-	} else {
-		$appliance_id = $appliance_fields['appliance_id'];
-		// add appliance hook
-		$this->get_instance_by_id($appliance_id);
-		// fill in the rest of the appliance info in the array for the plugin hook
-		$appliance_fields["appliance_id"]=$this->id;
-		$appliance_fields["appliance_name"]=$this->name;
-		$appliance_fields["appliance_kernelid"]=$this->kernelid;
-		$appliance_fields["appliance_imageid"]=$this->imageid;
-		$appliance_fields["appliance_cpunumber"]=$this->cpunumber;
-		$appliance_fields["appliance_cpuspeed"]=$this->cpuspeed;
-		$appliance_fields["appliance_cpumodel"]=$this->cpumodel;
-		$appliance_fields["appliance_memtotal"]=$this->memtotal;
-		$appliance_fields["appliance_swaptotal"]=$this->swaptotal;
-		$appliance_fields["appliance_nics"]=$this->nics;
-		$appliance_fields["appliance_capabilities"]=$this->capabilities;
-		$appliance_fields["appliance_cluster"]=$this->cluster;
-		$appliance_fields["appliance_ssi"]=$this->ssi;
-		$appliance_fields["appliance_resources"]=$this->resources;
-		$appliance_fields["appliance_highavailable"]=$this->highavailable;
-		$appliance_fields["appliance_virtual"]=$this->virtual;
-		$appliance_fields["appliance_virtualization"]=$this->virtualization;
-		$appliance_fields["appliance_virtualization_host"]=$this->virtualization_host;
-		$appliance_fields["appliance_comment"]=$this->comment;
-		$appliance_fields["appliance_wizard"]=$this->wizard;
-		$appliance_fields["appliance_event"]=$this->event;
-		// start the hook
-		$plugin = new plugin();
-		$enabled_plugins = $plugin->enabled();
-		foreach ($enabled_plugins as $index => $plugin_name) {
-			$plugin_start_appliance_hook = "$RootDir/plugins/$plugin_name/openqrm-$plugin_name-appliance-hook.php";
-			if (file_exists($plugin_start_appliance_hook)) {
-				$event->log("add", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Found plugin $plugin_name handling add-appliance event.", "", "", 0, 0, $this->resources);
-				require_once "$plugin_start_appliance_hook";
-				$appliance_function="openqrm_"."$plugin_name"."_appliance";
-				$appliance_function=str_replace("-", "_", $appliance_function);
-				$appliance_function("add", $appliance_fields);
-			}
-		}
-
-	}
-}
-
-
-
-// for the wizard we have to provide a add method without running the hook in step 1
-// which calls a separated method function to run the add hook after step 4
-// adds appliance to the database
-function add_no_hook($appliance_fields) {
-	global $APPLIANCE_INFO_TABLE;
-	global $event;
-	global $RootDir;
-	if (!is_array($appliance_fields)) {
-		$event->log("add", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "Appliance_field not well defined", "", "", 0, 0, 0);
-		return 1;
-	}
-	// set stop time and status to now
-	$now=$_SERVER['REQUEST_TIME'];
-	$appliance_fields['appliance_stoptime']=$now;
-	$appliance_fields['appliance_state']='stopped';
-	$db=openqrm_get_db_connection();
-	$result = $db->AutoExecute($APPLIANCE_INFO_TABLE, $appliance_fields, 'INSERT');
-	if (! $result) {
-		$event->log("add", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "Failed adding new appliance to database", "", "", 0, 0, 0);
-	}
-}
-
-function run_add_hook($appliance_id) {
-	global $APPLIANCE_INFO_TABLE;
-	global $event;
-	global $RootDir;
-	$this->get_instance_by_id($appliance_id);
-	// fill in the rest of the appliance info in the array for the plugin hook
-	$appliance_fields["appliance_id"]=$this->id;
-	$appliance_fields["appliance_name"]=$this->name;
-	$appliance_fields["appliance_kernelid"]=$this->kernelid;
-	$appliance_fields["appliance_imageid"]=$this->imageid;
-	$appliance_fields["appliance_cpunumber"]=$this->cpunumber;
-	$appliance_fields["appliance_cpuspeed"]=$this->cpuspeed;
-	$appliance_fields["appliance_cpumodel"]=$this->cpumodel;
-	$appliance_fields["appliance_memtotal"]=$this->memtotal;
-	$appliance_fields["appliance_swaptotal"]=$this->swaptotal;
-	$appliance_fields["appliance_nics"]=$this->nics;
-	$appliance_fields["appliance_capabilities"]=$this->capabilities;
-	$appliance_fields["appliance_cluster"]=$this->cluster;
-	$appliance_fields["appliance_ssi"]=$this->ssi;
-	$appliance_fields["appliance_resources"]=$this->resources;
-	$appliance_fields["appliance_highavailable"]=$this->highavailable;
-	$appliance_fields["appliance_virtual"]=$this->virtual;
-	$appliance_fields["appliance_virtualization"]=$this->virtualization;
-	$appliance_fields["appliance_virtualization_host"]=$this->virtualization_host;
-	$appliance_fields["appliance_comment"]=$this->comment;
-	$appliance_fields["appliance_wizard"]=$this->wizard;
-	$appliance_fields["appliance_event"]=$this->event;
-	// start the hook
-	$plugin = new plugin();
-	$enabled_plugins = $plugin->enabled();
-	foreach ($enabled_plugins as $index => $plugin_name) {
-		$plugin_start_appliance_hook = "$RootDir/plugins/$plugin_name/openqrm-$plugin_name-appliance-hook.php";
-		if (file_exists($plugin_start_appliance_hook)) {
-			$event->log("add", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Found plugin $plugin_name handling add-appliance event.", "", "", 0, 0, $this->resources);
-			require_once "$plugin_start_appliance_hook";
-			$appliance_function="openqrm_"."$plugin_name"."_appliance";
-			$appliance_function=str_replace("-", "_", $appliance_function);
-			$appliance_function("add", $appliance_fields);
-		}
-	}
-
-}
-
-
-
-// updates appliance in the database
-function update($appliance_id, $appliance_fields) {
-	global $APPLIANCE_INFO_TABLE;
-	global $RootDir;
-	global $event;
-	if ($appliance_id < 0 || ! is_array($appliance_fields)) {
-		$event->log("update", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "Unable to update appliance $appliance_id", "", "", 0, 0, 0);
-		return 1;
-	}
-	$db=openqrm_get_db_connection();
-	unset($appliance_fields["appliance_id"]);
-	$result = $db->AutoExecute($APPLIANCE_INFO_TABLE, $appliance_fields, 'UPDATE', "appliance_id = $appliance_id");
-	if (! $result) {
-		$event->log("update", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "Failed updating appliance $appliance_id", "", "", 0, 0, 0);
-	} else {
-		// refresh appliance object from db
-		$this->get_instance_by_id($appliance_id);
-		// if this is virtualization host also update the resource vtype
-		if (isset($appliance_fields['appliance_virtualization'])) {
-			$host_appliance_virtualization = new virtualization();
-			$host_appliance_virtualization->get_instance_by_id($appliance_fields['appliance_virtualization']);
-			if (strpos($host_appliance_virtualization->name, " Host")) {
-				$resource_fields["resource_vtype"]=$appliance_fields['appliance_virtualization'];
-				$resource_fields["resource_vhostid"]=$this->resources;
-				$host_appliance_resource = new resource();
-				$host_appliance_resource->update_info($this->resources, $resource_fields);
-			}
-		}
-		// update appliance hook
-		// fill in the rest of the appliance info in the array for the plugin hook
-		$appliance_fields["appliance_id"]=$this->id;
-		$appliance_fields["appliance_name"]=$this->name;
-		$appliance_fields["appliance_kernelid"]=$this->kernelid;
-		$appliance_fields["appliance_imageid"]=$this->imageid;
-		$appliance_fields["appliance_cpunumber"]=$this->cpunumber;
-		$appliance_fields["appliance_cpuspeed"]=$this->cpuspeed;
-		$appliance_fields["appliance_cpumodel"]=$this->cpumodel;
-		$appliance_fields["appliance_memtotal"]=$this->memtotal;
-		$appliance_fields["appliance_swaptotal"]=$this->swaptotal;
-		$appliance_fields["appliance_nics"]=$this->nics;
-		$appliance_fields["appliance_capabilities"]=$this->capabilities;
-		$appliance_fields["appliance_cluster"]=$this->cluster;
-		$appliance_fields["appliance_ssi"]=$this->ssi;
-		$appliance_fields["appliance_resources"]=$this->resources;
-		$appliance_fields["appliance_highavailable"]=$this->highavailable;
-		$appliance_fields["appliance_virtual"]=$this->virtual;
-		$appliance_fields["appliance_virtualization"]=$this->virtualization;
-		$appliance_fields["appliance_virtualization_host"]=$this->virtualization_host;
-		$appliance_fields["appliance_comment"]=$this->comment;
-		$appliance_fields["appliance_wizard"]=$this->wizard;
-		$appliance_fields["appliance_event"]=$this->event;
-		// start the hook
-		$plugin = new plugin();
-		$enabled_plugins = $plugin->enabled();
-		foreach ($enabled_plugins as $index => $plugin_name) {
-			$plugin_update_appliance_hook = $RootDir."/plugins/".$plugin_name."/openqrm-".$plugin_name."-appliance-hook.php";
-			if (file_exists($plugin_update_appliance_hook)) {
-				$event->log("update", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Found plugin ".$plugin_name." handling update-appliance event.", "", "", 0, 0, $this->resources);
-				require_once "$plugin_update_appliance_hook";
-				$appliance_function="openqrm_"."$plugin_name"."_appliance";
-				$appliance_function=str_replace("-", "_", $appliance_function);
-				$appliance_function("update", $appliance_fields);
-			}
-		}
-	}
-}
-
-// removes appliance from the database
-function remove($appliance_id) {
-	global $APPLIANCE_INFO_TABLE;
-	global $RootDir;
-	global $event;
-	// remove appliance hook
-	$this->get_instance_by_id($appliance_id);
-	// fill in the rest of the appliance info in the array for the plugin hook
-	$appliance_fields["appliance_id"]=$this->id;
-	$appliance_fields["appliance_name"]=$this->name;
-	$appliance_fields["appliance_kernelid"]=$this->kernelid;
-	$appliance_fields["appliance_imageid"]=$this->imageid;
-	$appliance_fields["appliance_cpunumber"]=$this->cpunumber;
-	$appliance_fields["appliance_cpuspeed"]=$this->cpuspeed;
-	$appliance_fields["appliance_cpumodel"]=$this->cpumodel;
-	$appliance_fields["appliance_memtotal"]=$this->memtotal;
-	$appliance_fields["appliance_swaptotal"]=$this->swaptotal;
-	$appliance_fields["appliance_nics"]=$this->nics;
-	$appliance_fields["appliance_capabilities"]=$this->capabilities;
-	$appliance_fields["appliance_cluster"]=$this->cluster;
-	$appliance_fields["appliance_ssi"]=$this->ssi;
-	$appliance_fields["appliance_resources"]=$this->resources;
-	$appliance_fields["appliance_highavailable"]=$this->highavailable;
-	$appliance_fields["appliance_virtual"]=$this->virtual;
-	$appliance_fields["appliance_virtualization"]=$this->virtualization;
-	$appliance_fields["appliance_virtualization_host"]=$this->virtualization_host;
-	$appliance_fields["appliance_comment"]=$this->comment;
-	$appliance_fields["appliance_wizard"]=$this->wizard;
-	$appliance_fields["appliance_event"]=$this->event;
-	// be sure to free the image
-	$appliance_image = new image();
-	$appliance_image->get_instance_by_id($this->imageid);
-	// only if image still exists
-	if ($appliance_image->id > 0) {
-		$appliance_image->set_active(0);
-	}
-	// start the hook
-	$plugin = new plugin();
-	$enabled_plugins = $plugin->enabled();
-	foreach ($enabled_plugins as $index => $plugin_name) {
-		$plugin_start_appliance_hook = "$RootDir/plugins/$plugin_name/openqrm-$plugin_name-appliance-hook.php";
-		if (file_exists($plugin_start_appliance_hook)) {
-			$event->log("remove", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Found plugin $plugin_name handling remove-appliance event.", "", "", 0, 0, $this->resources);
-			require_once "$plugin_start_appliance_hook";
-			$appliance_function="openqrm_"."$plugin_name"."_appliance";
-			$appliance_function=str_replace("-", "_", $appliance_function);
-			$appliance_function("remove", $appliance_fields);
-		}
-	}
-
-	// remove from db
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("delete from $APPLIANCE_INFO_TABLE where appliance_id=$appliance_id");
-
-
-}
-
-// removes appliance from the database by appliance_name
-function remove_by_name($appliance_name) {
-	global $APPLIANCE_INFO_TABLE;
-	global $RootDir;
-	global $event;
-	// remove appliance hook
-	$this->get_instance_by_name($appliance_name);
-	// fill in the rest of the appliance info in the array for the plugin hook
-	$appliance_fields["appliance_id"]=$this->id;
-	$appliance_fields["appliance_name"]=$this->name;
-	$appliance_fields["appliance_kernelid"]=$this->kernelid;
-	$appliance_fields["appliance_imageid"]=$this->imageid;
-	$appliance_fields["appliance_cpunumber"]=$this->cpunumber;
-	$appliance_fields["appliance_cpuspeed"]=$this->cpuspeed;
-	$appliance_fields["appliance_cpumodel"]=$this->cpumodel;
-	$appliance_fields["appliance_memtotal"]=$this->memtotal;
-	$appliance_fields["appliance_swaptotal"]=$this->swaptotal;
-	$appliance_fields["appliance_nics"]=$this->nics;
-	$appliance_fields["appliance_capabilities"]=$this->capabilities;
-	$appliance_fields["appliance_cluster"]=$this->cluster;
-	$appliance_fields["appliance_ssi"]=$this->ssi;
-	$appliance_fields["appliance_resources"]=$this->resources;
-	$appliance_fields["appliance_highavailable"]=$this->highavailable;
-	$appliance_fields["appliance_virtual"]=$this->virtual;
-	$appliance_fields["appliance_virtualization"]=$this->virtualization;
-	$appliance_fields["appliance_virtualization_host"]=$this->virtualization_host;
-	$appliance_fields["appliance_comment"]=$this->comment;
-	$appliance_fields["appliance_wizard"]=$this->wizard;
-	$appliance_fields["appliance_event"]=$this->event;
-	// be sure to free the image
-	$appliance_image = new image();
-	$appliance_image->get_instance_by_id($this->imageid);
-	// only if image still exists
-	if ($appliance_image->id > 0) {
-		$appliance_image->set_active(0);
-	}
-	// start the hook
-	$plugin = new plugin();
-	$enabled_plugins = $plugin->enabled();
-	foreach ($enabled_plugins as $index => $plugin_name) {
-		$plugin_start_appliance_hook = "$RootDir/plugins/$plugin_name/openqrm-$plugin_name-appliance-hook.php";
-		if (file_exists($plugin_start_appliance_hook)) {
-			$event->log("remove", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Found plugin $plugin_name handling remove-appliance event.", "", "", 0, 0, $this->resources);
-			require_once "$plugin_start_appliance_hook";
-			$appliance_function="openqrm_"."$plugin_name"."_appliance";
-			$appliance_function=str_replace("-", "_", $appliance_function);
-			$appliance_function("remove", $appliance_fields);
-		}
-	}
-
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("delete from $APPLIANCE_INFO_TABLE where appliance_name='$appliance_name'");
-}
-
-
-
-// starts an appliance -> assigns it to a resource
-function start($storage_authentication = NULL) {
-	global $event;
-	global $RootDir;
-	$appliance_start_timeout=360;
-	if ($this->resources < 1) {
-		$event->log("start", $_SERVER['REQUEST_TIME'], 1, "appliance.class.php", "No resource available for appliance ".$this->id, "", "", 0, 0, 0);
-		return;
-	}
-	$start_with_authblocker = true;
-	if (isset($storage_authentication)) {
-		$start_with_authblocker = $storage_authentication;
-	}
-
-	$resource = new resource();
-	$resource->get_instance_by_id($this->resources);
-	$kernel = new kernel();
-	$kernel->get_instance_by_id($this->kernelid);
-	$image = new image();
-	$image->get_instance_by_id($this->imageid);
-	// set image to active
-	$image->set_active(1);
-
-	// update resource state to transition early
-	$resource_fields=array();
-	$resource_fields["resource_state"]="transition";
-	$resource_fields["resource_event"]="reboot";
-	$resource->update_info($resource->id, $resource_fields);
-
-	// assign resource, wait a bit for the kernel to be assigned
-	$resource->assign($resource->id, $kernel->id, $kernel->name, $image->id, $image->name);
-	sleep(2);
-
-	// storage authentication hook
-	if ($start_with_authblocker) {
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-		$storage_auth_hook = $RootDir."/plugins/".$deployment_plugin_name."/openqrm-".$deployment_type."-auth-hook.php";
-		if (file_exists($storage_auth_hook)) {
-			$event->log("start", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Found deployment type ".$deployment_type." handling the start auth hook.", "", "", 0, 0, $this->resources);
-			// create storage_auth_blocker if not existing already
-			$authblocker = new authblocker();
-			$authblocker->get_instance_by_image_name($image->name);
-			if (!strlen($authblocker->id)) {
-				$event->log("start", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Creating new authblocker for image ".$image->name." / app id ".$this->id.".", "", "", 0, 0, $this->resources);
-				$ab_start_time = $_SERVER['REQUEST_TIME'];
-				$ab_create_fields['ab_image_id'] = $this->imageid;
-				$ab_create_fields['ab_image_name'] = $image->name;
-				$ab_create_fields['ab_start_time'] = $ab_start_time;
-				// get a new id
-				$ab_create_fields['ab_id'] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$authblocker->add($ab_create_fields);
-			}
-			$storage_auth_blocker_created = true;
-			// run the auth hook
-			require_once "$storage_auth_hook";
-			storage_auth_function("start", $this->id);
-		} else {
-			$event->log("start", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "No storage-auth hook (".$storage_auth_hook.") available for deployment type ".$deployment_type." for start auth hook.", "", "", 0, 0, $this->resources);
-			$storage_auth_blocker_created = false;
-		}
-		// delay to be sure to have the storage hook run before the reboot
-		if ($storage_auth_blocker_created) {
-			$wait_for_storage_auth_loop=0;
-			while (true) {
-				unset($check_authblocker);
-				$check_authblocker = new authblocker();
-				$check_authblocker->get_instance_by_image_name($image->name);
-				if (strlen($check_authblocker->id)) {
-					// ab still existing, check timeout
-					if ($wait_for_storage_auth_loop > $appliance_start_timeout) {
-						// remove authblocker
-						$check_authblocker->remove($check_authblocker->id);
-						// set appliance to stopped
-						$image->set_active(0);
-						$resource_fields=array();
-						$resource_fields["resource_state"]="active";
-						$resource_fields["resource_event"]="noop";
-						$resource->update_info($resource->id, $resource_fields);
-						$resource->assign($resource->id, "1", "default", "1", "idle");
-						$event->log("start", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "Failed starting server ".$this->id.". Storage-authentication timed out!", "", "", 0, 0, $this->resources);
-						sleep(2);
-						break;
-					}
-					sleep(1);
-					$wait_for_storage_auth_loop++;
-				} else {
-					// here we got the remove-auth-blocker message from the storage-auth hook
-					// now we can be sure that storage auth ran before rebooting the resource
-					$event->log("start", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Storage authentication for image ".$image->name." succeeded, assigning the resource now.", "", "", 0, 0, $this->resources);
-					break;
-				}
-			}
-		}
-	} else {
-		$event->log("start", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Starting without storage authentication for image ".$image->name.".", "", "", 0, 0, $this->resources);
-	}
-
-	// unset stoptime + update starttime + state
-	$now=$_SERVER['REQUEST_TIME'];
-	$appliance_fields = array();
-	$appliance_fields['appliance_stoptime']='';
-	$appliance_fields['appliance_starttime']=$now;
-	$appliance_fields['appliance_state']='active';
-	$this->update($this->id, $appliance_fields);
-
-	// start appliance hook
-	// fill in the rest of the appliance info in the array for the plugin hook
-	$appliance_fields["appliance_id"]=$this->id;
-	$appliance_fields["appliance_name"]=$this->name;
-	$appliance_fields["appliance_kernelid"]=$this->kernelid;
-	$appliance_fields["appliance_imageid"]=$this->imageid;
-	$appliance_fields["appliance_cpunumber"]=$this->cpunumber;
-	$appliance_fields["appliance_cpuspeed"]=$this->cpuspeed;
-	$appliance_fields["appliance_cpumodel"]=$this->cpumodel;
-	$appliance_fields["appliance_memtotal"]=$this->memtotal;
-	$appliance_fields["appliance_swaptotal"]=$this->swaptotal;
-	$appliance_fields["appliance_nics"]=$this->nics;
-	$appliance_fields["appliance_capabilities"]=$this->capabilities;
-	$appliance_fields["appliance_cluster"]=$this->cluster;
-	$appliance_fields["appliance_ssi"]=$this->ssi;
-	$appliance_fields["appliance_resources"]=$this->resources;
-	$appliance_fields["appliance_highavailable"]=$this->highavailable;
-	$appliance_fields["appliance_virtual"]=$this->virtual;
-	$appliance_fields["appliance_virtualization"]=$this->virtualization;
-	$appliance_fields["appliance_virtualization_host"]=$this->virtualization_host;
-	$appliance_fields["appliance_comment"]=$this->comment;
-	$appliance_fields["appliance_wizard"]=$this->wizard;
-	$appliance_fields["appliance_event"]=$this->event;
-	// start the hook
-	$plugin = new plugin();
-	$enabled_plugins = $plugin->enabled();
-	foreach ($enabled_plugins as $index => $plugin_name) {
-		$plugin_start_appliance_hook = "$RootDir/plugins/$plugin_name/openqrm-$plugin_name-appliance-hook.php";
-		if (file_exists($plugin_start_appliance_hook)) {
-			$event->log("start", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Found plugin $plugin_name handling start-appliance event.", "", "", 0, 0, $this->resources);
-			require_once "$plugin_start_appliance_hook";
-			$appliance_function="openqrm_"."$plugin_name"."_appliance";
-			$appliance_function=str_replace("-", "_", $appliance_function);
-			ob_start();
-			$appliance_function("start", $appliance_fields);
-			$start_error = ob_get_contents();
-			ob_end_clean();
-			if ($start_error !== '') {
-				$event->log("start", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "Plugin ".$plugin_name." caused ".$start_error, "", "", 0, 0, $this->resources);
-			}
-			$event->log("start", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Plugin ".$plugin_name." completed start-appliance event.", "", "", 0, 0, $this->resources);
-		}
-	}
-	// delay a bit to make sure all appliance hooks have been executed or at least arrived in the queue
-	sleep(2);
-	// reboot resource after the plugin start hook ran
-	$resource->get_instance_by_id($this->resources);
-	$resource->send_command("$resource->ip", "reboot");
-
-
-}
-
-
-// stops an appliance -> de-assigns it to idle
-function stop() {
-	global $event;
-	global $RootDir;
-	$resource = new resource();
-	$resource->get_instance_by_id($this->resources);
-	$resource->assign($resource->id, "1", "default", "1", "idle");
-
-	// update stoptime + state
-	$now=$_SERVER['REQUEST_TIME'];
-	$appliance_fields = array();
-	$appliance_fields['appliance_stoptime']=$now;
-	$appliance_fields['appliance_state']='stopped';
-	$this->update($this->id, $appliance_fields);
-
-	// update resource state to transition
-	$resource_fields=array();
-	$resource_fields["resource_state"]="transition";
-	$resource_fields["resource_event"]="reboot";
-	$resource->update_info($resource->id, $resource_fields);
-
-	// stop appliance hook
-	// fill in the rest of the appliance info in the array for the plugin hook
-	$appliance_fields["appliance_id"]=$this->id;
-	$appliance_fields["appliance_name"]=$this->name;
-	$appliance_fields["appliance_kernelid"]=$this->kernelid;
-	$appliance_fields["appliance_imageid"]=$this->imageid;
-	$appliance_fields["appliance_cpunumber"]=$this->cpunumber;
-	$appliance_fields["appliance_cpuspeed"]=$this->cpuspeed;
-	$appliance_fields["appliance_cpumodel"]=$this->cpumodel;
-	$appliance_fields["appliance_memtotal"]=$this->memtotal;
-	$appliance_fields["appliance_swaptotal"]=$this->swaptotal;
-	$appliance_fields["appliance_nics"]=$this->nics;
-	$appliance_fields["appliance_capabilities"]=$this->capabilities;
-	$appliance_fields["appliance_cluster"]=$this->cluster;
-	$appliance_fields["appliance_ssi"]=$this->ssi;
-	$appliance_fields["appliance_resources"]=$this->resources;
-	$appliance_fields["appliance_highavailable"]=$this->highavailable;
-	$appliance_fields["appliance_virtual"]=$this->virtual;
-	$appliance_fields["appliance_virtualization"]=$this->virtualization;
-	$appliance_fields["appliance_virtualization_host"]=$this->virtualization_host;
-	$appliance_fields["appliance_comment"]=$this->comment;
-	$appliance_fields["appliance_wizard"]=$this->wizard;
-	$appliance_fields["appliance_event"]=$this->event;
-
-	// stop the hook
-	$plugin = new plugin();
-	$enabled_plugins = $plugin->enabled();
-	foreach ($enabled_plugins as $index => $plugin_name) {
-		$plugin_stop_appliance_hook = "$RootDir/plugins/$plugin_name/openqrm-$plugin_name-appliance-hook.php";
-		if (file_exists($plugin_stop_appliance_hook)) {
-			$event->log("stop", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Found plugin $plugin_name handling stop-appliance event.", "", "", 0, 0, $this->resources);
-			require_once "$plugin_stop_appliance_hook";
-			$appliance_function="openqrm_"."$plugin_name"."_appliance";
-			$appliance_function=str_replace("-", "_", $appliance_function);
-			$appliance_function("stop", $appliance_fields);
-		}
-	}
-
-	// delay a bit to make sure all appliance hooks have been executed or at least arrived in the queue
-	sleep(2);
-	$resource->send_command("$resource->ip", "reboot");
-
-	// storage authentication hook
-	$image = new image();
-	$image->get_instance_by_id($this->imageid);
-	$deployment = new deployment();
-	$deployment->get_instance_by_type($image->type);
-	$deployment_type = $deployment->type;
-	$deployment_plugin_name = $deployment->storagetype;
-	$storage_auth_hook = "$RootDir/plugins/$deployment_plugin_name/openqrm-$deployment_type-auth-hook.php";
-	if (file_exists($storage_auth_hook)) {
-		$event->log("stop", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Found deployment type $deployment_type handling the stop auth hook.", "", "", 0, 0, $this->resources);
-		require_once "$storage_auth_hook";
-		storage_auth_function("stop", $this->id);
-	}
-	// set image to deactive
-	$image->set_active(0);
-
-
-}
-
-
-
-// returns appliance name by appliance_id
-function get_name($appliance_id) {
-	global $APPLIANCE_INFO_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	$appliance_set = $db->Execute("select appliance_name from $APPLIANCE_INFO_TABLE where appliance_id=$appliance_id");
-	if (!$appliance_set) {
-		$event->log("get_name", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "get_name: ".$db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		if (!$appliance_set->EOF) {
-			return $appliance_set->fields["appliance_name"];
-		} else {
-			return "idle";
-		}
-	}
-}
-
-// returns capabilities string by appliance_id
-function get_capabilities($appliance_id) {
-	global $APPLIANCE_INFO_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	$appliance_set = $db->Execute("select appliance_capabilities from $APPLIANCE_INFO_TABLE where appliance_id=$appliance_id");
-	if (!$appliance_set) {
-		$event->log("get_capabilities", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "get_capabilities: ".$db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		if ((!$appliance_set->EOF) && ($appliance_set->fields["appliance_capabilities"]!=""))  {
-			return $appliance_set->fields["appliance_capabilities"];
-		} else {
-			return "0";
-		}
-	}
-}
-
-
-
-// returns the number of appliances per virtualization type
-function get_count_per_virtualization($virtualization_id) {
-	global $APPLIANCE_INFO_TABLE;
-	$count=0;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select count(appliance_id) as num from $APPLIANCE_INFO_TABLE where appliance_virtualization='$virtualization_id'");
-	if (!$rs) {
-		print $db->ErrorMsg();
-	} else {
-		$count = $rs->fields["num"];
-	}
-	return $count;
-}
-
-
-// returns the number of all appliances
-function get_count() {
-	global $APPLIANCE_INFO_TABLE;
-	$count=0;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select count(appliance_id) as num from $APPLIANCE_INFO_TABLE");
-	if (!$rs) {
-		print $db->ErrorMsg();
-	} else {
-		$count = $rs->fields["num"];
-	}
-	return $count;
-}
-
-
-// returns the number of active appliances
-function get_count_active() {
-	global $APPLIANCE_INFO_TABLE;
-	$count=0;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select count(appliance_id) as num from ".$APPLIANCE_INFO_TABLE." where appliance_state='active' or appliance_resources=0");
-	if (!$rs) {
-		print $db->ErrorMsg();
-	} else {
-		$count = $rs->fields["num"];
-	}
-	return $count;
-}
-
-
-// returns a list of all appliance names
-function get_list() {
-	global $APPLIANCE_INFO_TABLE;
-	$query = "select appliance_id, appliance_name from $APPLIANCE_INFO_TABLE";
-	$appliance_name_array = array();
-	$appliance_name_array = openqrm_db_get_result_double ($query);
-	return $appliance_name_array;
-}
-
-
-// returns a list of all appliance ids
-function get_all_ids() {
-	global $APPLIANCE_INFO_TABLE;
-	global $event;
-	$appliance_list = array();
-	$query = "select appliance_id from $APPLIANCE_INFO_TABLE";
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute($query);
-	if (!$rs)
-		$event->log("get_list", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "get_all_ids: ".$db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	while (!$rs->EOF) {
-		$appliance_list[] = $rs->fields;
-		$rs->MoveNext();
-	}
-	return $appliance_list;
-}
-
-
-
-// returns a list of all appliance ids used by a specific resource
-function get_ids_per_resource($resource_id) {
-	global $APPLIANCE_INFO_TABLE;
-	global $event;
-	$appliance_list = array();
-	$query = "select appliance_id from ".$APPLIANCE_INFO_TABLE." where appliance_resources=".$resource_id;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute($query);
-	if (!$rs)
-		//$event->log("get_ids_per_resource", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "get_ids_per_resource: ".$db->ErrorMsg(), "", "", 0, 0, 0);
-		$rs = 0;
-	else
-	while (!$rs->EOF) {
-		$appliance_list[] = $rs->fields;
-		$rs->MoveNext();
-	}
-	return $appliance_list;
-}
-
-// returns a list of all appliance ids used by a specific image
-function get_ids_per_image($image_id) {
-	global $APPLIANCE_INFO_TABLE;
-	global $event;
-	if ($image_id == "") {
-		return;
-	}
-	$appliance_list = array();
-	$query = "select appliance_id from ".$APPLIANCE_INFO_TABLE." where appliance_imageid=".$image_id;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute($query);
-	if (!$rs) {
-		$event->log("get_ids_per_image", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "get_ids_per_image: ".$db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		while (!$rs->EOF) {
-			$appliance_list[] = $rs->fields;
-			$rs->MoveNext();
-		}
-	}
-	return $appliance_list;
-}
-
-
-// returns a list of all appliance ids of a specific virtualization type
-function get_ids_per_virtualization($virtualization_id) {
-	global $APPLIANCE_INFO_TABLE;
-	global $event;
-	$appliance_list = array();
-	$query = "select appliance_id from ".$APPLIANCE_INFO_TABLE." where appliance_virtualization='$virtualization_id'";
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute($query);
-	if (!$rs)
-		//$event->log("get_ids_per_virtualization", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "get_ids_per_resource: ".$db->ErrorMsg(), "", "", 0, 0, 0);
-		$rs = 0;
-	else
-	while (!$rs->EOF) {
-		$appliance_list[] = $rs->fields;
-		$rs->MoveNext();
-	}
-	return $appliance_list;
-}
-
-
-// find a resource fitting to the appliance
-function find_resource($appliance_virtualization) {
-	global $event;
-	$found_new_resource=0;
-	$virtualization = new virtualization();
-	$virtualization->get_instance_by_id($appliance_virtualization);
-	$event->log("find_resource", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Trying to find a new resource type $virtualization->name for appliance $this->name .", "", "", 0, 0, 0);
-	// we are searching for physical systems when we want to deploy a virtualization host
-	if (strstr($virtualization->name, "Host")) {
-		$appliance_virtualization=1;
-	}
-	$resource_tmp = new resource();
-	$resource_list = array();
-	$resource_list = $resource_tmp->get_list();
-	$resource = new resource();
-	$appliance = new appliance();
-	foreach ($resource_list as $index => $resource_db) {
-		$resource->get_instance_by_id($resource_db["resource_id"]);
-		if (($resource->id > 0) && ("$resource->imageid" == "1") && ("$resource->state" == "active")) {
-			$used_by = $appliance->get_ids_per_resource($resource->id);
-			if ($used_by) {
-				continue;
-			}			
-			$new_resource_id = $resource->id;
-			// check resource-type
-			$restype_id = $resource->vtype;
-			if ($restype_id == $appliance_virtualization) {
-				// check the rest of the required parameters for the appliance
-
-				// cpu-number
-				if ((strlen($this->cpunumber)) && (strcmp($this->cpunumber, "0"))) {
-					if (strcmp($this->cpunumber, $resource->cpunumber)) {
-						$event->log("find_resource", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Found new resource $resource->id type $virtualization->name for appliance $this->name but it has the wrong CPU-number, skipping.", "", "", 0, 0, 0);
-						continue;
-					}
-				}
-				// cpu-speed
-				if ((strlen($this->cpuspeed)) && (strcmp($this->cpuspeed, "0"))) {
-					if (strcmp($this->cpuspeed, $resource->cpuspeed)) {
-						$event->log("find_resource", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Found new resource $resource->id type $virtualization->name for appliance $this->name but it has the wrong CPU-speed, skipping.", "", "", 0, 0, 0);
-						continue;
-					}
-				}
-				// cpu-model
-				if ((strlen($this->cpumodel)) && (strcmp($this->cpumodel, "0"))) {
-					if (strcmp($this->cpumodel, $resource->cpumodel)) {
-						$event->log("find_resource", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Found new resource $resource->id type $virtualization->name for appliance $this->name but it has the wrong CPU-model, skipping.", "", "", 0, 0, 0);
-						continue;
-					}
-				}
-				// memtotal
-				if ((strlen($this->memtotal)) && (strcmp($this->memtotal, "0"))) {
-					if (strcmp($this->memtotal, $resource->memtotal)) {
-						$event->log("find_resource", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Found new resource $resource->id type $virtualization->name for appliance $this->name but it has the wrong amount of Memory, skipping.", "", "", 0, 0, 0);
-						continue;
-					}
-				}
-				// swaptotal
-				if ((strlen($this->swaptotal)) && (strcmp($this->swaptotal, "0"))) {
-					if (strcmp($this->swaptotal, $resource->swaptotal)) {
-						$event->log("find_resource", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Found new resource $resource->id type $virtualization->name for appliance $this->name but it has the wrong amount of Swap, skipping.", "", "", 0, 0, 0);
-						continue;
-					}
-				}
-				// nics
-				if ((strlen($this->nics)) && (strcmp($this->nics, "0"))) {
-					if (strcmp($this->nics, $resource->nics)) {
-						$event->log("find_resource", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Found new resource $resource->id type $virtualization->name for appliance $this->name but it has the wrong nic count, skipping.", "", "", 0, 0, 0);
-						continue;
-					}
-				}
-
-				$found_new_resource=1;
-				$event->log("find_resource", $_SERVER['REQUEST_TIME'], 5, "appliance.class.php", "Found new resource $resource->id type $virtualization->name for appliance $this->name .", "", "", 0, 0, 0);
-				break;
-			}
-		}
-	}
-	// in case no resources are available log another ha-error event !
-	if ($found_new_resource == 0) {
-		$event->log("find_resource", $_SERVER['REQUEST_TIME'], 4, "appliance.class.php", "Could not find a free resource type $virtualization->name for appliance $this->name !", "", "", 0, 0, 0);
-		return $this;
-	}
-
-	// if we find an resource which fits to the appliance we update it
-	$appliance_fields = array();
-	$appliance_fields['appliance_resources'] = $new_resource_id;
-	$this->update($this->id, $appliance_fields);
-
-	return $this;
-}
-
-
-
-
-// displays the appliance-overview per type
-function display_overview_per_virtualization($virtualization_id, $offset, $limit, $sort, $order) {
-	global $APPLIANCE_INFO_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	$recordSet = $db->SelectLimit("select * from $APPLIANCE_INFO_TABLE where appliance_virtualization='$virtualization_id' order by $sort $order", $limit, $offset);
-	$appliance_array = array();
-	if (!$recordSet) {
-		$event->log("display_overview_per_virtualization", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "display_overview_per_virtualization: ".$db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		while (!$recordSet->EOF) {
-			array_push($appliance_array, $recordSet->fields);
-			$recordSet->MoveNext();
-		}
-		$recordSet->Close();
-	}
-	return $appliance_array;
-}
-
-
-
-// displays the appliance-overview
-function display_overview($offset, $limit, $sort, $order) {
-	global $APPLIANCE_INFO_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	$recordSet = $db->SelectLimit("select * from $APPLIANCE_INFO_TABLE order by $sort $order", $limit, $offset);
-	$appliance_array = array();
-	if (!$recordSet) {
-		$event->log("display_overview", $_SERVER['REQUEST_TIME'], 2, "appliance.class.php", "display_overview: ".$db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		while (!$recordSet->EOF) {
-			array_push($appliance_array, $recordSet->fields);
-			$recordSet->MoveNext();
-		}
-		$recordSet->Close();
-	}
-	return $appliance_array;
-}
-
-
-
-
-
-// ---------------------------------------------------------------------------------
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/web/base/class/authblocker.class.php b/openQRM-5.3.50-CE/src/web/base/class/authblocker.class.php
deleted file mode 100644
index 230b1fb..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/authblocker.class.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// This class represents a auth-blocker object in openQRM
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/kernel.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-
-$AUTH_BLOCKER_TABLE="auth_blocker_info";
-global $AUTH_BLOCKER_TABLE;
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-$event = new event();
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $event;
-
-
-class authblocker {
-
-var $id = '';
-var $image_id = '';
-var $image_name = '';
-var $start_time = '';
-
-	//--------------------------------------------------
-	/**
-	* Constructor
-	*/
-	//--------------------------------------------------
-	function authblocker() {
-		$this->init();
-	}
-
-	//--------------------------------------------------
-	/**
-	* init storage environment
-	* @access public
-	*/
-	//--------------------------------------------------
-	function init() {
-		global $AUTH_BLOCKER_TABLE, $OPENQRM_SERVER_BASE_DIR;
-		$this->_event = new event();
-		$this->_db_table = "auth_blocker_info";
-		$this->_base_dir = $OPENQRM_SERVER_BASE_DIR;
-	}
-
-// ---------------------------------------------------------------------------------
-// methods to create an instance of a authblocker object filled from the db
-// ---------------------------------------------------------------------------------
-
-// returns an appliance from the db selected by id or name
-function get_instance($id, $image_id, $image_name) {
-	global $AUTH_BLOCKER_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	if ("$id" != "") {
-		$authblocker_array = $db->Execute("select * from ".$this->_db_table." where ab_id=$id");
-	} else if ("$image_id" != "") {
-		$authblocker_array = $db->Execute("select * from ".$this->_db_table." where ab_image_id=$image_id");
-	} else if ("$image_name" != "") {
-		$authblocker_array = $db->Execute("select * from ".$this->_db_table." where ab_image_name='$image_name'");
-	} else {
-		$event->log("get_instance", $_SERVER['REQUEST_TIME'], 2, "authblocker.class.php", "Could not create instance of authblocker without data", "", "", 0, 0, 0);
-		array_walk(debug_backtrace(),create_function('$a,$b','syslog(LOG_ERR, "{$a[\'function\']}()(".basename($a[\'file\']).":{$a[\'line\']}); ");'));
-		return;
-	}
-
-	foreach ($authblocker_array as $index => $authblocker) {
-		$this->id = $authblocker["ab_id"];
-		$this->image_id = $authblocker["ab_image_id"];
-		$this->image_name = $authblocker["ab_image_name"];
-		$this->start_time = $authblocker["ab_start_time"];
-	}
-	return $this;
-}
-
-
-// returns an authblocker from the db selected by id
-function get_instance_by_id($id) {
-	$this->get_instance($id, "", "");
-	return $this;
-}
-
-// returns an authblocker from the db selected by the image-id
-function get_instance_by_image_id($image_id) {
-	$this->get_instance("", $image_id, "");
-	return $this;
-}
-
-// returns an authblocker by image-name
-function get_instance_by_image_name($image_name) {
-	$this->get_instance("", "", $image_name);
-	return $this;
-}
-
-
-// ---------------------------------------------------------------------------------
-// general authblocker methods
-// ---------------------------------------------------------------------------------
-
-
-
-
-// checks if given authblocker id is free in the db
-function is_id_free($authblocker_id) {
-	global $AUTH_BLOCKER_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select ab_id from ".$this->_db_table." where ab_id=$authblocker_id");
-	if (!$rs)
-		$event->log("is_id_free", $_SERVER['REQUEST_TIME'], 2, "authblocker.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	if ($rs->EOF) {
-		return true;
-	} else {
-		return false;
-	}
-}
-
-
-// adds authblocker to the database
-function add($authblocker_fields) {
-	global $AUTH_BLOCKER_TABLE;
-	global $event;
-	if (!is_array($authblocker_fields)) {
-		$event->log("add", $_SERVER['REQUEST_TIME'], 2, "authblocker.class.php", "authblocker_field not well defined", "", "", 0, 0, 0);
-		return 1;
-	}
-	// set stop time and status to now
-	$now=$_SERVER['REQUEST_TIME'];
-	$db=openqrm_get_db_connection();
-	$result = $db->AutoExecute($this->_db_table, $authblocker_fields, 'INSERT');
-	if (! $result) {
-		$event->log("add", $_SERVER['REQUEST_TIME'], 2, "authblocker.class.php", "Failed adding new authblocker to database", "", "", 0, 0, 0);
-	}
-}
-
-
-
-// removes authblocker from the database
-function remove($authblocker_id) {
-	global $AUTH_BLOCKER_TABLE;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("delete from ".$this->_db_table." where ab_id=$authblocker_id");
-}
-
-
-// updates a authblocker
-function update($ab_id, $ab_fields) {
-	global $AUTH_BLOCKER_TABLE;
-	global $event;
-	if ($ab_id < 0 || ! is_array($ab_fields)) {
-		$this->_event->log("update", $_SERVER['REQUEST_TIME'], 2, "authblocker.class.php", "Unable to update authblocker $ab_id", "", "", 0, 0, 0);
-		return 1;
-	}
-	$db=openqrm_get_db_connection();
-	unset($ab_fields["ab_id"]);
-	$result = $db->AutoExecute($this->_db_table, $ab_fields, 'UPDATE', "ab_id = $ab_id");
-	if (! $result) {
-		$this->_event->log("update", $_SERVER['REQUEST_TIME'], 2, "authblocker.class.php", "Failed updating authblocker $ab_id", "", "", 0, 0, 0);
-	}
-}
-
-
-
-// returns the number of authblockers for an authblocker type
-function get_count() {
-	global $AUTH_BLOCKER_TABLE;
-	$count=0;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select count(ab_id) as num from ".$this->_db_table);
-	if (!$rs) {
-		print $db->ErrorMsg();
-	} else {
-		$count = $rs->fields["num"];
-	}
-	return $count;
-}
-
-
-
-// returns a list of all authblocker ids
-function get_all_ids() {
-	global $AUTH_BLOCKER_TABLE;
-	global $event;
-	$authblocker_list = array();
-	$query = "select ab_id from ".$this->_db_table;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute($query);
-	if (!$rs)
-		$event->log("get_list", $_SERVER['REQUEST_TIME'], 2, "authblocker.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	while (!$rs->EOF) {
-		$authblocker_list[] = $rs->fields;
-		$rs->MoveNext();
-	}
-	return $authblocker_list;
-
-}
-
-
-
-
-// ---------------------------------------------------------------------------------
-
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/web/base/class/db.class.php b/openQRM-5.3.50-CE/src/web/base/class/db.class.php
deleted file mode 100644
index 00df0ca..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/db.class.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * db Class
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class db
-{
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 */
-	//--------------------------------------------
-	function __construct($openqrm) {
-		$this->openqrm = $openqrm;
-		if (file_exists('/usr/share/php/adodb/adodb.inc.php')) {
-			require_once('/usr/share/php/adodb/adodb.inc.php');
-		} 
-		else if (file_exists($this->openqrm->get('basedir').'/include/adodb/adodb.inc.php')) {
-			require_once($this->openqrm->get('basedir').'/include/adodb/adodb.inc.php');
-		}
-		else if (file_exists('/usr/share/adodb/adodb.inc.php')) {
-			require_once('/usr/share/adodb/adodb.inc.php');
-		} else {
-			echo 'ERROR: Could not find adodb on this system!';
-		}
-		if (!defined("ADODB_ASSOC_CASE")) {
-			define('ADODB_ASSOC_CASE',0);
-		}
-		if ($this->openqrm->get('config', 'ORACLE_HOME'))  {
-			putenv('LD_LIBRARY_PATH='.$this->openqrm->get('config', 'LD_LIBRARY_PATH'));
-			putenv('ORACLE_HOME='.$this->openqrm->get('config', 'ORACLE_HOME'));
-			putenv('TNS_ADMIN='.$this->openqrm->get('config', 'TNS_ADMIN'));
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Connect to database
-	 *
-	 * @access public
-	 * @return dbobject
-	 */
-	//--------------------------------------------
-	function connect() {
-		if ($this->openqrm->get('config', 'DATABASE_TYPE') === "db2") {
-			$db = &ADONewConnection('odbc');
-			$db->PConnect(
-					$this->openqrm->get('config', 'DATABASE_NAME'),
-					$this->openqrm->get('config', 'DATABASE_USER'),
-					$this->openqrm->get('config', 'DATABASE_PASSWORD')
-				);
-			$db->SetFetchMode(ADODB_FETCH_ASSOC);
-			return $db;
-		} else if ($this->openqrm->get('config', 'DATABASE_TYPE') === "oracle") {
-			$db = NewADOConnection("oci8po");
-			$db->Connect(
-					$this->openqrm->get('config', 'DATABASE_NAME'),
-					$this->openqrm->get('config', 'DATABASE_USER'),
-					$this->openqrm->get('config', 'DATABASE_PASSWORD')
-				);
-		} else {
-			if (strlen($this->openqrm->get('config', 'DATABASE_PASSWORD'))) {
-				$dsn  = $this->openqrm->get('config', 'DATABASE_TYPE').'://';
-				$dsn .= $this->openqrm->get('config', 'DATABASE_USER').':';
-				$dsn .= $this->openqrm->get('config', 'DATABASE_PASSWORD').'@';
-				$dsn .= $this->openqrm->get('config', 'DATABASE_SERVER').'/';
-				$dsn .= $this->openqrm->get('config', 'DATABASE_NAME').'?persist';
-			} else {
-				$dsn  = $this->openqrm->get('config', 'DATABASE_TYPE').'://';
-				$dsn .= $this->openqrm->get('config', 'DATABASE_USER').'@';
-				$dsn .= $this->openqrm->get('config', 'DATABASE_SERVER').'/';
-				$dsn .= $this->openqrm->get('config', 'DATABASE_NAME').'?persist';
-			}
-			$db = &ADONewConnection($dsn);
-		}
-		$db->SetFetchMode(ADODB_FETCH_ASSOC);
-		return $db;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get a free id from a table
-	 *
-	 * @access public
-	 * @param string $fieldname
-	 * @param string $tablename
-	 * @return int
-	 */
-	//--------------------------------------------
-	function get_free_id($fieldname, $tablename) {
-		$db = $this->connect();
-		$recordSet = $db->Execute("select $fieldname from $tablename");
-		if (!$recordSet) {
-			print $db->ErrorMsg();
-			$db->Close();
-			exit(0);
-		} else {
-			$ids = array();
-			while ($arr = $recordSet->FetchRow()) {
-				foreach($arr as $val) {
-					$ids[] = $val;
-				}
-			}
-			$i = 1;
-			while($i > 0) {
-				if(in_array($i, $ids) == false) {
-					$db->Close();
-					return $i;
-					break;
-				}
-				$i++;
-			}
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/deployment.class.php b/openQRM-5.3.50-CE/src/web/base/class/deployment.class.php
deleted file mode 100644
index 7d74166..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/deployment.class.php
+++ /dev/null
@@ -1,435 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-	$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-	require_once "$RootDir/include/openqrm-database-functions.php";
-	require_once "$RootDir/class/event.class.php";
-
-/**
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- * @author M. Rechenburg, A. Kuballa
- * @version 1.1 added documentation
- */
-class deployment
-{
-
-/**
-* deployment id
-* @access protected
-* @var int
-*/
-var $id = '';
-/**
-* deployment name
-* @access protected
-* @var string
-*/
-var $name = '';
-/**
-* deployment type
-* @access protected
-* @var string
-*/
-var $type = '';
-/**
-* deployment description
-* @access protected
-* @var string
-*/
-var $description = '';
-/**
-* deployment storagetype
-* @access protected
-* @var string
-*/
-var $storagetype = '';
-/**
-* deployment storagedescription
-* @access protected
-* @var string
-*/
-var $storagedescription = '';
-/**
-* deployment mapping
-* @access protected
-* @var string
-*/
-var $mapping = '';
-
-/**
-* name of database table
-* @access protected
-* @var string
-*/
-var $_db_table;
-/**
-* event object
-* @access protected
-* @var object
-*/
-var $_event;
-
-
-	//--------------------------------------------------
-	/**
-	* Constructor
-	*/
-	//--------------------------------------------------
-	function deployment() {
-		$this->init();
-	}
-
-	//--------------------------------------------------
-	/**
-	* init deployment environment
-	* @access public
-	*/
-	//--------------------------------------------------
-	function init() {
-		global $DEPLOYMENT_INFO_TABLE;
-		$this->_db_table = $DEPLOYMENT_INFO_TABLE;
-		$this->_event = new event();
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an instance of a deployment object from db
-	* @access public
-	* @param int $id
-	* @param string $name
-	* @param string $type
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance($id, $name, $type) {
-		$db=openqrm_get_db_connection();
-		if ("$id" != "") {
-			$deployment_array = $db->Execute("select * from $this->_db_table where deployment_id=$id");
-		} else if ("$name" != "") {
-			$deployment_array = $db->Execute("select * from $this->_db_table where deployment_name='$name'");
-		} else if ("$type" != "") {
-			$deployment_array = $db->Execute("select * from $this->_db_table where deployment_type='$type'");
-		} else {
-			$error = '';
-			foreach(debug_backtrace() as $key => $msg) {
-				if($key === 1) {
-					$error .= '( '.basename($msg['file']).' '.$msg['line'].' )';
-				}
-				syslog(LOG_ERR, $msg['function'].'() '.basename($msg['file']).':'.$msg['line']);
-			}
-			$this->_event->log("get_instance", $_SERVER['REQUEST_TIME'], 2, "deployment.class.php", "Could not create instance of deployment without data ".$error, "", "", 0, 0, 0);
-			return;
-		}
-		foreach ($deployment_array as $index => $deployment) {
-			$this->id = $deployment["deployment_id"];
-			$this->name = $deployment["deployment_name"];
-			$this->type = $deployment["deployment_type"];
-			$this->description = $deployment["deployment_description"];
-			$this->storagetype = $deployment["deployment_storagetype"];
-			$this->storagedescription = $deployment["deployment_storagedescription"];
-			$this->mapping = $deployment["deployment_mapping"];
-		}
-		return $this;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an instance of a deployment object by id
-	* @access public
-	* @param int $id
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance_by_id($id) {
-		$this->get_instance($id, "", "");
-		return $this;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an instance of a deployment object by name
-	* @access public
-	* @param string $name
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance_by_name($name) {
-		$this->get_instance("", $name, "");
-		return $this;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an instance of a deployment object by type
-	* @access public
-	* @param string $type
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance_by_type($type) {
-		$this->get_instance("", "", $type);
-		return $this;
-	}
-
-	//--------------------------------------------------
-	/**
-	* add a deployment
-	* <code>
-	* $fields = array();
-	* $fields['deployment_name'] = 'somename';
-	* $fields['deployment_type'] = 'sometext';
-	* $fields['deployment_description'] = 'sometext';
-	* $fields['deployment_storagetype'] = 'sometext';
-	* $fields['deployment_storagedescription'] = 'sometext';
-	* $fields['deployment_mapping'] = 'sometext';
-	* $deployment = new deployment();
-	* $deployment->add($fields);
-	* </code>
-	* @access public
-	* @param array $deployment_fields
-	* @return bool
-	*/
-	//--------------------------------------------------
-	function add($deployment_fields) {
-		if (!is_array($deployment_fields)) {
-			$this->_event->log("add", $_SERVER['REQUEST_TIME'], 2, "deployment.class.php", "Deployment_field not well defined", "", "", 0, 0, 0);
-			return 1;
-		}
-		$db=openqrm_get_db_connection();
-		$result = $db->AutoExecute($this->_db_table, $deployment_fields, 'INSERT');
-		if (! $result) {
-			$this->_event->log("add", $_SERVER['REQUEST_TIME'], 2, "deployment.class.php", "Failed adding new deployment to database", "", "", 0, 0, 0);
-		}
-	}
-
-	//--------------------------------------------------
-	/**
-	* remove deployment by id
-	* @access public
-	* @param int $deployment_id
-	*/
-	//--------------------------------------------------
-	function remove($deployment_id) {
-		// do not remove the ram disk deployment
-		if ($deployment_id == 1) {
-			return;
-		}
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from $this->_db_table where deployment_id=$deployment_id");
-	}
-
-	//--------------------------------------------------
-	/**
-	* remove deployment by deployment_type
-	* @access public
-	* @param int $deployment_id
-	*/
-	//--------------------------------------------------
-	function remove_by_type($type) {
-		// do not remove the ram disk deployment
-		if ($type == "ram") {
-			return;
-		}
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from $this->_db_table where deployment_type='$type'");
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of all deployment ids
-	* <code>
-	* $image = new deployment();
-	* $arr = deployment->get_ids();
-	* // $arr['value']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_deployment_ids() {
-		$deployment_array = array();
-		$query = "select deployment_id from $this->_db_table";
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute($query);
-		if (!$rs)
-			$event->log("get_deployment_ids", $_SERVER['REQUEST_TIME'], 2, "deployment.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		else
-		while (!$rs->EOF) {
-			$deployment_array[] = $rs->fields;
-			$rs->MoveNext();
-		}
-		return $deployment_array;
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of all deployment names
-	* <code>
-	* $deployment = new deployment();
-	* $arr = $deployment->get_list();
-	* // $arr[0]['value']
-	* // $arr[0]['label']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_list() {
-		$query = "select deployment_id, deployment_name from $this->_db_table";
-		$deployment_name_array = array();
-		$deployment_name_array = openqrm_db_get_result_double ($query);
-		return $deployment_name_array;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an array of all deployment descriptions
-	* <code>
-	* $deployment = new deployment();
-	* $arr = $deployment->get_description_list();
-	* // $arr[0]['value']
-	* // $arr[0]['label']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_description_list() {
-		$query = "select deployment_id, deployment_description from $this->_db_table";
-		$deployment_name_array = array();
-		$deployment_name_array = openqrm_db_get_result_double ($query);
-		return $deployment_name_array;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an array of all deployment storage descriptions
-	* <code>
-	* $deployment = new deployment();
-	* $arr = $deployment->get_storagedescription_list();
-	* // $arr[0]['value']
-	* // $arr[0]['label']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_storagedescription_list() {
-		$query = "select deployment_id, deployment_storagedescription from $this->_db_table";
-		$deployment_name_array = array();
-		$deployment_name_array = openqrm_db_get_result_double ($query);
-		return $deployment_name_array;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an array of all deployment storagetypes
-	* <code>
-	* $deployment = new deployment();
-	* $arr = $deployment->get_storagetype_list();
-	* // $arr[0]['value']
-	* // $arr[0]['label']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_storagetype_list() {
-		$query = "select deployment_id, deployment_storagetype from $this->_db_table";
-		$ar_Return = array();
-		$ar_tmp = array();
-		$ar_result = openqrm_db_get_result_double ($query);
-
-		foreach($ar_result as $val) {
-			if($val['label'] != 'none') {
-				$ar_tmp[] = $val['label'];
-			}
-		}
-		$ar_tmp = array_unique($ar_tmp);
-
-		foreach($ar_tmp as $val) {
-			$ar_Return[] = array('label' => $val, 'value' => $val);
-		}
-
-		return $ar_Return;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get id by deployment storagetype
-	* <code>
-	* $deployment = new deployment();
-	* $arr = $deployment->get_id_by_storagetype();
-	* // $arr['value']
-	* // $arr['label']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_id_by_storagetype($type) {
-		$query = "select deployment_id, deployment_name from ".$this->_db_table." where deployment_storagetype='".$type."'";
-		$ar_Return = array();
-		$ar_Return = openqrm_db_get_result_double($query);
-		return $ar_Return;
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* parse deployment parameters
-	* <code>
-	* $deployment = new deployment();
-	* $id = $deployment->parse_deployment_parameter("id", $paramstr);
-	* $ip = $deployment->parse_deployment_parameter("ip", $paramstr);
-	* $path = $deployment->parse_deployment_parameter("path", $paramstr);
-	* </code>
-	* @access public
-	* @return string
-	*/
-	//--------------------------------------------------
-	function parse_deployment_parameter($key, $paramstr) {
-		$ip1=trim($paramstr);
-		$ipos=strpos($ip1, ':');
-		$ip_storage_id=substr($ip1, 0, $ipos);
-		$ipr=substr($ip1, $ipos+1);
-		$ipos1=strpos($ipr, ':');
-		$ip_storage_ip=substr($ipr, 0, $ipos1);
-		$ip_image_rootdevice=substr($ipr, $ipos1+1);
-		switch ($key) {
-			case "id":
-				return $ip_storage_id;
-				break;
-			case "ip":
-				return $ip_storage_ip;
-				break;
-			case "path":
-				return $ip_image_rootdevice;
-				break;
-		}
-	}
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/event.class.php b/openQRM-5.3.50-CE/src/web/base/class/event.class.php
deleted file mode 100644
index ff55cee..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/event.class.php
+++ /dev/null
@@ -1,572 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/plugin.class.php";
-
-
-/**
- * This class represents an event in the openQRM engine
- *
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- * @author M. Rechenburg, A. Kuballa
- * @version 1.1 added documentation
- * @copyright Copyright 2011, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-class event
-{
-
-/**
-* event id
-* @access protected
-* @var int
-*/
-var $id = '';
-/**
-* event name
-* @access protected
-* @var string
-*/
-var $name = '';
-/**
-* event date
-* @access protected
-* @var date
-*/
-var $time = '';
-/**
-* event priority
-* @access protected
-* @var int
-*/
-var $priority = '';
-/**
-* event source
-* @access protected
-* @var string
-*/
-var $source = '';
-/**
-* event description
-* @access protected
-* @var string
-*/
-var $description = '';
-/**
-* event comment
-* @access protected
-* @var string
-*/
-var $comment = '';
-/**
-* event description
-* @access protected
-* @var string
-*/
-var $capabilities = '';
-/**
-* event status (acknowledged etc.)
-* @access protected
-* @var string
-*/
-var $status = '';
-/**
-* event image id
-* @access protected
-* @var int
-*/
-var $image_id = '';
-/**
-* event resource id
-* @access protected
-* @var int
-*/
-var $resource_id = '';
-
-/**
-* name of database table
-* @access protected
-* @var string
-*/
-var $_db_table;
-
-/** thanks for the patch by tvs
-* Time of running cron.daily
-*/
-var $crondaily_time = '943939500';
-
-	//--------------------------------------------------
-	/**
-	* Constructor
-	*/
-	//--------------------------------------------------
-	function event() {
-		$this->init();
-	}
-
-	//--------------------------------------------------
-	/**
-	* init event environment
-	* @access public
-	*/
-	//--------------------------------------------------
-	function init() {
-		global $EVENT_INFO_TABLE;
-		// priorities :
-		if(defined('LOG_EMERG') == false) { define("LOG_EMERG", 0); }
-		if(defined('LOG_ALERT') == false) { define("LOG_ALERT", 1); }
-		if(defined('LOG_CRIT') == false) { define("LOG_CRIT", 2); }
-		if(defined('LOG_ERR') == false) { define("LOG_ERR", 3); }
-		if(defined('LOG_WARNING') == false) { define("LOG_WARNING", 4); }
-		if(defined('LOG_NOTICE') == false) { define("LOG_NOTICE", 5); }
-		if(defined('LOG_INFO') == false) { define("LOG_INFO", 6); }
-		if(defined('LOG_DEBUG') == false) { define("LOG_DEBUG", 7); }
-		$this->_db_table = $EVENT_INFO_TABLE;
-		$this->RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an instance of an event object from db
-	* @access public
-	* @param int $id
-	* @param string $name
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance($id, $name) {
-		$db=openqrm_get_db_connection();
-		if ("$id" != "") {
-			$event_array = $db->Execute("select * from $this->_db_table where event_id=$id");
-		} else if ("$name" != "") {
-			$event_array = $db->Execute("select * from $this->_db_table where event_name='$name'");
-		} else {
-			$this->log("get_instance", $_SERVER['REQUEST_TIME'], 2, "event.class.php", "Could not create instance of event without data", "", "", 0, 0, 0);
-			array_walk(debug_backtrace(),create_function('$a,$b','syslog(LOG_ERR, "{$a[\'function\']}()(".basename($a[\'file\']).":{$a[\'line\']}); ");'));
-			return;
-		}
-		foreach ($event_array as $index => $event) {
-			$this->id = $event["event_id"];
-			$this->name = $event["event_name"];
-			$this->time = $event["event_time"];
-			$this->priority = $event["event_priority"];
-			$this->source = $event["event_source"];
-			$this->description = $event["event_description"];
-			$this->comment = $event["event_comment"];
-			$this->capabilities = $event["event_capabilities"];
-			$this->status = $event["event_status"];
-			$this->image_id = $event["event_image_id"];
-			$this->resource_id = $event["event_resource_id"];
-		}
-		return $this;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an event object by id
-	* @access public
-	* @param int $id
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance_by_id($id) {
-		$this->get_instance($id, "");
-		return $this;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an event object by name
-	* @access public
-	* @param string $name
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance_by_name($name) {
-		$this->get_instance("", $name);
-		return $this;
-	}
-
-	//--------------------------------------------------
-	/**
-	* add a new event
-	* @access public
-	* @param array $event_fields
-	*/
-	//--------------------------------------------------
-	function add($event_fields) {
-		if (!is_array($event_fields)) {
-			$this->log("add", $_SERVER['REQUEST_TIME'], 2, "event.class.php", "Event_field not well defined", "", "", 0, 0, 0);
-			return 1;
-		}
-		$db=openqrm_get_db_connection();
-		$result = $db->AutoExecute($this->_db_table, $event_fields, 'INSERT');
-		// patch by tvs
-		if (! $result) {
-			if ((strncmp(strftime("%X", $this->crondaily_time), strftime("%X", $event_fields["event_time"]), 5))!=0) {
-				// try again
-				sleep(1);
-				$result = $db->AutoExecute($this->_db_table, $event_fields, 'INSERT');
-			}
-		}
-	}
-
-	//--------------------------------------------------
-	/**
-	* update an event
-	* <code>
-	* $fields = array();
-	* $fields['event_name'] = 'somename';
-	* $fields['event_time'] = time();
-	* $fields['event_priority'] = 5;
-	* $fields['event_source'] = 'kernel-action';
-	* $fields['event_comment'] = 'some comment';
-	* $fields['event_description'] = 'some description';
-	* $fields['event_capabilities'] = 'sometext';
-	* $fields['event_status'] = 1;
-	* $fields['event_image_id'] = 1;
-	* $fields['event_resource_id'] = 1;
-	* $event = new event();
-	* $event->update(1, $fields);
-	* </code>
-	* @access public
-	* @param int $event_id
-	* @param array $event_fields
-	* @return bool
-	*/
-	//--------------------------------------------------e
-	function update($event_id, $event_fields) {
-		if ($event_id < 0 || ! is_array($event_fields)) {
-			$this->log("update", $_SERVER['REQUEST_TIME'], 2, "event.class.php", "Unable to update event $event_id", "", "", 0, 0, 0);
-			return 1;
-		}
-		$db=openqrm_get_db_connection();
-		unset($event_fields["event_id"]);
-		$result = $db->AutoExecute($this->_db_table, $event_fields, 'UPDATE', "event_id = $event_id");
-		if (! $result) {
-			$this->log("update", $_SERVER['REQUEST_TIME'], 2, "event.class.php", "Failed updating event $event_id", "", "", 0, 0, 0);
-		}
-	}
-
-	//--------------------------------------------------
-	/**
-	* add a new event to db and syslog
-	* @access public
-	* @param string $name
-	* @param date $time unixtimestamp
-	* @param int $priority
-	* @param string $source
-	* @param string $description
-	* @param string $comment
-	* @param string $capabilities
-	* @param int $status
-	* @param int $image_id
-	* @param int $resource_id
-	*/
-	//--------------------------------------------------
-	function log($name, $time, $priority, $source, $description, $comment, $capabilities, $status, $image_id, $resource_id) {
-		$db=openqrm_get_db_connection();
-		// if the priority is == 10 then this is a finished event from a long term action event
-		// we have to set this event to prio 5 == notice
-		if ($priority == 10) {
-			$rs = $db->Execute("select event_id from $this->_db_table where event_priority=9 and event_source='$source' and event_name='$name' order by event_id DESC");
-			if (!$rs)
-				$this->log("log", $_SERVER['REQUEST_TIME'], 2, "event.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-			else
-			if (!$rs->EOF) {
-				// found origin active event, udpate to prio 5
-				$event_fields=array();
-				while (!$rs->EOF) {
-					$event_fields["event_priority"]=5;
-					$this->update($rs->fields["event_id"], $event_fields);
-					$rs->MoveNext();
-				}
-			}
-			// set prio to normal event
-			$priority = 5;
-		}
-
-		// check if log already exists, if yes, just update the date
-		$rs = $db->Execute("select event_id from $this->_db_table where event_priority=$priority and event_description='$description' and event_source='$source' and event_name='$name' order by event_id DESC");
-		if (!$rs)
-			$this->log("log", $_SERVER['REQUEST_TIME'], 2, "event.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		else
-		if ($rs->EOF) {
-			// log does not yet exists, add it
-			// $new_event_id=(int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-			$new_event_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-			$event_fields=array();
-			$event_fields["event_id"]=$new_event_id;
-			$event_fields["event_name"]="$name";
-			$event_fields["event_time"]="$time";
-			$event_fields["event_priority"]=$priority;
-			$event_fields["event_source"]="$source";
-			$event_fields["event_description"]=substr($description, 0, 255);
-			$event_fields["event_comment"]=substr($comment, 0, 255);
-			$event_fields["event_capabilities"]="$capabilities";
-			$event_fields["event_status"]=$status;
-			$event_fields["event_image_id"]=$image_id;
-			$event_fields["event_resource_id"]=$resource_id;
-			$this->add($event_fields);
-			// event hook
-			$this->trigger_event_hook('add', $new_event_id);
-
-		} else {
-			// log already exists, just update the date
-			$event_fields=array();
-			while (!$rs->EOF) {
-				$event_fields["event_id"]=$rs->fields["event_id"];
-				$rs->MoveNext();
-			}
-			$event_id = $event_fields["event_id"];
-			$event_fields["event_time"]="$time";
-			$this->update($event_id, $event_fields);
-
-			// event hook
-			//$this->trigger_event_hook('update', $event_id);
-		}
-
-		// add to syslog
-		$syslog_str="openQRM $source: ($name) $description";
-		$syslog_prio="LOG_ERR";
-		switch($priority) {
-			case 0:
-				$syslog_prio=LOG_WARNING;
-				break;
-			case 1:
-				$syslog_prio=LOG_WARNING;
-				break;
-			case 2:
-				$syslog_prio=LOG_WARNING;
-				break;
-			case 3:
-				$syslog_prio=LOG_WARNING;
-				break;
-			case 4:
-				$syslog_prio=LOG_WARNING;
-				break;
-			case 5:
-				$syslog_prio=LOG_NOTICE;
-				break;
-			case 6:
-				$syslog_prio=LOG_INFO;
-				break;
-			case 7:
-				$syslog_prio=LOG_DEBUG;
-				break;
-			case 8:
-				$syslog_prio=LOG_NOTICE;
-				break;
-			// long-term action started
-			case 9:
-				$syslog_prio=LOG_NOTICE;
-				break;
-			// long term action finished
-			case 10:
-				$syslog_prio=LOG_NOTICE;
-				break;
-		}
-		syslog($syslog_prio, $syslog_str);
-	}
-
-	//--------------------------------------------------
-	/**
-	* remove an event by id
-	* @access public
-	* @param int $event_id
-	*/
-	//--------------------------------------------------
-	function remove($event_id) {
-		$this->trigger_event_hook('remove', $event_id);
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from $this->_db_table where event_id=$event_id");
-	}
-
-	//--------------------------------------------------
-	/**
-	* remove an event by name
-	* @access public
-	* @param int $event_name
-	*/
-	//--------------------------------------------------
-	function remove_by_name($event_name) {
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from $this->_db_table where event_name='$event_name'");
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* remove an event by description
-	* @access public
-	* @param int $event_name
-	*/
-	//--------------------------------------------------
-	function remove_by_description($event_description) {
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from $this->_db_table where event_description like '%".$event_description."%';");
-	}
-	
-	
-	// resolves error event from the database by resource-id
-	function resolve_by_resource($event_name, $resource_id) {
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from $this->_db_table where event_resource_id=$resource_id and event_priority<3 and event_name='$event_name'");
-	}
-
-
-	// returns event_name by event_id
-	function get_name($event_id) {
-		$db=openqrm_get_db_connection();
-		$event_set = $db->Execute("select event_name from $this->_db_table where event_id=$event_id");
-		if (!$event_set) {
-			$this->log("get_name", $_SERVER['REQUEST_TIME'], 2, "event.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			if (!$event_set->EOF) {
-				return $event_set->fields["event_name"];
-			}
-		}
-	}
-
-	//--------------------------------------------------
-	/**
-	* get number of events
-	* @access public
-	* @return int
-	*/
-	//--------------------------------------------------
-	function get_count($mode = null) {
-		$count=0;
-		switch ($mode) {
-			case '':
-			case 'all':
-				$sql = "select count(event_id) as num from ".$this->_db_table;
-				break;
-			case 'error':
-				$sql = "select count(event_id) as num from ".$this->_db_table." where event_priority < 4 and event_status <> 1";
-				break;
-			case 'acknowledge':
-				$sql = "select count(event_id) as num from ".$this->_db_table." where event_status = 1";
-				break;
-			case 'warning':
-				$sql = "select count(event_id) as num from ".$this->_db_table." where event_priority = 4 and event_status <> 1";
-				break;
-			case 'active':
-				$sql = "select count(event_id) as num from ".$this->_db_table." where event_priority = 9 and event_status <> 1";
-				break;
-		}
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute($sql);
-		if (!$rs) {
-			$this->log("get_count", $_SERVER['REQUEST_TIME'], 2, "event.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			$count = $rs->fields["num"];
-		}
-		return $count;
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of all event names
-	* <code>
-	* $event = new event();
-	* $arr = $event->get_list();
-	* // $arr[0]['value']
-	* // $arr[0]['label']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_list() {
-		$query = "select event_id, event_name from $this->_db_table";
-		$event_name_array = array();
-		$event_name_array = openqrm_db_get_result_double ($query);
-		return $event_name_array;
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of events
-	* @access public
-	* @param int $offset
-	* @param int $limit
-	* @param string $sort
-	* @param enum $order [ASC/DESC]
-	* @return array
-	*/
-	//--------------------------------------------------
-	function display_overview($offset, $limit, $sort, $order, $mode = null) {
-		switch ($mode) {
-			case '':
-			case 'all':
-				$sql = "select * from ".$this->_db_table." order by ".$sort." ".$order;
-				break;
-			case 'error':
-				$sql = "select * from ".$this->_db_table." where event_priority < 4 and event_status <> 1 order by ".$sort." ".$order;
-				break;
-			case 'acknowledge':
-				$sql = "select * from ".$this->_db_table." where event_status = 1 order by ".$sort." ".$order;
-				break;
-			case 'warning':
-				$sql = "select * from ".$this->_db_table." where event_priority = 4 and event_status <> 1 order by ".$sort." ".$order;
-				break;
-			case 'active':
-				$sql = "select * from ".$this->_db_table." where event_priority = 9 and event_status <> 1 order by ".$sort." ".$order;
-				break;
-		}
-		$db=openqrm_get_db_connection();
-		$recordSet = $db->SelectLimit($sql, $limit, $offset);
-		$event_array = array();
-		if (!$recordSet) {
-			$this->log("display_overview", $_SERVER['REQUEST_TIME'], 2, "event.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			while (!$recordSet->EOF) {
-				array_push($event_array, $recordSet->fields);
-				$recordSet->MoveNext();
-			}
-			$recordSet->Close();
-		}
-		return $event_array;
-	}
-
-
-	function trigger_event_hook($action, $id) {
-		// add event hook for plugins
-		$plugin = new plugin();
-		$enabled_plugins = $plugin->enabled();
-		foreach ($enabled_plugins as $index => $plugin_name) {
-			$plugin_event_hook = $this->RootDir."/plugins/".$plugin_name."/openqrm-".$plugin_name."-event-hook.php";
-			if (file_exists($plugin_event_hook)) {
-				require_once "$plugin_event_hook";
-				$event_hook_function="openqrm_"."$plugin_name"."_event";
-				$event_hook_function=str_replace("-", "_", $event_hook_function);
-				$event_hook_function($action, $id);
-			}
-		}
-
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/file.class.php b/openQRM-5.3.50-CE/src/web/base/class/file.class.php
deleted file mode 100644
index ab6cb1b..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/file.class.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// -----------------------------------------------------------------------------------------------------------------------
-//
-//
-//
-//
-//
-// -----------------------------------------------------------------------------------------------------------------------
-class File
-{
-/**
-   *  path to file
-   *  @var string
-   */
-var $path = '';
-/**
-   *  filename
-   *  @var string
-   */
-var $name = '';
-/**
-   *  directory
-   *  @var string
-   */
-var $dir = '';
-/**
-   *  fileextension
-   *  @var string
-   */
-var $extension = '';
-/**
-   *  filetime
-   *  @var date
-   */
-var $date = '';
-/**
-   *  filetime (short)
-   *  @var date
-   */
-var $date_short = '';
-/**
-   *  filetype
-   *  @var string
-   */
-var $filetype = '';
-/**
-   *  filesize in kilobyte
-   *  @var double
-   */
-var $filesize = 0;
-/**
-   *  height (if > 0 = picture)
-   *  @var int
-   */
-var $height = 0;
-/**
-   *  width (if > 0 = picture)
-   *  @var int
-   */
-var $width = 0;
-/**
-   *  picture
-   *  @var string
-   */
-var $pictype = '';
-
-   /**
-	  *
-	  * @access public
-	  * @return object
-	  */
-	function File($path) {
-		$this->path = $path;
-		$path_parts = pathinfo($path);
-		$this->name = $path_parts["basename"];
-		$this->dir = $path_parts["dirname"];
-		if(isset($path_parts["extension"])) {
-			$this->extension = strtolower($path_parts["extension"]);
-		}
-		$this->filesize = round (filesize ($path)/100) /10;
-		$this->date = date("d.m.Y - H:i", filemtime ($path));
-		$this->date_short = date("d.m.Y", filemtime ($path));
-		$this->filetype = filetype($path);
-		if($this->filesize != 0) {
-			$imgsize = getimagesize($path);
-			$this->width = $imgsize[0];
-			$this->height = $imgsize[1];
-			$this->pictype = $imgsize[2];
-		}
-	}
-	
-	//-------------------------------------------------------------------
-	//
-	//
-	//-------------------------------------------------------------------	
-	function Move($target) {
-		$strMsg = "";
-		if(!copy($this->path, $target)){ $strMsg .= 'failed to copy '.$this->name.'<br>'; }
-		if(!unlink($this->path)) {$strMsg .= 'failed to delete '.$this->name.'<br>';}
-		return $strMsg;
-	}
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/file.handler.class.php b/openQRM-5.3.50-CE/src/web/base/class/file.handler.class.php
deleted file mode 100644
index fea91e6..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/file.handler.class.php
+++ /dev/null
@@ -1,581 +0,0 @@
-<?php
-/**
- * Filehandler
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class file_handler
-{
-/**
-*  date as formated string
-*  @access public
-*  @var string
-*/
-var $date_format = "Y/m/d - H:i";
-/**
-*  file permissions
-*  @access public
-*  @var string
-*/
-var $permissions_file = 0666;
-/**
-*  dir permissions
-*  @access public
-*  @var string
-*/
-var $permissions_dir = 0777;
-/**
-*  define allowed chars for filname
-*  @access public
-*  @var string
-*/
-var $regex_filename = '[a-zA-Z0-9~._-]';
-/**
-*  translation for message strings
-*  @access public
-*  @var array
-*/
-var $lang = array(
-	'remove_error'      => 'failed to delete %s',
-	'copy_error'        => 'failed to copy %s to %s',
-	'filename_error'    => 'filename must be %s',
-	'saved_error'       => 'failed to save %s',
-	'exists_error'      => '%s already exists',
-	'file'              => 'File',
-	'folder'            => 'Folder',
-	'permission_denied' => 'Permission denied',
-	'not_found'         => 'File not found',
-);
-
-/**
-*  files not to be shown
-*  @access private
-*  @var array
-*/
-var $arExcludedFiles = array('.', '..');
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function file_handler() {
-		// solve basename problem
-		setlocale(LC_ALL, 'en_US.UTF8');
-	}
-
-	//-------------------------------------------------------	
-	/**
-	 * return filinfos as array
-	 *
-	 * @param $path string 
-	 * @return array|null
-	 */
-	//-------------------------------------------------------
-	function get_fileinfo($path) {
-		if(file_exists($path)) {
-			$ar              = array();
-			$pi              = pathinfo($path);
-			
-			$ar['path']      = $path;
-			$ar['name']      = $pi["basename"];
-			$ar['dir']       = $pi["dirname"];
-			$ar['filesize']  = filesize($path);
-			$ar['date']      = date($this->date_format, filemtime ($path));
-			if(isset($pi["extension"])) {
-				$ar['extension'] = strtolower($pi["extension"]);
-			} else {
-				$ar['extension'] = '';
-			}
-			$ar['read']  = is_readable($path);
-			$ar['write'] = is_writable($path);
-			
-			return $ar;
-		}
-	}
-
-	//-------------------------------------------------------	
-	/**
-	 * return folderinfo as array
-	 *
-	 * @param $path string 
-	 * @return array|null
-	 */
-	//-------------------------------------------------------
-	function get_folderinfo($path) {
-		if(file_exists($path)) {
-			$ar["path"]        = $path;
-			$ar["name"]        = basename($path);
-			$ar["date"]        = date($this->date_format, filemtime ($path));
-			$ar["permissions"] = $this->get_permissions_octal($path);
-			$ar["read"]        = is_executable($path);
-			$ar["write"]       = is_writeable($path);
-			return $ar;
-		}
-	}
-	
-	//-------------------------------------------------------
-	/**
-	 * read file list from directory $path and return an array of file infos
-	 *
-	 * Usage:
-	 * <code>
-	 *	require_once($this->rootdir.'/class/file.handler.class.php');
-	 *	$file = new file_handler();
-	 * </code>
-	 *
-	 * @param	$path string 
-	 * @param	$excludes array files not to be returned
-	 * @param	$pattern string	matching pattern according to the rules used by the libc glob() function
-	 * @param	$subpattern	second filter for $pattern (pattern = '*.gif', subpattern = 'name_*' finds "name_*.gif" not "foobar_*.gif")
-	 * @return	$ar	array	@see: $this->get_fileinfo()
-	 */
-	//-------------------------------------------------------
-	function get_files($path, $excludes='', $pattern='*', $subpattern = null) {
-		$ar = array();
-		if(file_exists($path)) {
-			if($excludes != '') {
-				$this->arExcludedFiles = array_merge($this->arExcludedFiles, $excludes);
-			}
-			$glob = glob("$path/$pattern");
-			if(isset($subpattern) && $subpattern !== '') {
-				$glob = $this->__subpattern($glob, glob("$path/$subpattern", GLOB_BRACE));
-			}
-			foreach ($glob as $file) {
-				if (in_array($file, $this->arExcludedFiles) === false){
-					if (is_file("$file") === true) {
-						$ar[] = $this->get_fileinfo("$file");
-					}		
-				}
-			}			
-		}
-		return $ar;
-	}
-
-	//-------------------------------------------------------	
-	/**
-	 * check if file is dir
-	 *
-	 * @param array $path
-	 * @return bool
-	 */
-	//-------------------------------------------------------
-	function is_dir($path) {
-		return is_dir($path);
-	}
-
-	//-------------------------------------------------------	
-	/**
-	 * check if file is writable
-	 *
-	 * @param array $path
-	 * @return bool
-	 */
-	//-------------------------------------------------------
-	function is_writeable($path) {
-		return is_writable($path);
-	}
-
-	//-------------------------------------------------------	
-	/**
-	 * check if file exists
-	 *
-	 * @param array $path
-	 * @return bool
-	 */
-	//-------------------------------------------------------
-	function exists($path) {
-		return file_exists($path);
-	}
-
-	//-------------------------------------------------------	
-	/**
-	 * synchronize pattern and subpattern
-	 *
-	 * @param array $orig original glob
-	 * @param array $sub sub glob
-	 * @return array
-	 */
-	//-------------------------------------------------------
-	function __subpattern($orig, $sub) {
-		$return = array();
-		foreach($sub as $value) {
-			if(in_array($value, $orig)) {
-				$return[] = $value;
-			}
-		}
-		return $return;
-	}
-
-	//-------------------------------------------------------	
-	/**
-	 * read directory and return an array of folderinfos
-	 *
-	 * @param string $path
-	 * @param array $excludes files not to be returned
-	 * @return array
-	 */
-	//-------------------------------------------------------
-	function get_folders($path, $excludes = '', $pattern='*', $subpattern = null) {
-		$ar = array();
-		if(file_exists($path)) {
-			if($excludes != '') {
-				$this->arExcludedFiles = array_merge($this->arExcludedFiles, $excludes);
-			}
-			$glob = glob("$path/$pattern", GLOB_ONLYDIR);
-			if(isset($subpattern) && $subpattern !== '') {
-				$glob = $this->__subpattern($glob, glob("$path/$subpattern", GLOB_ONLYDIR|GLOB_BRACE));
-			}
-			foreach ($glob as $file) {
-				if (in_array($file, $this->arExcludedFiles) === false){
-					$ar[] = $this->get_folderinfo("$file");
-				}
-			}
-			/*
-			$handle = opendir ("$path/.");
-			while (false !== ($file = readdir ($handle))) {
-				if (in_array($file, $this->arExcludedFiles) === false){
-					if (is_dir("$path/$file") === true) {
-						$ar[] = $this->get_folderinfo("$path/$file");
-					}		
-				}	
-			}
-			*/
-		}
-		return $ar;
-	}
-	
-	//-------------------------------------------------------
-	/**
-	 * check valid filename
-	 *
-	 * @param $path string
-	 * @param $replace bool
-	 * @return string on error
-	 */
-	//-------------------------------------------------------	 
-	function check_filename( $path, $replace = false ) {
-		$str = '';
-		$name = basename($path);
-		preg_match('/^'.$this->regex_filename.'{'.strlen($name).'}$/u', $name, $matches);
-		if(!isset($matches[0])) {
-			$str = sprintf($this->lang['filename_error'], $this->regex_filename);
-		}
-		if($replace === false) {
-			if( file_exists($path) && is_file($path) ) {
-				$str = sprintf($this->lang['exists_error'], $this->lang['file'].' '.$name);
-			}
-			if( file_exists($path) && is_dir($path) ) {
-				$str = sprintf($this->lang['exists_error'], $this->lang['folder'].' '.$name);
-			}
-		}
-		return $str;
-	}
-
-	//-------------------------------------------------------
-	/**
-	 * check permissions
-	 *
-	 * @param $path string
-	 * @return string on error
-	 */
-	//-------------------------------------------------------	 
-	function check_permissions( $path ) {
-		$str = '';
-		$name = basename($path);
-		if(!is_readable($path)) {
-			$str = $this->lang['permission_denied'];
-		}
-		return $str;
-	}
-
-	//-------------------------------------------------------
-	/**
-	 * set file permissions
-	 *
-	 * @param $path string
-	 */
-	//-------------------------------------------------------
-	function chmod($path) {
-		if(is_file($path)) @chmod($path, $this->permissions_file);
-		if(is_dir($path))  @chmod($path, $this->permissions_dir);
-	}
-	
-	//-------------------------------------------------------
-	/**
-	 * copy a file ($path) to $target
-	 *
-	 * @param $path string
-	 * @param $target string
-	 * @return string on error
-	 */
-	//-------------------------------------------------------
-	function copy($path, $target) {
-		$str = '';
-		if($path !== $target) {
-			$str = $this->check_filename($target);
-			if($str === '')  {
-				if(is_dir($path)) {
-					$str = $this->mkdir($target);
-					if($str === '')  {
-						$handle = opendir("$path/.");
-						while (false !== ($file = readdir($handle))) {
-							if ($file !== '.'  && $file !== '..' ) {
-								if(is_dir($path.'/'.$file)) {
-									$this->copy($path.'/'.$file, $target.'/'.$file);
-								} else {
-									if(!@copy($path.'/'.$file, $target.'/'.$file)){
-										$str .= sprintf($this->lang['copy_error'], $this->lang['file'].' '.basename($path));
-									} else { 
-										$this->chmod($target);
-									}
-								}
-							}
-						}
-					}
-				}
-				if(is_file($path)) {
-					if(!@copy($path, $target)) {
-						$str .= sprintf($this->lang['copy_error'], $this->lang['file'].' '.$path, $target);
-					} else { 
-						$this->chmod($target);
-					}
-				}
-			}
-		}
-		return $str;
-	}
-
-	//-------------------------------------------------------
-	/**
-	 * move a file ($path) to $target
-	 *
-	 * alias for rename
-	 *
-	 * @param $path string
-	 * @param $target string
-	 * @return string
-	 */
-	//-------------------------------------------------------	 
-	function move($path, $target) {
-		$str = $this->rename($path, $target);
-		return $str;
-	}
-
-	//-------------------------------------------------------
-	/**
-	 * rename a file or folder ($path) to $target
-	 *
-	 * @param $path string
-	 * @param $target string
-	 * @return string on error
-	 * @todo find out why second realpath returns empty
-	 */
-	//-------------------------------------------------------
-	function rename($path, $target) {
-		$path   = realpath($path);
-		#$target = realpath($target);
-		$str    = '';
-		if($path !== $target) {
-			$str = $this->check_filename($target);
-			if($str === '')  {
-				if(@rename($path, $target) === false){
-					$str .= sprintf($this->lang['copy_error'], $this->lang['file'].' '.basename($path));
-				}
-				else { 
-					$this->chmod($target);
-				}
-			}
-		}
-		return $str;
-	}
-
-	//-------------------------------------------------------
-	/**
-	 * delete a file ($path) 
-	 *
-	 * @param $path string
-	 * @param $recursive bool
-	 * @return string on error
-	 */
-	//-------------------------------------------------------
-	function remove($path, $recursive = false) {
-		$ar = array();
-		if(is_file($path)) {
-			if(@unlink($path) === false) $ar[] = sprintf($this->lang['remove_error'], $this->lang['file'].' '.basename($path));
-		}
-		if(is_dir($path)) {
-			if($recursive === false) {
-				if(@rmdir($path) === false) $ar[] = sprintf($this->lang['remove_error'], $this->lang['folder'].' '.basename($path));
-			}
-			if($recursive === true) {
-		        $scan = glob(rtrim($path,'/').'/*');
-		        foreach($scan as $file){
-		            $error = $this->remove($file, $recursive);
-					if($error !== '') { $ar[] = $error; }
-		        }
-				if(@rmdir($path) === false) $ar[] = sprintf($this->lang['remove_error'], $this->lang['folder'].' '.basename($path));
-			}
-		}
-		$str = join('<br>', $ar);		
-		return $str;
-	}
-	
-	//-------------------------------------------------------
-	/**
-	 * make a directory ($path) 
-	 *
-	 * @param $path string
-	 * @return string on error
-	 */
-	//-------------------------------------------------------
-	function mkdir($path) {
-		$str = '';
-		$str = $this->check_filename($path);
-		if($str === '')  {
-			if(@mkdir($path) === false) {
-				$str = sprintf($this->lang['saved_error'], $this->lang['folder'].' '.basename($path));
-			} else {
-				$this->chmod($path);
-			}
-		}
-		return $str;
-	}
-
-	//-------------------------------------------------------
-	/**
-	 * make a file
-	 *
-	 * @param $path string
-	 * @param $data string
-	 * @param $mode for more details refere to php fopen
-	 * @param $replace bool
-	 * @return string on error
-	 */
-	//-------------------------------------------------------
-	function mkfile($path, $data, $mode = 'w+', $replace = false) {
-		$str = '';
-		$str = $this->check_filename($path, $replace);
-		if($str === '') {
-			$fp = @fopen($path, $mode);
-			if($fp) {
-				if(fwrite($fp, $data) === false) {
-					$str = sprintf($this->lang['saved_error'], $this->lang['file'].' '.basename($path));
-				} else {
-					$this->chmod($path);
-				}
-				fclose($fp);
-			} else {
-				$str = sprintf($this->lang['saved_error'], $this->lang['file'].' '.basename($path)).': '.$this->lang['permission_denied'];
-			}		
-		}
-		return $str;		
-	}
-
-	//-------------------------------------------------------
-	/**
-	 * reads an ini file ($path) and returns an array
-	 *
-	 * @param $path string
-	 * @param $multidimensional bool
-	 * @return array | null
-	 */
-	//-------------------------------------------------------
-	function get_ini($path, $multidimensional = true) {
-		if(file_exists($path)) {
-			return parse_ini_file($path, $multidimensional);
-		} 
-	}
-	
-	//-------------------------------------------------------
-	/**
-	 * creates an ini file ($path) from an array
-	 *
-	 * " will be saved as &quot;
-	 *
-	 * @param $path string
-	 * @param $data array
-	 * @param $extension string fileextension
-	 * @return string
-	 * @todo ereg
-	 */
-	//-------------------------------------------------------
-	function make_ini($path, $data, $extension = '.ini') {
-		$str = '';
-		if($extension) {
-			preg_match('/'.$extension.'$/i', $path, $matches);
-			if(count($matches) === 0) {
-				$path = $path.$extension;
-			}
-		}
-		if(is_array($data)) {
-			$fp = @fopen($path, 'w+');
-			if($fp) {
-				foreach($data as $key => $value) {
-					if(!is_array($value)) {
-						fwrite($fp, trim($key).' = "'.trim(str_replace('"', '&quot;', $value))."\"\n");
-					} else {
-						fwrite($fp, '['.trim($key).']'."\n");
-						foreach($value as $subkey => $subvalue) {
-							fwrite($fp, trim($subkey).' = "'.trim(str_replace('"', '&quot;', $subvalue))."\"\n");
-						}
-					}
-				}
-				fclose($fp);
-				$this->chmod($path);
-	 		} else {
-				$str = sprintf($this->lang['saved_error'], $this->lang['file'].' '.basename($path));
-			}
-		} else {
-			$str = 'Error: make_ini data must be of type array!';
-		}
-		return $str;		
-	}
-	
-	//-------------------------------------------------------
-	/**
-	 * returns octal filepermissions
-	 *
-	 * @param $path string
-	 * @return string
-	 */
-	//-------------------------------------------------------	
-	function get_permissions_octal($path) {
-		$info = substr(sprintf('%o', fileperms($path)), -4);
-		return $info;	
-	}
-
-	//-------------------------------------------------------
-	/**
-	 * returns file content as string
-	 *
-	 * @param $path string
-	 * @return string
-	 */
-	//-------------------------------------------------------	
-	function get_contents($path) {
-		$str = '';
-		$error = $this->check_permissions($path);
-		if($error === '') {
-			$str = file_get_contents($path);
-		} else {
-			$str = $error;
-		}
-		return $str;	
-	}
-	
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/file.upload.class.php b/openQRM-5.3.50-CE/src/web/base/class/file.upload.class.php
deleted file mode 100644
index 354ffa0..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/file.upload.class.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * @package file
- */
-
-/**
- * Fileupload
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class file_upload
-{
-
-/**
-*  translation for message strings
-*  @access public
-*  @var array
-*/
-var $lang = array(
-	'400' => 'Bad Request: Uploadfile not set',
-	'401' => 'Unauthorized: Directory is not writeable',
-	'403' => 'Forbidden: ',
-	'404' => 'Not Found: Directory not exists',
-	'406' => 'Not Acceptable: File is not uploded',
-	'500' => 'Server Error: ',
-	'Server' => array(
-		'1' => 'File exceeds upload_max_filesize',
-		'2' => 'File exceeds MAX_FILE_SIZE',
-		'3' => 'File was only partially uploaded',
-		'4' => 'No file was uploaded',
-		'6' => 'Missing a temporary folder',
-		'7' => 'Failed to write file to disk',
-		'8' => 'File upload stopped by extension',
-	),
-);
-
-	//---------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param $object file
-	 * @access public
-	 */
-	//---------------------------------------
-	function __construct( $obj ) {
-		$this->file = $obj;
-	}
-
-	//---------------------------------------
-	/**
-	 * Upload
-	 *
-	 * @access public
-	 * @param $key string
-	 * @param $dir string
-	 * @param $name string
-	 * @param $replace bool allow to replace files if exists
-	 * @return array
-	 */
-	//---------------------------------------
-	function upload( $key, $dir, $name = '', $replace = false ) {
-		if(isset( $_FILES[$key]) ) {
-			$userfile = $_FILES[$key];
-			if( $userfile['error'] === 0 ) {
-				if(is_uploaded_file($userfile["tmp_name"])) {
-					($name == '') ? $name = $userfile['name'] : null;
-					if(is_dir($dir)) {				
-						$file = $dir."/".$name;
-						$error = $this->file->check_filename( $file, $replace );
-						if( $error === '' ) {
-							if(@move_uploaded_file($userfile['tmp_name'],  $file) !== false) {
-								$this->file->chmod($file);
-								return '';
-							} else return $this->print_error('500', $this->lang['Server'][7]);
-						} else return $this->print_error('403', $error);
-					} else return $this->print_error('404');
-				} else return $this->print_error('406');
-			} else return $this->print_error('500', $this->lang['Server'][$userfile['error']]);
-		} else return $this->print_error('400');
-	}
-
-	//---------------------------------------
-	/**
-	 * @access protected
-	 * @param $key int
-	 * @param $error string
-	 * @return array
-	 */
-	//---------------------------------------
-	function print_error( $key, $error = '' ) {
-		$arr = array(
-			'status' => $key,
-			'msg'    => $this->lang[$key].$error,
-		);
-		return $arr;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/folder.class.php b/openQRM-5.3.50-CE/src/web/base/class/folder.class.php
deleted file mode 100644
index d867272..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/folder.class.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-// -----------------------------------------------------------------------------------------------------------------------
-//
-//
-//
-//
-//
-// -----------------------------------------------------------------------------------------------------------------------
-class Folder
-{
-var $files = array();
-var $folders = array();
-var $arExcludedFiles = array('.', '..');
-
-	//-------------------------------------------------------------------
-	//
-	//
-	//-------------------------------------------------------------------
-	function getFolderContent($path, $excludes = '') {
-
-		if($excludes != '') {
-			$arExcludedFiles = array_merge($this->arExcludedFiles, $excludes);
-		} else {
-			$arExcludedFiles = $this->arExcludedFiles;
-		}
-
-		$handle = opendir ("$path/.");
-		while (false != ($file = readdir ($handle))) {
-			if (in_array($file, $arExcludedFiles) == FALSE){
-				if (is_file("$path/$file")== TRUE) {
-				   $myFile = new File("$path/$file");
-				   $this->files[] = $myFile;
-				}
-			}
-		}
-	}
-	
-	//-------------------------------------------------------------------
-	//
-	//
-	//-------------------------------------------------------------------
-	function getFolders($path, $excludes = '') {
-
-		if($excludes != '') {
-			$arExcludedFiles = array_merge($this->arExcludedFiles, $excludes);
-		} else {
-			$arExcludedFiles = $this->arExcludedFiles;
-		}
-		$handle = opendir ("$path/.");
-		while (false != ($file = readdir ($handle))) {
-			if (in_array($file, $arExcludedFiles) == FALSE){
-				if (is_dir("$path/$file")== TRUE) {
-					$this->folders[] = $file;
-				}
-			}
-		}
-		sort($this->folders);
-	}
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.box.class.php b/openQRM-5.3.50-CE/src/web/base/class/htmlobject.box.class.php
deleted file mode 100644
index 5a8ce5c..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.box.class.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * @package Htmlobjects
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-/**
- * @package Htmlobjects
- * @author Alexander Kuballa akuballa@openqrm-enterprise.com
- * @version 1.0
- */
-class htmlobject_box extends htmlobject
-{
-
-/**
-* Label (Title) of box
-* @access public
-* @var string
-*/
-var $label = '';
-/**
-* Attribute name (should the the same as Attribute id)
-* @access public
-* @var object
-*/
-var $content = '';
-/**
-* Attribute name (should the the same as Attribute id)
-* @access public
-* @var string
-*/
-var $css_left = 'left';
-/**
-* Attribute name (should the the same as Attribute id)
-* @access public
-* @var string
-*/
-var $css_right = 'right';
-
-/**
-* internal use only
-*/
-
-	function init_htmlobject_box() {
-		if ($this->label == '')		{ $this->label = '&#160;'; }
-		if ($this->content == '')	{ $this->content = '&#160;'; }
-		if ($this->css_left != '') 	{ $this->css_left = ' class="'.$this->css_left.'"'; }
-		if ($this->css_right != '') { $this->css_right = ' class="'.$this->css_right.'"'; }
-	}
-
-	function get_string() {
-		$_strReturn = '';
-		$this->init_htmlobject();
-		$this->init_htmlobject_box();
-		$_strReturn = '
-		<div'.$this->_init_htmlobject.'>
-		<div'.$this->css_left.'><label for="'.$this->content->id.'">'.$this->label.'</label></div>
-		<div'.$this->css_right.'>'.$this->content->get_string().'</div>
-		<div style="line-height:0px;height:0px;clear:both;" class="floatbreaker">&#160;</div>
-		</div>
-		';
-		return $_strReturn;
-	}
-}
-
diff --git a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.class.php b/openQRM-5.3.50-CE/src/web/base/class/htmlobject.class.php
deleted file mode 100644
index 2b274d3..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.class.php
+++ /dev/null
@@ -1,713 +0,0 @@
-<?php
-/**
- * @package htmlobject
- *
- */  
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class htmlobject extends http
-{
-/**
-* Attribute class
-* @access public
-* @var string
-*/
-var $css = '';
-/**
-* Attribute id
-* @access public
-* @var string
-*/
-var $id = '';
-/**
-* Attribute style
-* @access public
-* @var string
-*/
-var $style = '';
-/**
-* Attribute title
-* @access public
-* @var string
-*/
-var $title = '';
-
-/**
-* adds an eventhandler to
-* @access public
-* @var string
-*/
-var $handler = '';
-
-/**
-* string of attribs
-* @acess protected
-* @var string
-*/
-var $_init;
-
-	/**
-	 * init attribs
-	 *
-	 * @acess protected
-	 */
-	function init() {
-		$this->_init = '';
-		if ($this->css != '')  		{ $this->_init .= ' class="'.$this->css.'"'; }
-		if ($this->style != '')		{ $this->_init .= ' style="'.$this->style.'"'; }
-		if ($this->title != '')		{ $this->_init .= ' title="'.$this->title.'"'; }
-		if ($this->handler != '')	{ $this->_init .= ' '.$this->handler; }
-		// set id
-		if ($this->id == '') 		{ $this->set_id(); }
-		if ($this->id != '')		{ $this->_init .= ' id="'.$this->id.'"'; }
-	}
-
-	/**
-	 * set html id
-	 *
-	 * @acess public
-	 * @param string $id
-	 */
-	function set_id($id = '') {
-		if($id != '') {
-			$this->id = $id;
-		}
-		// if no id is set
-		if($this->id == '') {
-			if(isset($this->name)) {
-				$this->id = $this->name;
-			} else {
-				$this->id = uniqid('p');
-			}
-		}
-	}
-	
-}
-
-/**
- * Select
- *
- * @package htmlobject
- * @author Alexander Kuballa akuballa@openqrm-enterprise.com
- * @copyright Copyright (c) 2008, Alexander Kuballa
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- * @version 1.0
- */
-class htmlobject_select extends htmlobject
-{
-/**
-* disable select 
-* @access public
-* @var bool
-*/
-var $disabled = false;
-/**
-* allow multiple selection
-* @access public
-* @var bool
-*/
-var $multiple = false;
-/**
-* Attribute name (should the the same as Attribute id)
-* @access public
-* @var string
-*/
-var $name = '';
-/**
-* number of lines to be shown
-* @access public
-* @var int
-*/
-var $size = '';
-/**
-* Attribute tabindex
-* @access public
-* @var int
-*/
-var $tabindex = '';
-/**
-* content of option element (text)
-* @access public
-* @var array
-*/
-var $text = array();
-/**
-* index of array text
-* @access public
-* @var array
-*/
-var $text_index = array(
-"value" => 'id',
-"text" => 'name'
-);
-/**
-* content of option element (value)
-* @access public
-* @var array
-*/
-var $selected = array();
-/**
-* selected  by text or value
-*
-* true = selected by text
-* false  = selected by values
-* @access public
-* @var bool
-*/
-var $selected_by_text = false;
-
-	/**
-	 * init attribs
-	 *
-	 * @acess protected
-	 */
-	function init() {
-		parent::init();
-		if ($this->disabled === true)	{ $this->_init .= ' disabled'; }
-		if ($this->multiple === true)	{ $this->_init .= ' multiple'; }
-		if ($this->name != '')  		{ $this->_init .= ' name="'.$this->name.'"'; }
-		if ($this->size != '')			{ $this->_init .= ' size="'.$this->size.'"'; }
-		if ($this->tabindex != '')  	{ $this->_init .= ' tabindex="'.$this->tabindex.'"'; }
-	}
-
-	/**
-	 * Get html element as string
-	 *
-	 * @acess public
-	 * @return string
-	 */
-	function get_string() {
-		$_strReturn = '';
-		$this->init();
-		$_strReturn = "\n<select$this->_init>\n";
-		$_strReturn .= $this->get_options();
-		$_strReturn .= "</select>\n";
-		return $_strReturn;
-	}
-
-	function get_options() {
-		$_strReturn = '';
-		if(count($this->text) > 0){
-			for ($i=0; count($this->text)>$i; $i++) {
-			$sel =  "";
-				if($this->selected_by_text === true) {
-					if(in_array($this->text[$i][$this->text_index['text']], $this->selected)) {
-						$sel =  ' selected="selected"';
-					}
-				}
-				else {
-					if(in_array($this->text[$i][$this->text_index['value']], $this->selected)) {
-						$sel =  ' selected="selected"';
-					}
-				}
-			$_strReturn .= "<option value=\"".$this->text[$i][$this->text_index['value']]."\"$sel>".$this->text[$i][$this->text_index['text']]."</option>\n";
-			}
-		} else {
-			$_strReturn .= '';
-		}
-		return $_strReturn;
-	}
-}
-
-/**
- * Input
- *
- * @package htmlobject
- * @author Alexander Kuballa akuballa@openqrm-enterprise.com
- * @copyright Copyright (c) 2008, Alexander Kuballa
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- * @version 1.0
- */
-class htmlobject_input extends htmlobject
-{
-/**
-* @access public 
-* @var bool
-*/
-var $checked = false;
-/**
-* disable select 
-* @access public 
-* @var bool
-*/
-var $disabled = false;
-/**
-* maxlength
-* @access public 
-* @var int
-*/
-var $maxlength;
-/**
-* Attribute name
-* @access public 
-* @var string
-*/
-var $name = '';
-/**
-* number of lines to be shown
-* @access public 
-* @var int
-*/
-var $size = '';
-/**
-* Attribute tabindex
-* @access public 
-* @var int
-*/
-var $tabindex = '';
-/**
-* type of element
-* @access public 
-* @var string
-* @values text | password | checkbox | radio | submit | reset | file | hidden | image | button
-*/
-var $type = '';
-/**
-* value of input
-* @access public 
-* @var string
-*/
-var $value = '';
-
-	/**
-	 * init attribs
-	 *
-	 * @acess protected
-	 */
-	function init() {
-		parent::init();
-		if ($this->checked != '')  		{ $this->_init .= ' checked="checked"'; }
-		if ($this->disabled === true)	{ $this->_init .= ' disabled="disabled"'; }
-		if ($this->maxlength != '')		{ $this->_init .= ' maxlength="'.$this->maxlength.'"'; }
-		if ($this->name != '')  		{ $this->_init .= ' name="'.$this->name.'"'; }
-		if ($this->size != '')			{ $this->_init .= ' size="'.$this->size.'"'; }
-		if ($this->tabindex != '')  	{ $this->_init .= ' tabindex="'.$this->tabindex.'"'; }
-		if ($this->value != '')  		{ $this->_init .= ' value="'.$this->value.'"'; }
-		$this->type = strtolower($this->type);
-		switch($this->type) {
-			case 'text':
-			case 'password':
-			case 'checkbox':
-			case 'radio':
-			case 'submit':
-			case 'reset':
-			case 'hidden':
-			case 'image':
-			case 'button':
-				$this->_init .= ' type="'.$this->type.'"';
-			break;
-			default:
-				$this->_init .= ' type="text"';
-				if(debug::active()) {
-					debug::add('type '.$this->type.' not supported - type set to text', 'ERROR');
-				}
-			break;
-		}
-	}
-
-	/**
-	 * Get html element as string
-	 *
-	 * @acess public
-	 * @return string
-	 */
-	function get_string() {
-		$_strReturn = '';
-		$this->init();
-		$_strReturn = "<input$this->_init>";
-		return $_strReturn;
-	}
-}
-
-/**
- * Button
- *
- * @package htmlobject
- * @author Alexander Kuballa akuballa@openqrm-enterprise.com
- * @copyright Copyright (c) 2008, Alexander Kuballa
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- * @version 1.0
- */
-class htmlobject_button extends htmlobject
-{
-/**
-* disable select 
-* @access public 
-* @var bool
-*/
-var $disabled = false;
-/**
-* Attribute name
-* @access public 
-* @var string
-*/
-var $name = '';
-/**
-* Attribute tabindex
-* @access public 
-* @var int
-*/
-var $tabindex = '';
-/**
-* type of element
-* @access public 
-* @var string
-* @values button | submit | reset
-*/
-var $type = '';
-/**
-* value of input
-* @access public 
-* @var string
-*/
-var $value = '';
-/**
-* value of input
-* @access public 
-* @var string
-*/
-var $label = '';
-
-	/**
-	 * init attribs
-	 *
-	 * @acess protected
-	 */
-	function init() {
-		parent::init();
-		if ($this->disabled === true)	{ $this->_init .= ' disabled="disabled"'; }
-		if ($this->name != '')  		{ $this->_init .= ' name="'.$this->name.'"'; }
-		if ($this->tabindex != '')  	{ $this->_init .= ' tabindex="'.$this->tabindex.'"'; }
-		if ($this->value != '')  		{ $this->_init .= ' value="'.$this->value.'"'; }
-		$this->type = strtolower($this->type);
-		switch($this->type) {
-			case 'submit':
-			case 'reset':
-			case 'button':
-				$this->_init .= ' type="'.$this->type.'"';
-			break;
-			default:
-				$this->_init .= ' type="button"';
-				if(debug::active()) {
-					debug::add('type '.$this->type.' not supported - type set to button', 'ERROR');
-				}
-			break;
-		}
-	}
-
-	/**
-	 * Get html element as string
-	 *
-	 * @acess public
-	 * @return string
-	 */
-	function get_string() {
-		$_strReturn = '';
-		$this->init();
-		$_strReturn = "\n<button$this->_init>$this->label</button>";
-		return $_strReturn;
-	}
-}
-
-/**
- * Textarea
- *
- * @package htmlobject
- * @author Alexander Kuballa akuballa@openqrm-enterprise.com
- * @copyright Copyright (c) 2008, Alexander Kuballa
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- * @version 1.0
- */
-class htmlobject_textarea extends htmlobject
-{
-/**
-* Attribute cols
-* @access public
-* @var int
-*/
-var $cols = 50;
-/**
-* disable textarea 
-* @access public
-* @var bool
-*/
-var $disabled = false;
-/**
-* Attribute name (should the the same as Attribute id)
-* @access public
-* @var string
-*/
-var $name = '';
-/**
-* set textarea to readonly
-* @access public
-* @var bool
-*/
-var $readonly = false;
-/**
-* number of rows
-* @access public
-* @var int
-*/
-var $rows = 5;
-/**
-* Attribute tabindex
-* @access public
-* @var int
-*/
-var $tabindex = '';
-/**
-* wrap type (physical,virtual,none)
-* @access public
-* @var string
-*/
-var $wrap = '';
-
-/**
-* Content of textarea
-* @access public
-* @var string
-*/
-var $text = '';
-
-	/**
-	 * init attribs
-	 *
-	 * @acess protected
-	 */
-	function init() {
-		parent::init();
-		if ($this->cols != '')			{ $this->_init .= ' cols="'.$this->cols.'"'; }
-		if ($this->disabled === true)	{ $this->_init .= ' disabled'; }
-		if ($this->name != '')  		{ $this->_init .= ' name="'.$this->name.'"'; }
-		if ($this->readonly === true)	{ $this->_init .= ' readonly'; }
-		if ($this->rows != '')			{ $this->_init .= ' rows="'.$this->rows.'"'; }
-		if ($this->tabindex != '')  	{ $this->_init .= ' tabindex="'.$this->tabindex.'"'; }
-		if ($this->wrap != '')  		{ $this->_init .= ' wrap="'.$this->wrap.'"'; }
-	}
-
-	/**
-	 * Get html element as string
-	 *
-	 * @acess public
-	 * @return string
-	 */
-	function get_string() {
-		$_strReturn = '';
-		$this->init();
-		$_strReturn = "\n<textarea$this->_init>";
-		$_strReturn .= $this->text;
-		$_strReturn .= "</textarea>\n";
-		return $_strReturn;
-	}
-}
-
-/**
- * Form
- *
- * @package htmlobject
- * @author Alexander Kuballa akuballa@openqrm-enterprise.com
- * @copyright Copyright (c) 2008, Alexander Kuballa
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- * @version 1.0
- */
-class htmlobject_form extends htmlobject
-{
-/**
-* uri 
-* @access public 
-* @var string
-*/
-var $action = '';
-/**
-* mime type
-* @access public 
-* @var string
-*/
-var $enctype = '';
-/**
-* Post/Get
-* @access public 
-* @var string
-*/
-var $method = '';
-/**
-* Attribute name
-* @access public 
-* @var string
-*/
-var $name = '';
-/**
-* target
-* @access public 
-* @var string
-*/
-var $target = '';
-/**
-* form elements
-* @access public 
-* @var string
-*/
-var $fields = '';
-
-	/**
-	 * init attribs
-	 *
-	 * @acess protected
-	 */
-	function init() {
-		parent::init();
-		if ($this->action != '')  		{ $this->_init .= ' action="'.$this->action.'"'; }
-		if ($this->enctype != '')  		{ $this->_init .= ' enctype="'.$this->enctype.'"'; }
-		if ($this->method != '')  		{ $this->_init .= ' method="'.$this->method.'"'; }
-		if ($this->name != '')  		{ $this->_init .= ' name="'.$this->name.'"'; }
-		if ($this->target != '')  		{ $this->_init .= ' target="'.$this->target.'"'; }
-	}
-
-	/**
-	 * Get html element as string
-	 *
-	 * @acess public
-	 * @return string
-	 */
-	function get_string() {
-		$_strReturn = '';
-		$this->init();
-		$_strReturn .= "\n<form$this->_init>\n";
-		$_strReturn .= $this->fields;
-		$_strReturn .= "\n</form>\n";
-		return $_strReturn;
-	}
-}
-
-/**
- * Div
- *
- * @package htmlobject
- * @author Alexander Kuballa akuballa@openqrm-enterprise.com
- * @copyright Copyright (c) 2008, Alexander Kuballa
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- * @version 1.0
- */
-class htmlobject_div extends htmlobject
-{
-/**
-* text
-* @access private
-* @var string
-*/
-var $text = '';
-
-	/**
-	 * Get html element as string
-	 *
-	 * @acess public
-	 * @return string
-	 */
-	function get_string() {
-		$_strReturn = '';
-		$this->init();
-		$_strReturn = "\n<div$this->_init>$this->text</div>";
-		return $_strReturn;
-	}
-}
-
-/**
- * Box
- *
- * @package htmlobject
- * @author Alexander Kuballa akuballa@openqrm-enterprise.com
- * @copyright Copyright (c) 2008, Alexander Kuballa
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- * @version 1.0
- */
-class htmlobject_box extends htmlobject
-{
-
-/**
-* Label (Title) of box
-* @access public
-* @var string
-*/
-var $label = '';
-/**
-* Label for input
-* @access public
-* @var string
-*/
-var $label_for = '';
-/**
-* content
-* @access public
-* @var object | string
-*/
-var $content = '';
-/**
-* css class for left box
-* @access public
-* @var string
-*/
-var $css_left = 'left';
-/**
-* css class for right box
-* @access public
-* @var string
-*/
-var $css_right = 'right';
-
-	/**
-	 * init attribs
-	 *
-	 * @acess protected
-	 */
-	function init() {
-		parent::init();
-		if ($this->content == '')	{ $this->content = '&#160;'; }
-		if ($this->css_left != '') 	{ $this->css_left = ' class="'.$this->css_left.'"'; }
-		if ($this->css_right != '') { $this->css_right = ' class="'.$this->css_right.'"'; }
-	}
-
-	/**
-	 * Get html element as string
-	 *
-	 * @acess public
-	 * @return string
-	 */
-	function get_string() {
-		$_strReturn = '';
-		$this->init();
-		$_strReturn .= "\n<div".$this->_init.">";
-
-		if($this->label != '') {
-			$_strReturn .= "\n<div".$this->css_left.">";
-			if(is_object($this->content) && isset($this->content->id)) { $_strReturn .= '<label for="'.$this->content->id.'">'.$this->label.'</label>'; }
-			if(is_string($this->content)) {
-				if($this->label_for != '') { $_strReturn .= '<label for="'.$this->label_for.'">'.$this->label.'</label>'; }
-				else { $_strReturn .= $this->label; }
-			}
-			$_strReturn .= "</div>";
-		}
-		$_strReturn .= "\n<div".$this->css_right.">";
-
-		if(is_object($this->content)) {	$_strReturn .= $this->content->get_string(); }
-		if(is_string($this->content)) {	$_strReturn .= $this->content; }
-
-		$_strReturn .= "</div>";
-		$_strReturn .= "\n<div style=\"line-height:0px;height:0px;clear:both;\" class=\"floatbreaker\">&#160;</div>";
-		$_strReturn .= "\n</div>";
-		return $_strReturn;
-	}
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.debug.class.php b/openQRM-5.3.50-CE/src/web/base/class/htmlobject.debug.class.php
deleted file mode 100644
index d34c224..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.debug.class.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * @package htmlobjects
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-//----------------------------------------------------------------------------------------
-
-class debug
-{
-static protected $debug = false;
-static protected $panic = false;
-static protected $_infos = array();
-	//--------------------------------
-	/**
-	* Start Debugger
-	*
-	* @access public
-	*/
-	//--------------------------------
-	public static function start($panic = false) {
-		if($panic === true) {
-			self::$panic = true;
-		}
-		self::$debug = true;
-	}
-	//--------------------------------
-	/**
-	* Stop Debugger
-	*
-	* @access public
-	*/
-	//--------------------------------
-	public static function stop() {
-		self::$debug = false;
-	}
-	//--------------------------------
-	/**
-	* Stop Debugger
-	*
-	* @access public
-	*/
-	//--------------------------------
-	public static function active() {
-		return self::$debug;
-	}
-
-	//--------------------------------
-	/**
-	* Add string to debugger info array
-	*
-	* @access public
-	* @param string $msg
-	* @param string $state
-	*/
-	//--------------------------------
-	public static function add( $msg, $state = 'INFO' ) {
-		if(self::active()) {
-			#if((self::$panic === true) || (self::$panic === false && $state != strtolower('INFO'))) {
-				$debug = debug_backtrace();
-				self::$_infos[] = $state.' '.$debug[1]['class'].'->'.$debug[1]['function'].'() '.$msg;
-				#for($i = 2; $i < count($debug); $i++) {
-				#	self::$_infos[] = '---- line '.$debug[$i]['line'].' : '.$debug[$i]['class'].'->'.$debug[$i]['function'].'()';
-				#}
-			#}
-		}
-	}
-	//--------------------------------
-	/**
-	* Print Debuger Info
-	*
-	* @access public
-	*/
-	//--------------------------------
-	public static function flush() {
-		if(self::$debug === true) {
-			print "Debugger Info\n";
-			print "<pre>\n";
-			foreach(self::$_infos as $msg) {
-				print $msg."\n";
-			}
-			print '</pre>';
-			// unset array
-			self::$_infos = array();
-		}
-	}
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.form.class.php b/openQRM-5.3.50-CE/src/web/base/class/htmlobject.form.class.php
deleted file mode 100644
index 20f1039..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.form.class.php
+++ /dev/null
@@ -1,637 +0,0 @@
-<?php
-/**
- * @package htmlobject
- *
- */  
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-  */
-
-class htmlobject_formbuilder extends http
-{
-/**
-* string to mark value as required
-* @access public
-* @var string
-*/
-var $str_required = '*';
-/**
-* store data
-* @access protected
-* @var string
-*/
-var $data = array();
-/**
-* store request
-* @access protected
-* @var array
-*/
-var $request = null;
-/**
-* store errors
-* @access protected
-* @var array|null
-*/
-var $check_request = null;
-
-
-	//---------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * Good to know:
-	 * If form is cleared (inputs are empty) and then submitted,
-	 * form will load preset values and will not appear empty.
-	 * No Errors will be displayed. Form will appear like opening
-	 * it for the first time.
-	 *
-	 * <code>
-	 *
-	 * $data  = array();
-	 * $data['name']                              = array ();
-	 * $data['name']['label']                     = 'Name';
-	 * $data['name']['required']                  = true;
-	 * // validation
-	 * $data['name']['validate']                  = array ();
-	 * $data['name']['validate']['regex']         = '/^[a-z0-9~._-]+$/i';
-	 * $data['name']['validate']['errormsg']      = 'string must be a-z0-9~._-';
-	 * // build object
-	 * $data['name']['object']                    = array ();
-	 * $data['name']['object']['type']            = 'htmlobject_input';
-	 * $data['name']['object']['attrib']          = array();
-	 * $data['name']['object']['attrib']['type']  = 'text';
-	 * $data['name']['object']['attrib']['name']  = 'name';
-	 * $data['name']['object']['attrib']['value'] = 'somevalue';
-	 *
-	 * $formbuilder = new htmlobject_formbuilder( $data );
-	 *
-	 * // Actions
-	 * // no errors, do something
-	 * if(!$formbuilder->get_errors()) {
-	 *		$values = $formbuilder->get_request_as_array();
-	 *		print_r($values);
-	 * }
-	 *
-	 * $template = new Template_PHPLIB();
-	 * $template->debug = 0;
-	 * $template->setFile('t', 'html/template.html');
-	 * $template->setVar($formbuilder->get_template_array());
-	 *
-	 * echo $template->parse('out', 't');
-	 *
-	 * </code>
-	 * @acess public
-	 * @param array $data
-	 */
-	//---------------------------------------
-	function __construct($data=null) {
-
-		if(debug::active()) {
-			foreach($data as $key => $value) {
-				if(!isset($value['object'])) {
-					debug::add('["'.$key.'"]["object"] not set', 'ERROR');
-				}
-				if(!isset($value['object']['type'])) {
-					debug::add('["'.$key.'"]["object"]["type"] not set', 'ERROR');
-				}
-				if(!isset($value['object']['attrib'])) {
-					debug::add('["'.$key.'"]["object"]["attrib"] not set', 'ERROR');
-				}
-				if(!isset($value['object']['attrib']['name'])) {
-					debug::add('["'.$key.'"]["object"]["attrib"]["name"] not set', 'ERROR');
-				}
-				elseif ($value['object']['attrib']['name'] == '') {
-					debug::add('["'.$key.'"]["object"]["attrib"]["name"] is empty', 'ERROR');
-				}
-				if(isset($value['validate']) &&
-					!isset($value['validate']['errormsg'])
-				) {
-					debug::add('["'.$key.'"]["validate"]["errormsg"] not set', 'ERROR');
-				}
-				elseif (isset($value['validate']) &&
-						$value['validate']['errormsg'] == ''
-				) {
-					debug::add('["'.$key.'"]["validate"]["errormsg"] is empty', 'NOTICE');
-				}
-			}
-		}
-
-		$this->data = $data;
-
-	}
-	//---------------------------------------------------------------- Public Section
-	//---------------------------------------
-	/**
-	 * init
-	 *
-	 * @acess public
-	 * @return array
-	 */
-	//---------------------------------------
-	function init() {
-
-		// only init if request not set
-		// set_request() will set array
-		if(!isset($this->request)) {
-			// filter quots (")
-			$this->add_request_filter(array(
-					array( 'pattern' => '~\r\n~', 'replace' => '\n'),
-					array( 'pattern' => '~&lt;~', 'replace' => '<'),
-					array( 'pattern' => '~&quot;~', 'replace' => '"'),
-					array( 'pattern' => '~\"~', 'replace' => '\"'),
-				));
-			$this->set_request();
-			$this->set_check_request();
-		}
-
-	}
-	//---------------------------------------
-	/**
-	 * get request values as array
-	 *
-	 * @acess public
-	 * @return array
-	 */
-	//---------------------------------------
-	function get_request_array($arg=null) {
-
-		$this->init();
-		if(count($this->request) > 0) {
-			return $this->request;
-		}
-
-	}
-
-	//---------------------------------------
-	/**
-	 * get request values as url params
-	 *
-	 * @acess public
-	 * @return string
-	 */
-	//---------------------------------------
-//	function get_request_string() {
-	function get_request_string($firstchar = '?', $excludes = Array()) {
-		$this->init();
-
-		$strReturn = '';
-		foreach ($this->data as $data) {
-			if(isset($data['object']['attrib']['name'])) {
-				$name = $this->unindex_array($data['object']['attrib']['name']);
-				$request = '$this->request'.$this->string_to_index($name);
-				if(eval("return isset($request);")) {
-					if(is_array(eval("return $request;"))) {
-						foreach(eval("return $request;") as $key => $value) {
-							$strReturn .= '&'.$name.'['.$key.']='.$value;
-						}
-					}
-					else {
-						$strReturn .= '&'.$name.'='. eval("return $request;");
-					}
-				}
-			}
-		}
-		return $strReturn;
-
-	}
-
-	//---------------------------------------
-	/**
-	 * get array for html template
-	 *
-	 * will return
-	 * array[$key] = html element as string
-	 * $key is
-	 *
-	 * @acess public
-	 * @return array of strings
-	 */
-	//---------------------------------------
-	function get_template_array() {
-		$this->init();
-
-		$ar = array();
-		foreach ($this->data as $key => $data) {
-			$box = new htmlobject_box();
-			$box->label = $this->get_label($data);
-			$box->content = $this->get_htmlobject_object($data);
-			$box->css = 'htmlobject_box';
-			$ar = array_merge($ar, array($key => $box->get_string()));
-		}
-		return $ar;
-
-	}
-
-	//---------------------------------------
-	/**
-	 * get errors
-	 *
-	 * will return array('name' => 'errormsg', ...)
-	 * or null if no error occured
-	 *
-	 * @acess public
-	 * @return array|null
-	 */
-	//---------------------------------------
-	function get_errors() {
-
-		$this->init();
-		return $this->check_request;
-
-	}
-
-	//---------------------------------------------------------------- Protected Section
-	//---------------------------------------
-	/**
-	 * set values from http request as array
-	 *
-	 * @acess protected
-	 */
-	//---------------------------------------
-	function set_request() {
-
-		$arReturn = array();
-		foreach ($this->data as $data) {
-			if(isset($data['object']['attrib']['name'])) {
-				// set vars
-				$name = $this->unindex_array($data['object']['attrib']['name']);
-				if(debug::active()) {
-					debug::add($name);
-				}
-				$request = $this->get_request($name);
-				if($request) {
-					$ar = '$arReturn'.$this->string_to_index($name);
-					eval("return $ar = \"$request\";");
-					if(is_array($request)) {
-						eval("return $ar = array();");
-						foreach($request as $key => $value) {
-							$tar = $ar.'["'.$key.'"]';
-							eval("return $tar = \"$value\";");
-							}
-					} else {
-						eval("return $ar = \"$request\";");
-					}
-				}
-			}
-		}
-
-		// set request even when Array is
-		// empty - array is needed for
-		// init() request not set test
-		$this->request = $arReturn;
-
-	}
-
-	//---------------------------------------
-	/**
-	 * Check $this->data request
-	 *
-	 * Returns array of errors if
-	 * request does not match given regex.
-	 * Empty if no missmatch occured.
-	 *
-	 * @acess protected
-	 * @return array('name'=> 'msg')
-	 */
-	//---------------------------------------
-	function set_check_request() {
-
-		$arReturn = array();
-		foreach ($this->data as $data) {
-			if(
-				isset($data['validate']) &&
-				isset($data['validate']['regex']) &&
-				isset($data['validate']['errormsg']) &&
-				isset($data['object']['attrib']['name']) &&
-				count($this->request) > 0
-			) {
-
-				// set vars
-				$regex = $data['validate']['regex'];
-				$name  = $data['object']['attrib']['name'];
-
-				$request = '$this->request'.$this->string_to_index($name);
-				if(eval("return isset($request);") && isset($regex) && $regex != '') {
-					$matches = regex::match($regex, eval("return $request;"));
-					if(!$matches) {
-						$this->check_request[$name] = $data['validate']['errormsg'];
-					}
-				}
-				elseif (eval("return !isset($request);") && isset($data['required']) && $data['required'] == true) {
-					$this->check_request[$name] = 'null';
-				}
-			}
-		}
-
-	}
-
-	//---------------------------------------
-	/**
-	 * get html objects
-	 *
-	 * @acess protected
-	 * @param array $data
-	 * @return object|null
-	 */
-	//---------------------------------------
-	function get_htmlobject_object($data) {
-
-		if(
-			isset($data['object']) &&
-			isset($data['object']['type']) &&
-			isset($data['object']['attrib']) &&
-			isset($data['object']['attrib']['name'])
-		) {
-
-			// set vars
-			$object  = strtolower($data['object']['type']);
-			$attribs = $data['object']['attrib'];
-			$name 	 = $data['object']['attrib']['name'];
-
-			// build object
-			switch($object) {
-				case 'htmlobject_input':
-				case 'htmlobject_select':
-				case 'htmlobject_textarea':
-				case 'htmlobject_button':
-					$html = $this->make_htmlobject($object, $attribs);
-				break;
-				default:
-					if(debug::active()) {
-						debug::add($object.' is not supported', 'ERROR');
-					}
-				break;
-			}
-
-			// set request
-			if(	isset($this->request) && count($this->request) > 0) {
-				$request = '$this->request'.$this->string_to_index($name);
-			}
-
-			// build return
-			if(
-				isset($request) &&
-				$request != '' &&
-				isset($html)
-			) {
-				// add request to object
-				switch($object) {
-					case 'htmlobject_input':
-						$html = $this->handle_htmlobject_input($html, $request);
-					break;
-					case 'htmlobject_select':
-						$html = $this->handle_htmlobject_select($html, $request);
-					break;
-					case  'htmlobject_textarea':
-						$html = $this->handle_htmlobject_textarea($html, $request);
-					break;
-				}
-				return $html;
-			}
-			elseif(isset($html)) {
-				return $html;
-			} else {
-				return '';
-			}
-		}
-
-	}
-
-	//---------------------------------------
-	/**
-	 * make html objects
-	 *
-	 * @acess protected
-	 * @param string $object
-	 * @param array $attrib
-	 * @return object
-	 */
-	//---------------------------------------
-	function make_htmlobject($object, $attrib) {
-
-		// build htmlobject
-		$html = new $object();
-		foreach ($attrib as $key => $param) {
-			$html->$key = $param;
-		}
-		// make sure id is set
-		$html->set_id();
-		return $html;
-
-	}
-
-	//------- Object Section
-
-	//---------------------------------------
-	/**
-	 * handle htmlobject_input
-	 *
-	 * @acess protected
-	 * @param object $html
-	 * @param array $attrib
-	 * @param string $request
-	 * @return object
-	 */
-	//---------------------------------------
-	function handle_htmlobject_input($html, $request) {
-
-		$html->type = strtolower($html->type);
-		switch($html->type) {
-			case 'submit':
-			case 'reset':
-			case 'file':
-			case 'image':
-			case 'button':
-				// do nothing
-			break;
-			case 'radio':
-				if(
-					eval("return isset($request);") &&
-					eval("return $request;") == $html->value
-				) {
-					$html->checked = true;
-				} else {
-					$html->checked = false;
-				}
-			break;
-			case 'checkbox':
-				if(
-					eval("return isset($request);") &&
-					eval("return $request;") != ''
-				) {
-					$html->checked = true;
-				} else {
-					$html->checked = false;
-				}
-			break;
-			case 'text':
-			case 'hidden':
-			case 'password':
-				if(eval("return isset($request);")) {
-					$html->value = str_replace('"', '&quot;', eval("return $request;"));
-				} else {
-					$html->value = '';
-				}
-			break;
-		}
-		return $html;
-
-	}
-
-	//---------------------------------------
-	/**
-	 * handle htmlobject_select
-	 *
-	 * @acess protected
-	 * @param object $html
-	 * @param string $request
-	 * @return object
-	 */
-	//---------------------------------------
-	function handle_htmlobject_select($html, $request) {
-
-		if(eval("return isset($request);")) {
-			if(is_array(eval("return $request;"))) {
-				$html->selected = eval("return $request;");
-			} else {
-				$html->selected = array(eval("return $request;"));
-			}
-		}
-		return $html;
-
-	}
-
-	//---------------------------------------
-	/**
-	 * handle htmlobject_textarea
-	 *
-	 * @acess protected
-	 * @param object $html
-	 * @param string $request
-	 * @return object
-	 */
-	//---------------------------------------
-	function handle_htmlobject_textarea($html, $request) {
-
-		if(eval("return isset($request);")) {
-			$html->text = str_replace('<', '&lt;', eval("return $request;"));
-		} else {
-			$html->text = '';
-		}
-		return $html;
-
-	}
-
-	//---------------------------------------
-	/**
-	 * handle label
-	 *
-	 * @acess protected
-	 * @param array $data
-	 * @return string
-	 */
-	//---------------------------------------
-	function get_label($data) {
-
-		$label = '';
-		if(
-			isset($data['label']) && $data['label'] != '' &&
-			isset($data['object']['attrib']['name'])
-		) {
-			$label = $data['label'];
-			$name  = $data['object']['attrib']['name'];
-			// mark error
-			if($this->check_request) {
-				if(array_key_exists($name, $this->check_request)) {
-					$label = '<span class="error">'.$label.'</span>';
-				}
-			}
-			// mark required
-			if(isset($data['required']) && $data['required'] === true) {
-				$label = $label.' '.$this->str_required;
-			}
-		}
-		return $label;
-
-	}
-	//-------------------------- Helpers
-
-	//---------------------------------------
-	/**
-	 * get tab_request as html inputs
-	 *
-	 * @acess protected
-	 * @param array $arValues
-	 * @return string
-	 */
-	//---------------------------------------
-	function get_tab_request_as_input($arValues = array()) {
-
-		$strReturn = '';
-		$arValues = array_merge($this->tab_request, $arValues);
-		foreach ($arValues as $key => $value) {
-			$strReturn .= $this->get_input($key, $value, 'hidden');
-		}
-		return $strReturn;
-
-	}
-
-	//---------------------------------------
-	/**
-	 * get htmlobject_input as string
-	 *
-	 * @acess protected
-	 * @param string $name
-	 * @param string $value
-	 * @param enum $type
-	 * @return string
-	 */
-	//---------------------------------------
-	function get_input($name, $value, $type = 'hidden') {
-
-		$value = str_replace('"', '&quot;', $value);
-		$value = str_replace('<', '&lt;', $value);
-
-		$html = new htmlobject_input();
-		$html->name = $name;
-		$html->value = $value;
-		$html->type = $type;
-
-		return $html->get_string();
-	}
-
-	//---------------------------------------
-	/**
-	 * get htmlobject_button as string
-	 *
-	 * @acess protected
-	 * @param string $name
-	 * @param string $value
-	 * @param string $label
-	 * @return string
-	 */
-	//---------------------------------------
-	function get_button($name, $value, $label) {
-
-		$html = new htmlobject_button();
-		$html->name = $name;
-		$html->value = $value;
-		$html->type = 'submit';
-		$html->label = $label;
-
-		return $html->get_string();
-	}
-
-
-} // end class
diff --git a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.head.class.php b/openQRM-5.3.50-CE/src/web/base/class/htmlobject.head.class.php
deleted file mode 100644
index 8628b24..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.head.class.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-class htmlobject_doctype
-{
-/**
-* Doctype
-* @access public
-* @var string ['html', 'xhtml']
-*/
-var $doctype = 'html';
-/**
-* Doctypemodel
-* @access public
-* @var string ['strict', 'transitional', 'frameset']
-*/
-var $doctypemodel = 'transitional';
-
-function get_doctype() {
-
-$this->doctype = strtolower($this->doctype);
-$this->doctypemodel = strtolower($this->doctypemodel);
-
-if($this->doctype == 'xhtml' && $this->doctypemodel == 'strict') {
-$_strReturn = '
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-'; }
-
-if($this->doctype == 'xhtml' && $this->doctypemodel == 'transitional') {
-$_strReturn = '
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-'; }
-
-if($this->doctype == 'xhtml' && $this->doctypemodel == 'frameset') {
-$_strReturn = '
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-'; }
-
-if($this->doctype == 'html' && $this->doctypemodel == 'strict') {
-$_strReturn = '
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-	"http://www.w3.org/TR/html4/strict.dtd">
-<html>
-'; }
-
-if($this->doctype == 'html' && $this->doctypemodel == 'transitional') {
-$_strReturn = '
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-	"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-'; }
-
-if($this->doctype == 'html' && $this->doctypemodel == 'frameset') {
-$_strReturn = '
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
-	"http://www.w3.org/TR/html4/frameset.dtd">
-<html>
-'; }
-
-return $_strReturn;
-}
-
-
-}
-
-
-class htmlobject_head extends htmlobject_doctype
-{
-/**
-* Title of page
-* @access public
-* @var string
-*/
-var $title = '';
-
-/**
-* internal use only
-*/
-var $_meta = array();
-var $_style = array();
-var $_script = array();
-
-	/**
-	* get head values as string
-	* @access public
-	* @return string
-	*/
-	function get_string() {
-
-		if(count($this->_style) > 0) {
-			$this->add_meta('Content-Style-Type', 'text/css');
-		}
-		if(count($this->_script) > 0) {
-			$this->add_meta('Content-Script-Type', 'text/javascript');
-		}
-		$_strReturn = "\n";
-		$_strReturn .= $this->get_doctype();
-		$_strReturn .= "<head>\n";
-		$_strReturn .= implode("\n", $this->_meta)."\n";
-		$_strReturn .= implode("\n", $this->_style)."\n";
-		$_strReturn .= implode("\n", $this->_script)."\n";
-		$_strReturn .= '<title>'.$this->title."</title>\n";
-		$_strReturn .= "</head>\n";
-
-		return $_strReturn;
-	}
-	/**
-	* Add metatag to head
-	* @access public
-	* @param $value string
-	* @param $content string
-	* @param $type string [http-equiv, name]
-	*/
-	function add_meta ($value, $content ,$type = 'http-equiv') {
-		$this->_meta[] = '<meta '.$type.'="'.$value.'" content="'.$content.'">';
-	}
-	/**
-	* Add external stylesheet to head
-	* @access public
-	* @param $path string [url]
-	* @param $media string [all, screen, print]
-	*/
-	function add_style ($path, $media='all') {
-		$this->_style[] = '<link rel="stylesheet" media="'.$media.'" href="'.$path.'">';
-	}
-	/**
-	* Add external script to head
-	* @access public
-	* @param $path string [url]
-	*/
-	function add_script ($path) {
-		$this->_script[] = '<script src="'.$path.'" type="text/javascript"></script>';
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.http.class.php b/openQRM-5.3.50-CE/src/web/base/class/htmlobject.http.class.php
deleted file mode 100644
index 9bd5782..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.http.class.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-/**
- * @package htmlobjects
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-//----------------------------------------------------------------------------------------
-
-class http
-{
-/**
-* regex pattern for httprequest (crosssitescripting)
-* @access protected
-* @var array
-*/
-var $request_filter;
-
-
-	//---------------------------------------------------------------
-	/**
-	* returns http request as cleaned string
-	* string is empty when request not set
-	* @access public
-	* @param  $arg string
-	* @return string | array [empty if request not set]
-	*/
-	//---------------------------------------------------------------
-	function get_request($arg)
-	{
-		if(debug::active()) {
-			debug::add($arg);
-		}
-		$Req = '$_REQUEST'.$this->string_to_index($arg);
-
-		if(eval("return isset($Req);") && eval("return $Req;") != '') {
-			if(is_array(eval("return $Req;"))) {
-				return $this->get_request_array(eval("return $Req;"));
-			} else {
-				return $this->filter_request(eval("return $Req;"));
-			}
-		} else {
-			return '';
-		}
-
-	}
-
-	//-------------------------------------------------
-	/**
-	 * get values from http request as array
-	 * @acess protected
-	 * @return array
-	 */
-	//-------------------------------------------------
-	function get_request_array($arg) {
-
-		debug::add($arg);
-
-		$arReturn = array();
-		if(is_array($arg)) {
-			foreach($arg as $key => $value) {
-				if(is_array($value)) {
-					$arReturn[$key] = $this->get_request_array($value);
-				}
-				if(is_string($value)) {
-					$arReturn[$key] = $this->filter_request($value);
-				}
-			}
-		}
-		if(is_string($arg)) {
-			$arReturn[$key] = $this->filter_request($value);
-		}
-		return $arReturn;
-	}
-
-	//---------------------------------------------------------------
-	/**
-	* set filter for request handling (XSS)
-	*
-	* <code>
-	* $http = new http();
-	* $http->set_request_filter(array(
-	*    array ( 'pattern' => '~\r\n~', 'replace' => '\n'),
-	*  );
-	* </code>
-	*
-	* @access public
-	* @param  array $arg
-	*/
-	//---------------------------------------------------------------
-	function set_request_filter($arg = array()) {
-		if(isset($arg) && count($arg) > 0) {
-			$this->request_filter = array();
-			foreach($arg as $key => $value) {
-				if(isset($value['pattern'])) {
-					if(!isset($value['replace'])) {
-						debug::add('could not find array key ["replace"]', 'NOTICE');
-						$value['replace'] = '';
-					}
-					$this->request_filter[] = array('pattern' => $value['pattern'], 'replace' => $value['replace']);
-				} else {
-					debug::add('could not find array key ["pattern"]', 'ERROR');
-				}
-			}
-		} else {
-			debug::add('nothing to do', 'NOTICE');
-		}
-	}
-
-	//---------------------------------------------------------------
-	/**
-	* add filter for request handling
-	* @access public
-	* @param  array $arg
-	*/
-	//---------------------------------------------------------------
-	function add_request_filter( $arg ) {
-
-		$tmp = $this->request_filter;
-		$this->set_request_filter($arg);
-		if($tmp) {
-			$this->request_filter = array_merge($tmp, $this->request_filter);
-		}
-
-	}
-
-
-	//---------------------------------------------------------------
-	/**
-	* performes preg_replace
-	* @access protected
-	* @param string $arg
-	* @return string
-	*/
-	//---------------------------------------------------------------
-	function filter_request($arg) {
-		if(is_string($arg)) {
-			$str = '';
-			$arg = stripslashes($arg);
-			if(is_array($this->request_filter)) {
-				foreach ($this->request_filter as $reg) {
-					$arg = regex::replace($reg['pattern'], $reg['replace'], $arg);
-				}
-				$str = $arg;
-			} else {
-				debug::add('no filter set - use set_request_filter()', 'NOTICE');
-				$str = $arg;
-			}
-			debug::add($arg.' return '.$str);
-			return $str;
-		} else {
-			debug::add($arg.' is not type string', 'ERROR');
-		}
-	}
-
-	//---------------------------------------------------------------
-	/**
-	* returns http request [POST/GET] as string
-	* @access public
-	* @param $firstchar string
-	* @param $excludes array
-	* @return string [empty if request empty]
-	*/
-	//---------------------------------------------------------------
-	function get_request_string($firstchar = '?', $excludes = array()) {
-		$type = array('$_POST','$_GET');
-		$_strReturn = '';
-		foreach($type as $request) {
-			foreach(eval("return $request;") as $name => $foo) {
-				if(in_array($name, $excludes) == false) {
-					$value = http_request($name);
-					if(is_array($value)) {
-						foreach($value as $key => $val) {
-							$_strReturn .= '&'.$name.'['.$key.']='.$val;
-						}
-					} else {
-						$_strReturn .= '&'.$name.'='.$value;
-					}
-				}
-			}
-		}
-		if($_strReturn != '') $_strReturn = preg_replace('/^&/', $firstchar, $_strReturn);
-		return $_strReturn;
-	}
-
-	//-------------------------------------------------
-	/**
-	 * transform string to array index string
-	 * @acess public
-	 * @param array $name
-	 * @return string
-	 */
-	//-------------------------------------------------
-	function string_to_index($arg) {
-
-		$strReturn = '';
-
-		// replace unindexed array
-		$arg = $this->unindex_array($arg);
-		$regex = '~(\[.*\])~';
-
-		preg_match($regex, $arg, $matches);
-		if($matches) {
-			$str = '['.preg_replace('~\[.*\]~', '', $arg).']'.$matches[0];
-		}
-		else  {
-			$str = '['.$arg.']';
-		}
-		// add quots to make it array
-		$str = str_replace('[', '["', $str);
-		$str = str_replace(']', '"]', $str);
-
-		return $str;
-
-	}
-
-	//-------------------------------------------------
-	/**
-	 * remove unindexed array
-	 * @acess protected
-	 * @param array $name
-	 * @return string
-	 */
-	//-------------------------------------------------
-	function unindex_array($name) {
-		return preg_replace('~\[]$~', '', $name);
-	}
-
-	//---------------------------------------------------------------
-	/**
-	* header redirect
-	* tries php header redirect,
-	* on fail js redirect,
-	* on fail meta redirect
-	*
-	* @access public
-	* @param  $url string
-	*/
-	//---------------------------------------------------------------
-	function redirect($url){
-		if (!headers_sent()){
-			header('Location: '.$url); exit;
-		} else {
-			echo '<script type="text/javascript">';
-			echo 'window.location.href="'.$url.'";';
-			echo '</script>';
-			echo '<noscript>';
-			echo '<meta http-equiv="refresh" content="0;url='.$url.'" />';
-			echo '</noscript>'; exit;
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.preloader.class.php b/openQRM-5.3.50-CE/src/web/base/class/htmlobject.preloader.class.php
deleted file mode 100644
index 5c4395a..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.preloader.class.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-class htmlobject_preloader extends htmlobject
-{
-	function start($string = 'Loading ...') {
-		echo '
-		<div id="Loadbar" style="margin:40px 0 0 40px;display:none">
-		<strong>'.$string.'</strong>
-		</div>
-		<script>
-		document.getElementById("Loadbar").style.display = "block";
-		</script>
-		';
-		flush();
-	}
-
-	function stop() {
-		echo '
-		<script>
-			document.getElementById("Loadbar").style.display = "none";
-		</script>
-		';
-	}
-}
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.table.class.php b/openQRM-5.3.50-CE/src/web/base/class/htmlobject.table.class.php
deleted file mode 100644
index a9a1d20..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.table.class.php
+++ /dev/null
@@ -1,1157 +0,0 @@
-<?php
-/**
- * @package htmlobjects
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//----------------------------------------------------------------------------------------
-
-class htmlobject_table extends htmlobject
-{
-/**
-* align
-* @access public
-* @var enum (left | center | right)
-*/
-var $align = '';
-/**
-* table border
-* @access public
-* @var int
-*/
-var $border = '';
-/**
-* table backgroundcolor
-* @access public
-* @var HEX
-*/
-var $bgcolor = '';
-/**
-* cellpadding
-* @access public
-* @var int
-*/
-var $cellpadding;
-/**
-* cellspacing
-* @access public
-* @var int
-*/
-var $cellspacing;
-/**
-* frame
-* @access public
-* @var enum (void | above | below | hsides | lhs | rhs | vsides | box | border)
-*/
-var $frame = '';
-/**
-* rules
-* @access public
-* @var enum (none | groups | rows | cols | all)
-*/
-var $rules = '';
-/**
-* summary
-* @access public
-* @var string
-*/
-var $summary = '';
-/**
-* width
-* @access public
-* @var int
-*/
-var $width = '';
-
-/**
-* Content of table
-* @access public
-* @var array
-*/
-var $arr_table = array();
-
-
-	function init() {
-		parent::init();
-		if ($this->align != '') { $this->_init .= ' align="'.$this->align.'"'; }
-		if (isset($this->border) && $this->border !== '') { $this->_init .= ' border="'.$this->border.'"'; }
-		if ($this->bgcolor != '') { $this->_init .= ' bgcolor="'.$this->bgcolor.'"'; }
-		if (isset($this->cellpadding) && $this->cellpadding !== '') { $this->_init .= ' cellpadding="'.$this->cellpadding.'"'; }
-		if (isset($this->cellspacing) && $this->cellspacing !== '') { $this->_init .= ' cellspacing="'.$this->cellspacing.'"'; }
-		if ($this->frame != '') { $this->_init .= ' frame="'.$this->frame.'"'; }
-		if ($this->rules != '') { $this->_init .= ' rules="'.$this->rules.'"'; }
-		if ($this->summary != '') { $this->_init .= ' summary="'.$this->summary.'"'; }
-		if ($this->width != '') { $this->_init .= ' width="'.$this->width.'"'; }
-	}
-
-	function get_string() {
-		$_strReturn = '';
-		$this->init();
-		$_strReturn = "\n<table$this->_init>";
-		foreach($this->arr_table as $tr) {
-			if(is_object($tr) == true && get_class($tr) == 'htmlobject_tr') {
-				$_strReturn .= $tr->get_string();
-			}
-			elseif(is_string($tr) == true) {
-				$_strReturn .= $tr;
-			}
-			else {
-				$_strReturn .= 'tr type not defined';
-			}
-		}
-		$_strReturn .= "</table>\n";
-		return $_strReturn;
-	}
-
-	function add($tr) {
-		$this->arr_table[] = $tr;
-	}
-	
-}
-
-//----------------------------------------------------------------------------------------
-/**
- * Tr
- *
- * @package htmlobjects
- * @author Alexander Kuballa akuballa@openqrm-enterprise.com
- * @copyright Copyright (c) 2009, Alexander Kuballa
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- * @version 1.0
-*/
-//----------------------------------------------------------------------------------------
-
-class htmlobject_tr extends htmlobject_table
-{
-/**
-* Content of tr
-* @access public
-* @var string
-*/
-var $arr_tr = array();
-
-
-	function get_string() {
-		$_strReturn = '';
-		$this->init();
-		$_strReturn = "\n<tr$this->_init>";
-		foreach($this->arr_tr as $td) {
-			if(is_object($td) == true && get_class($td) == 'htmlobject_td') {
-				$_strReturn .= $td->get_string();
-			}
-			elseif(is_string($td) == true) {
-				$_strReturn .= $td;
-			}
-			else {
-				$_strReturn .= '';
-			}
-		}
-		$_strReturn .= "</tr>\n";
-		return $_strReturn;
-	}
-
-	function add($td) {
-		$this->arr_tr[] = $td;
-	}
-
-}
-
-//----------------------------------------------------------------------------------------
-/**
- * Td
- *
- * @package htmlobjects
- * @author Alexander Kuballa akuballa@openqrm-enterprise.com
- * @copyright Copyright (c) 2009, Alexander Kuballa
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- * @version 1.0
-*/
-//----------------------------------------------------------------------------------------
-
-class htmlobject_td extends htmlobject_tr
-{
-/**
-* colspan
-* @access public
-* @var int
-*/
-var $colspan = '';
-/**
-* td type
-* @access public
-* @var enum (td,th)
-*/
-var $type = 'td';
-/**
-* Content of td
-* @access public
-* @var string
-*/
-var $text = '';
-
-
-	function init() {
-		parent::init();
-		if ($this->colspan != '') { $this->_init .= ' colspan="'.$this->colspan.'"'; }
-	}
-
-	function get_string() {
-		$_strReturn = '';
-		$this->init();
-		$_strReturn = "\n<$this->type$this->_init>";
-		$_strReturn .= $this->text;
-		$_strReturn .= "</$this->type>";
-		return $_strReturn;
-	}
-}
-
-//----------------------------------------------------------------------------------------
-/**
- * Tablebuilder
- *
- * @package htmlobjects
- * @author Alexander Kuballa akuballa@openqrm-enterprise.com
- * @copyright Copyright (c) 2009, Alexander Kuballa
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- * @version 1.0
-*/
-//----------------------------------------------------------------------------------------
-
-class htmlobject_table_builder extends htmlobject_table
-{
-/**
-* head row of table (th)
-* <code>
-* $head = array();
-* $head['id'] = array();
-* $head['id']['title'] = 'id';
-* $head['date'] = array();
-* $head['date']['title'] = 'Datum';
-* $head['date']['sortable'] = false;
-* $head['date']['hidden'] = true;
-*
-* $table = new htmlobject_table_builder();
-* $table->head = $head;
-* </code>
-* @access public
-* @var array
-*/
-var $head = array();
-/**
-* table body
-* <code>
-* $body = array();
-* $body[] = array('id' => 'value1', 'date' => 'value2', ...)
-* $body[] = array('id' => 'value1', 'date' => 'value2', ...)
-*
-* $table = new htmlobject_table_builder();
-* $table->body = $body;
-* </code>
-* @access public
-* @var array
-*/
-var $body = array();
-/**
-* bottom row of table
-* <code>
-* $bottom = array();
-* $bottom[] = 'delete';
-* $bottom[] = 'sort';
-*
-* $table = new htmlobject_table_builder();
-* $table->bottom = $bottom;
-* </code>
-* @access public
-* @var array
-*/
-var $bottom = array();
-/**
-* name for submit buttons
-* @access public
-* @var string
-*/
-var $bottom_buttons_name = 'action';
-
-/**
-*  ------------------------------------------------------------- Identifier Section
-*/
-/**
-* field to add value to checkbox
-* @access public
-* @var string
-*/
-var $identifier = '';
-/**
-* type of identifier input
-* @access public
-* @var enum $identifier_type possible values [checkbox, radio]
-*/
-var $identifier_name = 'identifier';
-/**
-* type of identifier input
-* @access public
-* @var enum $identifier_type possible values [checkbox, radio]
-*/
-var $identifier_type = 'checkbox';
-/**
-* array of identifiers to be checked
-* @access public
-* @var array()
-*/
-var $identifier_checked = array();
-/**
-* array of identifiers to be disabled
-* @access public
-* @var array()
-*/
-var $identifier_disabled = array();
-
-/**
-*  ------------------------------------------------------------- CSS Section
-*/
-/**
-* global prefix for css classes
-* @access public
-* @var string
-*/
-var $css_prefix = 'htmlobject_';
-
-/**
-*  ------------------------------------------------------------- Form Section
-*/
-/**
-* url to process request
-*  Form disabled if empty
-* <code>
-* $thisfile = basename($_SERVER['PHP_SELF']);
-* $table = new htmlobject_table_builder();
-* $table->form_action = $thisfile;
-* </code>
-* @access public
-* @var string
-*/
-var $form_action = '';
-/**
-* first limit
-* <code>
-* // to change initial value to 10
-* $table = new htmlobject_table_builder('somefield','', 10);
-* </code>
-* @access private
-* @var string
-*/
-var $limit = 20;
-/**
-* select with limit values  
-* <code>
-* $limit_select = array(
-*	array("value" => 10, "text" => 10),
-*	array("value" => 20, "text" => 20),
-*	array("value" => 30, "text" => 30),
-*	);
-*
-* $table = new htmlobject_table_builder();
-* $table->limit_select = $limit_select;
-* </code>
-* @access public
-* @var array
-*/
-var $limit_select = array();
-/**
-* offset  
-* @access public
-* @var int
-*/
-var $offset = 0;
-/**
-* maximum 
-* @access public
-* @var int
-*/
-var $max = 0;
-/**
-* field to be sorted
-* @access public
-* @var int
-*/
-var $sort = '';
-/**
-* extra params for table head sort function
-* disabled if not set
-* @access public
-* @var string
-*/
-var $sort_params;
-/**
-* sort order 
-* @access public
-* @var enum $order possible values [ASC, DESC]
-*/
-var $order = '';
-var $dorder = 'ASC';
-
-/**
-* use array_sort to sort output 
-* @access public
-* @var bol
-*/
-var $autosort = false;
-
-/**
-*  ------------------------------------------------------------- Lang Section
-*/
-/**
-* capation of refresh button 
-* @access public
-* @var string
-*/
-var $lang_button_refresh = 'refresh';
-/**
-* label for sort select
-* @access public
-* @var string
-*/
-var $lang_label_sort = 'order by';
-/**
-* label for offset input
-* @access public
-* @var string
-*/
-var $lang_label_offset = 'offset';
-/**
-* label for limit select
-* @access public
-* @var string
-*/
-var $lang_label_limit = 'limit';
-/**
-* text for nolimit option
-* @access public
-* @var string
-*/
-var $lang_option_nolimit = 'none';
-/**
-* Title for identifier Select function
-* @access public
-* @var string
-*/
-var $lang_select_title = 'Select:';
-/**
-* identifier Select function (all)
-* @access public
-* @var string
-*/
-var $lang_select_all = 'all';
-/**
-* identifier Select function (none)
-* @access public
-* @var string
-*/
-var $lang_select_none = 'none';
-/**
-* identifier Select function (none)
-* @access public
-* @var string
-*/
-var $lang_select_invert = 'inverted';
-
-/**
-*  ------------------------------------------------------------- Private Section
-*/
-/**
-* number of cols 
-* @access private
-* @var int
-*/
-var $_num_cols;
-/**
-* output body array 
-* @access private
-* @var array
-*/
-var $_body = array();
-/**
-* additional headrows 
-* @access private
-* @var array
-*/
-var $_headrow = array();
-/**
-* additional bottomrows 
-* @access private
-* @var array
-*/
-var $_bottomrow = array();
-/**
-* internal prefix for posted vars 
-* @access private
-* @var array
-*/
-var $_var_prefix;
-
-
-	//----------------------------------------------------------------------------------------
-	/**
-	* init htmlobject_table_builder vars from Request
-	* @access public
-	* @param string $sort key for initial sort - sort functionality is disabled if empty
-	* @param enum $order  initial sort order [ASC, DESC]
-	* @param int $limit  initial limit
-	* @param int $offset  initial offset
-	* @param string $var_prefix  prefix for posted vars
-	*/
-	//----------------------------------------------------------------------------------------
-	function htmlobject_table_builder($sort = '', $orderr = '', $limit = '', $offset = '', $var_prefix = 'table_') {
-
-		$this->_var_prefix = $var_prefix;
-
-		// filter request - remove all none digits
-		$replace_tmp = $this->request_filter;
-		$this->request_filter = array(array('pattern' => '~[^0-9]~', 'replace' => ''));
-
-		if($this->get_request($this->_var_prefix.'limit') != '') {
-			$this->limit = $this->get_request($this->_var_prefix.'limit');
-		}
-		else if($limit != '') {
-			$this->limit = $limit;
-		}
-		if($this->get_request($this->_var_prefix.'max') != '') {
-			$this->max = $this->get_request($this->_var_prefix.'max');
-		}
-		if($this->get_request($this->_var_prefix.'offset') != '') {
-			$this->offset = $this->get_request($this->_var_prefix.'offset');
-		}
-		else if ($offset != '') {
-			$this->offset = $offset;
-		}
-
-		// reset request filter
-		$this->request_filter = $replace_tmp;
-
-		if($this->get_request($this->_var_prefix.'order') != '') {
-			$this->order = $this->get_request($this->_var_prefix.'order');
-		} else if($orderr != '') {
-			$this->order = $orderr;
-		} else {
-			$this->order = $this->dorder;
-		}
-		if($this->get_request($this->_var_prefix.'sort') != '') {
-			$this->sort = $this->get_request($this->_var_prefix.'sort');
-		}
-		else if($sort != '') {
-			$this->sort = $sort;
-		}
-
-		//------------------------------------------------------------------- set new offset
-		if($this->get_request($this->_var_prefix.'action') != '') {
-			switch ($this->get_request($this->_var_prefix.'action')) {
-				case '<': $this->offset = $this->offset - $this->limit; break;
-				case '<<': $this->offset = 0; break;
-				case '>': $this->offset = $this->offset + $this->limit; break;
-				case '>>': $this->offset = $this->max - $this->limit; break;
-				case $this->lang_button_refresh: break;
-			}
-		}
-		//------------------------------------------- check offset
-		if($this->offset >= $this->max ) {
-			$this->offset = $this->max - $this->limit;
-		}
-		if($this->offset < 0 ) {
-			$this->offset = 0;
-		}
-	}
-
-	//----------------------------------------------------------------------------------------
-	/**
-	* init basic values _body, _num_cols
-	* @access public
-	*/
-	//----------------------------------------------------------------------------------------
-	function init_table_builder() {
-
-		$minus = 0;
-		// Execute head array special key values
-		foreach($this->head as $key => $value) {
-			//  special key hidden
-			if(@array_key_exists('hidden', $this->head[$key]) == true) {
-				if($this->head[$key]['hidden'] === true) {
-					$minus = $minus+1;
-				}
-			}
-		}
-		$this->_num_cols = count($this->head) - $minus;
-		if($this->identifier != '') { $this->_num_cols = $this->_num_cols +1; }
-
-		// Sortfunction eabled?
-		if($this->sort != '') {
-			// use autosort ?
-			if($this->autosort == true) { $this->arr_sort(); }
-			// max still untouched?
-			if($this->max == 0) { $this->max = count($this->body); }
-			// Input bigger than Output?
-			if(count($this->body) > $this->limit && $this->limit != 0) {
-				// max smaller than  limit + offset?
-				if(($this->offset + $this->limit) < $this->max ) {
-					$max = $this->offset + $this->limit;
-				} else { $max = $this->max;	}
-				// Transfer Input to Output
-				for($i = $this->offset; $i < $max; $i++) {
-					$this->_body[$i] = $this->body[$i];
-				}
-			} else { $this->_body = $this->body; }
-		} else { $this->_body = $this->body; }
-	}
-	//----------------------------------------------------------------------------------------
-	/**
-	* sorts array [body] by key [sort]
-	* @access public
-	*/
-	//----------------------------------------------------------------------------------------
-	function arr_sort() {
-		if($this->order != '') {
-			if($this->order == 'ASC') $sort_order = SORT_ASC;
-			if($this->order == 'DESC') $sort_order = SORT_DESC;
-		} else {
-			$sort_order = SORT_ASC;
-		}
-		$column = array();
-		foreach($this->body as $val) {
-			$column[] = $val[$this->sort];
-		}
-		array_multisort($column, $sort_order, $this->body);
-	}
-	//----------------------------------------------------------------------------------------
-	/**
-	* builds table head
-	* @access public
-	* @return object|string htmlobject_tr or empty string
-	*/
-	//----------------------------------------------------------------------------------------
-	function get_table_head() {
-		$tr = '';
-		if(count($this->head) > 0) {
-			$tr = new htmlobject_tr();
-			$tr->css = $this->css_prefix.'tr';
-			$tr->id = 'tr_'. uniqid();
-
-			foreach($this->head as $key_2 => $value) {
-
-				$hidden = false;
-				if(@array_key_exists('hidden', $this->head[$key_2]) == true) {
-					if($this->head[$key_2]['hidden'] === true) {
-						$hidden = true;
-					}
-				}
-
-				$sortable = true;
-				if(@array_key_exists('sortable', $this->head[$key_2]) == true) {
-					if($this->head[$key_2]['sortable'] === false) {
-						$sortable = false;
-					}
-				}
-
-				if($hidden === false) {
-					if($value['title'] == '') {
-						$str = '&#160;';
-					} else {
-						if($this->sort != '' && $sortable ===  true && isset($this->sort_params)) {
-							$order_param = '';
-							$linkclass = '';
-							if($this->sort == $key_2) {
-								if($this->order == 'ASC') {
-									$order_param = '&'.$this->_var_prefix.'order=DESC';
-									$linkclass = ' class="desc"';
-								} else {
-									$linkclass = ' class="asc"';
-								}
-							}
-							$str = '<a href="?'.$this->_var_prefix.'sort='.$key_2.$this->sort_params.$order_param.'"'.$linkclass.'>'.$value['title'].'</a>';
-						} else {
-							$str = $value['title'];
-						}
-					}
-					$td = new htmlobject_td();
-					$td->type = 'th';
-					$td->css = $this->css_prefix.'td '.$key_2;
-					$td->text = $str;
-					$tr->add($td);
-				}
-			}
-			if($this->identifier != '') {
-				$td = new htmlobject_td();
-				$td->type = 'th';
-				$td->css = $this->css_prefix.'td '.$this->identifier_name;
-				$td->text = '&#160;';
-				$tr->add($td);
-			}
-		}
-		return $tr;
-	}
-	//----------------------------------------------------------------------------------------
-	/**
-	* adds one row to table body
-	* @access public
-	* @param array $val
-	* @return object|string htmlobject_tr or empty string
-	*/
-	//----------------------------------------------------------------------------------------
-	function get_table_body($key, $val, $i) {
-		$ident = 'id'. uniqid();
-
-		$tr = new htmlobject_tr();
-		$tr->css = $this->css_prefix.'tr ' .$i;
-		$tr->id = 'tr_'. uniqid();
-		$tr->handler = $this->get_js_tr($ident);
-
-		foreach($val as $key_2 => $v) {
-			if($v == '') { $v = '&#160;'; }
-				if(@array_key_exists('exec', $this->head[$key_2]) == true) {
-					#echo $key_2;
-				}
-				$hidden = false;
-				if(@array_key_exists('hidden', $this->head[$key_2]) == true) {
-					if($this->head[$key_2]['hidden'] === true) {
-						$hidden = true;
-					}
-				}
-
-				if($hidden === false) {
-					$td = new htmlobject_td();
-					$td->type = 'td';
-					$td->css = $this->css_prefix.'td '.$key_2;
-					$td->text = $v;
-					$tr->add($td);
-				}
-			}
-			//--------------------------------------------------------------- identifier
-			if($this->identifier != '') {
-				$tr->add($this->get_indentifier($key, $ident));
-			}
-		return $tr;
-	}
-	//----------------------------------------------------------------------------------------
-	/**
-	* returns table bottom row
-	* @access public
-	* @return object|string htmlobject_tr or empty string
-	*/
-	//----------------------------------------------------------------------------------------
-	function get_table_bottom () {
-		$tr = '';
-		if(isset($this->bottom[0]) && isset($this->body[0])) {
-			$tr = new htmlobject_tr();
-			$tr->css = $this->css_prefix.'tr';
-			$tr->id = 'tr_'. uniqid();
-
-			$td = new htmlobject_td();
-			$td->colspan = $this->_num_cols;
-			$td->type = 'td';
-			$td->css = $this->css_prefix.'td bottom';
-			$str = '<div class="actiontable">';
-			foreach($this->bottom as $key_2 => $v) {
-				$html = new htmlobject_input();
-				$html->name = $this->bottom_buttons_name;
-				$html->value = $v;
-				$html->type = 'submit';
-				$str .= $html->get_string();
-			}
-			$str .= '</div>';
-			$td->text = $this->get_select().''.$str.'<div style="line-height:0px;clear:both;">&#160;</div>';
-			$tr->add($td);
-		}
-		return $tr;
-	}
-	//----------------------------------------------------------------------------------------
-	/**
-	* adds a row above the sort row
-	* @access public
-	* @param  $str string
-	*/
-	//----------------------------------------------------------------------------------------
-	function add_headrow($str = '') {
-		$tr = new htmlobject_tr();
-		$tr->css = $this->css_prefix.'tr';
-		$tr->id = 'tr_'. uniqid();
-
-		$td = new htmlobject_td();
-		$td->colspan = $this->_num_cols;
-		$td->type = 'td';
-		$td->css = $this->css_prefix.'td head';
-		$td->text = $str;
-		$tr->add($td);
-
-		$this->_headrow[] = $tr;
-	}
-	//----------------------------------------------------------------------------------------
-	/**
-	* adds a row under the bottom row
-	* @access public
-	* @param  $str string
-	*/
-	//----------------------------------------------------------------------------------------
-	function add_bottomrow($str = '') {
-		$tr = new htmlobject_tr();
-		$tr->css = $this->css_prefix.'tr';
-		$tr->id = 'tr_'. uniqid();
-
-		$td = new htmlobject_td();
-		$td->colspan = $this->_num_cols;
-		$td->type = 'td';
-		$td->css = $this->css_prefix.'td head';
-		$td->text = $str;
-		$tr->add($td);
-
-		$this->_bottomrow[] = $tr;
-	}
-	//----------------------------------------------------------------------------------------
-	/**
-	* adds sort functions to table
-	* @access public
-	* @return object|string
-	*/
-	//----------------------------------------------------------------------------------------
-	function get_sort() {
-		$strR = '';
-		if($this->sort != '') {
-			foreach($this->head as $key_2 => $v) {
-				if(isset($v['sortable']) == false) {
-					$v['sortable'] = true;
-				}
-				if($v['sortable'] == true) {
-					$value[] = array("value" => $key_2, "label" => $v['title']);
-				}
-			}
-			$sort = new htmlobject_select();
-			$sort->id = 'p'.uniqid();
-			$sort->name = $this->_var_prefix.'sort';
-			$sort->text_index = array("value" => "value", "text" => "label");
-			$sort->text = $value;
-			$sort->selected = array($this->sort);
-			$str_sort = '<label for="'.$sort->id.'">'.$this->lang_label_sort.$sort->get_string().'</label>';
-
-			$order = new htmlobject_select();
-			$order->id = 'p'.uniqid();
-			$order->name = $this->_var_prefix.'order';
-			$order->text_index = array("value" => "value", "text" => "text");
-			$order->text = array(array("value" => "ASC", "text" => "ASC"),array("value" => "DESC", "text" => "DESC"));
-			$order->selected = array($this->order);
-			$str_order = $order->get_string();
-
-			if (count($this->limit_select) <= 0) {
-			$this->limit_select = array(
-				array("value" => 0, "text" => $this->lang_option_nolimit),
-				array("value" => 10, "text" => 10),
-				array("value" => 20, "text" => 20),
-				array("value" => 30, "text" => 30),
-				array("value" => 40, "text" => 40),
-				array("value" => 50, "text" => 50),
-				);
-			}
-			$limit_input = new htmlobject_select();
-			$limit_input->id = 'p'.uniqid();
-			$limit_input->name = $this->_var_prefix.'limit';
-			$limit_input->text_index = array("value" => "value", "text" => "text");
-			$limit_input->text = $this->limit_select;
-			$limit_input->selected = array($this->limit);
-			$str_limit = '<label for="'.$limit_input->id.'">'.$this->lang_label_limit.$limit_input->get_string().'</label>';
-
-			$offset_input = new htmlobject_input();
-			$offset_input->id = 'p'.uniqid();
-			$offset_input->name = $this->_var_prefix.'offset';
-			$offset_input->value = "$this->offset";
-			$offset_input->type = 'text';
-			$offset_input->size = 3;
-			$str_offset = '<label for="'.$offset_input->id.'">'.$this->lang_label_offset.$offset_input->get_string().'</label>';
-
-			$max_input = new htmlobject_input();
-			$max_input->name = $this->_var_prefix.'max';
-			$max_input->value = $this->max;
-			$max_input->type = 'hidden';
-
-			$action = new htmlobject_input();
-			$action->name =  $this->_var_prefix.'action';
-			$action->value = $this->lang_button_refresh;
-			$action->type = 'submit';
-
-			$strR = '<div class="sort_box">';
-			$strR .= $max_input->get_string().
-						$str_sort.
-						$str_order.
-						$str_offset.
-						$str_limit.
-						$action->get_string();
-			$strR .= '<div style="line-height:0px;clear:both;">&#160;</div>';
-			$strR .= '</div>';
-		}
-		return $strR;
-	}
-	//----------------------------------------------------------------------------------------
-	/**
-	* returns page turn functions
-	* @access public
-	* @return string
-	*/
-	//----------------------------------------------------------------------------------------
-	function get_pageturn() {
-		$strR = '';
-		if($this->sort != '') {
-			#$this->init_table_builder();
-
-			$first = new htmlobject_input();
-			$first->name =  $this->_var_prefix.'action';
-			$first->value = '<<';
-			$first->type = 'submit';
-
-			$prev = new htmlobject_input();
-			$prev->name =  $this->_var_prefix.'action';
-			$prev->value = '<';
-			$prev->type = 'submit';
-
-			$next = new htmlobject_input();
-			$next->name =  $this->_var_prefix.'action';
-			$next->value = '>';
-			$next->type = 'submit';
-
-			$last = new htmlobject_input();
-			$last->name =  $this->_var_prefix.'action';
-			$last->value = '>>';
-			$last->type = 'submit';
-
-			if($this->limit == 0) { $this->limit = $this->max; }
-
-			if(( $this->offset + $this->limit ) >= $this->max) {
-				$next->style = 'visibility:hidden;';
-				$last->style = 'visibility:hidden;';
-			}
-			if($this->offset <= 0) {
-				$first->style = 'visibility:hidden;';
-				$prev->style = 'visibility:hidden;';
-			}
-
-			if(($this->offset + $this->limit) < $this->max ) {
-				$max = $this->offset + $this->limit;
-			} else {
-				$max = $this->max;
-			}
-
-			$strR .= '<div class="pageturn_box">';
-			$strR .= '<table class="pageturn_table" cellpadding="0" cellspacing="0"></tr>';
-			$strR .= '  <td class="pageturn_left">'.$first->get_string().$prev->get_string().'</td>';
-			$strR .= '  <td class="pageturn_middle">';
-			$strR .= '    <span>'.( $this->offset + 1 ).'</span> - ';
-			$strR .= '    <span>'.$max.'</span> / ';
-			$strR .= '    <span>'.$this->max.'</span>';
-			$strR .= '  </td>';
-			$strR .= '  <td class="pageturn_right">'.$next->get_string().$last->get_string().'</td>';
-			$strR .= '</tr></table>';
-			$strR .= '</div>';
-		}
-		return $strR;
-	}
-	//----------------------------------------------------------------------------------------
-	/**
-	* returns identifier multi select functions
-	* @access public
-	* @return string
-	*/
-	//----------------------------------------------------------------------------------------
-	function get_select() {
-		$strR = '';
-		if($this->identifier_type == 'checkbox' && $this->identifier != '') {
-			$strR .= '<div class="selecttable" id="'.$this->_var_prefix.'SelectTable" style="display:none;">';
-			$strR .= $this->lang_select_title;
-			$strR .= ' <a href="javascript:selectident(\'all\');">'.$this->lang_select_all.'</a>'."\n";
-			$strR .= ' <a href="javascript:selectident(\'none\');">'.$this->lang_select_none.'</a>'."\n";
-			$strR .= ' <a href="javascript:selectident(\'invert\');">'.$this->lang_select_invert.'</a>'."\n";
-			$strR .= '<script>'."\n";
-			$strR .= 'document.getElementById("'.$this->_var_prefix.'SelectTable").style.display = "inline"'."\n";
-			$strR .= 'function selectident(arg) {'."\n";
-			$strR .= '  if(arg == "all") {'."\n";
-			$strR .= '    for(i = 0; i < document.getElementsByName("'.$this->identifier_name.'[]").length; i++)  {'."\n";
-			$strR .= '      document.getElementsByName("'.$this->identifier_name.'[]")[i].checked = true;'."\n";
-			$strR .= '    }'."\n";
-			$strR .= '  }'."\n";
-			$strR .= '  if(arg == "none") {'."\n";
-			$strR .= '    for(i = 0; i < document.getElementsByName("'.$this->identifier_name.'[]").length; i++)  {'."\n";
-			$strR .= '      document.getElementsByName("'.$this->identifier_name.'[]")[i].checked = false;'."\n";
-			$strR .= '    }'."\n";
-			$strR .= '  }'."\n";
-			$strR .= '  if(arg == "invert") {'."\n";
-			$strR .= '    for(i = 0; i < document.getElementsByName("'.$this->identifier_name.'[]").length; i++)  {'."\n";
-			$strR .= '      if(document.getElementsByName("'.$this->identifier_name.'[]")[i].checked == false) {'."\n";
-			$strR .= '        document.getElementsByName("'.$this->identifier_name.'[]")[i].checked = true;'."\n";
-			$strR .= '      } else {'."\n";
-			$strR .= '        document.getElementsByName("'.$this->identifier_name.'[]")[i].checked = false;'."\n";
-			$strR .= '      }'."\n";
-			$strR .= '    }'."\n";
-			$strR .= '  }'."\n";
-			$strR .= '}'."\n";
-			$strR .= '</script>'."\n";
-			$strR .= '</div>'."\n";
-		}
-		return $strR;
-	}
-	//----------------------------------------------------------------------------------------
-	/**
-	* adds identifier td to body row
-	* @access public
-	* @param  $ident string
-	* @return object|string
-	*/
-	//----------------------------------------------------------------------------------------
-	function get_indentifier($key, $ident) {
-		$td = '';
-		if($this->identifier != '') {
-			$html = new htmlobject_input();
-			$html->id = $ident;
-			$html->name = $this->identifier_name.'[]';
-			$html->value = $this->body[$key][$this->identifier];
-			$html->type = $this->identifier_type;
-			if(in_array($this->body[$key][$this->identifier], $this->identifier_checked)) {
-				$html->checked = true;
-			}
-			if(in_array( $this->body[$key][$this->identifier], $this->identifier_disabled)) {
-				$html = new htmlobject_div();
-				$html->text = '&#160;';
-			}
-
-			$td = new htmlobject_td();
-			$td->type = 'td';
-			$td->css = $this->css_prefix.'td '.$this->identifier_name;
-			$td->text = $html->get_string();
-		}
-		return $td;
-	}
-	//----------------------------------------------------------------------------------------
-	/**
-	* returns JS for tr hover and click function
-	* @access public
-	* @return string
-	*/
-	//----------------------------------------------------------------------------------------
-	function  get_js() {
-		$_strReturn = '';
-		$id_1 = '';
-		$id_2 = '';
-		if($this->identifier != '') {
-			$id_1 = 'try { document.getElementById(arg).checked = true; } catch(e) {}';
-			$id_2 = 'try { document.getElementById(arg).checked = false; } catch(e) {}';
-		}
-		$_strReturn .= "\n";
-		$_strReturn .= '<script>'."\n";
-		$_strReturn .= 'function tr_hover(element) {'."\n";
-		$_strReturn .= '	x = element.className.match(/tr_hover/g);'."\n";
-		$_strReturn .= '	if(x == null) {	element.className = element.className + " tr_hover"; }'."\n";
-		$_strReturn .= '	else { element.className = element.className.replace(/ tr_hover/g, "");	}'."\n";
-		$_strReturn .= '}'."\n";
-		$_strReturn .= 'function tr_click(element, arg) {'."\n";
-		$_strReturn .= '	x = element.className.match(/tr_click/g);'."\n";
-		$_strReturn .= '	if(x == null) {	element.className = element.className + " tr_click";';
-		$_strReturn .= '	'.$id_1.' }'."\n";
-		$_strReturn .= '	else { element.className = element.className.replace(/ tr_click/g, "");';
-		$_strReturn .= '	'.$id_2.' }'."\n";
-		$_strReturn .= '}'."\n";
-		$_strReturn .= '</script>'."\n";
-		return $_strReturn;
-	}
-	//----------------------------------------------------------------------------------------
-	/**
-	* returns JS for tr
-	* @access public
-	* @return string
-	*/
-	//----------------------------------------------------------------------------------------
-	function  get_js_tr($ident) {
-		$script = 'onmouseover="tr_hover(this);" onmouseout="tr_hover(this);"';
-		#if($this->identifier != '') {
-			$script .= ' onclick="tr_click(this, \''.$ident.'\')"';
-		#}
-		return $script;
-	}
-	//----------------------------------------------------------------------------------------
-	/**
-	* builds html table
-	* @access public
-	* @param  $name string
-	* @param  $value array(array(label=>, value=>, ...)
-	* @return string
-	*/
-	//----------------------------------------------------------------------------------------
-	function get_string() {
-		$_strReturn = '';
-
-		// build table
-		$this->init_table_builder();
-
-		// build additional table head
-		foreach ($this->_headrow as $row) {
-			$row->arr_tr[0]->colspan = $this->_num_cols;
-			htmlobject_table::add($row);
-		}
-		// build sort functions
-		if($this->sort != '') {
-			$td = new htmlobject_td();
-			$td->colspan = $this->_num_cols;
-			$td->type = 'td';
-			$td->css = $this->css_prefix.'td pageturn_head';
-
-			$tr = new htmlobject_tr();
-			$tr->css = $this->css_prefix.'tr pageturn_head';
-			$tr->id = 'tr_'. uniqid();
-			$td->text = $this->get_sort().$this->get_pageturn();
-			$tr->add($td);
-			htmlobject_table::add($tr);
-		}
-		// build table head
-		htmlobject_table::add($this->get_table_head());
-
-		// build table body
-		$i = 'odd';
-		foreach ($this->_body as $key => $value) {
-			htmlobject_table::add($this->get_table_body($key, $value, $i));
-			if($i == 'odd') $i = 'even';
-			else  $i = 'odd';
-		}
-		// build table bottom
-		htmlobject_table::add($this->get_table_bottom());
-
-		// insert bottom pageturn
-		if(count($this->_body) > 9 && $this->limit < $this->max && $this->sort != '') {
-			$td = new htmlobject_td();
-			$td->colspan = $this->_num_cols;
-			$td->type = 'td';
-			$td->css = $this->css_prefix.'td pageturn_bottom';
-
-			$tr = new htmlobject_tr();
-			$tr->css = $this->css_prefix.'tr pageturn_bottom';
-			$tr->id = 'tr_'. uniqid();
-			$td->text = $this->get_pageturn();
-			$tr->add($td);
-			htmlobject_table::add($tr);
-		}
-
-		foreach ($this->_bottomrow as $row) {
-			$row->arr_tr[0]->colspan = $this->_num_cols;
-			htmlobject_table::add($row);
-		}
-		// build form
-		$_strReturn = $this->get_js();
-		($this->form_action != '') ? $_strReturn .= '<form action="'.$this->form_action.'" method="GET">' : null;
-		$_strReturn .= htmlobject_table::get_string();
-		($this->form_action != '') ? $_strReturn .= '</form>' : null;
-		return $_strReturn;
-	}
-
-}//-- end class
diff --git a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.tabmenu.class.php b/openQRM-5.3.50-CE/src/web/base/class/htmlobject.tabmenu.class.php
deleted file mode 100644
index 98f99a6..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.tabmenu.class.php
+++ /dev/null
@@ -1,296 +0,0 @@
-<?php
-/**
- * @package htmlobjects
- */
-
-//----------------------------------------------------------------------------------------
-/**
- * Tabmenubuilder
-*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//----------------------------------------------------------------------------------------
-
-class htmlobject_tabmenu extends htmlobject
-{
-/**
-* general prefix must be set via constructor
-* @access private
-* @var string
-*/
-var $prefix;
-/**
-* prefix for $message_param value
-* @access private
-* @var string
-*/
-var $prefix_tab = 'tab';
-/**
-* url to process request
-* Form disabled if empty
-* @access public
-* @var string
-*/
-var $form_action = '';
-/**
-* css class to highlight active tab
-* @access public
-* @var string
-*/
-var $tabcss = 'current';
-/**
-* add a custom string to tabs
-* @access public
-* @var string
-*/
-var $custom_tab = '';
-//------------------------------------------------------------------------------------ Message Section
-/**
-* name of param to transport message to messagebox
-* @access public
-* @var string
-*/
-var $message_param = 'strMsg';
-/**
-* regex pattern for messagebox (crosssitescripting)
-* replace pattern with replace
-* @access public
-* @var array(array('pattern'=>'','replace'=>''));
-*/
-var $message_replace = array (
-	array ( 'pattern' => '~</?script.+~i', 'replace' => ''),
-	array ( 'pattern' => '~</?iframe.+~i', 'replace' => ''),
-	array ( 'pattern' => '~</?object.+~i', 'replace' => ''),
-	array ( 'pattern' => '~on.+=~i', 'replace' => ''),
-	array ( 'pattern' => '~javascript~i', 'replace' => ''),
-	array ( 'pattern' => '~://~', 'replace' => ':&frasl;&frasl;'),
-	);
-/**
-* time to show messagebox in milliseconds (1/1000 sec.)
-* @access public
-* @var int
-*/
-var $message_time = 10000;
-/**
-* css class for messagebox
-* @access public
-* @var string
-*/
-var $message_css = 'msgBox';
-
-//------------------------------------------------------------------------------------Private Section
-/**
-* tab values
-* @access private
-* @var array
-*/
-var $_tabs = array();
-
-	//----------------------------------------------------------------------------------------
-	/**
-	* constructor
-	* <code>
-	* $content = array();
-	* $content[0]['label']   = 'some title';
-	* $content[0]['value']   = 'some content text';
-	* $content[0]['target']  = 'somefile.php';
-	* $content[0]['request'] = '&param1=value1&param2=value2';
-	* $content[0]['onclick'] = false;
-	* $tab = new htmlobject_tabmenu($content, 'some_prefix');
-	* </code>
-	* @access public
-	* @param array $arr
-	* @param string $prefix
-	*/
-	//----------------------------------------------------------------------------------------
-	function htmlobject_tabmenu($arr, $prefix = 'currenttab', $prefix_tab = 'tab') {
-		$this->prefix = $prefix;
-		$this->prefix_tab = $prefix_tab;
-		$this->_set($arr);
-	}
-
-	//----------------------------------------------------------------------------------------
-	/**
-	* set tabs data
-	* @access private
-	* @param array $arr
-	*/
-	//----------------------------------------------------------------------------------------
-	function _set( $arr ) {
-		$i = 0;
-		foreach ($arr as $val) {
-
-			$identifier = $this->prefix.$this->prefix_tab.$i;
-
-			if(array_key_exists('value', $val)) {
-				$html       = new htmlobject_div();
-				$html->id   = $identifier;
-				$html->css  = 'htmlobject_tab_box';
-				$html->text = $val['value']."<div style=\"line-height:0px;clear:both;\">&#160;</div>\n";
-				$value = $html;
-			} else { $value = ''; }
-
-			array_key_exists('label', $val) ? $label = $val['label'] : $label = '';
-			array_key_exists('target', $val) ? 	$target = $val['target'].'?'.$this->prefix.'='.$this->prefix_tab.$i : $target = '?'.$this->prefix.'='.$this->prefix_tab.$i;
-			array_key_exists('request', $val) ? $request = $val['request'] : $request = array();
-			array_key_exists('onclick', $val) ? $onclick = $val['onclick'] : $onclick = true;
-			array_key_exists('active', $val) ? $active = $val['active'] : $active = false;
-
-			if( $active === true ) {
-				$_REQUEST[$this->prefix.$this->prefix_tab] = $i;
-			}
-
-			$this->_tabs[] = array(
-				'target'  => $target,
-				'value'   => $value,
-				'label'   => $label,
-				'id'      => $identifier,
-				'request' => $request,
-				'onclick' => $onclick,
-				'active'  => $active,
-				);
-		$i++;
-		}
-	}
-
-	//----------------------------------------------------------------------------------------
-	/**
-	* create tabs
-	* @access private
-	* @param string $currenttab
-	* @return string
-	*/
-	//----------------------------------------------------------------------------------------
-	function _get_tabs($currenttab) {
-		$thisfile = basename($_SERVER['PHP_SELF']);
-		$_str = "\n<div ".$this->_init.">\n";
-		$_str .= "<ul>\n";
-		foreach($this->_tabs as $tab) {
-			$css = '';
-			if($tab['id'] == $this->prefix.$this->prefix_tab.$currenttab) { $css = ' class="'.$this->tabcss.'"'; }
-			foreach ($tab['request'] as $key => $arg) {
-				$tab['target'] = $tab['target'].'&amp;'.$key.'='.$arg;
-			}
-			$_str .= '<li id="tab_'.$tab['id'].'"'.$css.'>';
-			$_str .= "<span>";
-
-			if(strstr($tab['target'], $thisfile) && $tab['onclick'] !== false) {
-				$_str .= '<a href="'.$tab['target'].'" onclick="'.$this->prefix.'Toggle(\''.$tab['id'].'\'); this.blur(); return false;">';
-			} else {
-				$_str .= '<a href="'.$tab['target'].'" onclick="this.blur();">';
-			}
-			$_str .= $tab['label'];
-			$_str .= "</a>";
-			$_str .= "</span>";
-			$_str .= "</li>\n";
-		}
-		$_str .= "</ul>\n";
-		if($this->custom_tab != '') {
-			$_str .= "<div class=\"custom_tab\">".$this->custom_tab."</div>\n";
-		}
-		$_str .= "</div>\n";
-		$_str .= "<div style=\"line-height:0px;clear:both;\">&#160;</div>\n";
-
-		return $_str;
-	}
-
-	//----------------------------------------------------------------------------------------
-	/**
-	* create JS toggle function
-	* @access private
-	* @return string
-	*/
-	//----------------------------------------------------------------------------------------
-	function _get_js() {
-		$_str = '';
-		$thisfile = basename($_SERVER['PHP_SELF']);
-		$_str .= "\n<script type=\"text/javascript\">\n";
-		$_str .= "function ".$this->prefix."Toggle(id) {\n";
-		foreach($this->_tabs  as $tab) {
-			if(strstr($tab['target'], $thisfile)) {
-				$_str .= "document.getElementById('".$tab['id']."').style.display = 'none';\n";
-				$_str .= "document.getElementById('tab_".$tab['id']."').className = '';\n";
-			}
-		}
-		$_str .= "document.getElementById(id).style.display = 'block';\n";
-		$_str .= "document.getElementById('tab_' + id).className = '".$this->tabcss."';\n";
-		$_str .= "}\n";
-		$_str .= "</script>\n";
-
-		return $_str;
-	}
-
-	//----------------------------------------------------------------------------------------
-	/**
-	* create messagebox
-	* @access private
-	* @return string
-	*/
-	//----------------------------------------------------------------------------------------
-	function _get_messagebox() {
-		$_str = '';
-		$this->add_request_filter($this->message_replace);
-		$msg = $this->get_request($this->message_param);
-		if($msg != "") {
-			$_str .= '';
-			$_str .= '<div class="'.$this->message_css.'" id="'.$this->prefix.'msgBox">'.$msg.'</div>';
-			$_str .= '<script type="text/javascript">';
-			$_str .= 'var '.$this->prefix.'aktiv = window.setInterval("'.$this->prefix.'msgBox()", '.$this->message_time.');';
-			$_str .= 'function '.$this->prefix.'msgBox() {';
-			$_str .= '    document.getElementById(\''.$this->prefix.'msgBox\').style.display = \'none\';';
-			$_str .= '    window.clearInterval('.$this->prefix.'aktiv);';
-			$_str .= '}';
-			$_str .= '</script>';
-			$_str .= '';
-		}
-		return $_str;
-	}
-
-	//----------------------------------------------------------------------------------------
-	/**
-	* build tabs output
-	* @access public
-	* @param array $arr
-	* @return string
-	*/
-	//----------------------------------------------------------------------------------------
-	function get_string() {
-		$_str = '';
-		($this->form_action != '') ? $_str .= '<form action="'.$this->form_action.'" method="POST">' : null;
-		if(count($this->_tabs) > 0) {
-			$this->init();
-			if(isset($_REQUEST[$this->prefix]) && $_REQUEST[$this->prefix] != '') {
-				$currenttab = str_replace($this->prefix_tab, '', $_REQUEST[$this->prefix]);
-			} else {
-				$currenttab = '0';
-			}
-			$_str .= $this->_get_js();
-			$_str .= $this->_get_tabs($currenttab);
-			foreach ($this->_tabs as $tab) {
-				if($tab['value'] != '') {
-					$html = $tab['value'];
-					if($tab['id'] !== $this->prefix.$this->prefix_tab.$currenttab) {
-						$html->style = 'display:none;';
-					} else {
-						$html->text = $this->_get_messagebox().$html->text;
-					}
-					$_str .= $html->get_string();
-				}
-			}
-		}
-		($this->form_action != '') ? $_str .= '</form>' : null;
-
-		return $_str;
-	}
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.tabs.class.php b/openQRM-5.3.50-CE/src/web/base/class/htmlobject.tabs.class.php
deleted file mode 100644
index 099d2a3..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/htmlobject.tabs.class.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-/**
- * @package htmlobjects
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//----------------------------------------------------------------------------------------
-
-class htmlobject_tabmenu extends htmlobject
-{
-/**
-* general prefix must be set via constructor
-* @access private
-* @var string
-*/
-var $prefix;
-/**
-* prefix for $message_param value
-* @access private
-* @var string
-*/
-var $prefix_tab = 'tab';
-/**
-* url to process request
-* Form disabled if empty
-* @access public
-* @var string
-*/
-var $form_action = '';
-/**
-* name of param to transport message to messagebox
-* @access public
-* @var string
-*/
-var $message_param = 'strMsg';
-/**
-* regex pattern for messagebox (crosssitescripting)
-* @access public
-* @var array
-*/
-var $message_replace = array (
-	array ( 'pattern' => '~</?script.+~i', 'replace' => ''),
-	array ( 'pattern' => '~</?iframe.+~i', 'replace' => ''),
-	array ( 'pattern' => '~</?object.+~i', 'replace' => ''),
-	array ( 'pattern' => '~://~', 'replace' => ':&frasl;&frasl;'),
-	);
-/**
-* time to show messagebox in milliseconds
-* @access public
-* @var int
-*/
-var $message_time = 10000;
-/**
-* css class for messagebox
-* @access public
-* @var int
-*/
-var $message_css = 'msgBox';
-/**
-* css class to highlight active tab
-* @access public
-* @var string
-*/
-var $tabcss = 'current';
-/**
-* tab values
-* @access private
-* @var array
-*/
-var $_tabs = array();
-
-	//----------------------------------------------------------------------------------------
-	/**
-	* constructor
-	* <code>
-	* $content = array();
-	* $content[0]['label'] = 'some title';
-	* $content[0]['value']= 'some content text';
-	* $content[0]['target']= 'somefile.php';
-	* $content[0]['request']= '&param1=value1&param2=value2';
-	* $tab = new htmlobject_tabmenu($content, 'some_prefix');
-	* </code>
-	* @access public
-	* @param array $arr
-	* @param string $prefix
-	*/
-	//----------------------------------------------------------------------------------------
-	function htmlobject_tabmenu($arr, $prefix = 'currenttab') {
-		$this->prefix = $prefix;
-		$this->_set($arr);
-	}
-
-	//----------------------------------------------------------------------------------------
-	/**
-	* set tabs data
-	* @access private
-	* @param array $arr
-	*/
-	//----------------------------------------------------------------------------------------
-	function _set($arr) {
-		$i = 0;
-		foreach ($arr as $val) {
-
-			$identifier = $this->prefix.$this->prefix_tab.$i;
-
-			if(array_key_exists('value', $val)) {
-				$html = new htmlobject_div();
-				$html->id = $identifier;
-				$html->css = 'htmlobject_tab_box';
-				$html->text = $val['value'].'<div style="clear:both;line-height:0;">&#160;</div>';
-				$value = $html->get_string();
-			} else { $value = ''; }
-
-			array_key_exists('label', $val) ? $label = $val['label'] : $label = '';
-			array_key_exists('target', $val) ? 	$target = $val['target'].'?'.$this->prefix.'='.$this->prefix_tab.$i : $target = '?'.$this->prefix.'='.$this->prefix_tab.$i;
-			array_key_exists('request', $val) ? $request = $val['request'] : $request = array();
-
-			$this->_tabs[] = array(
-				'target' => $target,
-				'value' => $value,
-				'label' => $label,
-				'id' => $identifier,
-				'request' => $request,
-				);
-		$i++;
-		}
-	}
-
-	//----------------------------------------------------------------------------------------
-	/**
-	* create tabs
-	* @access private
-	* @param string $currenttab
-	* @return string
-	*/
-	//----------------------------------------------------------------------------------------
-	function _get_tabs($currenttab) {
-		$thisfile = basename($_SERVER['PHP_SELF']);
-		$_strReturn = "\n<div $this->_init_htmlobject>\n";
-		$_strReturn .= "<ul>\n";
-		foreach($this->_tabs as $tab) {
-			$css = '';
-			if($tab['id'] == $this->prefix.$this->prefix_tab.$currenttab) { $css = ' class="'.$this->tabcss.'"'; }
-			foreach ($tab['request'] as $key => $arg) {
-				$tab['target'] = $tab['target'].'&'.$key.'='.$arg;
-			}
-			$_strReturn .= '<li id="tab_'.$tab['id'].'"'.$css.'>';
-			$_strReturn .= "<span>";
-			if(strstr($tab['target'], $thisfile)) {
-				$_strReturn .= '<a href="'.$tab['target'].'" onclick="'.$this->prefix.'Toggle(\''.$tab['id'].'\'); this.blur(); return false;">';
-			} else {
-				$_strReturn .= '<a href="'.$tab['target'].'" onclick="this.blur();">';
-			}
-			$_strReturn .= $tab['label'];
-			$_strReturn .= "</a>";
-			$_strReturn .= "</span>";
-			$_strReturn .= "</li>\n";
-		}
-		$_strReturn .= "</ul>\n";
-		$_strReturn .= "</div>\n";
-		$_strReturn .= "<div style=\"line-height:0px;clear:both;\">&#160;</div>\n";
-
-		return $_strReturn;
-	}
-
-	//----------------------------------------------------------------------------------------
-	/**
-	* create JS toggle function
-	* @access private
-	* @return string
-	*/
-	//----------------------------------------------------------------------------------------
-	function _get_js() {
-		$_strReturn = '';
-		$thisfile = basename($_SERVER['PHP_SELF']);
-		$_strReturn .= "\n<script>\n";
-		$_strReturn .= "function ".$this->prefix."Toggle(id) {\n";
-		foreach($this->_tabs  as $tab) {
-			if(strstr($tab['target'], $thisfile)) {
-				$_strReturn .= "document.getElementById('".$tab['id']."').style.display = 'none';\n";
-				$_strReturn .= "document.getElementById('tab_".$tab['id']."').className = '';\n";
-			}
-		}
-		$_strReturn .= "document.getElementById(id).style.display = 'block';\n";
-		$_strReturn .= "document.getElementById('tab_'+id).className = '".$this->tabcss."';\n";
-		$_strReturn .= "}\n";
-		$_strReturn .= "</script>\n";
-
-		return $_strReturn;
-	}
-
-	//----------------------------------------------------------------------------------------
-	/**
-	* create css
-	* @access private
-	* @param string $currenttab
-	* @return string
-	*/
-	//----------------------------------------------------------------------------------------
-	function _get_css($currenttab) {
-		$_strReturn = '';
-
-		$_strReturn .= "\n<style>\n";
-		foreach($this->_tabs as $tab) {
-			if($tab['id'] == $this->prefix.$this->prefix_tab.$currenttab) { $_strReturn .= "#".$tab['id']." { display: block; }\n"; }
-			else { $_strReturn .= "#".$tab['id']." { display: none; }\n"; }
-		}
-		$_strReturn .= "</style>\n";
-
-		return $_strReturn;
-	}
-
-	//----------------------------------------------------------------------------------------
-	/**
-	* create messagebox
-	* @access private
-	* @return string
-	*/
-	//----------------------------------------------------------------------------------------
-	function _get_messagebox() {
-		$_strReturn = '';
-		if($this->get_request($this->message_param) != "") {
-
-			$this->http_request_replace = array_merge($this->message_replace, $this->http_request_replace);
-			$msg = $this->get_request($this->message_param);
-
-			$_strReturn .= '';
-			$_strReturn .= '<div class="'.$this->message_css.'" id="'.$this->prefix.'msgBox">'.$msg.'</div>';
-			$_strReturn .= '<script>';
-			$_strReturn .= 'var '.$this->prefix.'aktiv = window.setInterval("'.$this->prefix.'msgBox()", '.$this->message_time.');';
-			$_strReturn .= 'function '.$this->prefix.'msgBox() {';
-			$_strReturn .= '    document.getElementById(\''.$this->prefix.'msgBox\').style.display = \'none\';';
-			$_strReturn .= '    window.clearInterval('.$this->prefix.'aktiv);';
-			$_strReturn .= '}';
-			$_strReturn .= '</script>';
-			$_strReturn .= '';
-		}
-		return $_strReturn;
-	}
-
-	//----------------------------------------------------------------------------------------
-	/**
-	* build tabs output
-	* @access public
-	* @param array $arr
-	* @return string
-	*/
-	//----------------------------------------------------------------------------------------
-	function get_string() {
-		$_strReturn = '';
-		($this->form_action != '') ? $_strReturn .= '<form action="'.$this->form_action.'" method="POST">' : null;
-		if(count($this->_tabs) > 0) {
-			$this->init_htmlobject();
-			if(isset($_REQUEST[$this->prefix]) && $_REQUEST[$this->prefix] != '') {
-				$currenttab = str_replace($this->prefix_tab, '', $_REQUEST[$this->prefix]);
-			} else {
-				$currenttab = '0';
-			}
-			$_strReturn .= $this->_get_js();
-			$_strReturn .= $this->_get_css($currenttab);
-			$_strReturn .= $this->_get_tabs($currenttab);
-			$_strReturn .= $this->_get_messagebox();
-			foreach ($this->_tabs as $tab) {
-				if($tab['value'] != '') {
-					$_strReturn .= $tab['value'];
-				}
-			}
-		}
-		($this->form_action != '') ? $_strReturn .= '</form>' : null;
-
-		return $_strReturn;
-	}
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/http.class.php b/openQRM-5.3.50-CE/src/web/base/class/http.class.php
deleted file mode 100644
index d2f9be8..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/http.class.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * @package htmlobjects
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//----------------------------------------------------------------------------------------
-
-class http
-{
-/**
-* regex pattern for httprequest (crosssitescripting)
-* <code>
-* $http = new http();
-* $http->http_request_replace = array(
-*    array ( 'pattern' => '~\r\n~', 'replace' => '\n'),
-*  );
-* </code>
-* @access public
-* @var array
-*/
-var $http_request_replace = array(
-		array ( 'pattern' => '~\r\n~', 'replace' => '\n'),
-	);
-
-
-	//---------------------------------------------------------------
-	/**
-	* returns http request as cleaned string
-	* string is empty when request not set
-	* @access public
-	* @param  $path string
-	* @return string [empty if request not set]
-	*/
-	//---------------------------------------------------------------
-	function get_request($arg)
-	{
-		if (isset($_REQUEST[$arg])) {
-			if(is_array($_REQUEST[$arg])) {
-				foreach($_REQUEST[$arg] as $key => $value) {
-					$arr[$key] =  $this->filter_request($value);
-				}
-				return $arr;
-			} else {
-				return $this->filter_request($_REQUEST[$arg]);
-			}
-		} else {
-			return '';
-		}
-	}
-
-	//---------------------------------------------------------------
-	/**
-	* performes preg_replace
-	* @access public
-	* @param  $value string
-	* @return string
-	*/
-	//---------------------------------------------------------------
-	function filter_request($value) {
-		$value = stripslashes($value);
-		if(is_array($this->http_request_replace)) {
-			foreach ($this->http_request_replace as $reg) {
-				$value = preg_replace($reg['pattern'], $reg['replace'], $value);
-			}
-		}
-		return $value;
-	}
-
-	//---------------------------------------------------------------
-	/**
-	* returns http request [POST/GET] as string
-	* @access public
-	* @param $firstchar string
-	* @param $excludes array
-	* @return string [empty if request empty]
-	*/
-	//---------------------------------------------------------------
-	function get_request_as_string($firstchar = '?', $excludes = array()) {
-		$type = array('_POST','_GET');
-		$_strReturn = '';
-		foreach($type as $request) {
-			foreach(eval("return \$$request;") as $name => $foo) {
-				if(in_array($name, $excludes) == false) {
-					$value = http_request($name);
-					if(is_array($value)) {
-						foreach($value as $key => $val) {
-							$_strReturn .= '&'.$name.'['.$key.']='.$val;
-						}
-					} else {
-						$_strReturn .= '&'.$name.'='.$value;
-					}
-				}
-			}
-		}
-		if($_strReturn != '') $_strReturn = preg_replace('/^&/', $firstchar, $_strReturn);
-		return $_strReturn;
-	}
-
-	//---------------------------------------------------------------
-	/**
-	* header redirect
-	* tries php header redirect, on fail js redirect, on fail meta redirect
-	* @access public
-	* @param  $url string
-	*/
-	//---------------------------------------------------------------
-	function redirect($url){
-		if (!headers_sent()){
-			header('Location: '.$url); exit;
-		} else {
-			echo '<script type="text/javascript">';
-			echo 'window.location.href="'.$url.'";';
-			echo '</script>';
-			echo '<noscript>';
-			echo '<meta http-equiv="refresh" content="0;url='.$url.'" />';
-			echo '</noscript>'; exit;
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/image.class.php b/openQRM-5.3.50-CE/src/web/base/class/image.class.php
deleted file mode 100644
index 815e379..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/image.class.php
+++ /dev/null
@@ -1,829 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-server-config.php";
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/event.class.php";
-
-/**
- * This class represents a filesystem-image (rootfs) 
- * In combination with a kernel it can be deployed to a resource
- * via the appliance.class
- *
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- * @author M. Rechenburg, A. Kuballa
- * @version 1.1 added documentation
- */
-class image
-{
-
-/**
-* image id
-* @access protected
-* @var int
-*/
-var $id = '';
-/**
-* image name
-* @access protected
-* @var string
-*/
-var $name = '';
-/**
-* image version
-* @access protected
-* @var string
-*/
-var $version = '';
-/**
-* image type
-* @access protected
-* @var string
-*/
-var $type = '';
-/**
-* image rootdevice
-* @access protected
-* @var string
-*/
-var $rootdevice = '';
-/**
-* image root filesystem
-* @access protected
-* @var string
-*/
-var $rootfstype = '';
-/**
-* image size (MB)
-* @access protected
-* @var integer
-*/
-var $size = 0;
-/**
-* storage id
-* @access protected
-* @var int
-*/
-var $storageid = '';
-/**
-* deployment type
-* @access protected
-* @var string
-*/
-var $deployment_type = '';
-/**
-* deployment parameter
-* @access protected
-* @var string
-*/
-var $deployment_parameter = '';
-/**
-* image is shared?
-* @access protected
-* @var bool
-*/
-var $isshared = '';
-/**
-* image is active?
-* @access protected
-* @var bool
-*/
-var $isactive = '';
-/**
-* image comment
-* @access protected
-* @var string
-*/
-var $comment = '';
-/**
-* image capabilities
-* @access protected
-* @var string
-*/
-var $capabilities = '';
-
-/**
-* name of database table
-* @access protected
-* @var string
-*/
-var $_db_table;
-/**
-* path to openqrm basedir
-* @access protected
-* @var string
-*/
-var $_base_dir;
-/**
-* event object
-* @access protected
-* @var object
-*/
-var $_event;
-
-	//--------------------------------------------------
-	/**
-	* Constructor
-	*/
-	//--------------------------------------------------
-	function image($deployment_type=null) {
-		$this->init($deployment_type);
-	}
-
-	//--------------------------------------------------
-	/**
-	* init storage environment
-	* @access public
-	*/
-	//--------------------------------------------------
-	function init($deployment_type=null) {
-		global $IMAGE_INFO_TABLE, $OPENQRM_SERVER_BASE_DIR;
-		$this->_event = new event();
-		$this->_db_table = $IMAGE_INFO_TABLE;
-		$this->_base_dir = $OPENQRM_SERVER_BASE_DIR;
-
-		$this->deployment_type = $deployment_type;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an instance of an image object from db
-	* @access public
-	* @param int $id
-	* @param string $name
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance($id, $name) {
-		$db=openqrm_get_db_connection();
-		
-		if(@strlen(@$this->deployment_type->type)>0){
-			$where_extra_sql = " and image_type = '".$this->deployment_type->type."'";
-		}
-		else if($this->deployment_type){
-			$where_extra_sql = " and image_type = '".$this->deployment_type."'";
-		}else{
-			$where_extra_sql = null;
-		}
-		
-		if ("$id" != "") {
-			$image_array = $db->Execute("select * from $this->_db_table where image_id=$id".$where_extra_sql);
-		} else if ("$name" != "") {
-			$image_array = $db->Execute("select * from $this->_db_table where image_name='$name'".$where_extra_sql);
-		} else {
-			$error = '';
-			foreach(debug_backtrace() as $key => $msg) {
-				if($key === 1) {
-					$error .= '( '.basename($msg['file']).' '.$msg['line'].' )';
-				}
-				syslog(LOG_ERR, $msg['function'].'() '.basename($msg['file']).':'.$msg['line']);
-			}
-			$this->_event->log("get_instance", $_SERVER['REQUEST_TIME'], 2, "image.class.php", "Could not create instance of image without data ".$error, "", "", 0, 0, 0);
-			return;
-		}
-		foreach ($image_array as $index => $image) {
-			$this->id = $image["image_id"];
-			$this->name = $image["image_name"];
-			$this->version = $image["image_version"];
-			$this->type = $image["image_type"];
-			$this->rootdevice = $image["image_rootdevice"];
-			$this->rootfstype = $image["image_rootfstype"];
-			$this->size = $image["image_size"];
-			$this->storageid = $image["image_storageid"];
-			$this->deployment_parameter = $image["image_deployment_parameter"];
-			$this->isshared = $image["image_isshared"];
-			$this->isactive = $image["image_isactive"];
-			$this->comment = $image["image_comment"];
-			$this->capabilities = $image["image_capabilities"];
-		}
-		return $this;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an instance of an image by id
-	* @access public
-	* @param int $id
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance_by_id($id) {
-		$this->get_instance($id, "");
-		return $this;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an instance of an image by name
-	* @access public
-	* @param int $id
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance_by_name($name) {
-		$this->get_instance("", $name);
-		return $this;
-	}
-
-	//--------------------------------------------------
-	/**
-	* add a new image
-	* @access public
-	* @param array $image_fields
-	*/
-	//--------------------------------------------------
-	function add($image_fields) {
-		if (!is_array($image_fields)) {
-			$this->_event->log("add", $_SERVER['REQUEST_TIME'], 2, "image.class.php", "Image_field not well defined", "", "", 0, 0, 0);
-			return 1;
-		}
-		// set to not active by default when adding
-		$image_fields['image_isactive']=0;
-		$db=openqrm_get_db_connection();
-		$result = $db->AutoExecute($this->_db_table, $image_fields, 'INSERT');
-		if (! $result) {
-			$this->_event->log("add", $_SERVER['REQUEST_TIME'], 2, "image.class.php", "Failed adding new image to database", "", "", 0, 0, 0);
-		}
-	}
-
-	//--------------------------------------------------
-	/**
-	* update an image
-	* <code>
-	* $fields = array();
-	* $fields['image_name'] = 'somename';
-	* $fields['image_version'] = '1.1';
-	* $fields['image_type'] = 1;
-	* $fields['image_rootdevice'] = 1;
-	* $fields['image_rootfstype'] = 1;
-	* $fields['image_size'] = 0;
-	* $fields['image_storageid'] = 1;
-	* $fields['image_deployment_parameter'] = 1;
-	* $fields['image_isshared'] = 1;
-	* $fields['image_isactive'] = 0;
-	* $fields['image_comment'] = 'sometext';
-	* $fields['image_capabilities'] = 'sometext';
-	* $image = new image();
-	* $image->update(1, $fields);
-	* </code>
-	* @access public
-	* @param int $image_id
-	* @param array $image_fields
-	* @return bool
-	*/
-	//--------------------------------------------------
-	function update($image_id, $image_fields) {
-		if ($image_id < 0 || ! is_array($image_fields)) {
-			$this->_event->log("update", $_SERVER['REQUEST_TIME'], 2, "image.class.php", "Unable to update image $image_id", "", "", 0, 0, 0);
-			return 1;
-		}
-		$db=openqrm_get_db_connection();
-		unset($image_fields["image_id"]);
-		$result = $db->AutoExecute($this->_db_table, $image_fields, 'UPDATE', "image_id = $image_id");
-		if (! $result) {
-			$this->_event->log("update", $_SERVER['REQUEST_TIME'], 2, "image.class.php", "Failed updating image $image_id", "", "", 0, 0, 0);
-		}
-	}
-
-	//--------------------------------------------------
-	/**
-	* remove an image by id
-	* @access public
-	* @param int $image_id
-	*/
-	//--------------------------------------------------
-	function remove($image_id) {
-		// do not remove the idle + openqrm image
-		if (($image_id == 0) || ($image_id == 1))  {
-			return;
-		}
-		// remove auth file
-		$CMD="rm -f $this->_base_dir/openqrm/web/action/image-auth/iauth.$image_id";
-		exec($CMD);
-		// remove from db
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from $this->_db_table where image_id=$image_id");
-	}
-
-	//--------------------------------------------------
-	/**
-	* remove an image by name
-	* @access public
-	* @param string $image_name
-	*/
-	//--------------------------------------------------
-	function remove_by_name($image_name) {
-		// do not remove the idle + openqrm image
-		if (($image_name == "openqrm") || ($image_name == "idle"))  {
-			return;
-		}
-		// remove auth file
-		$rem_image = new image();
-		$rem_image->get_instance_by_name($image_name);
-		$rem_image_id = $rem_image->id;
-		$CMD="rm -f $this->_base_dir/openqrm/web/action/image-auth/iauth.$rem_image_id";
-		exec($CMD);
-		// remove from db
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from $this->_db_table where image_name='$image_name'");
-
-	}
-
-	//--------------------------------------------------
-	/**
-	* get image name by id
-	* @access public
-	* @param int $image_id
-	* @return string
-	*/
-	//--------------------------------------------------
-	function get_name($image_id) {
-		$db=openqrm_get_db_connection();
-		$image_set = $db->Execute("select image_name from $this->_db_table where image_id=$image_id");
-		if (!$image_set) {
-			$this->_event->log("get_name", $_SERVER['REQUEST_TIME'], 2, "image.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			if (!$image_set->EOF) {
-				return $image_set->fields["image_name"];
-			} else {
-				return "idle";
-			}
-		}
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* set the image is currently in use
-	* @access public
-	* @param int $active
-	*/
-	//--------------------------------------------------
-	function set_active($active) {
-		$this->get_instance_by_id($this->id);
-		$image_fields=array();
-		$image_fields["image_isactive"]=$active;
-		$this->update($this->id, $image_fields);
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* set the deployment parameters of an image
-	* @access public
-	* @param string $key
-	* @param string $value
-	*/
-	//--------------------------------------------------
-	function set_deployment_parameters($key, $value) {
-		$this->get_instance_by_id($this->id);
-		$image_deployment_parameter = $this->deployment_parameter;
-		$key=trim($key);
-		if (strstr($image_deployment_parameter, $key)) {
-			// change
-			$cp1=trim($image_deployment_parameter);
-			$cp2 = strstr($cp1, $key);
-			$keystr="$key=\"";
-			$endmark="\"";
-			$cp3=str_replace($keystr, "", $cp2);
-			$endpos=strpos($cp3, $endmark);
-			$cp=substr($cp3, 0, $endpos);
-			$new_image_deployment_parameter = str_replace("$key=\"$cp\"", "$key=\"$value\"", $image_deployment_parameter);
-		} else {
-			// add
-			$new_image_deployment_parameter = "$image_deployment_parameter $key=\"$value\"";
-		}
-		$image_fields=array();
-		$image_fields["image_deployment_parameter"]="$new_image_deployment_parameter";
-		$this->update($this->id, $image_fields);
-
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* gets a deployment parameter of an image
-	* @access public
-	* @param string $key
-	* @return string $value
-	*/
-	//--------------------------------------------------
-	function get_deployment_parameter($key) {
-
-		$image_deployment_parameter = $this->deployment_parameter;
-		$key=trim($key);
-		if (strstr($image_deployment_parameter, $key)) {
-			// change
-			$cp1=trim($image_deployment_parameter);
-			$cp2 = strstr($cp1, $key);
-			$keystr="$key=\"";
-			$endmark="\"";
-			$cp3=str_replace($keystr, "", $cp2);
-			$endpos=strpos($cp3, $endmark);
-			$cp=substr($cp3, 0, $endpos);
-			return $cp;
-		} else {
-			return "";
-		}
-	}
-
-
-
-
-
-
-	//--------------------------------------------------
-	/**
-	* get image capabilities by id
-	* @access public
-	* @param int $image_id
-	* @return string
-	*/
-	//--------------------------------------------------
-	function get_capabilities($image_id) {
-		$db=openqrm_get_db_connection();
-		$image_set = $db->Execute("select image_capabilities from $this->_db_table where image_id=$image_id");
-		if (!$image_set) {
-			$this->_event->log("get_capabilities", $_SERVER['REQUEST_TIME'], 2, "image.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			if ((!$image_set->EOF) && ($image_set->fields["image_capabilities"]!=""))  {
-				return $image_set->fields["image_capabilities"];
-			} else {
-				return "0";
-			}
-		}
-	}
-
-	//--------------------------------------------------
-	/**
-	* get number of images per type
-	* @access public
-	* @param string $deployment_type
-	* @return int
-	*/
-	//--------------------------------------------------
-	function get_count_per_type($deployment_type_str) {
-		$count=0;
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("select count(image_id) as num from $this->_db_table where image_type='".$deployment_type_str."'");
-		if (!$rs) {
-			$this->_event->log("get_count_per_type", $_SERVER['REQUEST_TIME'], 2, "image.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			$count = $rs->fields["num"];
-		}
-		return $count;
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* get number of images
-	* @access public
-	* @return int
-	*/
-	//--------------------------------------------------
-	function get_count() {
-		$count=0;
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("select count(image_id) as num from $this->_db_table");
-		if (!$rs) {
-			$this->_event->log("get_count", $_SERVER['REQUEST_TIME'], 2, "image.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			$count = $rs->fields["num"];
-		}
-		return $count;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an array of all image names
-	* <code>
-	* $image = new image();
-	* $arr = $image->get_list();
-	* // $arr[0]['value']
-	* // $arr[0]['label']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_list() {
-		$query = "select image_id, image_name from $this->_db_table order by image_id ASC";
-		$image_name_array = array();
-		$image_name_array = openqrm_db_get_result_double ($query);
-		return $image_name_array;
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of all image ids
-	* <code>
-	* $image = new image();
-	* $arr = $image->get_ids();
-	* // $arr['value']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_ids() {
-		$image_array = array();
-		$query = "select image_id from $this->_db_table";
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute($query);
-		if (!$rs)
-			$event->log("get_list", $_SERVER['REQUEST_TIME'], 2, "image.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		else
-		while (!$rs->EOF) {
-			$image_array[] = $rs->fields;
-			$rs->MoveNext();
-		}
-		return $image_array;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an array of all image ids on a storage
-	* <code>
-	* $image = new image();
-	* $arr = $image->get_ids_by_storage($storage_id);
-	* // $arr['value']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_ids_by_storage($storage_id) {
-		$image_array = array();
-		$query = "select image_id from $this->_db_table where image_storageid=$storage_id";
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute($query);
-		if (!$rs)
-			$event->log("get_list", $_SERVER['REQUEST_TIME'], 2, "image.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		else
-		while (!$rs->EOF) {
-			$image_array[] = $rs->fields;
-			$rs->MoveNext();
-		}
-		return $image_array;
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of all image ids on a storage
-	* <code>
-	* $image = new image();
-	* $arr = $image->get_ids_by_storage($storage_id);
-	* // $arr['value']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_ids_by_type($deployment_type_str) {
-		$image_array = array();
-		$query = "select image_id from $this->_db_table where image_type='".$deployment_type_str."'";
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute($query);
-		if (!$rs)
-			$event->log("get_ids_by_type", $_SERVER['REQUEST_TIME'], 2, "image.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		else
-		while (!$rs->EOF) {
-			$image_array[] = $rs->fields;
-			$rs->MoveNext();
-		}
-		return $image_array;
-	}
-	
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of images per type
-	* @access public
-	* @param string $deployment_type
-	* @param int $offset
-	* @param int $limit
-	* @param string $sort
-	* @param enum $order [ASC/DESC]
-	* @return array
-	*/
-	//--------------------------------------------------
-	function display_overview_per_type($deployment_type_str, $offset, $limit, $sort, $order) {
-		$db=openqrm_get_db_connection();
-		$recordSet = $db->SelectLimit("select * from $this->_db_table where image_id > 1 and image_type='".$deployment_type_str."' order by $sort $order", $limit, $offset);
-		$image_array = array();
-		if (!$recordSet) {
-			$this->_event->log("display_overview_per_type", $_SERVER['REQUEST_TIME'], 2, "image.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			while (!$recordSet->EOF) {
-				array_push($image_array, $recordSet->fields);
-				$recordSet->MoveNext();
-			}
-			$recordSet->Close();
-		}
-		return $image_array;
-	}
-
-
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of images
-	* @access public
-	* @param int $offset
-	* @param int $limit
-	* @param string $sort
-	* @param enum $order [ASC/DESC]
-	* @return array
-	*/
-	//--------------------------------------------------
-	function display_overview($offset, $limit, $sort, $order) {
-		$db=openqrm_get_db_connection();
-		$recordSet = $db->SelectLimit("select * from $this->_db_table where image_id > 1 order by $sort $order", $limit, $offset);
-		$image_array = array();
-		if (!$recordSet) {
-			$this->_event->log("display_overview", $_SERVER['REQUEST_TIME'], 2, "image.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			while (!$recordSet->EOF) {
-				array_push($image_array, $recordSet->fields);
-				$recordSet->MoveNext();
-			}
-			$recordSet->Close();
-		}
-		return $image_array;
-	}
-
-	//--------------------------------------------------
-	/**
-	* generate a random password for images
-	* @access public
-	* @param int $length
-	* @return string
-	*/
-	//--------------------------------------------------
-	function generatePassword ($length) {
-		// start with a blank password
-		$password = "";
-		// define possible characters
-		$possible = "abcdfghjkmnpqrstvwxyzABCDEFGHIYKLMNOPQRSTVWXYZ";
-		$numbers = "0123456789";
-		$special = "-_";
-		// set up a counter
-		$i = 0;
-		// add random characters to $password until $length is reached
-		while ($i < $length) {
-			// pick a random character from the possible ones
-			$char = substr($possible, mt_rand(0, strlen($possible)-1), 1);
-			// we don't want this character if it's already in the password
-			if (!strstr($password, $char)) {
-					$password .= $char;
-					$i++;
-			}
-			$char = substr($numbers, mt_rand(0, strlen($numbers)-1), 1);
-			if (!strstr($password, $char)) {
-					$password .= $char;
-					$i++;
-			}
-			$char = substr($special, mt_rand(0, strlen($special)-1), 1);
-			if (!strstr($password, $char)) {
-					$password .= $char;
-					$i++;
-			}
-		}
-	  // done!
-	  return $password;
-	}
-
-	//--------------------------------------------------
-	/**
-	* set crypted root-password from string
-	* @access public
-	* @param int $id
-	* @param string $passwd
-	*/
-	//--------------------------------------------------
-	function set_root_password($id, $passwd) {
-		$this->get_instance_by_id($id);
-		if (stripos($this->version, 'Windows') !== false) {
-			$content = "<?php\n";
-			$content .= "\$thisfile = basename(\$_SERVER['PHP_SELF']);\n";
-			$content .= "echo \"".$passwd."\";\n";
-			$content .= "unlink(\$thisfile);\n";
-			$content .= "?>\n";
-			file_put_contents($this->_base_dir."/openqrm/web/action/image-auth/iauth.".$id.".php", $content);
-		} else {
-			$CMD=$this->_base_dir."/openqrm/sbin/openqrm-crypt ".$passwd." > ".$this->_base_dir."/openqrm/web/action/image-auth/iauth.".$id.".php";
-			exec($CMD);
-		}
-	}
-
-	//--------------------------------------------------
-	/**
-	* check image is network deployment
-	* @access public
-	* @return bool
-	*/
-	//--------------------------------------------------
-	function is_network_deployment() {
-		$hook = $this->_base_dir.'/openqrm/web/boot-service/image.'.$this->type.'.php';
-		if (file_exists($hook)) {
-			require_once($hook);
-			$function = "get_". str_replace("-", "_", $this->type)."_is_network_deployment";
-			return $function();
-		} else {
-			return false;
-		}
-	}
-
-
-	
-	
-	//--------------------------------------------------
-	/**
-	* get an array of the supported image OS versions
-	* @access public
-	* @return bool
-	*/
-	//--------------------------------------------------
-	function get_os_version() {
-
-		$image_version_arr[] = array("label" => "Linux", "value" => "linux");
-		$image_version_arr[] = array("label" => "Windows", "value" => "windows");
-
-		$image_version_arr[] = array("label" => "CentOS 7", "value" => "linux_centos7");
-		$image_version_arr[] = array("label" => "CentOS 6", "value" => "linux_centos4");
-		$image_version_arr[] = array("label" => "CentOS 5", "value" => "linux_centos5");
-		
-		$image_version_arr[] = array("label" => "Debian 8", "value" => "linux_debian8");
-		$image_version_arr[] = array("label" => "Debian 7", "value" => "linux_debian7");
-		$image_version_arr[] = array("label" => "Debian 6", "value" => "linux_debian6");
-		
-		$image_version_arr[] = array("label" => "openSUSE Linux 13.x", "value" => "linux_opensuse13");
-		$image_version_arr[] = array("label" => "openSUSE Linux 12.x", "value" => "linux_opensuse12");
-		$image_version_arr[] = array("label" => "openSUSE Linux 11.x", "value" => "linux_opensuse11");
-		$image_version_arr[] = array("label" => "openSUSE Linux 10.x", "value" => "linux_opensuse10");
-		
-		$image_version_arr[] = array("label" => "Red Hat Enterprise Linux 7", "value" => "linux_rhel7");
-		$image_version_arr[] = array("label" => "Red Hat Enterprise Linux 6", "value" => "linux_rhel6");
-		$image_version_arr[] = array("label" => "Red Hat Enterprise Linux 5", "value" => "linux_rhel5");
-		$image_version_arr[] = array("label" => "Red Hat Enterprise Linux 4", "value" => "linux_rhel4");
-		
-		$image_version_arr[] = array("label" => "SUSE Linux Enterprise 12", "value" => "linux_suse12");
-		$image_version_arr[] = array("label" => "SUSE Linux Enterprise 11", "value" => "linux_suse11");
-		$image_version_arr[] = array("label" => "SUSE Linux Enterprise 10", "value" => "linux_suse10");
-		
-		$image_version_arr[] = array("label" => "Ubuntu 15.10", "value" => "linux_ubuntu1510");
-		$image_version_arr[] = array("label" => "Ubuntu 15.04", "value" => "linux_ubuntu1504");
-		$image_version_arr[] = array("label" => "Ubuntu 14.10", "value" => "linux_ubuntu1410");
-		$image_version_arr[] = array("label" => "Ubuntu 14.04 LTS", "value" => "linux_ubuntu1404");
-		$image_version_arr[] = array("label" => "Ubuntu 13.10", "value" => "linux_ubuntu1310");
-		$image_version_arr[] = array("label" => "Ubuntu 13.04", "value" => "linux_ubuntu1304");
-		$image_version_arr[] = array("label" => "Ubuntu 12.10", "value" => "linux_ubuntu1210");
-		$image_version_arr[] = array("label" => "Ubuntu 12.04 LTS", "value" => "linux_ubuntu1204");
-		$image_version_arr[] = array("label" => "Ubuntu 11.10", "value" => "linux_ubuntu1110");
-		$image_version_arr[] = array("label" => "Ubuntu 11.04", "value" => "linux_ubuntu1104");
-		$image_version_arr[] = array("label" => "Ubuntu 10.10", "value" => "linux_ubuntu1010");
-		$image_version_arr[] = array("label" => "Ubuntu 10.04 LTS ", "value" => "linux_ubuntu1004");
-		
-		$image_version_arr[] = array("label" => "Windows Server 2016", "value" => "windows_server2016");
-		$image_version_arr[] = array("label" => "Windows 10", "value" => "windows_10");
-		$image_version_arr[] = array("label" => "Windows Server 2012 R2", "value" => "windows_server2012r2");
-		$image_version_arr[] = array("label" => "Windows Server 2012", "value" => "windows_server2012");
-		$image_version_arr[] = array("label" => "Windows 8.1", "value" => "windows_81");
-		$image_version_arr[] = array("label" => "Windows 8", "value" => "windows_8");
-		$image_version_arr[] = array("label" => "Windows 7", "value" => "windows_7");
-		$image_version_arr[] = array("label" => "Windows Server 2008", "value" => "windows_2008");
-		$image_version_arr[] = array("label" => "Windows Vista", "value" => "windows_vista");
-		$image_version_arr[] = array("label" => "Windows Server 2003", "value" => "windows_server2003");
-		$image_version_arr[] = array("label" => "Windows XP", "value" => "windows_xp");
-		
-		$image_version_arr[] = array("label" => "Other", "value" => "Other");
-		return $image_version_arr;
-	}
-	
-	
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/image_authentication.class.php b/openQRM-5.3.50-CE/src/web/base/class/image_authentication.class.php
deleted file mode 100644
index 06407d4..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/image_authentication.class.php
+++ /dev/null
@@ -1,335 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-// This class represents a image_authentication object in openQRM
-// its for registering to set (remove) the authenication of an image
-// after its appliance stopped
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-
-global $IMAGE_AUTHENTICATION_TABLE;
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXEC_PORT;
-$event = new event();
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-global $OPENQRM_SERVER_IP_ADDRESS;
-global $event;
-
-
-class image_authentication {
-
-var $id = '';
-var $image_id = '';
-var $resource_id = '';
-var $auth_type = '';
-	// -> 0 = image-root
-	// -> 1 = image-deployment
-
-
-
-// ---------------------------------------------------------------------------------
-// methods to create an instance of a image_authentication object filled from the db
-// ---------------------------------------------------------------------------------
-
-// returns an appliance from the db selected by id or name
-function get_instance($id, $image_id) {
-	global $IMAGE_AUTHENTICATION_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	if ("$id" != "") {
-		$image_authentication_array = $db->Execute("select * from $IMAGE_AUTHENTICATION_TABLE where ia_id=$id");
-	} else if ("$image_id" != "") {
-		$image_authentication_array = $db->Execute("select * from $IMAGE_AUTHENTICATION_TABLE where ia_image_id=$image_id");
-	} else {
-		$event->log("get_instance", $_SERVER['REQUEST_TIME'], 2, "image_authentication.class.php", "Could not create instance of event without data", "", "", 0, 0, 0);
-		array_walk(debug_backtrace(),create_function('$a,$b','syslog(LOG_ERR, "{$a[\'function\']}()(".basename($a[\'file\']).":{$a[\'line\']}); ");'));
-		return;
-	}
-
-	foreach ($image_authentication_array as $index => $image_authentication) {
-		$this->id = $image_authentication["ia_id"];
-		$this->image_id = $image_authentication["ia_image_id"];
-		$this->resource_id = $image_authentication["ia_resource_id"];
-		$this->auth_type = $image_authentication["ia_auth_type"];
-	}
-	return $this;
-}
-
-// returns an image_authentication from the db selected by id
-function get_instance_by_id($id) {
-	$this->get_instance($id, "");
-	return $this;
-}
-
-// returns an image_authentication from the db selected by the image_id
-function get_instance_by_image_id($image_id) {
-	$this->get_instance("", $image_id);
-	return $this;
-}
-
-// ---------------------------------------------------------------------------------
-// general image_authentication methods
-// ---------------------------------------------------------------------------------
-
-
-
-
-// checks if given image_authentication id is free in the db
-function is_id_free($image_authentication_id) {
-	global $IMAGE_AUTHENTICATION_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select ia_id from $IMAGE_AUTHENTICATION_TABLE where ia_id=$image_authentication_id");
-	if (!$rs)
-		$event->log("is_id_free", $_SERVER['REQUEST_TIME'], 2, "image_authentication.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	if ($rs->EOF) {
-		return true;
-	} else {
-		return false;
-	}
-}
-
-
-// adds image_authentication to the database
-function add($image_authentication_fields) {
-	global $IMAGE_AUTHENTICATION_TABLE;
-	global $event;
-	if (!is_array($image_authentication_fields)) {
-		$event->log("add", $_SERVER['REQUEST_TIME'], 2, "image_authentication.class.php", "image_authentication_field not well defined", "", "", 0, 0, 0);
-		return 1;
-	}
-	$image_id = $image_authentication_fields['ia_image_id'];
-	$auth_type = $image_authentication_fields['ia_auth_type'];
-
-	// before we add we check that it is uniq per image
-	// so there can just be 2 image_authentications per image, rootfs + deployment
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select ia_id from $IMAGE_AUTHENTICATION_TABLE where ia_image_id=$image_id and ia_auth_type=$auth_type");
-	if (!$rs) {
-		$event->log("add", $_SERVER['REQUEST_TIME'], 2, "image_authentication.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		if ($rs->EOF) {
-			$event->log("add", $_SERVER['REQUEST_TIME'], 5, "image_authentication.class.php", "Adding image_authentication for image id $image_id type $auth_type.", "", "", 0, 0, 0);
-			$result = $db->AutoExecute($IMAGE_AUTHENTICATION_TABLE, $image_authentication_fields, 'INSERT');
-			if (! $result) {
-				$event->log("add", $_SERVER['REQUEST_TIME'], 2, "image_authentication.class.php", "Failed adding new image_authentication to database", "", "", 0, 0, 0);
-			}
-
-		} else {
-			$event->log("add", $_SERVER['REQUEST_TIME'], 2, "image_authentication.class.php", "Not adding image_authentication for image id $image_id type $auth_type since it already is registered.", "", "", 0, 0, 0);
-		}
-	}
-}
-
-
-
-// removes image_authentication from the database
-function remove($image_authentication_id) {
-	global $IMAGE_AUTHENTICATION_TABLE;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("delete from $IMAGE_AUTHENTICATION_TABLE where ia_id=$image_authentication_id");
-}
-
-
-
-// returns the number of image_authentications for an image_authentication type
-function get_count() {
-	global $IMAGE_AUTHENTICATION_TABLE;
-	$count=0;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select count(id) as num from $IMAGE_AUTHENTICATION_TABLE");
-	if (!$rs) {
-		print $db->ErrorMsg();
-	} else {
-		$count = $rs->fields["num"];
-	}
-	return $count;
-}
-
-
-
-// returns a list of all image_authentication names
-function get_list() {
-	global $IMAGE_AUTHENTICATION_TABLE;
-	$query = "select id, image_id from $IMAGE_AUTHENTICATION_TABLE";
-	$image_authentication_name_array = array();
-	$image_authentication_name_array = openqrm_db_get_result_double ($query);
-	return $image_authentication_name_array;
-}
-
-
-// returns a list of all image_authentication ids
-function get_all_ids() {
-	global $IMAGE_AUTHENTICATION_TABLE;
-	global $event;
-	$image_authentication_list = array();
-	$query = "select ia_id from $IMAGE_AUTHENTICATION_TABLE";
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute($query);
-	if (!$rs)
-		$event->log("get_list", $_SERVER['REQUEST_TIME'], 2, "image_authentication.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	while (!$rs->EOF) {
-		$image_authentication_list[] = $rs->fields;
-		$rs->MoveNext();
-	}
-	return $image_authentication_list;
-
-}
-
-
-
-
-// checks all image_authentications and de-authenticates them if 
-// its resource (the appliance resource) is idle/active again
-function check_all_image_authentication() {
-	global $IMAGE_AUTHENTICATION_TABLE;
-	global $event;
-	global $RootDir;
-
-	// $event->log("check_all_image_authentication", $_SERVER['REQUEST_TIME'], 5, "image_authentication.class.php", "Checking all image_authentications", "", "", 0, 0, 0);
-	$ia_id_ar = $this->get_all_ids();
-	foreach($ia_id_ar as $ia_list) {
-
-		$ia_auth_id = $ia_list['ia_id'];
-		$ia_auth = new image_authentication();
-		$ia_auth->get_instance_by_id($ia_auth_id);
-		$event->log("check_all_image_authentication", $_SERVER['REQUEST_TIME'], 5, "image_authentication.class.php", "Checking image_authentication '$ia_auth_id'", "", "", 0, 0, 0);
-
-		// get data
-		$image = new image();
-		if($ia_auth->image_id>0){
-			$image->get_instance_by_id($ia_auth->image_id);
-		}else{
-			$image->get_instance_by_id($ia_auth_id);
-		}
-		$image_name = $image->name;
-		$image_id = $image->id;
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-		$deployment_type = $deployment->type;
-		$deployment_plugin_name = $deployment->storagetype;
-		$storage_auth_hook = "$RootDir/plugins/$deployment_plugin_name/openqrm-$deployment_type-auth-hook.php";
-
-		$resource_id = $ia_auth->resource_id;
-		$resource = new resource();
-		$resource->get_instance_by_id($resource_id);
-
-		// check for root or deployment auth
-		switch ($ia_auth->auth_type) {
-			case 0:
-				// run storage_auth_stop (rootfs)
-				if ((!strcmp($resource->state, "active")) && ($resource->imageid == 1)) {
-					$event->log("check_all_image_authentication", $_SERVER['REQUEST_TIME'], 5, "image_authentication.class.php", "Resource $resource_id idle again, stop-auth $image_name ($image_id)", "", "", 0, 0, $resource_id);
-					// include storage-plugin auth-hook
-					if (file_exists($storage_auth_hook)) {
-						$event->log("check_all_image_authentication", $_SERVER['REQUEST_TIME'], 5, "image_authentication.class.php", "Deployment type $deployment_type handling stop-auth hook $image_id.", "", "", 0, 0, $resource_id);
-						require_once "$storage_auth_hook";
-						storage_auth_stop($image->id);
-						// remove image_authentication
-						$ia_auth->remove($ia_auth_id);
-
-					}
-				} else {
-					// resource is still on rebooting
-					$event->log("check_all_image_authentication", $_SERVER['REQUEST_TIME'], 5, "image_authentication.class.php", "Resource $resource_id still rebooting, waiting for stop-auth $image_name", "", "", 0, 0, $resource_id);
-				}
-				break;
-
-
-			case 1:
-				// run storage_auth_stop (deployment export)
-				// we stop the deployment hook when the resource is active or active/idle
-				// -> in both states it for sure does not need the deployment mount any more
-				if (!strcmp($resource->state, "active")) {
-					$event->log("check_all_image_authentication", $_SERVER['REQUEST_TIME'], 5, "image_authentication.class.php", "Resource $resource_id active, stop-deployment auth $image_name", "", "", 0, 0, $resource_id);
-					// include storage-plugin auth-hook
-					if (file_exists($storage_auth_hook)) {
-						$event->log("check_all_image_authentication", $_SERVER['REQUEST_TIME'], 5, "image_authentication.class.php", "Deployment type $deployment_type handling stop-deployment auth hook $image_id.", "", "", 0, 0, $resource_id);
-						require_once "$storage_auth_hook";
-						storage_auth_deployment_stop($image->id);
-
-						if($ia_auth->image_id > 0){
-							$image->get_instance_by_id($ia_auth->image_id);
-							$image_name = $image->name;
-							$image_id = $image->id;
-						}
-						
-						if($deployment_type != 'tmpfs-deployment'){
-							// remove all install from or transfer to deployment parameters
-							$image->set_deployment_parameters("IMAGE_INSTALL_FROM_NFS", "");
-							$image->set_deployment_parameters("IMAGE_TRANSFER_TO_NFS", "");
-							$image->set_deployment_parameters("IMAGE_INSTALL_FROM_LOCAL", "");
-							$image->set_deployment_parameters("IMAGE_TRANSFER_TO_LOCAL", "");
-						}
-						// remove image_authentication
-						$ia_auth->remove($ia_auth_id);
-					}
-				} else {
-					// resource is still on rebooting
-					$event->log("check_all_image_authentication", $_SERVER['REQUEST_TIME'], 5, "image_authentication.class.php", "Resource $resource_id is still rebooting, waiting for stop-deployment auth $image_name", "", "", 0, 0, $resource_id);
-				}
-				break;
-
-		}
-
-	}
-
-}
-
-
-
-// displays the image_authentication-overview
-function display_overview($offset, $limit, $sort, $order) {
-	global $IMAGE_AUTHENTICATION_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	$recordSet = $db->SelectLimit("select * from $IMAGE_AUTHENTICATION_TABLE order by $sort $order", $limit, $offset);
-	$image_authentication_array = array();
-	if (!$recordSet) {
-		$event->log("display_overview", $_SERVER['REQUEST_TIME'], 2, "image_authentication.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		while (!$recordSet->EOF) {
-			array_push($image_authentication_array, $recordSet->fields);
-			$recordSet->MoveNext();
-		}
-		$recordSet->Close();
-	}
-	return $image_authentication_array;
-}
-
-
-
-
-
-
-
-
-
-// ---------------------------------------------------------------------------------
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/web/base/class/kernel.class.php b/openQRM-5.3.50-CE/src/web/base/class/kernel.class.php
deleted file mode 100644
index 39d6a7b..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/kernel.class.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-// This class represents boot-image (kernel) 
-// A Kernel can be used to deploy an (server-)image (image.class)
-// to a resource (resource.class) via an appliance (appliance.class)
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/event.class.php";
-
-global $KERNEL_INFO_TABLE;
-
-
-class kernel {
-
-var $id = '';
-var $name = '';
-var $version = '';
-var $comment = '';
-var $capabilities = '';
-
-
-// ---------------------------------------------------------------------------------
-// methods to create an instance of a kernel object filled from the db
-// ---------------------------------------------------------------------------------
-
-//--------------------------------------------------
-/**
-* Constructor
-*/
-//--------------------------------------------------
-function kernel() {
-	global $KERNEL_INFO_TABLE;
-	$this->__event = new event();
-}
-
-
-// returns a kernel from the db selected by id or name
-function get_instance($id, $name) {
-	global $KERNEL_INFO_TABLE;
-	$db=openqrm_get_db_connection();
-	if ("$id" != "") {
-		$kernel_array = $db->Execute("select * from $KERNEL_INFO_TABLE where kernel_id=$id");
-	} else if ("$name" != "") {
-		$kernel_array = $db->Execute("select * from $KERNEL_INFO_TABLE where kernel_name='$name'");
-	} else {
-		$this->__event->log("get_instance", $_SERVER['REQUEST_TIME'], 2, "kernel.class.php", "Could not create instance of kernel without data", "", "", 0, 0, 0);
-		foreach(debug_backtrace() as $key => $msg) {
-			syslog(LOG_ERR, $msg['function'].'() '.basename($msg['file']).':'.$msg['line']);
-		}
-		return;
-	}
-	foreach ($kernel_array as $index => $kernel) {
-		$this->id = $kernel["kernel_id"];
-		$this->name = $kernel["kernel_name"];
-		$this->version = $kernel["kernel_version"];
-		$this->capabilities = $kernel["kernel_capabilities"];
-		$this->comment = $kernel["kernel_comment"];
-	}
-	return $this;
-}
-
-// returns a kernel from the db selected by id
-function get_instance_by_id($id) {
-	$this->get_instance($id, "");
-	return $this;
-}
-
-// returns a kernel from the db selected by iname
-function get_instance_by_name($name) {
-	$this->get_instance("", $name);
-	return $this;
-}
-
-
-
-
-// ---------------------------------------------------------------------------------
-// general kernel methods
-// ---------------------------------------------------------------------------------
-
-
-// checks if given kernel id is free in the db
-function is_id_free($kernel_id) {
-	global $KERNEL_INFO_TABLE;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select kernel_id from $KERNEL_INFO_TABLE where kernel_id=$kernel_id");
-	if (!$rs)
-		$this->__event->log("is_id_free", $_SERVER['REQUEST_TIME'], 2, "kernel.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	if ($rs->EOF) {
-		return true;
-	} else {
-		return false;
-	}
-}
-
-
-// adds kernel to the database
-function add($kernel_fields) {
-	global $KERNEL_INFO_TABLE;
-	if (!is_array($kernel_fields)) {
-		$this->__event->log("add", $_SERVER['REQUEST_TIME'], 2, "kernel.class.php", "Kernel_field not well defined", "", "", 0, 0, 0);
-		return 1;
-	}
-	$db=openqrm_get_db_connection();
-	$result = $db->AutoExecute($KERNEL_INFO_TABLE, $kernel_fields, 'INSERT');
-	if (! $result) {
-		$this->__event->log("add", $_SERVER['REQUEST_TIME'], 2, "kernel.class.php", "Failed adding new kernel to database", "", "", 0, 0, 0);
-	}
-}
-
-// updates kernel in the database
-function update($kernel_id, $kernel_fields) {
-	global $KERNEL_INFO_TABLE;
-	if ($kernel_id < 0 || ! is_array($kernel_fields)) {
-		$this->__event->log("update", $_SERVER['REQUEST_TIME'], 2, "kernel.class.php", "Unable to update kernel $kernel_id", "", "", 0, 0, 0);
-		return 1;
-	}
-	$db=openqrm_get_db_connection();
-	unset($kernel_fields["kernel_id"]);
-	$result = $db->AutoExecute($KERNEL_INFO_TABLE, $kernel_fields, 'UPDATE', "kernel_id = $kernel_id");
-	if (! $result) {
-		$this->__event->log("update", $_SERVER['REQUEST_TIME'], 2, "kernel.class.php", "Failed updating kernel $kernel_id", "", "", 0, 0, 0);
-	}
-}
-
-// removes kernel from the database
-function remove($kernel_id) {
-	// do not remove the openqrm + default kernel
-	if (($kernel_id == 0) || ($kernel_id == 1))  {
-		return;
-	}
-	global $KERNEL_INFO_TABLE;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("delete from $KERNEL_INFO_TABLE where kernel_id=$kernel_id");
-}
-
-// removes kernel from the database by name
-function remove_by_name($kernel_name) {
-	// do not remove the idle + openqrm image
-	if (($kernel_name == "openqrm") || ($kernel_name == "default"))  {
-		return;
-	}
-	global $KERNEL_INFO_TABLE;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("delete from $KERNEL_INFO_TABLE where kernel_name='$kernel_name'");
-}
-
-
-// returns kernel_name by kernel_id
-function get_name($kernel_id) {
-	global $KERNEL_INFO_TABLE;
-	$db=openqrm_get_db_connection();
-	$kernel_set = $db->Execute("select kernel_name from $KERNEL_INFO_TABLE where kernel_id=$kernel_id");
-	if (!$kernel_set) {
-		$this->__event->log("get_name", $_SERVER['REQUEST_TIME'], 2, "kernel.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		if (!$kernel_set->EOF) {
-			return $kernel_set->fields["kernel_name"];
-		}
-	}
-}
-
-
-
-// returns the number of available kernels
-function get_count() {
-	global $KERNEL_INFO_TABLE;
-	$count=0;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select count(kernel_id) as num from $KERNEL_INFO_TABLE");
-	if (!$rs) {
-		$this->__event->log("get_name", $_SERVER['REQUEST_TIME'], 2, "kernel.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		$count = $rs->fields["num"];
-	}
-	return $count;
-}
-
-
-
-
-// returns a list of all kernel names
-function get_list() {
-	global $KERNEL_INFO_TABLE;
-	$query = "select kernel_id, kernel_name from $KERNEL_INFO_TABLE";
-	$kernel_name_array = array();
-	$kernel_name_array = openqrm_db_get_result_double ($query);
-	return $kernel_name_array;
-}
-
-
-
-// displays the kernel-overview
-function display_overview($offset, $limit, $sort, $order) {
-	global $KERNEL_INFO_TABLE;
-	$db=openqrm_get_db_connection();
-	$recordSet = $db->SelectLimit("select * from $KERNEL_INFO_TABLE where kernel_id > 0 order by $sort $order", $limit, $offset);
-	$kernel_array = array();
-	if (!$recordSet) {
-		$this->__event->log("display_overview", $_SERVER['REQUEST_TIME'], 2, "kernel.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		while (!$recordSet->EOF) {
-			array_push($kernel_array, $recordSet->fields);
-			$recordSet->MoveNext();
-		}
-		$recordSet->Close();
-	}
-	return $kernel_array;
-}
-
-
-
-
-
-
-
-// ---------------------------------------------------------------------------------
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/web/base/class/layersmenu.class.php b/openQRM-5.3.50-CE/src/web/base/class/layersmenu.class.php
deleted file mode 100644
index 6328abb..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/layersmenu.class.php
+++ /dev/null
@@ -1,1353 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-// based on PHP Layers Menu 3.2.0-rc (C) 2001-2004 Marco Pratesi - http://www.marcopratesi.it/
-
-/**
-* This file contains the code of the LayersMenuCommon class.
-* @package PHPLayersMenu
-*/
-
-/**
-* This is the "common" class of the PHP Layers Menu library.
-*
-* You need to include PEAR.php and DB.php if (and only if) you want to use the DB support provided by ths class.
-*
-* @version 3.2.0-rc
-* @package PHPLayersMenu
-*/
-class LayersMenuCommon
-{
-
-/**
-* The name of the package
-* @access private
-* @var string
-*/
-var $_packageName;
-/**
-* The version of the package
-* @access private
-* @var string
-*/
-var $version;
-/**
-* The copyright of the package
-* @access private
-* @var string
-*/
-var $copyright;
-/**
-* The author of the package
-* @access private
-* @var string
-*/
-var $author;
-
-/**
-* URL to be prepended to the menu hrefs
-* @access private
-* @var string
-*/
-var $prependedUrl = '';
-/**
-* Do you want that code execution halts on error?
-* @access private
-* @var string
-*/
-var $haltOnError = 'yes';
-
-/**
-* The base directory where the package is installed
-* @access private
-* @var string
-*/
-var $dirroot;
-/**
-* The "libjs" directory of the package
-* @access private
-* @var string
-*/
-var $libjsdir;
-/**
-* The directory where images related to the menu can be found
-* @access private
-* @var string
-*/
-var $imgdir;
-/**
-* The http path corresponding to imgdir
-* @access private
-* @var string
-*/
-var $imgwww;
-/**
-* The directory where icons of menu items can be found
-* @access private
-* @var string
-*/
-var $icondir;
-/**
-* The http path corresponding to icondir
-* @access private
-* @var string
-*/
-var $iconwww;
-/**
-* This array may contain width and height of all icons
-* @access private
-* @var integer
-*/
-var $iconsize = array();
-/**
-* If this var is false, width and height of icons have to be detected; if this var is true, width and height of icons are not detected and are retrieved from the iconsize array
-* @access private
-* @var boolean
-*/
-var $issetIconsize = false;
-/**
-* The directory where templates can be found
-* @access private
-* @var string
-*/
-var $tpldir;
-/**
-* The string containing the menu structure
-* @access private
-* @var string
-*/
-var $menuStructure;
-
-/**
-* It counts nodes for all menus
-* @access private
-* @var integer
-*/
-var $_nodesCount;
-/**
-* A multi-dimensional array to store informations for each menu entry
-* @access private
-* @var array
-*/
-var $tree;
-/**
-* A multi-dimensional array used only with the DB support; for each $menu_name, it stores the $cnt associated to each item id
-*
-* This array is needed for selection of the current item
-* through the corresponding id (see the DB table structure)
-* as, internally, items are stored, sorted and addressed in terms of $cnt
-*
-* @access private
-* @var array
-*/
-var $treecnt;
-/**
-* The maximum hierarchical level of menu items
-* @access private
-* @var integer
-*/
-var $_maxLevel;
-/**
-* An array that counts the number of first level items for each menu
-* @access private
-* @var array
-*/
-var $_firstLevelCnt;
-/**
-* An array containing the number identifying the first item of each menu
-* @access private
-* @var array
-*/
-var $_firstItem;
-/**
-* An array containing the number identifying the last item of each menu
-* @access private
-* @var array
-*/
-var $_lastItem;
-
-/**
-* Data Source Name: the connection string for PEAR DB
-* @access private
-* @var string
-*/
-var $dsn = 'pgsql://dbuser:dbpass@dbhost/dbname';
-/**
-* DB connections are either persistent or not persistent
-* @access private
-* @var boolean
-*/
-var $persistent = false;
-/**
-* Name of the table storing data describing the menu
-* @access private
-* @var string
-*/
-var $tableName = 'phplayersmenu';
-/**
-* Name of the i18n table corresponding to $tableName
-* @access private
-* @var string
-*/
-var $tableName_i18n = 'phplayersmenu_i18n';
-/**
-* Names of fields of the table storing data describing the menu
-*
-* default field names correspond to the same field names foreseen
-* by the menu structure format
-*
-* @access private
-* @var array
-*/
-var $tableFields = array(
-	'id'		=> 'id',
-	'parent_id'	=> 'parent_id',
-	'text'		=> 'text',
-	'href'		=> 'href',
-	'title'		=> 'title',
-	'icon'		=> 'icon',
-	'target'	=> 'target',
-	'orderfield'	=> 'orderfield',
-	'expanded'	=> 'expanded'
-);
-/**
-* Names of fields of the i18n table corresponding to $tableName
-* @access private
-* @var array
-*/
-var $tableFields_i18n = array(
-	'language'	=> 'language',
-	'id'		=> 'id',
-	'text'		=> 'text',
-	'title'		=> 'title'
-);
-/**
-* A temporary array to store data retrieved from the DB and to perform the depth-first search
-* @access private
-* @var array
-*/
-var $_tmpArray = array();
-
-/**
-* The constructor method; it initializates the menu system
-* @return void
-*/
-function LayersMenuCommon()
-{
-	$this->_packageName = 'PHP Layers Menu';
-	$this->version = '3.2.0-rc';
-	$this->copyright = '(C) 2001-2004';
-	$this->author = 'Marco Pratesi - http://www.marcopratesi.it/';
-
-	$this->prependedUrl = '';
-
-	$this->dirroot = './';
-	$this->libjsdir = './libjs/';
-	$this->imgdir = './menuimages/';
-	$this->imgwww = 'menuimages/';
-	$this->icondir = './menuicons/';
-	$this->iconwww = 'menuicons/';
-	$this->tpldir = './templates/';
-	$this->menuStructure = '';
-	$this->separator = '|';
-
-	$this->_nodesCount = 0;
-	$this->tree = array();
-	$this->treecnt = array();
-	$this->_maxLevel = array();
-	$this->_firstLevelCnt = array();
-	$this->_firstItem = array();
-	$this->_lastItem = array();
-}
-
-/**
-* The method to set the prepended URL
-* @access public
-* @return boolean
-*/
-function setPrependedUrl($prependedUrl)
-{
-	// We do not perform any check
-	$this->prependedUrl = $prependedUrl;
-	return true;
-}
-
-/**
-* The method to set the dirroot directory
-* @access public
-* @return boolean
-*/
-function setDirrootCommon($dirroot)
-{
-	if (!is_dir($dirroot)) {
-		$this->error("setDirroot: $dirroot is not a directory.");
-		return false;
-	}
-	if (substr($dirroot, -1) != '/') {
-		$dirroot .= '/';
-	}
-	$oldlength = strlen($this->dirroot);
-	$foobar = strpos($this->libjsdir, $this->dirroot);
-	if (!($foobar === false || $foobar != 0)) {
-		$this->libjsdir = $dirroot . substr($this->libjsdir, $oldlength);
-	}
-	$foobar = strpos($this->imgdir, $this->dirroot);
-	if (!($foobar === false || $foobar != 0)) {
-		$this->imgdir = $dirroot . substr($this->imgdir, $oldlength);
-	}
-	$foobar = strpos($this->icondir, $this->dirroot);
-	if (!($foobar === false || $foobar != 0)) {
-		$this->icondir = $dirroot . substr($this->icondir, $oldlength);
-	}
-	$foobar = strpos($this->tpldir, $this->dirroot);
-	if (!($foobar === false || $foobar != 0)) {
-		$this->tpldir = $dirroot . substr($this->tpldir, $oldlength);
-	}
-	$this->dirroot = $dirroot;
-	return true;
-}
-
-/**
-* The method to set the libjsdir directory
-* @access public
-* @return boolean
-*/
-function setLibjsdir($libjsdir)
-{
-	if ($libjsdir != '' && substr($libjsdir, -1) != '/') {
-		$libjsdir .= '/';
-	}
-	if ($libjsdir == '' || substr($libjsdir, 0, 1) != '/') {
-		$foobar = strpos($libjsdir, $this->dirroot);
-		if ($foobar === false || $foobar != 0) {
-			$libjsdir = $this->dirroot . $libjsdir;
-		}
-	}
-	if (!is_dir($libjsdir)) {
-		$this->error("setLibjsdir: $libjsdir is not a directory.");
-		return false;
-	}
-	$this->libjsdir = $libjsdir;
-	return true;
-}
-
-/**
-* The method to set the imgdir directory
-* @access public
-* @return boolean
-*/
-function setImgdir($imgdir)
-{
-	if ($imgdir != '' && substr($imgdir, -1) != '/') {
-		$imgdir .= '/';
-	}
-	if ($imgdir == '' || substr($imgdir, 0, 1) != '/') {
-		$foobar = strpos($imgdir, $this->dirroot);
-		if ($foobar === false || $foobar != 0) {
-			$imgdir = $this->dirroot . $imgdir;
-		}
-	}
-	if (!is_dir($imgdir)) {
-		$this->error("setImgdir: $imgdir is not a directory.");
-		return false;
-	}
-	$this->imgdir = $imgdir;
-	return true;
-}
-
-/**
-* The method to set imgwww
-* @access public
-* @return void
-*/
-function setImgwww($imgwww)
-{
-	if ($imgwww != '' && substr($imgwww, -1) != '/') {
-		$imgwww .= '/';
-	}
-	$this->imgwww = $imgwww;
-}
-
-/**
-* The method to set the icondir directory
-* @access public
-* @return boolean
-*/
-function setIcondir($icondir)
-{
-	if ($icondir != '' && substr($icondir, -1) != '/') {
-		$icondir .= '/';
-	}
-	if ($icondir == '' || substr($icondir, 0, 1) != '/') {
-		$foobar = strpos($icondir, $this->dirroot);
-		if ($foobar === false || $foobar != 0) {
-			$icondir = $this->dirroot . $icondir;
-		}
-	}
-	if (!is_dir($icondir)) {
-		$this->error("setIcondir: $icondir is not a directory.");
-		return false;
-	}
-	$this->icondir = $icondir;
-	return true;
-}
-
-/**
-* The method to set iconwww
-* @access public
-* @return void
-*/
-function setIconwww($iconwww)
-{
-	if ($iconwww != '' && substr($iconwww, -1) != '/') {
-		$iconwww .= '/';
-	}
-	$this->iconwww = $iconwww;
-}
-
-/**
-* The method to set the iconsize array
-* @access public
-* @return void
-*/
-function setIconsize($width, $height)
-{
-	$this->iconsize['width'] = ($width == (int) $width) ? $width : 0;
-	$this->iconsize['height'] = ($height == (int) $height) ? $height : 0;
-	$this->issetIconsize = true;
-}
-
-/**
-* The method to unset the iconsize array
-* @access public
-* @return void
-*/
-function unsetIconsize()
-{
-	unset($this->iconsize['width']);
-	unset($this->iconsize['height']);
-	$this->issetIconsize = false;
-}
-
-/**
-* The method to set the tpldir directory
-* @access public
-* @return boolean
-*/
-function setTpldirCommon($tpldir)
-{
-	if ($tpldir != '' && substr($tpldir, -1) != '/') {
-		$tpldir .= '/';
-	}
-	if ($tpldir == '' || substr($tpldir, 0, 1) != '/') {
-		$foobar = strpos($tpldir, $this->dirroot);
-		if ($foobar === false || $foobar != 0) {
-			$tpldir = $this->dirroot . $tpldir;
-		}
-	}
-	if (!is_dir($tpldir)) {
-		$this->error("setTpldir: $tpldir is not a directory.");
-		return false;
-	}
-	$this->tpldir = $tpldir;
-	return true;
-}
-
-/**
-* The method to read the menu structure from a file
-* @access public
-* @param string $tree_file the menu structure file
-* @return boolean
-*/
-function setMenuStructureFile($tree_file)
-{
-	if (!($fd = fopen($tree_file, 'r'))) {
-		$this->error("setMenuStructureFile: unable to open file $tree_file.");
-		return false;
-	}
-	$this->menuStructure = '';
-	while ($buffer = fgets($fd, 4096)) {
-		$buffer = str_replace(chr(13), '', $buffer);	// Microsoft Stupidity Suppression
-		$this->menuStructure .= $buffer;
-	}
-	fclose($fd);
-	if ($this->menuStructure == '') {
-		$this->error("setMenuStructureFile: $tree_file is empty.");
-		return false;
-	}
-	return true;
-}
-
-/**
-* The method to set the menu structure passing it through a string
-* @access public
-* @param string $tree_string the menu structure string
-* @return boolean
-*/
-function setMenuStructureString($tree_string)
-{
-	$this->menuStructure = str_replace(chr(13), '', $tree_string);	// Microsoft Stupidity Suppression
-	if ($this->menuStructure == '') {
-		$this->error('setMenuStructureString: empty string.');
-		return false;
-	}
-	return true;
-}
-
-/**
-* The method to set the value of separator
-* @access public
-* @return void
-*/
-function setSeparator($separator)
-{
-	$this->separator = $separator;
-}
-
-/**
-* The method to set parameters for the DB connection
-* @access public
-* @param string $dns Data Source Name: the connection string for PEAR DB
-* @param bool $persistent DB connections are either persistent or not persistent
-* @return boolean
-*/
-function setDBConnParms($dsn, $persistent=false)
-{
-	if (!is_string($dsn)) {
-		$this->error('initdb: $dsn is not an string.');
-		return false;
-	}
-	if (!is_bool($persistent)) {
-		$this->error('initdb: $persistent is not a boolean.');
-		return false;
-	}
-	$this->dsn = $dsn;
-	$this->persistent = $persistent;
-	return true;
-}
-
-/**
-* The method to set the name of the table storing data describing the menu
-* @access public
-* @param string
-* @return boolean
-*/
-function setTableName($tableName)
-{
-	if (!is_string($tableName)) {
-		$this->error('setTableName: $tableName is not a string.');
-		return false;
-	}
-	$this->tableName = $tableName;
-	return true;
-}
-
-/**
-* The method to set the name of the i18n table corresponding to $tableName
-* @access public
-* @param string
-* @return boolean
-*/
-function setTableName_i18n($tableName_i18n)
-{
-	if (!is_string($tableName_i18n)) {
-		$this->error('setTableName_i18n: $tableName_i18n is not a string.');
-		return false;
-	}
-	$this->tableName_i18n = $tableName_i18n;
-	return true;
-}
-
-/**
-* The method to set names of fields of the table storing data describing the menu
-* @access public
-* @param array
-* @return boolean
-*/
-function setTableFields($tableFields)
-{
-	if (!is_array($tableFields)) {
-		$this->error('setTableFields: $tableFields is not an array.');
-		return false;
-	}
-	if (count($tableFields) == 0) {
-		$this->error('setTableFields: $tableFields is a zero-length array.');
-		return false;
-	}
-	reset ($tableFields);
-	while (list($key, $value) = each($tableFields)) {
-		$this->tableFields[$key] = ($value == '') ? "''" : $value;
-	}
-	return true;
-}
-
-/**
-* The method to set names of fields of the i18n table corresponding to $tableName
-* @access public
-* @param array
-* @return boolean
-*/
-function setTableFields_i18n($tableFields_i18n)
-{
-	if (!is_array($tableFields_i18n)) {
-		$this->error('setTableFields_i18n: $tableFields_i18n is not an array.');
-		return false;
-	}
-	if (count($tableFields_i18n) == 0) {
-		$this->error('setTableFields_i18n: $tableFields_i18n is a zero-length array.');
-		return false;
-	}
-	reset ($tableFields_i18n);
-	while (list($key, $value) = each($tableFields_i18n)) {
-		$this->tableFields_i18n[$key] = ($value == '') ? "''" : $value;
-	}
-	return true;
-}
-
-/**
-* The method to parse the current menu structure and correspondingly update related variables
-* @access public
-* @param string $menu_name the name to be attributed to the menu
-*   whose structure has to be parsed
-* @return void
-*/
-function parseStructureForMenu(
-	$menu_name = ''	// non consistent default...
-	)
-{
-	$this->_maxLevel[$menu_name] = 0;
-	$this->_firstLevelCnt[$menu_name] = 0;
-	$this->_firstItem[$menu_name] = $this->_nodesCount + 1;
-	$cnt = $this->_firstItem[$menu_name];
-	$menuStructure = $this->menuStructure;
-
-	/* *********************************************** */
-	/* Partially based on a piece of code taken from   */
-	/* TreeMenu 1.1 - Bjorge Dijkstra (bjorge@gmx.net) */
-	/* *********************************************** */
-
-	while ($menuStructure != '') {
-		$before_cr = strcspn($menuStructure, "\n");
-		$buffer = substr($menuStructure, 0, $before_cr);
-		$menuStructure = substr($menuStructure, $before_cr+1);
-		if (substr($buffer, 0, 1) == '#') {
-			continue;	// commented item line...
-		}
-		$tmp = rtrim($buffer);
-		$node = explode($this->separator, $tmp);
-		for ($i=count($node); $i<=6; $i++) {
-			$node[$i] = '';
-		}
-		$this->tree[$cnt]['level'] = strlen($node[0]);
-		$this->tree[$cnt]['text'] = $node[1];
-		$this->tree[$cnt]['href'] = $node[2];
-		$this->tree[$cnt]['title'] = $node[3];
-		$this->tree[$cnt]['icon'] = $node[4];
-		$this->tree[$cnt]['target'] = $node[5];
-		$this->tree[$cnt]['expanded'] = $node[6];
-		$cnt++;
-	}
-
-	/* *********************************************** */
-
-	$this->_lastItem[$menu_name] = count($this->tree);
-	$this->_nodesCount = $this->_lastItem[$menu_name];
-	$this->tree[$this->_lastItem[$menu_name]+1]['level'] = 0;
-	$this->_postParse($menu_name);
-}
-
-/**
-* The method to parse the current menu table and correspondingly update related variables
-* @access public
-* @param string $menu_name the name to be attributed to the menu
-*   whose structure has to be parsed
-* @param string $language i18n language; either omit it or pass
-*   an empty string ('') if you do not want to use any i18n table
-* @return void
-*/
-function scanTableForMenu(
-	$menu_name = '', // non consistent default...
-	$language = ''
-	)
-{
-	$this->_maxLevel[$menu_name] = 0;
-	$this->_firstLevelCnt[$menu_name] = 0;
-	unset($this->tree[$this->_nodesCount+1]);
-	$this->_firstItem[$menu_name] = $this->_nodesCount + 1;
-/* BEGIN BENCHMARK CODE
-$time_start = $this->_getmicrotime();
-/* END BENCHMARK CODE */
-	$db = DB::connect($this->dsn, $this->persistent);
-	if (DB::isError($db)) {
-		$this->error('scanTableForMenu: ' . $db->getMessage());
-	}
-	$dbresult = $db->query('
-		SELECT ' .
-			$this->tableFields['id'] . ' AS id, ' .
-			$this->tableFields['parent_id'] . ' AS parent_id, ' .
-			$this->tableFields['text'] . ' AS text, ' .
-			$this->tableFields['href'] . ' AS href, ' .
-			$this->tableFields['title'] . ' AS title, ' .
-			$this->tableFields['icon'] . ' AS icon, ' .
-			$this->tableFields['target'] . ' AS target, ' .
-			$this->tableFields['expanded'] . ' AS expanded
-		FROM ' . $this->tableName . '
-		WHERE ' . $this->tableFields['id'] . ' <> 1
-		ORDER BY ' . $this->tableFields['orderfield'] . ', ' . $this->tableFields['text'] . ' ASC
-	');
-	$this->_tmpArray = array();
-	while ($dbresult->fetchInto($row, DB_FETCHMODE_ASSOC)) {
-		$this->_tmpArray[$row['id']]['parent_id'] = $row['parent_id'];
-		$this->_tmpArray[$row['id']]['text'] = $row['text'];
-		$this->_tmpArray[$row['id']]['href'] = $row['href'];
-		$this->_tmpArray[$row['id']]['title'] = $row['title'];
-		$this->_tmpArray[$row['id']]['icon'] = $row['icon'];
-		$this->_tmpArray[$row['id']]['target'] = $row['target'];
-		$this->_tmpArray[$row['id']]['expanded'] = $row['expanded'];
-	}
-	if ($language != '') {
-		$dbresult = $db->query('
-			SELECT ' .
-				$this->tableFields_i18n['id'] . ' AS id, ' .
-				$this->tableFields_i18n['text'] . ' AS text, ' .
-				$this->tableFields_i18n['title'] . ' AS title
-			FROM ' . $this->tableName_i18n . '
-			WHERE ' . $this->tableFields_i18n['id'] . ' <> 1
-				AND ' . $this->tableFields_i18n['language'] . ' = ' . "'$language'" . '
-		');
-		while ($dbresult->fetchInto($row, DB_FETCHMODE_ASSOC)) {
-			if (isset($this->_tmpArray[$row['id']])) {
-				$this->_tmpArray[$row['id']]['text'] = $row['text'];
-				$this->_tmpArray[$row['id']]['title'] = $row['title'];
-			}
-		}
-	}
-	unset($dbresult);
-	unset($row);
-	$this->_depthFirstSearch($menu_name, $this->_tmpArray, 1, 1);
-/* BEGIN BENCHMARK CODE
-$time_end = $this->_getmicrotime();
-$time = $time_end - $time_start;
-print "TIME ELAPSED = $time\n<br>";
-/* END BENCHMARK CODE */
-	$this->_lastItem[$menu_name] = count($this->tree);
-	$this->_nodesCount = $this->_lastItem[$menu_name];
-	$this->tree[$this->_lastItem[$menu_name]+1]['level'] = 0;
-	$this->_postParse($menu_name);
-}
-
-function _getmicrotime()
-{
-	list($usec, $sec) = explode(' ', microtime());
-	return ((float) $usec + (float) $sec);
-}
-
-/**
-* Recursive method to perform the depth-first search of the tree data taken from the current menu table
-* @access private
-* @param string $menu_name the name to be attributed to the menu
-*   whose structure has to be parsed
-* @param array $tmpArray the temporary array that stores data to perform
-*   the depth-first search
-* @param integer $parent_id id of the item whose children have
-*   to be searched for
-* @param integer $level the hierarchical level of children to be searched for
-* @return void
-*/
-function _depthFirstSearch($menu_name, $tmpArray, $parent_id=1, $level=1)
-{
-	reset ($tmpArray);
-	while (list($id, $foobar) = each($tmpArray)) {
-		if ($foobar['parent_id'] == $parent_id) {
-			unset($tmpArray[$id]);
-			unset($this->_tmpArray[$id]);
-			$cnt = count($this->tree) + 1;
-			$this->tree[$cnt]['level'] = $level;
-			$this->tree[$cnt]['text'] = $foobar['text'];
-			$this->tree[$cnt]['href'] = $foobar['href'];
-			$this->tree[$cnt]['title'] = $foobar['title'];
-			$this->tree[$cnt]['icon'] = $foobar['icon'];
-			$this->tree[$cnt]['target'] = $foobar['target'];
-			$this->tree[$cnt]['expanded'] = $foobar['expanded'];
-			$this->treecnt[$menu_name][$id] = $cnt;
-			unset($foobar);
-			if ($id != $parent_id) {
-				$this->_depthFirstSearch($menu_name, $this->_tmpArray, $id, $level+1);
-			}
-		}
-	}
-}
-
-/**
-* A method providing parsing needed after both file/string parsing and DB table parsing
-* @access private
-* @param string $menu_name the name of the menu for which the parsing
-*   has to be performed
-* @return void
-*/
-function _postParse(
-	$menu_name = ''	// non consistent default...
-	)
-{
-	for ($cnt=$this->_firstItem[$menu_name]; $cnt<=$this->_lastItem[$menu_name]; $cnt++) {	// this counter scans all nodes of the new menu
-		$this->tree[$cnt]['child_of_root_node'] = ($this->tree[$cnt]['level'] == 1);
-		$this->tree[$cnt]['parsed_text'] = stripslashes($this->tree[$cnt]['text']);
-		$this->tree[$cnt]['parsed_href'] = (str_replace(' ', '', $this->tree[$cnt]['href']) == '') ? '#' : $this->prependedUrl . $this->tree[$cnt]['href'];
-		$this->tree[$cnt]['parsed_title'] = ($this->tree[$cnt]['title'] == '') ? '' : ' title="' . stripslashes($this->tree[$cnt]['title']) . '"';
-		$fooimg = $this->icondir . $this->tree[$cnt]['icon'];
-		if ($this->tree[$cnt]['icon'] != '' && (substr($this->tree[$cnt]['icon'], 0, 7) == 'http://' || substr($this->tree[$cnt]['icon'], 0, 8) == 'https://')) {
-			$this->tree[$cnt]['parsed_icon'] = $this->tree[$cnt]['icon'];
-			if ($this->issetIconsize) {
-				$this->tree[$cnt]['iconwidth'] = $this->iconsize['width'];
-				$this->tree[$cnt]['iconheight'] = $this->iconsize['height'];
-			} else {
-				$foobar = getimagesize($this->tree[$cnt]['icon']);
-				$this->tree[$cnt]['iconwidth'] = $foobar[0];
-				$this->tree[$cnt]['iconheight'] = $foobar[1];
-			}
-		} elseif ($this->tree[$cnt]['icon'] != '' && file_exists($fooimg)) {
-			$this->tree[$cnt]['parsed_icon'] = $this->iconwww . $this->tree[$cnt]['icon'];
-			if ($this->issetIconsize) {
-				$this->tree[$cnt]['iconwidth'] = $this->iconsize['width'];
-				$this->tree[$cnt]['iconheight'] = $this->iconsize['height'];
-			} else {
-				$foobar = getimagesize($fooimg);
-				$this->tree[$cnt]['iconwidth'] = $foobar[0];
-				$this->tree[$cnt]['iconheight'] = $foobar[1];
-			}
-		} else {
-			$this->tree[$cnt]['parsed_icon'] = '';
-		}
-		$this->tree[$cnt]['parsed_target'] = ($this->tree[$cnt]['target'] == '') ? '' : ' target="' . $this->tree[$cnt]['target'] . '"';
-	//		$this->tree[$cnt]['expanded'] = ($this->tree[$cnt]['expanded'] == '') ? 0 : $this->tree[$cnt]['expanded'];
-		$this->_maxLevel[$menu_name] = max($this->_maxLevel[$menu_name], $this->tree[$cnt]['level']);
-		if ($this->tree[$cnt]['level'] == 1) {
-			$this->_firstLevelCnt[$menu_name]++;
-		}
-	}
-}
-
-/**
-* A method to replace strings in all URLs (hrefs) of a menu
-* @access public
-* @param string $menu_name the name of the menu for which the replacement
-*   has to be performed
-* @param string $string the string to be replaced
-* @param string $value the replacement string
-* @return void
-*/
-function replaceStringInUrls($menu_name, $string, $value)
-{
-	for ($cnt=$this->_firstItem[$menu_name]; $cnt<=$this->_lastItem[$menu_name]; $cnt++) {	// this counter scans all nodes of the new menu
-		$this->tree[$cnt]['parsed_href'] = str_replace($string, $value, $this->tree[$cnt]['parsed_href']);
-	}
-}
-
-/**
-* A method to set the same target for all links of a menu
-* @access public
-* @param string $menu_name the name of the menu for which the targets
-*   have to be set
-* @param string $target the target to be set for all links
-*   of the $menu_name menu
-* @return void
-*/
-function setLinksTargets($menu_name, $target)
-{
-	for ($cnt=$this->_firstItem[$menu_name]; $cnt<=$this->_lastItem[$menu_name]; $cnt++) {	// this counter scans all nodes of the new menu
-		$this->tree[$cnt]['parsed_target'] = ' target="' . $target . '"';
-	}
-}
-
-/**
-* A method to select the current item of $menu_name in terms of $cnt, i.e., very likely, in terms of its line number in the corresponding menu structure file (excluding from the count commented out lines, if any)
-* @access public
-* @param string $menu_name the name of the menu for which the current item
-*   has to be selected
-* @param integer $count the line number of the current item
-*   in the corresponding menu structure file
-*   (excluding from the count commented out lines, if any)
-* @return void
-*/
-function setSelectedItemByCount($menu_name, $count)
-{
-	if ($count < 1) {
-		$this->error("setSelectedItemByCount: the \$count argument is $count, but \$count can not be lower than 1");
-		return;
-	}
-	if ($count > $this->_lastItem[$menu_name] - $this->_firstItem[$menu_name] + 1) {
-		$this->error("setSelectedItemByCount: the \$count argument is $count and is larger than the number of items of the '$menu_name' menu");
-		return;
-	}
-	$cnt = $this->_firstItem[$menu_name] + $count - 1;
-	$this->tree[$cnt]['selected'] = true;
-}
-
-/**
-* A method to select the current item of $menu_name in terms of the corresponding id (see the DB table structure); obviously, this method can be used only together with the DB support
-* @access public
-* @param string $menu_name the name of the menu for which the current item
-*   has to be selected
-* @param integer $id the id of the current item in the corresponding DB table
-* @return void
-*/
-function setSelectedItemById($menu_name, $id)
-{
-	if (!isset($this->treecnt[$menu_name][$id])) {
-		$this->error("setSelectedItemById: there is not any item with \$id = $id in the '$menu_name' menu");
-		return;
-	}
-	$cnt = $this->treecnt[$menu_name][$id];
-	$this->tree[$cnt]['selected'] = true;
-}
-
-/**
-* A method to select the current item of $menu_name specifying a string that occurs in the current URL
-* @access public
-* @param string $menu_name the name of the menu for which the current item
-*   has to be selected
-* @param string $url a string that occurs in the current URL
-* @return void
-*/
-function setSelectedItemByUrl($menu_name, $url)
-{
-	if(isset($url) && $url !== '') {
-		for ($cnt=$this->_firstItem[$menu_name]; $cnt<=$this->_lastItem[$menu_name]; $cnt++) {  // this counter scans all nodes of the new menu
-			if (!(strpos($this->tree[$cnt]['parsed_href'], $url) === false)) {
-				$this->tree[$cnt]['selected'] = true;
-				break;
-			}
-		}
-	}
-}
-
-/**
-* A method to select the current item of $menu_name specifying a regular expression that matches (a substring of) the current URL; just the same as the setSelectedItemByUrl() method, but using eregi() instead of strpos()
-* @access public
-* @param string $menu_name the name of the menu for which the current item
-*   has to be selected
-* @param string $url_eregi the regular expression that matches
-*   (a substring of) the current URL
-* @return void
-*/
-function setSelectedItemByUrlEregi($menu_name, $url_eregi)
-{
-	for ($cnt=$this->_firstItem[$menu_name]; $cnt<=$this->_lastItem[$menu_name]; $cnt++) {  // this counter scans all nodes of the new menu
-		if (eregi($url_eregi, $this->tree[$cnt]['parsed_href'])) {
-			$this->tree[$cnt]['selected'] = true;
-			break;
-		}
-	}
-}
-
-/**
-* Method to handle errors
-* @access private
-* @param string $errormsg the error message
-* @return void
-*/
-function error($errormsg)
-{
-	print "<b>LayersMenu Error:</b> $errormsg<br />\n";
-	if ($this->haltOnError == 'yes') {
-		die("<b>Halted.</b><br />\n");
-	}
-}
-
-} /* END OF CLASS */
-
-?>
-
-<?php
-// PHP Layers Menu 3.2.0-rc (C) 2001-2004 Marco Pratesi - http://www.marcopratesi.it/
-
-/**
-* This file contains the code of the TreeMenu class.
-* @package PHPLayersMenu
-*/
-
-/**
-* This is the TreeMenu class of the PHP Layers Menu library.
-*
-* This class depends on the LayersMenuCommon class and on the PEAR conforming version of the PHPLib Template class, i.e. on HTML_Template_PHPLIB
-*
-* @version 3.2.0-rc
-* @package PHPLayersMenu
-*/
-class TreeMenu extends LayersMenuCommon
-{
-
-/**
-* Type of images used for the Tree Menu
-* @access private
-* @var string
-*/
-var $treeMenuImagesType;
-/**
-* Prefix for filenames of images of a theme
-* @access private
-* @var string
-*/
-var $treeMenuTheme;
-/**
-* An array where we store the Tree Menu code for each menu
-* @access private
-* @var array
-*/
-var $_treeMenu;
-
-/**
-* The constructor method; it initializates the menu system
-* @return void
-*/
-function TreeMenu()
-{
-	$this->LayersMenuCommon();
-
-	$this->treeMenuImagesType = 'png';
-	$this->treeMenuTheme = '';
-	$this->_treeMenu = array();
-
-	$this->_nodesCount = 0;
-	$this->tree = array();
-	$this->_maxLevel = array();
-	$this->_firstLevelCnt = array();
-	$this->_firstItem = array();
-	$this->_lastItem = array();
-}
-
-/**
-* The method to set the dirroot directory
-* @access public
-* @return boolean
-*/
-function setDirroot($dirroot)
-{
-	return $this->setDirrootCommon($dirroot);
-}
-
-/**
-* The method to set the type of images used for the Tree Menu
-* @access public
-* @return void
-*/
-function setTreeMenuImagesType($treeMenuImagesType)
-{
-	$this->treeMenuImagesType = $treeMenuImagesType;
-}
-
-/**
-* The method to set the prefix for filenames of images of a theme
-* @access public
-* @return void
-*/
-function setTreeMenuTheme($treeMenuTheme)
-{
-	$this->treeMenuTheme = $treeMenuTheme;
-}
-
-/**
-* Method to prepare a new Tree Menu.
-*
-* This method processes items of a menu to prepare and return
-* the corresponding Tree Menu code.
-*
-* @access public
-* @param string $menu_name the name of the menu whose items have to be processed
-* @return string
-*/
-function newTreeMenu(
-	$menu_name = ''	// non consistent default...
-	)
-{
-	if (!isset($this->_firstItem[$menu_name]) || !isset($this->_lastItem[$menu_name])) {
-		$this->error("newTreeMenu: the first/last item of the menu '$menu_name' is not defined; please check if you have parsed its menu data.");
-		return 0;
-	}
-
-	$this->_treeMenu[$menu_name] = '';
-
-	$img_collapse				= $this->imgwww . $this->treeMenuTheme . 'tree_collapse.' . $this->treeMenuImagesType;
-	$alt_collapse				= '--';
-	$img_collapse_corner		= $this->imgwww . $this->treeMenuTheme . 'tree_collapse_corner.' . $this->treeMenuImagesType;
-	$alt_collapse_corner		= '--';
-	$img_collapse_corner_first	= $this->imgwww . $this->treeMenuTheme . 'tree_collapse_corner_first.' . $this->treeMenuImagesType;
-	$alt_collapse_corner_first	= '--';
-	$img_collapse_first			= $this->imgwww . $this->treeMenuTheme . 'tree_collapse_first.' . $this->treeMenuImagesType;
-	$alt_collapse_first			= '--';
-	$img_corner					= $this->imgwww . $this->treeMenuTheme . 'tree_corner.' . $this->treeMenuImagesType;
-	$alt_corner					= '`-';
-	$img_expand					= $this->imgwww . $this->treeMenuTheme . 'tree_expand.' . $this->treeMenuImagesType;
-	$alt_expand					= '+-';
-	$img_expand_corner			= $this->imgwww . $this->treeMenuTheme . 'tree_expand_corner.' . $this->treeMenuImagesType;
-	$alt_expand_corner			= '+-';
-	$img_expand_corner_first	= $this->imgwww . $this->treeMenuTheme . 'tree_expand_corner_first.' . $this->treeMenuImagesType;
-	$alt_expand_corner_first	= '+-';
-	$img_expand_first			= $this->imgwww . $this->treeMenuTheme . 'tree_expand_first.' . $this->treeMenuImagesType;
-	$alt_expand_first			= '+-';
-	$img_folder_closed			= $this->imgwww . $this->treeMenuTheme . 'tree_folder_closed.' . $this->treeMenuImagesType;
-	$alt_folder_closed			= '->';
-	$img_folder_open			= $this->imgwww . $this->treeMenuTheme . 'tree_folder_open.' . $this->treeMenuImagesType;
-	$alt_folder_open			= '->';
-	$img_leaf					= $this->imgwww . $this->treeMenuTheme . 'tree_leaf.' . $this->treeMenuImagesType;
-	$alt_leaf					= '->';
-	$img_space					= $this->imgwww . $this->treeMenuTheme . 'tree_space.' . $this->treeMenuImagesType;
-	$alt_space					= '  ';
-	$img_split					= $this->imgwww . $this->treeMenuTheme . 'tree_split.' . $this->treeMenuImagesType;
-	$alt_split					= '|-';
-	$img_split_first			= $this->imgwww . $this->treeMenuTheme . 'tree_split_first.' . $this->treeMenuImagesType;
-	$alt_split_first			= '|-';
-	$img_vertline				= $this->imgwww . $this->treeMenuTheme . 'tree_vertline.' . $this->treeMenuImagesType;
-	$alt_vertline				= '| ';
-
-	for ($i=0; $i<=$this->_maxLevel[$menu_name]; $i++) {
-		$levels[$i] = 0;
-	}
-
-	// Find last nodes of subtrees
-	$last_level = $this->_maxLevel[$menu_name];
-	for ($i=$this->_lastItem[$menu_name]; $i>=$this->_firstItem[$menu_name]; $i--) {
-		if ($this->tree[$i]['level'] < $last_level) {
-			for ($j=$this->tree[$i]['level']+1; $j<=$this->_maxLevel[$menu_name]; $j++) {
-				$levels[$j] = 0;
-			}
-		}
-		if ($levels[$this->tree[$i]['level']] == 0) {
-			$levels[$this->tree[$i]['level']] = 1;
-			$this->tree[$i]['last_item'] = 1;
-		} else {
-			$this->tree[$i]['last_item'] = 0;
-		}
-		$last_level = $this->tree[$i]['level'];
-	}
-
-	$toggle = '';
-	$toggle_function_name = 'toggle' . $menu_name;
-
-	for ($cnt=$this->_firstItem[$menu_name]; $cnt<=$this->_lastItem[$menu_name]; $cnt++) {
-		if ($this->tree[$cnt]['text'] == '---') {
-			continue;	// separators are significant only for layers-based menus
-		}
-
-		if (isset($this->tree[$cnt]['selected']) && $this->tree[$cnt]['selected']) {
-			$linkstyle = 'phplmselected';
-		} else {
-			$linkstyle = 'phplm';
-		}
-
-		$this->_treeMenu[$menu_name] .= '<div id="'.$menu_name . $cnt . '" class="treemenudiv">' . "\n";
-		
-		/*
-		Condition zum Ausschalten der leeren Menüeinträge (vorallem im Bereich "Plugins")
-		Bedingungen:
-		
-			* Menüeinträge:
-				- Aktueller Eintrag hat keinen Link: 'href' und/oder 'parsed_href' sind leer
-				- Der aktuelle tree-level ist gleich dem des folgenden Elements
-				- $cnt (Index-ID des aktuellen Eintrags) ist nicht '$this->_firstItem[$menu_name]'
-			* Letzter Menüeintrag:
-				- $cnt ist gleich dem letzten Menüeintrag
-				- Der letzte Menüeintrag hat keinen Link
-		if(!((empty($this->tree[$cnt]['href']) && $this->tree[$cnt]['level'] == $this->tree[$cnt+1]['level'] && $cnt != $this->_firstItem[$menu_name]) || ($cnt == $this->_lastItem[$menu_name] && empty($this->tree[$cnt]['href'])))
-		)		
-		*/	
-		if(!((empty($this->tree[$cnt]['href']) && $this->tree[$cnt]['level'] == $this->tree[$cnt+1]['level'] && $cnt != $this->_firstItem[$menu_name]))) {
-		
-			// vertical lines from higher levels
-			for ($i=0; $i<$this->tree[$cnt]['level']-1; $i++) {
-				if ($levels[$i] == 1) {
-					$img = $img_vertline;
-					$alt = $alt_vertline;
-				} else {
-					$img = $img_space;
-					$alt = $alt_space;
-				}
-				$this->_treeMenu[$menu_name] .= '<img class="imgs" src="' . $img . '" alt="' . $alt . '">';
-			}
-	
-			$not_a_leaf = $cnt<$this->_lastItem[$menu_name] && $this->tree[$cnt+1]['level']>$this->tree[$cnt]['level'];
-	
-			if ($this->tree[$cnt]['last_item'] == 1) {
-			// corner at end of subtree or t-split
-				if ($not_a_leaf) {
-					if ($cnt == $this->_firstItem[$menu_name]) {
-						$img = $img_collapse_corner_first;
-						$alt = $alt_collapse_corner_first;
-					} else {
-						$img = $img_collapse_corner;
-						$alt = $alt_collapse_corner;
-					}
-					$this->_treeMenu[$menu_name] .= '<a onmousedown="' . $toggle_function_name . "('".$menu_name . $cnt . "')" . '"><img class="imgs" id="'.$menu_name . $cnt . 'node" src="' . $img . '" alt="' . $alt . '" /></a>';
-				} else {
-					$this->_treeMenu[$menu_name] .= '<img class="imgs" src="' . $img_corner . '" alt="' . $alt_corner . '">';
-				}
-				$levels[$this->tree[$cnt]['level']-1] = 0;
-			} else {
-				if ($not_a_leaf) {
-					if ($cnt == $this->_firstItem[$menu_name]) {
-						$img = $img_collapse_first;
-						$alt = $alt_collapse_first;
-					} else {
-						$img = $img_collapse;
-						$alt = $alt_collapse;
-					}
-					$this->_treeMenu[$menu_name] .= '<span onmousedown="' . $toggle_function_name . "('".$menu_name . $cnt . "');" . '"><img class="imgs" id="'.$menu_name . $cnt . 'node" src="' . $img . '" alt="' . $alt . '"></span>';
-				} else {
-					if ($cnt == $this->_firstItem[$menu_name]) {
-						$img = $img_split_first;
-						$alt = $alt_split_first;
-					} else {
-						$img = $img_split;
-						$alt = $alt_split;
-					}
-					$this->_treeMenu[$menu_name] .= '<img class="imgs" id="'.$menu_name . $cnt . 'node" src="' . $img . '" alt="' . $alt . '">';
-				}
-				$levels[$this->tree[$cnt]['level']-1] = 1;
-			}
-	
-			if ($this->tree[$cnt]['parsed_href'] == '' || $this->tree[$cnt]['parsed_href'] == '#') {
-				$a_href_open_img = '';
-				$a_href_close_img = '';
-				$a_href_open = '<a class="phplmnormal" onmousedown="' . $toggle_function_name . "('".$menu_name . $cnt . "');" . '">';
-				$a_href_close = '</a>';
-			} else {
-				$a_href_open_img = '<a href="' . $this->tree[$cnt]['parsed_href'] . '"' . $this->tree[$cnt]['parsed_title'] . $this->tree[$cnt]['parsed_target'] . '>';
-				$a_href_close_img = '</a>';
-				$a_href_open = '<a href="' . $this->tree[$cnt]['parsed_href'] . '"' . $this->tree[$cnt]['parsed_title'] . $this->tree[$cnt]['parsed_target'] . ' class="' . $linkstyle . '">';
-				$a_href_close = '</a>';
-			}
-	
-			if ($not_a_leaf) {
-				//$this->_treeMenu[$menu_name] .= $a_href_open_img . '<span onmousedown="' . $toggle_function_name . "('".$menu_name . $cnt . "')" . '"><img class="imgs" id="'.$menu_name . $cnt . 'folder" src="' . $img_folder_open . '" alt="' . $alt_folder_open . '" /></span>' . $a_href_close_img;
-				$this->_treeMenu[$menu_name] .= $a_href_open_img . '<span onmousedown="' . $toggle_function_name . "('".$menu_name . $cnt . "')" . '"></span>' . $a_href_close_img;
-			} else {
-				if ($this->tree[$cnt]['parsed_icon'] != '') {
-					$this->_treeMenu[$menu_name] .= $a_href_open_img . '<img src="' . $this->tree[$cnt]['parsed_icon'] . '" width="' . $this->tree[$cnt]['iconwidth'] . '" height="' . $this->tree[$cnt]['iconheight'] . '" alt="' . $alt_leaf . '">' . $a_href_close_img;
-				} else {
-					//$this->_treeMenu[$menu_name] .= $a_href_open_img . '<img class="imgs" src="' . $img_leaf . '" alt="' . $alt_leaf . '" />' . $a_href_close_img;
-	
-				}
-			}
-
-		
-			//$this->_treeMenu[$menu_name] .= ' drop this ->';
-		
-			$this->_treeMenu[$menu_name] .= '&nbsp;' . $a_href_open . $this->tree[$cnt]['text']. $a_href_close . "\n";
-			$this->_treeMenu[$menu_name] .= '</div>' . "\n";
-
-		}		
-		
-
-		if ($cnt<$this->_lastItem[$menu_name] && $this->tree[$cnt]['level']<$this->tree[$cnt+1]['level']) {
-			$this->_treeMenu[$menu_name] .= '<div id="'.$menu_name . $cnt . 'son" class="treemenudiv">' . "\n";
-			if ($this->tree[$cnt]['expanded'] != 1) {
-				$toggle .= 'if (phplm_expand[\'' . $menu_name . $cnt . '\'] != 1) ' . $toggle_function_name . "('".$menu_name . $cnt . "');\n";
-			} else {
-				$toggle .= 'if (hplm_collapse[\'' . $menu_name . $cnt. '\'] == 1) ' . $toggle_function_name . "('".$menu_name . $cnt . "');\n";
-			}
-		}
-
-		if ($cnt>$this->_firstItem[$menu_name] && $this->tree[$cnt]['level']>$this->tree[$cnt+1]['level']) {
-			for ($i=max(1, $this->tree[$cnt+1]['level']); $i<$this->tree[$cnt]['level']; $i++) {
-				$this->_treeMenu[$menu_name] .= '</div>' . "\n";
-			}
-		}
-	}
-
-/*
-	$this->_treeMenu[$menu_name] =
-	'<div class="phplmnormal">' . "\n" .
-	$this->_treeMenu[$menu_name] .
-	'</div>' . "\n";
-*/
-	// Some (old) browsers do not support the "white-space: nowrap;" CSS property...
-	$this->_treeMenu[$menu_name] =
-	'<table>' . "\n" .
-	'<tr>' . "\n" .
-	'<td class="phplmnormal">' . "\n" .
-	$this->_treeMenu[$menu_name] .
-	'</td>' . "\n" .
-	'</tr>' . "\n" .
-	'</table>' . "\n";
-
-
-	$t = new Template_PHPLIB();
-	$t->setFile('tplfile', 'js/treemenu.js');
-	$t->setVar(array(
-		'menu_name'	=> $menu_name,
-		'toggle_function_name'		=> $toggle_function_name,
-		'img_collapse'			=> $img_collapse,
-		'img_collapse_corner'		=> $img_collapse_corner,
-		'img_collapse_corner_first'	=> $img_collapse_corner_first,
-		'img_collapse_first'		=> $img_collapse_first,
-		'img_expand'			=> $img_expand,
-		'img_expand_corner'		=> $img_expand_corner,
-		'img_expand_corner_first'	=> $img_expand_corner_first,
-		'img_expand_first'		=> $img_expand_first,
-		'img_folder_closed'		=> $img_folder_closed,
-		'img_folder_open'		=> $img_folder_open
-	));
-	$toggle_function = $t->parse('out', 'tplfile');
-
-	$toggle_function =
-	'<script type="text/javascript">' . "\n" .
-	'<!--' . "\n" .
-	$toggle_function .
-	'// -->' . "\n" .
-	'</script>' . "\n";
-
-	$toggle =
-	'<script type="text/javascript">' . "\n" .
-	'<!--' . "\n" .
-	'if ((DOM && !Opera56 && !Konqueror22) || IE4) {' . "\n" .
-	$toggle .
-	'}' . "\n" .
-	'if (NS4) alert("Only the accessibility is provided to Netscape 4 on the JavaScript Tree Menu.\nWe *strongly* suggest you to upgrade your browser.");' . "\n" .
-	'// -->' . "\n" .
-	'</script>' . "\n";
-
-	$this->_treeMenu[$menu_name] = $toggle_function . "\n" . $this->_treeMenu[$menu_name] . "\n" . $toggle;
-
-	return $this->_treeMenu[$menu_name];
-}
-
-/**
-* Method that returns the code of the requested Tree Menu
-* @access public
-* @param string $menu_name the name of the menu whose Tree Menu code
-*   has to be returned
-* @return string
-*/
-function getTreeMenu($menu_name)
-{
-	return $this->_treeMenu[$menu_name];
-}
-
-/**
-* Method that prints the code of the requested Tree Menu
-* @access public
-* @param string $menu_name the name of the menu whose Tree Menu code
-*   has to be printed
-* @return void
-*/
-function printTreeMenu($menu_name)
-{
-	print $this->_treeMenu[$menu_name];
-}
-
-} /* END OF CLASS */
-
diff --git a/openQRM-5.3.50-CE/src/web/base/class/lock.class.php b/openQRM-5.3.50-CE/src/web/base/class/lock.class.php
deleted file mode 100644
index b2e5b1f..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/lock.class.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-// This class represents a global lock type
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/event.class.php";
-
-$event = new event();
-global $event;
-
-class lock {
-
-var $id = '';
-var $time = '';
-var $section = '';
-var $resource_id = '';
-var $token = '';
-var $description = '';
-
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function __construct() {
-		$this->db_name = "lock_info";
-		$this->lock_timeout = 200000;
-		// 100000 = 10 secs
-	}
-
-
-	// ---------------------------------------------------------------------------------
-	// methods to create an instance of an lock object filled from the db
-	// ---------------------------------------------------------------------------------
-
-	// returns an lock from the db selected by id, resource_id or section
-	function get_instance($id, $resource_id, $section) {
-		global $event;
-		$db=openqrm_get_db_connection();
-		if ($id != "") {
-			$lock_array = $db->Execute("select * from ".$this->db_name." where lock_id=$id");
-		} else if ($resource_id != "") {
-			$lock_array = $db->Execute("select * from ".$this->db_name." where lock_resource_id=$resource_id");
-		} else if ($section != "") {
-			$lock_array = $db->Execute("select * from ".$this->db_name." where lock_section='$section'");
-		} else {
-			$event->log("get_instance", $_SERVER['REQUEST_TIME'], 2, "lock.class.php", "Could not create instance of lock without data", "", "", 0, 0, 0);
-			foreach(debug_backtrace() as $key => $msg) {
-				syslog(LOG_ERR, $msg['function'].'() '.basename($msg['file']).':'.$msg['line']);
-			}
-			return;
-		}
-		foreach ($lock_array as $index => $lock) {
-			$this->id = $lock["lock_id"];
-			$this->time = $lock["lock_time"];
-			$this->section = $lock["lock_section"];
-			$this->resource_id = $lock["lock_resource_id"];
-			$this->token = $lock["lock_token"];
-			$this->description = $lock["lock_description"];
-		}
-		return $this;
-	}
-
-	// returns an lock from the db selected by id
-	function get_instance_by_id($id) {
-		$this->get_instance($id, "", "");
-		return $this;
-	}
-
-	// returns an lock from the db selected by resource_id
-	function get_instance_by_resource_id($resource_id) {
-		$this->get_instance("", $resource_id, "");
-		return $this;
-	}
-
-	// returns an lock from the db selected by section
-	function get_instance_by_section($section) {
-		$this->get_instance("", "", $section);
-		return $this;
-	}
-
-	// ---------------------------------------------------------------------------------
-	// general lock methods
-	// ---------------------------------------------------------------------------------
-
-
-	// checks if given lock id is free in the db
-	function is_id_free($lock_id) {
-		global $event;
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("select lock_id from ".$this->db_name." where lock_id=$lock_id");
-		if (!$rs)
-			$event->log("is_id_free", $_SERVER['REQUEST_TIME'], 2, "lock.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		else
-		if ($rs->EOF) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-
-	// adds lock to the database
-	function add($lock_fields) {
-		global $event;
-		if (!is_array($lock_fields)) {
-			$event->log("add", $_SERVER['REQUEST_TIME'], 2, "lock.class.php", "array fields not well defined", "", "", 0, 0, 0);
-			return;
-		}
-		$section = $lock_fields['lock_section'];
-		if (!strlen($section)) {
-			return;
-		}
-		$lock_array = array();
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("select lock_time from ".$this->db_name." where lock_section='$section'");
-		if (!$rs) {
-			$event->log("is_id_free", $_SERVER['REQUEST_TIME'], 2, "lock.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-			return;
-		} else {
-			if (!$rs->EOF) {
-				array_push($lock_array, $rs->fields);
-			}
-		}
-		$new_id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-		// timeout
-		$current_lock_time = "";
-		if (isset($lock_array[0]['lock_time'])) {
-			$current_lock_time = $lock_array[0]['lock_time'];
-		}
-		if (strlen($current_lock_time)) {
-			if ($new_id > ($current_lock_time + $this->lock_timeout)) {
-				$event->log("add", $_SERVER['REQUEST_TIME'], 2, "lock.class.php", "Timeout for lock ".$current_lock_time."! Force remove lock.", "", "", 0, 0, 0);
-				$this->remove_by_section($section);
-			} else {
-				$event->log("add", $_SERVER['REQUEST_TIME'], 2, "lock.class.php", "Still awaiting imeout for lock ".$current_lock_time."! Not adding new lock ".$new_id, "", "", 0, 0, 0);
-				return;
-			}
-		}
-		$lock_fields['lock_id'] = $new_id;
-		$lock_fields['lock_time'] = $new_id;
-		$result = $db->AutoExecute($this->db_name, $lock_fields, 'INSERT');
-		if (! $result) {
-			$event->log("add", $_SERVER['REQUEST_TIME'], 2, "lock.class.php", "Failed adding new lock to database", "", "", 0, 0, 0);
-			return;
-		}
-		return $new_id;
-	}
-
-
-	// removes lock from the database
-	function remove($lock_id) {
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from ".$this->db_name." where lock_id=$lock_id");
-	}
-
-	// removes lock from the database by section
-	function remove_by_section($section) {
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from ".$this->db_name." where lock_section='$section'");
-	}
-
-
-
-
-// ---------------------------------------------------------------------------------
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/web/base/class/openqrm.api.class.php b/openQRM-5.3.50-CE/src/web/base/class/openqrm.api.class.php
deleted file mode 100644
index 20b158a..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/openqrm.api.class.php
+++ /dev/null
@@ -1,303 +0,0 @@
-<?php
-/**
- * Openqrm Content
- *
-    openQRM Community developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class openqrm_api
-{
-/**
-* absolute path to template dir
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* absolute path to webroot
-* @access public
-* @var string
-*/
-var $rootdir;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm_controller
-	 */
-	//--------------------------------------------
-	function __construct($controller) {
-		$this->controller = $controller;
-		$this->response   = $this->controller->response;
-		$this->openqrm    = $this->controller->openqrm;
-		$this->file       = $this->controller->openqrm->file();
-		$this->user       = $this->controller->openqrm->user();
-
-		$this->openqrm->init();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function action() {
-		$action = $this->response->html->request()->get('action');
-		switch( $action ) {
-			case 'get_event_status':
-				$this->get_event_status();
-			break;
-			case 'get_queue_status':
-				$this->get_queue_status();
-			break;
-			case 'get_info_box':
-				$this->get_info_box();
-			break;
-			case 'set_language':
-				$this->set_language();
-			break;
-			case 'plugin':
-				$this->plugin();
-			break;
-			case 'base':
-				$this->base();
-			break;
-			case 'lock':
-				$this->lock();
-			break;
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get values for top status
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function get_event_status() {
-		$appliance = new appliance();
-		$appliance_all = $appliance->get_count();
-		$appliance_active = $appliance->get_count_active();
-
-		$resource = new resource();
-		$resource_all = $resource->get_count("all");
-		$resource_active = $resource->get_count("online");
-		$resource_inactive = $resource->get_count("offline");
-		$resource_error = $resource->get_count("error");
-
-		$event = new event();
-		$event_error_count = $event->get_count('error');
-		$event_active_count = $event->get_count('active');
-		echo $appliance_all."@".$appliance_active."@".$resource_all."@".$resource_active."@".$resource_inactive."@".$resource_error."@".$event_error_count."@".$event_active_count;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get values from queue
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function get_queue_status() {
-		$running = array();
-		$content = '';
-		$path = $this->openqrm->get('basedir').'/var/spool/';
-		$files = $this->file->get_files($path);
-		$waiting = count($files);
-		if($waiting > 0) {
-			$i = 0;
-			foreach($files as $file) {
-				if(stripos($file['name'], 'ouput') !== false) {
-					$running[$i]['name'] = str_replace('ouput.', '', $file['name']);
-					$running[$i]['start'] = filemtime($file['path']);
-					$waiting = $waiting -2;
-					$i++;
-				}
-			}
-			if(count($running) > 0) {
-				foreach($running as $key) {
-					$time = time() - $key['start'];
-					$content .= 'Running since <b>'.$time.'</b> seconds<br>'.$this->file->get_contents($path.'/openqrm-queue.'.$key['name']).'<br>';
-				}
-			}
-		}
-		// unset data if user is not admin
-		if(!$this->openqrm->user()->isAdmin()) {
-			$content = '';
-			$running = array();
-		}
-		echo $waiting.";;".count($running).';;'.$content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Set language
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function set_language() {
-		$name = $this->response->html->request()->get('user');
-		$lang = $this->response->html->request()->get('lang');
-		$user = new user($name);
-		$user->set_user_language($name, $lang);
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Get values for info box
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function get_info_box() {
-		$now = $_SERVER['REQUEST_TIME'];
-		if ($this->openqrm->l[3] == 0) {
-			$valid = 'unlimited';
-		} else {
-			$valid = date("F j, Y", $this->openqrm->l[3]);
-		}
-		$bd = $this->openqrm->get('baseurl');
-		$green = '<img src="'.$bd.'/img/active_small.png" alt="Active" title="Active">';
-		$red = '<img src="'.$bd.'/img/error_small.png" alt="Expired" title="Expired">';
-		$yellow = '<img src="'.$bd.'/img/transition_small.png" alt="Expiring soon" title="Expiring soon">';
-		$icon = $red;
-		$ex = '';
-		echo '<p class="justify">';
-		echo "openQRM Community developed by OPENQRM AUSTRALIA PTY LTD.<br>
-			All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise. This source code is released under the GNU General Public License version 2	unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-			The latest version of this license can be found at <a href='https://openqrm-enterprise.com/license' TARGET='_BLANK'>https://openqrm-enterprise.com/license</a>. By using this software, you acknowledge having read this license and agree to be bound thereby.<br>";
-		echo "</p>";
-	}
-
-	//--------------------------------------------
-	/**
-	 * Load plugins
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function plugin() {
-		$plugin = $this->response->html->request()->get('plugin');
-		$name   = $plugin;
-		$class  = $plugin;
-		if($this->response->html->request()->get('controller') !== '') {
-			$class = $this->response->html->request()->get('controller');
-			$name  = $class;
-		}
-		$class  = str_replace('-', '_', $class).'_controller';
-		$path   = $this->controller->rootdir.'/plugins/'.$plugin.'/class/'.$name.'.controller.class.php';
-		if($this->file->exists($path)) {
-			require_once($path);
-			$controller = new $class($this->openqrm, $this->response);
-			if(method_exists($controller, 'api')) {
-				$controller->api();
-			}
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Load Base
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function base() {
-		$plugin = $this->response->html->request()->get('base');
-		$name   = $plugin;
-		$class  = $plugin;
-		if($this->response->html->request()->get('controller') !== '') {
-			$class = $this->response->html->request()->get('controller');
-			$name  = $class;
-		}
-		$class  = str_replace('-', '_', $class).'_controller';
-		$path   = $this->controller->rootdir.'/server/'.$plugin.'/class/'.$name.'.controller.class.php';
-		if($this->file->exists($path)) {
-			require_once($path);
-			$controller = new $class($this->openqrm, $this->response);
-			if(method_exists($controller, 'api')) {
-				$controller->api();
-			}
-		}
-	}
-
-
-
-	//--------------------------------------------
-	/**
-	 * global lock
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function lock() {
-		require_once($this->controller->rootdir.'/class/lock.class.php');
-		require_once($this->controller->rootdir.'/class/event.class.php');
-		$event = new event();
-
-		$lock_cmd = $this->response->html->request()->get('lock');
-		$resource_id = $this->response->html->request()->get('resource_id');
-		$section = $this->response->html->request()->get('section');
-		if ((!strlen($lock_cmd)) || (!strlen($resource_id)) || (!strlen($section))) {
-			$event->log("lock", $_SERVER['REQUEST_TIME'], 2, "openqrm.api.class.php", "Got empty paramater for lock, section or resource_id!", "", "", 0, 0, 0);
-			return;
-		}
-		$lock = new lock();
-		switch( $lock_cmd ) {
-			case 'aquire':
-				$description = $this->response->html->request()->get('description');
-				$token = $this->response->html->request()->get('token');
-				$lock_fields['lock_resource_id'] = $resource_id;
-				$lock_fields['lock_section'] = $section;
-				$lock_fields['lock_description'] = $description;
-				$lock_fields['lock_token'] = $token;
-				$lock_id = $lock->add($lock_fields);
-				if (strlen($lock_id)) {
-					echo $lock_id;
-					$event->log("lock", $_SERVER['REQUEST_TIME'], 5, "openqrm.api.class.php", "Section ".$section." is now locked by ".$resource_id."!", "", "", 0, 0, 0);
-				} else {
-					$event->log("lock", $_SERVER['REQUEST_TIME'], 2, "openqrm.api.class.php", "Section ".$section." is still locked!", "", "", 0, 0, 0);
-				}
-			break;
-
-			case 'release':
-				$lock->get_instance_by_section($section);
-				if (!strlen($lock->id)) {
-					$event->log("lock", $_SERVER['REQUEST_TIME'], 2, "openqrm.api.class.php", "Resource ".$resource_id." trying to remove lock but no lock active for section ".$section, "", "", 0, 0, 0);
-					return;
-				}
-				if ($resource_id == $lock->resource_id) {
-					$event->log("lock", $_SERVER['REQUEST_TIME'], 5, "openqrm.api.class.php", "Resource ".$resource_id." released lock for section ".$section, "", "", 0, 0, 0);
-					echo $lock->id;
-					$lock->remove_by_section($section);
-				} else {
-					$event->log("lock", $_SERVER['REQUEST_TIME'], 2, "openqrm.api.class.php", "Resource ".$resource_id." trying to remove lock from ".$lock->resource_id." for section ".$section, "", "", 0, 0, 0);
-				}
-
-			break;
-		}
-	}
-
-
-
-
-}
-?>
diff --git a/openQRM-5.3.50-CE/src/web/base/class/openqrm.class.php b/openQRM-5.3.50-CE/src/web/base/class/openqrm.class.php
deleted file mode 100644
index 5c284c0..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/openqrm.class.php
+++ /dev/null
@@ -1,465 +0,0 @@
-<?php
-/**
- * openQRM Class
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class openqrm
-{
-/**
-* Absolute path to istall dir
-* @access protected
-* @var string
-*/
-protected $basedir;
-/**
-* Absolute path to class dir
-* @access protected
-* @var string
-*/
-protected $classdir;
-/**
-* Absolute path to web dir
-* @access protected
-* @var string
-*/
-protected $webdir;
-/**
-* Absolute uri
-* @access protected
-* @var string
-*/
-protected $baseurl;
-/**
-* openQRM config
-* @access protected
-* @var string
-*/
-protected $config;
-/**
-* DB object
-* @access private
-* @var object
-*/
-private $db;
-/**
-* file object
-* @access private
-* @var object
-*/
-private $file;
-/**
-* admin user object
-* @access private
-* @var object
-*/
-private $admin;
-/**
-* current user object
-* @access private
-* @var object
-*/
-private $user;
-/**
-* name of db tables
-* @access private
-* @var array
-*/
-private $table;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @param object $file
-	 * @param object $user
-	 * @param object $response
-	 * @access public
-	 */
-	//--------------------------------------------
-	function __construct($file, $user, $response) {
-		if ((file_exists("/etc/init.d/openqrm")) && (is_link("/etc/init.d/openqrm"))) {
-			$this->basedir = dirname(dirname(dirname(readlink("/etc/init.d/openqrm"))));
-		} else {
-			$this->basedir = "/usr/share/openqrm";
-		}
-		$this->response = $response;
-		$this->classdir = $this->basedir.'/web/base/class';
-		$this->webdir   = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base';
-		$this->baseurl  = '/openqrm/base';
-		$this->config   = $this->parse_conf($this->basedir.'/etc/openqrm-server.conf', 'OPENQRM_');
-		
-		$this->table['appliance']      = 'appliance_info';
-		$this->table['deployment']     = 'deployment_info';
-		$this->table['event']          = 'event_info';
-		$this->table['image']          = 'image_info';
-		$this->table['kernel']         = 'kernel_info';
-		$this->table['resource']       = 'resource_info';
-		$this->table['storage']        = 'storage_info';
-		$this->table['virtualization'] = 'virtualization_info';
-
-		// used regexes
-		$this->regex['name'] = '~^[a-z0-9]+$~i';
-		$this->regex['hostname'] = '~^[a-z0-9]{1,}[a-z0-9-]*[a-z0-9]$~i';
-		$this->regex['comment'] = '/^[a-z 0-9()._-]+$/i';
-				
-		$this->file = $file;
-		$this->user = $user;
-		// load object
-		
-	}
-
-	//--------------------------------------------
-	/**
-	 * Init
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function init() {
-		require_once($this->classdir.'/appliance.class.php');
-		require_once($this->classdir.'/deployment.class.php');
-		require_once($this->classdir.'/event.class.php');
-		require_once($this->classdir.'/image.class.php');
-		require_once($this->classdir.'/kernel.class.php');
-		require_once($this->classdir.'/plugin.class.php');
-		require_once($this->classdir.'/resource.class.php');
-		require_once($this->classdir.'/storage.class.php');
-		require_once($this->classdir.'/virtualization.class.php');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get object attributes
-	 *
-	 * @access public
-	 * @param string $attrib name of attrib to return
-	 * @param string $key name of attrib key to return
-	 * @return mixed
-	 */
-	//--------------------------------------------
-	function get($attrib, $key = null) {
-		if(isset($this->$attrib)) {
-			$attrib = $this->$attrib;
-			if(isset($key)) {
-				if(isset($attrib[$key])) {
-					return $attrib[$key];
-				}
-			} else {
-				return $attrib;
-			}
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Set object attributes
-	 *
-	 * @access public
-	 * @param string $attrib name of attrib to return
-	 * @param string $key name of attrib key to set
-	 * @return bool
-	 */
-	//--------------------------------------------
-	function set($attrib, $value, $key = null) {
-		if(isset($this->$attrib)) {
-			if(isset($key)) {
-				$tmp = &$this->$attrib;
-				if(isset($tmp[$key])) {
-					$tmp[$key] = $value;
-					return true;
-				} else {
-					return false;
-				}
-			} else {
-				$this->$attrib = $value;
-				return true;
-			}
-		} else {
-			return false;
-		}
-	}
-
-	
-	//--------------------------------------------
-	/**
-	 * converts csv string to associative array
-	 *
-	 * @access public
-	 * @return array
-	 */
-	//--------------------------------------------
-	function string_to_array($string, $element_delimiter = '|', $value_delimiter = '=') {
-		$results = array();
-		$array = explode($element_delimiter, $string);
-		foreach ($array as $result) {
-			$element = explode($value_delimiter, $result);
-			if (isset($element[1])) {
-				$results[$element[0]] = $element[1];
-			}
-		}
-		return $results;
-	}
-
-	
-	
-	//--------------------------------------------
-	/**
-	 * Get db object
-	 *
-	 * @access protected
-	 * @return object db
-	 */
-	//--------------------------------------------
-	protected function db() {
-		if(!isset($this->db)) {
-			require_once($this->classdir.'/db.class.php');
-			$this->db = new db($this);
-		}
-		return $this->db;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get file object
-	 *
-	 * @access public
-	 * @return file_handler
-	 */
-	//--------------------------------------------
-	function file() {
-		return $this->file;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get admin object
-	 *
-	 * @access public
-	 * @return file_handler
-	 */
-	//--------------------------------------------
-	function admin() {
-		if(!isset($this->admin)) {
-			$user  = $this->user();
-			$class = get_class($user);
-			$admin = new $class('openqrm');
-			$this->admin = $admin;
-		}
-		return $this->admin;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get user object
-	 *
-	 * @access public
-	 * @return file_handler
-	 */
-	//--------------------------------------------
-	function user() {
-		return $this->user;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get role object (plugin loader)
-	 *
-	 * @access public
-	 * @param htmlobject_response $response
-	 * @return openqrm_role
-	 */
-	//--------------------------------------------
-	function role($response) {
-		require_once($this->classdir.'/openqrm.role.class.php');
-		$role = new openqrm_role($this, $response);
-		return $role;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get appliance object
-	 *
-	 * @access public
-	 * @return object appliance
-	 */
-	//--------------------------------------------
-	function appliance() {
-		require_once($this->classdir.'/appliance.class.php');
-		return new appliance();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get deployment object
-	 *
-	 * @access public
-	 * @return object deployment
-	 */
-	//--------------------------------------------
-	function deployment() {
-		require_once($this->classdir.'/deployment.class.php');
-		return new deployment();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get event object
-	 *
-	 * @access public
-	 * @return object event
-	 */
-	//--------------------------------------------
-	function event() {
-		require_once($this->classdir.'/event.class.php');
-		return new event();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get image object
-	 *
-	 * @access public
-	 * @return object image
-	 */
-	//--------------------------------------------
-	function image() {
-		require_once($this->classdir.'/image.class.php');
-		return new image();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get kernel object
-	 *
-	 * @access public
-	 * @return object kernel
-	 */
-	//--------------------------------------------
-	function kernel() {
-		require_once($this->classdir.'/kernel.class.php');
-		return new kernel();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get plugin object
-	 *
-	 * @access public
-	 * @return object plugin
-	 */
-	//--------------------------------------------
-	function plugin() {
-		require_once($this->classdir.'/plugin.class.php');
-		return new plugin();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get resource object
-	 *
-	 * @access public
-	 * @return object resource
-	 */
-	//--------------------------------------------
-	function resource() {
-		require_once($this->classdir.'/resource.class.php');
-		return new resource();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get storage object
-	 *
-	 * @access public
-	 * @return object storage
-	 */
-	//--------------------------------------------
-	function storage() {
-		require_once($this->classdir.'/storage.class.php');
-		return new storage();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get virtualization object
-	 *
-	 * @access public
-	 * @return object virtualization
-	 */
-	//--------------------------------------------
-	function virtualization() {
-		require_once($this->classdir.'/virtualization.class.php');
-		return new virtualization();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get openqrm server object
-	 *
-	 * @access public
-	 * @return object openqrm_server
-	 */
-	//--------------------------------------------
-	function server() {
-		require_once($this->classdir.'/openqrm_server.class.php');
-		return new openqrm_server();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Parse an openqrm config file
-	 *
-	 * @access public
-	 * @param string $path
-	 * @param string $replace
-	 * @return array
-	 */
-	//--------------------------------------------
-	function parse_conf ( $path, $replace = null ) {
-		if(file_exists($path)) {
-			$ini = file( $path );
-			if ( count( $ini ) == 0 ) { return array(); }
-			$globals = array();
-			foreach( $ini as $line ){
-				$line = trim( $line );
-				// Comments
-				if ( $line == '' || $line{0} != 'O' ) { continue; }
-				// Key-value pair
-				list( $key, $value ) = explode( '=', $line, 2 );
-				$key = trim( $key );
-				if(isset($replace)) {
-					$key = str_replace($replace, "", $key );
-				}
-				$value = trim( $value );
-				$value = str_replace("\"", "", $value );
-				$globals[ $key ] = $value;
-			}
-		return $globals;
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * lc
-	 *
-	 * @access public
-	 * @param string $path
-	 * @param string $replace
-	 * @return array
-	 */
-	//--------------------------------------------
-}
-?>
diff --git a/openQRM-5.3.50-CE/src/web/base/class/openqrm.cli.class.php b/openQRM-5.3.50-CE/src/web/base/class/openqrm.cli.class.php
deleted file mode 100644
index fe63caf..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/openqrm.cli.class.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * Openqrm Content
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class openqrm_cli
-{
-/**
-* absolute path to template dir
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* absolute path to webroot
-* @access public
-* @var string
-*/
-var $rootdir;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm_controller $controller
-	 * @param string $argv console parameters
-	 */
-	//--------------------------------------------
-	function __construct($controller, $argv) {
-		$this->controller = $controller;
-		$this->response   = $this->controller->response;
-		$this->openqrm    = $this->controller->openqrm;
-		$this->file       = $this->controller->openqrm->file();
-		$this->user       = $this->controller->openqrm->user();
-
-		$this->openqrm->init();
-
-		// set request params
-		foreach($argv as $k => $v) {
-			if($k !== 0) {
-				$tmp = explode('=', $v);
-				if(isset($tmp[0]) && isset($tmp[1])) {
-					if(strpos($tmp[0], '[]') !== false) {
-						$tmp[0] = str_replace('[]', '', $tmp[0]);
-						$_REQUEST[$tmp[0]][] = $tmp[1];
-					} else {
-						$_REQUEST[$tmp[0]] = $tmp[1];
-					}
-				}
-			}
-		}
-		#print_r($_REQUEST);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function action() {
-		$action = $this->response->html->request()->get('action');
-		switch( $action ) {
-			case 'plugin':
-				$this->plugin();
-			break;
-			case 'base':
-				$this->base();
-			break;
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Load plugins
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function plugin() {
-		$plugin = $this->response->html->request()->get('plugin');
-		$name   = $plugin;
-		$class  = $plugin;
-		if($this->response->html->request()->get('controller') !== '') {
-			$class = $this->response->html->request()->get('controller');
-			$name  = $class;
-		}
-		$class  = str_replace('-', '_', $class).'_controller';
-		$path   = $this->controller->rootdir.'/plugins/'.$plugin.'/class/'.$name.'.controller.class.php';
-		if($this->file->exists($path)) {
-			require_once($path);
-			$controller = new $class($this->openqrm, $this->response);
-			if(method_exists($controller, 'cli')) {
-				$controller->cli();
-			}
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Load Base
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function base() {
-		$plugin = $this->response->html->request()->get('base');
-		$name   = $plugin;
-		$class  = $plugin;
-		if($this->response->html->request()->get('controller') !== '') {
-			$class = $this->response->html->request()->get('controller');
-			$name  = $class;
-		}
-		$class  = str_replace('-', '_', $class).'_controller';
-		$path   = $this->controller->rootdir.'/server/'.$plugin.'/class/'.$name.'.controller.class.php';
-		if($this->file->exists($path)) {
-			require_once($path);
-			$controller = new $class($this->openqrm, $this->response);
-			if(method_exists($controller, 'cli')) {
-				$controller->cli();
-			}
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/openqrm.configure.class.php b/openQRM-5.3.50-CE/src/web/base/class/openqrm.configure.class.php
deleted file mode 100644
index 6beec09..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/openqrm.configure.class.php
+++ /dev/null
@@ -1,509 +0,0 @@
-<?php
-/**
- * Openqrm Setup
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2013, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2013, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class openqrm_configure
-{
-/**
-* absolute path to template dir
-* @access public
-* @var string
-*/
-var $configure_timeout = 240;
-/**
-* absolute path to template dir
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'step1' => array (
-		'tab' => 'Step 1',
-		'label' => 'Please select a network card',
-		'howto' => 'The selected network card will be used to setup openQRM Server and create
-					the openQRM Management Network. All available and configured network interfaces
-					on this system are listed on the left.',
-		'error_empty' => 'Networkcard may not be empty',
-		'saved' => 'Saved networkcard %s',
-	),
-	'step2' => array (
-		'tab' => 'Step 2',
-		'label' => 'Please select a database type',
-		'howto' => 'Select the database type to use for storing the openQRM data.',
-		'error_empty' => 'Database type may not be empty',
-		'saved' => 'Saved database type %s',
-	),
-	'step3' => array (
-		'tab' => 'Step 3',
-		'label' => 'Configure the database connection and initialize openQRM',
-		'form_server' => 'Server',
-		'form_db' => 'Database',
-		'form_user' => 'User',
-		'form_password' => 'Password',
-		'form_restore' => 'Restore last backup',
-		'howto' => 'Fill in the database name, the database server and a username plus password to setup the database connection.',
-		'saved' => 'Successfully initialized openQRM',
-		'failed' => 'Failed to initialyze openQRM! Please check syslog!',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param htmlobject_response $response
-	 * @param file $file
-	 * @param user $user
-	 */
-	//--------------------------------------------
-	function __construct($response, $file) {
-		$this->response = $response;
-		$this->file  = $file;
-
-		if (($this->file->exists("/etc/init.d/openqrm")) && (is_link("/etc/init.d/openqrm"))) {
-			$this->basedir = dirname(dirname(dirname(readlink("/etc/init.d/openqrm"))));
-		} else {
-			$this->basedir = "/usr/share/openqrm";
-		}
-
-		$this->webdir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$this->action = '';
-		$ar = $this->response->html->request()->get('step');
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case '1':
-				$content[] = $this->step1(true);
-			break;
-			case '2':
-				$content[] = $this->step1(false);
-				$content[] = $this->step2(true);
-			break;
-			case '3':
-				$content[] = $this->step1(false);
-				$content[] = $this->step2(false);
-				$content[] = $this->step3(true);
-			break;
-			default:
-				$content[] = $this->step1(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu('configure_tab');
-		$tab->message_param = 'configure_msg';
-		$tab->css = 'htmlobject_tabs';
-		$tab->auto_tab = false;
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Step1
-	 *
-	 * @access public
-	 * @return array
-	 */
-	//--------------------------------------------
-	function step1( $visible = false ) {
-
-		$t = '';
-		if($visible === true) {
-			$form = $this->response->get_form('step', '1');
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			if ($this->file->exists($this->webdir.'/unconfigured')) {
-				$i = 0;
-				$d = array();
-				$lines = explode("\n", $this->file->get_contents($this->webdir.'/unconfigured'));
-				foreach($lines as $line) {
-					$line = trim($line);
-					if($line !== '') {
-						$d['param_nic_'.$i]['label']                     = $line;
-						$d['param_nic_'.$i]['object']['type']            = 'htmlobject_input';
-						$d['param_nic_'.$i]['object']['attrib']['type']  = 'radio';
-						$d['param_nic_'.$i]['object']['attrib']['name']  = 'nic';
-						$d['param_nic_'.$i]['object']['attrib']['value'] = $line;
-						if($i === 0) {
-							$d['param_nic_'.$i]['object']['attrib']['checked'] = true;
-						}
-						$i++;
-					}
-				}
-				$form->add($d);
-			}
-
-			if(!$form->get_errors() && $this->response->submit()) {
-				$nic = $form->get_request('nic');
-				if($nic === '') {
-					$_REQUEST['configure_msg'] = $this->lang['step1']['error_empty'];
-				} else {
-					$token = md5(uniqid(rand(), true));
-					$command = $this->basedir."/sbin/openqrm-exec -i 127.0.0.1 -l true -t $token -c \"sed -i -e 's/^OPENQRM_SERVER_INTERFACE=.*/OPENQRM_SERVER_INTERFACE=\"$nic\"/g' ".$this->basedir."/etc/openqrm-server.conf\"";
-					shell_exec($command);
-					// send to sleep to wait for background command
-					sleep(6);
-					$this->response->redirect(
-						$this->response->get_url('step', '2', 'configure_msg', sprintf($this->lang['step1']['saved'], $nic))
-					);
-				}
-			}
-
-			$t = $this->response->html->template($this->tpldir.'/configure1.tpl.php');
-			$t->add($this->response->html->thisfile, "thisfile");
-			$t->add($this->lang['step1']['label'], 'label');
-			$t->add($this->lang['step1']['howto'], 'howto');
-			$t->add($form);
-			$t->group_elements(array('param_' => 'form'));
-		}
-
-		$content['label']   = $this->lang['step1']['tab'];
-		$content['value']   = $t;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array('step', '1' );
-		$content['onclick'] = false;
-		if($this->action === '1'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Step2
-	 *
-	 * @access public
-	 * @return array
-	 */
-	//--------------------------------------------
-	function step2( $visible = false ) {
-
-		$t = '';
-		if($visible === true) {
-			$form = $this->response->get_form('step', '2');
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			$d = array();
-			$lines = array('mysql', 'postgres');
-			foreach($lines as $line) {
-				if($line !== '') {
-					$d['param_db_'.$i]['label']                     = $line;
-					$d['param_db_'.$i]['object']['type']            = 'htmlobject_input';
-					$d['param_db_'.$i]['object']['attrib']['type']  = 'radio';
-					$d['param_db_'.$i]['object']['attrib']['name']  = 'db';
-					$d['param_db_'.$i]['object']['attrib']['value'] = $line;
-					if($i === 0) {
-						$d['param_db_'.$i]['object']['attrib']['checked'] = true;
-					}
-					$i++;
-				}
-			}
-			$form->add($d);
-
-			if($this->response->cancel()) {
-				$this->response->redirect(
-					$this->response->get_url('step', '1')
-				);
-			}
-
-			if(!$form->get_errors() && $this->response->submit()) {
-				$db = $form->get_request('db');
-				if($db === '') {
-					$_REQUEST['configure_msg'] = $this->lang['step2']['error_empty'];
-				} else {
-					// do redirect adding db type
-					$this->response->redirect(
-						$this->response->get_url('step', '3', 'configure_msg', sprintf($this->lang['step2']['saved'], $db)).'&dbtype='.$db
-					);
-				}
-			}
-
-			$t = $this->response->html->template($this->tpldir.'/configure2.tpl.php');
-			$t->add($this->response->html->thisfile, "thisfile");
-			$t->add($this->lang['step2']['label'], 'label');
-			$t->add($this->lang['step2']['howto'], 'howto');
-			$t->add($form);
-			$t->group_elements(array('param_' => 'form'));
-		}
-
-		$content['label']   = $this->lang['step2']['tab'];
-		$content['value']   = $t;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array('step', '2' );
-		$content['onclick'] = false;
-		if($this->action === '2'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Step3
-	 *
-	 * @access public
-	 * @return array
-	 */
-	//--------------------------------------------
-	function step3( $visible = false ) {
-		$t = '';
-		$dbtype = $this->response->html->request()->get('dbtype');
-		$this->response->add('dbtype', $dbtype);
-		if($visible === true) {
-			if($dbtype === '') {
-				$this->response->redirect(
-					$this->response->get_url('step', '2', 'configure_msg', $this->lang['step2']['error_empty'])
-				);
-			} else {
-				$form = $this->response->get_form('step', '3');
-
-				$submit = $form->get_elements('submit');
-				$submit->handler = 'onclick="wait();"';
-				$form->add($submit, 'submit');
-
-				$submit = $form->get_elements('cancel');
-				$submit->handler = 'onclick="cancel();"';
-				$form->add($submit, 'cancel');
-
-				$d['param_db_1']['label']                     = $this->lang['step3']['form_server'];
-				$d['param_db_1']['required']                  = true;
-				$d['param_db_1']['object']['type']            = 'htmlobject_input';
-				$d['param_db_1']['object']['attrib']['type']  = 'text';
-				$d['param_db_1']['object']['attrib']['name']  = 'db_server';
-				$d['param_db_1']['object']['attrib']['value']  = 'localhost';
-
-				$d['param_db_2']['label']                     = $this->lang['step3']['form_db'];
-				$d['param_db_2']['required']                  = true;
-				$d['param_db_2']['object']['type']            = 'htmlobject_input';
-				$d['param_db_2']['object']['attrib']['type']  = 'text';
-				$d['param_db_2']['object']['attrib']['name']  = 'db_name';
-				$d['param_db_2']['object']['attrib']['value']  = 'openqrm';
-
-				$d['param_db_3']['label']                     = $this->lang['step3']['form_user'];
-				$d['param_db_3']['required']                  = true;
-				$d['param_db_3']['object']['type']            = 'htmlobject_input';
-				$d['param_db_3']['object']['attrib']['type']  = 'text';
-				$d['param_db_3']['object']['attrib']['name']  = 'db_user';
-
-				$d['param_db_4']['label']                     = $this->lang['step3']['form_password'];
-				$d['param_db_4']['object']['type']            = 'htmlobject_input';
-				$d['param_db_4']['object']['attrib']['type']  = 'password';
-				$d['param_db_4']['object']['attrib']['name']  = 'db_password';
-
-				$d['param_db_5']['label']                     = $this->lang['step3']['form_restore'];
-				$d['param_db_5']['object']['type']            = 'htmlobject_input';
-				$d['param_db_5']['object']['attrib']['type']  = 'checkbox';
-				$d['param_db_5']['object']['attrib']['name']  = 'db_restore';
-
-				$form->add($d);
-
-				if($this->response->cancel()) {
-					$this->response->redirect(
-						$this->response->get_url('step', '2')
-					);
-				}
-
-				if(!$form->get_errors() && $this->response->submit()) {
-					$type    = $dbtype;
-					$server  = $form->get_request('db_server');
-					$db      = $form->get_request('db_name');
-					$user    = $form->get_request('db_user');
-					$pass    = $form->get_request('db_password');
-					$restore = $form->get_request('db_restore');
-					
-					$token = md5(uniqid(rand(), true));
-					$command  = $this->basedir.'/sbin/openqrm-exec -i 127.0.0.1 -l true -t '.$token.' -c';
-					$command .= ' "sed -i -e \'s/^OPENQRM_DATABASE_TYPE=.*/OPENQRM_DATABASE_TYPE="'.$type.'"/g\'';
-					$command .= ' -e \'s/^OPENQRM_DATABASE_SERVER=.*/OPENQRM_DATABASE_SERVER="'.$server.'"/g\'';
-					$command .= ' -e \'s/^OPENQRM_DATABASE_NAME=.*/OPENQRM_DATABASE_NAME="'.$db.'"/g\'';
-					$command .= ' -e \'s/^OPENQRM_DATABASE_USER=.*/OPENQRM_DATABASE_USER="'.$user.'"/g\'';
-					$command .= ' -e \'s/^OPENQRM_DATABASE_PASSWORD=.*/OPENQRM_DATABASE_PASSWORD="'.$pass.'"/g\'';
-					if (!strcmp($type, "oracle")) { 
-						$command .= ' -e \'s/#OPENQRM_LD_LIBRARY_PATH=.*/OPENQRM_LD_LIBRARY_PATH="'.$oqc_db_ld_path.'"/g\'';
-						$command .= ' -e \'s/#OPENQRM_ORACLE_HOME=.*/OPENQRM_ORACLE_HOME="'.$oqc_db_home.'"/g\'';
-						$command .= ' -e \'s/#OPENQRM_TNS_ADMIN=.*/OPENQRM_TNS_ADMIN="'.$oqc_db_tns.'"/g\'';
-						$command .= ' -e \'s/OPENQRM_LD_LIBRARY_PATH=.*/OPENQRM_LD_LIBRARY_PATH="'.$oqc_db_ld_path.'"/g\'';
-						$command .= ' -e \'s/OPENQRM_ORACLE_HOME=.*/OPENQRM_ORACLE_HOME="'.$oqc_db_home.'"/g\'';
-						$command .= ' -e \'s/OPENQRM_TNS_ADMIN=.*/OPENQRM_TNS_ADMIN="'.$oqc_db_tns.'"/g\'';
-					}
-					$command .= ' '.$this->basedir.'/etc/openqrm-server.conf"';
-					shell_exec($command);
-					// send to sleep to wait for background command
-					sleep(4);
-					// init token plus timeout
-					$token = md5(uniqid(rand(), true));
-					$token .= ".".$this->configure_timeout;
-					// restore last backup ?
-					$command = $this->basedir."/sbin/openqrm-exec -i 127.0.0.1 -l true -t ".$token." -c \"".$this->basedir."/bin/openqrm init_config";
-					if ($restore !== '') {
-						$command .= " restore\"";
-					} else {
-						$command .= "\"";
-					}
-					shell_exec($command);
-					if (!$this->__check_install($this->webdir.'/unconfigured')) {
-						$_REQUEST['configure_msg'] = $this->lang['step3']['failed'];
-					} else {
-						$this->response->redirect(
-							$this->response->get_url('none', 'none', 'datacenter_msg', $this->lang['step3']['saved'])
-						);
-					}
-				}
-				$t = $this->response->html->template($this->tpldir.'/configure3.tpl.php');
-				$t->add($this->response->html->thisfile, "thisfile");
-				$t->add($this->lang['step3']['label'], 'label');
-				$t->add($this->lang['step3']['howto'], 'howto');
-				$t->add($form);
-				$t->group_elements(array('param_' => 'form'));
-			}
-		}
-
-		$content['label']   = $this->lang['step3']['tab'];
-		$content['value']   = $t;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array('step', '3' );
-		$content['onclick'] = false;
-		if($this->action === '3'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * check if init was successful
-	 *
-	 * @access protected
-	 * @param file
-	 * @return null
-	 */
-	//--------------------------------------------
-	function __check_install($file) {
-		$loop = 0;
-		while ($this->file->exists($file)) {
-			sleep(1);
-			flush();
-			$loop++;
-			if ($loop > $this->configure_timeout)  {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Check db
-	 *
-	 * @access protected
-	 * @param $type
-	 * @param $server
-	 * @param $db
-	 * @param $user
-	 * @param $pass
-	 * @return empty|string
-	 */
-	//--------------------------------------------
-
-
-/*
-	function __check($type, $server, $db, $user, $pass) {
-
-		// try to connect
-		// different locations of adodb for suse/redhat/debian
-		if (file_exists('/usr/share/php/adodb/adodb.inc.php')) {
-			require_once ('/usr/share/php/adodb/adodb.inc.php');
-		} else if (file_exists($this->basedir.'/include/adodb/adodb.inc.php')) {
-			require_once ($this->basedir.'/include/adodb/adodb.inc.php');
-		} else if (file_exists('/usr/share/adodb/adodb.inc.php')) {
-			require_once ('/usr/share/adodb/adodb.inc.php');
-		} else {
-			return 'ERROR: Could not find adodb on this system!';
-		}
-
-		// cache output
-		ob_start();
-
-		if ($type == "db2") {
-			$db = ADONewConnection('odbc');
-			$db->PConnect($db, $user, $pass);
-			$db->SetFetchMode(ADODB_FETCH_ASSOC);
-			return $db;
-
-		} else if ($type == "oracle") {
-			// we need to use the oci8po driver because it is the
-			// only oracle driver supporting to set the column-names to lowercase
-			// via define('ADODB_ASSOC_CASE',0);
-			$db = NewADOConnection("oci8po");
-			$db->Connect($db, $user, $pass);
-
-		} else {
-			if (strlen($pass)) {
-				$dsn = "$type://$user:$pass@$server/$db?persist";
-			} else {
-				$dsn = "$type://$user@$server/$db?persist";
-			}
-		$db = ADONewConnection($dsn);
-		}
-
-		$error = ob_get_contents();
-		// end cache
-		ob_end_clean();
-		$error = str_replace("<br />", '', trim($error));
-		return $error;
-
-	}
-*/
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/openqrm.content.class.php b/openQRM-5.3.50-CE/src/web/base/class/openqrm.content.class.php
deleted file mode 100644
index 258a1f9..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/openqrm.content.class.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/**
- * Openqrm Content
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class openqrm_content
-{
-
-var $pluginkey;
-/**
-* absolute path to template dir
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* absolute path to webroot
-* @access public
-* @var string
-*/
-var $rootdir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang;
-
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param htmlobject_response $response
-	 * @param file $file
-	 * @param user $user
-	 */
-	//--------------------------------------------
-	function __construct($response, $file, $user, $openqrm) {
-		$this->response = $response;
-		$this->openqrm  = $openqrm;
-		$this->file     = $file;
-		$this->user     = $user;
-		$this->request  = $this->response->html->request();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/index_content.tpl.php');
-		$t->add($this->content(), 'content');
-		$t->add($this->pluginkey, 'contentclass'); // needs to run after $this->content()
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Build content
-	 *
-	 * @access public
-	 * @return htmlobject_tabmenu | string
-	 */
-	//--------------------------------------------
-	function content() {
-		
-		if (isset($lc)) {
-			return $lc;
-		}
-		if($this->request->get('iframe') !== '') {
-			$this->pluginkey = 'iframe';
-			$iframe = parse_url($this->request->get('iframe'), PHP_URL_PATH);
-			$str = '<iframe name="MainFrame" id="MainFrame" src="'.$iframe.'" scrolling="auto" height="1" frameborder="0"></iframe>';
-			$name = $this->request->get('name');
-			if($name === '') {
-				$name = 'Iframe';
-			}
-			// assign params to response
-			$this->response->add('iframe',$this->request->get('iframe'));
-			$this->response->add('name',$this->request->get('name'));
-
-			// tabs
-			$content[] = array(
-				'label' => $name,
-				'value' => $str,
-				'target' => $this->response->html->thisfile,
-				'request' => $this->response->get_array(),
-				'onclick' => false,
-				'hidden' => false,
-			);
-			$tab = $this->response->html->tabmenu('iframe_tab');
-			$tab->message_param = 'noop';
-			$tab->auto_tab = false;
-			$tab->css = 'htmlobject_tabs';
-			$tab->add($content);
-			return $tab;
-		} 
-		else if ($this->request->get('base') !== '') {
-			$plugin = $this->request->get('base');
-			$this->pluginkey = $plugin;
-			$name   = $plugin;
-			$class  = $plugin;
-			if($this->request->get('controller') !== '') {
-				$class = $this->request->get('controller');
-				$name  = $class;
-			}
-			$class  = str_replace('-', '_', $class).'_controller';
-			$path   = $this->rootdir.'/server/'.$plugin.'/class/'.$name.'.controller.class.php';
-			$role = $this->openqrm->role($this->response);
-			$data = $role->get_plugin($class, $path);
-			return $data;
-		}
-		else if($this->request->get('plugin') !== '') {
-			$plugin = $this->request->get('plugin');
-			$this->pluginkey = $plugin;
-			$name   = $plugin;
-			$class  = $plugin;
-			if($this->request->get('controller') !== '') {
-				$class = $this->request->get('controller');
-				$name  = $class;
-			}
-			$class  = str_replace('-', '_', $class).'_controller';
-			$path   = $this->rootdir.'/plugins/'.$plugin.'/class/'.$name.'.controller.class.php';
-			if($this->file->exists($path)) {
-				$role = $this->openqrm->role($this->response);
-				$data = $role->get_plugin($class, $path);
-				return $data;
-			} else {
-				// handle plugins not oop
-				$path = $this->rootdir.'/plugins/'.$plugin.'/'.$name.'-manager.php';
-				if($this->file->exists($path)) {
-					$params = '';
-					foreach($_REQUEST as $k => $v) {
-						if(is_string($v)) {
-							$params .= '&'.$k.'='.$v;		
-						}
-						if(is_array($v)) {
-							foreach($v as $key => $value) {
-								$params .= '&'.$k.'['.$key.']'.'='.$value;
-							}
-						}
-					}
-					$str = '<iframe name="MainFrame" id="MainFrame" src="plugins/'.$plugin.'/'.$name.'-manager.php?'.$params.'" scrolling="auto" height="1" frameborder="0"></iframe>';
-					return $str;
-				} else {
-					$role = $this->openqrm->role($this->response);
-					$data = $role->get_plugin($class, $path);
-					return $data;
-				}
-			}
-		} else {
-			// default page - datacenter overview
-			$this->pluginkey = 'aa_server';
-			$path   = $this->rootdir.'/server/'.$this->pluginkey.'/class/datacenter.controller.class.php';
-			$this->openqrm->init();
-			require_once($path);
-			$controller = new datacenter_controller($this->openqrm, $this->response);
-			$data = $controller->action();
-			return $data;
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * lcc
-	 *
-	 * @access public
-	 * @return null
-	 */
-	//--------------------------------------------
-}
-?>
diff --git a/openQRM-5.3.50-CE/src/web/base/class/openqrm.controller.class.php b/openQRM-5.3.50-CE/src/web/base/class/openqrm.controller.class.php
deleted file mode 100644
index 76dd737..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/openqrm.controller.class.php
+++ /dev/null
@@ -1,393 +0,0 @@
-<?php
-/**
- * Openqrm Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class openqrm_controller
-{
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'content' => array(
-		'tab' => 'License',
-		'ltimeout' => 'Your openQRM license has expired!',
-		'lclients' => 'Your openQRM client license has expired!',
-	),
-	'top' => array(
-		'account' => 'Account',
-		'support' => 'Support',
-		'info' => 'Info',
-		'documentation' => 'Documentation',
-		'language' => 'Language',
-	),
-	'upload' => array(
-		'tab' => 'Upload',
-		'label' => 'Upload License File(s)',
-		'public_key' => 'Public Key',
-		'server_license' => 'Server License',
-		'client_license' => 'Client Licenses (optional)',
-		'welcome' => 'Welcome to your newly installed openQRM Enterprise Edition',
-		'explanation' => 'Please activate it by uploading the license key files you received by email.',
-		'msg' => 'Uploaded License File %s',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function __construct() {
-
-		// handle timezone needed since php 5.3
-		if(function_exists('ini_get')) {
-			if(ini_get('date.timezone') === '') {
-				date_default_timezone_set('Europe/Berlin');
-			}
-		}
-
-		$this->rootdir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base';
-		$this->tpldir = $this->rootdir.'/tpl';
-
-		require_once($this->rootdir.'/class/file.handler.class.php');
-		$file = new file_handler();
-
-		require_once($this->rootdir.'/class/htmlobjects/htmlobject.class.php');
-		require_once($this->rootdir.'/class/openqrm.htmlobjects.class.php');
-		$html = new openqrm_htmlobject();
-
-		// if openQRM is unconfigured, set openqrm empty
-		if ($file->exists($this->rootdir.'/unconfigured')) {
-			$this->openqrm = '';
-			$this->webdir  = $this->rootdir;
-			$this->baseurl = $html->thisurl;
-		} else {
-			require_once($this->rootdir.'/class/user.class.php');
-			$user = new user($_SERVER['PHP_AUTH_USER']);
-			$user->set_user();
-			require_once($this->rootdir.'/class/openqrm.class.php');
-			$this->openqrm = new openqrm($file, $user, $html->response());
-			$this->webdir  = $this->openqrm->get('webdir');
-			$this->baseurl = $this->openqrm->get('baseurl');
-		}
-
-		// only translate if openqrm is not empty (configure mode)
-		if($this->openqrm !== '') {
-			$html->lang = $user->translate($html->lang, $this->rootdir."/lang", 'htmlobjects.ini');
-			$file->lang = $user->translate($file->lang, $this->rootdir."/lang", 'file.handler.ini');
-			$this->lang = $user->translate($this->lang, $this->rootdir."/lang", 'openqrm.controller.ini');
-		}
-
-		require_once $this->rootdir.'/include/requestfilter.inc.php';
-		$request = $html->request();
-		$request->filter = $requestfilter;
-
-		$this->response = $html->response();
-		$this->request  = $this->response->html->request();
-		$this->file     = $file;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function action() {
-
-		$ti = microtime(true);
-		
-		// get js translation file;
-		// EN file serves master key for language labels
-		$file = $this->rootdir.'/lang/en.javascript.ini'; // 'en.' prefix is needed and must not be renamed
-		$jstranslation = '';
-		if($this->file->exists($file)) {
-			$lang = $this->file->get_ini($file);
-			// only translate if openqrm is not empty (configure mode)
-			if($this->openqrm !== '') {
-				$lang = $this->openqrm->user()->translate($lang, $this->rootdir."/lang", 'javascript.ini');
-			}			
-			$jstranslation  = '<script type="text/javascript">'."\n";
-			$jstranslation .= '//<![CDATA['."\n";
-			$jstranslation .= 'var jstranslation = {'."\n";
-			$i = 0;
-			foreach($lang as $key => $value) {
-				$jstranslation .= $key.': "'.$value."\"";	// build js array
-				if($i < count($lang)-1) {
-					$jstranslation .= ",\n";
-				}
-				$i++;
-			}
-			$jstranslation .= "\n".'};'."\n";
-			$jstranslation .= '//]]>'."\n";
-			$jstranslation .= '</script>'."\n";
-		}
-
-		// handle scripts and stylesheets
-		$style = '';
-		$script = '';
-		$basetarget = '<base target="MainFrame"></base>';
-		
-		if($this->request->get('plugin') !== '') {
-			$plugin = $this->request->get('plugin');
-			$style  = $this->__renderAssetInclude( '/plugins/'.$plugin.'/css/', 'css' );
-			$script = $this->__renderAssetInclude( '/plugins/'.$plugin.'/js/', 'js' );
-			$basetarget = '';
-			$this->response->add('plugin', $plugin);
-			if($this->request->get('controller') !== '') {
-				$this->response->add('controller', $this->request->get('controller'));
-			}
-		}
-		else if ( $this->request->get('base') !== '') {
-			$plugin = $this->request->get('base');
-			$style  = $this->__renderAssetInclude( '/server/'.$plugin.'/css/', 'css' );
-			$script = $this->__renderAssetInclude( '/server/'.$plugin.'/js/', 'js' );
-			$basetarget = '';
-			$this->response->params['base'] = $plugin;
-			if($this->request->get('controller') !== '') {
-				$this->response->params['controller'] = $this->request->get('controller');
-			}
-		} else {
-			$plugin = 'aa_server';
-			$style  = $this->__renderAssetInclude( '/server/'.$plugin.'/css/', 'css' );
-			$script = $this->__renderAssetInclude( '/server/'.$plugin.'/js/', 'js' );
-			$basetarget = '';
-		}
-
-		$t = $this->response->html->template($this->tpldir.'/index.tpl.php');
-	
-		// Configure switch
-		if ($this->file->exists($this->webdir.'/unconfigured')) {
-			$t->add('', "lang");
-			$t->add('<h1 id="setup_h1">Setup</h1>', "menu");
-			$content = $this->configure();
-		} 
-		else if ($this->response->html->request()->get('upload') !== '') {
-			$t->add($this->openqrm->user()->lang, "lang");
-			$t->add($this->menu(), "menu");
-			$content = $this->upload();
-		} else {
-			$t->add($this->openqrm->user()->lang, "lang");
-			$t->add($this->menu(), "menu");
-			$content = $this->content();
-			// handle scripts and styles of sub loaded objects (tab in tab)
-			if($content->__elements['content'] instanceof htmlobject_tabmenu) {
-				$tabs = $this->__renderTabs($content->__elements['content']);
-				isset($tabs['script']) ? $script .= $tabs['script'] : null;
-				isset($tabs['style'])  ? $style  .= $tabs['style']  : null;
-			}
-		}
-
-		$t->add($content, "content");
-		$t->add($this->baseurl, "baseurl");
-		$t->add($basetarget, "basetarget");
-		$t->add($jstranslation, "jstranslation");
-		$t->add($style, "style");
-		$t->add($script, "script");
-		$t->add(date('Y'), "currentyear");
-		$t->add($this->top(), "top");
-
-		$memory = '';
-		if(function_exists('memory_get_peak_usage')) {
-			$memory = memory_get_peak_usage(false);
-		}
-		$t->add('Memory: '.$memory.' bytes', 'memory');
-		$ti = (microtime(true) - $ti);
-		$t->add('Time: '.$ti.' sec', 'time');
-
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Api
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function api() {
-		if ($this->file->exists($this->rootdir.'/unconfigured')) {
-			return '';
-		} else {
-			require_once($this->rootdir.'/class/openqrm.api.class.php');
-			$controller = new openqrm_api($this);
-			$controller->action();
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * CLI
-	 *
-	 * @access public
-	 * @param string $argv console parameters
-	 */
-	//--------------------------------------------
-	function cli($argv) {
-		if ($this->file->exists($this->rootdir.'/unconfigured')) {
-			return '';
-		} else {
-			require_once($this->rootdir.'/class/openqrm.cli.class.php');
-			$controller = new openqrm_cli($this, $argv);
-			$controller->action();
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Build Top of page
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function top() {
-		require_once($this->rootdir.'/class/openqrm.top.class.php');
-		$controller = new openqrm_top($this->response, $this->file, $this->openqrm);
-		$controller->tpldir = $this->tpldir;
-		$controller->lang = $this->lang['top'];
-		return $controller->action();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Build menu
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function menu() {
-		require_once($this->rootdir.'/class/openqrm.menu.class.php');
-		$controller = new openqrm_menu($this->response, $this->file, $this->openqrm->user());
-		$controller->tpldir = $this->tpldir;
-		return $controller->action();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Handle content
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function content() {
-		require_once($this->rootdir.'/class/openqrm.content.class.php');
-		$controller = new openqrm_content($this->response, $this->file, $this->openqrm->user(), $this->openqrm);
-		$controller->tpldir = $this->tpldir;
-		$controller->rootdir = $this->rootdir;
-		$controller->lang = $this->lang['content'];
-		$data = $controller->action();
-		return $data;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Configure openQRM
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function configure() {
-		require_once($this->rootdir.'/class/openqrm.configure.class.php');
-		$controller = new openqrm_configure($this->response, $this->file);
-		$controller->tpldir = $this->tpldir;
-		return $controller->action();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Upload
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function upload() {
-		require_once($this->rootdir.'/class/openqrm.upload.class.php');
-		$controller = new openqrm_upload($this->response, $this->openqrm);
-		$controller->tpldir = $this->tpldir;
-		$controller->lang = $this->lang['upload'];
-		return $controller->action();
-	}	
-	
-	//--------------------------------------------
-	/**
-	 * Render js/css include strings
-	 *
-	 * @access protected
-	 * @param $path path to css/js dir
-	 * @param $mode enum [css|js]
-	 * @return string
-	 */
-	//--------------------------------------------
-	protected function __renderAssetInclude( $path, $mode ) {
-		$str   = '';
-		$files = $this->file->get_files($this->webdir.$path, '', '*.'.$mode);
-		foreach($files as $file) {
-			if($mode === 'css') {
-				$str.= '<link rel="stylesheet" href="'.$this->baseurl.$path.$file['name'].'" type="text/css">'."\n";
-			}
-			else if($mode === 'js') {
-				$str.= '<script src="'.$this->baseurl.$path.$file['name'].'" type="text/javascript"></script>'."\n";
-			}
-		}
-		return $str;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Read pluginroot attrib (tab in tab)
-	 *
-	 * @access protected
-	 * @param htmloject_tabmenu $obj
-	 * @return array
-	 */
-	//--------------------------------------------
-	protected function __renderTabs( $obj ) {
-		$return['script'] = '';
-		$return['style']  = '';
-		foreach($obj->__data as $a) {
-			if(
-				isset($a['active']) && 
-				$a['active'] === true &&
-				isset($a['value']) && 
-				$a['value'] instanceof htmlobject_tabmenu
-			){
-				if(isset($a['value']->pluginroot)) {
-					$return['style']  .= $this->__renderAssetInclude( $a['value']->pluginroot.'/css/', 'css' );
-					$return['script'] .= $this->__renderAssetInclude( $a['value']->pluginroot.'/js/', 'js' );
-				}
-				$tabs = $this->__renderTabs($a['value']);
-				isset($tabs['script']) ? $return['script'] .= $tabs['script'] : null;
-				isset($tabs['style'])  ? $return['style']  .= $tabs['style']  : null;
-				break;
-			}
-		}
-		return $return;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/openqrm.htmlobjects.class.php b/openQRM-5.3.50-CE/src/web/base/class/openqrm.htmlobjects.class.php
deleted file mode 100644
index 1f6dc1d..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/openqrm.htmlobjects.class.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/**
- * openQRM htmlobjects extension
- *
-
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-class openqrm_htmlobject extends htmlobject
-{
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct() {
-		parent::__construct($_SERVER["DOCUMENT_ROOT"].'/openqrm/base/class/htmlobjects');
-	}
-
-
-	//------------------------------------------------
-	/**
-	 * Request Object
-	 *
-	 * @access public
-	 * @return htmlobject_request
-	 */
-	//------------------------------------------------
-	function request() {            
-		if(isset($this->__request)) {
-			$request = $this->__request;
-		} else {
-			$request = parent::request();
-			$request->filter = array (
-				array ( 'pattern' => '/(&#*\w+)[\x00-\x20]+;/u', 'replace' => '$1;'),
-				array ( 'pattern' => '/(&#x*[0-9A-F]+);*/iu', 'replace' => '$1;'),
-				// Remove any attribute starting with "on" or xmlns
-				array ( 'pattern' => '#(<[^>]+?[\x00-\x20"\'])(?:on|xmlns)[^>]*+>#iu', 'replace' => '$1>'),
-				// Remove javascript: and vbscript: protocols
-				array ( 'pattern' => '#([a-z]*)[\x00-\x20]*=[\x00-\x20]*([`\'"]*)[\x00-\x20]*j[\x00-\x20]*a[\x00-\x20]*v[\x00-\x20]*a[\x00-\x20]*s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:#iu', 'replace' => '$1=$2nojavascript...'),
-				array ( 'pattern' => '#([a-z]*)[\x00-\x20]*=([\'"]*)[\x00-\x20]*v[\x00-\x20]*b[\x00-\x20]*s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:#iu', 'replace' => '$1=$2novbscript...'),
-				array ( 'pattern' => '#([a-z]*)[\x00-\x20]*=([\'"]*)[\x00-\x20]*-moz-binding[\x00-\x20]*:#u', 'replace' => '$1=$2nomozbinding...'),
-				// Only works in IE: <span style="width: expression(alert('Ping!'));"></span>
-				array ( 'pattern' => '#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?expression[\x00-\x20]*\([^>]*+>#i', 'replace' => '$1>'),
-				array ( 'pattern' => '#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?behaviour[\x00-\x20]*\([^>]*+>#i', 'replace' => '$1>'),
-				array ( 'pattern' => '#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:*[^>]*+>#iu', 'replace' => '$1>'),
-				// Remove namespaced elements (we do not need them)
-				array ( 'pattern' => '#</*\w+:\w[^>]*+>#i', 'replace' => ''),
-				// Remove really unwanted tags
-				array ( 'pattern' => '#</*(?:applet|b(?:ase|gsound|link)|embed|frame(?:set)?|i(?:frame|layer)|l(?:ayer|ink)|meta|object|s(?:cript|tyle)|title|xml|a)[^>]*+>#i', 'replace' => '')
-			);
-			$this->__request = $request;
-		}
-		return $request;
-	}
-
-	//------------------------------------------------
-	/**
-	 * Tabmenu Object
-	 *
-	 * @access public
-	 * @param string $id prefix for posted vars
-	 * @param array $params array(key => value, ...);
-	 * @return htmlobject_tablebuilder
-	 */
-	//------------------------------------------------
-	function tabmenu(  $id = 'currenttab' ) {
-		$obj = parent::tabmenu($id);
-		#$obj->message_filter = $this->__request->filter;
-		return $obj;
-	}
-
-	//------------------------------------------------
-	/**
-	 * Tablebuilder Object
-	 *
-	 * @access public
-	 * @param string $id prefix for posted vars
-	 * @param array $params array(key => value, ...);
-	 * @return htmlobject_tablebuilder
-	 */
-	//------------------------------------------------
-	
-	function tablebuilder( $id, $params = null ) {
-		// handle table params
-		!isset($_SESSION) ? @session_start() : null;
-		$vars = $this->request()->get($id);
-		if($vars !== '') {
-			$_SESSION['tablebuilder'][$id]['sort']   = $vars['sort'];
-			$_SESSION['tablebuilder'][$id]['order']  = $vars['order'];
-			$_SESSION['tablebuilder'][$id]['limit']  = $vars['limit'];
-			$_SESSION['tablebuilder'][$id]['offset'] = $vars['offset'];
-		} else {
-			if(isset($_SESSION['tablebuilder'][$id]['sort'])) {
-				$_REQUEST[$id]['sort']   = $_SESSION['tablebuilder'][$id]['sort'];
-				$_REQUEST[$id]['order']  = $_SESSION['tablebuilder'][$id]['order'];
-				$_REQUEST[$id]['limit']  = $_SESSION['tablebuilder'][$id]['limit'];
-				$_REQUEST[$id]['offset'] = $_SESSION['tablebuilder'][$id]['offset'];
-			}
-		}
-		$obj = parent::tablebuilder($id, $params);
-		return $obj;
-	}
-
-	//------------------------------------------------
-	/**
-	 * B Object
-	 *
-	 * @access public
-	 * @return htmlobject_customtag
-	 */
-	//------------------------------------------------
-	function b() {
-		return $this->customtag('b');
-	}
-
-	//------------------------------------------------
-	/**
-	 * I Object
-	 *
-	 * @access public
-	 * @return htmlobject_customtag
-	 */
-	//------------------------------------------------
-	function i() {
-		return $this->customtag('i');
-	}
-
-	//------------------------------------------------
-	/**
-	 * Label Object
-	 *
-	 * @access public
-	 * @return htmlobject_customtag
-	 */
-	//------------------------------------------------
-	function label() {
-		return $this->customtag('label');
-	}
-
-	//------------------------------------------------
-	/**
-	 * Span Object
-	 *
-	 * @access public
-	 * @return htmlobject_customtag
-	 */
-	//------------------------------------------------
-	function span() {
-		return $this->customtag('span');
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/openqrm.menu.class.php b/openQRM-5.3.50-CE/src/web/base/class/openqrm.menu.class.php
deleted file mode 100644
index a91946c..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/openqrm.menu.class.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/**
- * Openqrm Menu
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class openqrm_menu
-{
-/**
-* absolute path to template dir
-* @access public
-* @var string
-*/
-var $tpldir;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param htmlobject_response $response
-	 * @param file $file
-	 * @param user $user
-	 */
-	//--------------------------------------------
-	function __construct($response, $file, $user) {
-		global $OPENQRM_SERVER_BASE_DIR;
-		$this->response = $response;
-		$this->file     = $file;
-		$this->user     = $user;
-		
-		$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-		$this->RootDir = $OPENQRM_SERVER_BASE_DIR.'/openqrm';
-		$this->WebDir = '/openqrm/base/';
-		$this->ImgDir = $RootDir.'/img/';
-		$this->PluginsDir = $RootDir.'plugins/';
-		$this->ClassDir = $RootDir.'class/';
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		require_once($_SERVER["DOCUMENT_ROOT"].'/openqrm/base/class/layersmenu.class.php');
-		require_once($_SERVER["DOCUMENT_ROOT"].'/openqrm/base/class/PHPLIB.php');
-		
-		$mid = new TreeMenu();
-		$mid->dirroot = $this->RootDir;
-		$mid->imgdir = $this->ImgDir.'menu/';
-		$mid->imgwww = $this->WebDir.'img/menu/';
-		$mid->icondir = $this->ImgDir.'menu/';
-		$mid->iconwww = $this->WebDir.'img/menu/';
-		
-		$strMenuStructure = '';
-		
-		// define the base menu item
-		$strMenuStructure .= implode('', file($this->RootDir.'/web/base/server/aa_server/menu.txt'));
-		
-		if($strMenuStructure != '') {
-			$mid->setMenuStructureString($strMenuStructure);
-		}
-		$mid->setIconsize(18, 18);
-		$mid->parseStructureForMenu('menu1_');
-//		$mid->replaceStringInUrls('menu1_', '&', '&amp;');
-
-
-//		var_dump($_SERVER['QUERY_STRING']);
-		$mid->setSelectedItemByUrl('menu1_', $_SERVER['QUERY_STRING']);
-		$mid->newTreeMenu('menu1_');
-
-		$mid2 = new TreeMenu();
-		$mid2->dirroot = $this->RootDir;
-		$mid2->imgdir = $this->ImgDir.'menu/';
-		$mid2->imgwww = $this->WebDir.'img/menu/';
-		$mid2->icondir = $this->ImgDir.'menu/';
-		$mid2->iconwww = $this->WebDir.'img/menu/';
-		
-		$strMenuStructure = '';		
-		
-		// define the plugin manager menu item
-		$strMenuStructure .= implode('', file($this->PluginsDir.'/aa_plugins/menu.txt'));
-		
-		// define the base plugin sections
-		$strMenuStructure .= $this->parse_subsection("Cloud", "cloud");
-		$strMenuStructure .= $this->parse_subsection("Deployment", "deployment");
-		$strMenuStructure .= $this->parse_subsection("Highavailability", "HA");
-		$strMenuStructure .= $this->parse_subsection("Management", "management");
-		$strMenuStructure .= $this->parse_subsection("Monitoring", "monitoring");
-		$strMenuStructure .= $this->parse_subsection("Network", "network");
-		$strMenuStructure .= $this->parse_subsection("Storage", "storage");
-		$strMenuStructure .= $this->parse_subsection("Virtualization", "virtualization");
-		$strMenuStructure .= $this->parse_subsection("Misc", "misc");
-		
-		if($strMenuStructure != '') {
-			$mid2->setMenuStructureString($strMenuStructure);
-		}	
-		$mid2->setIconsize(18, 18);
-		$mid2->parseStructureForMenu('menu2_');
-		$mid2->setSelectedItemByUrl('menu2_', $_SERVER['QUERY_STRING']);
-		$mid2->newTreeMenu('menu2_');
-
-		$t = $this->response->html->template($this->tpldir.'/index_menu.tpl.php');
-		$t->add("time()", 'timestamp');
-		$t->add($mid->getTreeMenu('menu1_'), 'menu_1');
-		$t->add($mid2->getTreeMenu('menu2_'), 'menu_2');
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Parse menu.txt files for phplayers
-	 *
-	 * @access private
-	 * @return string
-	 */
-	//--------------------------------------------
-	function parse_subsection($menuname, $name) {
-		global $OPENQRM_SERVER_BASE_DIR;
-		$str = '';
-		$folders = $this->file->get_folders($this->RootDir.'/plugins');
-		$menu = ".|$menuname\n";
-		foreach ($folders as $plug) {
-			$filename = $this->PluginsDir.'/'.$plug['name'].'/menu.txt';
-			$plugin_config = $plug['path'].'/etc/openqrm-plugin-'.$plug['name'].'.conf';
-			if($this->file->exists($plugin_config)) {
-				$store = "";
-				$store = openqrm_parse_conf($plugin_config);
-				extract($store);
-				if (!strcmp($store['OPENQRM_PLUGIN_TYPE'], $name)) {
-					if($this->file->exists($filename)) {
-						$str .= implode('', file($filename));
-					}
-				}
-			}
-		}
-		// workaround for img path
-		if($str !== '') {
-			$str = str_replace('|../../', '|', $str);
-			$str = $menu.$str;
-		}
-		return $str;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/openqrm.role.class.php b/openQRM-5.3.50-CE/src/web/base/class/openqrm.role.class.php
deleted file mode 100644
index 4b42f6f..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/openqrm.role.class.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/**
- * Openqrm Content
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class openqrm_role
-{
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->response = $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get plugin
-	 *
-	 * @access public
-	 * @param string $class
-	 * @param string $path
-	 */
-	//--------------------------------------------
-	function get_plugin($class, $path) {
-		if($this->openqrm->file()->exists($path)) {
-			$this->openqrm->init();
-			require_once($path);
-			$controller = new $class($this->openqrm, $this->response);
-			$data = $this->check_permission($controller);
-			return $data;
-		}
-		else {
-			$t = $this->response->html->template($this->openqrm->get('webdir').'/tpl/plugin_not_found.tpl.php');
-			$t->add(str_replace('_controller', '', $class), 'plugin');
-			$t->add($this->openqrm->get('baseurl'), 'baseurl');
-
-			$content['label']   = 'Plugin not found';
-			$content['value']   = $t;
-			$content['target']  = $this->response->html->thisfile;
-			$content['request'] = array();
-			$content['onclick'] = false;
-			$content['active']  = true;
-			$tab = $this->response->html->tabmenu('permissions');
-			$tab->css = 'htmlobject_tabs';
-			$tab->add(array($content));
-			return $tab;
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * check_permission
-	 *
-	 * datacenter_controller, user_controller,
-	 * documentation_controller, about(_.._controller)s
-	 * and action load(...) will be ignored
-	 *
-	 * @access public
-	 * @param object $object
-	 * @param bool $bool if true only true or false will be returned
-	 * @return htmlobject_template|bool
-	 */
-	//--------------------------------------------
-	function check_permission($object = null, $bool = false) {
-		$controller = get_class($object);
-		$action     = $this->response->html->request()->get($object->actions_name);
-		$user       = $this->openqrm->user();
-		if(is_array($action)) {
-			$action = key($action);
-		}
-		if(
-			!$user->isAdmin() &&
-			$controller !== 'datacenter_controller' &&
-			$controller !== 'user_controller' &&
-			$controller !== 'documentation_controller' &&
- 			strripos($controller, 'about') === false &&
-			substr($action, 0, 4) !== 'load'
-		) {
-			// check for plugin implementing the role hook
-			$plugin = new plugin();
-			$enabled_plugins = $plugin->enabled();
-			foreach ($enabled_plugins as $index => $plugin_name) {
-				$plugin_role_hook = $this->openqrm->get('webdir')."/plugins/".$plugin_name."/openqrm-".$plugin_name."-role-hook.class.php";
-				if (file_exists($plugin_role_hook)) {
-					require_once $plugin_role_hook;
-					$plugin_role_hook_class = "openqrm-".$plugin_name."-role-hook";
-					$plugin_role_hook_class = str_replace("-", "_", $plugin_role_hook_class);
-					$plugin_role_hook_method = $plugin_name."-check_permission";
-					$plugin_role_hook_method = str_replace("-", "_", $plugin_role_hook_method);
-					$plugin_role_hook = new $plugin_role_hook_class($this->openqrm, $object);
-					return $plugin_role_hook->$plugin_role_hook_method($bool);
-				}
-			}
-			// no plugin implemented the role hook, go on with basic role permission check
-			// is_not_admin -> tab menu with global error permission msg
-			$response = $object->response;
-			$html     = $response->html;
-			// handle empty action
-			if($action === '') {
-				// try select as first action
-				if(method_exists($object, 'select')) {
-					$action = 'select';
-				} else {
-					// pick first method as action
-					$m = get_class_methods($object);
-					foreach($m as $a) {
-						if(!in_array($a, array('api', 'action')) && strpos($a, '__') === false && strripos($a, 'reload') === false) {
-							$action = $a;
-							break;
-						}
-					}
-				}
-			}
-
-			if($bool === true) {
-				return false;
-			} else {
-				$controller = str_replace('_controller', '', get_class($object));
-				$controller = str_replace('aa_', '', $controller);
-
-				$t = $html->template($this->openqrm->get('webdir').'/tpl/permission_denied.tpl.php');
-				$t->add($action, 'action');
-				$t->add($controller, 'controller');
-				$t->add($this->openqrm->get('baseurl'), 'baseurl');
-
-				$content['label']   = 'Permissions';
-				$content['value']   = $t;
-				$content['target']  = $html->thisfile;
-				$content['request'] = $response->get_array($object->actions_name, '' );
-				$content['onclick'] = false;
-				$content['active']  = true;
-				$tab = $html->tabmenu('permissions');
-				$tab->css = 'htmlobject_tabs';
-				$tab->add(array($content));
-				return $tab;
-			}
-
-		} else {
-			if($bool === true) {
-				return true;
-			} else {
-				return $object->action();
-			}
-		}
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/openqrm.top.class.php b/openQRM-5.3.50-CE/src/web/base/class/openqrm.top.class.php
deleted file mode 100644
index 1294892..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/openqrm.top.class.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Openqrm Top
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class openqrm_top
-{
-/**
-* absolute path to template dir
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang;
-
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param htmlobject_response $response
-	 * @param file $file
-	 * @param openqrm $openqrm
-	 */
-	//--------------------------------------------
-	function __construct($response, $file, $openqrm) {
-		$this->response = $response;
-		$this->file     = $file;
-		$this->openqrm  = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/index_top.tpl.php');
-		// only translate if user is not empty (configure mode)
-		if($this->openqrm !== '') {
-			$t->add($this->openqrm->user()->name, 'username');
-			$t->add($this->openqrm->user()->lang, 'userlang');
-			$t->add($this->lang['account'], 'account');
-			$t->add($this->lang['documentation'], 'documentation');
-			$t->add($this->lang['info'], 'info');
-			$t->add($this->lang['support'], 'support');
-			$t->add($this->response->html->thisfile, 'thisfile');
-			$t->add($this->openqrm->user()->lang, 'userlang');
-			$openqrm_config = $this->openqrm->get('config');
-			$openqrm_version =  $openqrm_config['SERVER_VERSION'].".".$openqrm_config['MINOR_RELEASE_VERSION'];
-			$t->add($openqrm_version, 'version');
-
-			$a = $this->response->html->a();
-			$a->href = '../';
-			$a->label = '&#160;';
-			$a->title = 'Logout';
-			$a->css = 'logout';
-			$a->id = 'logoutbutton';
-			$a->style = 'display:none;';
-			$a->handler = 'onclick="Logout(this);return false;"';
-			$logout  = $a->get_string();
-			$logout .= '<script type="text/javascript">';
-			$logout .= 'document.getElementById(\'logoutbutton\').style.display = "block";';
-			$logout .= '</script>';
-
-			$select          = $this->response->html->select();
-			$select->css     = 'htmlobject_select';
-			$select->id      = 'Language_select';
-			$select->name    = 'language';
-			$select->handler = 'onchange="wait(); set_language();"';
-
-			$languages = array();
-			$files = $this->file->get_files($this->openqrm->get('basedir').'/web/base/lang/', '', '*.htmlobjects.ini');
-			foreach($files as $v) {
-				$tmp = explode('.', $v['name']);
-				$languages[] = $tmp[0];
-			}
-
-			foreach($languages as $lang) {
-				$o = $this->response->html->option();
-				$o->label = '&nbsp;'.$lang;
-				$o->css   = 'lang-'.$lang;
-				$o->value = $lang;
-				$o->style = 'background-image: url(img/'.$lang.'.gif) no-repeat';
-				if($lang === $this->openqrm->user()->lang) {
-					$o->selected = true; 
-				}
-				$select->add($o);
-			}
-			$box = $this->response->html->box();
-			$box->id  = 'Language_box';
-			$box->label = $this->lang['language'];
-			$box->add($select);
-			$box->add($logout);
-
-			$t->add($box, 'language_select');
-		} else {
-			$t->add('&#160;', 'language_select');
-			$t->add('&#160;', 'account');
-			$t->add('&#160;', 'documentation');
-			$t->add('&#160;', 'info');
-			$t->add('&#160;', 'support');
-		}
-		return $t;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/openqrm.upload.class.php b/openQRM-5.3.50-CE/src/web/base/class/openqrm.upload.class.php
deleted file mode 100644
index b18d56e..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/openqrm.upload.class.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
- * Openqrm Top
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2013, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2013, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class openqrm_upload
-{
-/**
-* absolute path to template dir
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang;
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param htmlobject_response $response
-	 * @param object $openqrm
-	 */
-	//--------------------------------------------
-	function __construct($response, $openqrm) {
-		$this->response = $response;
-		$this->openqrm  = $openqrm;
-		$this->openqrm->init();
-		require_once($this->openqrm->get('classdir').'/file.upload.class.php');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$content[] = $this->upload();
-
-		$tab = $this->response->html->tabmenu('upload_tab');
-		$tab->message_param = 'upload_msg';
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Upload
-	 *
-	 * @access public
-	 * @return array
-	 */
-	//--------------------------------------------
-	function upload() {
-
-		$response = $this->response;
-		$form = $response->get_form('upload', 'true');
-		$form->box_css = 'htmlobject_box';
-		$form->display_errors = false;
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$d['upload_1']['label']                    = $this->lang['public_key'];
-		$d['upload_1']['object']['type']           = 'input';
-		$d['upload_1']['object']['attrib']['type'] = 'file';
-		$d['upload_1']['object']['attrib']['name'] = 'upload_1';
-		$d['upload_1']['object']['attrib']['size'] = 30;
-
-		$d['upload_2']['label']                    = $this->lang['server_license'];
-		$d['upload_2']['object']['type']           = 'input';
-		$d['upload_2']['object']['attrib']['type'] = 'file';
-		$d['upload_2']['object']['attrib']['name'] = 'upload_2';
-		$d['upload_2']['object']['attrib']['size'] = 30;
-
-		$d['upload_3']['label']                    = $this->lang['client_license'];
-		$d['upload_3']['object']['type']           = 'input';
-		$d['upload_3']['object']['attrib']['type'] = 'file';
-		$d['upload_3']['object']['attrib']['name'] = 'upload_3';
-		$d['upload_3']['object']['attrib']['size'] = 30;
-
-		$form->add($d);
-
-		if(!$form->get_errors() && $response->submit()) {
-			$upload = new file_upload($this->openqrm->file());
-			$upload->lang = $this->openqrm->user()->translate($upload->lang, $this->openqrm->get('basedir')."/web/base/lang", 'file.upload.ini');
-			$error = '';
-			for($i = 1; $i < 4; $i++) {
-				if($_FILES['upload_'.$i]['name'] !== '') {
-					$msg = $upload->upload('upload_'.$i, $this->openqrm->get('webdir').'/tmp/', '', true);
-					if($msg !== '') {
-						$error .= $msg['msg'].'<br>';
-					}
-				}
-			}
-			if($error !== '') {
-				$_REQUEST['upload_msg'] = $error;
-			} else {
-				$response_msg = array();
-				for($i = 1; $i < 4; $i++) {
-					if($_FILES['upload_'.$i]['name'] !== '') {
-						$command = $this->openqrm->get('basedir')."/bin/openqrm license -l ".$this->openqrm->get('webdir')."/tmp/".$_FILES['upload_'.$i]['name']." --openqrm-cmd-mode background";
-						$resource = new resource();
-						$resource->get_instance_by_id(0);
-						$resource->send_command($resource->ip, $command);
-						$response_msg[] = sprintf($this->lang['msg'], $_FILES['upload_'.$i]['name']);
-						sleep(4);
-					}
-				}
-				$response_msg = implode('<br>', $response_msg);
-				$response->redirect($this->openqrm->get('baseurl').'/index.php?datacenter_msg='.$response_msg.'&upload_msg='.$response_msg);
-			}
-		}
-		$t = $this->response->html->template($this->openqrm->get('webdir').'/tpl/upload.tpl.php');
-		$t->add($response->html->thisfile, 'thisfile');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['welcome'], 'welcome');
-		$t->add($this->lang['explanation'], 'explanation');
-		$t->add($form->get_elements());
-		$t->group_elements(array('param_' => 'form'));
-
-		$content['label']   = $this->lang['tab'];
-		$content['value']   = $t;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array('upload', 'true' );
-		$content['onclick'] = false;
-		$content['active']  = true;
-
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/openqrm_server.class.php b/openQRM-5.3.50-CE/src/web/base/class/openqrm_server.class.php
deleted file mode 100644
index 58f031b..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/openqrm_server.class.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-// This class represents the openQRM-server
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/event.class.php";
-
-global $RESOURCE_INFO_TABLE;
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXECUTION_LAYER;
-$event = new event();
-global $event;
-
-class openqrm_server {
-
-var $id = '';
-
-
-// ---------------------------------------------------------------------------------
-// general server methods
-// ---------------------------------------------------------------------------------
-
-// returns the ip of the openQRM-server
-function get_ip_address() {
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select resource_openqrmserver from $RESOURCE_INFO_TABLE where resource_id=0");
-	if (!$rs)
-		$event->log("get_ip_address", $_SERVER['REQUEST_TIME'], 2, "openqrm_server.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	while (!$rs->EOF) {
-		$resource_openqrmserver=$rs->fields["resource_openqrmserver"];
-		$rs->MoveNext();
-	}
-	if (!strlen($resource_openqrmserver)) {
-		$event->log("get_ip_address", $_SERVER['REQUEST_TIME'], 2, "openqrm_server.class.php", "Could not find out IP-Address of the openQRM server. Server misconfiguration!", "", "", 0, 0, 0);
-	}
-	return $resource_openqrmserver;
-}
-
-
-// function to send a command to the openQRM-server
-function send_command($server_command, $command_timeout = NULL, $run_local = NULL) {
-	global $OPENQRM_EXEC_PORT;
-	// global $OPENQRM_SERVER_IP_ADDRESS;
-	$OPENQRM_SERVER_IP_ADDRESS=$this->get_ip_address();
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_EXECUTION_LAYER;
-	global $event;
-
-	// check which execution layer to use
-	switch($OPENQRM_EXECUTION_LAYER) {
-		case 'dropbear':
-			// generate a random token for the cmd
-			$cmd_token = md5(uniqid(rand(), true));
-			// custom timeout ?
-			if (!is_null($command_timeout)) {
-				$cmd_token .= ".".$command_timeout;
-			}
-			// run local ?
-			$run_local_parameter = '';
-			if (!is_null($run_local)) {
-				$run_local_parameter = "-l true";
-			}
-			$final_command = "$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-exec -i $OPENQRM_SERVER_IP_ADDRESS -t $cmd_token $run_local_parameter -c \"$server_command\"";
-			// $event->log("send_command", $_SERVER['REQUEST_TIME'], 5, "openqrm_server.class.php", "Running : $final_command", "", "", 0, 0, 0);
-			shell_exec($final_command);
-			return true;
-			break;
-		case 'rabbitmq':
-			$event->log("send_command", $_SERVER['REQUEST_TIME'], 5, "openqrm_server.class.php", "Sending command to the rabbit queue $OPENQRM_SERVER_IP_ADDRESS", "", "", 0, 0, 0);
-			require_once $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/class/rabbit.class.php';
-			$rabbit = new rabbit();
-			$rabbit->queue($OPENQRM_SERVER_IP_ADDRESS, $server_command);
-			break;
-	}
-
-}
-
-
-
-// ---------------------------------------------------------------------------------
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/web/base/class/plugin.class.php b/openQRM-5.3.50-CE/src/web/base/class/plugin.class.php
deleted file mode 100644
index 721e82f..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/plugin.class.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once ($RootDir.'include/openqrm-server-config.php');
-require_once "$RootDir/class/folder.class.php";
-require_once "$RootDir/class/event.class.php";
-
-/**
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- * @author M. Rechenburg, A. Kuballa
- * @version 1.1 added documentation
- */
-class plugin
-{
-/**
-* path to openqrm webdir
-* @access protected
-* @var string
-*/
-var $_web_dir;
-/**
-* path to openqrm basedir
-* @access protected
-* @var string
-*/
-var $_base_dir;
-/**
-* event object
-* @access protected
-* @var object
-*/
-var $_event;
-
-	//--------------------------------------------------
-	/**
-	* Constructor
-	*/
-	//--------------------------------------------------
-	function plugin() {
-		$this->init();
-	}
-
-	//--------------------------------------------------
-	/**
-	* init plugin environment
-	* @access public
-	*/
-	//--------------------------------------------------
-	function init() {
-		global $RootDir, $OPENQRM_SERVER_BASE_DIR;
-		$this->_event = new event();
-		$this->_web_dir = $RootDir;
-		$this->_base_dir = $OPENQRM_SERVER_BASE_DIR;
-	}
-
-	//--------------------------------------------------
-	/**
-	* return a list of available plugins
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	// return a list of available plugins
-	function available() {
-		$plugin_array = array();
-		$plugins = new Folder();
-		$plugins->getFolders("$this->_base_dir/openqrm/plugins/");
-		foreach ($plugins->folders as $plugin) {
-				array_push($plugin_array, $plugin);
-		}
-		return $plugin_array;
-	}
-
-	//--------------------------------------------------
-	/**
-	* return a list of enabled plugins
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function enabled() {
-		$plugin_array = array();
-		$plugins = new Folder();
-		$plugins->getFolders($this->_web_dir.'plugins/');
-		foreach ($plugins->folders as $plugin) {
-			if ("$plugin" != "aa_plugins") {
-				$plugin=basename(dirname(realpath($this->_web_dir.'plugins/'.$plugin)));
-				array_push($plugin_array, $plugin);
-			}
-
-		}
-		return $plugin_array;
-	}
-
-	//--------------------------------------------------
-	/**
-	* return a list of started plugins
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function started() {
-		$plugin_array = array();
-		$plugins = new Folder();
-		$plugins->getFolders($this->_web_dir.'plugins/');
-		foreach ($plugins->folders as $plugin) {
-			if ("$plugin" != "aa_plugins") {
-				$plugin=basename(dirname(realpath($this->_web_dir.'plugins/'.$plugin)));
-				$plugin_status="$this->_web_dir/plugins/$plugin/.running";
-				if (file_exists($plugin_status)) {
-					array_push($plugin_array, $plugin);
-				}
-			}
-
-		}
-		return $plugin_array;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get plugin config
-	* @access public
-	* @param string $plugin_name
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_config($plugin_name) {
-	$ar_Return = array();
-
-		// values not configurable
-		$blacklist[] = 'OPENQRM_PLUGIN_VERSION';
-		$blacklist[] = 'OPENQRM_PLUGIN_BUILD_REQUIREMENTS';
-		$blacklist[] = 'OPENQRM_PLUGIN_DESCRIPTION';
-		$blacklist[] = 'OPENQRM_PLUGIN_TYPE';
-		$blacklist[] = 'OPENQRM_PLUGIN_DEPENDENCIES';
-		$blacklist[] = 'OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES';
-		$blacklist[] = 'OPENQRM_PLUGIN_STATE_DIRS';
-		$blacklist[] = 'OPENQRM_PLUGIN_STATE_FILES';
-
-		$plugin_config="$this->_base_dir/openqrm/plugins/$plugin_name/etc/openqrm-plugin-$plugin_name.conf";
-		$plugin_description="";
-		$plugin_type="";
-		$config_array=file($plugin_config);
-		foreach ($config_array as $index => $line) {
-			if (strstr($line, "OPENQRM_PLUGIN_DESCRIPTION")) {
-				$plugin_description=str_replace("OPENQRM_PLUGIN_DESCRIPTION=", "", $line);
-				$plugin_description=str_replace("\"", "", $plugin_description);
-				$plugin_description=trim($plugin_description);
-			}
-			else if (strstr($line, "OPENQRM_PLUGIN_TYPE")) {
-				$plugin_type=str_replace("OPENQRM_PLUGIN_TYPE=", "", $line);
-				$plugin_type=str_replace("\"", "", $plugin_type);
-				$plugin_type=trim($plugin_type);
-			}
-			else if (strstr($line, "OPENQRM_PLUGIN_VERSION")) {
-				$plugin_version=str_replace("OPENQRM_PLUGIN_VERSION=", "", $line);
-				$plugin_version=str_replace("\"", "", $plugin_version);
-				$plugin_version=trim($plugin_version);
-			}
-			// check plugin is configurable
-			else if((strpos($line, 'OPENQRM_') === 0 || stripos($line, str_replace('-', '_', $plugin_name)) === 0) && !in_array(substr($line, 0, strpos($line, '=')), $blacklist)) {
-				$ar_Return['configurable'] = true;
-			}
-		}
-		$ar_Return['type'] = $plugin_type;
-		$ar_Return['version'] = $plugin_version;
-		$ar_Return['description'] = $plugin_description;
-	return $ar_Return;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get plugin dependencies
-	* @access public
-	* @param string $plugin_name
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_dependencies($plugin_name) {
-	$ar_Return = array();
-		$plugin_config="$this->_base_dir/openqrm/plugins/$plugin_name/etc/openqrm-plugin-$plugin_name.conf";
-		$plugin_dependencies="";
-		$config_array=file($plugin_config);
-		foreach ($config_array as $index => $line) {
-			// plugin deps
-			if (strstr($line, "OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES")) {
-				$plugin_dependencies=str_replace("OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES=", "", $line);
-				$plugin_dependencies=str_replace("\"", "", $plugin_dependencies);
-				$plugin_dependencies=trim($plugin_dependencies);
-			}
-		}
-		$ar_Return['dependencies'] = $plugin_dependencies;
-	return $ar_Return;
-	}
-	
-	
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/rabbit.class.php b/openQRM-5.3.50-CE/src/web/base/class/rabbit.class.php
deleted file mode 100644
index fe08cbc..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/rabbit.class.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-// This class represents a resource in openQRM (physical hardware or virtual machine)
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-require_once  $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/php-amqplib/vendor/autoload.php';
-use PhpAmqpLib\Connection\AMQPConnection;
-use PhpAmqpLib\Message\AMQPMessage;
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/user.class.php";
-$event = new event();
-global $event;
-global $OPENQRM_SERVER_BASE_DIR;
-
-
-class rabbit {
-
-var $ip = '';
-var $cmd = '';
-var $read_only_commands = array("post_vm_list", "post_vg post_lv", "post_vm_config", "post_bridge_config", "post_identifier");
-
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 */
-	//--------------------------------------------
-	function __construct() {
-		$OPENQRM_ADMIN = new user('openqrm');
-		$OPENQRM_ADMIN->set_user();
-		$connection = new AMQPConnection('localhost', 5672, 'openqrm', $OPENQRM_ADMIN->password);
-		$channel = $connection->channel();
-		$this->connection = $connection;
-		$this->channel = $channel;
-		global $event;
-		$this->event = new event();
-		global $OPENQRM_SERVER_BASE_DIR;
-		$this->openqrm_server_base_dir = $OPENQRM_SERVER_BASE_DIR;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Add to RabbitMQ queue
-	 *
-	 * @param string $queue
-	 * @param string $cmd
-	 * @access public
-	 */
-	//--------------------------------------------
-	function queue($queue, $cmd) {
-		$cmd_arr = explode(' ', $cmd);
-		if (isset($cmd_arr[1])) {
-			if (in_array($cmd_arr[1], $this->read_only_commands)) {
-				$queue = $queue.'.ui';
-			}
-		}
-		$this->event->log("send_command", $_SERVER['REQUEST_TIME'], 5, "rabbit.class.php", "Adding command to RabbitMQ queue ".$queue, "", "", 0, 0, 0);
-		$this->channel->queue_declare($queue, false, false, false, false);
-		$msg = new AMQPMessage($this->openqrm_server_base_dir."/openqrm/bin/openqrm-cmd ".$cmd, array('delivery_mode' => 2));
-		$this->channel->basic_publish($msg, '', $queue);
-		$this->channel->close();
-		$this->connection->close();
-	}
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/regex.class.php b/openQRM-5.3.50-CE/src/web/base/class/regex.class.php
deleted file mode 100644
index 9fbfce7..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/regex.class.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * @package htmlobjects
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-//----------------------------------------------------------------------------------------
-/**
- * Regex
- *
- * @package htmlobjects
- * @author Alexander Kuballa akuballa@openqrm-enterprise.com
- * @copyright Copyright (c) 2009, Alexander Kuballa
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- * @version 1.0
- */
-//----------------------------------------------------------------------------------------
-class regex
-{
-	//--------------------------------
-	/**
-	 * pereg_match()
-	 *
-	 * @param string $pattern
-	 * @param string $match
-	 * @return array|null
-	 */
-	//--------------------------------
-	static public function match($pattern, $match) {
-		@preg_match($pattern, $match, $matches);
-		if(debug::active()) {
-			$error = error_get_last();
-			if(strstr($error['message'], 'preg_match')) {
-				$msg = str_replace('preg_match() [<a href=\'function.preg-match\'>function.preg-match</a>]:', '' , $error['message']);
-				debug::add($msg.' in '. $pattern, 'ERROR');
-			}
-		}
-		if($matches) {
-			return $matches;
-		} else {
-			return null;
-		}
-	}
-	//--------------------------------
-	/**
-	 * pereg_replace()
-	 *
-	 * @param string $pattern
-	 * @param string $replace
-	 * @param string $string
-	 * @return array|null
-	 */
-	//--------------------------------
-	static public function replace($pattern, $replace, $string) {
-		$error = '';
-		$str = @preg_replace($pattern, $replace, $string) | $error;
-		echo $error;
-		if(debug::active()) {
-			$error = error_get_last();
-			if(strstr($error['message'], 'preg_replace')) {
-				$msg = str_replace('preg_replace() [<a href=\'function.preg-replace\'>function.preg-replace</a>]:', '' , $error['message']);
-				debug::add($msg.' in '. $pattern, 'ERROR');
-			}
-		}
-		return $str;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/resource.class.php b/openQRM-5.3.50-CE/src/web/base/class/resource.class.php
deleted file mode 100644
index 4cefd41..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/resource.class.php
+++ /dev/null
@@ -1,1145 +0,0 @@
-<?php
-
-// This class represents a resource in openQRM (physical hardware or virtual machine)
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-$BootServiceDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/boot-service/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/storage.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/plugin.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/user.class.php";
-
-global $RESOURCE_INFO_TABLE;
-$RESOURCE_TIME_OUT=240;
-global $RESOURCE_TIME_OUT;
-$event = new event();
-global $event;
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXECUTION_LAYER;
-global $OPENQRM_WEB_PROTOCOL;
-
-
-class resource {
-
-var $id = '';
-var $localboot = '';
-var $kernel = '';
-var $kernelid = '';
-var $image = '';
-var $imageid = '';
-var $openqrmserver = '';
-var $basedir = '';
-var $applianceid = '';
-var $ip = '';
-var $subnet = '';
-var $broadcast = '';
-var $network = '';
-var $mac = '';
-var $nics = '';
-var $uptime = '';
-var $cpunumber = '';
-var $cpuspeed = '';
-var $cpumodel = '';
-var $memtotal = '';
-var $memused = '';
-var $swaptotal = '';
-var $swapused = '';
-var $hostname = '';
-var $vtype = '';
-var $vhostid = '';
-var $vname = '';
-var $vnc = '';
-var $load = '';
-var $execdport = '';
-var $senddelay = '';
-var $capabilities = '';
-var $lastgood = '';
-var $state = '';
-var $event = '';
-
-// ---------------------------------------------------------------------------------
-// methods to create an instance of a resource object filled from the db
-// ---------------------------------------------------------------------------------
-
-// returns a resource from the db selected by id, mac or ip
-function get_instance($id, $mac, $ip) {
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	if (strlen($mac)) {
-	    // check for both, lowercase + uppercase mac
-	    $mac_lowercase = strtolower($mac);
-	    $mac_uppercase = strtoupper($mac);
-	}
-	$db=openqrm_get_db_connection();
-	if ("$id" != "") {
-		$resource_array = $db->GetAll("select * from $RESOURCE_INFO_TABLE where resource_id=$id");
-	} else if ("$mac" != "") {
-		$resource_array = $db->GetAll("select * from $RESOURCE_INFO_TABLE where resource_mac='$mac_lowercase' or resource_mac='$mac_uppercase'");
-	} else if ("$ip" != "") {
-		$resource_array = $db->GetAll("select * from $RESOURCE_INFO_TABLE where resource_ip='$ip'");
-	} else {
-		$error = '';
-		foreach(debug_backtrace() as $key => $msg) {
-			if($key === 1) {
-				$error .= '( '.basename($msg['file']).' '.$msg['line'].' )';
-			}
-			syslog(LOG_ERR, $msg['function'].'() '.basename($msg['file']).':'.$msg['line']);
-		}
-		$event->log("get_instance", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", "Could not create instance of event without data ".$error, "", "", 0, 0, 0);
-	}
-	if(isset($resource_array)) {
-		foreach ($resource_array as $index => $resource) {
-			$this->id = $resource["resource_id"];
-			$this->localboot = $resource["resource_localboot"];
-			$this->kernel = $resource["resource_kernel"];
-			$this->kernelid = $resource["resource_kernelid"];
-			$this->image = $resource["resource_image"];
-			$this->imageid = $resource["resource_imageid"];
-			$this->openqrmserver = $resource["resource_openqrmserver"];
-			$this->basedir = $resource["resource_basedir"];
-			$this->applianceid = $resource["resource_applianceid"];
-			$this->ip = $resource["resource_ip"];
-			$this->subnet = $resource["resource_subnet"];
-			$this->broadcast = $resource["resource_broadcast"];
-			$this->network = $resource["resource_network"];
-			$this->mac = $resource["resource_mac"];
-			$this->nics = $resource["resource_nics"];
-			$this->uptime = $resource["resource_uptime"];
-			$this->cpunumber = $resource["resource_cpunumber"];
-			$this->cpuspeed = $resource["resource_cpuspeed"];
-			$this->cpumodel = $resource["resource_cpumodel"];
-			$this->memtotal = $resource["resource_memtotal"];
-			$this->memused = $resource["resource_memused"];
-			$this->swaptotal = $resource["resource_swaptotal"];
-			$this->swapused = $resource["resource_swapused"];
-			$this->hostname = $resource["resource_hostname"];
-			$this->vtype = $resource["resource_vtype"];
-			$this->vhostid = $resource["resource_vhostid"];
-			$this->vname = $resource["resource_vname"];
-			$this->vnc = $resource["resource_vnc"];
-			$this->load = $resource["resource_load"];
-			$this->execdport = $resource["resource_execdport"];
-			$this->senddelay = $resource["resource_senddelay"];
-			$this->capabilities = $resource["resource_capabilities"];
-			$this->lastgood = $resource["resource_lastgood"];
-			$this->state = $resource["resource_state"];
-			$this->event = $resource["resource_event"];
-		}
-		return $this;
-	}
-}
-
-// returns a resource from the db selected by id
-function get_instance_by_id($id) {
-	$this->get_instance($id, "", "");
-	return $this;
-}
-
-// returns a resource from the db selected by ip
-function get_instance_by_ip($ip) {
-	$this->get_instance("", "", $ip);
-	return $this;
-}
-
-// returns a resource from the db selected by mac
-function get_instance_by_mac($mac) {
-	$this->get_instance("", $mac, "");
-	return $this;
-}
-
-
-// returns a resource with just the id set by the resource_hostname
-function get_instance_id_by_hostname($resource_hostname) {
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	if ($resource_hostname != "") {
-		$resource_array = $db->GetAll("select * from ".$RESOURCE_INFO_TABLE." where resource_hostname='".$resource_hostname."'");
-	} else {
-		$event->log("get_instance_id_by_hostname", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", "Could not create instance of event without data", "", "", 0, 0, 0);
-		foreach(debug_backtrace() as $key => $msg) {
-			syslog(LOG_ERR, $msg['function'].'() '.basename($msg['file']).':'.$msg['line']);
-		}
-		return;
-	}
-	foreach ($resource_array as $index => $resource) {
-		$this->id = $resource["resource_id"];
-	}
-	return $this;
-}
-
-
-
-
-// ---------------------------------------------------------------------------------
-// getter + setter
-// ---------------------------------------------------------------------------------
-
-function get_id() {
-	return $this->id;
-}
-
-function set_id($id) {
-	$this->id = $id;
-}
-
-
-
-// ---------------------------------------------------------------------------------
-// general resource methods
-// ---------------------------------------------------------------------------------
-
-// checks if a resource exists in the database
-function exists($mac_address) {
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	// check for both, lowercase + uppercase mac
-	$mac_lowercase = strtolower($mac_address);
-	$mac_uppercase = strtoupper($mac_address);
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select resource_id from $RESOURCE_INFO_TABLE where resource_mac='$mac_lowercase' or resource_mac='$mac_uppercase'");
-	if (!$rs)
-		$event->log("exists", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	if ($rs->EOF) {
-		return false;
-	} else {
-		return true;
-	}
-}
-
-
-// checks if a resource exists in the database by name
-function exists_by_name($resource_hostname) {
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select resource_id from ".$RESOURCE_INFO_TABLE." where resource_hostname='".$resource_hostname."'");
-	if (!$rs)
-		$event->log("exists_by_name", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	if ($rs->EOF) {
-		return false;
-	} else {
-		return true;
-	}
-}
-
-
-// checks if given resource id is free in the db
-function is_id_free($resource_id) {
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select resource_id from $RESOURCE_INFO_TABLE where resource_id=$resource_id");
-	if (!$rs)
-		$event->log("exists", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	if ($rs->EOF) {
-		return true;
-	} else {
-		return false;
-	}
-}
-
-
-
-// adds resource to the database
-function add($resource_fields) {
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $OPENQRM_RESOURCE_BASE_DIR;
-	global $event;
-	global $RootDir;
-	$openqrm_server = new openqrm_server();
-	$OPENQRM_SERVER_IP_ADDRESS = $openqrm_server->get_ip_address();
-	if (!is_array($resource_fields)) {
-		$event->log("add", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", "Resource_field not well defined", "", "", 0, 0, 0);
-		return 1;
-	}
-	# set defaults
-	$resource_fields["resource_basedir"]=$OPENQRM_RESOURCE_BASE_DIR;
-	$resource_fields["resource_openqrmserver"]=$OPENQRM_SERVER_IP_ADDRESS;
-	$resource_fields["resource_execdport"]=$OPENQRM_EXEC_PORT;
-	$resource_fields["resource_kernel"]='default';
-	$resource_fields["resource_kernelid"]='1';
-	$resource_fields["resource_image"]='idle';
-	$resource_fields["resource_imageid"]='1';
-	$resource_fields["resource_senddelay"]=10;
-	$resource_fields["resource_lastgood"]=$_SERVER['REQUEST_TIME'];
-	// add mac address always in lowercase
-	$macl = strtolower($resource_fields["resource_mac"]);
-	$resource_fields["resource_mac"] = $macl;
-	if ($this->exists($resource_fields["resource_mac"])) {
-		$event->log("add", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", "Resource mac address ".$resource_fields["resource_mac"]." already existing! Not adding.", "", "", 0, 0, 0);
-		return 1;
-	}
-	$db=openqrm_get_db_connection();
-	$result = $db->AutoExecute($RESOURCE_INFO_TABLE, $resource_fields, 'INSERT');
-	if (! $result) {
-		$event->log("add", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", "Failed adding new resource to database", "", "", 0, 0, 0);
-	}
-	// new resource hook
-	$plugin = new plugin();
-	$enabled_plugins = $plugin->enabled();
-	foreach ($enabled_plugins as $index => $plugin_name) {
-		$plugin_new_resource_hook = "$RootDir/plugins/$plugin_name/openqrm-$plugin_name-resource-hook.php";
-		if (file_exists($plugin_new_resource_hook)) {
-			$event->log("add", $_SERVER['REQUEST_TIME'], 5, "resource.class.php", "Found plugin $plugin_name handling new-resource event.", "", "", 0, 0, $resource_fields["resource_id"]);
-			require_once "$plugin_new_resource_hook";
-			$resource_function="openqrm_"."$plugin_name"."_resource";
-			$resource_function=str_replace("-", "_", $resource_function);
-			$resource_function("add", $resource_fields);
-		}
-	}
-
-}
-
-// removes resource from the database
-function remove($resource_id, $resource_mac) {
-	global $OPENQRM_EXEC_PORT;
-	global $RESOURCE_INFO_TABLE;
-	global $RootDir;
-	global $event;
-	// never remove the openQRM server resource
-	if ($resource_id == 0) {
-		return;
-	}
-	// never remove an auto-select resource
-	if ($resource_id == -1) {
-		return;
-	}
-	$openqrm_server = new openqrm_server();
-	$OPENQRM_SERVER_IP_ADDRESS = $openqrm_server->get_ip_address();
-
-	// remove resource hook
-	$plugin = new plugin();
-	$enabled_plugins = $plugin->enabled();
-	foreach ($enabled_plugins as $index => $plugin_name) {
-		$plugin_new_resource_hook = "$RootDir/plugins/$plugin_name/openqrm-$plugin_name-resource-hook.php";
-		if (file_exists($plugin_new_resource_hook)) {
-			$event->log("remove", $_SERVER['REQUEST_TIME'], 5, "resource.class.php", "Found plugin $plugin_name handling remove-resource event.", "", "", 0, 0, $resource_id);
-			require_once "$plugin_new_resource_hook";
-			$resource_fields = array();
-			$resource_fields = $this->get_fields($resource_id);
-			// run remove hook
-			$resource_function="openqrm_"."$plugin_name"."_resource";
-			$resource_function=str_replace("-", "_", $resource_function);
-			$resource_function("remove", $resource_fields);
-		}
-	}
-
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("delete from $RESOURCE_INFO_TABLE where resource_id=$resource_id and resource_mac='$resource_mac'");
-}
-
-
-// assigns a kernel and fs-image to a resource
-function assign($resource_id, $resource_kernelid, $resource_kernel, $resource_imageid, $resource_image) {
-	global $RESOURCE_INFO_TABLE;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("update $RESOURCE_INFO_TABLE set
-		 resource_kernelid=$resource_kernelid,
-		 resource_kernel='$resource_kernel',
-		 resource_imageid=$resource_imageid,
-		 resource_image='$resource_image' where resource_id=$resource_id");
-}
-
-
-
-// set a resource to net- or local boot
-// resource_localboot = 0 -> netboot / 1 -> localboot
-function set_localboot($resource_id, $resource_localboot) {
-	global $RESOURCE_INFO_TABLE;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("update $RESOURCE_INFO_TABLE set resource_localboot=$resource_localboot where resource_id=$resource_id");
-}
-
-
-// displays resource parameter for resource_id
-function get_parameter($resource_id) {
-	global $RESOURCE_INFO_TABLE;
-	global $KERNEL_INFO_TABLE;
-	global $IMAGE_INFO_TABLE;
-	global $APPLIANCE_INFO_TABLE;
-	global $STORAGE_INFO_TABLE;
-	global $DEPLOYMENT_INFO_TABLE;
-	global $BootServiceDir;
-	global $event;
-	global $OPENQRM_EXECUTION_LAYER;
-	global $OPENQRM_WEB_PROTOCOL;
-	$db=openqrm_get_db_connection();
-	// resource parameter
-	if (!strlen($resource_id)) {
-		return;
-	}
-	$recordSet = $db->Execute("select * from $RESOURCE_INFO_TABLE where resource_id=$resource_id");
-	if (!$recordSet)
-		$event->log("get_parameter", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	while (!$recordSet->EOF) {
-		array_walk($recordSet->fields, 'print_array');
-		$image_id=$recordSet->fields["resource_imageid"];
-		$kernel_id=$recordSet->fields["resource_kernelid"];
-		$recordSet->MoveNext();
-	}
-	$recordSet->Close();
-	// kernel-parameter
-	$recordSet = $db->Execute("select * from $KERNEL_INFO_TABLE where kernel_id=$kernel_id");
-	if (!$recordSet)
-		$event->log("get_parameter", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	while (!$recordSet->EOF) {
-		array_walk($recordSet->fields, 'print_array');
-		$recordSet->MoveNext();
-	}
-	$recordSet->Close();
-	// image-parameter
-	$recordSet = $db->Execute("select * from $IMAGE_INFO_TABLE where image_id=$image_id");
-	if (!$recordSet)
-		$event->log("get_parameter", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	while (!$recordSet->EOF) {
-		array_walk($recordSet->fields, 'print_array');
-		$image_storageid=$recordSet->fields["image_storageid"];
-		$recordSet->MoveNext();
-	}
-	$recordSet->Close();
-	// image storage parameter
-	if (strlen($image_storageid)) {
-		$storage = new storage();
-		$storage->get_instance_by_id($image_storageid);
-		$storage_resource_id = $storage->resource_id;
-		$recordSet = $db->Execute("select resource_ip from $RESOURCE_INFO_TABLE where resource_id=$storage_resource_id");
-		if (!$recordSet)
-			$event->log("get_parameter", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		else
-		while (!$recordSet->EOF) {
-			//array_walk($recordSet->fields, 'print_array');
-			$image_storage_server_ip=$recordSet->fields['resource_ip'];
-			$recordSet->MoveNext();
-		}
-		$recordSet->Close();
-		echo "image_storage_server_ip=$image_storage_server_ip\n";
-	}
-	// appliance parameter
-	$appliance_virtualization = 0;
-	$recordSet = $db->Execute("select * from $APPLIANCE_INFO_TABLE where appliance_resources=$resource_id and appliance_stoptime='0'");
-	if (!$recordSet)
-		$event->log("get_parameter", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	while (!$recordSet->EOF) {
-		array_walk($recordSet->fields, 'print_array');
-		$appliance_virtualization = $recordSet->fields["appliance_virtualization"];
-		$recordSet->MoveNext();
-	}
-	$recordSet->Close();
-
-	// virtualization parameter
-	if ($appliance_virtualization > 0) {
-		$virtualization = new virtualization();
-		$virtualization->get_instance_by_id($appliance_virtualization);
-		echo "virtualization_type=\"$virtualization->type\"\n";
-		echo "virtualization_name=\"$virtualization->name\"\n";
-	}
-	// storage server parameter
-	if ($image_id<>1) {
-		$recordSet = $db->Execute("select * from $STORAGE_INFO_TABLE where storage_resource_id=$resource_id");
-		if (!$recordSet)
-			$event->log("get_parameter", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		else
-		while (!$recordSet->EOF) {
-			$storage_type = $recordSet->fields["storage_type"];
-			$recordSet1 = $db->Execute("select deployment_storagetype from $DEPLOYMENT_INFO_TABLE where deployment_id=$storage_type");
-			if (!$recordSet1)
-				$event->log("get_parameter", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-			else
-			while (!$recordSet1->EOF) {
-				$deployment_storagetype = $recordSet1->fields["deployment_storagetype"];
-				echo "deployment_storagetype=$deployment_storagetype\n";
-				$recordSet1->MoveNext();
-			}
-			$recordSet1->Close();
-			$recordSet->MoveNext();
-		}
-		$recordSet->Close();
-	}
-
-	$db->Close();
-
-	// command execution layer
-	echo "openqrm_execution_layer=\"$OPENQRM_EXECUTION_LAYER\"\n";
-	// openQRM server web protocol
-	echo "openqrm_web_protocol=\"$OPENQRM_WEB_PROTOCOL\"\n";
-
-	// plugin and bootservice list
-	$plugin_list = '';
-	$boot_service_list = '';
-	$plugin = new plugin();
-	$enabled_plugins = $plugin->enabled();
-	foreach ($enabled_plugins as $index => $plugin_name) {
-		$plugin_list = "$plugin_list$plugin_name ";
-		// add to list of boot-services only if boot-services for the resource exists
-		$plugin_boot_service = "$BootServiceDir/boot-service-$plugin_name.tgz";
-		if (file_exists($plugin_boot_service)) {
-			$boot_service_list = "$boot_service_list$plugin_name ";
-		}
-	}
-	echo "openqrm_plugins=\"$plugin_list\"\n";
-	echo "openqrm_boot_services=\"$boot_service_list\"\n";
-    // here the appliance resouce got active
-    // now we remove the iscsi password from the deployment parameters
-    // TODO: this is not reboot save !
-//    $image = new image();
-//    $image->get_instance_by_id($image_id);
-//    if (strstr($image->deployment_parameter, "IMAGE_ISCSI_AUTH")) {
-//        $image->set_deployment_parameters("IMAGE_ISCSI_AUTH", "");
-//        $event->log("get_parameter", $_SERVER['REQUEST_TIME'], 5, "resource.class.php", "Resource $resource_id gets active. Removing authentication token from image $image_id", "", "", 0, 0, $resource_id);
-//    }
-
-}
-
-function get_parameter_array($resource_id) {
-	global $RESOURCE_INFO_TABLE;
-	$db = openqrm_get_db_connection();
-	$resource_array = $db->GetAll("select * from $RESOURCE_INFO_TABLE where resource_id=$resource_id");
-	return $resource_array;
-}
-
-function get_list() {
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$resource_list = array();
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select resource_id, resource_ip, resource_state from $RESOURCE_INFO_TABLE ORDER BY resource_id ASC");
-	if (!$rs)
-		$event->log("get_list", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	while (!$rs->EOF) {
-		$resource_list[] = $rs->fields;
-		$rs->MoveNext();
-	}
-	return $resource_list;
-}
-
-
-
-function update_info($resource_id, $resource_fields) {
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	if (! is_array($resource_fields)) {
-		$event->log("update_info", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", "Unable to update resource $resource_id", "", "", 0, 0, 0);
-		return 1;
-	}
-	if (!strlen($resource_id)) {
-		return 1;
-	}
-	$db=openqrm_get_db_connection();
-	unset($resource_fields["resource_id"]);
-	if (isset($resource_fields["resource_mac"])) {
-	    // add mac address always in lowercase
-	    $macl = strtolower($resource_fields["resource_mac"]);
-	    $resource_fields["resource_mac"] = $macl;
-	}
-	$result = $db->AutoExecute($RESOURCE_INFO_TABLE, $resource_fields, 'UPDATE', "resource_id = $resource_id");
-	if (! $result) {
-		$event->log("update_info", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", "Failed updating resource $resource_id", "", "", 0, 0, 0);
-	}
-}
-
-function update_status($resource_id, $resource_state, $resource_event) {
-	global $RESOURCE_INFO_TABLE;
-	$db=openqrm_get_db_connection();
-	$query = "update $RESOURCE_INFO_TABLE set
-			resource_state='$resource_state',
-			resource_event='$resource_event'
-			where resource_id=$resource_id";
-	$rs = $db->Execute("$query");
-}
-
-
-
-// returns an array of resource fields by id
-function get_fields($which) {
-	$resource = new resource();
-	$resource->get_instance_by_id($which);
-	$resource_fields = array();
-	$resource_fields["resource_id"] = $resource->id;
-	$resource_fields["resource_localboot"] = $resource->localboot;
-	$resource_fields["resource_kernel"] = $resource->kernel;
-	$resource_fields["resource_kernelid"] = $resource->kernelid;
-	$resource_fields["resource_image"] = $resource->image;
-	$resource_fields["resource_imageid"] = $resource->imageid;
-	$resource_fields["resource_openqrmserver"] = $resource->openqrmserver;
-	$resource_fields["resource_basedir"] = $resource->basedir;
-	$resource_fields["resource_applianceid"] = $resource->applianceid;
-	$resource_fields["resource_ip"] = $resource->ip;
-	$resource_fields["resource_subnet"] = $resource->subnet;
-	$resource_fields["resource_broadcast"] = $resource->broadcast;
-	$resource_fields["resource_network"] = $resource->network;
-	$resource_fields["resource_mac"] = $resource->mac;
-	$resource_fields["resource_nics"] = $resource->nics;
-	$resource_fields["resource_uptime"] = $resource->uptime;
-	$resource_fields["resource_cpunumber"] = $resource->cpunumber;
-	$resource_fields["resource_cpuspeed"] = $resource->cpuspeed;
-	$resource_fields["resource_cpumodel"] = $resource->cpumodel;
-	$resource_fields["resource_memtotal"] = $resource->memtotal;
-	$resource_fields["resource_memused"] = $resource->memused;
-	$resource_fields["resource_swaptotal"] = $resource->swaptotal;
-	$resource_fields["resource_swapused"] = $resource->swapused;
-	$resource_fields["resource_hostname"] = $resource->hostname;
-	$resource_fields["resource_vtype"] = $resource->vtype;
-	$resource_fields["resource_vhostid"] = $resource->vhostid;
-	$resource_fields["resource_load"] = $resource->load;
-	$resource_fields["resource_execdport"] = $resource->execdport;
-	$resource_fields["resource_senddelay"] = $resource->senddelay;
-	$resource_fields["resource_capabilities"] = $resource->capabilities;
-	$resource_fields["resource_lastgood"] = $resource->lastgood;
-	$resource_fields["resource_state"] = $resource->state;
-	$resource_fields["resource_event"] = $resource->event;
-	return $resource_fields;
-}
-
-
-
-// function to send a command to a resource by resource_ip
-function send_command($resource_ip, $resource_command, $command_timeout = NULL) {
-	global $OPENQRM_EXEC_PORT;
-	global $OPENQRM_SERVER_BASE_DIR;
-	global $OPENQRM_EXECUTION_LAYER;
-	global $event;
-	global $RootDir;
-	// here we assume that we are the resource
-
-	// plugin hook in case a resource gets rebooted or halted
-	switch($resource_command) {
-		case 'reboot':
-			// start the hook
-			$plugin = new plugin();
-			$enabled_plugins = $plugin->enabled();
-			foreach ($enabled_plugins as $index => $plugin_name) {
-				$plugin_start_resource_hook = "$RootDir/plugins/$plugin_name/openqrm-$plugin_name-resource-hook.php";
-				if (file_exists($plugin_start_resource_hook)) {
-					$event->log("start", $_SERVER['REQUEST_TIME'], 5, "resource.class.php", "Found plugin $plugin_name handling start-resource event.", "", "", 0, 0, $this->id);
-					// prepare resource_fields array
-					$resource_fields = array();
-					$resource_fields = $this->get_fields($this->id);
-					// include the plugin function file and run it
-					require_once "$plugin_start_resource_hook";
-					$resource_function="openqrm_"."$plugin_name"."_resource";
-					$resource_function=str_replace("-", "_", $resource_function);
-					$resource_function("start", $resource_fields);
-				}
-			}
-			// here we check if the resource is virtual or a host and if
-			// the virtualization plugin wants to reboot it via the host
-			$virtualization = new virtualization();
-			$virtualization->get_instance_by_id($this->vtype);
-			$virtualization_plugin_name = $virtualization->get_plugin_name();
-			$plugin_resource_virtual_command_hook_vm_type = "$RootDir/plugins/$virtualization_plugin_name/openqrm-$virtualization_plugin_name-resource-virtual-command-hook.php";
-			// we also give the deployment type a chance to implement virtual commands
-			$deployment_plugin_name = '';
-			if ($this->imageid != 1) {
-				$image = new image();
-				$image->get_instance_by_id($this->imageid);
-				$storage = new storage();
-				$storage->get_instance_by_id($image->storageid);
-				$deployment = new deployment();
-				$deployment->get_instance_by_id($storage->type);
-				$deployment_plugin_name = $deployment->storagetype;
-			}
-			$plugin_resource_virtual_command_hook = '';
-			$plugin_resource_virtual_command_hook_image_type = "$RootDir/plugins/$deployment_plugin_name/openqrm-$deployment_plugin_name-resource-virtual-command-hook.php";
-	//            $plugin_resource_virtual_command_hook_image_type = "$RootDir/plugins/sanboot-storage/openqrm-sanboot-storage-resource-virtual-command-hook.php";
-			if (file_exists($plugin_resource_virtual_command_hook_vm_type)) {
-				$event->log("start", $_SERVER['REQUEST_TIME'], 5, "resource.class.php", "Found virtualization $virtualization_plugin_name managing virtual command.", "", "", 0, 0, $this->id);
-				$plugin_resource_virtual_command_hook = $plugin_resource_virtual_command_hook_vm_type;
-			} else if (file_exists($plugin_resource_virtual_command_hook_image_type)) {
-				// check if IMAGE_VIRTUAL_RESOURCE_COMMAND=true
-				$event->log("start", $_SERVER['REQUEST_TIME'], 5, "resource.class.php", "Found deploymetn $deployment_plugin_name managing virtual command.", "", "", 0, 0, $this->id);
-				$image = new image();
-				$image->get_instance_by_id($this->imageid);
-				$virtual_command_enabled = $image->get_deployment_parameter("IMAGE_VIRTUAL_RESOURCE_COMMAND");
-				if (!strcmp($virtual_command_enabled, "true")) {
-					$event->log("start", $_SERVER['REQUEST_TIME'], 5, "resource.class.php", "Found IMAGE_VIRTUAL_RESOURCE_COMMAND enabled, using virtual command.", "", "", 0, 0, $this->id);
-					$plugin_resource_virtual_command_hook = $plugin_resource_virtual_command_hook_image_type;
-					$virtualization_plugin_name=$deployment_plugin_name;
-				} else {
-					$event->log("start", $_SERVER['REQUEST_TIME'], 5, "resource.class.php", "Found IMAGE_VIRTUAL_RESOURCE_COMMAND disabled, using regular command.", "", "", 0, 0, $this->id);
-				}
-			}
-			if (strlen($plugin_resource_virtual_command_hook)) {
-				$event->log("start", $_SERVER['REQUEST_TIME'], 5, "resource.class.php", "Found plugin $virtualization_plugin_name virtually handling the reboot command.", "", "", 0, 0, $this->id);
-				// prepare resource_fields array
-				$resource_fields = array();
-				$resource_fields = $this->get_fields($this->id);
-				// include the plugin function file and run it
-				require_once "$plugin_resource_virtual_command_hook";
-				$resource_function="openqrm_"."$virtualization_plugin_name"."_resource_virtual_command";
-				$resource_function=str_replace("-", "_", $resource_function);
-				$resource_function("reboot", $resource_fields);
-				// the virtual reboot function can only be
-				// implemented by a single plugin depending on the
-				// resource type. So we return after that and
-				// do not try to reboot the resource via its ip
-				return;
-			}
-			break;
-
-		case 'halt':
-			// stop hook
-			$plugin = new plugin();
-			$enabled_plugins = $plugin->enabled();
-			foreach ($enabled_plugins as $index => $plugin_name) {
-				$plugin_start_resource_hook = "$RootDir/plugins/$plugin_name/openqrm-$plugin_name-resource-hook.php";
-				if (file_exists($plugin_start_resource_hook)) {
-					$event->log("stop", $_SERVER['REQUEST_TIME'], 5, "resource.class.php", "Found plugin $plugin_name handling start-resource event.", "", "", 0, 0, $this->id);
-					// prepare resource_fields array
-					$resource_fields = array();
-					$resource_fields = $this->get_fields($this->id);
-					// include the plugin function file and run it
-					require_once "$plugin_start_resource_hook";
-					$resource_function="openqrm_"."$plugin_name"."_resource";
-					$resource_function=str_replace("-", "_", $resource_function);
-					$resource_function("stop", $resource_fields);
-				}
-			}
-			// here we check if the resource is virtual or a host and if
-			// the virtualization plugin wants to reboot it via the host
-			$virtualization = new virtualization();
-			$virtualization->get_instance_by_id($this->vtype);
-			$virtualization_plugin_name = $virtualization->get_plugin_name();
-			$plugin_resource_virtual_command_hook_vm_type = "$RootDir/plugins/$virtualization_plugin_name/openqrm-$virtualization_plugin_name-resource-virtual-command-hook.php";
-			// we also give the deployment type a chance to implement virtual commands
-			$deployment_plugin_name = '';
-			if ($this->imageid != 1) {
-				$image = new image();
-				$image->get_instance_by_id($this->imageid);
-				$storage = new storage();
-				$storage->get_instance_by_id($image->storageid);
-				$deployment = new deployment();
-				$deployment->get_instance_by_id($storage->type);
-				$deployment_plugin_name = $deployment->storagetype;
-			}
-			$plugin_resource_virtual_command_hook = '';
-			$plugin_resource_virtual_command_hook_image_type = "$RootDir/plugins/$deployment_plugin_name/openqrm-$deployment_plugin_name-resource-virtual-command-hook.php";
-			if (file_exists($plugin_resource_virtual_command_hook_vm_type)) {
-				$event->log("stop", $_SERVER['REQUEST_TIME'], 5, "resource.class.php", "Found virtualization $virtualization_plugin_name managing virtual command.", "", "", 0, 0, $this->id);
-				$plugin_resource_virtual_command_hook = $plugin_resource_virtual_command_hook_vm_type;
-			} else if (file_exists($plugin_resource_virtual_command_hook_image_type)) {
-				// check if IMAGE_VIRTUAL_RESOURCE_COMMAND=true
-				$event->log("stop", $_SERVER['REQUEST_TIME'], 5, "resource.class.php", "Found deploymetn $deployment_plugin_name managing virtual command.", "", "", 0, 0, $this->id);
-				$image = new image();
-				$image->get_instance_by_id($this->imageid);
-				$virtual_command_enabled = $image->get_deployment_parameter("IMAGE_VIRTUAL_RESOURCE_COMMAND");
-				if (!strcmp($virtual_command_enabled, "true")) {
-					$event->log("stop", $_SERVER['REQUEST_TIME'], 5, "resource.class.php", "Found IMAGE_VIRTUAL_RESOURCE_COMMAND enabled, using virtual command.", "", "", 0, 0, $this->id);
-					$plugin_resource_virtual_command_hook = $plugin_resource_virtual_command_hook_image_type;
-					$virtualization_plugin_name=$deployment_plugin_name;
-				} else {
-					$event->log("stop", $_SERVER['REQUEST_TIME'], 5, "resource.class.php", "Found IMAGE_VIRTUAL_RESOURCE_COMMAND disabled, using regular command.", "", "", 0, 0, $this->id);
-				}
-			}
-			if (strlen($plugin_resource_virtual_command_hook)) {
-				$event->log("stop", $_SERVER['REQUEST_TIME'], 5, "resource.class.php", "Found plugin $virtualization_plugin_name virtually handling the reboot command.", "", "", 0, 0, $this->id);
-				// prepare resource_fields array
-				$resource_fields = array();
-				$resource_fields = $this->get_fields($this->id);
-				// include the plugin function file and run it
-				require_once "$plugin_resource_virtual_command_hook";
-				$resource_function="openqrm_"."$virtualization_plugin_name"."_resource_virtual_command";
-				$resource_function=str_replace("-", "_", $resource_function);
-				$resource_function("halt", $resource_fields);
-				// the virtual halt function can only be
-				// implemented by a single plugin depending on the
-				// resource type. So we return after that and
-				// do not try to halt the resource via its ip
-				return;
-			}
-			break;
-	}
-
-	// check which execution layer to use
-	switch($OPENQRM_EXECUTION_LAYER) {
-		case 'dropbear':
-			// generate a random token for the cmd
-			$cmd_token = md5(uniqid(rand(), true));
-			// custom timeout ?
-			if (!is_null($command_timeout)) {
-				$cmd_token .= ".".$command_timeout;
-			}
-			$final_resource_command = "$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-exec -i $resource_ip -t $cmd_token -c \"$resource_command\"";
-			//$event->log("start", $_SERVER['REQUEST_TIME'], 5, "resource.class.php", "Running : $final_resource_command", "", "", 0, 0, 0);
-			shell_exec($final_resource_command);
-			break;
-		case 'rabbitmq':
-			$event->log("send_command", $_SERVER['REQUEST_TIME'], 5, "resource.class.php", "Sending command to the rabbit queue $resource_ip", "", "", 0, 0, 0);
-			require_once "$RootDir/class/rabbit.class.php";
-			$rabbit = new rabbit();
-			$rabbit->queue($resource_ip, $resource_command);
-			break;
-	}
-}
-
-
-
-
-//--------------------------------------------------
-/**
-* set the capabilities of a resource
-* @access public
-* @param string $key
-* @param string $value
-*/
-//--------------------------------------------------
-function set_resource_capabilities($key, $value) {
-	$this->get_instance_by_id($this->id);
-	$resource_capabilites_parameter = $this->capabilities;
-	$key=trim($key);
-	if (strstr($resource_capabilites_parameter, $key)) {
-		// change
-		$cp1=trim($resource_capabilites_parameter);
-		$cp2 = strstr($cp1, $key);
-		$keystr="$key=\"";
-		$endmark="\"";
-		$cp3=str_replace($keystr, "", $cp2);
-		$endpos=strpos($cp3, $endmark);
-		$cp=substr($cp3, 0, $endpos);
-		$new_resource_capabilites_parameter = str_replace("$key=\"$cp\"", "$key=\"$value\"", $resource_capabilites_parameter);
-	} else {
-		// add
-		$new_resource_capabilites_parameter = "$resource_capabilites_parameter $key=\"$value\"";
-	}
-	$resource_fields=array();
-	$resource_fields["resource_capabilities"]="$new_resource_capabilites_parameter";
-	$this->update_info($this->id, $resource_fields);
-}
-
-
-
-//--------------------------------------------------
-/**
-* gets a deployment parameter of an image
-* @access public
-* @param string $key
-* @return string $value
-*/
-//--------------------------------------------------
-function get_resource_capabilities($key) {
-	$resource_capabilites_parameter = $this->capabilities;
-	$key=trim($key);
-	if (strstr($resource_capabilites_parameter, $key)) {
-		// change
-		$cp1=trim($resource_capabilites_parameter);
-		$cp2 = strstr($cp1, $key);
-		$keystr="$key=\"";
-		$endmark="\"";
-		$cp3=str_replace($keystr, "", $cp2);
-		$endpos=strpos($cp3, $endmark);
-		$cp=substr($cp3, 0, $endpos);
-		return $cp;
-	} else {
-		return "";
-	}
-}
-
-
-
-
-
-
-// returns the number of managed resource
-function get_count($which) {
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$count = 0;
-	$db=openqrm_get_db_connection();
-
-	$sql = "select count(resource_id) as num from $RESOURCE_INFO_TABLE where ";
-	switch($which) {
-		case 'all':
-			$sql .= " resource_id>=0";
-			break;
-		case 'online':
-			$sql .= " resource_state='active'";
-			break;
-		case 'offline':
-			$sql .= " resource_state!='active'";
-			break;
-		case 'idle':
-			$sql .= " resource_state!='active' and resource_imageid=1";
-			break;
-		case 'error':
-			$sql .= " resource_state='error'";
-			break;
-		case 'phys':
-			$sql .= " resource_id=resource_vhostid or resource_vtype=1";
-			break;
-	}
-	$rs = $db->Execute($sql);
-	if (!$rs) {
-		$event->log("get_count", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		$count = $rs->fields["num"];
-	}
-	return $count;
-}
-
-
-// generates a mac address
-function generate_mac() {
-	$CMD="(date; cat /proc/interrupts) | md5sum | sed -r 's/^(.{10}).*\$/\\1/; s/([0-9a-f]{2})/\\1:/g; s/:\$//;' | tr '[:lower:]:' '[:upper:]-' | sed -e 's/-/:/g'";
-	$GEN_MAC=exec($CMD);
-	$GEN_MAC="00:".$GEN_MAC;
-	$this->mac = strtolower($GEN_MAC);
-}
-
-
-
-// returns the next free vnc port number for a specific vm host
-function generate_vnc_port($host_id) {
-	global $RESOURCE_INFO_TABLE;
-	global $RootDir;
-	global $event;
-	
-	$db=openqrm_get_db_connection();
-	$recordSet = $db->Execute("select resource_vnc from ".$RESOURCE_INFO_TABLE." where resource_vnc != '' and resource_vhostid=".$host_id);
-	if (!$recordSet)
-		print $db->ErrorMsg();
-	else {
-		$ar_ids = array();
-		while ($arr = $recordSet->FetchRow()) {
-		foreach($arr as $val) {
-			$colon = strpos($val, ':');
-			if ($colon !== false) {
-				$vnc_info_arr = explode(":", $val);
-				$val = $vnc_info_arr[1];
-			}
-			$ar_ids[] = $val;
-			}
-		}
-		$i=1;
-		while($i > 0) {
-			if(in_array($i, $ar_ids) == false) {
-				return $i;
-				break;
-			}
-		 $i++;
-		}
-	}
-	$db->Close();
-
-
-}
-
-
-// check when resources last send their statistics
-// update state in case of timeout
-function check_all_states() {
-	global $RESOURCE_INFO_TABLE;
-	global $RESOURCE_TIME_OUT;
-	global $RootDir;
-	global $event;
-	$resource_list = array();
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select resource_id, resource_lastgood, resource_state from $RESOURCE_INFO_TABLE");
-	if (!$rs)
-		$event->log("check_all_states", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	while (!$rs->EOF) {
-		$resource_id=$rs->fields['resource_id'];
-		$resource_lastgood=$rs->fields['resource_lastgood'];
-		$resource_state=$rs->fields['resource_state'];
-		$check_time=$_SERVER['REQUEST_TIME'];
-		// get the HA-timeout per resource from the capabilites
-		$custom_resource_ha_timeout="";
-		$resource_hat = new resource();
-		$resource_hat->get_instance_by_id($resource_id);
-		$custom_resource_ha_timeout = $resource_hat->get_resource_capabilities("HAT");
-		if (strlen($custom_resource_ha_timeout)) {
-			$RESOURCE_TIME_OUT = $custom_resource_ha_timeout;
-		}
-
-		// resolve errors for all active resources
-		if (("$resource_state" == "active") && ($resource_id != 0)) {
-			if (($check_time - $resource_lastgood) < $RESOURCE_TIME_OUT) {
-				// resolve error event
-				$event->resolve_by_resource("check_all_states", $resource_id);
-			}
-		}
-
-		// check for statistics (errors) for all resources which are not offline
-		// exclude manual added resources from the check !
-		if (("$resource_state" != "off") && ("$resource_lastgood" != "-1")) {
-			if (($check_time - $resource_lastgood) > $RESOURCE_TIME_OUT) {
-				$resource_fields=array();
-				$resource_fields["resource_state"]="error";
-				$resource_error = new resource();
-				$resource_error->update_info($resource_id, $resource_fields);
-				// log error event
-				$event->log("check_all_states", $_SERVER['REQUEST_TIME'], 1, "resource.class.php", "Resource $resource_id is in error state", "", "", 0, 0, $resource_id);
-
-				// check for plugin which may want to handle the error event
-				$plugin = new plugin();
-				$enabled_plugins = $plugin->started();
-				foreach ($enabled_plugins as $index => $plugin_name) {
-					$plugin_ha_hook = "$RootDir/plugins/$plugin_name/openqrm-$plugin_name-ha-hook.php";
-					if (file_exists($plugin_ha_hook)) {
-						$event->log("check_all_states", $_SERVER['REQUEST_TIME'], 1, "resource.class.php", "Found $plugin_name handling the resource error.", "", "", 0, 0, $resource_id);
-						require_once "$plugin_ha_hook";
-						$ha_function="openqrm_"."$plugin_name"."_ha_hook";
-						$ha_function=str_replace("-", "_", $ha_function);
-						$ha_function($resource_id);
-					}
-				}
-			}
-		}
-
-		$rs->MoveNext();
-	}
-}
-
-
-
-
-// displays only idle resources
-function display_idle_overview($offset, $limit, $sort, $order) {
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	$recordSet = $db->SelectLimit("select * from $RESOURCE_INFO_TABLE where resource_state='active' and resource_imageid=1 order by $sort $order", $limit, $offset);
-	$resource_array = array();
-	if (!$recordSet) {
-		$event->log("display_overview", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		while (!$recordSet->EOF) {
-			array_push($resource_array, $recordSet->fields);
-			$recordSet->MoveNext();
-		}
-		$recordSet->Close();
-	}
-	return $resource_array;
-}
-
-
-
-// displays the resource-overview
-function display_overview($offset, $limit, $sort, $order) {
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	$recordSet = $db->SelectLimit("select * from $RESOURCE_INFO_TABLE order by $sort $order", $limit, $offset);
-	$resource_array = array();
-	if (!$recordSet) {
-		$event->log("display_overview", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		while (!$recordSet->EOF) {
-			array_push($resource_array, $recordSet->fields);
-			$recordSet->MoveNext();
-		}
-		$recordSet->Close();
-	}
-	return $resource_array;
-}
-
-//--------------------------------------------
-/**
- * find a resource by id, name or mac
- *
- * @access public
- * @param string $search
- * @return array
- */
-//--------------------------------------------
-function find_resource($search) {
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-
-	// replace glob wildcards with sql wildcards
-	$search = str_replace('_', '\_', $search);
-	$search = str_replace('%', '\%', $search);
-	$search = str_replace('?', '_', $search);
-	$search = str_replace('*', '%', $search);
-
-	$sql  = 'SELECT * FROM '.$RESOURCE_INFO_TABLE;
-	$sql .= ' WHERE resource_id LIKE ?';
-	$sql .= ' OR resource_hostname LIKE ?';
-	$sql .= ' OR resource_mac LIKE ?';
-
-	// handle sql injection
-	$sql = $db->db->Prepare($sql);
-
-	$recordSet = $db->db->Execute($sql, array($search,$search,$search));
-	$resource_array = array();
-	if (!$recordSet) {
-		$event->log("find_resource", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		while (!$recordSet->EOF) {
-			array_push($resource_array, $recordSet->fields);
-			$recordSet->MoveNext();
-		}
-		$recordSet->Close();
-	}
-	return $resource_array;
-}
-
-//--------------------------------------------
-/**
- * Get all resources assigned to a host
- *
- * @access public
- * @param string $hostid
- * @return array
- */
-//--------------------------------------------
-function get_resources_by_vhostid($hostid) {
-	global $RESOURCE_INFO_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-
-	$sql  = 'SELECT resource_id FROM '.$RESOURCE_INFO_TABLE;
-	$sql .= ' WHERE resource_vhostid=?';
-	$sql .= ' AND resource_id!=?';
-
-	// handle sql injection
-	$sql = $db->db->Prepare($sql);
-
-	$recordSet = $db->db->Execute($sql, array($hostid,$hostid));
-	$resource_array = array();
-	if (!$recordSet) {
-		$event->log("get_resource_by_vhostid", $_SERVER['REQUEST_TIME'], 2, "resource.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	} else {
-		while (!$recordSet->EOF) {
-			array_push($resource_array, $recordSet->fields);
-			$recordSet->MoveNext();
-		}
-		$recordSet->Close();
-	}
-	return $resource_array;
-}
-
-
-// ---------------------------------------------------------------------------------
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/storage.class.php b/openQRM-5.3.50-CE/src/web/base/class/storage.class.php
deleted file mode 100644
index 63a7cac..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/storage.class.php
+++ /dev/null
@@ -1,481 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/event.class.php";
-
-/**
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- * @author M. Rechenburg, A. Kuballa
- * @version 1.1 added documentation
- */
-class storage
-{
-
-/**
-* storage id
-* @access protected
-* @var int
-*/
-var $id = '';
-/**
-* storage name
-* @access protected
-* @var string
-*/
-var $name = '';
-/**
-* resource id used by storage
-* @access protected
-* @var int
-*/
-var $resource_id = '';
-/**
-* storage type
-* @access protected
-* @var string
-*/
-var $type = '';
-/**
-* state of storage
-* @access protected
-* @var string
-*/
-var $state = '';
-/**
-* comment for storage
-* @access protected
-* @var string
-*/
-var $comment = '';
-/**
-* storage capabilities
-* @access protected
-* @var string
-*/
-var $capabilities = '';
-
-/**
-* name of database table
-* @access protected
-* @var string
-*/
-var $_db_table;
-
-/**
-* event object
-* @access protected
-* @var object
-*/
-var $_event;
-
-
-	//--------------------------------------------------
-	/**
-	* Constructor
-	*/
-	//--------------------------------------------------
-	function storage() {
-		$this->init();
-	}
-
-	//--------------------------------------------------
-	/**
-	* init storage environment
-	* @access public
-	*/
-	//--------------------------------------------------
-	function init() {
-		global $STORAGE_INFO_TABLE;
-		$this->_db_table = $STORAGE_INFO_TABLE;
-		$this->_event = new event();
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an instance of a storage object from db
-	* @access public
-	* @param int $id
-	* @param string $name
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance($id, $name) {
-		$db=openqrm_get_db_connection();
-		if ("$id" != "") {
-			$storage_array = $db->Execute("select * from $this->_db_table where storage_id=$id");
-		} else if ("$name" != "") {
-			$storage_array = $db->Execute("select * from $this->_db_table where storage_name='$name'");
-		} else {
-			$error = '';
-			foreach(debug_backtrace() as $key => $msg) {
-				if($key === 1) {
-					$error .= '( '.basename($msg['file']).' '.$msg['line'].' )';
-				}
-				syslog(LOG_ERR, $msg['function'].'() '.basename($msg['file']).':'.$msg['line']);
-			}
-			$this->_event->log("get_instance", $_SERVER['REQUEST_TIME'], 2, "storage.class.php", "Could not create instance of storage without data ".$error, "", "", 0, 0, 0);
-			return;
-		}
-		foreach ($storage_array as $index => $storage) {
-			$this->id = $storage["storage_id"];
-			$this->name = $storage["storage_name"];
-			$this->resource_id = $storage["storage_resource_id"];
-			$this->type = $storage["storage_type"];
-			$this->state = $storage["storage_state"];
-			$this->comment = $storage["storage_comment"];
-			$this->capabilities = $storage["storage_capabilities"];
-		}
-		return $this;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an instance of a storage by id
-	* @access public
-	* @param int $id
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance_by_id($id) {
-		$this->get_instance($id, "");
-		return $this;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an instance of a storage by name
-	* @access public
-	* @param string $name
-	* @return object
-	*/
-	//--------------------------------------------------
-	function get_instance_by_name($name) {
-		$this->get_instance("", $name);
-		return $this;
-	}
-
-	//--------------------------------------------------
-	/**
-	* add a new storage
-	* @access public
-	* @param array $storage_fields
-	*/
-	//--------------------------------------------------
-	function add($storage_fields) {
-		if (!is_array($storage_fields)) {
-			$this->_event->log("add", $_SERVER['REQUEST_TIME'], 2, "storage.class.php", "Storage_field not well defined", "", "", 0, 0, 0);
-			return 1;
-		}
-		$db=openqrm_get_db_connection();
-		$result = $db->AutoExecute($this->_db_table, $storage_fields, 'INSERT');
-		if (! $result) {
-			$this->_event->log("add", $_SERVER['REQUEST_TIME'], 2, "storage.class.php", "Failed adding new storage to database", "", "", 0, 0, 0);
-		}
-	}
-
-	//--------------------------------------------------
-	/**
-	* update a storage
-	* <code>
-	* $fields = array();
-	* $fields['storage_name'] = 'somename';
-	* $fields['storage_type'] = 1;
-	* $fields['storage_capabilities'] = 'sometext';
-	* $fields['storage_comment'] = 'sometext';
-	* $fields['storage_resource_id'] = 1;
-	* $storage = new storage();
-	* $storage->update(1, $fields);
-	* </code>
-	* @access public
-	* @param int $storage_id
-	* @param array $storage_fields
-	* @return bool
-	*/
-	//--------------------------------------------------
-	function update($storage_id, $storage_fields) {
-		if ($storage_id < 0 || ! is_array($storage_fields)) {
-			$this->_event->log("update", $_SERVER['REQUEST_TIME'], 2, "storage.class.php", "Unable to update storage $storage_id", "", "", 0, 0, 0);
-		}
-		$db=openqrm_get_db_connection();
-		unset($storage_fields["storage_id"]);
-		$result = $db->AutoExecute($this->_db_table, $storage_fields, 'UPDATE', "storage_id = $storage_id");
-		if (! $result) {
-			$this->_event->log("update", $_SERVER['REQUEST_TIME'], 2, "storage.class.php", "Failed updating storage $storage_id", "", "", 0, 0, 0);
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-	//--------------------------------------------------
-	/**
-	* remove a storage by id
-	* @access public
-	* @param int $storage_id
-	*/
-	//--------------------------------------------------
-	function remove($storage_id) {
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from $this->_db_table where storage_id=$storage_id");
-	}
-
-	//--------------------------------------------------
-	/**
-	* remove a storage by name
-	* @access public
-	* @param string $storage_name
-	*/
-	//--------------------------------------------------
-	function remove_by_name($storage_name) {
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from $this->_db_table where storage_name='$storage_name'");
-	}
-
-	//--------------------------------------------------
-	/**
-	* get a storage name by id
-	* @access public
-	* @param int $storage_id
-	*/
-	//--------------------------------------------------
-	function get_name($storage_id) {
-		$db=openqrm_get_db_connection();
-		$storage_set = $db->Execute("select storage_name from $this->_db_table where storage_id=$storage_id");
-		if (!$storage_set) {
-			$this->_event->log("get_name", $_SERVER['REQUEST_TIME'], 2, "storage.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			if (!$storage_set->EOF) {
-				return $storage_set->fields["storage_name"];
-			} else {
-				return "idle";
-			}
-		}
-	}
-
-	//--------------------------------------------------
-	/**
-	* get capabilities string by storage_id
-	* @access public
-	* @param int $storage_id
-	* @return string
-	*/
-	//--------------------------------------------------
-	function get_capabilities($storage_id) {
-		$db=openqrm_get_db_connection();
-		$storage_set = $db->Execute("select storage_capabilities from $this->_db_table where storage_id=$storage_id");
-		if (!$storage_set) {
-			$this->_event->log("get_capabilities", $_SERVER['REQUEST_TIME'], 2, "storage.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			if ((!$storage_set->EOF) && ($storage_set->fields["storage_capabilities"]!=""))  {
-				return $storage_set->fields["storage_capabilities"];
-			} else {
-				return "0";
-			}
-		}
-	}
-
-	//--------------------------------------------------
-	/**
-	* get number of storages
-	* @access public
-	* @return int
-	*/
-	//--------------------------------------------------
-	function get_count() {
-		$count=0;
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("select count(storage_id) as num from $this->_db_table");
-		if (!$rs) {
-			$this->_event->log("get_count", $_SERVER['REQUEST_TIME'], 2, "storage.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			$count = $rs->fields["num"];
-		}
-		return $count;
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* get number of storages by type
-	* @access public
-	* @return int
-	*/
-	//--------------------------------------------------
-	function get_count_per_type($deployment_type) {
-		$count=0;
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("select count(storage_id) as num from $this->_db_table where storage_type = $deployment_type");
-		if (!$rs) {
-			$this->_event->log("get_count_per_type", $_SERVER['REQUEST_TIME'], 2, "storage.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			$count = $rs->fields["num"];
-		}
-		return $count;
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of all storage names
-	* <code>
-	* $storage = new storage();
-	* $arr = $storage->get_list();
-	* // $arr[0]['value']
-	* // $arr[0]['label']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_list() {
-		$query = "select storage_id, storage_name from $this->_db_table";
-		$storage_name_array = array();
-		$storage_name_array = openqrm_db_get_result_double ($query);
-		return $storage_name_array;
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of all storage ids of a certain type
-	* <code>
-	* $storage = new storage();
-	* $arr = $storage->get_ids_by_storage_type($storage_type);
-	* // $arr[0]['value']
-	* // $arr[0]['label']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_ids_by_storage_type($storage_type) {
-		$storage_array = array();
-		$query = "select storage_id from $this->_db_table where storage_type=$storage_type";
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute($query);
-		if (!$rs)
-			$this->_event->log("get_ids_by_storage_type", $_SERVER['REQUEST_TIME'], 2, "storage.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		else
-		while (!$rs->EOF) {
-			$storage_array[] = $rs->fields;
-			$rs->MoveNext();
-		}
-		return $storage_array;
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of all storage types
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_storage_types() {
-		$ar_Return = array();
-		$db=openqrm_get_db_connection();
-		$ar_tmp = $db->Execute("select storage_type, storage_name from $this->_db_table");
-		foreach($ar_tmp as $val) {
-			$ar_Return[] = $val['storage_type'];
-		}
-		return array_unique($ar_Return);
-	}
-	
-	//--------------------------------------------------
-	/**
-	* get an array of all storage types with all record values
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get_full_storage_list() {
-		$storageList = array();
-		$db=openqrm_get_db_connection();
-		$result = $db->Execute("SELECT * FROM $this->_db_table");
-		foreach($result as $storageServer) {
-			$storageList[] = $storageServer;
-		}
-		return $storageList;
-	}
-
-	//--------------------------------------------------
-	/**
-	* get an array of storages by type
-	* @access public
-	* @param int $offset
-	* @param int $limit
-	* @param string $sort
-	* @param enum $order [ASC/DESC]
-	* @return array
-	*/
-	//--------------------------------------------------
-	function display_overview_per_type($deployment_type, $offset, $limit, $sort, $order) {
-		$db=openqrm_get_db_connection();
-		$recordSet = $db->SelectLimit("select * from $this->_db_table where storage_type = $deployment_type order by $sort $order", $limit, $offset);
-		$storage_array = array();
-		if (!$recordSet) {
-			$this->_event->log("display_overview_per_type", $_SERVER['REQUEST_TIME'], 2, "storage.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			while (!$recordSet->EOF) {
-				array_push($storage_array, $recordSet->fields);
-				$recordSet->MoveNext();
-			}
-			$recordSet->Close();
-		}
-		return $storage_array;
-	}
-
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of storages
-	* @access public
-	* @param int $offset
-	* @param int $limit
-	* @param string $sort
-	* @param enum $order [ASC/DESC]
-	* @return array
-	*/
-	//--------------------------------------------------
-	function display_overview($offset, $limit, $sort, $order) {
-		$db=openqrm_get_db_connection();
-		$recordSet = $db->SelectLimit("select * from $this->_db_table order by $sort $order", $limit, $offset);
-		$storage_array = array();
-		if (!$recordSet) {
-			$this->_event->log("display_overview", $_SERVER['REQUEST_TIME'], 2, "storage.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			while (!$recordSet->EOF) {
-				array_push($storage_array, $recordSet->fields);
-				$recordSet->MoveNext();
-			}
-			$recordSet->Close();
-		}
-		return $storage_array;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/user.class.php b/openQRM-5.3.50-CE/src/web/base/class/user.class.php
deleted file mode 100644
index ae38379..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/user.class.php
+++ /dev/null
@@ -1,616 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-
-
-class user
-{
-/**
-* Id
-* @access public
-* @var int
-*/
-var $id;
-/**
-* Nickname
-* @access public
-* @var string
-*/
-var $name = '';
-/**
-* Password
-* @access public
-* @var string
-*/
-var $password = '';
-/**
-* Gender
-* @access public
-* @var string
-*/
-var $gender = '';
-/**
-* Firstname
-* @access public
-* @var string
-*/
-var $first_name = '';
-/**
-* Lastname
-* @access public
-* @var string
-*/
-var $last_name = '';
-/**
-* Department
-* @access public
-* @var string
-*/
-var $department = '';
-/**
-* Office
-* @access public
-* @var string
-*/
-var $office = '';
-/**
-* Role (Group)
-* @access public
-* @var string
-*/
-var $role = '';
-/**
- *
-* Lang (language)
-* @access public
-* @var string
-*/
-var $lang = '';
-/**
-* Last update
-* @access public
-* @var string
-*/
-var $last_update_time = '';
-/**
-* Description
-* @access public
-* @var string
-*/
-var $description = '';
-/**
-* Capabilities
-* @access public
-* @var string
-*/
-var $capabilities = '';
-/**
-* wizard_name
-* @access public
-* @var string
-*/
-var $wizard_name = '';
-/**
-* wizard_step
-* @access public
-* @var string
-*/
-var $wizard_step = '';
-/**
-* wizard_id
-* @access public
-* @var string
-*/
-var $wizard_id = '';
-/**
-* State
-* @access public
-* @var string
-*/
-var $state = '';
-
-/**
-* Internal use only
-* @access private
-* @var string
-*/
-var $_user_table = '';
-/**
-* Internal use only
-* @access private
-* @var string
-*/
-var $_role_table = '';
-
-
-	//-----------------------------------------------------------------------------------
-	function user($name) {
-		global $USER_INFO_TABLE;
-		$this->name = $name;
-		$this->get_instance_by_name($name);
-		$this->_role_table = 'role_info';
-		$this->_user_table = $USER_INFO_TABLE;
-	}
-
-
-
-
-	// returns a user from the db selected by id, mac or ip
-	function get_instance($id, $name) {
-		global $USER_INFO_TABLE;
-		$event = new event();
-		$db=openqrm_get_db_connection();
-		if ($id != "") {
-			$user_array = $db->GetAll("select * from ".$this->_user_table." where user_id=$id");
-		} else if ($name != "") {
-			$user_array = $db->GetAll("select * from ".$USER_INFO_TABLE." where user_name='$name'");
-		} else {
-			$event->log("get_instance", $_SERVER['REQUEST_TIME'], 2, "user.class.php", "Could not create instance of user without data", "", "", 0, 0, 0);
-			array_walk(debug_backtrace(),create_function('$a,$b','syslog(LOG_ERR, "{$a[\'function\']}()(".basename($a[\'file\']).":{$a[\'line\']}); ");'));
-			return;
-		}
-		foreach ($user_array as $index => $user) {
-			$this->id = $user["user_id"];
-			$this->name = $user["user_name"];
-			$this->password = $user["user_password"];
-			$this->gender = $user["user_gender"];
-			$this->first_name = $user["user_first_name"];
-			$this->last_name = $user["user_last_name"];
-			$this->department = $user["user_department"];
-			$this->office = $user["user_office"];
-			$this->role = $user["user_role"];
-			$this->lang = $user["user_lang"];
-			$this->last_update_time = $user["user_last_update_time"];
-			$this->description = $user["user_description"];
-			$this->capabilities = $user["user_capabilities"];
-			$this->wizard_name = $user["user_wizard_name"];
-			$this->wizard_step = $user["user_wizard_step"];
-			$this->wizard_id = $user["user_wizard_id"];
-			$this->state = $user["user_state"];
-		}
-		return $this;
-	}
-
-	// returns a user from the db selected by id
-	function get_instance_by_id($id) {
-		$this->get_instance($id, "");
-		return $this;
-	}
-
-
-	// returns a user from the db selected by id
-	function get_instance_by_name($name) {
-		$this->get_instance("", $name);
-		return $this;
-	}
-
-
-
-	// for the ldap integration
-
-	// adds user just to the database
-	function add($user_fields) {
-		global $event;
-		if (!is_array($user_fields)) {
-			$event->log("add", $_SERVER['REQUEST_TIME'], 2, "user.class.php", "user_fields not well defined", "", "", 0, 0, 0);
-			return 1;
-		}
-		$db=openqrm_get_db_connection();
-		$result = $db->AutoExecute($this->_user_table, $user_fields, 'INSERT');
-		if (! $result) {
-			$event->log("add", $_SERVER['REQUEST_TIME'], 2, "user.class.php", "Failed adding new user to database", "", "", 0, 0, 0);
-		}
-	}
-
-	function get_name_list() {
-		$user_array = array();
-		$query = "select user_name from $this->_user_table";
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute($query);
-		if (!$rs)
-			$event->log("get_name_list", $_SERVER['REQUEST_TIME'], 2, "user.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		else
-		while (!$rs->EOF) {
-			$user_array[] = $rs->fields;
-			$rs->MoveNext();
-		}
-		return $user_array;
-	}
-
-	function remove_by_name($user_name) {
-		// remove from db
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("delete from $this->_user_table where user_name='$user_name'");
-		return $rs;
-	}
-
-	// end of ldap integration
-
-
-	//--------------------------------------------
-	/**
-	 * Find out user is admin
-	 *
-	 * @access public
-	 * @return bool
-	 */
-	//--------------------------------------------
-	function isAdmin() {
-		if(strtolower($this->role) === 'administrator' || $this->role === 0) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-
-	//-----------------------------------------------------------------------------------
-	function set_user_form() {
-
-		$query = $this->query_select();
-		$result = openqrm_db_get_result($query);
-
-		$this->name 			= array('value'=>$this->name, 'label'=>'Login');
-		$this->id 				= $result[0][0];
-		$this->gender 			= $result[0][1];
-		$this->first_name 		= $result[0][2];
-		$this->last_name 		= $result[0][3];
-		$this->description 		= $result[0][4];
-		$this->department 		= $result[0][5];
-		$this->office 			= $result[0][6];
-		$this->capabilities		= $result[0][7];
-		$this->state 			= $result[0][8];
-		$this->role 			= $result[0][9];
-		$this->last_update_time	= $result[0][10];
-		$this->password	= array('value'=>'', 'label'=>$result[0][11]['label']);
-	}
-	//-----------------------------------------------------------------------------------
-	function set_user() {
-
-		$query = $this->query_select();
-		$result = openqrm_db_get_result($query);
-
-		$this->id 				= $result[0][0]['value'];
-		$this->gender 			= $result[0][1]['value'];
-		$this->first_name 		= $result[0][2]['value'];
-		$this->last_name 		= $result[0][3]['value'];
-		$this->description 		= $result[0][4]['value'];
-		$this->department 		= $result[0][5]['value'];
-		$this->office 			= $result[0][6]['value'];
-		$this->capabilities		= $result[0][7]['value'];
-		$this->state 			= $result[0][8]['value'];
-		$this->role 			= $result[0][9]['value'];
-		$this->last_update_time	= $result[0][10]['value'];
-		$this->password			= $result[0][11]['value'];
-
-		$this->get_role_name();
-		$this->role = $this->role['label'];
-	}
-	//-----------------------------------------------------------------------------------
-	function set_user_from_request() {
-
-		$this->id	 			= $this->http_request('id');
-		$this->password 		= $this->http_request('password');
-		$this->gender 			= $this->http_request('gender');
-		$this->first_name 		= $this->http_request('first_name');
-		$this->last_name 		= $this->http_request('last_name');
-		$this->department 		= $this->http_request('department');
-		$this->office 			= $this->http_request('office');
-		$this->role 			= $this->http_request('role');
-		$this->last_update_time = $this->http_request('last_update_time');
-		$this->description 		= $this->http_request('description');
-		$this->capabilities 	= $this->http_request('capabilities');
-		$this->state 			= $this->http_request('state');
-
-	}
-	//-----------------------------------------------------------------------------------
-	function query_select(){
-		$query = "
-			SELECT
-				user_id,
-				user_gender,
-				user_first_name,
-				user_last_name,
-				user_description,
-				user_department,
-				user_office,
-				user_capabilities,
-				user_state,
-				user_role,
-				user_last_update_time,
-				user_password
-				user_lang
-			FROM $this->_user_table
-			WHERE user_name = '$this->name'
-		";
-		return $query;
-	}
-	//-----------------------------------------------------------------------------------
-	function query_insert(){
-		global $USER_INFO_TABLE;
-		$this->id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-		$query = "
-			INSERT INTO
-				$USER_INFO_TABLE (
-					user_id,
-					user_name,
-					user_password,
-					user_gender,
-					user_first_name,
-					user_last_name,
-					user_department,
-					user_office,
-					user_role,
-					user_last_update_time,
-					user_description,
-					user_capabilities,
-					user_state,
-					user_lang
-				)
-			VALUES (
-					'$this->id',
-					'$this->name',
-					'$this->password',
-					'$this->gender',
-					'$this->first_name',
-					'$this->last_name',
-					'$this->department',
-					'$this->office',
-					'$this->role',
-					'$this->last_update_time',
-					'$this->description',
-					'$this->capabilities',
-					'$this->state.',
-					'$this->lang.'
-				)
-		";
-
-		$this->change_htpasswd('insert');
-		return openqrm_db_get_result($query);
-	}
-	//-----------------------------------------------------------------------------------
-	function query_update(){
-		global $USER_INFO_TABLE;
-		$user_fields = array();
-		if($this->password != '') {
-			$user_fields['user_password']=$this->password;
-			$this->change_htpasswd('update');
-		}
-		$user_fields['user_gender']=$this->gender;
-		$user_fields['user_first_name']=$this->first_name;
-		$user_fields['user_last_name']=$this->last_name;
-		$user_fields['user_department']=$this->department;
-		$user_fields['user_office']=$this->office;
-		$user_fields['user_role']=$this->role;
-		$user_fields['user_last_update_time']=$this->last_update_time;
-		$user_fields['user_description']=$this->description;
-		$user_fields['user_capabilities']=$this->capabilities;
-		$user_fields['user_state']=$this->state;
-		$user_fields['user_lang']=$this->lang;
-		$db=openqrm_get_db_connection();
-		$result = $db->AutoExecute($USER_INFO_TABLE, $user_fields, 'UPDATE', "user_name = '$this->name'");
-		if (! $result) {
-			$event->log("query_update", $_SERVER['REQUEST_TIME'], 2, "user.class.php", "Failed updating user", "", "", 0, 0, 0);
-		}
-	}
-	//-----------------------------------------------------------------------------------
-	function query_delete(){
-		$query = "
-			DELETE FROM $this->_user_table
-			WHERE user_name = '".$this->name."'
-		";
-		$this->change_htpasswd('delete');
-		return openqrm_db_get_result($query);
-	}
-	//-----------------------------------------------------------------------------------
-	function check_user_exists() {
-		$query = "
-			SELECT user_name
-			FROM $this->_user_table
-			WHERE user_name = '".$this->name."'
-		";
-		$result = openqrm_db_get_result_single($query);
-
-		if($result['value'] != '') { return true; }
-		else { return false; }
-
-	}
-	//-----------------------------------------------------------------------------------
-	function get_gender_list() {
-		$ar_Return = array();
-		$ar_Return[] = array("value"=>'', "label"=>'',);
-		$ar_Return[] = array("value"=>'f', "label"=>'female',);
-		$ar_Return[] = array("value"=>'m', "label"=>'male',);
-		return $ar_Return;
-	}
-	//-----------------------------------------------------------------------------------
-	function get_role_name() {
-		$query = "
-			SELECT user_role, role_name
-			FROM $this->_user_table, $this->_role_table
-			WHERE user_name = '".$this->name."'
-				AND user_role = role_id
-		";
-		$result = openqrm_db_get_result_double($query);
-		$this->role = $result[0];
-	}
-	//-----------------------------------------------------------------------------------
-	function get_role_list() {
-		$query = "
-			SELECT role_id, role_name
-			FROM $this->_role_table
-		";
-		$result = openqrm_db_get_result_double($query);
-		return $result;
-	}
-	//-----------------------------------------------------------------------------------
-	function check_string_name($name) {
-
-		if (!preg_match('#^[A-Za-z0-9]*$#', $name)) {
-			return '[A-Za-z0-9]';
-		} else {
-			return '';
-		}
-	}
-	//-----------------------------------------------------------------------------------
-	function check_string_password($pass) {
-		if (!preg_match('#^[A-Za-z0-9]*$#', $pass)) {
-			return '[A-Za-z0-9_-]';
-		} else {
-			return '';
-		}
-	}
-	//-----------------------------------------------------------------------------------
-	/**
-	* Change htpassswd
-	* @access private
-	* @param $mode [update, delete, insert]
-	*/
-	function change_htpasswd($mode = 'update') {
-	global $RootDir;
-
-		$ar_values = array();
-
-		$handle = fopen ($RootDir.'/.htpasswd', "r");
-		while (!feof($handle)) {
-			$tmp = explode(':', fgets($handle, 4096));
-			if($tmp[0] != '') {
-				$ar_values[$tmp[0]] = $tmp[1];
-			}
-		}
-		fclose ($handle);
-
-		$handle = fopen ($RootDir.'/.htpasswd', "w+");
-
-		if($mode == 'insert') {
-			foreach($ar_values as $key => $value) {
-				fputs($handle, "$key:$value");
-			}
-			fputs($handle, $this->name.':'.crypt($this->password)."\n");
-		}
-		if($mode == 'update') {
-			foreach($ar_values as $key => $value) {
-				if($key == $this->name) {
-					fputs($handle, $this->name.':'.crypt($this->password)."\n");
-				} else {
-					fputs($handle, "$key:$value");
-				}
-			}
-		}
-		if($mode == 'delete') {
-			foreach($ar_values as $key => $value) {
-				if($key != $this->name) {
-					fputs($handle, "$key:$value");
-				}
-			}
-		}
-		fclose ($handle);
-	}
-	//-----------------------------------------------------------------------------------
-	function get_users() {
-		$query = '
-			SELECT
-				user_name,
-				user_id,
-				user_first_name,
-				user_last_name,
-				role_name
-			FROM '.$this->_user_table.', '.$this->_role_table.'
-			WHERE user_role = role_id
-			ORDER BY user_name
-		';
-		$ar_db = openqrm_db_get_result($query);
-		$ar_headline = array();
-		$ar_headline[] = array('Login', 'ID', 'First Name', 'Last Name', 'Role');
-		$result = array_merge($ar_headline, $ar_db);
-
-		return $result;
-	}
-	//-----------------------------------------------------------------------------------
-	function http_request($arg)
-	{
-		global $_REQUEST;
-		if (isset($_REQUEST[$arg]))
-			return $_REQUEST[$arg];
-		else
-			return '';
-	}
-
-
-
-	// set users lang
-	function set_user_language($name, $lang) {
-		$db=openqrm_get_db_connection();
-		$sql = "update ".$this->_user_table." set user_lang='".$lang."' where user_name='".$name."'";
-		$rs = $db->Execute($sql);
-	}
-
-
-	// set wizard fields
-	function set_wizard($username, $wizardname, $step, $id) {
-		$db=openqrm_get_db_connection();
-		$sql = "update ".$this->_user_table." set user_wizard_name='".$wizardname."',  user_wizard_step=".$step.",user_wizard_id=".$id." where user_name='".$username."'";
-		$rs = $db->Execute($sql);
-		return $rs;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Translate
-	 *
-	 * @access public
-	 * @param array $text_array array to translate
-	 * @param string $dir dir of translation files
-	 * @param string $file translation file
-	 * @return array
-	 */
-	//--------------------------------------------
-	function translate( $text_array, $dir, $file ) {
-		$user_language = $this->lang;
-		$path = $dir.'/'.$user_language.'.'.$file;
-		if(file_exists($path)) {
-			$tmp = parse_ini_file( $path, true );
-			foreach($tmp as $k => $v) {
-				if(is_array($v)) {
-					foreach($v as $k2 => $v2) {
-						$text_array[$k][$k2] = $v2;
-					}
-				} else {
-					$text_array[$k] = $v;
-				}
-			}
-		}
-		// use en file as first fallback
-		else if(file_exists($dir.'/en.'.$file)) {
-			$tmp = parse_ini_file( $dir.'/en.'.$file, true );
-			foreach($tmp as $k => $v) {
-				if(is_array($v)) {
-					foreach($v as $k2 => $v2) {
-						$text_array[$k][$k2] = $v2;
-					}
-				} else {
-					$text_array[$k] = $v;
-				}
-			}
-		}
-		return $text_array;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/class/virtualization.class.php b/openQRM-5.3.50-CE/src/web/base/class/virtualization.class.php
deleted file mode 100644
index e7081e8..0000000
--- a/openQRM-5.3.50-CE/src/web/base/class/virtualization.class.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-
-// This class represents a virtualization type
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/class/event.class.php";
-
-global $VIRTUALIZATION_INFO_TABLE;
-$event = new event();
-global $event;
-
-class virtualization {
-
-var $id = '';
-var $name = '';
-var $type = '';
-var $mapping = '';
-
-
-
-// ---------------------------------------------------------------------------------
-// methods to create an instance of an virtualization object filled from the db
-// ---------------------------------------------------------------------------------
-
-// returns an virtualization from the db selected by id, type or name
-function get_instance($id, $name, $type) {
-	global $VIRTUALIZATION_INFO_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	if ("$id" != "") {
-		$virtualization_array = $db->Execute("select * from $VIRTUALIZATION_INFO_TABLE where virtualization_id=$id");
-	} else if ("$name" != "") {
-		$virtualization_array = $db->Execute("select * from $VIRTUALIZATION_INFO_TABLE where virtualization_name='$name'");
-	} else if ("$type" != "") {
-		$virtualization_array = $db->Execute("select * from $VIRTUALIZATION_INFO_TABLE where virtualization_type='$type'");
-	} else {
-		$error = '';
-		foreach(debug_backtrace() as $key => $msg) {
-			if($key === 1) {
-				$error .= '( '.basename($msg['file']).' '.$msg['line'].' )';
-			}
-			syslog(LOG_ERR, $msg['function'].'() '.basename($msg['file']).':'.$msg['line']);
-		}
-		$event->log("get_instance", $_SERVER['REQUEST_TIME'], 2, "virtualization.class.php", "Could not create instance of virtualization without data - <br>".$error, "", "", 0, 0, 0);
-		return;
-	}
-	foreach ($virtualization_array as $index => $virtualization) {
-		$this->id = $virtualization["virtualization_id"];
-		$this->name = $virtualization["virtualization_name"];
-		$this->type = $virtualization["virtualization_type"];
-		$this->mapping = $virtualization["virtualization_mapping"];
-	}
-	return $this;
-}
-
-// returns an virtualization from the db selected by id
-function get_instance_by_id($id) {
-	$this->get_instance($id, "", "");
-	return $this;
-}
-
-// returns an virtualization from the db selected by name
-function get_instance_by_name($name) {
-	$this->get_instance("", $name, "");
-	return $this;
-}
-
-// returns an virtualization from the db selected by type
-function get_instance_by_type($type) {
-	$this->get_instance("", "", $type);
-	return $this;
-}
-
-// ---------------------------------------------------------------------------------
-// general virtualization methods
-// ---------------------------------------------------------------------------------
-
-
-// checks if given virtualization id is free in the db
-function is_id_free($virtualization_id) {
-	global $VIRTUALIZATION_INFO_TABLE;
-	global $event;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("select virtualization_id from $VIRTUALIZATION_INFO_TABLE where virtualization_id=$virtualization_id");
-	if (!$rs)
-		$event->log("is_id_free", $_SERVER['REQUEST_TIME'], 2, "virtualization.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-	else
-	if ($rs->EOF) {
-		return true;
-	} else {
-		return false;
-	}
-}
-
-
-// adds virtualization to the database
-function add($virtualization_fields) {
-	global $VIRTUALIZATION_INFO_TABLE;
-	global $event;
-	if (!is_array($virtualization_fields)) {
-		$event->log("add", $_SERVER['REQUEST_TIME'], 2, "virtualization.class.php", "Deployment_field not well defined", "", "", 0, 0, 0);
-		return 1;
-	}
-	$db=openqrm_get_db_connection();
-	$result = $db->AutoExecute($VIRTUALIZATION_INFO_TABLE, $virtualization_fields, 'INSERT');
-	if (! $result) {
-		$event->log("add", $_SERVER['REQUEST_TIME'], 2, "virtualization.class.php", "Failed adding new virtualization to database", "", "", 0, 0, 0);
-	}
-}
-
-
-// removes virtualization from the database
-function remove($virtualization_id) {
-	global $VIRTUALIZATION_INFO_TABLE;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("delete from $VIRTUALIZATION_INFO_TABLE where virtualization_id=$virtualization_id");
-}
-
-// removes virtualization from the database by virtualization_type
-function remove_by_type($type) {
-	global $VIRTUALIZATION_INFO_TABLE;
-	$db=openqrm_get_db_connection();
-	$rs = $db->Execute("delete from $VIRTUALIZATION_INFO_TABLE where virtualization_type='$type'");
-}
-
-
-
-// returns a list of all virtualization names
-function get_list() {
-	global $VIRTUALIZATION_INFO_TABLE;
-	$query = "select virtualization_id, virtualization_name from $VIRTUALIZATION_INFO_TABLE";
-	$virtualization_name_array = array();
-	$virtualization_name_array = openqrm_db_get_result_double ($query);
-	return $virtualization_name_array;
-}
-
-
-// returns the virtualization plugin name
-function get_plugin_name() {
-	$virtualization_plugin_name = str_replace("-vm-local", "", $this->type);
-	$virtualization_plugin_name = str_replace("-vm-net", "", $virtualization_plugin_name);
-	$virtualization_plugin_name = str_replace("-vm", "", $virtualization_plugin_name);
-	return $virtualization_plugin_name;
-}
-
-
-
-// ---------------------------------------------------------------------------------
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/web/base/cli.php b/openQRM-5.3.50-CE/src/web/base/cli.php
deleted file mode 100644
index d082ba2..0000000
--- a/openQRM-5.3.50-CE/src/web/base/cli.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-$_SERVER["DOCUMENT_ROOT"] = '/var/www/';
-$_SERVER['PHP_AUTH_USER'] = 'openqrm';
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once($RootDir.'/class/openqrm.controller.class.php');
-if (!file_exists('unconfigured')) {
-	require_once($RootDir.'/include/user.inc.php');
-}
-
-#$controller = new openqrm_controller();
-#$controller->cli($argv);
diff --git a/openQRM-5.3.50-CE/src/web/base/css/bootstrap/bootstrap.css b/openQRM-5.3.50-CE/src/web/base/css/bootstrap/bootstrap.css
deleted file mode 100644
index c2cc1c4..0000000
--- a/openQRM-5.3.50-CE/src/web/base/css/bootstrap/bootstrap.css
+++ /dev/null
@@ -1,1723 +0,0 @@
-/*!
- * Bootstrap v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-.clearfix {
-  *zoom: 1;
-}
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  content: "";
-  line-height: 0;
-}
-.clearfix:after {
-  clear: both;
-}
-.hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-.input-block-level {
-  display: block;
-  width: 100%;
-  min-height: 30px;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-}
-p {
-  margin: 0 0 10px;
-}
-.lead {
-  margin-bottom: 20px;
-  font-size: 18px;
-  font-weight: 200;
-  line-height: 30px;
-}
-small {
-  font-size: 85%;
-}
-strong {
-  font-weight: bold;
-}
-em {
-  font-style: italic;
-}
-cite {
-  font-style: normal;
-}
-.muted {
-  color: #999999;
-}
-a.muted:hover,
-a.muted:focus {
-  color: #808080;
-}
-.text-warning {
-  color: #c09853;
-}
-a.text-warning:hover,
-a.text-warning:focus {
-  color: #a47e3c;
-}
-.text-error {
-  color: #b94a48;
-}
-a.text-error:hover,
-a.text-error:focus {
-  color: #953b39;
-}
-.text-info {
-  color: #3a87ad;
-}
-a.text-info:hover,
-a.text-info:focus {
-  color: #2d6987;
-}
-.text-success {
-  color: #468847;
-}
-a.text-success:hover,
-a.text-success:focus {
-  color: #356635;
-}
-.text-left {
-  text-align: left;
-}
-.text-right {
-  text-align: right;
-}
-.text-center {
-  text-align: center;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 10px 0;
-  font-family: inherit;
-  font-weight: bold;
-  line-height: 20px;
-  color: inherit;
-  text-rendering: optimizelegibility;
-}
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small {
-  font-weight: normal;
-  line-height: 1;
-  color: #999999;
-}
-h1,
-h2,
-h3 {
-  line-height: 40px;
-}
-h1 {
-  font-size: 33px;
-}
-h2 {
-  font-size: 27px;
-}
-h3 {
-  font-size: 21px;
-}
-h4 {
-  font-size: 15px;
-}
-h5 {
-  font-size: 12px;
-}
-h6 {
-  font-size: 10.2px;
-}
-h1 small {
-  font-size: 21px;
-}
-h2 small {
-  font-size: 15px;
-}
-h3 small {
-  font-size: 12px;
-}
-h4 small {
-  font-size: 12px;
-}
-.page-header {
-  padding-bottom: 9px;
-  margin: 20px 0 30px;
-  border-bottom: 1px solid #eeeeee;
-}
-ul,
-ol {
-  padding: 0;
-  margin: 0 0 10px 25px;
-}
-ul ul,
-ul ol,
-ol ol,
-ol ul {
-  margin-bottom: 0;
-}
-li {
-  line-height: 20px;
-}
-ul.unstyled,
-ol.unstyled {
-  margin-left: 0;
-  list-style: none;
-}
-ul.inline,
-ol.inline {
-  margin-left: 0;
-  list-style: none;
-}
-ul.inline > li,
-ol.inline > li {
-  display: inline-block;
-  *display: inline;
-  /* IE7 inline-block hack */
-
-  *zoom: 1;
-  padding-left: 5px;
-  padding-right: 5px;
-}
-dl {
-  margin-bottom: 20px;
-}
-dt,
-dd {
-  line-height: 20px;
-}
-dt {
-  font-weight: bold;
-}
-dd {
-  margin-left: 10px;
-}
-.dl-horizontal {
-  *zoom: 1;
-}
-.dl-horizontal:before,
-.dl-horizontal:after {
-  display: table;
-  content: "";
-  line-height: 0;
-}
-.dl-horizontal:after {
-  clear: both;
-}
-.dl-horizontal dt {
-  float: left;
-  width: 160px;
-  clear: left;
-  text-align: right;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.dl-horizontal dd {
-  margin-left: 180px;
-}
-hr {
-  margin: 20px 0;
-  border: 0;
-  border-top: 1px solid #eeeeee;
-  border-bottom: 1px solid #ffffff;
-}
-abbr[title],
-abbr[data-original-title] {
-  cursor: help;
-  border-bottom: 1px dotted #999999;
-}
-abbr.initialism {
-  font-size: 90%;
-  text-transform: uppercase;
-}
-blockquote {
-  padding: 0 0 0 15px;
-  margin: 0 0 20px;
-  border-left: 5px solid #eeeeee;
-}
-blockquote p {
-  margin-bottom: 0;
-  font-size: 15px;
-  font-weight: 300;
-  line-height: 1.25;
-}
-blockquote small {
-  display: block;
-  line-height: 20px;
-  color: #999999;
-}
-blockquote small:before {
-  content: '\2014 \00A0';
-}
-blockquote.pull-right {
-  float: right;
-  padding-right: 15px;
-  padding-left: 0;
-  border-right: 5px solid #eeeeee;
-  border-left: 0;
-}
-blockquote.pull-right p,
-blockquote.pull-right small {
-  text-align: right;
-}
-blockquote.pull-right small:before {
-  content: '';
-}
-blockquote.pull-right small:after {
-  content: '\00A0 \2014';
-}
-q:before,
-q:after,
-blockquote:before,
-blockquote:after {
-  content: "";
-}
-address {
-  display: block;
-  margin-bottom: 20px;
-  font-style: normal;
-  line-height: 20px;
-}
-code,
-pre {
-  padding: 0 3px 2px;
-  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
-  font-size: 10px;
-  color: #333333;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-code {
-  padding: 2px 4px;
-  color: #d14;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
-  white-space: nowrap;
-}
-pre {
-  display: block;
-  padding: 9.5px;
-  margin: 0 0 10px;
-  font-size: 11px;
-  line-height: 20px;
-  word-break: break-all;
-  word-wrap: break-word;
-  white-space: pre;
-  white-space: pre-wrap;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-pre.prettyprint {
-  margin-bottom: 20px;
-}
-pre code {
-  padding: 0;
-  color: inherit;
-  white-space: pre;
-  white-space: pre-wrap;
-  background-color: transparent;
-  border: 0;
-}
-.pre-scrollable {
-  max-height: 340px;
-  overflow-y: scroll;
-}
-form {
-  margin: 0 0 20px;
-}
-fieldset {
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-legend {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin-bottom: 20px;
-  font-size: 18px;
-  line-height: 40px;
-  color: #333333;
-  border: 0;
-  border-bottom: 1px solid #e5e5e5;
-}
-legend small {
-  font-size: 15px;
-  color: #999999;
-}
-label,
-input,
-button,
-select,
-textarea {
-  font-size: 12px;
-  font-weight: normal;
-  line-height: 20px;
-}
-input,
-button,
-select,
-textarea {
-  font-family: Arial, Helvetica, sans-serif;
-}
-label {
-  display: block;
-  margin-bottom: 5px;
-}
-select,
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  display: inline-block;
-  height: 20px;
-  padding: 4px 6px;
-  font-size: 12px;
-  margin-bottom: 10px;
-  line-height: 20px;
-  color: #555555;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  vertical-align: middle;
-}
-input,
-textarea,
-.uneditable-input {
-  width: 206px;
-}
-textarea {
-  height: auto;
-}
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border linear .2s, box-shadow linear .2s;
-  -moz-transition: border linear .2s, box-shadow linear .2s;
-  -o-transition: border linear .2s, box-shadow linear .2s;
-  transition: border linear .2s, box-shadow linear .2s;
-}
-textarea:focus,
-input[type="text"]:focus,
-input[type="password"]:focus,
-input[type="datetime"]:focus,
-input[type="datetime-local"]:focus,
-input[type="date"]:focus,
-input[type="month"]:focus,
-input[type="time"]:focus,
-input[type="week"]:focus,
-input[type="number"]:focus,
-input[type="email"]:focus,
-input[type="url"]:focus,
-input[type="search"]:focus,
-input[type="tel"]:focus,
-input[type="color"]:focus,
-.uneditable-input:focus {
-  border-color: rgba(82, 168, 236, 0.8);
-  outline: 0;
-  outline: thin dotted \9;
-  /* IE6-9 */
-
-  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
-  -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
-  box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
-}
-input[type="radio"],
-input[type="checkbox"] {
-  margin: 4px 0 0;
-  *margin-top: 0;
-  /* IE7 */
-
-  margin-top: 1px \9;
-  /* IE8-9 */
-
-  line-height: normal;
-}
-input[type="file"],
-input[type="image"],
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="radio"],
-input[type="checkbox"] {
-  width: auto;
-}
-select,
-input[type="file"] {
-  height: auto;
-  /* In IE7, the height of the select element cannot be changed by height, only font-size */
-
-  *margin-top: 4px;
-  /* For IE7, add top margin to align select with labels */
-
-  line-height: auto;
-}
-select {
-  width: 220px;
-  border: 1px solid #cccccc;
-  background-color: #ffffff;
-}
-select[multiple],
-select[size] {
-  height: auto;
-}
-select:focus,
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-.uneditable-input,
-.uneditable-textarea {
-  color: #999999;
-  background-color: #fcfcfc;
-  border-color: #cccccc;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-  cursor: not-allowed;
-}
-.uneditable-input {
-  overflow: hidden;
-  white-space: nowrap;
-}
-.uneditable-textarea {
-  width: auto;
-  height: auto;
-}
-input:-moz-placeholder,
-textarea:-moz-placeholder {
-  color: #999999;
-}
-input:-ms-input-placeholder,
-textarea:-ms-input-placeholder {
-  color: #999999;
-}
-input::-webkit-input-placeholder,
-textarea::-webkit-input-placeholder {
-  color: #999999;
-}
-.radio,
-.checkbox {
-  min-height: 20px;
-  padding-left: 20px;
-}
-.radio input[type="radio"],
-.checkbox input[type="checkbox"] {
-  float: left;
-  margin-left: -20px;
-}
-.controls > .radio:first-child,
-.controls > .checkbox:first-child {
-  padding-top: 5px;
-}
-.radio.inline,
-.checkbox.inline {
-  display: inline-block;
-  padding-top: 5px;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-.radio.inline + .radio.inline,
-.checkbox.inline + .checkbox.inline {
-  margin-left: 10px;
-}
-.input-mini {
-  width: 60px;
-}
-.input-small {
-  width: 90px;
-}
-.input-medium {
-  width: 150px;
-}
-.input-large {
-  width: 210px;
-}
-.input-xlarge {
-  width: 270px;
-}
-.input-xxlarge {
-  width: 530px;
-}
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"],
-.uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"] {
-  float: none;
-  margin-left: 0;
-}
-.input-append input[class*="span"],
-.input-append .uneditable-input[class*="span"],
-.input-prepend input[class*="span"],
-.input-prepend .uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"],
-.row-fluid .input-prepend [class*="span"],
-.row-fluid .input-append [class*="span"] {
-  display: inline-block;
-}
-input,
-textarea,
-.uneditable-input {
-  margin-left: 0;
-}
-.controls-row [class*="span"] + [class*="span"] {
-  margin-left: 20px;
-}
-input.span12,
-textarea.span12,
-.uneditable-input.span12 {
-  width: 926px;
-}
-input.span11,
-textarea.span11,
-.uneditable-input.span11 {
-  width: 846px;
-}
-input.span10,
-textarea.span10,
-.uneditable-input.span10 {
-  width: 766px;
-}
-input.span9,
-textarea.span9,
-.uneditable-input.span9 {
-  width: 686px;
-}
-input.span8,
-textarea.span8,
-.uneditable-input.span8 {
-  width: 606px;
-}
-input.span7,
-textarea.span7,
-.uneditable-input.span7 {
-  width: 526px;
-}
-input.span6,
-textarea.span6,
-.uneditable-input.span6 {
-  width: 446px;
-}
-input.span5,
-textarea.span5,
-.uneditable-input.span5 {
-  width: 366px;
-}
-input.span4,
-textarea.span4,
-.uneditable-input.span4 {
-  width: 286px;
-}
-input.span3,
-textarea.span3,
-.uneditable-input.span3 {
-  width: 206px;
-}
-input.span2,
-textarea.span2,
-.uneditable-input.span2 {
-  width: 126px;
-}
-input.span1,
-textarea.span1,
-.uneditable-input.span1 {
-  width: 46px;
-}
-.controls-row {
-  *zoom: 1;
-}
-.controls-row:before,
-.controls-row:after {
-  display: table;
-  content: "";
-  line-height: 0;
-}
-.controls-row:after {
-  clear: both;
-}
-.controls-row [class*="span"],
-.row-fluid .controls-row [class*="span"] {
-  float: left;
-}
-.controls-row .checkbox[class*="span"],
-.controls-row .radio[class*="span"] {
-  padding-top: 5px;
-}
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
-  cursor: not-allowed;
-  background-color: #eeeeee;
-}
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-input[type="radio"][readonly],
-input[type="checkbox"][readonly] {
-  background-color: transparent;
-}
-.control-group.warning .control-label,
-.control-group.warning .help-block,
-.control-group.warning .help-inline {
-  color: #c09853;
-}
-.control-group.warning .checkbox,
-.control-group.warning .radio,
-.control-group.warning input,
-.control-group.warning select,
-.control-group.warning textarea {
-  color: #c09853;
-}
-.control-group.warning input,
-.control-group.warning select,
-.control-group.warning textarea {
-  border-color: #c09853;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-.control-group.warning input:focus,
-.control-group.warning select:focus,
-.control-group.warning textarea:focus {
-  border-color: #a47e3c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-}
-.control-group.warning .input-prepend .add-on,
-.control-group.warning .input-append .add-on {
-  color: #c09853;
-  background-color: #fcf8e3;
-  border-color: #c09853;
-}
-.control-group.error .control-label,
-.control-group.error .help-block,
-.control-group.error .help-inline {
-  color: #b94a48;
-}
-.control-group.error .checkbox,
-.control-group.error .radio,
-.control-group.error input,
-.control-group.error select,
-.control-group.error textarea {
-  color: #b94a48;
-}
-.control-group.error input,
-.control-group.error select,
-.control-group.error textarea {
-  border-color: #b94a48;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-.control-group.error input:focus,
-.control-group.error select:focus,
-.control-group.error textarea:focus {
-  border-color: #953b39;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-}
-.control-group.error .input-prepend .add-on,
-.control-group.error .input-append .add-on {
-  color: #b94a48;
-  background-color: #f2dede;
-  border-color: #b94a48;
-}
-.control-group.success .control-label,
-.control-group.success .help-block,
-.control-group.success .help-inline {
-  color: #468847;
-}
-.control-group.success .checkbox,
-.control-group.success .radio,
-.control-group.success input,
-.control-group.success select,
-.control-group.success textarea {
-  color: #468847;
-}
-.control-group.success input,
-.control-group.success select,
-.control-group.success textarea {
-  border-color: #468847;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-.control-group.success input:focus,
-.control-group.success select:focus,
-.control-group.success textarea:focus {
-  border-color: #356635;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-}
-.control-group.success .input-prepend .add-on,
-.control-group.success .input-append .add-on {
-  color: #468847;
-  background-color: #dff0d8;
-  border-color: #468847;
-}
-.control-group.info .control-label,
-.control-group.info .help-block,
-.control-group.info .help-inline {
-  color: #3a87ad;
-}
-.control-group.info .checkbox,
-.control-group.info .radio,
-.control-group.info input,
-.control-group.info select,
-.control-group.info textarea {
-  color: #3a87ad;
-}
-.control-group.info input,
-.control-group.info select,
-.control-group.info textarea {
-  border-color: #3a87ad;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-.control-group.info input:focus,
-.control-group.info select:focus,
-.control-group.info textarea:focus {
-  border-color: #2d6987;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-}
-.control-group.info .input-prepend .add-on,
-.control-group.info .input-append .add-on {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #3a87ad;
-}
-input:focus:invalid,
-textarea:focus:invalid,
-select:focus:invalid {
-  color: #b94a48;
-  border-color: #ee5f5b;
-}
-input:focus:invalid:focus,
-textarea:focus:invalid:focus,
-select:focus:invalid:focus {
-  border-color: #e9322d;
-  -webkit-box-shadow: 0 0 6px #f8b9b7;
-  -moz-box-shadow: 0 0 6px #f8b9b7;
-  box-shadow: 0 0 6px #f8b9b7;
-}
-.form-actions {
-  padding: 19px 20px 20px;
-  margin-top: 20px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border-top: 1px solid #e5e5e5;
-  *zoom: 1;
-}
-.form-actions:before,
-.form-actions:after {
-  display: table;
-  content: "";
-  line-height: 0;
-}
-.form-actions:after {
-  clear: both;
-}
-.help-block,
-.help-inline {
-  color: #595959;
-}
-.help-block {
-  display: block;
-  margin-bottom: 10px;
-}
-.help-inline {
-  display: inline-block;
-  *display: inline;
-  /* IE7 inline-block hack */
-
-  *zoom: 1;
-  vertical-align: middle;
-  padding-left: 5px;
-}
-.input-append,
-.input-prepend {
-  display: inline-block;
-  margin-bottom: 10px;
-  vertical-align: middle;
-  font-size: 0;
-  white-space: nowrap;
-}
-.input-append input,
-.input-prepend input,
-.input-append select,
-.input-prepend select,
-.input-append .uneditable-input,
-.input-prepend .uneditable-input,
-.input-append .dropdown-menu,
-.input-prepend .dropdown-menu,
-.input-append .popover,
-.input-prepend .popover {
-  font-size: 12px;
-}
-.input-append input,
-.input-prepend input,
-.input-append select,
-.input-prepend select,
-.input-append .uneditable-input,
-.input-prepend .uneditable-input {
-  position: relative;
-  margin-bottom: 0;
-  *margin-left: 0;
-  vertical-align: top;
-  -webkit-border-radius: 0 4px 4px 0;
-  -moz-border-radius: 0 4px 4px 0;
-  border-radius: 0 4px 4px 0;
-}
-.input-append input:focus,
-.input-prepend input:focus,
-.input-append select:focus,
-.input-prepend select:focus,
-.input-append .uneditable-input:focus,
-.input-prepend .uneditable-input:focus {
-  z-index: 2;
-}
-.input-append .add-on,
-.input-prepend .add-on {
-  display: inline-block;
-  width: auto;
-  height: 20px;
-  min-width: 16px;
-  padding: 4px 5px;
-  font-size: 12px;
-  font-weight: normal;
-  line-height: 20px;
-  text-align: center;
-  text-shadow: 0 1px 0 #ffffff;
-  background-color: #eeeeee;
-  border: 1px solid #ccc;
-}
-.input-append .add-on,
-.input-prepend .add-on,
-.input-append .btn,
-.input-prepend .btn,
-.input-append .btn-group > .dropdown-toggle,
-.input-prepend .btn-group > .dropdown-toggle {
-  vertical-align: top;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-.input-append .active,
-.input-prepend .active {
-  background-color: #a9dba9;
-  border-color: #46a546;
-}
-.input-prepend .add-on,
-.input-prepend .btn {
-  margin-right: -1px;
-}
-.input-prepend .add-on:first-child,
-.input-prepend .btn:first-child {
-  -webkit-border-radius: 4px 0 0 4px;
-  -moz-border-radius: 4px 0 0 4px;
-  border-radius: 4px 0 0 4px;
-}
-.input-append input,
-.input-append select,
-.input-append .uneditable-input {
-  -webkit-border-radius: 4px 0 0 4px;
-  -moz-border-radius: 4px 0 0 4px;
-  border-radius: 4px 0 0 4px;
-}
-.input-append input + .btn-group .btn:last-child,
-.input-append select + .btn-group .btn:last-child,
-.input-append .uneditable-input + .btn-group .btn:last-child {
-  -webkit-border-radius: 0 4px 4px 0;
-  -moz-border-radius: 0 4px 4px 0;
-  border-radius: 0 4px 4px 0;
-}
-.input-append .add-on,
-.input-append .btn,
-.input-append .btn-group {
-  margin-left: -1px;
-}
-.input-append .add-on:last-child,
-.input-append .btn:last-child,
-.input-append .btn-group:last-child > .dropdown-toggle {
-  -webkit-border-radius: 0 4px 4px 0;
-  -moz-border-radius: 0 4px 4px 0;
-  border-radius: 0 4px 4px 0;
-}
-.input-prepend.input-append input,
-.input-prepend.input-append select,
-.input-prepend.input-append .uneditable-input {
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-.input-prepend.input-append input + .btn-group .btn,
-.input-prepend.input-append select + .btn-group .btn,
-.input-prepend.input-append .uneditable-input + .btn-group .btn {
-  -webkit-border-radius: 0 4px 4px 0;
-  -moz-border-radius: 0 4px 4px 0;
-  border-radius: 0 4px 4px 0;
-}
-.input-prepend.input-append .add-on:first-child,
-.input-prepend.input-append .btn:first-child {
-  margin-right: -1px;
-  -webkit-border-radius: 4px 0 0 4px;
-  -moz-border-radius: 4px 0 0 4px;
-  border-radius: 4px 0 0 4px;
-}
-.input-prepend.input-append .add-on:last-child,
-.input-prepend.input-append .btn:last-child {
-  margin-left: -1px;
-  -webkit-border-radius: 0 4px 4px 0;
-  -moz-border-radius: 0 4px 4px 0;
-  border-radius: 0 4px 4px 0;
-}
-.input-prepend.input-append .btn-group:first-child {
-  margin-left: 0;
-}
-input.search-query {
-  padding-right: 14px;
-  padding-right: 4px \9;
-  padding-left: 14px;
-  padding-left: 4px \9;
-  /* IE7-8 doesn't have border-radius, so don't indent the padding */
-
-  margin-bottom: 0;
-  -webkit-border-radius: 15px;
-  -moz-border-radius: 15px;
-  border-radius: 15px;
-}
-/* Allow for input prepend/append in search forms */
-.form-search .input-append .search-query,
-.form-search .input-prepend .search-query {
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-.form-search .input-append .search-query {
-  -webkit-border-radius: 14px 0 0 14px;
-  -moz-border-radius: 14px 0 0 14px;
-  border-radius: 14px 0 0 14px;
-}
-.form-search .input-append .btn {
-  -webkit-border-radius: 0 14px 14px 0;
-  -moz-border-radius: 0 14px 14px 0;
-  border-radius: 0 14px 14px 0;
-}
-.form-search .input-prepend .search-query {
-  -webkit-border-radius: 0 14px 14px 0;
-  -moz-border-radius: 0 14px 14px 0;
-  border-radius: 0 14px 14px 0;
-}
-.form-search .input-prepend .btn {
-  -webkit-border-radius: 14px 0 0 14px;
-  -moz-border-radius: 14px 0 0 14px;
-  border-radius: 14px 0 0 14px;
-}
-.form-search input,
-.form-inline input,
-.form-horizontal input,
-.form-search textarea,
-.form-inline textarea,
-.form-horizontal textarea,
-.form-search select,
-.form-inline select,
-.form-horizontal select,
-.form-search .help-inline,
-.form-inline .help-inline,
-.form-horizontal .help-inline,
-.form-search .uneditable-input,
-.form-inline .uneditable-input,
-.form-horizontal .uneditable-input,
-.form-search .input-prepend,
-.form-inline .input-prepend,
-.form-horizontal .input-prepend,
-.form-search .input-append,
-.form-inline .input-append,
-.form-horizontal .input-append {
-  display: inline-block;
-  *display: inline;
-  /* IE7 inline-block hack */
-
-  *zoom: 1;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-.form-search .hide,
-.form-inline .hide,
-.form-horizontal .hide {
-  display: none;
-}
-.form-search label,
-.form-inline label,
-.form-search .btn-group,
-.form-inline .btn-group {
-  display: inline-block;
-}
-.form-search .input-append,
-.form-inline .input-append,
-.form-search .input-prepend,
-.form-inline .input-prepend {
-  margin-bottom: 0;
-}
-.form-search .radio,
-.form-search .checkbox,
-.form-inline .radio,
-.form-inline .checkbox {
-  padding-left: 0;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-.form-search .radio input[type="radio"],
-.form-search .checkbox input[type="checkbox"],
-.form-inline .radio input[type="radio"],
-.form-inline .checkbox input[type="checkbox"] {
-  float: left;
-  margin-right: 3px;
-  margin-left: 0;
-}
-.control-group {
-  margin-bottom: 10px;
-}
-legend + .control-group {
-  margin-top: 20px;
-  -webkit-margin-top-collapse: separate;
-}
-.form-horizontal .control-group {
-  margin-bottom: 20px;
-  *zoom: 1;
-}
-.form-horizontal .control-group:before,
-.form-horizontal .control-group:after {
-  display: table;
-  content: "";
-  line-height: 0;
-}
-.form-horizontal .control-group:after {
-  clear: both;
-}
-.form-horizontal .control-label {
-  float: left;
-  width: 160px;
-  padding-top: 5px;
-  text-align: right;
-}
-.form-horizontal .controls {
-  *display: inline-block;
-  *padding-left: 20px;
-  margin-left: 180px;
-  *margin-left: 0;
-}
-.form-horizontal .controls:first-child {
-  *padding-left: 180px;
-}
-.form-horizontal .help-block {
-  margin-bottom: 0;
-}
-.form-horizontal input + .help-block,
-.form-horizontal select + .help-block,
-.form-horizontal textarea + .help-block,
-.form-horizontal .uneditable-input + .help-block,
-.form-horizontal .input-prepend + .help-block,
-.form-horizontal .input-append + .help-block {
-  margin-top: 10px;
-}
-.form-horizontal .form-actions {
-  padding-left: 180px;
-}
-
-
-
-/* Tables */
-table {
-  max-width: 100%;
-  background-color: transparent;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-.table {
-  width: 100%;
-  margin-bottom: 20px;
-}
-.table th,
-.table td {
-  padding: 8px;
-  line-height: 20px;
-  text-align: left;
-  vertical-align: top;
-  border-top: 1px solid #dddddd;
-}
-.table th {
-  font-weight: bold;
-}
-.table thead th {
-  vertical-align: bottom;
-}
-.table caption + thead tr:first-child th,
-.table caption + thead tr:first-child td,
-.table colgroup + thead tr:first-child th,
-.table colgroup + thead tr:first-child td,
-.table thead:first-child tr:first-child th,
-.table thead:first-child tr:first-child td {
-  border-top: 0;
-}
-.table tbody + tbody {
-  border-top: 2px solid #dddddd;
-}
-.table .table {
-  background-color: #ffffff;
-}
-.table-condensed th,
-.table-condensed td {
-  padding: 4px 5px;
-}
-.table-bordered {
-  border: 1px solid #dddddd;
-  border-collapse: separate;
-  *border-collapse: collapse;
-  border-left: 0;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.table-bordered th,
-.table-bordered td {
-  border-left: 1px solid #dddddd;
-}
-.table-bordered caption + thead tr:first-child th,
-.table-bordered caption + tbody tr:first-child th,
-.table-bordered caption + tbody tr:first-child td,
-.table-bordered colgroup + thead tr:first-child th,
-.table-bordered colgroup + tbody tr:first-child th,
-.table-bordered colgroup + tbody tr:first-child td,
-.table-bordered thead:first-child tr:first-child th,
-.table-bordered tbody:first-child tr:first-child th,
-.table-bordered tbody:first-child tr:first-child td {
-  border-top: 0;
-}
-.table-bordered thead:first-child tr:first-child > th:first-child,
-.table-bordered tbody:first-child tr:first-child > td:first-child,
-.table-bordered tbody:first-child tr:first-child > th:first-child {
-  -webkit-border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-  border-top-left-radius: 4px;
-}
-.table-bordered thead:first-child tr:first-child > th:last-child,
-.table-bordered tbody:first-child tr:first-child > td:last-child,
-.table-bordered tbody:first-child tr:first-child > th:last-child {
-  -webkit-border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  border-top-right-radius: 4px;
-}
-.table-bordered thead:last-child tr:last-child > th:first-child,
-.table-bordered tbody:last-child tr:last-child > td:first-child,
-.table-bordered tbody:last-child tr:last-child > th:first-child,
-.table-bordered tfoot:last-child tr:last-child > td:first-child,
-.table-bordered tfoot:last-child tr:last-child > th:first-child {
-  -webkit-border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  border-bottom-left-radius: 4px;
-}
-.table-bordered thead:last-child tr:last-child > th:last-child,
-.table-bordered tbody:last-child tr:last-child > td:last-child,
-.table-bordered tbody:last-child tr:last-child > th:last-child,
-.table-bordered tfoot:last-child tr:last-child > td:last-child,
-.table-bordered tfoot:last-child tr:last-child > th:last-child {
-  -webkit-border-bottom-right-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-  border-bottom-right-radius: 4px;
-}
-.table-bordered tfoot + tbody:last-child tr:last-child td:first-child {
-  -webkit-border-bottom-left-radius: 0;
-  -moz-border-radius-bottomleft: 0;
-  border-bottom-left-radius: 0;
-}
-.table-bordered tfoot + tbody:last-child tr:last-child td:last-child {
-  -webkit-border-bottom-right-radius: 0;
-  -moz-border-radius-bottomright: 0;
-  border-bottom-right-radius: 0;
-}
-.table-bordered caption + thead tr:first-child th:first-child,
-.table-bordered caption + tbody tr:first-child td:first-child,
-.table-bordered colgroup + thead tr:first-child th:first-child,
-.table-bordered colgroup + tbody tr:first-child td:first-child {
-  -webkit-border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-  border-top-left-radius: 4px;
-}
-.table-bordered caption + thead tr:first-child th:last-child,
-.table-bordered caption + tbody tr:first-child td:last-child,
-.table-bordered colgroup + thead tr:first-child th:last-child,
-.table-bordered colgroup + tbody tr:first-child td:last-child {
-  -webkit-border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  border-top-right-radius: 4px;
-}
-.table-striped tbody > tr:nth-child(odd) > td,
-.table-striped tbody > tr:nth-child(odd) > th {
-  background-color: #f9f9f9;
-}
-.table-hover tbody tr:hover > td,
-.table-hover tbody tr:hover > th {
-  background-color: #f5f5f5;
-}
-table td[class*="span"],
-table th[class*="span"],
-.row-fluid table td[class*="span"],
-.row-fluid table th[class*="span"] {
-  display: table-cell;
-  float: none;
-  margin-left: 0;
-}
-.table td.span1,
-.table th.span1 {
-  float: none;
-  width: 44px;
-  margin-left: 0;
-}
-.table td.span2,
-.table th.span2 {
-  float: none;
-  width: 124px;
-  margin-left: 0;
-}
-.table td.span3,
-.table th.span3 {
-  float: none;
-  width: 204px;
-  margin-left: 0;
-}
-.table td.span4,
-.table th.span4 {
-  float: none;
-  width: 284px;
-  margin-left: 0;
-}
-.table td.span5,
-.table th.span5 {
-  float: none;
-  width: 364px;
-  margin-left: 0;
-}
-.table td.span6,
-.table th.span6 {
-  float: none;
-  width: 444px;
-  margin-left: 0;
-}
-.table td.span7,
-.table th.span7 {
-  float: none;
-  width: 524px;
-  margin-left: 0;
-}
-.table td.span8,
-.table th.span8 {
-  float: none;
-  width: 604px;
-  margin-left: 0;
-}
-.table td.span9,
-.table th.span9 {
-  float: none;
-  width: 684px;
-  margin-left: 0;
-}
-.table td.span10,
-.table th.span10 {
-  float: none;
-  width: 764px;
-  margin-left: 0;
-}
-.table td.span11,
-.table th.span11 {
-  float: none;
-  width: 844px;
-  margin-left: 0;
-}
-.table td.span12,
-.table th.span12 {
-  float: none;
-  width: 924px;
-  margin-left: 0;
-}
-.table tbody tr.success > td {
-  background-color: #dff0d8;
-}
-.table tbody tr.error > td {
-  background-color: #f2dede;
-}
-.table tbody tr.warning > td {
-  background-color: #fcf8e3;
-}
-.table tbody tr.info > td {
-  background-color: #d9edf7;
-}
-.table-hover tbody tr.success:hover > td {
-  background-color: #d0e9c6;
-}
-.table-hover tbody tr.error:hover > td {
-  background-color: #ebcccc;
-}
-.table-hover tbody tr.warning:hover > td {
-  background-color: #faf2cc;
-}
-.table-hover tbody tr.info:hover > td {
-  background-color: #c4e3f3;
-}
-
-
-
-
-
-
-/* Grid system */
-
-.row {
-  margin-left: -15px;
-  *zoom: 1;
-}
-.row:before,
-.row:after {
-  display: table;
-  content: "";
-  line-height: 0;
-}
-.row:after {
-  clear: both;
-}
-[class*="span"] {
-  float: left;
-  min-height: 1px;
-  margin-left: 15px;
-}
-.container,
-.navbar-static-top .container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  width: 1198px;
-}
-.span12 {
-  width: 1198px;
-}
-.span11 {
-  width: 1083px;
-}
-.span10 {
-  width: 960px;
-}
-.span9 {
-  width: 968px;
-}
-.span8 {
-  width: 738px;
-}
-.span7 {
-  width: 630px;
-}
-.span6 {
-  width: 575px;
-}
-.span5 {
-  width: 560px;
-}
-.span4 {
-  width: 345px;
-}
-.span3 {
-  width: 330px;
-}
-.span2 {
-  width: 215px;
-}
-.span1 {
-  width: 100px;
-}
-.offset12 {
-  margin-left: 1395px;
-}
-.offset11 {
-  margin-left: 1280px;
-}
-.offset10 {
-  margin-left: 1165px;
-}
-.offset9 {
-  margin-left: 1050px;
-}
-.offset8 {
-  margin-left: 935px;
-}
-.offset7 {
-  margin-left: 820px;
-}
-.offset6 {
-  margin-left: 705px;
-}
-.offset5 {
-  margin-left: 590px;
-}
-.offset4 {
-  margin-left: 475px;
-}
-.offset3 {
-  margin-left: 360px;
-}
-.offset2 {
-  margin-left: 245px;
-}
-.offset1 {
-  margin-left: 90px;
-}
-.row-fluid {
-  width: 100%;
-  *zoom: 1;
-}
-.row-fluid:before,
-.row-fluid:after {
-  display: table;
-  content: "";
-  line-height: 0;
-}
-.row-fluid:after {
-  clear: both;
-}
-.row-fluid [class*="span"] {
-  display: block;
-  width: 100%;
-  min-height: 30px;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  float: left;
-  margin-left: 1.098901098901099%;
-  *margin-left: 1.0622710622710623%;
-}
-.row-fluid [class*="span"]:first-child {
-  margin-left: 0;
-}
-.row-fluid .controls-row [class*="span"] + [class*="span"] {
-  margin-left: 1.098901098901099%;
-}
-.row-fluid .span12 {
-  width: 100%;
-  *width: 99.96336996336996%;
-}
-.row-fluid .span11 {
-  width: 91.57509157509159%;
-  *width: 91.53846153846155%;
-}
-.row-fluid .span10 {
-  width: 83.15018315018315%;
-  *width: 83.11355311355311%;
-}
-.row-fluid .span9 {
-  width: 74.72527472527473%;
-  *width: 74.68864468864469%;
-}
-.row-fluid .span8 {
-  width: 66.3003663003663%;
-  *width: 66.26373626373626%;
-}
-.row-fluid .span7 {
-  width: 57.875457875457876%;
-  *width: 57.83882783882784%;
-}
-.row-fluid .span6 {
-  width: 49.45054945054945%;
-  *width: 49.413919413919416%;
-}
-.row-fluid .span5 {
-  width: 41.02564102564103%;
-  *width: 40.98901098901099%;
-}
-.row-fluid .span4 {
-  width: 32.600732600732606%;
-  *width: 32.56410256410257%;
-}
-.row-fluid .span3 {
-  width: 24.175824175824175%;
-  *width: 24.13919413919414%;
-}
-.row-fluid .span2 {
-  width: 15.750915750915752%;
-  *width: 15.714285714285715%;
-}
-.row-fluid .span1 {
-  width: 7.326007326007327%;
-  *width: 7.28937728937729%;
-}
-.row-fluid .offset12 {
-  margin-left: 102.1978021978022%;
-  *margin-left: 102.12454212454212%;
-}
-.row-fluid .offset12:first-child {
-  margin-left: 101.0989010989011%;
-  *margin-left: 101.02564102564101%;
-}
-.row-fluid .offset11 {
-  margin-left: 93.7728937728938%;
-  *margin-left: 93.69963369963371%;
-}
-.row-fluid .offset11:first-child {
-  margin-left: 92.67399267399269%;
-  *margin-left: 92.6007326007326%;
-}
-.row-fluid .offset10 {
-  margin-left: 85.34798534798536%;
-  *margin-left: 85.27472527472527%;
-}
-.row-fluid .offset10:first-child {
-  margin-left: 84.24908424908425%;
-  *margin-left: 84.17582417582416%;
-}
-.row-fluid .offset9 {
-  margin-left: 76.92307692307693%;
-  *margin-left: 76.84981684981685%;
-}
-.row-fluid .offset9:first-child {
-  margin-left: 75.82417582417582%;
-  *margin-left: 75.75091575091574%;
-}
-.row-fluid .offset8 {
-  margin-left: 68.49816849816851%;
-  *margin-left: 68.42490842490842%;
-}
-.row-fluid .offset8:first-child {
-  margin-left: 67.3992673992674%;
-  *margin-left: 67.32600732600731%;
-}
-.row-fluid .offset7 {
-  margin-left: 60.07326007326007%;
-  *margin-left: 60%;
-}
-.row-fluid .offset7:first-child {
-  margin-left: 58.97435897435898%;
-  *margin-left: 58.901098901098905%;
-}
-.row-fluid .offset6 {
-  margin-left: 51.64835164835165%;
-  *margin-left: 51.57509157509158%;
-}
-.row-fluid .offset6:first-child {
-  margin-left: 50.549450549450555%;
-  *margin-left: 50.47619047619048%;
-}
-.row-fluid .offset5 {
-  margin-left: 43.223443223443226%;
-  *margin-left: 43.15018315018315%;
-}
-.row-fluid .offset5:first-child {
-  margin-left: 42.12454212454213%;
-  *margin-left: 42.05128205128206%;
-}
-.row-fluid .offset4 {
-  margin-left: 34.7985347985348%;
-  *margin-left: 34.72527472527473%;
-}
-.row-fluid .offset4:first-child {
-  margin-left: 33.69963369963371%;
-  *margin-left: 33.626373626373635%;
-}
-.row-fluid .offset3 {
-  margin-left: 26.373626373626372%;
-  *margin-left: 26.3003663003663%;
-}
-.row-fluid .offset3:first-child {
-  margin-left: 25.274725274725274%;
-  *margin-left: 25.2014652014652%;
-}
-.row-fluid .offset2 {
-  margin-left: 17.94871794871795%;
-  *margin-left: 17.875457875457876%;
-}
-.row-fluid .offset2:first-child {
-  margin-left: 16.84981684981685%;
-  *margin-left: 16.776556776556777%;
-}
-.row-fluid .offset1 {
-  margin-left: 9.523809523809526%;
-  *margin-left: 9.450549450549453%;
-}
-.row-fluid .offset1:first-child {
-  margin-left: 8.424908424908425%;
-  *margin-left: 8.351648351648352%;
-}
-[class*="span"].hide,
-.row-fluid [class*="span"].hide {
-  display: none;
-}
-[class*="span"].pull-right,
-.row-fluid [class*="span"].pull-right {
-  float: right;
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/css/bootstrap/glyphicons.css b/openQRM-5.3.50-CE/src/web/base/css/bootstrap/glyphicons.css
deleted file mode 100644
index e689dee..0000000
--- a/openQRM-5.3.50-CE/src/web/base/css/bootstrap/glyphicons.css
+++ /dev/null
@@ -1,2581 +0,0 @@
-/*!
- *
- *  Project:  GLYPHICONS
- *  Author:   Jan Kovarik - www.glyphicons.com
- *  Twitter:  @jankovarik
- *
- */
-html,
-html .halflings {
-  -webkit-font-smoothing: antialiased !important;
-}
-@font-face {
-  font-family: 'Glyphicons';
-  src: url('../../fonts/glyphicons-regular.eot');
-  src: url('../../fonts/glyphicons-regular.eot?#iefix') format('embedded-opentype'), url('../../fonts/glyphicons-regular.woff') format('woff'), url('../../fonts/glyphicons-regular.ttf') format('truetype'), url('../../fonts/glyphicons-regular.svg#glyphicons_halflingsregular') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-.glyphicons {
-  display: inline-block;
-  position: relative;
-  padding: 5px 0 5px 35px;
-  color: #1d1d1b;
-  text-decoration: none;
-  *display: inline;
-  *zoom: 1;
-}
-.glyphicons i:before {
-  position: absolute;
-  left: 0;
-  top: 0;
-  font: 24px/1em 'Glyphicons';
-  font-style: normal;
-  color: #1d1d1b;
-}
-.glyphicons.white i:before {
-  color: #fff;
-}
-.glyphicons.glass i:before {
-  content: "\e001";
-}
-.glyphicons.leaf i:before {
-  content: "\e002";
-}
-.glyphicons.dog i:before {
-  content: "\e003";
-}
-.glyphicons.user i:before {
-  content: "\e004";
-}
-.glyphicons.girl i:before {
-  content: "\e005";
-}
-.glyphicons.car i:before {
-  content: "\e006";
-}
-.glyphicons.user_add i:before {
-  content: "\e007";
-}
-.glyphicons.user_remove i:before {
-  content: "\e008";
-}
-.glyphicons.film i:before {
-  content: "\e009";
-}
-.glyphicons.magic i:before {
-  content: "\e010";
-}
-.glyphicons.envelope i:before {
-  content: "\2709";
-}
-.glyphicons.camera i:before {
-  content: "\e012";
-}
-.glyphicons.heart i:before {
-  content: "\e013";
-}
-.glyphicons.beach_umbrella i:before {
-  content: "\e014";
-}
-.glyphicons.train i:before {
-  content: "\e015";
-}
-.glyphicons.print i:before {
-  content: "\e016";
-}
-.glyphicons.bin i:before {
-  content: "\e017";
-}
-.glyphicons.music i:before {
-  content: "\e018";
-}
-.glyphicons.note i:before {
-  content: "\e019";
-}
-.glyphicons.heart_empty i:before {
-  content: "\e020";
-}
-.glyphicons.home i:before {
-  content: "\e021";
-}
-.glyphicons.snowflake i:before {
-  content: "\2744";
-}
-.glyphicons.fire i:before {
-  content: "\e023";
-}
-.glyphicons.magnet i:before {
-  content: "\e024";
-}
-.glyphicons.parents i:before {
-  content: "\e025";
-}
-.glyphicons.binoculars i:before {
-  content: "\e026";
-}
-.glyphicons.road i:before {
-  content: "\e027";
-}
-.glyphicons.search i:before {
-  content: "\e028";
-}
-.glyphicons.cars i:before {
-  content: "\e029";
-}
-.glyphicons.notes_2 i:before {
-  content: "\e030";
-}
-.glyphicons.pencil i:before {
-  content: "\270F";
-}
-.glyphicons.bus i:before {
-  content: "\e032";
-}
-.glyphicons.wifi_alt i:before {
-  content: "\e033";
-}
-.glyphicons.luggage i:before {
-  content: "\e034";
-}
-.glyphicons.old_man i:before {
-  content: "\e035";
-}
-.glyphicons.woman i:before {
-  content: "\e036";
-}
-.glyphicons.file i:before {
-  content: "\e037";
-}
-.glyphicons.coins i:before {
-  content: "\e038";
-}
-.glyphicons.airplane i:before {
-  content: "\2708";
-}
-.glyphicons.notes i:before {
-  content: "\e040";
-}
-.glyphicons.stats i:before {
-  content: "\e041";
-}
-.glyphicons.charts i:before {
-  content: "\e042";
-}
-.glyphicons.pie_chart i:before {
-  content: "\e043";
-}
-.glyphicons.group i:before {
-  content: "\e044";
-}
-.glyphicons.keys i:before {
-  content: "\e045";
-}
-.glyphicons.calendar i:before {
-  content: "\e046";
-}
-.glyphicons.router i:before {
-  content: "\e047";
-}
-.glyphicons.camera_small i:before {
-  content: "\e048";
-}
-.glyphicons.dislikes i:before {
-  content: "\e049";
-}
-.glyphicons.star i:before {
-  content: "\e050";
-}
-.glyphicons.link i:before {
-  content: "\e051";
-}
-.glyphicons.eye_open i:before {
-  content: "\e052";
-}
-.glyphicons.eye_close i:before {
-  content: "\e053";
-}
-.glyphicons.alarm i:before {
-  content: "\e054";
-}
-.glyphicons.clock i:before {
-  content: "\e055";
-}
-.glyphicons.stopwatch i:before {
-  content: "\e056";
-}
-.glyphicons.projector i:before {
-  content: "\e057";
-}
-.glyphicons.history i:before {
-  content: "\e058";
-}
-.glyphicons.truck i:before {
-  content: "\e059";
-}
-.glyphicons.cargo i:before {
-  content: "\e060";
-}
-.glyphicons.compass i:before {
-  content: "\e061";
-}
-.glyphicons.keynote i:before {
-  content: "\e062";
-}
-.glyphicons.paperclip i:before {
-  content: "\e063";
-}
-.glyphicons.power i:before {
-  content: "\e064";
-}
-.glyphicons.lightbulb i:before {
-  content: "\e065";
-}
-.glyphicons.tag i:before {
-  content: "\e066";
-}
-.glyphicons.tags i:before {
-  content: "\e067";
-}
-.glyphicons.cleaning i:before {
-  content: "\e068";
-}
-.glyphicons.ruller i:before {
-  content: "\e069";
-}
-.glyphicons.gift i:before {
-  content: "\e070";
-}
-.glyphicons.umbrella i:before {
-  content: "\2602";
-}
-.glyphicons.book i:before {
-  content: "\e072";
-}
-.glyphicons.bookmark i:before {
-  content: "\e073";
-}
-.glyphicons.wifi i:before {
-  content: "\e074";
-}
-.glyphicons.cup i:before {
-  content: "\e075";
-}
-.glyphicons.stroller i:before {
-  content: "\e076";
-}
-.glyphicons.headphones i:before {
-  content: "\e077";
-}
-.glyphicons.headset i:before {
-  content: "\e078";
-}
-.glyphicons.warning_sign i:before {
-  content: "\e079";
-}
-.glyphicons.signal i:before {
-  content: "\e080";
-}
-.glyphicons.retweet i:before {
-  content: "\e081";
-}
-.glyphicons.refresh i:before {
-  content: "\e082";
-}
-.glyphicons.roundabout i:before {
-  content: "\e083";
-}
-.glyphicons.random i:before {
-  content: "\e084";
-}
-.glyphicons.heat i:before {
-  content: "\e085";
-}
-.glyphicons.repeat i:before {
-  content: "\e086";
-}
-.glyphicons.display i:before {
-  content: "\e087";
-}
-.glyphicons.log_book i:before {
-  content: "\e088";
-}
-.glyphicons.adress_book i:before {
-  content: "\e089";
-}
-.glyphicons.building i:before {
-  content: "\e090";
-}
-.glyphicons.eyedropper i:before {
-  content: "\e091";
-}
-.glyphicons.adjust i:before {
-  content: "\e092";
-}
-.glyphicons.tint i:before {
-  content: "\e093";
-}
-.glyphicons.crop i:before {
-  content: "\e094";
-}
-.glyphicons.vector_path_square i:before {
-  content: "\e095";
-}
-.glyphicons.vector_path_circle i:before {
-  content: "\e096";
-}
-.glyphicons.vector_path_polygon i:before {
-  content: "\e097";
-}
-.glyphicons.vector_path_line i:before {
-  content: "\e098";
-}
-.glyphicons.vector_path_curve i:before {
-  content: "\e099";
-}
-.glyphicons.vector_path_all i:before {
-  content: "\e100";
-}
-.glyphicons.font i:before {
-  content: "\e101";
-}
-.glyphicons.italic i:before {
-  content: "\e102";
-}
-.glyphicons.bold i:before {
-  content: "\e103";
-}
-.glyphicons.text_underline i:before {
-  content: "\e104";
-}
-.glyphicons.text_strike i:before {
-  content: "\e105";
-}
-.glyphicons.text_height i:before {
-  content: "\e106";
-}
-.glyphicons.text_width i:before {
-  content: "\e107";
-}
-.glyphicons.text_resize i:before {
-  content: "\e108";
-}
-.glyphicons.left_indent i:before {
-  content: "\e109";
-}
-.glyphicons.right_indent i:before {
-  content: "\e110";
-}
-.glyphicons.align_left i:before {
-  content: "\e111";
-}
-.glyphicons.align_center i:before {
-  content: "\e112";
-}
-.glyphicons.align_right i:before {
-  content: "\e113";
-}
-.glyphicons.justify i:before {
-  content: "\e114";
-}
-.glyphicons.list i:before {
-  content: "\e115";
-}
-.glyphicons.text_smaller i:before {
-  content: "\e116";
-}
-.glyphicons.text_bigger i:before {
-  content: "\e117";
-}
-.glyphicons.embed i:before {
-  content: "\e118";
-}
-.glyphicons.embed_close i:before {
-  content: "\e119";
-}
-.glyphicons.table i:before {
-  content: "\e120";
-}
-.glyphicons.message_full i:before {
-  content: "\e121";
-}
-.glyphicons.message_empty i:before {
-  content: "\e122";
-}
-.glyphicons.message_in i:before {
-  content: "\e123";
-}
-.glyphicons.message_out i:before {
-  content: "\e124";
-}
-.glyphicons.message_plus i:before {
-  content: "\e125";
-}
-.glyphicons.message_minus i:before {
-  content: "\e126";
-}
-.glyphicons.message_ban i:before {
-  content: "\e127";
-}
-.glyphicons.message_flag i:before {
-  content: "\e128";
-}
-.glyphicons.message_lock i:before {
-  content: "\e129";
-}
-.glyphicons.message_new i:before {
-  content: "\e130";
-}
-.glyphicons.inbox i:before {
-  content: "\e131";
-}
-.glyphicons.inbox_plus i:before {
-  content: "\e132";
-}
-.glyphicons.inbox_minus i:before {
-  content: "\e133";
-}
-.glyphicons.inbox_lock i:before {
-  content: "\e134";
-}
-.glyphicons.inbox_in i:before {
-  content: "\e135";
-}
-.glyphicons.inbox_out i:before {
-  content: "\e136";
-}
-.glyphicons.cogwheel i:before {
-  content: "\e137";
-}
-.glyphicons.cogwheels i:before {
-  content: "\e138";
-}
-.glyphicons.picture i:before {
-  content: "\e139";
-}
-.glyphicons.adjust_alt i:before {
-  content: "\e140";
-}
-.glyphicons.database_lock i:before {
-  content: "\e141";
-}
-.glyphicons.database_plus i:before {
-  content: "\e142";
-}
-.glyphicons.database_minus i:before {
-  content: "\e143";
-}
-.glyphicons.database_ban i:before {
-  content: "\e144";
-}
-.glyphicons.folder_open i:before {
-  content: "\e145";
-}
-.glyphicons.folder_plus i:before {
-  content: "\e146";
-}
-.glyphicons.folder_minus i:before {
-  content: "\e147";
-}
-.glyphicons.folder_lock i:before {
-  content: "\e148";
-}
-.glyphicons.folder_flag i:before {
-  content: "\e149";
-}
-.glyphicons.folder_new i:before {
-  content: "\e150";
-}
-.glyphicons.edit i:before {
-  content: "\e151";
-}
-.glyphicons.new_window i:before {
-  content: "\e152";
-}
-.glyphicons.check i:before {
-  content: "\e153";
-}
-.glyphicons.unchecked i:before {
-  content: "\e154";
-}
-.glyphicons.more_windows i:before {
-  content: "\e155";
-}
-.glyphicons.show_big_thumbnails i:before {
-  content: "\e156";
-}
-.glyphicons.show_thumbnails i:before {
-  content: "\e157";
-}
-.glyphicons.show_thumbnails_with_lines i:before {
-  content: "\e158";
-}
-.glyphicons.show_lines i:before {
-  content: "\e159";
-}
-.glyphicons.playlist i:before {
-  content: "\e160";
-}
-.glyphicons.imac i:before {
-  content: "\e161";
-}
-.glyphicons.macbook i:before {
-  content: "\e162";
-}
-.glyphicons.ipad i:before {
-  content: "\e163";
-}
-.glyphicons.iphone i:before {
-  content: "\e164";
-}
-.glyphicons.iphone_transfer i:before {
-  content: "\e165";
-}
-.glyphicons.iphone_exchange i:before {
-  content: "\e166";
-}
-.glyphicons.ipod i:before {
-  content: "\e167";
-}
-.glyphicons.ipod_shuffle i:before {
-  content: "\e168";
-}
-.glyphicons.ear_plugs i:before {
-  content: "\e169";
-}
-.glyphicons.phone i:before {
-  content: "\e170";
-}
-.glyphicons.step_backward i:before {
-  content: "\e171";
-}
-.glyphicons.fast_backward i:before {
-  content: "\e172";
-}
-.glyphicons.rewind i:before {
-  content: "\e173";
-}
-.glyphicons.play i:before {
-  content: "\e174";
-}
-.glyphicons.pause i:before {
-  content: "\e175";
-}
-.glyphicons.stop i:before {
-  content: "\e176";
-}
-.glyphicons.forward i:before {
-  content: "\e177";
-}
-.glyphicons.fast_forward i:before {
-  content: "\e178";
-}
-.glyphicons.step_forward i:before {
-  content: "\e179";
-}
-.glyphicons.eject i:before {
-  content: "\e180";
-}
-.glyphicons.facetime_video i:before {
-  content: "\e181";
-}
-.glyphicons.download_alt i:before {
-  content: "\e182";
-}
-.glyphicons.mute i:before {
-  content: "\e183";
-}
-.glyphicons.volume_down i:before {
-  content: "\e184";
-}
-.glyphicons.volume_up i:before {
-  content: "\e185";
-}
-.glyphicons.screenshot i:before {
-  content: "\e186";
-}
-.glyphicons.move i:before {
-  content: "\e187";
-}
-.glyphicons.more i:before {
-  content: "\e188";
-}
-.glyphicons.brightness_reduce i:before {
-  content: "\e189";
-}
-.glyphicons.brightness_increase i:before {
-  content: "\e190";
-}
-.glyphicons.circle_plus i:before {
-  content: "\e191";
-}
-.glyphicons.circle_minus i:before {
-  content: "\e192";
-}
-.glyphicons.circle_remove i:before {
-  content: "\e193";
-}
-.glyphicons.circle_ok i:before {
-  content: "\e194";
-}
-.glyphicons.circle_question_mark i:before {
-  content: "\e195";
-}
-.glyphicons.circle_info i:before {
-  content: "\e196";
-}
-.glyphicons.circle_exclamation_mark i:before {
-  content: "\e197";
-}
-.glyphicons.remove i:before {
-  content: "\e198";
-}
-.glyphicons.ok i:before {
-  content: "\e199";
-}
-.glyphicons.ban i:before {
-  content: "\e200";
-}
-.glyphicons.download i:before {
-  content: "\e201";
-}
-.glyphicons.upload i:before {
-  content: "\e202";
-}
-.glyphicons.shopping_cart i:before {
-  content: "\e203";
-}
-.glyphicons.lock i:before {
-  content: "\e204";
-}
-.glyphicons.unlock i:before {
-  content: "\e205";
-}
-.glyphicons.electricity i:before {
-  content: "\e206";
-}
-.glyphicons.ok_2 i:before {
-  content: "\e207";
-}
-.glyphicons.remove_2 i:before {
-  content: "\e208";
-}
-.glyphicons.cart_out i:before {
-  content: "\e209";
-}
-.glyphicons.cart_in i:before {
-  content: "\e210";
-}
-.glyphicons.left_arrow i:before {
-  content: "\e211";
-}
-.glyphicons.right_arrow i:before {
-  content: "\e212";
-}
-.glyphicons.down_arrow i:before {
-  content: "\e213";
-}
-.glyphicons.up_arrow i:before {
-  content: "\e214";
-}
-.glyphicons.resize_small i:before {
-  content: "\e215";
-}
-.glyphicons.resize_full i:before {
-  content: "\e216";
-}
-.glyphicons.circle_arrow_left i:before {
-  content: "\e217";
-}
-.glyphicons.circle_arrow_right i:before {
-  content: "\e218";
-}
-.glyphicons.circle_arrow_top i:before {
-  content: "\e219";
-}
-.glyphicons.circle_arrow_down i:before {
-  content: "\e220";
-}
-.glyphicons.play_button i:before {
-  content: "\e221";
-}
-.glyphicons.unshare i:before {
-  content: "\e222";
-}
-.glyphicons.share i:before {
-  content: "\e223";
-}
-.glyphicons.chevron-right i:before {
-  content: "\e224";
-}
-.glyphicons.chevron-left i:before {
-  content: "\e225";
-}
-.glyphicons.bluetooth i:before {
-  content: "\e226";
-}
-.glyphicons.euro i:before {
-  content: "\20AC";
-}
-.glyphicons.usd i:before {
-  content: "\e228";
-}
-.glyphicons.gbp i:before {
-  content: "\e229";
-}
-.glyphicons.retweet_2 i:before {
-  content: "\e230";
-}
-.glyphicons.moon i:before {
-  content: "\e231";
-}
-.glyphicons.sun i:before {
-  content: "\2609";
-}
-.glyphicons.cloud i:before {
-  content: "\2601";
-}
-.glyphicons.direction i:before {
-  content: "\e234";
-}
-.glyphicons.brush i:before {
-  content: "\e235";
-}
-.glyphicons.pen i:before {
-  content: "\e236";
-}
-.glyphicons.zoom_in i:before {
-  content: "\e237";
-}
-.glyphicons.zoom_out i:before {
-  content: "\e238";
-}
-.glyphicons.pin i:before {
-  content: "\e239";
-}
-.glyphicons.albums i:before {
-  content: "\e240";
-}
-.glyphicons.rotation_lock i:before {
-  content: "\e241";
-}
-.glyphicons.flash i:before {
-  content: "\e242";
-}
-.glyphicons.google_maps i:before {
-  content: "\e243";
-}
-.glyphicons.anchor i:before {
-  content: "\2693";
-}
-.glyphicons.conversation i:before {
-  content: "\e245";
-}
-.glyphicons.chat i:before {
-  content: "\e246";
-}
-.glyphicons.male i:before {
-  content: "\e247";
-}
-.glyphicons.female i:before {
-  content: "\e248";
-}
-.glyphicons.asterisk i:before {
-  content: "\002A";
-}
-.glyphicons.divide i:before {
-  content: "\00F7";
-}
-.glyphicons.snorkel_diving i:before {
-  content: "\e251";
-}
-.glyphicons.scuba_diving i:before {
-  content: "\e252";
-}
-.glyphicons.oxygen_bottle i:before {
-  content: "\e253";
-}
-.glyphicons.fins i:before {
-  content: "\e254";
-}
-.glyphicons.fishes i:before {
-  content: "\e255";
-}
-.glyphicons.boat i:before {
-  content: "\e256";
-}
-.glyphicons.delete i:before {
-  content: "\e257";
-}
-.glyphicons.sheriffs_star i:before {
-  content: "\e258";
-}
-.glyphicons.qrcode i:before {
-  content: "\e259";
-}
-.glyphicons.barcode i:before {
-  content: "\e260";
-}
-.glyphicons.pool i:before {
-  content: "\e261";
-}
-.glyphicons.buoy i:before {
-  content: "\e262";
-}
-.glyphicons.spade i:before {
-  content: "\e263";
-}
-.glyphicons.bank i:before {
-  content: "\e264";
-}
-.glyphicons.vcard i:before {
-  content: "\e265";
-}
-.glyphicons.electrical_plug i:before {
-  content: "\e266";
-}
-.glyphicons.flag i:before {
-  content: "\e267";
-}
-.glyphicons.credit_card i:before {
-  content: "\e268";
-}
-.glyphicons.keyboard-wireless i:before {
-  content: "\e269";
-}
-.glyphicons.keyboard-wired i:before {
-  content: "\e270";
-}
-.glyphicons.shield i:before {
-  content: "\e271";
-}
-.glyphicons.ring i:before {
-  content: "\02DA";
-}
-.glyphicons.cake i:before {
-  content: "\e273";
-}
-.glyphicons.drink i:before {
-  content: "\e274";
-}
-.glyphicons.beer i:before {
-  content: "\e275";
-}
-.glyphicons.fast_food i:before {
-  content: "\e276";
-}
-.glyphicons.cutlery i:before {
-  content: "\e277";
-}
-.glyphicons.pizza i:before {
-  content: "\e278";
-}
-.glyphicons.birthday_cake i:before {
-  content: "\e279";
-}
-.glyphicons.tablet i:before {
-  content: "\e280";
-}
-.glyphicons.settings i:before {
-  content: "\e281";
-}
-.glyphicons.bullets i:before {
-  content: "\e282";
-}
-.glyphicons.cardio i:before {
-  content: "\e283";
-}
-.glyphicons.t-shirt i:before {
-  content: "\e284";
-}
-.glyphicons.pants i:before {
-  content: "\e285";
-}
-.glyphicons.sweater i:before {
-  content: "\e286";
-}
-.glyphicons.fabric i:before {
-  content: "\e287";
-}
-.glyphicons.leather i:before {
-  content: "\e288";
-}
-.glyphicons.scissors i:before {
-  content: "\e289";
-}
-.glyphicons.bomb i:before {
-  content: "\e290";
-}
-.glyphicons.skull i:before {
-  content: "\e291";
-}
-.glyphicons.celebration i:before {
-  content: "\e292";
-}
-.glyphicons.tea_kettle i:before {
-  content: "\e293";
-}
-.glyphicons.french_press i:before {
-  content: "\e294";
-}
-.glyphicons.coffe_cup i:before {
-  content: "\e295";
-}
-.glyphicons.pot i:before {
-  content: "\e296";
-}
-.glyphicons.grater i:before {
-  content: "\e297";
-}
-.glyphicons.kettle i:before {
-  content: "\e298";
-}
-.glyphicons.hospital i:before {
-  content: "\e299";
-}
-.glyphicons.hospital_h i:before {
-  content: "\e300";
-}
-.glyphicons.microphone i:before {
-  content: "\e301";
-}
-.glyphicons.webcam i:before {
-  content: "\e302";
-}
-.glyphicons.temple_christianity_church i:before {
-  content: "\e303";
-}
-.glyphicons.temple_islam i:before {
-  content: "\e304";
-}
-.glyphicons.temple_hindu i:before {
-  content: "\e305";
-}
-.glyphicons.temple_buddhist i:before {
-  content: "\e306";
-}
-.glyphicons.bicycle i:before {
-  content: "\e307";
-}
-.glyphicons.life_preserver i:before {
-  content: "\e308";
-}
-.glyphicons.share_alt i:before {
-  content: "\e309";
-}
-.glyphicons.comments i:before {
-  content: "\e310";
-}
-.glyphicons.flower i:before {
-  content: "\2698";
-}
-.glyphicons.baseball i:before {
-  content: "\e312";
-}
-.glyphicons.rugby i:before {
-  content: "\e313";
-}
-.glyphicons.ax i:before {
-  content: "\e314";
-}
-.glyphicons.table_tennis i:before {
-  content: "\e315";
-}
-.glyphicons.bowling i:before {
-  content: "\e316";
-}
-.glyphicons.tree_conifer i:before {
-  content: "\e317";
-}
-.glyphicons.tree_deciduous i:before {
-  content: "\e318";
-}
-.glyphicons.more_items i:before {
-  content: "\e319";
-}
-.glyphicons.sort i:before {
-  content: "\e320";
-}
-.glyphicons.filter i:before {
-  content: "\e321";
-}
-.glyphicons.gamepad i:before {
-  content: "\e322";
-}
-.glyphicons.playing_dices i:before {
-  content: "\e323";
-}
-.glyphicons.calculator i:before {
-  content: "\e324";
-}
-.glyphicons.tie i:before {
-  content: "\e325";
-}
-.glyphicons.wallet i:before {
-  content: "\e326";
-}
-.glyphicons.piano i:before {
-  content: "\e327";
-}
-.glyphicons.sampler i:before {
-  content: "\e328";
-}
-.glyphicons.podium i:before {
-  content: "\e329";
-}
-.glyphicons.soccer_ball i:before {
-  content: "\e330";
-}
-.glyphicons.blog i:before {
-  content: "\e331";
-}
-.glyphicons.dashboard i:before {
-  content: "\e332";
-}
-.glyphicons.certificate i:before {
-  content: "\e333";
-}
-.glyphicons.bell i:before {
-  content: "\e334";
-}
-.glyphicons.candle i:before {
-  content: "\e335";
-}
-.glyphicons.pushpin i:before {
-  content: "\e336";
-}
-.glyphicons.iphone_shake i:before {
-  content: "\e337";
-}
-.glyphicons.pin_flag i:before {
-  content: "\e338";
-}
-.glyphicons.turtle i:before {
-  content: "\e339";
-}
-.glyphicons.rabbit i:before {
-  content: "\e340";
-}
-.glyphicons.globe i:before {
-  content: "\e341";
-}
-.glyphicons.briefcase i:before {
-  content: "\e342";
-}
-.glyphicons.hdd i:before {
-  content: "\e343";
-}
-.glyphicons.thumbs_up i:before {
-  content: "\e344";
-}
-.glyphicons.thumbs_down i:before {
-  content: "\e345";
-}
-.glyphicons.hand_right i:before {
-  content: "\e346";
-}
-.glyphicons.hand_left i:before {
-  content: "\e347";
-}
-.glyphicons.hand_up i:before {
-  content: "\e348";
-}
-.glyphicons.hand_down i:before {
-  content: "\e349";
-}
-.glyphicons.fullscreen i:before {
-  content: "\e350";
-}
-.glyphicons.shopping_bag i:before {
-  content: "\e351";
-}
-.glyphicons.book_open i:before {
-  content: "\e352";
-}
-.glyphicons.nameplate i:before {
-  content: "\e353";
-}
-.glyphicons.nameplate_alt i:before {
-  content: "\e354";
-}
-.glyphicons.vases i:before {
-  content: "\e355";
-}
-.glyphicons.bullhorn i:before {
-  content: "\e356";
-}
-.glyphicons.dumbbell i:before {
-  content: "\e357";
-}
-.glyphicons.suitcase i:before {
-  content: "\e358";
-}
-.glyphicons.file_import i:before {
-  content: "\e359";
-}
-.glyphicons.file_export i:before {
-  content: "\e360";
-}
-.glyphicons.bug i:before {
-  content: "\e361";
-}
-.glyphicons.crown i:before {
-  content: "\e362";
-}
-.glyphicons.smoking i:before {
-  content: "\e363";
-}
-.glyphicons.cloud-upload i:before {
-  content: "\e364";
-}
-.glyphicons.cloud-download i:before {
-  content: "\e365";
-}
-.glyphicons.restart i:before {
-  content: "\e366";
-}
-.glyphicons.security_camera i:before {
-  content: "\e367";
-}
-.glyphicons.expand i:before {
-  content: "\e368";
-}
-.glyphicons.collapse i:before {
-  content: "\e369";
-}
-.glyphicons.collapse_top i:before {
-  content: "\e370";
-}
-.glyphicons.globe_af i:before {
-  content: "\e371";
-}
-.glyphicons.global i:before {
-  content: "\e372";
-}
-.glyphicons.spray i:before {
-  content: "\e373";
-}
-.glyphicons.nails i:before {
-  content: "\e374";
-}
-.glyphicons.claw_hammer i:before {
-  content: "\e375";
-}
-.glyphicons.classic_hammer i:before {
-  content: "\e376";
-}
-.glyphicons.hand_saw i:before {
-  content: "\e377";
-}
-.glyphicons.riflescope i:before {
-  content: "\e378";
-}
-.glyphicons.electrical_socket_eu i:before {
-  content: "\e379";
-}
-.glyphicons.electrical_socket_us i:before {
-  content: "\e380";
-}
-.glyphicons.pinterest i:before {
-  content: "\e381";
-}
-.glyphicons.dropbox i:before {
-  content: "\e382";
-}
-.glyphicons.google_plus i:before {
-  content: "\e383";
-}
-.glyphicons.jolicloud i:before {
-  content: "\e384";
-}
-.glyphicons.yahoo i:before {
-  content: "\e385";
-}
-.glyphicons.blogger i:before {
-  content: "\e386";
-}
-.glyphicons.picasa i:before {
-  content: "\e387";
-}
-.glyphicons.amazon i:before {
-  content: "\e388";
-}
-.glyphicons.tumblr i:before {
-  content: "\e389";
-}
-.glyphicons.wordpress i:before {
-  content: "\e390";
-}
-.glyphicons.instapaper i:before {
-  content: "\e391";
-}
-.glyphicons.evernote i:before {
-  content: "\e392";
-}
-.glyphicons.xing i:before {
-  content: "\e393";
-}
-.glyphicons.zootool i:before {
-  content: "\e394";
-}
-.glyphicons.dribbble i:before {
-  content: "\e395";
-}
-.glyphicons.deviantart i:before {
-  content: "\e396";
-}
-.glyphicons.read_it_later i:before {
-  content: "\e397";
-}
-.glyphicons.linked_in i:before {
-  content: "\e398";
-}
-.glyphicons.forrst i:before {
-  content: "\e399";
-}
-.glyphicons.pinboard i:before {
-  content: "\e400";
-}
-.glyphicons.behance i:before {
-  content: "\e401";
-}
-.glyphicons.github i:before {
-  content: "\e402";
-}
-.glyphicons.youtube i:before {
-  content: "\e403";
-}
-.glyphicons.skitch i:before {
-  content: "\e404";
-}
-.glyphicons.foursquare i:before {
-  content: "\e405";
-}
-.glyphicons.quora i:before {
-  content: "\e406";
-}
-.glyphicons.badoo i:before {
-  content: "\e407";
-}
-.glyphicons.spotify i:before {
-  content: "\e408";
-}
-.glyphicons.stumbleupon i:before {
-  content: "\e409";
-}
-.glyphicons.readability i:before {
-  content: "\e410";
-}
-.glyphicons.facebook i:before {
-  content: "\e411";
-}
-.glyphicons.twitter i:before {
-  content: "\e412";
-}
-.glyphicons.instagram i:before {
-  content: "\e413";
-}
-.glyphicons.posterous_spaces i:before {
-  content: "\e414";
-}
-.glyphicons.vimeo i:before {
-  content: "\e415";
-}
-.glyphicons.flickr i:before {
-  content: "\e416";
-}
-.glyphicons.last_fm i:before {
-  content: "\e417";
-}
-.glyphicons.rss i:before {
-  content: "\e418";
-}
-.glyphicons.skype i:before {
-  content: "\e419";
-}
-.glyphicons.e-mail i:before {
-  content: "\e420";
-}
-.glyphicons-icon {
-  display: inline-block;
-  width: 48px;
-  height: 48px;
-  line-height: 48px;
-  vertical-align: text-top;
-  background-image: url(../../img/glyphicons/glyphicons.png);
-  background-position: 0 0;
-  background-repeat: no-repeat;
-  vertical-align: top;
-  *display: inline;
-  *zoom: 1;
-  *margin-right: .3em;
-}
-.no-inlinesvg .glyphicons-icon {
-  background-image: url(../../img/glyphicons/glyphicons.png);
-}
-.glyphicons-icon.white {
-  background-image: url(../../img/glyphicons/glyphicons-white.svg);
-}
-.no-inlinesvg .glyphicons-icon.white {
-  background-image: url(../../img/glyphicons/glyphicons-white.png);
-}
-.glyphicons-icon.glass {
-  background-position: 4px 11px;
-}
-.glyphicons-icon.leaf {
-  background-position: -44px 11px;
-}
-.glyphicons-icon.dog {
-  background-position: -92px 11px;
-}
-.glyphicons-icon.user {
-  background-position: -140px 11px;
-}
-.glyphicons-icon.girl {
-  background-position: -188px 11px;
-}
-.glyphicons-icon.car {
-  background-position: -236px 11px;
-}
-.glyphicons-icon.user_add {
-  background-position: -284px 11px;
-}
-.glyphicons-icon.user_remove {
-  background-position: -332px 11px;
-}
-.glyphicons-icon.film {
-  background-position: -380px 11px;
-}
-.glyphicons-icon.magic {
-  background-position: -428px 11px;
-}
-.glyphicons-icon.envelope {
-  background-position: 4px -37px;
-}
-.glyphicons-icon.camera {
-  background-position: -44px -37px;
-}
-.glyphicons-icon.heart {
-  background-position: -92px -37px;
-}
-.glyphicons-icon.beach_umbrella {
-  background-position: -140px -37px;
-}
-.glyphicons-icon.train {
-  background-position: -188px -37px;
-}
-.glyphicons-icon.print {
-  background-position: -236px -37px;
-}
-.glyphicons-icon.bin {
-  background-position: -284px -37px;
-}
-.glyphicons-icon.music {
-  background-position: -332px -37px;
-}
-.glyphicons-icon.note {
-  background-position: -380px -37px;
-}
-.glyphicons-icon.heart_empty {
-  background-position: -428px -37px;
-}
-.glyphicons-icon.home {
-  background-position: 4px -85px;
-}
-.glyphicons-icon.snowflake {
-  background-position: -44px -85px;
-}
-.glyphicons-icon.fire {
-  background-position: -92px -85px;
-}
-.glyphicons-icon.magnet {
-  background-position: -140px -85px;
-}
-.glyphicons-icon.parents {
-  background-position: -188px -85px;
-}
-.glyphicons-icon.binoculars {
-  background-position: -236px -85px;
-}
-.glyphicons-icon.road {
-  background-position: -284px -85px;
-}
-.glyphicons-icon.search {
-  background-position: -332px -85px;
-}
-.glyphicons-icon.cars {
-  background-position: -380px -85px;
-}
-.glyphicons-icon.notes_2 {
-  background-position: -428px -85px;
-}
-.glyphicons-icon.pencil {
-  background-position: 4px -133px;
-}
-.glyphicons-icon.bus {
-  background-position: -44px -133px;
-}
-.glyphicons-icon.wifi_alt {
-  background-position: -92px -133px;
-}
-.glyphicons-icon.luggage {
-  background-position: -140px -133px;
-}
-.glyphicons-icon.old_man {
-  background-position: -188px -133px;
-}
-.glyphicons-icon.woman {
-  background-position: -236px -133px;
-}
-.glyphicons-icon.file {
-  background-position: -284px -133px;
-}
-.glyphicons-icon.coins {
-  background-position: -332px -133px;
-}
-.glyphicons-icon.airplane {
-  background-position: -380px -133px;
-}
-.glyphicons-icon.notes {
-  background-position: -428px -133px;
-}
-.glyphicons-icon.stats {
-  background-position: 4px -181px;
-}
-.glyphicons-icon.charts {
-  background-position: -44px -181px;
-}
-.glyphicons-icon.pie_chart {
-  background-position: -92px -181px;
-}
-.glyphicons-icon.group {
-  background-position: -140px -181px;
-}
-.glyphicons-icon.keys {
-  background-position: -188px -181px;
-}
-.glyphicons-icon.calendar {
-  background-position: -236px -181px;
-}
-.glyphicons-icon.router {
-  background-position: -284px -181px;
-}
-.glyphicons-icon.camera_small {
-  background-position: -332px -181px;
-}
-.glyphicons-icon.dislikes {
-  background-position: -380px -181px;
-}
-.glyphicons-icon.star {
-  background-position: -428px -181px;
-}
-.glyphicons-icon.link {
-  background-position: 4px -229px;
-}
-.glyphicons-icon.eye_open {
-  background-position: -44px -229px;
-}
-.glyphicons-icon.eye_close {
-  background-position: -92px -229px;
-}
-.glyphicons-icon.alarm {
-  background-position: -140px -229px;
-}
-.glyphicons-icon.clock {
-  background-position: -188px -229px;
-}
-.glyphicons-icon.stopwatch {
-  background-position: -236px -229px;
-}
-.glyphicons-icon.projector {
-  background-position: -284px -229px;
-}
-.glyphicons-icon.history {
-  background-position: -332px -229px;
-}
-.glyphicons-icon.truck {
-  background-position: -380px -229px;
-}
-.glyphicons-icon.cargo {
-  background-position: -428px -229px;
-}
-.glyphicons-icon.compass {
-  background-position: 4px -277px;
-}
-.glyphicons-icon.keynote {
-  background-position: -44px -277px;
-}
-.glyphicons-icon.paperclip {
-  background-position: -92px -277px;
-}
-.glyphicons-icon.power {
-  background-position: -140px -277px;
-}
-.glyphicons-icon.lightbulb {
-  background-position: -188px -277px;
-}
-.glyphicons-icon.tag {
-  background-position: -236px -277px;
-}
-.glyphicons-icon.tags {
-  background-position: -284px -277px;
-}
-.glyphicons-icon.cleaning {
-  background-position: -332px -277px;
-}
-.glyphicons-icon.ruller {
-  background-position: -380px -277px;
-}
-.glyphicons-icon.gift {
-  background-position: -428px -277px;
-}
-.glyphicons-icon.umbrella {
-  background-position: 4px -325px;
-}
-.glyphicons-icon.book {
-  background-position: -44px -325px;
-}
-.glyphicons-icon.bookmark {
-  background-position: -92px -325px;
-}
-.glyphicons-icon.wifi {
-  background-position: -140px -325px;
-}
-.glyphicons-icon.cup {
-  background-position: -188px -325px;
-}
-.glyphicons-icon.stroller {
-  background-position: -236px -325px;
-}
-.glyphicons-icon.headphones {
-  background-position: -284px -325px;
-}
-.glyphicons-icon.headset {
-  background-position: -332px -325px;
-}
-.glyphicons-icon.warning_sign {
-  background-position: -380px -325px;
-}
-.glyphicons-icon.signal {
-  background-position: -428px -325px;
-}
-.glyphicons-icon.retweet {
-  background-position: 4px -373px;
-}
-.glyphicons-icon.refresh {
-  background-position: -44px -373px;
-}
-.glyphicons-icon.roundabout {
-  background-position: -92px -373px;
-}
-.glyphicons-icon.random {
-  background-position: -140px -373px;
-}
-.glyphicons-icon.heat {
-  background-position: -188px -373px;
-}
-.glyphicons-icon.repeat {
-  background-position: -236px -373px;
-}
-.glyphicons-icon.display {
-  background-position: -284px -373px;
-}
-.glyphicons-icon.log_book {
-  background-position: -332px -373px;
-}
-.glyphicons-icon.adress_book {
-  background-position: -380px -373px;
-}
-.glyphicons-icon.building {
-  background-position: -428px -373px;
-}
-.glyphicons-icon.eyedropper {
-  background-position: 4px -421px;
-}
-.glyphicons-icon.adjust {
-  background-position: -44px -421px;
-}
-.glyphicons-icon.tint {
-  background-position: -92px -421px;
-}
-.glyphicons-icon.crop {
-  background-position: -140px -421px;
-}
-.glyphicons-icon.vector_path_square {
-  background-position: -188px -421px;
-}
-.glyphicons-icon.vector_path_circle {
-  background-position: -236px -421px;
-}
-.glyphicons-icon.vector_path_polygon {
-  background-position: -284px -421px;
-}
-.glyphicons-icon.vector_path_line {
-  background-position: -332px -421px;
-}
-.glyphicons-icon.vector_path_curve {
-  background-position: -380px -421px;
-}
-.glyphicons-icon.vector_path_all {
-  background-position: -428px -421px;
-}
-.glyphicons-icon.font {
-  background-position: 4px -469px;
-}
-.glyphicons-icon.italic {
-  background-position: -44px -469px;
-}
-.glyphicons-icon.bold {
-  background-position: -92px -469px;
-}
-.glyphicons-icon.text_underline {
-  background-position: -140px -469px;
-}
-.glyphicons-icon.text_strike {
-  background-position: -188px -469px;
-}
-.glyphicons-icon.text_height {
-  background-position: -236px -469px;
-}
-.glyphicons-icon.text_width {
-  background-position: -284px -469px;
-}
-.glyphicons-icon.text_resize {
-  background-position: -332px -469px;
-}
-.glyphicons-icon.left_indent {
-  background-position: -380px -469px;
-}
-.glyphicons-icon.right_indent {
-  background-position: -428px -469px;
-}
-.glyphicons-icon.align_left {
-  background-position: 4px -517px;
-}
-.glyphicons-icon.align_center {
-  background-position: -44px -517px;
-}
-.glyphicons-icon.align_right {
-  background-position: -92px -517px;
-}
-.glyphicons-icon.justify {
-  background-position: -140px -517px;
-}
-.glyphicons-icon.list {
-  background-position: -188px -517px;
-}
-.glyphicons-icon.text_smaller {
-  background-position: -236px -517px;
-}
-.glyphicons-icon.text_bigger {
-  background-position: -284px -517px;
-}
-.glyphicons-icon.embed {
-  background-position: -332px -517px;
-}
-.glyphicons-icon.embed_close {
-  background-position: -380px -517px;
-}
-.glyphicons-icon.table {
-  background-position: -428px -517px;
-}
-.glyphicons-icon.message_full {
-  background-position: 4px -565px;
-}
-.glyphicons-icon.message_empty {
-  background-position: -44px -565px;
-}
-.glyphicons-icon.message_in {
-  background-position: -92px -565px;
-}
-.glyphicons-icon.message_out {
-  background-position: -140px -565px;
-}
-.glyphicons-icon.message_plus {
-  background-position: -188px -565px;
-}
-.glyphicons-icon.message_minus {
-  background-position: -236px -565px;
-}
-.glyphicons-icon.message_ban {
-  background-position: -284px -565px;
-}
-.glyphicons-icon.message_flag {
-  background-position: -332px -565px;
-}
-.glyphicons-icon.message_lock {
-  background-position: -380px -565px;
-}
-.glyphicons-icon.message_new {
-  background-position: -428px -565px;
-}
-.glyphicons-icon.inbox {
-  background-position: 4px -613px;
-}
-.glyphicons-icon.inbox_plus {
-  background-position: -44px -613px;
-}
-.glyphicons-icon.inbox_minus {
-  background-position: -92px -613px;
-}
-.glyphicons-icon.inbox_lock {
-  background-position: -140px -613px;
-}
-.glyphicons-icon.inbox_in {
-  background-position: -188px -613px;
-}
-.glyphicons-icon.inbox_out {
-  background-position: -236px -613px;
-}
-.glyphicons-icon.cogwheel {
-  background-position: -284px -613px;
-}
-.glyphicons-icon.cogwheels {
-  background-position: -332px -613px;
-}
-.glyphicons-icon.picture {
-  background-position: -380px -613px;
-}
-.glyphicons-icon.adjust_alt {
-  background-position: -428px -613px;
-}
-.glyphicons-icon.database_lock {
-  background-position: 4px -661px;
-}
-.glyphicons-icon.database_plus {
-  background-position: -44px -661px;
-}
-.glyphicons-icon.database_minus {
-  background-position: -92px -661px;
-}
-.glyphicons-icon.database_ban {
-  background-position: -140px -661px;
-}
-.glyphicons-icon.folder_open {
-  background-position: -188px -661px;
-}
-.glyphicons-icon.folder_plus {
-  background-position: -236px -661px;
-}
-.glyphicons-icon.folder_minus {
-  background-position: -284px -661px;
-}
-.glyphicons-icon.folder_lock {
-  background-position: -332px -661px;
-}
-.glyphicons-icon.folder_flag {
-  background-position: -380px -661px;
-}
-.glyphicons-icon.folder_new {
-  background-position: -428px -661px;
-}
-.glyphicons-icon.edit {
-  background-position: 4px -709px;
-}
-.glyphicons-icon.new_window {
-  background-position: -44px -709px;
-}
-.glyphicons-icon.check {
-  background-position: -92px -709px;
-}
-.glyphicons-icon.unchecked {
-  background-position: -140px -709px;
-}
-.glyphicons-icon.more_windows {
-  background-position: -188px -709px;
-}
-.glyphicons-icon.show_big_thumbnails {
-  background-position: -236px -709px;
-}
-.glyphicons-icon.show_thumbnails {
-  background-position: -284px -709px;
-}
-.glyphicons-icon.show_thumbnails_with_lines {
-  background-position: -332px -709px;
-}
-.glyphicons-icon.show_lines {
-  background-position: -380px -709px;
-}
-.glyphicons-icon.playlist {
-  background-position: -428px -709px;
-}
-.glyphicons-icon.imac {
-  background-position: 4px -757px;
-}
-.glyphicons-icon.macbook {
-  background-position: -44px -757px;
-}
-.glyphicons-icon.ipad {
-  background-position: -92px -757px;
-}
-.glyphicons-icon.iphone {
-  background-position: -140px -757px;
-}
-.glyphicons-icon.iphone_transfer {
-  background-position: -188px -757px;
-}
-.glyphicons-icon.iphone_exchange {
-  background-position: -236px -757px;
-}
-.glyphicons-icon.ipod {
-  background-position: -284px -757px;
-}
-.glyphicons-icon.ipod_shuffle {
-  background-position: -332px -757px;
-}
-.glyphicons-icon.ear_plugs {
-  background-position: -380px -757px;
-}
-.glyphicons-icon.phone {
-  background-position: -428px -757px;
-}
-.glyphicons-icon.step_backward {
-  background-position: 4px -805px;
-}
-.glyphicons-icon.fast_backward {
-  background-position: -44px -805px;
-}
-.glyphicons-icon.rewind {
-  background-position: -92px -805px;
-}
-.glyphicons-icon.play {
-  background-position: -140px -805px;
-}
-.glyphicons-icon.pause {
-  background-position: -188px -805px;
-}
-.glyphicons-icon.stop {
-  background-position: -236px -805px;
-}
-.glyphicons-icon.forward {
-  background-position: -284px -805px;
-}
-.glyphicons-icon.fast_forward {
-  background-position: -332px -805px;
-}
-.glyphicons-icon.step_forward {
-  background-position: -380px -805px;
-}
-.glyphicons-icon.eject {
-  background-position: -428px -805px;
-}
-.glyphicons-icon.facetime_video {
-  background-position: 4px -853px;
-}
-.glyphicons-icon.download_alt {
-  background-position: -44px -853px;
-}
-.glyphicons-icon.mute {
-  background-position: -92px -853px;
-}
-.glyphicons-icon.volume_down {
-  background-position: -140px -853px;
-}
-.glyphicons-icon.volume_up {
-  background-position: -188px -853px;
-}
-.glyphicons-icon.screenshot {
-  background-position: -236px -853px;
-}
-.glyphicons-icon.move {
-  background-position: -284px -853px;
-}
-.glyphicons-icon.more {
-  background-position: -332px -853px;
-}
-.glyphicons-icon.brightness_reduce {
-  background-position: -380px -853px;
-}
-.glyphicons-icon.brightness_increase {
-  background-position: -428px -853px;
-}
-.glyphicons-icon.circle_plus {
-  background-position: 4px -901px;
-}
-.glyphicons-icon.circle_minus {
-  background-position: -44px -901px;
-}
-.glyphicons-icon.circle_remove {
-  background-position: -92px -901px;
-}
-.glyphicons-icon.circle_ok {
-  background-position: -140px -901px;
-}
-.glyphicons-icon.circle_question_mark {
-  background-position: -188px -901px;
-}
-.glyphicons-icon.circle_info {
-  background-position: -236px -901px;
-}
-.glyphicons-icon.circle_exclamation_mark {
-  background-position: -284px -901px;
-}
-.glyphicons-icon.remove {
-  background-position: -332px -901px;
-}
-.glyphicons-icon.ok {
-  background-position: -380px -901px;
-}
-.glyphicons-icon.ban {
-  background-position: -428px -901px;
-}
-.glyphicons-icon.download {
-  background-position: 4px -949px;
-}
-.glyphicons-icon.upload {
-  background-position: -44px -949px;
-}
-.glyphicons-icon.shopping_cart {
-  background-position: -92px -949px;
-}
-.glyphicons-icon.lock {
-  background-position: -140px -949px;
-}
-.glyphicons-icon.unlock {
-  background-position: -188px -949px;
-}
-.glyphicons-icon.electricity {
-  background-position: -236px -949px;
-}
-.glyphicons-icon.ok_2 {
-  background-position: -284px -949px;
-}
-.glyphicons-icon.remove_2 {
-  background-position: -332px -949px;
-}
-.glyphicons-icon.cart_out {
-  background-position: -380px -949px;
-}
-.glyphicons-icon.cart_in {
-  background-position: -428px -949px;
-}
-.glyphicons-icon.left_arrow {
-  background-position: 4px -997px;
-}
-.glyphicons-icon.right_arrow {
-  background-position: -44px -997px;
-}
-.glyphicons-icon.down_arrow {
-  background-position: -92px -997px;
-}
-.glyphicons-icon.up_arrow {
-  background-position: -140px -997px;
-}
-.glyphicons-icon.resize_small {
-  background-position: -188px -997px;
-}
-.glyphicons-icon.resize_full {
-  background-position: -236px -997px;
-}
-.glyphicons-icon.circle_arrow_left {
-  background-position: -284px -997px;
-}
-.glyphicons-icon.circle_arrow_right {
-  background-position: -332px -997px;
-}
-.glyphicons-icon.circle_arrow_top {
-  background-position: -380px -997px;
-}
-.glyphicons-icon.circle_arrow_down {
-  background-position: -428px -997px;
-}
-.glyphicons-icon.play_button {
-  background-position: 4px -1045px;
-}
-.glyphicons-icon.unshare {
-  background-position: -44px -1045px;
-}
-.glyphicons-icon.share {
-  background-position: -92px -1045px;
-}
-.glyphicons-icon.chevron-right {
-  background-position: -140px -1045px;
-}
-.glyphicons-icon.chevron-left {
-  background-position: -188px -1045px;
-}
-.glyphicons-icon.bluetooth {
-  background-position: -236px -1045px;
-}
-.glyphicons-icon.euro {
-  background-position: -284px -1045px;
-}
-.glyphicons-icon.usd {
-  background-position: -332px -1045px;
-}
-.glyphicons-icon.gbp {
-  background-position: -380px -1045px;
-}
-.glyphicons-icon.retweet_2 {
-  background-position: -428px -1045px;
-}
-.glyphicons-icon.moon {
-  background-position: 4px -1093px;
-}
-.glyphicons-icon.sun {
-  background-position: -44px -1093px;
-}
-.glyphicons-icon.cloud {
-  background-position: -92px -1093px;
-}
-.glyphicons-icon.direction {
-  background-position: -140px -1093px;
-}
-.glyphicons-icon.brush {
-  background-position: -188px -1093px;
-}
-.glyphicons-icon.pen {
-  background-position: -236px -1093px;
-}
-.glyphicons-icon.zoom_in {
-  background-position: -284px -1093px;
-}
-.glyphicons-icon.zoom_out {
-  background-position: -332px -1093px;
-}
-.glyphicons-icon.pin {
-  background-position: -380px -1093px;
-}
-.glyphicons-icon.albums {
-  background-position: -428px -1093px;
-}
-.glyphicons-icon.rotation_lock {
-  background-position: 4px -1141px;
-}
-.glyphicons-icon.flash {
-  background-position: -44px -1141px;
-}
-.glyphicons-icon.google_maps {
-  background-position: -92px -1141px;
-}
-.glyphicons-icon.anchor {
-  background-position: -140px -1141px;
-}
-.glyphicons-icon.conversation {
-  background-position: -188px -1141px;
-}
-.glyphicons-icon.chat {
-  background-position: -236px -1141px;
-}
-.glyphicons-icon.male {
-  background-position: -284px -1141px;
-}
-.glyphicons-icon.female {
-  background-position: -332px -1141px;
-}
-.glyphicons-icon.asterisk {
-  background-position: -380px -1141px;
-}
-.glyphicons-icon.divide {
-  background-position: -428px -1141px;
-}
-.glyphicons-icon.snorkel_diving {
-  background-position: 4px -1189px;
-}
-.glyphicons-icon.scuba_diving {
-  background-position: -44px -1189px;
-}
-.glyphicons-icon.oxygen_bottle {
-  background-position: -92px -1189px;
-}
-.glyphicons-icon.fins {
-  background-position: -140px -1189px;
-}
-.glyphicons-icon.fishes {
-  background-position: -188px -1189px;
-}
-.glyphicons-icon.boat {
-  background-position: -236px -1189px;
-}
-.glyphicons-icon.delete {
-  background-position: -284px -1189px;
-}
-.glyphicons-icon.sheriffs_star {
-  background-position: -332px -1189px;
-}
-.glyphicons-icon.qrcode {
-  background-position: -380px -1189px;
-}
-.glyphicons-icon.barcode {
-  background-position: -428px -1189px;
-}
-.glyphicons-icon.pool {
-  background-position: 4px -1237px;
-}
-.glyphicons-icon.buoy {
-  background-position: -44px -1237px;
-}
-.glyphicons-icon.spade {
-  background-position: -92px -1237px;
-}
-.glyphicons-icon.bank {
-  background-position: -140px -1237px;
-}
-.glyphicons-icon.vcard {
-  background-position: -188px -1237px;
-}
-.glyphicons-icon.electrical_plug {
-  background-position: -236px -1237px;
-}
-.glyphicons-icon.flag {
-  background-position: -284px -1237px;
-}
-.glyphicons-icon.credit_card {
-  background-position: -332px -1237px;
-}
-.glyphicons-icon.keyboard-wireless {
-  background-position: -380px -1237px;
-}
-.glyphicons-icon.keyboard-wired {
-  background-position: -428px -1237px;
-}
-.glyphicons-icon.shield {
-  background-position: 4px -1285px;
-}
-.glyphicons-icon.ring {
-  background-position: -44px -1285px;
-}
-.glyphicons-icon.cake {
-  background-position: -92px -1285px;
-}
-.glyphicons-icon.drink {
-  background-position: -140px -1285px;
-}
-.glyphicons-icon.beer {
-  background-position: -188px -1285px;
-}
-.glyphicons-icon.fast_food {
-  background-position: -236px -1285px;
-}
-.glyphicons-icon.cutlery {
-  background-position: -284px -1285px;
-}
-.glyphicons-icon.pizza {
-  background-position: -332px -1285px;
-}
-.glyphicons-icon.birthday_cake {
-  background-position: -380px -1285px;
-}
-.glyphicons-icon.tablet {
-  background-position: -428px -1285px;
-}
-.glyphicons-icon.settings {
-  background-position: 4px -1333px;
-}
-.glyphicons-icon.bullets {
-  background-position: -44px -1333px;
-}
-.glyphicons-icon.cardio {
-  background-position: -92px -1333px;
-}
-.glyphicons-icon.t-shirt {
-  background-position: -140px -1333px;
-}
-.glyphicons-icon.pants {
-  background-position: -188px -1333px;
-}
-.glyphicons-icon.sweater {
-  background-position: -236px -1333px;
-}
-.glyphicons-icon.fabric {
-  background-position: -284px -1333px;
-}
-.glyphicons-icon.leather {
-  background-position: -332px -1333px;
-}
-.glyphicons-icon.scissors {
-  background-position: -380px -1333px;
-}
-.glyphicons-icon.bomb {
-  background-position: -428px -1333px;
-}
-.glyphicons-icon.skull {
-  background-position: 4px -1381px;
-}
-.glyphicons-icon.celebration {
-  background-position: -44px -1381px;
-}
-.glyphicons-icon.tea_kettle {
-  background-position: -92px -1381px;
-}
-.glyphicons-icon.french_press {
-  background-position: -140px -1381px;
-}
-.glyphicons-icon.coffe_cup {
-  background-position: -188px -1381px;
-}
-.glyphicons-icon.pot {
-  background-position: -236px -1381px;
-}
-.glyphicons-icon.grater {
-  background-position: -284px -1381px;
-}
-.glyphicons-icon.kettle {
-  background-position: -332px -1381px;
-}
-.glyphicons-icon.hospital {
-  background-position: -380px -1381px;
-}
-.glyphicons-icon.hospital_h {
-  background-position: -428px -1381px;
-}
-.glyphicons-icon.microphone {
-  background-position: 4px -1429px;
-}
-.glyphicons-icon.webcam {
-  background-position: -44px -1429px;
-}
-.glyphicons-icon.temple_christianity_church {
-  background-position: -92px -1429px;
-}
-.glyphicons-icon.temple_islam {
-  background-position: -140px -1429px;
-}
-.glyphicons-icon.temple_hindu {
-  background-position: -188px -1429px;
-}
-.glyphicons-icon.temple_buddhist {
-  background-position: -236px -1429px;
-}
-.glyphicons-icon.bicycle {
-  background-position: -284px -1429px;
-}
-.glyphicons-icon.life_preserver {
-  background-position: -332px -1429px;
-}
-.glyphicons-icon.share_alt {
-  background-position: -380px -1429px;
-}
-.glyphicons-icon.comments {
-  background-position: -428px -1429px;
-}
-.glyphicons-icon.flower {
-  background-position: 4px -1477px;
-}
-.glyphicons-icon.baseball {
-  background-position: -44px -1477px;
-}
-.glyphicons-icon.rugby {
-  background-position: -92px -1477px;
-}
-.glyphicons-icon.ax {
-  background-position: -140px -1477px;
-}
-.glyphicons-icon.table_tennis {
-  background-position: -188px -1477px;
-}
-.glyphicons-icon.bowling {
-  background-position: -236px -1477px;
-}
-.glyphicons-icon.tree_conifer {
-  background-position: -284px -1477px;
-}
-.glyphicons-icon.tree_deciduous {
-  background-position: -332px -1477px;
-}
-.glyphicons-icon.more_items {
-  background-position: -380px -1477px;
-}
-.glyphicons-icon.sort {
-  background-position: -428px -1477px;
-}
-.glyphicons-icon.filter {
-  background-position: 4px -1525px;
-}
-.glyphicons-icon.gamepad {
-  background-position: -44px -1525px;
-}
-.glyphicons-icon.playing_dices {
-  background-position: -92px -1525px;
-}
-.glyphicons-icon.calculator {
-  background-position: -140px -1525px;
-}
-.glyphicons-icon.tie {
-  background-position: -188px -1525px;
-}
-.glyphicons-icon.wallet {
-  background-position: -236px -1525px;
-}
-.glyphicons-icon.piano {
-  background-position: -284px -1525px;
-}
-.glyphicons-icon.sampler {
-  background-position: -332px -1525px;
-}
-.glyphicons-icon.podium {
-  background-position: -380px -1525px;
-}
-.glyphicons-icon.soccer_ball {
-  background-position: -428px -1525px;
-}
-.glyphicons-icon.blog {
-  background-position: 4px -1573px;
-}
-.glyphicons-icon.dashboard {
-  background-position: -44px -1573px;
-}
-.glyphicons-icon.certificate {
-  background-position: -92px -1573px;
-}
-.glyphicons-icon.bell {
-  background-position: -140px -1573px;
-}
-.glyphicons-icon.candle {
-  background-position: -188px -1573px;
-}
-.glyphicons-icon.pushpin {
-  background-position: -236px -1573px;
-}
-.glyphicons-icon.iphone_shake {
-  background-position: -284px -1573px;
-}
-.glyphicons-icon.pin_flag {
-  background-position: -332px -1573px;
-}
-.glyphicons-icon.turtle {
-  background-position: -380px -1573px;
-}
-.glyphicons-icon.rabbit {
-  background-position: -428px -1573px;
-}
-.glyphicons-icon.globe {
-  background-position: 4px -1621px;
-}
-.glyphicons-icon.briefcase {
-  background-position: -44px -1621px;
-}
-.glyphicons-icon.hdd {
-  background-position: -92px -1621px;
-}
-.glyphicons-icon.thumbs_up {
-  background-position: -140px -1621px;
-}
-.glyphicons-icon.thumbs_down {
-  background-position: -188px -1621px;
-}
-.glyphicons-icon.hand_right {
-  background-position: -236px -1621px;
-}
-.glyphicons-icon.hand_left {
-  background-position: -284px -1621px;
-}
-.glyphicons-icon.hand_up {
-  background-position: -332px -1621px;
-}
-.glyphicons-icon.hand_down {
-  background-position: -380px -1621px;
-}
-.glyphicons-icon.fullscreen {
-  background-position: -428px -1621px;
-}
-.glyphicons-icon.shopping_bag {
-  background-position: 4px -1669px;
-}
-.glyphicons-icon.book_open {
-  background-position: -44px -1669px;
-}
-.glyphicons-icon.nameplate {
-  background-position: -92px -1669px;
-}
-.glyphicons-icon.nameplate_alt {
-  background-position: -140px -1669px;
-}
-.glyphicons-icon.vases {
-  background-position: -188px -1669px;
-}
-.glyphicons-icon.bullhorn {
-  background-position: -236px -1669px;
-}
-.glyphicons-icon.dumbbell {
-  background-position: -284px -1669px;
-}
-.glyphicons-icon.suitcase {
-  background-position: -332px -1669px;
-}
-.glyphicons-icon.file_import {
-  background-position: -380px -1669px;
-}
-.glyphicons-icon.file_export {
-  background-position: -428px -1669px;
-}
-.glyphicons-icon.bug {
-  background-position: 4px -1717px;
-}
-.glyphicons-icon.crown {
-  background-position: -44px -1717px;
-}
-.glyphicons-icon.smoking {
-  background-position: -92px -1717px;
-}
-.glyphicons-icon.cloud-upload {
-  background-position: -140px -1717px;
-}
-.glyphicons-icon.cloud-download {
-  background-position: -188px -1717px;
-}
-.glyphicons-icon.restart {
-  background-position: -236px -1717px;
-}
-.glyphicons-icon.security_camera {
-  background-position: -284px -1717px;
-}
-.glyphicons-icon.expand {
-  background-position: -332px -1717px;
-}
-.glyphicons-icon.collapse {
-  background-position: -380px -1717px;
-}
-.glyphicons-icon.collapse_top {
-  background-position: -428px -1717px;
-}
-.glyphicons-icon.globe_af {
-  background-position: 4px -1765px;
-}
-.glyphicons-icon.global {
-  background-position: -44px -1765px;
-}
-.glyphicons-icon.spray {
-  background-position: -92px -1765px;
-}
-.glyphicons-icon.nails {
-  background-position: -140px -1765px;
-}
-.glyphicons-icon.claw_hammer {
-  background-position: -188px -1765px;
-}
-.glyphicons-icon.classic_hammer {
-  background-position: -236px -1765px;
-}
-.glyphicons-icon.hand_saw {
-  background-position: -284px -1765px;
-}
-.glyphicons-icon.riflescope {
-  background-position: -332px -1765px;
-}
-.glyphicons-icon.electrical_socket_eu {
-  background-position: -380px -1765px;
-}
-.glyphicons-icon.electrical_socket_us {
-  background-position: -428px -1765px;
-}
-.glyphicons-icon.pinterest {
-  background-position: 4px -1813px;
-}
-.glyphicons-icon.dropbox {
-  background-position: -44px -1813px;
-}
-.glyphicons-icon.google_plus {
-  background-position: -92px -1813px;
-}
-.glyphicons-icon.jolicloud {
-  background-position: -140px -1813px;
-}
-.glyphicons-icon.yahoo {
-  background-position: -188px -1813px;
-}
-.glyphicons-icon.blogger {
-  background-position: -236px -1813px;
-}
-.glyphicons-icon.picasa {
-  background-position: -284px -1813px;
-}
-.glyphicons-icon.amazon {
-  background-position: -332px -1813px;
-}
-.glyphicons-icon.tumblr {
-  background-position: -380px -1813px;
-}
-.glyphicons-icon.wordpress {
-  background-position: -428px -1813px;
-}
-.glyphicons-icon.instapaper {
-  background-position: 4px -1861px;
-}
-.glyphicons-icon.evernote {
-  background-position: -44px -1861px;
-}
-.glyphicons-icon.xing {
-  background-position: -92px -1861px;
-}
-.glyphicons-icon.zootool {
-  background-position: -140px -1861px;
-}
-.glyphicons-icon.dribbble {
-  background-position: -188px -1861px;
-}
-.glyphicons-icon.deviantart {
-  background-position: -236px -1861px;
-}
-.glyphicons-icon.read_it_later {
-  background-position: -284px -1861px;
-}
-.glyphicons-icon.linked_in {
-  background-position: -332px -1861px;
-}
-.glyphicons-icon.forrst {
-  background-position: -380px -1861px;
-}
-.glyphicons-icon.pinboard {
-  background-position: -428px -1861px;
-}
-.glyphicons-icon.behance {
-  background-position: 4px -1909px;
-}
-.glyphicons-icon.github {
-  background-position: -44px -1909px;
-}
-.glyphicons-icon.youtube {
-  background-position: -92px -1909px;
-}
-.glyphicons-icon.skitch {
-  background-position: -140px -1909px;
-}
-.glyphicons-icon.foursquare {
-  background-position: -188px -1909px;
-}
-.glyphicons-icon.quora {
-  background-position: -236px -1909px;
-}
-.glyphicons-icon.badoo {
-  background-position: -284px -1909px;
-}
-.glyphicons-icon.spotify {
-  background-position: -332px -1909px;
-}
-.glyphicons-icon.stumbleupon {
-  background-position: -380px -1909px;
-}
-.glyphicons-icon.readability {
-  background-position: -428px -1909px;
-}
-.glyphicons-icon.facebook {
-  background-position: 4px -1957px;
-}
-.glyphicons-icon.twitter {
-  background-position: -44px -1957px;
-}
-.glyphicons-icon.instagram {
-  background-position: -92px -1957px;
-}
-.glyphicons-icon.posterous_spaces {
-  background-position: -140px -1957px;
-}
-.glyphicons-icon.vimeo {
-  background-position: -188px -1957px;
-}
-.glyphicons-icon.flickr {
-  background-position: -236px -1957px;
-}
-.glyphicons-icon.last_fm {
-  background-position: -284px -1957px;
-}
-.glyphicons-icon.rss {
-  background-position: -332px -1957px;
-}
-.glyphicons-icon.skype {
-  background-position: -380px -1957px;
-}
-.glyphicons-icon.e-mail {
-  background-position: -428px -1957px;
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/css/bootstrap/halflings.css b/openQRM-5.3.50-CE/src/web/base/css/bootstrap/halflings.css
deleted file mode 100644
index 94e457f..0000000
--- a/openQRM-5.3.50-CE/src/web/base/css/bootstrap/halflings.css
+++ /dev/null
@@ -1,1275 +0,0 @@
-/*!
- *
- *  Project:  GLYPHICONS HALFLINGS
- *  Author:   Jan Kovarik - www.glyphicons.com
- *  Twitter:  @glyphicons
- *
- */
-@font-face {
-  font-family: 'Glyphicons Halflings Regular';
-  src: url('../fonts/glyphicons-halflings-regular.eot');
-  src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-.halflings {
-  display: inline-block;
-  position: relative;
-  padding-left: 25px;
-  color: #1d1d1b;
-  text-decoration: none;
-  *display: inline;
-  *zoom: 1;
-  vertical-align: middle;
-}
-.halflings:before {
-  position: absolute;
-  left: 0;
-  top: 0;
-  display: inline-block;
-  margin: 0 5px 0 0;
-  font: 12px/1em 'Glyphicons Halflings Regular';
-  font-style: normal;
-  font-weight: normal;
-  color: #1d1d1b;
-  *display: inline;
-  *zoom: 1;
-  vertical-align: middle;
-  text-transform: none;
-  -webkit-font-smoothing: antialiased;
-}
-.halflings.white:before {
-  color: #fff;
-}
-.halflings.glass:before {
-  content: "\E001";
-}
-.halflings.music:before {
-  content: "\E002";
-}
-.halflings.search:before {
-  content: "\E003";
-}
-.halflings.envelope:before {
-  content: "\2709";
-}
-.halflings.heart:before {
-  content: "\E005";
-}
-.halflings.star:before {
-  content: "\E006";
-}
-.halflings.star-empty:before {
-  content: "\E007";
-}
-.halflings.user:before {
-  content: "\E008";
-}
-.halflings.film:before {
-  content: "\E009";
-}
-.halflings.th-large:before {
-  content: "\E010";
-}
-.halflings.th:before {
-  content: "\E011";
-}
-.halflings.th-list:before {
-  content: "\E012";
-}
-.halflings.ok:before {
-  content: "\E013";
-}
-.halflings.remove:before {
-  content: "\E014";
-}
-.halflings.zoom-in:before {
-  content: "\E015";
-}
-.halflings.zoom-out:before {
-  content: "\E016";
-}
-.halflings.off:before {
-  content: "\E017";
-}
-.halflings.signal:before {
-  content: "\E018";
-}
-.halflings.cog:before {
-  content: "\E019";
-}
-.halflings.trash:before {
-  content: "\E020";
-}
-.halflings.home:before {
-  content: "\E021";
-}
-.halflings.file:before {
-  content: "\E022";
-}
-.halflings.time:before {
-  content: "\E023";
-}
-.halflings.road:before {
-  content: "\E024";
-}
-.halflings.download-alt:before {
-  content: "\E025";
-}
-.halflings.download:before {
-  content: "\E026";
-}
-.halflings.upload:before {
-  content: "\E027";
-}
-.halflings.inbox:before {
-  content: "\E028";
-}
-.halflings.play-circle:before {
-  content: "\E029";
-}
-.halflings.repeat:before {
-  content: "\E030";
-}
-.halflings.refresh:before {
-  content: "\E031";
-}
-.halflings.list-alt:before {
-  content: "\E032";
-}
-.halflings.lock:before {
-  content: "\1F512";
-}
-.halflings.flag:before {
-  content: "\E034";
-}
-.halflings.headphones:before {
-  content: "\E035";
-}
-.halflings.volume-off:before {
-  content: "\E036";
-}
-.halflings.volume-down:before {
-  content: "\E037";
-}
-.halflings.volume-up:before {
-  content: "\E038";
-}
-.halflings.qrcode:before {
-  content: "\E039";
-}
-.halflings.barcode:before {
-  content: "\E040";
-}
-.halflings.tag:before {
-  content: "\E041";
-}
-.halflings.tags:before {
-  content: "\E042";
-}
-.halflings.book:before {
-  content: "\E043";
-}
-.halflings.bookmark:before {
-  content: "\1F516";
-}
-.halflings.print:before {
-  content: "\E045";
-}
-.halflings.camera:before {
-  content: "\1F4F7";
-}
-.halflings.font:before {
-  content: "\E047";
-}
-.halflings.bold:before {
-  content: "\E048";
-}
-.halflings.italic:before {
-  content: "\E049";
-}
-.halflings.text-height:before {
-  content: "\E050";
-}
-.halflings.text-width:before {
-  content: "\E051";
-}
-.halflings.align-left:before {
-  content: "\E052";
-}
-.halflings.align-center:before {
-  content: "\E053";
-}
-.halflings.align-right:before {
-  content: "\E054";
-}
-.halflings.align-justify:before {
-  content: "\E055";
-}
-.halflings.list:before {
-  content: "\E056";
-}
-.halflings.indent-left:before {
-  content: "\E057";
-}
-.halflings.indent-right:before {
-  content: "\E058";
-}
-.halflings.facetime-video:before {
-  content: "\E059";
-}
-.halflings.picture:before {
-  content: "\E060";
-}
-.halflings.pencil:before {
-  content: "\270F";
-}
-.halflings.map-marker:before {
-  content: "\E062";
-}
-.halflings.adjust:before {
-  content: "\E063";
-}
-.halflings.tint:before {
-  content: "\E064";
-}
-.halflings.edit:before {
-  content: "\E065";
-}
-.halflings.share:before {
-  content: "\E066";
-}
-.halflings.check:before {
-  content: "\E067";
-}
-.halflings.move:before {
-  content: "\E068";
-}
-.halflings.step-backward:before {
-  content: "\E069";
-}
-.halflings.fast-backward:before {
-  content: "\E070";
-}
-.halflings.backward:before {
-  content: "\E071";
-}
-.halflings.play:before {
-  content: "\E072";
-}
-.halflings.pause:before {
-  content: "\E073";
-}
-.halflings.stop:before {
-  content: "\E074";
-}
-.halflings.forward:before {
-  content: "\E075";
-}
-.halflings.fast-forward:before {
-  content: "\E076";
-}
-.halflings.step-forward:before {
-  content: "\E077";
-}
-.halflings.eject:before {
-  content: "\E078";
-}
-.halflings.chevron-left:before {
-  content: "\E079";
-}
-.halflings.chevron-right:before {
-  content: "\E080";
-}
-.halflings.plus-sign:before {
-  content: "\E081";
-}
-.halflings.minus-sign:before {
-  content: "\E082";
-}
-.halflings.remove-sign:before {
-  content: "\E083";
-}
-.halflings.ok-sign:before {
-  content: "\E084";
-}
-.halflings.question-sign:before {
-  content: "\E085";
-}
-.halflings.info-sign:before {
-  content: "\E086";
-}
-.halflings.screenshot:before {
-  content: "\E087";
-}
-.halflings.remove-circle:before {
-  content: "\E088";
-}
-.halflings.ok-circle:before {
-  content: "\E089";
-}
-.halflings.ban-circle:before {
-  content: "\E090";
-}
-.halflings.arrow-left:before {
-  content: "\E091";
-}
-.halflings.arrow-right:before {
-  content: "\E092";
-}
-.halflings.arrow-up:before {
-  content: "\E093";
-}
-.halflings.arrow-down:before {
-  content: "\E094";
-}
-.halflings.share-alt:before {
-  content: "\E095";
-}
-.halflings.resize-full:before {
-  content: "\E096";
-}
-.halflings.resize-small:before {
-  content: "\E097";
-}
-.halflings.plus:before {
-  content: "\002B";
-}
-.halflings.minus:before {
-  content: "\2212";
-}
-.halflings.asterisk:before {
-  content: "\002A";
-}
-.halflings.exclamation-sign:before {
-  content: "\E101";
-}
-.halflings.gift:before {
-  content: "\E102";
-}
-.halflings.leaf:before {
-  content: "\E103";
-}
-.halflings.fire:before {
-  content: "\1F525";
-}
-.halflings.eye-open:before {
-  content: "\E105";
-}
-.halflings.eye-close:before {
-  content: "\E106";
-}
-.halflings.warning-sign:before {
-  content: "\E107";
-}
-.halflings.plane:before {
-  content: "\E108";
-}
-.halflings.calendar:before {
-  content: "\1F4C5";
-}
-.halflings.random:before {
-  content: "\E110";
-}
-.halflings.comments:before {
-  content: "\E111";
-}
-.halflings.magnet:before {
-  content: "\E112";
-}
-.halflings.chevron-up:before {
-  content: "\E113";
-}
-.halflings.chevron-down:before {
-  content: "\E114";
-}
-.halflings.retweet:before {
-  content: "\E115";
-}
-.halflings.shopping-cart:before {
-  content: "\E116";
-}
-.halflings.folder-close:before {
-  content: "\E117";
-}
-.halflings.folder-open:before {
-  content: "\E118";
-}
-.halflings.resize-vertical:before {
-  content: "\E119";
-}
-.halflings.resize-horizontal:before {
-  content: "\E120";
-}
-.halflings.hdd:before {
-  content: "\E121";
-}
-.halflings.bullhorn:before {
-  content: "\E122";
-}
-.halflings.bell:before {
-  content: "\1F514";
-}
-.halflings.certificate:before {
-  content: "\E124";
-}
-.halflings.thumbs-up:before {
-  content: "\E125";
-}
-.halflings.thumbs-down:before {
-  content: "\E126";
-}
-.halflings.hand-right:before {
-  content: "\E127";
-}
-.halflings.hand-left:before {
-  content: "\E128";
-}
-.halflings.hand-top:before {
-  content: "\E129";
-}
-.halflings.hand-down:before {
-  content: "\E130";
-}
-.halflings.circle-arrow-right:before {
-  content: "\E131";
-}
-.halflings.circle-arrow-left:before {
-  content: "\E132";
-}
-.halflings.circle-arrow-top:before {
-  content: "\E133";
-}
-.halflings.circle-arrow-down:before {
-  content: "\E134";
-}
-.halflings.globe:before {
-  content: "\E135";
-}
-.halflings.wrench:before {
-  content: "\1F527";
-}
-.halflings.tasks:before {
-  content: "\E137";
-}
-.halflings.filter:before {
-  content: "\E138";
-}
-.halflings.briefcase:before {
-  content: "\1F4BC";
-}
-.halflings.fullscreen:before {
-  content: "\E140";
-}
-.halflings.dashboard:before {
-  content: "\E141";
-}
-.halflings.paperclip:before {
-  content: "\1F4CE";
-}
-.halflings.heart-empty:before {
-  content: "\E143";
-}
-.halflings.link:before {
-  content: "\E144";
-}
-.halflings.phone:before {
-  content: "\E145";
-}
-.halflings.pushpin:before {
-  content: "\1F4CC";
-}
-.halflings.euro:before {
-  content: "\20AC";
-}
-.halflings.usd:before {
-  content: "\E148";
-}
-.halflings.gbp:before {
-  content: "\E149";
-}
-.halflings.sort:before {
-  content: "\E150";
-}
-.halflings.sort-by-alphabet:before {
-  content: "\E151";
-}
-.halflings.sort-by-alphabet-alt:before {
-  content: "\E152";
-}
-.halflings.sort-by-order:before {
-  content: "\E153";
-}
-.halflings.sort-by-order-alt:before {
-  content: "\E154";
-}
-.halflings.sort-by-attributes:before {
-  content: "\E155";
-}
-.halflings.sort-by-attributes-alt:before {
-  content: "\E156";
-}
-.halflings.unchecked:before {
-  content: "\E157";
-}
-.halflings.expand:before {
-  content: "\E158";
-}
-.halflings.collapse:before {
-  content: "\E159";
-}
-.halflings.collapse-top:before {
-  content: "\E160";
-}
-.halflings.log_in:before {
-  content: "\E161";
-}
-.halflings.flash:before {
-  content: "\E162";
-}
-.halflings.log_out:before {
-  content: "\E163";
-}
-.halflings.new_window:before {
-  content: "\E164";
-}
-.halflings.record:before {
-  content: "\E165";
-}
-.halflings.save:before {
-  content: "\E166";
-}
-.halflings.open:before {
-  content: "\E167";
-}
-.halflings.saved:before {
-  content: "\E168";
-}
-.halflings.import:before {
-  content: "\E169";
-}
-.halflings.export:before {
-  content: "\E170";
-}
-.halflings.send:before {
-  content: "\E171";
-}
-.halflings.floppy_disk:before {
-  content: "\E172";
-}
-.halflings.floppy_saved:before {
-  content: "\E173";
-}
-.halflings.floppy_remove:before {
-  content: "\E174";
-}
-.halflings.floppy_save:before {
-  content: "\E175";
-}
-.halflings.floppy_open:before {
-  content: "\E176";
-}
-.halflings.credit_card:before {
-  content: "\E177";
-}
-.halflings.transfer:before {
-  content: "\E178";
-}
-.halflings.cutlery:before {
-  content: "\E179";
-}
-.halflings.header:before {
-  content: "\E180";
-}
-.halflings.compressed:before {
-  content: "\E181";
-}
-.halflings.earphone:before {
-  content: "\E182";
-}
-.halflings.phone_alt:before {
-  content: "\E183";
-}
-.halflings.tower:before {
-  content: "\E184";
-}
-.halflings.stats:before {
-  content: "\E185";
-}
-.halflings.sd_video:before {
-  content: "\E186";
-}
-.halflings.hd_video:before {
-  content: "\E187";
-}
-.halflings.subtitles:before {
-  content: "\E188";
-}
-.halflings.sound_stereo:before {
-  content: "\E189";
-}
-.halflings.sound_dolby:before {
-  content: "\E190";
-}
-.halflings.sound_5_1:before {
-  content: "\E191";
-}
-.halflings.sound_6_1:before {
-  content: "\E192";
-}
-.halflings.sound_7_1:before {
-  content: "\E193";
-}
-.halflings.copyright_mark:before {
-  content: "\E194";
-}
-.halflings.registration_mark:before {
-  content: "\E195";
-}
-.halflings.cloud:before {
-  content: "\2601";
-}
-.halflings.cloud_download:before {
-  content: "\E197";
-}
-.halflings.cloud_upload:before {
-  content: "\E198";
-}
-.halflings.tree_conifer:before {
-  content: "\E199";
-}
-.halflings.tree_deciduous:before {
-  content: "\E200";
-}
-.halflings-icon {
-  display: inline-block;
-  width: 14px;
-  height: 14px;
-  margin: 0 8px 0 0;
-  line-height: 14px;
-  vertical-align: text-top;
-  background-image: url(../../img/glyphicons/halflings/glyphicons_halflings.svg);
-  background-position: 0 0;
-  background-repeat: no-repeat;
-  vertical-align: top;
-  *display: inline;
-  *zoom: 1;
-  *margin-right: .3em;
-}
-.halflings-icon _:-o-prefocus,
-.halflings-icon {
-  background-image: url(../../img/glyphicons/halflings/glyphicons_halflings.png);
-}
-.no-inlinesvg .halflings-icon {
-  background-image: url(../../img/glyphicons/halflings/glyphicons_halflings.png);
-}
-.halflings-icon.white {
-  background-image: url(../../img/glyphicons/halflings/glyphicons_halflings-white.svg);
-}
-.halflings-icon.white _:-o-prefocus,
-.halflings-icon.white {
-  background-image: url(../../img/glyphicons/halflings/glyphicons_halflings-white.png);
-}
-.no-inlinesvg .halflings-icon.white {
-  background-image: url(../../img/glyphicons/halflings/glyphicons_halflings-white.png);
-}
-.halflings-icon.glass {
-  background-position: 0px 0px;
-}
-.halflings-icon.music {
-  background-position: -24px 0px;
-}
-.halflings-icon.search {
-  background-position: -48px 0px;
-}
-.halflings-icon.envelope {
-  background-position: -72px 0px;
-}
-.halflings-icon.heart {
-  background-position: -96px 0px;
-}
-.halflings-icon.star {
-  background-position: -120px 0px;
-}
-.halflings-icon.star-empty {
-  background-position: -144px 0px;
-}
-.halflings-icon.user {
-  background-position: -168px 0px;
-}
-.halflings-icon.film {
-  background-position: -192px 0px;
-}
-.halflings-icon.th-large {
-  background-position: -216px 0px;
-}
-.halflings-icon.th {
-  background-position: -240px 0px;
-}
-.halflings-icon.th-list {
-  background-position: -264px 0px;
-}
-.halflings-icon.ok {
-  background-position: -288px 0px;
-}
-.halflings-icon.remove {
-  background-position: -312px 0px;
-}
-.halflings-icon.zoom-in {
-  background-position: -336px 0px;
-}
-.halflings-icon.zoom-out {
-  background-position: -360px 0px;
-}
-.halflings-icon.off {
-  background-position: -384px 0px;
-}
-.halflings-icon.signal {
-  background-position: -408px 0px;
-}
-.halflings-icon.cog {
-  background-position: -432px 0px;
-}
-.halflings-icon.trash {
-  background-position: -456px 0px;
-}
-.halflings-icon.home {
-  background-position: 0px -24px;
-}
-.halflings-icon.file {
-  background-position: -24px -24px;
-}
-.halflings-icon.time {
-  background-position: -48px -24px;
-}
-.halflings-icon.road {
-  background-position: -71px -24px;
-}
-.halflings-icon.download-alt {
-  background-position: -96px -24px;
-}
-.halflings-icon.download {
-  background-position: -120px -24px;
-}
-.halflings-icon.upload {
-  background-position: -144px -24px;
-}
-.halflings-icon.inbox {
-  background-position: -168px -24px;
-}
-.halflings-icon.play-circle {
-  background-position: -192px -24px;
-}
-.halflings-icon.repeat {
-  background-position: -216px -24px;
-}
-.halflings-icon.refresh {
-  background-position: -240px -24px;
-}
-.halflings-icon.list-alt {
-  background-position: -264px -24px;
-}
-.halflings-icon.lock {
-  background-position: -288px -24px;
-}
-.halflings-icon.flag {
-  background-position: -312px -24px;
-}
-.halflings-icon.headphones {
-  background-position: -336px -24px;
-}
-.halflings-icon.volume-off {
-  background-position: -360px -24px;
-}
-.halflings-icon.volume-down {
-  background-position: -384px -24px;
-}
-.halflings-icon.volume-up {
-  background-position: -408px -24px;
-}
-.halflings-icon.qrcode {
-  background-position: -432px -24px;
-}
-.halflings-icon.barcode {
-  background-position: -456px -24px;
-}
-.halflings-icon.tag {
-  background-position: 0px -48px;
-}
-.halflings-icon.tags {
-  background-position: -24px -48px;
-}
-.halflings-icon.book {
-  background-position: -48px -48px;
-}
-.halflings-icon.bookmark {
-  background-position: -72px -48px;
-}
-.halflings-icon.print {
-  background-position: -96px -48px;
-}
-.halflings-icon.camera {
-  background-position: -120px -48px;
-}
-.halflings-icon.font {
-  background-position: -144px -48px;
-}
-.halflings-icon.bold {
-  background-position: -168px -48px;
-}
-.halflings-icon.italic {
-  background-position: -192px -48px;
-}
-.halflings-icon.text-height {
-  background-position: -216px -48px;
-}
-.halflings-icon.text-width {
-  background-position: -240px -48px;
-}
-.halflings-icon.align-left {
-  background-position: -264px -48px;
-}
-.halflings-icon.align-center {
-  background-position: -288px -48px;
-}
-.halflings-icon.align-right {
-  background-position: -312px -48px;
-}
-.halflings-icon.align-justify {
-  background-position: -336px -48px;
-}
-.halflings-icon.list {
-  background-position: -360px -48px;
-}
-.halflings-icon.indent-left {
-  background-position: -384px -48px;
-}
-.halflings-icon.indent-right {
-  background-position: -408px -48px;
-}
-.halflings-icon.facetime-video {
-  background-position: -432px -48px;
-}
-.halflings-icon.picture {
-  background-position: -456px -48px;
-}
-.halflings-icon.pencil {
-  background-position: 0px -72px;
-}
-.halflings-icon.map-marker {
-  background-position: -24px -72px;
-}
-.halflings-icon.adjust {
-  background-position: -48px -72px;
-}
-.halflings-icon.tint {
-  background-position: -72px -72px;
-}
-.halflings-icon.edit {
-  background-position: -96px -72px;
-}
-.halflings-icon.share {
-  background-position: -120px -72px;
-}
-.halflings-icon.check {
-  background-position: -144px -72px;
-}
-.halflings-icon.move {
-  background-position: -168px -72px;
-}
-.halflings-icon.step-backward {
-  background-position: -192px -72px;
-}
-.halflings-icon.fast-backward {
-  background-position: -216px -72px;
-}
-.halflings-icon.backward {
-  background-position: -240px -72px;
-}
-.halflings-icon.play {
-  background-position: -264px -72px;
-}
-.halflings-icon.pause {
-  background-position: -288px -72px;
-}
-.halflings-icon.stop {
-  background-position: -312px -72px;
-}
-.halflings-icon.forward {
-  background-position: -336px -72px;
-}
-.halflings-icon.fast-forward {
-  background-position: -360px -72px;
-}
-.halflings-icon.step-forward {
-  background-position: -384px -72px;
-}
-.halflings-icon.eject {
-  background-position: -408px -72px;
-}
-.halflings-icon.chevron-left {
-  background-position: -432px -72px;
-}
-.halflings-icon.chevron-right {
-  background-position: -456px -72px;
-}
-.halflings-icon.plus-sign {
-  background-position: 0px -96px;
-}
-.halflings-icon.minus-sign {
-  background-position: -24px -96px;
-}
-.halflings-icon.remove-sign {
-  background-position: -48px -96px;
-}
-.halflings-icon.ok-sign {
-  background-position: -72px -96px;
-}
-.halflings-icon.question-sign {
-  background-position: -96px -96px;
-}
-.halflings-icon.info-sign {
-  background-position: -120px -96px;
-}
-.halflings-icon.screenshot {
-  background-position: -144px -96px;
-}
-.halflings-icon.remove-circle {
-  background-position: -168px -96px;
-}
-.halflings-icon.ok-circle {
-  background-position: -192px -96px;
-}
-.halflings-icon.ban-circle {
-  background-position: -216px -96px;
-}
-.halflings-icon.arrow-left {
-  background-position: -240px -96px;
-}
-.halflings-icon.arrow-right {
-  background-position: -264px -96px;
-}
-.halflings-icon.arrow-up {
-  background-position: -288px -96px;
-}
-.halflings-icon.arrow-down {
-  background-position: -312px -96px;
-}
-.halflings-icon.share-alt {
-  background-position: -336px -96px;
-}
-.halflings-icon.resize-full {
-  background-position: -360px -96px;
-}
-.halflings-icon.resize-small {
-  background-position: -384px -96px;
-}
-.halflings-icon.plus {
-  background-position: -408px -96px;
-}
-.halflings-icon.minus {
-  background-position: -432px -96px;
-}
-.halflings-icon.asterisk {
-  background-position: -456px -96px;
-}
-.halflings-icon.exclamation-sign {
-  background-position: 0px -120px;
-}
-.halflings-icon.gift {
-  background-position: -24px -120px;
-}
-.halflings-icon.leaf {
-  background-position: -48px -120px;
-}
-.halflings-icon.fire {
-  background-position: -72px -120px;
-}
-.halflings-icon.eye-open {
-  background-position: -95px -120px;
-}
-.halflings-icon.eye-close {
-  background-position: -119px -120px;
-}
-.halflings-icon.warning-sign {
-  background-position: -144px -120px;
-}
-.halflings-icon.plane {
-  background-position: -168px -120px;
-}
-.halflings-icon.calendar {
-  background-position: -192px -120px;
-}
-.halflings-icon.random {
-  background-position: -216px -120px;
-}
-.halflings-icon.comments {
-  background-position: -240px -120px;
-}
-.halflings-icon.magnet {
-  background-position: -264px -120px;
-}
-.halflings-icon.chevron-up {
-  background-position: -288px -120px;
-}
-.halflings-icon.chevron-down {
-  background-position: -312px -120px;
-}
-.halflings-icon.retweet {
-  background-position: -336px -120px;
-}
-.halflings-icon.shopping-cart {
-  background-position: -360px -120px;
-}
-.halflings-icon.folder-close {
-  background-position: -384px -120px;
-}
-.halflings-icon.folder-open {
-  background-position: -408px -120px;
-}
-.halflings-icon.resize-vertical {
-  background-position: -432px -120px;
-}
-.halflings-icon.resize-horizontal {
-  background-position: -456px -120px;
-}
-.halflings-icon.hdd {
-  background-position: 0px -144px;
-}
-.halflings-icon.bullhorn {
-  background-position: -24px -144px;
-}
-.halflings-icon.bell {
-  background-position: -48px -144px;
-}
-.halflings-icon.certificate {
-  background-position: -72px -144px;
-}
-.halflings-icon.thumbs-up {
-  background-position: -96px -144px;
-}
-.halflings-icon.thumbs-down {
-  background-position: -120px -144px;
-}
-.halflings-icon.hand-right {
-  background-position: -145px -144px;
-}
-.halflings-icon.hand-left {
-  background-position: -167px -144px;
-}
-.halflings-icon.hand-top {
-  background-position: -192px -144px;
-}
-.halflings-icon.hand-down {
-  background-position: -216px -144px;
-}
-.halflings-icon.circle-arrow-right {
-  background-position: -240px -144px;
-}
-.halflings-icon.circle-arrow-left {
-  background-position: -264px -144px;
-}
-.halflings-icon.circle-arrow-top {
-  background-position: -288px -144px;
-}
-.halflings-icon.circle-arrow-down {
-  background-position: -312px -144px;
-}
-.halflings-icon.globe {
-  background-position: -336px -144px;
-}
-.halflings-icon.wrench {
-  background-position: -360px -144px;
-}
-.halflings-icon.tasks {
-  background-position: -384px -144px;
-}
-.halflings-icon.filter {
-  background-position: -408px -144px;
-}
-.halflings-icon.briefcase {
-  background-position: -432px -144px;
-}
-.halflings-icon.fullscreen {
-  background-position: -456px -144px;
-}
-.halflings-icon.dashboard {
-  background-position: 0px -168px;
-}
-.halflings-icon.paperclip {
-  background-position: -24px -168px;
-}
-.halflings-icon.heart-empty {
-  background-position: -48px -168px;
-}
-.halflings-icon.link {
-  background-position: -72px -168px;
-}
-.halflings-icon.phone {
-  background-position: -96px -168px;
-}
-.halflings-icon.pushpin {
-  background-position: -120px -168px;
-}
-.halflings-icon.euro {
-  background-position: -144px -168px;
-}
-.halflings-icon.usd {
-  background-position: -168px -168px;
-}
-.halflings-icon.gbp {
-  background-position: -192px -168px;
-}
-.halflings-icon.sort {
-  background-position: -216px -168px;
-}
-.halflings-icon.sort-by-alphabet {
-  background-position: -240px -168px;
-}
-.halflings-icon.sort-by-alphabet-alt {
-  background-position: -264px -168px;
-}
-.halflings-icon.sort-by-order {
-  background-position: -288px -168px;
-}
-.halflings-icon.sort-by-order-alt {
-  background-position: -312px -168px;
-}
-.halflings-icon.sort-by-attributes {
-  background-position: -336px -168px;
-}
-.halflings-icon.sort-by-attributes-alt {
-  background-position: -360px -168px;
-}
-.halflings-icon.unchecked {
-  background-position: -384px -168px;
-}
-.halflings-icon.expand {
-  background-position: -408px -168px;
-}
-.halflings-icon.collapse {
-  background-position: -432px -168px;
-}
-.halflings-icon.collapse-top {
-  background-position: -456px -168px;
-}
-.halflings-icon.log_in {
-  background-position: 0px -192px;
-}
-.halflings-icon.flash {
-  background-position: -24px -192px;
-}
-.halflings-icon.log_out {
-  background-position: -48px -192px;
-}
-.halflings-icon.new_window {
-  background-position: -72px -192px;
-}
-.halflings-icon.record {
-  background-position: -96px -192px;
-}
-.halflings-icon.save {
-  background-position: -120px -192px;
-}
-.halflings-icon.open {
-  background-position: -144px -192px;
-}
-.halflings-icon.saved {
-  background-position: -168px -192px;
-}
-.halflings-icon.import {
-  background-position: -192px -192px;
-}
-.halflings-icon.export {
-  background-position: -216px -192px;
-}
-.halflings-icon.send {
-  background-position: -240px -192px;
-}
-.halflings-icon.floppy_disk {
-  background-position: -264px -192px;
-}
-.halflings-icon.floppy_saved {
-  background-position: -288px -192px;
-}
-.halflings-icon.floppy_remove {
-  background-position: -312px -192px;
-}
-.halflings-icon.floppy_save {
-  background-position: -336px -192px;
-}
-.halflings-icon.floppy_open {
-  background-position: -360px -192px;
-}
-.halflings-icon.credit_card {
-  background-position: -384px -192px;
-}
-.halflings-icon.transfer {
-  background-position: -408px -192px;
-}
-.halflings-icon.cutlery {
-  background-position: -432px -192px;
-}
-.halflings-icon.header {
-  background-position: -456px -192px;
-}
-.halflings-icon.compressed {
-  background-position: 0px -216px;
-}
-.halflings-icon.earphone {
-  background-position: -24px -216px;
-}
-.halflings-icon.phone_alt {
-  background-position: -48px -216px;
-}
-.halflings-icon.tower {
-  background-position: -72px -216px;
-}
-.halflings-icon.stats {
-  background-position: -96px -216px;
-}
-.halflings-icon.sd_video {
-  background-position: -119px -216px;
-}
-.halflings-icon.hd_video {
-  background-position: -143px -216px;
-}
-.halflings-icon.subtitles {
-  background-position: -167px -216px;
-}
-.halflings-icon.sound_stereo {
-  background-position: -191px -216px;
-}
-.halflings-icon.sound_dolby {
-  background-position: -215px -216px;
-}
-.halflings-icon.sound_5_1 {
-  background-position: -239px -216px;
-}
-.halflings-icon.sound_6_1 {
-  background-position: -263px -216px;
-}
-.halflings-icon.sound_7_1 {
-  background-position: -287px -216px;
-}
-.halflings-icon.copyright_mark {
-  background-position: -312px -216px;
-}
-.halflings-icon.registration_mark {
-  background-position: -336px -216px;
-}
-.halflings-icon.cloud {
-  background-position: -360px -216px;
-}
-.halflings-icon.cloud_download {
-  background-position: -384px -216px;
-}
-.halflings-icon.cloud_upload {
-  background-position: -408px -216px;
-}
-.halflings-icon.tree_conifer {
-  background-position: -432px -216px;
-}
-.halflings-icon.tree_deciduous {
-  background-position: -456px -216px;
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/css/bootstrap/img/glyphicons-halflings-white.png b/openQRM-5.3.50-CE/src/web/base/css/bootstrap/img/glyphicons-halflings-white.png
deleted file mode 100644
index 3bf6484..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/css/bootstrap/img/glyphicons-halflings-white.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/css/bootstrap/img/glyphicons-halflings.png b/openQRM-5.3.50-CE/src/web/base/css/bootstrap/img/glyphicons-halflings.png
deleted file mode 100644
index a996999..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/css/bootstrap/img/glyphicons-halflings.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/css/bootstrap/normalize.css b/openQRM-5.3.50-CE/src/web/base/css/bootstrap/normalize.css
deleted file mode 100644
index 4acf9bd..0000000
--- a/openQRM-5.3.50-CE/src/web/base/css/bootstrap/normalize.css
+++ /dev/null
@@ -1,402 +0,0 @@
-/*! normalize.css v2.1.1 | MIT License | git.io/normalize */
-
-/* ==========================================================================
-   HTML5 display definitions
-   ========================================================================== */
-
-/**
- * Correct `block` display not defined in IE 8/9.
- */
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-nav,
-section,
-summary {
-    display: block;
-}
-
-/**
- * Correct `inline-block` display not defined in IE 8/9.
- */
-
-audio,
-canvas,
-video {
-    display: inline-block;
-}
-
-/**
- * Prevent modern browsers from displaying `audio` without controls.
- * Remove excess height in iOS 5 devices.
- */
-
-audio:not([controls]) {
-    display: none;
-    height: 0;
-}
-
-/**
- * Address styling not present in IE 8/9.
- */
-
-[hidden] {
-    display: none;
-}
-
-/* ==========================================================================
-   Base
-   ========================================================================== */
-
-/**
- * 1. Prevent system color scheme's background color being used in Firefox, IE,
- *    and Opera.
- * 2. Prevent system color scheme's text color being used in Firefox, IE, and
- *    Opera.
- * 3. Set default font family to sans-serif.
- * 4. Prevent iOS text size adjust after orientation change, without disabling
- *    user zoom.
- */
-
-html {
-    background: #fff; /* 1 */
-    color: #000; /* 2 */
-    font-family: sans-serif; /* 3 */
-    -ms-text-size-adjust: 100%; /* 4 */
-    -webkit-text-size-adjust: 100%; /* 4 */
-}
-
-/**
- * Remove default margin.
- */
-
-body {
-    margin: 0 0 0 0;
-}
-
-/* ==========================================================================
-   Links
-   ========================================================================== */
-
-/**
- * Address `outline` inconsistency between Chrome and other browsers.
- */
-
-a:focus {
-    outline: thin dotted;
-}
-
-/**
- * Improve readability when focused and also mouse hovered in all browsers.
- */
-
-a:active,
-a:hover {
-    outline: 0;
-}
-
-/* ==========================================================================
-   Typography
-   ========================================================================== */
-
-/**
- * Address variable `h1` font-size and margin within `section` and `article`
- * contexts in Firefox 4+, Safari 5, and Chrome.
- */
-
-h1 {
-    font-size: 2em;
-    margin: 0.67em 0;
-}
-
-/**
- * Address styling not present in IE 8/9, Safari 5, and Chrome.
- */
-
-abbr[title] {
-    border-bottom: 1px dotted;
-}
-
-/**
- * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
- */
-
-b,
-strong {
-    font-weight: bold;
-}
-
-/**
- * Address styling not present in Safari 5 and Chrome.
- */
-
-dfn {
-    font-style: italic;
-}
-
-/**
- * Address differences between Firefox and other browsers.
- */
-
-hr {
-    -moz-box-sizing: content-box;
-    box-sizing: content-box;
-    height: 0;
-}
-
-/**
- * Address styling not present in IE 8/9.
- */
-
-mark {
-    background: #ff0;
-    color: #000;
-}
-
-/**
- * Correct font family set oddly in Safari 5 and Chrome.
- */
-
-code,
-kbd,
-pre,
-samp {
-    font-family: monospace, serif;
-    font-size: 1em;
-}
-
-/**
- * Improve readability of pre-formatted text in all browsers.
- */
-
-pre {
-    white-space: pre-wrap;
-}
-
-/**
- * Set consistent quote types.
- */
-
-q {
-    quotes: "\201C" "\201D" "\2018" "\2019";
-}
-
-/**
- * Address inconsistent and variable font size in all browsers.
- */
-
-small {
-    font-size: 80%;
-}
-
-/**
- * Prevent `sub` and `sup` affecting `line-height` in all browsers.
- */
-
-sub,
-sup {
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline;
-}
-
-sup {
-    top: -0.5em;
-}
-
-sub {
-    bottom: -0.25em;
-}
-
-/* ==========================================================================
-   Embedded content
-   ========================================================================== */
-
-/**
- * Remove border when inside `a` element in IE 8/9.
- */
-
-img {
-    border: 0;
-}
-
-/**
- * Correct overflow displayed oddly in IE 9.
- */
-
-svg:not(:root) {
-    overflow: hidden;
-}
-
-/* ==========================================================================
-   Figures
-   ========================================================================== */
-
-/**
- * Address margin not present in IE 8/9 and Safari 5.
- */
-
-figure {
-    margin: 0;
-}
-
-/* ==========================================================================
-   Forms
-   ========================================================================== */
-
-/**
- * Define consistent border, margin, and padding.
- */
-
-fieldset {
-    border: 1px solid #c0c0c0;
-    margin: 0 2px;
-    padding: 0.35em 0.625em 0.75em;
-}
-
-/**
- * 1. Correct `color` not being inherited in IE 8/9.
- * 2. Remove padding so people aren't caught out if they zero out fieldsets.
- */
-
-legend {
-    border: 0; /* 1 */
-    padding: 0; /* 2 */
-}
-
-/**
- * 1. Correct font family not being inherited in all browsers.
- * 2. Correct font size not being inherited in all browsers.
- * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
- */
-
-button,
-input,
-select,
-textarea {
-    font-family: inherit; /* 1 */
-    font-size: 100%; /* 2 */
-    margin: 0; /* 3 */
-}
-
-/**
- * Address Firefox 4+ setting `line-height` on `input` using `!important` in
- * the UA stylesheet.
- */
-
-button,
-input {
-    line-height: normal;
-}
-
-/**
- * Address inconsistent `text-transform` inheritance for `button` and `select`.
- * All other form control elements do not inherit `text-transform` values.
- * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
- * Correct `select` style inheritance in Firefox 4+ and Opera.
- */
-
-button,
-select {
-    text-transform: none;
-}
-
-/**
- * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
- *    and `video` controls.
- * 2. Correct inability to style clickable `input` types in iOS.
- * 3. Improve usability and consistency of cursor style between image-type
- *    `input` and others.
- */
-
-button,
-html input[type="button"], /* 1 */
-input[type="reset"],
-input[type="submit"] {
-    -webkit-appearance: button; /* 2 */
-    cursor: pointer; /* 3 */
-}
-
-/**
- * Re-set default cursor for disabled elements.
- */
-
-button[disabled],
-html input[disabled] {
-    cursor: default;
-}
-
-/**
- * 1. Address box sizing set to `content-box` in IE 8/9.
- * 2. Remove excess padding in IE 8/9.
- */
-
-input[type="checkbox"],
-input[type="radio"] {
-    box-sizing: border-box; /* 1 */
-    padding: 0; /* 2 */
-}
-
-/**
- * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
- * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
- *    (include `-moz` to future-proof).
- */
-
-input[type="search"] {
-    -webkit-appearance: textfield; /* 1 */
-    -moz-box-sizing: content-box;
-    -webkit-box-sizing: content-box; /* 2 */
-    box-sizing: content-box;
-}
-
-/**
- * Remove inner padding and search cancel button in Safari 5 and Chrome
- * on OS X.
- */
-
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
-    -webkit-appearance: none;
-}
-
-/**
- * Remove inner padding and border in Firefox 4+.
- */
-
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-    border: 0;
-    padding: 0;
-}
-
-/**
- * 1. Remove default vertical scrollbar in IE 8/9.
- * 2. Improve readability and alignment in all browsers.
- */
-
-textarea {
-    overflow: auto; /* 1 */
-    vertical-align: top; /* 2 */
-}
-
-/* ==========================================================================
-   Tables
-   ========================================================================== */
-
-/**
- * Remove most spacing between table cells.
- */
-
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
-}
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/web/base/css/default.css b/openQRM-5.3.50-CE/src/web/base/css/default.css
deleted file mode 100644
index fbcca6a..0000000
--- a/openQRM-5.3.50-CE/src/web/base/css/default.css
+++ /dev/null
@@ -1,409 +0,0 @@
-html {
-
-}
-body {
-	overflow-y:scroll;
-}
-
-/* Page */
-#page {
-	margin: 0 0 30px 0;
-	width: 1198px;
-	background: #fff url(../img/menu-background.png) repeat-y -85px 0;
-	margin: 0 auto 0 auto;
-	border-left: 1px solid #aaaaaa;
-	border-right: 1px solid #aaaaaa;
-	border-bottom: 1px solid #aaaaaa;
-	position: relative;
-}
-#page #wrapper{
-	background: url(../img/html-tabs-fix.png) repeat-x 0px 76px;
-}
-
-option.imagebacked {
-	padding: 2px 10px 2px 20px;
-	background-repeat: no-repeat;
-	background-position: 0px 0px;
-	vertical-align: middle;
-}
-
-/* Middle Head */
-#page #head {
-	display: block;
-	margin: 0px; 
-	padding: 0px;
-	color: #353535;
-	position: relative;
-	border-bottom: 5px solid #39aacb;
-	height: 71px;
-}
-#page #head .logo {
-	background-repeat: no-repeat;
-	position: absolute;
-	overflow: hidden;
-	left: 0;
-	top: 8px;
-	width: 170px;
-	height: 47px;
-	padding: 0 0 0 25px;
-	font-size: 80%;
-	cursor: pointer;
-}
-
-#page #head .logo .openqrmVersion {
-	position: absolute;
-	top: 53px;
-	left: 133px;
-}
-#page #head .main {
-	position: relative;
-	background: #2693b8;
-	margin: 20px 0 0 0;
-	height: 42px;
-	padding: 0 0 0 15px;
-	color: #ffffff;
-}
-#page #head .main #edition_label {
-	font-size: 25px;
-	line-height:37px;
-	opacity: 0.7;
-	text-transform: uppercase;
-	letter-spacing: -1;
-	float: left;
-	margin: 5px 0 0 14px;
-	color: #ffffff;
-
-}
-
-
-#page #head .top {
-	margin: 0 0 0 450px;
-	text-align: right;
-	padding: 0 20px 0 0;
-	color: #fff;
-}
-#page #head .bottom-line {
-	position:absolute;
-	bottom:0;
-	clear:both;
-	line-height:0px;
-	width:100%;
-}
-#page #head #Event_box {
-	display:none;
-	float:left;
-	margin: 5px 0 5px 30px;
-	padding: 0 0 0 20px;
-	line-height:16px;
-	text-decoration:none;
-	color:red;
-}
-#page #head #Event_active_box {
-	display:none;
-	float:left;
-	margin: 5px 0 5px 30px;
-	padding: 0 0 0 20px;
-	line-height:16px;
-	text-decoration:none;
-	color:orange;
-}
-.top form{
-	margin: 0;
-}
-#Watch, #Login_box, #Docu_box, #Info_box, #Support_box, #Language_box {
-	display:block;
-	margin: 25px 0 14px 20px;
-	padding: 0 0 0 20px;
-	float:right;
-	color: #353535;
-	line-height:18px;
-	text-decoration: none;
-	text-transform: uppercase;
-}
-#Language_box .right {
-	float: left;
-}
-#Language_box .left label {
-	margin-bottom: 0px;
-	font-size: inherit;
-}
-#Language_box .left {
-	float: left;
-	width: auto;
-	text-align: left;
-	padding: 0 8px 0 0;
-}
-#Language_select {
-	width: auto;
-	height: auto;
-	margin: 0;
-	padding: 1px;
-}
-
-#page #head #Resource_box,
-#page #head #Server_box {
-	margin: 15px 0 0 0;
-	padding: 0 10px 0 0px;
-	float: right;
-}
-#page #head #Resource_box {
-	margin-right: 30px;
-}
-
-#page #head .appliances,
-#page #head .resources {
-	float:left;
-	margin: 0 10px 0 0;
-	padding: 0 0 0 10px;
-	border-left: 1px solid #fff;
-}
-
-#page #head .appliances.headline,
-#page #head .resources.headline {
-	font-weight:bold;
-	text-transform: uppercase;
-	border: 0;
-}
-#page #head .appliances.first,
-#page #head .resources.first {
- border: 0;
-}
-
-/* Middle Content */
-#page #content {
-	height: auto;
-	padding-bottom: 50px;
-	margin: 0px;
-}
-/* Middle Content Menu */
-#page .menu {
-	width: 214px;
-	padding: 0 0 60px 0;
-}
-
-#page #content .menu table {
-	border: 0px none;
-}
-
-
-/* Middle Content Content */
-#page .container .middle {
-	min-height: 530px;
-}
-
-
-/* Footer */
-#page #footer {
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	display: block;
-	width: 1198px;
-	margin: 0;
-	padding: 10px 0 10px 0;
-	background: #fff;
-	border-top: solid 1px #aaaaaa;
-	font-size: 11px;
-	margin: 0 auto 0 auto;
-}
-
-#openqrm_enterprise_footer {
-	margin: 5px 20px 0 0;
-}
-
-#performance-stats {
-	margin-left: 14px;
-}
-
-#page #footer,
-#page #footer a {
-	color: #888888;
-	text-decoration:none;
-}
-
-
-/* Misc */
-.noscript {
-	border: 2px solid red;
-	color: red;
-	font-weight: bold;
-	font-size: 12px;
-	padding: 15px;
-	margin: 20px;
-}
-.floatbreaker {
-	clear:both;
-	height:0px !important;
-	position:relative;
-	line-height:0px;
-	font-size:0px;
-	border:0px none;
-	margin:0;
-	padding:0;
-	overflow:hidden;
-	width:0px;
-}
-input[type="button"].namegenButton,
-input[type="button"].browseButton {
-	margin: 3px 0 0 15px;
-	vertical-align: top;
-}
-
-/* DEPRECATED: Info box, should be replaced by universal modal dialog */
-#infoScrollArea {
-	position:relative;
-	border:1px solid #cecece;
-	overflow: scroll;
-	height: 300px;
-}
-
-#infoArea {
-	margin: 5px 0 5px 5px;
-	padding: 0 0 0 5px;
-}
-
-#backgroundPopup{
-	display:none;
-	position:fixed;
-	_position:absolute;
-	height:100%;
-	width:100%;
-	top:0;
-	left:0;
-	background:#000000;
-	z-index:1;
-}
-#popupInfo{
-	display:none;
-	position:fixed;
-	_position:absolute;
-	width:650px;
-	background:#ffffff;
-	-moz-border-radius: 8px;
-	-webkit-border-radius: 8px;
-	border-radius: 8px;
-	-moz-box-shadow: 0 0 30px #555;
-	-webkit-box-shadow: 0 0 30px #555;
-	box-shadow: 0 0 30px #555;
-	padding: 20px 30px;
-	font-size:13px;
-    z-index: 2000;
-}
-
-#popupInfoClose{
-	-moz-box-shadow: 0 0 12px #555;
-	-webkit-box-shadow: 0 0 12px #555;
-	box-shadow: 0 0 12px #555;
-	border: 2px solid #fff;
-	-moz-border-radius: 16px;
-	-webkit-border-radius: 16px;
-	border-radius: 16px;
-	font-size: 12px;
-	line-height: 14px;
-	right: -10px;
-	top: -10px;
-	position: absolute;
-	color: #fff;
-	font-weight: 700;
-	display: block;
-	background: #555;
-	width: 15px;
-	text-align: center;
-	padding: 3px;
-	cursor: pointer;
-}
-
-
-
-/* DEPRECATED: 2 column element */
-.clear_col {
-	clear: both;
-}
-.col_2_left, .col_2_right {
-	float: left;
-	padding: 15px 0 0;
-	width: 48%;
-}
-.col_wrap_2 .col_inner_left {
-	padding: 0 15px 0 0;
-}
-.col_wrap_2 .col_inner_right {
-	padding: 0 0 0 15px;
-}
-
-
-/* FILEPICKER */
-.functionbox-capation-box {
-	text-align: right;
-	padding: 5px;
-	background: #494949;
-	border-bottom: 5px solid #39AACB;
-}
-.functionbox-capation {
-	text-align: left;
-	color: white;
-	cursor: crosshair;
-	font-size: inherit;
-	line-height: 15px;
-	padding: 5px !important;
-}
-#filepicker {
-	z-index: 10;
-	position: absolute;
-	left: 0;
-	top: 0;
-	width:280px;
-	background: white;
-	border: 0px none;
-	border-left: 1px solid #ddd;
-	border-bottom: 1px solid #ddd;
-	box-shadow: 3px 3px 8px rgba(0, 0, 0, 0.30);
-	-moz-box-shadow: 3px 3px 8px rgba(0, 0, 0, 0.30);
-	-webkit-box-shadow: 3px 3px 8px rgba(0, 0, 0, 0.30);
-}
-#filepicker .functionbox-capation input {
-	position: absolute;
-	right: 5px;
-	top: 7px;
-	width:18px;
-	height:18px;
-	font-size: 10px;
-	color: black;
-	border: 1px solid;
-	background: #fff;
-	text-align: center;
-	line-height: 18px;
-	padding: 0;
-}
-#filepicker #canvas {
-	vertical-align:middle;
-	text-align:center;
-	height:340px;
-	overflow: auto;
-	overflow-y: scroll;
-}
-#filepicker table {
-	width: 100%;
-	border: 0px none;
-	margin: 0;
-}
-#filepicker table td {
-	border-bottom: 1px solid #ccc;
-}
-#filepicker table a {
-	display: block;
-	line-height: 20px;
-	padding: 0 0 0 35px;
-	text-align: left;
-	text-decoration: none;
-	font-size: 11px;
-}
-#filepicker table a.folder {
-	background: url("../img/filepicker_icons.gif") no-repeat scroll 0 -20px transparent;
-}
-#filepicker table a.file {
-    background: url("../img/filepicker_icons.gif") no-repeat scroll 0 0 transparent;
-	color: black;
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/web/base/css/htmlobject.css b/openQRM-5.3.50-CE/src/web/base/css/htmlobject.css
deleted file mode 100644
index 1fdd929..0000000
--- a/openQRM-5.3.50-CE/src/web/base/css/htmlobject.css
+++ /dev/null
@@ -1,324 +0,0 @@
-iframe {
-	margin: 10px 0 0 0;
-	display: block;
-	width: 100%;
-	height: 600px;
-	border: 0 none;
-}
-
-
-/* Tabs */
-.htmlobject_tabs {
-	display: block;
-	width: 100%;
-	height: 29px;
-	line-height: normal;
-	padding: 3px 0 0px 13px;
-	margin: 0 0 0 -16px;
-	background: #ddd; 
-	border-bottom: 1px solid #ccc;
-}
-.htmlobject_tabs_box .htmlobject_tabs {
-	padding: 3px 12px 0 11px;
-	margin: 0 0 0 -14px;
-}
-
-.htmlobject_table a {
-	color: #000;
-	text-decoration: underline;
-}
-.htmlobject_tabs ul {
-	position: relative;
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-.htmlobject_tabs li { 
-	float: right;
-	padding:0;
-	margin: 0 0 0 10px;
-}
-.htmlobject_tabs li.current { }
-.htmlobject_tabs li:hover,
-.htmlobject_tabs li.current:hover { }
-
-.htmlobject_tabs span {
-	float: left;
-	display: block;
-	padding: 0;
-}
-.htmlobject_tabs li a,
-.htmlobject_tabs li.current a {
-	margin: 0 !important;
-}
-
-
-/* Tabbox */
-.htmlobject_tabs_box {
-	position: relative;
-	margin: 0 0 65px 0;
-}
-
-/*.htmlobject_tabs_box div,
-.htmlobject_tabs_box p,
-.htmlobject_tabs_box h1,
-.htmlobject_tabs_box h3,*/
-.htmlobject_tabs_box form {
-	margin: 0;
-	padding: 5px;
-}
-
-.htmlobject_tabs_box .error {
-	color: red;
-}
-.htmlobject_box.error .errormsg {
-	margin: 0 0 10px 2px;
-}
-
-/* Box */
-
-.htmlobject_box {
-	margin: 0 0 5px 0 !important;
-}
-/* disabled 
-.htmlobject_box input,
-.htmlobject_box textarea,
-.htmlobject_box select,
-.htmlobject_box input[type=file] {
-	font-family: Tahoma, Verdana, sans-serif;
-	font-size: 11px;
-	line-height: 15px;
-	padding-left: 2px;
-}
-*/
-.htmlobject_box textarea {	
-/*	width: 396px; */
-}
-.htmlobject_box input[type=text],
-.htmlobject_box input[type=password] {	
-/*	width: 180px; */
-}
-.htmlobject_box .left {
-	float: left;
-	width: 200px;
-	margin: 0;
-	padding: 0;
-}
-.htmlobject_box .left label{
-	line-height: 30px;
-	margin: 0;
-}
-.htmlobject_box .right {
-	float: left;
-	margin: 0;
-	padding: 0;
-}
-.htmlobject_box.textarea .left {
-	width: 300px;
-	float: none;
-	margin: 15px 0 5px 0;
-}
-.htmlobject_box.textarea .right {
-	float: none;
-}
-.htmlobject_tabs_box .msgBox {
-	display: block;
-	position: absolute;
-	top: -70px;
-	left: 250px;
-	font-size: 11px;
-	border: solid 1px #aaaaaa;
-	background-color: #FFFFE0;
-	color: black;
-	padding: 10px 15px;
-	margin: 0;
-	z-index: 100;
-	-webkit-box-shadow: 0 2px 2px 0 rgba(33, 33, 33, 0.5);
-	box-shadow: 0 2px 2px 0 rgba(33, 33, 33, 0.5);
-}
-.msgBox strong {
-	font-weight: bold;
-	color: red;
-}
-
-/* Table */
-.htmlobject_table {
-	width: 100%;
-	border: 0px none;
-}
-.htmlobject_td {
-	border: 0;
-	border-top : 1px solid #cccccc;
-	padding: 8px 10px;
-	vertical-align: top;
-}
-.htmlobject_tr .pageturn_head {
-	padding: 5px;
-}
-.htmlobject_table .last {
-	border-bottom : 1px solid #cccccc;
-}
-
-.htmlobject_tr th {
-	background: #eee;
-	text-align: left;
-	border: 0;
-	border-top: 1px solid #ccc;
-	padding: 5px 10px;
-	font-size: 13px  !important;
-}
-.htmlobject_td.head {
-	border-top: 1px solid white !important;
-	padding: 0 !important;
-}
-.htmlobject_td.identifier {
-	text-align: center;
-	width: 20px;
-}
-.htmlobject_td.sorttable {
-	border: 0px none;
-}
-.htmlobject_td.sorttable select,
-.htmlobject_td.sorttable input {
-	border: 1px solid #cccccc;
-}
-.htmlobject_td.sorttable label {
-	margin: 0 0 0 5px;
-}
-.htmlobject_td.bottom {
-	padding-top: 15px !important;
-	text-align: right;
-	border: 0px none;
-}
-.htmlobject_table .selecttable {
-	display: inline;
-	padding: 0 20px 0 0 !important;
-	line-height: 18px;
-	white-space: nowrap;
-}
-.htmlobject_table .actiontable {
-	display: inline;
-}
-
-.htmlobject_table .pageturn_head .pageturn_wrapper {
-	display: bolck;
-	
-}
-.htmlobject_table .pageturn_head .sort_box {
-	float: right;
-}
-.htmlobject_table .pageturn_head .pageturn_box {
-	float: left;
-}
-.htmlobject_table .pageturn_head .sort_box input,
-.htmlobject_table .pageturn_head .sort_box select,
-.htmlobject_table .pageturn_head .sort_box textarea {
-	width: auto;
-	height: auto;
-	line-height: auto;
-	margin-bottom: 0;
-	margin-bottom:0;
-	line-height: auto;
-	padding:5px;
-	font-size: 90%;
-}
-.htmlobject_table .pageturn_head .sort_box input.offset {
-	display: none;
-}
-
-
-.htmlobject_table .pageturn_head .sort_box {
-	font-size: 11px;
-}
-
-.htmlobject_table .pageturn_head .sort_box input.submit {
-	vertical-align: middle;
-	margin: 0 0 0 8px;
-	width: 30px;
-	height: 30px;
-	text-indent: -1000px;
-	background-color: transparent;
-	background-image: url(../img/glyphicons/glyphicons.png);
-	background-position: -44px -382px;
-}
-
-
-.htmlobject_td.pageturn_head,
-.htmlobject_td.pageturn_bottom {
-	border: 0 none;
-}
-.htmlobject_td.pageturn_bottom .pageturn_middle,
-.htmlobject_td.pageturn_bottom a,
-.htmlobject_td.pageturn_bottom span {
-	color: #000;
-}
-.htmlobject_td.pageturn_head {
-/*	background: #494949; */
-}
-
-.htmlobject_table .pageturn_table td {
-	border: 0 none;
-	padding: 0;
-}
-
-.htmlobject_table .pageturn_table .last {
-	border-bottom: 0px none;
-}
-
-.htmlobject_table .pageturn_box a {
-	display: block;
-	float: left;
-	font-weight: bold;
-	margin: 1px;
-	padding: 2px 6px;
-	color: #444;
-	text-align: center;
-	text-decoration: none;
-}
-.htmlobject_table .pageturn_bottom .pageturn_box a {
-	color: #000;
-}
-.htmlobject_table .pageturn_box a.disabled {
-	
-}
-.htmlobject_td.pageturn_head .pageturn_table {
-	margin: 0 0 0 auto;
-	border: 0 none;
-}
-.htmlobject_td.pageturn_bottom .pageturn_table {
-	margin: 0 auto;
-	border: 0 none;
-	padding: 25px 5px 5px 5px !important;
-}
-.pageturn_table td.pageturn_middle {
-	text-align: center;
-	color: #444;
-	padding: 3px 10px 0;
-}
-.pageturn_middle span {
-	color: #444;
-}
-
-
-.htmlobject_td.sort_form {
-    border: 0 none;
-    text-align: right;
-}
-.htmlobject_td.actions {
-    border: 0 none;
-    padding-top: 15px !important;
-    text-align: right;
-}
-
-.tr_hover {
-}
-.tr_click {
-	background-color: #ddd;
-}
-/* defaults */
-.checkbox,
-.radio {
-	border: 0px none;
-}
-
-
diff --git a/openQRM-5.3.50-CE/src/web/base/css/menu.css b/openQRM-5.3.50-CE/src/web/base/css/menu.css
deleted file mode 100644
index 9dd2a9f..0000000
--- a/openQRM-5.3.50-CE/src/web/base/css/menu.css
+++ /dev/null
@@ -1,60 +0,0 @@
-.menuSection {
-	margin-top: 30px;
-}
-.menuSection table {
-	width: 100%;
-	margin: 0;
-	border: 0;
-
-}
-.menuSection a, .menuSection span {
-	text-decoration: none;
-	color: #353535;
-	font-size: 90%;
-}
-.menuSection a.phplmselected {
-	font-weight: bold;
-}
-.treemenudiv {
-	display: block;
-	white-space: nowrap;
-	padding: 0 0 0 10px;
-}
-
-.phplmnormal {
-	padding: 0;
-}
-
-/* Setup headline (first config) */
-#setup_h1 {
-	text-align: center;
-	margin: 35px 0 0 0;
-}
-
-/* styling for 1st item in both menu objects */
-#menu1_1, #menu2_1, #menuSection_queue_1{
-	background: #ddd;
-	padding: 8px 20px 5px 13px;
-
-}
-#menu1_1 a, #menu2_1 a, #menuSection_queue_1 a {
-	color: #353535;
-	font-family: "Arial Narrow",arial, verdana;
-	font-weight: normal;
-	font-size: 17px;
-}
-#menu1_1 img, #menu2_1 img, #menuSection_queue_1 img {
-	visibility: hidden;
-	display: none;
-}
-
-#menu1_1 .glyphicons, #menu2_1 .glyphicons, #menuSection_queue_1 .glyphicons {
-	padding: 8px 0 5px 17px;
-}
-
-/* Event counter */
-#Event_messages, #Queue_messages {
-	float:right;
-	text-align:right;
-	margin: 0 25px 0 0;
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/css/openqrm-ui.css b/openQRM-5.3.50-CE/src/web/base/css/openqrm-ui.css
deleted file mode 100644
index 539b554..0000000
--- a/openQRM-5.3.50-CE/src/web/base/css/openqrm-ui.css
+++ /dev/null
@@ -1,361 +0,0 @@
-html {
-	font-family: Arial, sans-serif;
-	font-size: 13px;
-}
-
-hr { border-top-color: #ccc; }
-
-
-/* text colors */
-.font-blue { color: #769cd3; }
-.font-green { color: #2693b8; }
-.font-orange { color: #FF8000; }
-.font-red { color: #BA264B; }
-
-h1, h2, h3, h4, h5, h6 {
-	font-family: "Arial Narrow",arial, verdana;
-	color: #353535;
-	font-weight: normal;
-}
-h3, h4, h5, h6 {
-	line-height: 20px;
-	margin-top: 20px;
-}
-
-code {
-	color: #353535;
-}
-
-
-/* modal dialog */
-.modal-overlay {
-	position: fixed;
-	top:0; 
-	left:0;
-	bottom: 0;
-	right: 0;
-	width: 100%; 
-	height:100%;
-	background: #999;
-	opacity:0.3; 
-	z-index: 10000;
-}
-.modal-box {
-	position: fixed;
-	width: 350px;
-	height:150px;
-	padding: 20px 30px;
-	font-size:13px;
-	border: 8px solid #999;
-	background: #ffffff url(/openqrm/base/img/ajax-loader.gif) no-repeat center center;
-	text-align: center;
-	z-index: 10001;
-}
-.modal-box .ajax-loader {
-	margin: 20px auto;
-	z-index: 10002;
-}
-
-
-/* defaults */
-.justify {
-	text-align: justify;
-}
-.first {
-	margin-top: 0;
-	padding-top: 0;
-}
-.lead {
-	font-size: 16px;
-}
-.pull-left {
-	float: left;
-}
-.pull-right {
-	float: right;
-}
-.hidden {
-	display: none;
-	visibility: hidden;
-	line-height: 0;
-	font-size: 0;
-	margin: 0;
-	padding: 0;
-}
-.disabled {
-	opacity: .6;
-	cursor: default;
-}
-
-
-/* pills */
-.pill {
-	padding: 2px 8px;
-	color: #fff;
-	font-size: 10px;
-	line-height: 10px;
-	text-transform: uppercase;
-	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-	background: #444;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	border-radius: 8px;
-}
-.pill a { color: #fff; text-decoration: none; }
-
-.pill.storage {}
-.pill.virtualization {}
-.pill.cloud {}
-.pill.enterprise { background: #2693b8; }
-.pill.deployment {}
-.pill.network {}
-.pill.ha {}
-.pill.monitoring {}
-.pill.management {}
-.pill.misc {}
-.pill.active { background: #3AE08A; color: black; }
-.pill.idle { background: silver; color: black; }
-.pill.inactive { background: #2693B8; }
-.pill.warning { background: #f69437; }
-.pill.error { 
-	background: red;
-	color: #fff;		/* override '.htmlobject_tabs_box .error', htmlobject.css:94 */	
-}
-.pill.acknowledged { background: green; }
-
-/* badge/pill colors */
-.pill.green, .pill.notice, .badge.green {	background: #2693b8; }
-.pill.red, .pill.error, .badge.red { background: #BA264B; }
-.pill.orange, .pill.warning .badge.orange { background: #FF8000; }
-.pill.yellow, .badge.yellow {	background: #CCCC00; }
-
-
-/* Common link classes */
-a.btn {}
-a.badge {}
-a.add {}
-a.edit {}
-a.details {}
-a.console {}
-a.resize {}
-a.manage {}
-a.migrate {}
-a.clone {}
-a.remove {}
-a.snap {}
-a.graphs {}
-a.start {}
-a.stop {}
-a.enable {}
-a.disable {}
-
-a.btn,
-a.badge, .badge,
-a.add,
-a.edit,
-a.details,
-a.console,
-a.resize,
-a.manage,
-a.migrate,
-a.clone,
-a.remove,
-a.snap,
-a.graphs,
-a.start,
-a.stop,
-a.enable,
-a.disable,
-a.configure,
-a.logout,
-input.password-button,
-input[type="submit"],
-input[type="button"],
-.submit,
-.htmlobject_table .actiontable input,
-.htmlobject_tabs li a,
-.htmlobject_tabs li.current a {
-	display: inline-block;
-	cursor: pointer;
-	background: #999;
-	line-height: 17px;
-	font-family: arial, verdana;
-	font-size: 10px;
-	color: #fff;
-	text-decoration: none;
-	text-transform: uppercase;
-	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	border-radius: 3px;
-	margin-right: 3px;
-	margin-bottom: 7px;
-	padding: 4px 8px;
-	border: 0;
-	white-space: nowrap;
-}
-
-a:hover.btn,
-a:hover.badge,
-a:hover.add,
-a:hover.edit,
-a:hover.details,
-a:hover.console,
-a:hover.resize,
-a:hover.manage,
-a:hover.migrate,
-a:hover.clone,
-a:hover.remove,
-a:hover.snap,
-a:hover.graphs,
-a:hover.start,
-a:hover.stop,
-a:hover.enable,
-a:hover.disable,
-input:hover.password-button,
-input[type="submit"]:hover,
-.submit:hover,
-.htmlobject_table .actiontable input:hover,
-.htmlobject_tabs li:hover a,
-.htmlobject_tabs li:hover.current a {
-	opacity: 0.8;
-}
-
-/* Quicklink buttons, use in dashboards
-   Supports: 
-     * icons: <i class="glyphicons-icon list"></i> (see glyphicons docs)
-     * button-label: <span class="label">label</span>
-     * colored corner
-       top right with label
-*/
-a.quicklink {
-	position: relative;
-	display: inline-block;
-	width: 90px;
-	height: 60px;
-	background: #e5e5e5;
-	border: 1px solid #c9c9c9;
-	text-align: center;
-	overflow: hidden;
-
-}
-a.quicklink .label {
-	display: block;
-	clear: both;
-	text-align: center;
-	font-family: "Arial Narrow",arial, verdana;
-	font-weight: bold;
-	color: #444;
-	text-shadow: none;
-	text-transform: none;
-	font-size: 13px;
-}
-a.quicklink  .glyphicons-icon {
-	opacity: 0.8;
-	text-align: center;
-	width: 40px;
-	height: 40px;
-}
-a.quicklink .corner {
-	position: absolute;
-	display: block;
-	top: -13px;
-	right: -3px;
-	width: 0;
-	height: 0;
-	border-top: 20px solid transparent;
-	border-bottom: 20px solid transparent;
-	border-right: 20px solid #444;
-	-webkit-transform: rotate(135deg);
-	-moz-transform: rotate(135deg);
-	transform: rotate(135deg);
-}
-a.quicklink .corner-orange { border-right: 20px solid #f07109; }
-a.quicklink .corner-green { border-right: 20px solid #82c782; }
-a.quicklink .corner-blue { border-right: 20px solid #769cd3; }
-a.quicklink label {
-	position: absolute;
-	top: -2px;
-	right: 2px;
-	font-size: 10px;
-	letter-spacing: -1px;
-}
-a.logout {
-	width: 24px;
-	height: 24px;
-	line-height: 24px;
-	background: url('../img/logout.png') no-repeat center #999;
-	float: right;
-	margin: -2px 0 0 12px;
-	padding: 0;
-}
-
-
-
-/* glyphicons customization */
-.glyphicons i:before {
-	font-size: 14px;
-}
-
-
-/* misc */
-.chart-bar {
-	position: relative;
-	display: block;
-	width: 90%;
-	height: 12px;
-	margin-top: 3px;
-	background: #e5e5e5;
-}
-
-.chart-bar .bar {
-	position: absolute;
-	top: 0;
-	left: 0;
-	display: block;
-	width: 1%;
-	max-width: 90%;
-	height: 12px;
-	background: #454545;
-	margin: 0 30px 0 0;
-}
-.chart-bar .bar label {
-	position: absolute;
-	top: 0;
-	bottom: auto;
-	left: auto;
-	right: -30px;
-	font-size: 10px;
-	line-height: 12px;
-}
-.chart-bar .peak {
-	position: absolute;
-	background: #ff0000;
-	width: 1px;
-	height: 12px;
-	left: 0;
-}
-
-.bar-01 .bar { background: #82c782; width: 0%; }
-.bar-02 .bar { background: #f07109; width: 0%; }
-.bar-03 .bar { background: #769cd3; width: 0%; }
-
-.doculink {
-	background: url(../img/help_small.png) no-repeat top right transparent;
-	line-height: 18px;
-	display: block;
-	margin: 0; 
-	padding: 0 25px 0 0; 
-	text-decoration: none;
-}
-
-/* fix .lead and <small> line-height when used in .table */
-.table .lead {
-	line-height: 20px;
-}
-
-/* htmlobjects overrides */
-.htmlobject_tabs li.current a {
-	background: #39aacb;
-}
-
diff --git a/openQRM-5.3.50-CE/src/web/base/fonts/glyphicons-regular.eot b/openQRM-5.3.50-CE/src/web/base/fonts/glyphicons-regular.eot
deleted file mode 100644
index c73cdd8..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/fonts/glyphicons-regular.eot and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/fonts/glyphicons-regular.otf b/openQRM-5.3.50-CE/src/web/base/fonts/glyphicons-regular.otf
deleted file mode 100644
index b428a69..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/fonts/glyphicons-regular.otf and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/fonts/glyphicons-regular.svg b/openQRM-5.3.50-CE/src/web/base/fonts/glyphicons-regular.svg
deleted file mode 100644
index d84cf19..0000000
--- a/openQRM-5.3.50-CE/src/web/base/fonts/glyphicons-regular.svg
+++ /dev/null
@@ -1,435 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="glyphiconsregular" horiz-adv-x="2400" >
-<font-face units-per-em="2400" ascent="1920" descent="-480" />
-<missing-glyph horiz-adv-x="500" />
-<glyph />
-<glyph />
-<glyph unicode="&#xd;" />
-<glyph unicode=" " />
-<glyph unicode="*" d="M200 1050v300q0 20 14.5 35t35.5 15h467l-302 302q-15 15 -15 36t15 35l212 212q14 15 35.5 15t35.5 -15l302 -302v467q0 21 14.5 35.5t35.5 14.5h300q21 0 35.5 -15t14.5 -35v-468l303 303q15 15 36 15t35 -15l212 -212q15 -15 15 -36t-15 -36l-301 -301h465 q21 0 35.5 -15t14.5 -35v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-466l302 -303q15 -14 15 -35.5t-15 -35.5l-212 -212q-14 -15 -35.5 -15t-35.5 15l-303 302v-466q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v465l-302 -301q-14 -15 -35 -15t-36 15 l-212 211q-14 15 -14 36t14 36l303 303h-468q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xf7;" d="M300 1050v300q0 21 14.5 35.5t35.5 14.5h1700q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-1700q-21 0 -35.5 14.5t-14.5 35.5zM1000 450v300q0 21 14.5 35.5t35.5 14.5h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300 q-21 0 -35.5 14.5t-14.5 35.5zM1000 1650v300q0 21 14.5 35.5t35.5 14.5h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#x2da;" d="M128 1007q-1 224 80 396.5t285 331.5l313 -313q-135 -80 -223.5 -225.5t-88.5 -333.5q0 -24 1 -36q5 -103 63 -207.5t146.5 -185t206 -131.5t234.5 -51q116 0 232 51.5t202.5 133t143 185.5t61.5 205q1 12 1 36q0 188 -88.5 333.5t-223.5 225.5l313 313 q206 -160 291 -333.5t84 -394.5q-1 -205 -71.5 -384t-199 -312t-321 -210t-424.5 -77t-424.5 77t-321 210t-199.5 312t-72 384zM495 2000l368 368q27 -32 52 -53l-220 -515zM895 1641l262 -282l238 282q-13 -9 -35.5 -22t-86 -35t-120.5 -22t-121.5 20t-100.5 40zM895 1800 l129 452q64 -23 125 -23q57 0 117 21l129 -450q-5 -4 -13.5 -10t-36.5 -21t-56 -27t-67.5 -21.5t-76.5 -9.5q-58 0 -120.5 22.5t-96.5 44.5zM969 2400h360q-77 -71 -180 -71t-180 71zM1376 2310q28 23 55 54l364 -364l-200 -200z" />
-<glyph unicode="&#x20ac;" d="M160 800l80 300h263q-1 24 -1.5 61t0.5 39h-342l80 300h300q80 377 309.5 583t579.5 206q156 0 296.5 -53.5t251 -152.5t183 -249.5t90.5 -333.5h-402q-20 153 -143 268.5t-276 115.5q-196 0 -304 -83.5t-159 -300.5h674l-80 -300h-642q-1 0 -1 -18.5t0.5 -43.5t1.5 -38 h621l-80 -300h-481q29 -78 69 -143t94.5 -118.5t128 -83.5t158.5 -30q187 0 293.5 123t130.5 352h402q-16 -187 -82.5 -348.5t-172.5 -279t-253.5 -184.5t-317.5 -67q-168 0 -314.5 59.5t-256.5 165.5t-188.5 246.5t-121.5 307.5h-388z" />
-<glyph unicode="&#x2601;" d="M-86 697q0 126 87 214.5t210 88.5h2q-1 34 -1.5 52t-1 20t-0.5 3.5v6.5q0 140 67 265.5t183.5 201.5t252.5 76q56 0 103 -11q65 212 241.5 346.5t398.5 134.5q182 0 337 -92.5t245 -251t90 -345.5v-3q126 -4 234 -78t170 -192.5t62 -250.5q0 -149 -80 -277t-213 -205 h-2144q-107 0 -175 90t-68 207z" />
-<glyph unicode="&#x2602;" d="M-100 1028q0 264 94 507.5t254 426t382.5 298.5t469.5 134v105q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5v-105q247 -18 469.5 -134t382.5 -298.5t254 -426t94 -507.5h-5q-136 269 -441 269q-130 0 -240.5 -51.5t-186.5 -148.5q-79 101 -190.5 161t-236.5 60 q-123 0 -234.5 -63.5t-192.5 -167.5q-77 100 -188 156t-238 56q-305 0 -442 -271h-5zM500 199v49q0 21 14.5 35.5t35.5 15.5h100q21 -1 35.5 -15.5t14.5 -35.5v-49q0 -38 9.5 -71t31 -63t62 -47.5t97.5 -17.5q56 0 97 18.5t60 41t29.5 55.5t12 49.5t1.5 34.5v880q0 3 14 7.5 t38 8.5t48 4t48 -4t38 -8.5t14 -7.5v-880q0 -75 -25 -145t-73.5 -127.5t-129 -92t-181.5 -34.5q-179 0 -285 107.5t-106 291.5z" />
-<glyph unicode="&#x2609;" d="M0 1100v200h401q-7 0 -7 -100t7 -100h-401zM278 425l284 285q62 -81 148 -148l-285 -284zM278 1975l147 147l285 -284q-83 -65 -148 -148zM712 1200q0 131 66 243.5t178.5 178.5t243.5 66t243.5 -66t178.5 -178.5t66 -243.5t-66 -243.5t-178.5 -178.5t-243.5 -66 t-243.5 66t-178.5 178.5t-66 243.5zM1100 0v401q0 -7 100 -7t100 7v-401h-200zM1100 1999v401h200v-401q0 7 -100 7t-100 -7zM1690 562q86 67 148 148l284 -285l-147 -147zM1690 1838l285 284l147 -147l-284 -285q-65 83 -148 148zM1999 1100q7 0 7 100t-7 100h401v-200 h-401z" />
-<glyph unicode="&#x2693;" d="M4 849q-3 20 10 32.5t33 9.5l644 -92q20 -3 24.5 -15.5t-9.5 -26.5l-167 -168q96 -104 206.5 -170t254.5 -95v1330q-84 58 -143 150.5t-59 195.5q0 166 116.5 283t282.5 117q165 0 283 -117.5t118 -282.5q0 -104 -57.5 -196.5t-140.5 -149.5v-1330q143 29 251.5 94.5 t204.5 169.5l-170 168q-15 15 -10.5 27.5t24.5 15.5l643 91q21 3 33.5 -9.5t9.5 -32.5l-92 -643q-3 -21 -15.5 -25t-26.5 10l-188 188q-168 -177 -393 -277.5t-476 -100.5q-253 0 -478.5 99.5t-392.5 276.5l-185 -185q-15 -15 -27.5 -10.5t-15.5 24.5zM984 2000 q0 -87 62 -149t150 -62q87 0 148.5 62t61.5 149t-61.5 149t-148.5 62q-88 0 -150 -62t-62 -149z" />
-<glyph unicode="&#x2698;" d="M300 1090q72 -21 147 -40t113.5 -28t80 -21.5t66 -26.5t50 -36.5t51.5 -56.5q52 -66 65 -138.5t-4 -156.5l231 -231v766q-188 23 -346 137.5t-217 285.5q-70 204 -33 449q101 7 217 7q-6 54 -4.5 112t5.5 103l5 45q65 12 157 12q-41 -52 -68.5 -148t-35.5 -166l-7 -70 l100 -26q197 -52 266 -220l111 -272l111 272q69 168 266 220l100 26q-1 11 -2.5 29.5t-10 71t-19.5 99t-32 99.5t-47 85q41 0 80 -3t58 -6l19 -3q2 -18 4.5 -45t6 -103t-4.5 -112q116 0 217 -7q37 -247 -33 -449q-59 -171 -217 -285.5t-346 -137.5v-766l231 231 q-6 36 -8.5 60.5t-0.5 66.5t19.5 84.5t49.5 83.5l1 1q31 39 65.5 65.5t83.5 44.5t91 29t123 30.5t145 38.5q0 -131 -20.5 -234t-53.5 -166.5t-78.5 -106.5t-90.5 -61.5t-96 -23.5t-88.5 0t-73.5 15l-299 -299v-214h-300v214l-299 299q-35 -10 -73 -15t-88.5 0t-96 23.5 t-91 61.5t-78.5 106.5t-53.5 166.5t-20.5 234zM928 1987q7 75 43 152.5t82 134t91 102t76 68.5l30 24q12 -9 32 -24.5t72.5 -67t94 -104.5t79 -131.5t44.5 -153.5q-144 -38 -227 -122q-59 -59 -95 -148q-36 89 -95 148q-83 84 -227 122z" />
-<glyph unicode="&#x2708;" d="M0 435v171q0 21 11 45t27 38l862 719v698q0 117 82 205.5t221 88.5t218 -88t79 -206v-698l862 -719q16 -14 27 -38t11 -45v-170q0 -20 -13 -28t-31 1l-956 497v-600l261 -211q16 -13 27.5 -36.5t11.5 -44.5v-75q0 -21 -14 -31.5t-34 -4.5l-352 103q-20 6 -100 6t-100 -6 l-352 -103q-20 -6 -34 4.5t-14 31.5v75q0 21 11.5 44.5t27.5 36.5l261 211v600l-956 -498q-18 -9 -31 -1t-13 28z" />
-<glyph unicode="&#x2709;" d="M0 400l700 700l500 -500l500 500l700 -700h-2400zM0 600v1200l600 -600zM0 2000h2400l-1200 -1200zM1800 1200l600 600v-1200z" />
-<glyph unicode="&#x270f;" d="M2 31l236 615l408 -408l-615 -236q-19 -8 -28 0.5t-1 28.5zM362 770l1284 1283l408 -407l-1284 -1285zM1769 2177l153 153l51 51q21 21 51 21t51 -21l306 -306q21 -21 21 -51t-21 -51l-51 -51l-102 -102l-51 -51l-51 51l-306 306z" />
-<glyph unicode="&#x2744;" d="M-198 1200q0 38 26 69t72 31h159l-95 94q-22 22 -27.5 48.5t3 49.5t27 41.5t41.5 27t49.5 3t48.5 -27.5l235 -236h300l106 212l-188 188h-359q-46 0 -72 31t-26 69t26 69t72 31h159l-149 148q-22 22 -27.5 48.5t3 49.5t27 41.5t41.5 27t49.5 3t48.5 -27.5l148 -149v159 q0 46 31 72t69 26t69 -26t31 -72v-359l189 -188l211 106v300l-236 235q-22 22 -27.5 48.5t3 49.5t27 41.5t41.5 27t49.5 3t48.5 -27.5l94 -95v159q0 46 31 72t69 26t69 -26t31 -72v-159l94 95q22 22 48.5 27.5t49.5 -3t41.5 -27t27 -41.5t3 -49.5t-27.5 -48.5l-236 -235 v-300l212 -106l188 188v359q0 46 31 72t69 26t69 -26t31 -72v-159l149 149q19 19 41.5 26t42.5 2t38.5 -16.5t30 -30.5t16.5 -39t-2 -42.5t-26 -41.5l-149 -148h159q46 0 72 -31t26 -69t-26 -69t-72 -31h-359l-188 -188l106 -212h300l235 236q22 22 48.5 27.5t49.5 -3 t41.5 -27t27 -41.5t3 -49.5t-27.5 -48.5l-95 -94h159q46 0 72 -31t26 -69t-26 -69t-72 -31h-159l95 -94q22 -22 27.5 -48.5t-3 -49.5t-27 -41.5t-41.5 -27t-49.5 -3t-48.5 27.5l-235 236h-300l-106 -211l188 -189h359q46 0 72 -31t26 -69t-26 -69t-72 -31h-159l149 -149 q19 -19 26 -41.5t2 -42.5t-16.5 -38.5t-30 -30t-38.5 -16.5t-42.5 2t-41.5 26l-149 149v-159q0 -46 -31 -72t-69 -26t-69 26t-31 72v359l-189 188l-211 -106v-300l236 -235q22 -22 27.5 -48.5t-3 -49.5t-27 -41.5t-41.5 -27t-49.5 -3t-48.5 27.5l-94 95v-159q0 -46 -31 -72 t-69 -26t-69 26t-31 72v159l-94 -95q-22 -22 -48.5 -27.5t-49.5 3t-41.5 27t-27 41.5t-3 49.5t27.5 48.5l236 235v300l-212 106l-188 -188v-359q0 -46 -31 -72t-69 -26t-69 26t-31 72v159l-148 -149q-19 -19 -41.5 -26t-42.5 -2t-39 16.5t-30.5 30t-16.5 38.5t2 42.5 t26 41.5l149 149h-159q-46 0 -72 31t-26 69t26 69t72 31h359l188 188l-106 212h-300l-235 -236q-43 -43 -97.5 -24t-68.5 68t24 98l95 94h-159q-46 0 -72 31t-26 69zM815 1200l128 -257l257 -128l257 128l128 257l-128 257l-257 128l-257 -128z" />
-<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#xe001;" d="M58 2400h2284l-1050 -1288v-827l700 -233v-50h-1600v50l700 233v834zM388 2200l704 -899l-404 899h-300z" />
-<glyph unicode="&#xe002;" d="M1 -22l437 440q30 0 119.5 -14.5t216 -29t244.5 -14.5q105 0 202 11.5t208 43.5t209 83t198 135.5t181.5 194.5t154 267t122 347t78 440t28.5 540q-163 -47 -342 -93t-302.5 -75t-258.5 -64t-231 -65t-197.5 -73t-180.5 -94t-157.5 -122t-149.5 -162q-252 -324 -252 -718 q0 -85 10.5 -172.5t25.5 -168.5t18 -112l-381 -383v-142zM536 647q0 25 28 89q43 102 121.5 202.5t165 178.5t201 158t206.5 134t204 114q228 121 318 181q203 135 323 311q70 103 85 103q4 0 4 -8q0 -13 -10 -43.5t-20 -54.5l-10 -25q-63 -130 -146 -240.5t-148 -178.5 t-182 -148t-173 -112t-195 -107l-1 -1q-210 -113 -414.5 -252.5t-282.5 -244.5q-14 -19 -36 -42.5t-32 -23.5q-6 0 -6 10z" />
-<glyph unicode="&#xe003;" d="M0 100v1044q0 21 9 47.5t21 43.5l191 265q12 17 10 39.5t-18 35.5l-194 248q-16 15 -18.5 35.5t13.5 37.5q10 10 23.5 11t19.5 -1.5t25 -10.5q163 -120 224 -158q27 -17 61 -26.5t54 -10.5h20h740q26 0 48 5t35.5 12t23 14.5t13.5 12.5l4 5q14 14 35 14t35 -14l385 -411 q15 -15 27.5 -40.5t12.5 -44.5v-1153q0 -41 -29.5 -70.5t-70.5 -29.5h-100q-41 0 -70.5 29.5t-29.5 70.5v664q0 21 -11.5 37.5t-30.5 18.5l-858 180q-21 2 -48 -6t-42 -22l-210 -369v-503q0 -41 -29.5 -70.5t-70.5 -29.5h-100q-41 0 -70.5 29.5t-29.5 70.5zM1470 1893 q0 21 14 35l524 524q24 25 45 35t34 1t13 -37v-151q2 -55 21 -73l465 -458q14 -15 11 -32t-20 -29l-316 -210q-17 -12 -39.5 -11t-39.5 14l-67 56q-17 13 -38.5 12t-35.5 -15l-107 -107q-15 -15 -36 -15t-35 15l-379 410q-14 15 -14 36z" />
-<glyph unicode="&#xe004;" d="M50 150v235q0 80 20.5 120.5t79.5 73.5q481 278 700 373v376q-100 74 -100 224v298q0 126 48.5 226t152.5 162t249 62t249 -62t152.5 -162t48.5 -226v-298q0 -149 -100 -223v-377q186 -76 700 -373q59 -33 79.5 -73.5t20.5 -120.5v-235q0 -21 -14.5 -35.5t-35.5 -14.5 h-2200q-20 0 -35 14.5t-15 35.5z" />
-<glyph unicode="&#xe005;" d="M199.5 217.5q-0.5 11.5 5 44.5t19 64t47.5 70t83 69q21 12 121.5 82.5t218.5 146t206 120.5v202l-249 92l-206 -313l-230 231l347 116l138 258v400q0 131 61.5 244.5t177.5 184.5t261 71q130 0 240.5 -71t177.5 -184.5t82 -244.5v-400l137 -258l348 -116l-230 -231 l-206 313l-249 -92v-202q88 -45 206 -120.5t218.5 -146t121.5 -82.5q49 -30 83 -68t47.5 -71.5t19.5 -62.5t5 -46l-1 -17v-50q0 -21 -15 -35.5t-35 -14.5h-1900q-21 0 -35.5 14.5t-14.5 35.5v50h1q-1 6 -1.5 17.5z" />
-<glyph unicode="&#xe006;" d="M-100 1450v100q0 21 14.5 35.5t35.5 14.5h190l164 547q44 89 90.5 121t141.5 32h1328q95 0 141.5 -32t90.5 -121l164 -547h190q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-92l42 -100v-1150q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-20 0 -35 14.5 t-15 35.5v150h-1800v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-20 0 -35 14.5t-15 35.5v1150l42 100h-92q-21 0 -35.5 14.5t-14.5 35.5zM100 1000l100 -100h300v200l-400 110v-210zM344 1600h1712q-102 423 -119 460q-23 40 -60 40h-1354q-37 0 -60 -40q-8 -16 -37.5 -131 t-55.5 -222zM800 500h800v200h-800v-200zM1900 900h300l100 100v210l-400 -110v-200z" />
-<glyph unicode="&#xe007;" d="M-200 1250v100q0 21 14.5 35.5t35.5 14.5h350v350q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v350 h-350q-21 0 -35.5 14.5t-14.5 35.5zM300 150v235q0 80 20.5 120.5t79.5 73.5q481 278 700 373v376q-100 74 -100 224v298q0 126 48.5 226t152.5 162t249 62t249 -62t152.5 -162t48.5 -226v-298q0 -149 -100 -223v-377q186 -76 700 -373q59 -33 79.5 -73.5t20.5 -120.5v-235 q0 -21 -14.5 -35.5t-35.5 -14.5h-2200q-20 0 -35 14.5t-15 35.5z" />
-<glyph unicode="&#xe008;" d="M-100 1250v100q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM200 150v235q0 80 20.5 120.5t79.5 73.5q481 278 700 373v376q-100 74 -100 224v298q0 126 48.5 226t152.5 162t249 62 t249 -62t152.5 -162t48.5 -226v-298q0 -149 -100 -223v-377q186 -76 700 -373q59 -33 79.5 -73.5t20.5 -120.5v-235q0 -21 -14.5 -35.5t-35.5 -14.5h-2200q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe009;" d="M100 0v2400q0 41 29.5 70.5t70.5 29.5h2000q41 0 70.5 -29.5t29.5 -70.5v-2400q0 -41 -29.5 -70.5t-70.5 -29.5h-2000q-41 0 -70.5 29.5t-29.5 70.5zM200 100h300v200h-300v-200zM200 500h300v200h-300v-200zM200 900h300v200h-300v-200zM200 1300h300v200h-300v-200z M200 1700h300v200h-300v-200zM200 2100h300v200h-300v-200zM600 100h1200v1000h-1200v-1000zM600 1300h1200v1000h-1200v-1000zM1900 100h300v200h-300v-200zM1900 500h300v200h-300v-200zM1900 900h300v200h-300v-200zM1900 1300h300v200h-300v-200zM1900 1700h300v200 h-300v-200zM1900 2100h300v200h-300v-200z" />
-<glyph unicode="&#xe010;" d="M3 1737l494 -143l154 -499l146 499l493 148l-493 152l-150 500l-150 -500zM15 198q0 21 14 35l1572 1572l212 -213l-1572 -1571q-14 -15 -35 -15t-35 15l-142 141q-14 15 -14 36zM1108 539l344 -101l101 -344l101 344l343 101l-343 101l-101 344l-101 -344zM1708 1149 l266 -79l79 -266l78 266l266 79l-266 78l-78 267l-79 -267zM1760 1964l403 402q14 15 35 15t35 -15l142 -141q14 -15 14 -35.5t-14 -35.5l-403 -402z" />
-<glyph unicode="&#xe012;" d="M-100 540v1020q0 140 100 240t240 100h341q1 3 3 11l32 78q35 87 126 149t185 62h546q94 0 185 -62t126 -149l32 -78q2 -8 3 -11h341q140 0 240 -100t100 -240v-1020q0 -140 -100 -240t-240 -100h-1920q-140 0 -240 100t-100 240zM675 1000q0 -142 70.5 -263 t191.5 -191.5t263 -70.5q107 0 204 41.5t167.5 112t112 168t41.5 203.5t-41.5 203.5t-112 168t-167.5 112t-204 41.5q-142 0 -263 -70.5t-191.5 -191.5t-70.5 -263zM925 1000q0 114 80.5 194.5t194.5 80.5t194.5 -80.5t80.5 -194.5t-80.5 -194.5t-194.5 -80.5t-194.5 80.5 t-80.5 194.5zM2000 1500h200v100h-200v-100z" />
-<glyph unicode="&#xe013;" d="M0 1616q0 103 34.5 201.5t93.5 177.5t140 140.5t171.5 97.5t191 40.5t195.5 -23t187.5 -99t164.5 -182.5q77 111 172 182.5t191 99t195.5 23t189 -40.5t169 -97.5t137 -140.5t91 -177.5t33.5 -201.5q0 -89 -38 -181.5t-108.5 -185t-159 -186t-200 -202t-219.5 -216 t-231 -246.5t-222 -274q-99 135 -222 274t-231 246.5t-219.5 216t-200 202t-159 186t-108.5 185t-38 181.5z" />
-<glyph unicode="&#xe014;" d="M0 1647q27 61 57 112q119 206 303.5 350.5t396 209.5t444 51t443.5 -114l54 93q21 36 62 47t78 -10q36 -21 47 -62t-10 -78l-54 -93q192 -133 320.5 -327t178 -409.5t17 -447.5t-151.5 -438q-33 -57 -64 -98q8 135 -55 255.5t-183 189.5q-95 55 -205 62t-205 -31 q-8 125 -73.5 234t-178.5 175q-112 65 -240 68t-236 -52q-18 105 -78 193t-154 142q-127 71 -263.5 63.5t-249.5 -85.5zM353 19l669 1158q52 -11 98 -37q45 -27 79 -64l-610 -1057h-236zM409 1909l33 -11q88 -28 142 -51.5t103.5 -60.5t86 -86t77.5 -126l16 -30l18 29 q61 97 130.5 176.5t129.5 128.5t123 85.5t107.5 54t86.5 27.5t57.5 11.5t22.5 1.5l8 38q-205 92 -428 92q-190 0 -367.5 -66.5t-319.5 -190.5zM1593 1124l34 2q9 0 25 0.5t24 0.5q138 0 226.5 -41t209.5 -152l26 -24l7 34q58 299 -54.5 584t-360.5 463l-28 -25l1 -1 q52 -105 54 -264q3 -262 -147 -546z" />
-<glyph unicode="&#xe015;" d="M200 -100l536 600h-136q-61 0 -116.5 22t-94.5 57.5t-72 78t-54 85t-36 78t-21 57.5l-6 22v400l170 1003q12 82 79.5 139.5t150.5 57.5h1200q83 0 150.5 -57.5t80.5 -139.5l169 -1003v-400q-2 -8 -6.5 -22.5t-20.5 -56t-36 -79.5t-54 -84t-72.5 -79t-94 -56t-116.5 -23 h-144l544 -600h-400l-327 600h-554l-319 -600h-400zM400 900l400 -100v200l-400 200v-300zM400 1400q16 -9 45.5 -25t120 -55.5t181 -70t216 -55.5t237.5 -25t235.5 24t220 57.5t177 67.5t123.5 58l44 24l-150 872q-2 8 -13 18t-20 10h-1229q-9 0 -20.5 -10t-12.5 -18z M1600 800l400 100v300l-400 -200v-200z" />
-<glyph unicode="&#xe016;" d="M0 253v1397q0 21 14.5 35.5t35.5 14.5h297q21 0 37 -14.5t16 -35.5v-300q0 -21 13 -35.5t34 -14.5h1503q21 0 35.5 14.5t14.5 35.5v300q0 21 14.5 35.5t35.5 14.5h300q21 0 35.5 -14.5t14.5 -35.5v-1397q0 -21 -14.5 -37t-35.5 -16h-370q-21 0 -39 15t-23 35l-39 202 q-5 20 -23 34t-39 14h-1234q-20 0 -38.5 -14.5t-23.5 -34.5l-39 -201q-5 -20 -23 -35t-39 -15h-370q-21 0 -35.5 16t-14.5 37zM100 1498q0 -42 29.5 -71t70.5 -29t70.5 29t29.5 71q0 41 -29.5 70.5t-70.5 29.5t-70.5 -29.5t-29.5 -70.5zM505 1456l190 894q2 21 18 35.5 t37 14.5h900q21 0 37 -14.5t18 -35.5l190 -894q2 -20 -11 -35t-34 -15h-1300q-21 0 -34 15t-11 35zM562 48l76 304q5 20 23 34t39 14h1000q21 0 39 -14t23 -34l76 -304q5 -20 -6 -34t-32 -14h-1200q-21 0 -32 14t-6 34z" />
-<glyph unicode="&#xe017;" d="M200 2050v100q0 21 14.5 35.5t35.5 14.5h550v200q0 82 59 141t141 59h400q82 0 141 -59t59 -141v-200h550q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1900q-21 0 -35.5 14.5t-14.5 35.5zM300 -167v2017q0 25 11 37.5t39 12.5h1679q71 0 71 -41 v-2009q0 -23 -20.5 -36.5t-50.5 -13.5h-1679q-17 0 -29.5 8t-16.5 16zM600 150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v1400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-1400zM1000 2200h400v200h-400v-200zM1100 150 q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v1400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-1400zM1600 150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v1400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5 t-14.5 -35.5v-1400z" />
-<glyph unicode="&#xe018;" d="M128 169q36 -111 172 -158t295 2q129 42 214.5 125.5t90.5 161.5v1274l1100 293v-980q-119 29 -277 -22q-157 -51 -244 -168.5t-51 -227.5q36 -111 172 -158t295 2q129 41 214.5 125t90.5 162v1761q0 21 -14 31.5t-34 5.5l-1404 -369q-20 -6 -34 -24.5t-14 -39.5v-1378 q-117 30 -277 -22q-157 -51 -244 -168.5t-51 -227.5z" />
-<glyph unicode="&#xe019;" d="M360 200q-28 87 10 181.5t131 172t219 118.5q134 43 283 20l1 1647q0 25 18 43t43 18h174q25 0 43 -18t18 -43v-55q44 -22 139 -59.5t171.5 -71t159.5 -81t139.5 -111.5t75.5 -140q25 -96 11 -180.5t-45.5 -151t-78 -118.5t-85.5 -82t-68 -42q-38 -14 -42 -6.5t10 23.5 l14 17q6 9 15 24t28 60t28 88.5t3.5 101t-33.5 104.5q-27 45 -89 73.5t-123.5 37.5t-130 23.5t-99.5 32.5v-1415q0 -2 -1 -5.5t-1 -5.5q-12 -114 -113.5 -217.5t-256.5 -153.5q-132 -39 -248 -32t-203.5 61t-116.5 142z" />
-<glyph unicode="&#xe020;" d="M22 1616q0 103 34.5 201.5t93.5 177.5t140 140.5t171.5 97.5t191 40.5t195.5 -23t187.5 -99t164.5 -182.5q77 111 172 182.5t191 99t195.5 23t189 -40.5t169 -97.5t137 -140.5t91 -177.5t33.5 -201.5q0 -89 -38 -181.5t-108.5 -185t-159 -186t-200 -202t-219.5 -216 t-231 -246.5t-222 -274q-99 135 -222 274t-231 246.5t-219.5 216t-200 202t-159 186t-108.5 185t-38 181.5zM272 1616q0 -45 27.5 -102.5t62.5 -107t109 -130t124 -130.5t150 -148q287 -279 455 -472q149 172 457 475q70 68 107 105t95.5 97t90 96.5t71.5 86.5t59.5 85.5 t33.5 74t14 70.5q0 85 -36 162t-93.5 130t-129 84.5t-142.5 31.5q-185 0 -321 -198l-212 -305l-203 311q-126 192 -307 192q-73 0 -146.5 -31.5t-132.5 -84.5t-96 -130t-37 -162z" />
-<glyph unicode="&#xe021;" d="M-97 1200l1349 1342v-5l348 -345v308h400v-705l600 -595h-400v-1200h-700v800h-500v-800h-700v1200h-397z" />
-<glyph unicode="&#xe023;" d="M247 819q2 42 10.5 106t25.5 115.5t47 115t71.5 116t103 107.5t137.5 100q-6 -16 -20 -53q-17 -45 -26 -70.5t-24.5 -74t-20 -79t-8.5 -72t5.5 -67.5t26 -51.5t50 -38.5t79.5 -15q36 -1 64.5 4t49 19.5t35 31.5t22 46t12 55.5t2 68.5t-5.5 76t-11.5 87.5t-15.5 93.5 t-19 103q-21 118 -32 181q-15 96 -5.5 182.5t38.5 162t66.5 138.5t78.5 113t75 84.5t56 52.5l23 18q-14 -136 30.5 -316t120 -334t170.5 -267.5t173 -128.5q87 -17 86 86q-1 132 -147 441q175 -83 304.5 -203t203 -253t109 -284.5t33.5 -297t-34 -290.5 q-35 -158 -100 -274.5t-156.5 -190.5t-199.5 -114.5t-243 -55.5q-96 -10 -99 42t49 149q18 42 28.5 67.5t26 67.5t25.5 81.5t15 79.5q13 109 -44.5 257.5t-157.5 267.5q3 -53 -4 -125t-24 -158t-46.5 -174.5t-68.5 -173.5t-93 -156t-116.5 -121t-143.5 -69t-170 0 q-337 128 -400 550q-6 39 -9 63.5t-6.5 80t-1.5 97.5z" />
-<glyph unicode="&#xe024;" d="M100 1100v500h600v-498q0 -93 27.5 -181t80.5 -160.5t140 -116.5t196 -44h6h6q88 0 162 29t125.5 78t87.5 114t52.5 136t16.5 145v498h600v-500q0 -232 -80.5 -436.5t-219.5 -350t-332.5 -229.5t-411.5 -84h-6h-6q-175 0 -335 53.5t-288 153.5t-223 234t-146.5 304 t-51.5 355zM100 1800v400q0 41 29.5 70.5t70.5 29.5h400q41 0 70.5 -29.5t29.5 -70.5v-400h-600zM1600 1800v400q0 41 29.5 70.5t70.5 29.5h400q41 0 70.5 -29.5t29.5 -70.5v-400h-600z" />
-<glyph unicode="&#xe025;" d="M-500 150v235q0 80 20.5 120.5t79.5 73.5q481 278 700 373v376q-100 74 -100 224v298q0 126 48.5 226t152.5 162t249 62t249 -62t152.5 -162t48.5 -226v-298q0 -150 -100 -223v-377q186 -76 700 -373q59 -33 79.5 -73.5t20.5 -120.5v-235q0 -21 -14.5 -35.5t-35.5 -14.5 h-2200q-20 0 -35 14.5t-15 35.5zM1210 1033.5q-1 16.5 7.5 31.5t26.5 34.5t36.5 36t44 41.5t44.5 47q62 72 81.5 150t19.5 232q0 95 47 183.5t139.5 149t208.5 61.5q116 -1 208.5 -61.5t139.5 -149t47 -183.5q0 -156 18.5 -233.5t79.5 -148.5q18 -21 43 -46.5t42.5 -42 t34 -36.5t24 -34.5t5.5 -31t-16 -31.5q-56 -61 -156.5 -114t-234.5 -61v-199q143 -62 295 -134t203 -101q49 -28 75.5 -61.5t26.5 -81.5v-100q0 -21 -13 -35.5t-33 -14.5h-754v328q0 103 -34.5 167.5t-134.5 121.5q-74 42 -131 75v35q-82 4 -162 33q-68 38 -140 76 q-38 29 -73 66q-14 15 -15 31.5z" />
-<glyph unicode="&#xe026;" d="M0 0v100h900v-100h-900zM0 200v300l200 700l300 900h100v300l400 -100v-200h100v100h200v-100h100v200l400 100v-300h100l300 -900l200 -700v-300h-900v300l100 700h-800l100 -700v-300h-900zM900 1400h100v500h-100v-500zM1400 1400h100v500h-100v-500zM1500 0v100h900 v-100h-900z" />
-<glyph unicode="&#xe027;" d="M-200 0l861 2400h418l-40 -600h323l-40 600h416l862 -2400h-1077l-81 900h-484l-81 -900h-1077zM976 1100h448l-53 600h-341z" />
-<glyph unicode="&#xe028;" d="M25 1426q0 193 75.5 368.5t202.5 302.5t303 202.5t369 75.5t368.5 -75.5t302.5 -202.5t202.5 -302.5t75.5 -368.5q0 -278 -152 -514l588 -588q15 -14 15 -35t-15 -36l-213 -213q-14 -14 -35.5 -14t-35.5 14l-588 588q-234 -152 -513 -152q-193 0 -369 75.5t-303 202.5 t-202.5 303t-75.5 369zM327 1426q0 -132 51.5 -252t138.5 -206.5t206.5 -138t251.5 -51.5t251.5 51.5t206.5 138t138.5 206.5t51.5 252q0 131 -51.5 251t-138.5 206.5t-206.5 138t-251.5 51.5t-251.5 -51.5t-206.5 -138t-138.5 -206.5t-51.5 -251z" />
-<glyph unicode="&#xe029;" d="M-500 1150v100q0 21 14.5 35.5t35.5 14.5h190l164 447q44 89 90.5 121t141.5 32h1128q95 0 141.5 -32t90.5 -121l164 -447h190q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-92l42 -100v-1150q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5 t-14.5 35.5v150h-1600v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v1150l42 100h-92q-21 0 -35.5 14.5t-14.5 35.5zM-300 700l100 -100h300v200l-400 110v-210zM-56 1200h1512q-102 423 -119 460q-23 40 -60 40h-1154q-37 0 -60 -40 q-8 -16 -37.5 -131t-55.5 -222zM300 200h800v200h-800v-200zM1300 600h300l100 100v210l-400 -110v-200zM1359 2058l45 89q41 84 89.5 118.5t142.5 34.5h564h314q56 0 92 -8t61.5 -30t40.5 -45t38 -70l114 -247h190q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5 t-35.5 -14.5h-92l42 -100v-1050q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v150h-800v100h500v200h-400v273q0 74 -28 100.5t-103 26.5h-94l-150 400h1031q-52 223 -69 260q-23 40 -60 40h-904q-37 0 -60 -40l-44 -82q-82 57 -160 80zM2600 1200h200 l100 100v210l-300 -110v-200z" />
-<glyph unicode="&#xe030;" d="M200 50v2300q0 21 14.5 35.5t35.5 14.5h250v-300q0 -41 29.5 -70.5t70.5 -29.5h1200q41 0 70.5 29.5t29.5 70.5v300h250q21 0 35.5 -14.5t14.5 -35.5v-2300q0 -21 -14.5 -35.5t-35.5 -14.5h-1900q-21 0 -35.5 14.5t-14.5 35.5zM500 300h500v100h-500v-100zM500 500h1400 v100h-1400v-100zM500 700h1400v100h-1400v-100zM500 900h1400v100h-1400v-100zM500 1300h1000v100h-1000v-100zM500 1500h1400v100h-1400v-100zM600 1100h1300v100h-1300v-100zM600 1700h1300v100h-1300v-100zM600 2200v198q0 41 30.5 71.5t71.5 30.5h198v92q0 42 29.5 75 t70.5 33h400q41 0 70.5 -33t29.5 -75v-92h198q41 0 71.5 -30.5t30.5 -71.5v-198q0 -41 -30.5 -70.5t-71.5 -29.5h-996q-41 0 -71.5 29.5t-30.5 70.5z" />
-<glyph unicode="&#xe032;" d="M-400 1600v400q0 99 489 278l66 133q19 37 61.5 63t83.5 26h1800q41 0 83.5 -26t61.5 -63l66 -132q84 -30 159 -61.5t155 -70.5t127.5 -77.5t47.5 -69.5v-400q0 -41 -29.5 -70.5t-70.5 -29.5h-100q-41 0 -70.5 29.5t-29.5 70.5v400q0 32 -100 86v-2036q0 -21 -14.5 -35.5 t-35.5 -14.5h-200q-20 0 -35 14.5t-15 35.5v150h-1800v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-20 0 -35 14.5t-15 35.5v2036q-100 -54 -100 -86v-400q0 -42 -26 -71t-67 -29h-100q-42 0 -74.5 29.5t-32.5 70.5zM100 590l100 -90h300v200l-400 100v-210zM200 1079 q0 -21 14 -40.5t33 -26.5q13 -5 38 -13.5t114 -29.5t190.5 -37t267 -29.5t343.5 -13.5t341.5 12.5t270 30.5t187.5 36.5t117 31.5l37 12q19 7 33 26.5t14 40.5v971q0 21 -14.5 35.5t-35.5 14.5h-1900q-21 0 -35.5 -14.5t-14.5 -35.5v-971zM900 300h700v200h-700v-200z M1900 500h300l100 90v210l-400 -100v-200z" />
-<glyph unicode="&#xe033;" d="M-100 1598q0 268 103.5 508t288.5 420l141 -141q-157 -153 -245 -356.5t-88 -430.5t88 -430.5t245 -356.5l-141 -142q-185 181 -288.5 421t-103.5 508zM414 1598q0 163 64 308.5t178 255.5l141 -141q-86 -82 -134.5 -191.5t-48.5 -231.5q0 -123 48.5 -232.5t134.5 -190.5 l-141 -142q-114 109 -178 255.5t-64 309.5zM949 1598q0 104 73.5 177t177.5 73t177.5 -73.5t73.5 -176.5q0 -82 -48 -147t-124 -90l121 -1361h-400l121 1361q-76 25 -124 90t-48 147zM1603 1175q86 81 134.5 190.5t48.5 232.5q0 122 -48.5 231.5t-134.5 191.5l141 141 q114 -110 178 -255.5t64 -308.5t-64 -309.5t-178 -255.5zM1967 811q157 153 245 356.5t88 430.5t-88 430.5t-245 356.5l141 141q185 -180 288.5 -420t103.5 -508t-103.5 -508t-288.5 -421z" />
-<glyph unicode="&#xe034;" d="M200 300v1400q0 124 88 212t212 88h400v400h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-400h400q124 0 212 -88t88 -212v-1400q0 -124 -88 -212t-212 -88h-100 q0 -41 -29.5 -70.5t-70.5 -29.5t-70.5 29.5t-29.5 70.5h-800q0 -41 -29.5 -70.5t-70.5 -29.5t-70.5 29.5t-29.5 70.5h-100q-124 0 -212 88t-88 212zM400 300q0 -40 30 -70t70 -30h1400q40 0 70 30t30 70v800q0 40 -30 70t-70 30h-1400q-40 0 -70 -30t-30 -70v-800zM400 1500 q0 -40 30 -70t70 -30h1400q40 0 70 30t30 70v200q0 40 -30 70t-70 30h-1400q-40 0 -70 -30t-30 -70v-200zM1100 2000h200v400h-200v-400z" />
-<glyph unicode="&#xe035;" d="M100 150v239q0 80 20.5 120t79.5 74q481 278 700 372v250q-100 73 -100 223v165q-85 32 -141.5 67.5t-56.5 51.5q0 32 16 60t38 28h113l146 658q-3 23 10 32t35 1l239 -68q21 -8 51 -8.5t51 7.5l239 76q22 8 35 0.5t10 -30.5l146 -668h113q22 0 38 -28t16 -60 q0 -16 -56.5 -51.5t-141.5 -67.5v-165q0 -151 -100 -222v-251q186 -75 700 -372q59 -34 79.5 -74t20.5 -120v-239q0 -21 -14.5 -35.5t-35.5 -14.5h-2200q-20 0 -35 14.5t-15 35.5z" />
-<glyph unicode="&#xe036;" d="M100 150v122q0 57 28.5 96t83.5 70q29 16 302.5 116.5t385.5 156.5v230q-136 9 -256.5 72.5t-181.5 130.5q-16 17 -17.5 36t7.5 36.5t29 40t41.5 42t51 48.5t50.5 54q72 84 94.5 174.5t22.5 268.5q0 81 33 161.5t90.5 145.5t145.5 106t190 42q102 -1 190 -42t145.5 -106 t90.5 -145.5t33 -161.5q0 -178 22.5 -268.5t94.5 -174.5q21 -25 50.5 -54t51 -48.5t41.5 -42t29 -40t7.5 -36.5t-17.5 -36q-62 -67 -182.5 -130.5t-255.5 -72.5v-230q112 -56 385 -156.5t302 -116.5q113 -62 113 -166v-122q0 -21 -14.5 -35.5t-35.5 -14.5h-2100 q-20 0 -35 14.5t-15 35.5z" />
-<glyph unicode="&#xe037;" d="M300 50v2300q0 21 14.5 35.5t35.5 14.5h1150v-650q0 -21 14.5 -35.5t35.5 -14.5h650v-1650q0 -21 -14.5 -35.5t-35.5 -14.5h-1800q-21 0 -35.5 14.5t-14.5 35.5zM1600 1850v550l600 -600h-550q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe038;" d="M-100 855v196q0 104 134 192q-34 49 -34 102v196q0 105 135 192q-35 48 -35 102v196q0 213 450 316q338 80 737 30q419 -52 567 -220q21 -24 34 -54t17 -67t4.5 -64.5t-1.5 -72t-2 -64.5q0 -33 -25 -74q202 -66 353 -220.5t219.5 -359t36.5 -414.5 q-32 -212 -161.5 -387.5t-323 -276t-408.5 -100.5q-160 0 -311 56q-169 -43 -351 -55q-326 -21 -641 60q-58 15 -101.5 29.5t-97 39t-95 58.5t-66.5 77q-17 28 -24.5 69t-7.5 72t2.5 81.5t2.5 70.5q0 81 72 147q-79 73 -79 147zM42 1053l1 -5q8 -28 37 -53t73 -43.5 t74.5 -29t69.5 -21.5q8 -2 11 -3q179 -52 429 -61q-6 96 6 190q-354 27 -554 136q-88 -37 -118 -64q-20 -20 -27 -40zM43 558q5 -17 16 -33t29.5 -29.5t35.5 -24.5t44 -21.5t44.5 -17t48.5 -14.5t44 -11.5t42.5 -10t33.5 -7.5q64 -15 140 -24t130.5 -10.5t143.5 -3.5t136 -4 q-69 82 -102 145q-212 11 -433 49t-253 87l-11 17q-38 -12 -60.5 -34t-25.5 -37zM141 1538q10 -34 44 -62t87.5 -47.5t89.5 -29.5t86 -22q13 -3 18 -4q160 -38 379 -47q49 90 139 186q-164 3 -385.5 50.5t-311.5 90.5q-48 -19 -84.5 -48t-48.5 -48zM238 2033l1 -5 q4 -15 14.5 -29t22 -25.5t31 -23t34.5 -19.5t40.5 -17t39.5 -14t42 -12.5t37.5 -9.5t35.5 -8.5t28 -6.5q195 -47 431 -47q243 -1 495 64q5 1 29.5 7.5t34 9.5t33.5 10t36.5 12.5t33 14.5t32.5 18.5t25.5 21t22 25.5t12.5 30l-2 5q-4 14 -12 27t-22 24.5t-26.5 21t-33 18.5 t-33.5 15t-36.5 13.5t-33.5 11t-33.5 10t-27.5 7.5q-212 65 -496 65q-292 0 -507 -67q-5 -2 -42.5 -13t-52.5 -16.5t-47 -19t-48.5 -26t-34 -31.5t-23.5 -41zM895 870.5q5 -150.5 72 -285.5q76 -152 218.5 -254.5t309.5 -124.5q148 -25 294 20t256 138.5t180.5 229.5 t75.5 285q4 143 -51 278t-150.5 234t-228 159t-275.5 60q-128 0 -258 -49q-141 -57 -244.5 -166t-153.5 -241.5t-45 -283z" />
-<glyph unicode="&#xe040;" d="M200 50v1850h2000v-1850q0 -21 -14.5 -35.5t-35.5 -14.5h-1900q-21 0 -35.5 14.5t-14.5 35.5zM200 2000v400q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5h100q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5h100q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5 h100q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5h100q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5h100q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5h100q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5v-400h-2000zM500 300h500v100h-500v-100zM500 500 h1400v100h-1400v-100zM500 700h1400v100h-1400v-100zM500 900h1400v100h-1400v-100zM500 1300h1000v100h-1000v-100zM600 1100h1300v100h-1300v-100zM600 1500h1300v100h-1300v-100z" />
-<glyph unicode="&#xe041;" d="M0 0v2500h200v-300h300v300h100v-300h300v300h100v-300h300v300h100v-300h300v300h100v-300h300v300h100v-52q68 50 150 50q104 0 177 -73t73 -177t-73 -177t-177 -73q-28 0 -64 9l-86 -130v-77h300v-100h-300v-300h300v-100h-300v-300h300v-100h-300v-300h300v-100h-300 v-300h300v-200h-2500zM200 315l160 185h-160v-185zM200 600h247l53 61v239h-300v-300zM200 1000h300v300h-300v-300zM200 1400h300v300h-300v-300zM200 1800h300v300h-300v-300zM299 200h201v232zM533 699l104 120q-23 39 -32 81h-5v-123zM600 200h300v300h-300v-300z M600 1000h5q18 85 87 141.5t158 56.5q23 0 50 -5v107h-300v-300zM600 1400h300v300h-300v-300zM600 1800h300v300h-300v-300zM646 600h254v103q-27 -5 -50 -5q-52 0 -101 22zM1000 200h300v300h-300v-300zM1000 600h300v300h-205q-19 -96 -95 -152v-148zM1000 1147 q21 -16 38 -35l465 205l-39 -17h-64v-28l-100 -44v72h-300v-153zM1000 1400h300v300h-300v-300zM1000 1800h300v300h-300v-300zM1157 1000h143v63zM1400 200h300v300h-300v-300zM1400 600h300v300h-300v-300zM1400 1000h300v103q-80 17 -135 78l-165 -73v-108zM1400 1400 h105q16 73 69 125.5t126 67.5v107h-300v-300zM1400 1800h300v300h-300v-300zM1800 200h300v300h-300v-300zM1800 600h300v300h-300v-300zM1800 1000h300v300h-105q-14 -74 -67.5 -128t-127.5 -69v-103zM1800 1592q4 -1 13 -3.5t14 -3.5l114 172l-38 -57h-103v-108z M1800 1800h169l190 288l-59 -90v102h-300v-300zM1950 1497q34 -45 44 -97h106v300h-17z" />
-<glyph unicode="&#xe042;" d="M-200 0v200h200v450q0 21 15 35.5t35 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-450h100v1050q0 21 15 35.5t35 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-1050h100v2150q0 21 15 35.5t35 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-2150h100v1450q0 21 15 35.5t35 14.5h400 q21 0 35.5 -14.5t14.5 -35.5v-1450h200v-200h-2700z" />
-<glyph unicode="&#xe043;" d="M87 1196q0 227 89 434t238.5 356t357 237.5t434.5 88.5t429.5 -86t357.5 -241l-793 -789v-1115q-148 0 -290.5 40t-265 112t-226 175t-176.5 225t-114 267t-41 296zM1300 -12v1115l789 -788q-327 -327 -789 -327zM1404 1196l789 789q161 -160 244.5 -368.5t83.5 -420 t-83.5 -420t-244.5 -368.5z" />
-<glyph unicode="&#xe044;" d="M-600 423v174q0 51 22 80t69 55q3 2 49 30t94 56t111.5 62t131 64t123.5 47v262q-29 9 -48.5 22t-30 24.5t-15 32t-5.5 34.5t-1 43v178q0 138 75.5 225.5t224.5 87.5t224.5 -87.5t75.5 -225.5v-178q0 -29 -1 -42.5t-5.5 -34t-15 -32t-30 -24.5t-48.5 -22v-263 q80 -25 185 -76q-207 -104 -545 -297l-14 -8q-136 -77 -165 -210h-442q-8 0 -13.5 7.5t-5.5 15.5zM0 35v250q0 80 20.5 120.5t79.5 73.5q481 278 700 373v376q-100 74 -100 224v298q0 126 48.5 226t152.5 162t249 62t249 -62t152.5 -162t48.5 -226v-298q0 -149 -100 -223 v-377q186 -76 700 -373q59 -33 79.5 -73.5t20.5 -120.5v-250q0 -11 -8 -22t-19 -11h-2246q-11 0 -19 11t-8 22zM1717 916q112 54 183 75v262q-29 9 -48.5 22t-30 24.5t-15 32t-5.5 34.5t-1 43v178q0 138 75.5 225.5t224.5 87.5t224.5 -87.5t75.5 -225.5v-178q0 -29 -1 -42.5 t-5.5 -34t-15 -32t-30 -24.5t-48.5 -22v-263q56 -17 123.5 -47t131 -64t111.5 -62t94 -56t49 -30q47 -26 69 -55t22 -80v-174q0 -8 -5.5 -15.5t-13.5 -7.5h-442q-31 134 -165 210l-36 20q-316 184 -521 286z" />
-<glyph unicode="&#xe045;" d="M14 2351q-5 20 6 36.5t31 19.5l600 86q47 7 99 7t99 -7l600 -86q20 -3 31 -19.5t6 -36.5l-275 -1103q-5 -20 -23.5 -34t-38.5 -14h-149v-1100l-100 -99v999l-33 200h-34l-33 -200v-100h-100v-100h100v-100h-100v-100h100v-100h-100v-100h100v-100h-100v-100h100v-100 h-100v-100h100v-97l-3 -3h-109l-188 200v1100h-149q-20 0 -38.5 14t-23.5 34zM556 2100q0 -80 57 -137t137 -57t137 57t57 137t-57 137t-137 57t-137 -57t-57 -137zM1200 921v119q72 4 120 50t66 120l248 1074l304 -846q7 -20 0 -42t-24 -33l-134 -89l610 -928l-47 -272 l-90 -61l-276 55l-608 928l-108 -76q-31 -21 -61 1z" />
-<glyph unicode="&#xe046;" d="M0 100v1600h2300v-1600q0 -41 -29.5 -70.5t-70.5 -29.5h-2100q-41 0 -70.5 29.5t-29.5 70.5zM0 1800v300q0 41 29.5 70.5t70.5 29.5h200v100q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-100h1100v100q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5 t29.5 -70.5v-100h200q41 0 70.5 -29.5t29.5 -70.5v-300h-2300zM200 200h300v300h-300v-300zM200 600h300v300h-300v-300zM200 1000h300v300h-300v-300zM600 200h300v300h-300v-300zM600 600h300v300h-300v-300zM600 1000h300v300h-300v-300zM1000 200h300v300h-300v-300z M1000 600h300v300h-300v-300zM1000 1000h300v300h-300v-300zM1400 200h300v300h-300v-300zM1400 600h300v300h-300v-300zM1400 1000h300v300h-300v-300zM1800 200h300v300h-300v-300zM1800 600h300v300h-300v-300zM1800 1000h300v300h-300v-300z" />
-<glyph unicode="&#xe047;" d="M-300 1950q0 164 60 313t168 265l142 -141q-170 -188 -170 -437q0 -142 58.5 -268.5t161.5 -217.5l-141 -142q-131 120 -205 282.5t-74 345.5zM0 300v300q0 41 29.5 70.5t70.5 29.5h300v500l100 400v400q0 48 50 48q23 0 35.5 -12t13.5 -24l1 -12v-400l100 -400v-500 h1600q41 0 70.5 -29.5t29.5 -70.5v-300q0 -82 -59 -141t-141 -59v-100h-2000v100q-82 0 -141 59t-59 141zM162 1950q0 141 94 251l141 -142q-35 -49 -35 -109q0 -49 23 -91t63 -67l-142 -142q-67 55 -105.5 133t-38.5 167zM652 1792q40 25 63 67t23 91q0 60 -35 109l141 142 q94 -110 94 -251q0 -89 -38.5 -167t-105.5 -133zM980 1464q103 91 161.5 217.5t58.5 268.5q0 249 -170 437l141 141q109 -116 169 -265t60 -313q0 -183 -74 -345.5t-205 -282.5zM1000 400h100v100h-100v-100zM1200 400h100v100h-100v-100zM1400 400h100v100h-100v-100z M1600 400h100v100h-100v-100zM1900 300h200v200h-200v-200z" />
-<glyph unicode="&#xe048;" d="M100 700v700q0 41 29.5 70.5t70.5 29.5h900q41 0 70.5 -29.5t29.5 -70.5h100v134q-100 143 -100 316q0 112 43.5 214t117 175.5t175.5 117t214 43.5t214 -43.5t175.5 -117t117 -175.5t43.5 -214q0 -173 -100 -316v-1251q0 -116 -83.5 -199.5t-199.5 -83.5h-334 q-116 0 -199.5 83.5t-83.5 199.5v417h-100q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5zM1400 1850q0 -145 102.5 -247.5t247.5 -102.5t247.5 102.5t102.5 247.5t-102.5 247.5t-247.5 102.5t-247.5 -102.5t-102.5 -247.5zM1500 400h100v100h-100v-100z M1502 1827q46 -27 99 -27q83 0 141 58t58 141q0 53 -27 99q96 -9 161.5 -80t65.5 -168q0 -104 -73 -177t-177 -73q-97 0 -168 65.5t-80 161.5zM1600 200h100v100h-100v-100zM1700 400h100v100h-100v-100zM1800 200h100v100h-100v-100zM1900 400h100v100h-100v-100z" />
-<glyph unicode="&#xe049;" d="M0 1500h958l294 900h3l292 -900h944l-765 -541l291 -885l-768 551l-764 -554l291 883zM624 1300l387 -268l-145 -437l383 277l389 -284l-147 448l379 264h-468l-149 459l-150 -459h-479z" />
-<glyph unicode="&#xe050;" d="M0 1500h958l294 900h3l292 -900h944l-765 -541l291 -885l-768 551l-764 -554l291 883z" />
-<glyph unicode="&#xe051;" d="M159.5 723q-4.5 181 123.5 309l209 209q46 -153 159 -266l-156 -156q-42 -48 -35 -101.5t50 -97.5l164 -164q46 -45 105 -55t105 29l524 525q39 45 29 104t-55 104l-270 270l-2 2l212 212l2 -1l270 -270q91 -91 126.5 -207t9.5 -229t-110 -197l-524 -525 q-126 -125 -312 -117.5t-322 143.5l-164 164q-134 134 -138.5 315zM630.5 1507.5q-27.5 -111.5 5.5 -224.5t121 -202l1 -1l281 -282l213 213l-281 280l-2 3q-43 43 -49.5 96t34.5 101l525 525q29 29 67 34t71 -9.5t60 -41.5l164 -164q46 -45 56 -104t-29 -104l-157 -157 q112 -118 156 -269l213 214q127 128 119.5 310.5t-146.5 321.5l-164 164q-134 134 -314 139t-308 -122l-525 -525q-84 -84 -111.5 -195.5z" />
-<glyph unicode="&#xe052;" d="M-252 1151q6 11 18.5 31t56 81t92.5 120t129 139t165.5 149t202 139.5t238.5 120t274.5 80.5t310.5 31q201 0 391.5 -49t334.5 -127.5t271.5 -174t215 -190.5t151 -173.5t93.5 -127.5l30 -49q-15 -16 -42 -42.5t-116 -104.5t-182.5 -148.5t-233.5 -156.5t-277.5 -148 t-307 -104.5t-328.5 -42.5q-125 0 -256 25.5t-247 69t-229.5 99.5t-209.5 118t-182 123.5t-151.5 117.5t-113.5 99.5t-73 69.5zM28 1151q298 -271 632 -416q-108 110 -168 254.5t-60 305.5q0 62 12 139q-247 -129 -416 -283zM636 1295q0 -163 80 -300.5t218 -217.5t301 -80 q162 0 300 80t218 217.5t80 300.5q0 129 -56 252q-159 54 -316 78q80 -55 127 -142t47 -188q0 -166 -117 -283.5t-283 -117.5t-283.5 117.5t-117.5 283.5q0 101 47 187.5t127 142.5q-153 -25 -318 -84q-54 -119 -54 -246zM957 1187q37 -95 117 -146l74 73q-45 22 -74 63 t-36 91zM1800 724q211 85 392 205t293 222q-72 65 -193.5 145t-268.5 150q15 -82 15 -151q0 -164 -63 -311.5t-175 -259.5z" />
-<glyph unicode="&#xe053;" d="M-261 1169q6 11 18.5 31t56 80.5t92.5 119.5t129 139t166 148.5t202 138.5t238.5 119.5t274.5 80.5t310 31q194 0 417 -61l162 404h249l-939 -2400h-251l166 432q-142 22 -290.5 74t-271.5 118.5t-238.5 142t-202.5 146t-153.5 128.5t-100.5 93zM19 1171 q113 -104 275.5 -218t356.5 -199q-108 111 -168 255.5t-60 304.5q0 67 13 140q-248 -129 -417 -283zM628 1314q0 -224 147 -391.5t365 -199.5l76 192q-163 4 -277 120t-114 279q0 101 47 188t127 142q-151 -23 -318 -83q-53 -117 -53 -247zM948 1207q36 -95 118 -146l73 73 q-45 22 -74 62.5t-36 91.5zM1431 442l155 395q110 84 174 209t64 268q0 49 -10 106l173 443q98 -53 191 -120.5t163.5 -132t132.5 -130t104.5 -120t74 -97.5t45.5 -67l15 -25q-12 -13 -35 -35.5t-97.5 -89t-153.5 -128.5t-199 -141.5t-239 -142t-267.5 -116t-290.5 -76.5z M1791 744q212 85 393.5 205t291.5 222q-72 65 -193.5 145t-268.5 150q15 -73 15 -152q0 -164 -63 -311.5t-175 -258.5z" />
-<glyph unicode="&#xe054;" d="M-131.5 2008q5.5 63 53.5 103l420 359q48 40 114.5 32.5t107.5 -56.5l146 -171q-206 -81 -374.5 -223.5t-282.5 -329.5l-25 29l-125 146q-40 48 -34.5 111zM100 1100q0 223 87.5 427t234.5 351t351 234.5t427 87.5q224 0 427.5 -87.5t351 -235t234.5 -351t87 -426.5 q0 -149 -39.5 -292t-110.5 -263.5t-172.5 -222t-222 -172.5t-263.5 -110.5t-292 -39.5q-223 0 -426.5 87t-351 234.5t-235 351t-87.5 427.5zM400 1100q0 -162 63.5 -310.5t170.5 -255.5t255.5 -170.5t310.5 -63.5t310.5 63.5t255.5 170.5t170.5 255.5t63.5 310.5 t-63.5 310.5t-170.5 255.5t-255.5 170.5t-310.5 63.5t-310.5 -63.5t-255.5 -170.5t-170.5 -255.5t-63.5 -310.5zM800 1050v95q0 21 14.5 38t35.5 17h175q6 18 16.5 31t14.5 17t23 15t21 12v373q0 21 15 36.5t35 15.5h98q21 0 36.5 -15.5t15.5 -36.5v-375q42 -28 71.5 -74.5 t29.5 -98.5q0 -83 -59 -141.5t-142 -58.5q-55 0 -100.5 27t-71.5 73h-178q-21 0 -35.5 14.5t-14.5 35.5zM1698 2271l145 174q40 48 106 56t115 -31l422 -355q49 -40 55 -103t-34 -111l-156 -187q-113 188 -281 332t-372 225z" />
-<glyph unicode="&#xe055;" d="M0 1200q0 244 95 466t256 383t383 256t466 95t466 -95t383 -256t256 -383t95 -466t-95 -466t-256 -383t-383 -256t-466 -95t-466 95t-383 256t-256 383t-95 466zM300 1200q0 -183 71.5 -349.5t192 -287t287 -192t349.5 -71.5t349.5 71.5t287 192t192 287t71.5 349.5 t-71.5 349.5t-192 287t-287 192t-349.5 71.5t-349.5 -71.5t-287 -192t-192 -287t-71.5 -349.5zM700 1152v96q0 21 14.5 36.5t35.5 15.5h276q29 42 75.5 71.5t98.5 29.5q19 0 57 -10l324 324q14 14 35 14t35 -14l69 -70q15 -14 15 -35t-15 -36l-326 -327q6 -30 6 -48 q0 -83 -58.5 -141.5t-141.5 -58.5q-52 0 -98.5 29.5t-75.5 71.5h-276q-21 0 -35.5 15.5t-14.5 36.5z" />
-<glyph unicode="&#xe056;" d="M100 1114q0 223 87.5 427t234.5 351t351 234.5t427 87.5q224 0 427.5 -87.5t351 -235t234.5 -351t87 -426.5q0 -149 -39.5 -292t-110.5 -263.5t-172.5 -222t-222 -172.5t-263.5 -110.5t-292 -39.5q-223 0 -426.5 87t-351 234.5t-235 351t-87.5 427.5zM400 1114 q0 -163 63.5 -311t170.5 -255t255.5 -170.5t310.5 -63.5t310.5 63.5t255.5 170.5t170.5 255t63.5 311q0 162 -63.5 310.5t-170.5 255.5t-255.5 170.5t-310.5 63.5t-310.5 -63.5t-255.5 -170.5t-170.5 -255.5t-63.5 -310.5zM1000 1114q0 54 27 99.5t73 72.5v364 q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-364q46 -27 73 -72.5t27 -99.5q0 -55 -27 -100.5t-73 -72.5v-89q0 -21 -14.5 -36.5t-35.5 -15.5h-100q-21 0 -35.5 15.5t-14.5 36.5v89q-46 27 -73 72.5t-27 100.5zM1000 2400v247q0 21 14.5 37t35.5 16h300 q21 0 35.5 -16t14.5 -37v-247q-73 9 -200 9q-126 0 -200 -9zM2002 2098l148 148q15 15 36 15t35 -15l142 -141q14 -15 14 -35.5t-14 -35.5l-149 -148q-47 61 -99 113t-113 99z" />
-<glyph unicode="&#xe057;" d="M-100 600v1100q0 82 59 141t141 59h1282q90 94 211.5 147t256.5 53q136 0 258 -53.5t212 -148.5q76 -8 128 -64.5t52 -133.5v-1100q0 -82 -59 -141t-141 -59v-100l-150 -100l-150 100v100h-1600v-100l-150 -100l-150 100v100q-82 0 -141 59t-59 141zM100 1000h1100v100 h-1100v-100zM100 1200h1100v100h-1100v-100zM128 900q27 -45 72.5 -72.5t99.5 -27.5h900v100h-1072zM128 1400h1072v100h-900q-54 0 -99.5 -27.5t-72.5 -72.5zM1000 2000v100h341q-51 -48 -90 -100h-251zM1238 2491l71 71l302 -302q-51 -16 -100 -42zM1410 1450 q0 -182 129 -311t311 -129t311 129t129 311t-129 311t-311 129t-311 -129t-129 -311zM1510 1450q0 61 24 122q42 -62 116 -62q58 0 99 41t41 99q0 74 -62 116q61 24 122 24q141 0 240.5 -99.5t99.5 -240.5t-99.5 -240.5t-240.5 -99.5t-240.5 99.5t-99.5 240.5zM1800 2297 v403h100v-403q-8 1 -50 1t-50 -1zM2090 2260l302 302l70 -71l-273 -273q-48 26 -99 42zM2359 2100h341v-100h-251q-39 52 -90 100z" />
-<glyph unicode="&#xe058;" d="M-1 1203q0 244 95 466t256 383t383 256t466 95t466 -95.5t383 -256.5t256 -383t95 -466q0 -25 -1.5 -48.5t-3.5 -39.5t-7 -51.5t-8 -62.5h-304l10 62.5t8 52.5t4 38.5t2 48.5q0 183 -71.5 350t-192 288t-287 192.5t-349.5 71.5t-349.5 -71.5t-287 -192t-192 -287 t-71.5 -349.5t71 -349.5t191.5 -287t287.5 -192t351 -71.5q146 1 256.5 35t226.5 108l-152 212q-12 17 -6 29t27 11h684q20 0 30.5 -14t4.5 -34l-221 -644q-6 -20 -19 -22.5t-25 14.5l-148 205l-5 -4q-146 -95 -321 -145.5t-332 -50.5q-257 0 -482 95t-382 256.5t-247 382 t-90 465.5zM700 1152v96q0 21 14.5 36.5t35.5 15.5h276q29 42 75.5 71.5t98.5 29.5q19 0 57 -10l323 324q15 14 36 14t35 -14l69 -70q15 -14 15 -35t-15 -36l-326 -327q6 -30 6 -48q0 -83 -58.5 -141.5t-141.5 -58.5q-52 0 -98.5 29.5t-75.5 71.5h-276q-21 0 -35.5 15.5 t-14.5 36.5z" />
-<glyph unicode="&#xe059;" d="M-400 1299v500q0 41 29.5 71t70.5 30v50q0 21 14.5 35.5t35.5 14.5h250v58q0 47 28 83.5t72 50.5v408h2200v-408q44 -14 72 -50.5t28 -83.5v-58h250q21 0 35.5 -14.5t14.5 -35.5v-50q41 0 70.5 -30t29.5 -71v-500q0 -41 -29.5 -70t-70.5 -29v-50q0 -21 -14.5 -35.5 t-35.5 -14.5h-250v-1150q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v150h-1800v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v1150h-250q-21 0 -35.5 14.5t-14.5 35.5v50q-41 0 -70.5 29t-29.5 70zM100 689l100 -89h400v199 l-500 100v-210zM200 1378q0 -20 14 -40t33 -27q13 -5 38 -13t114 -29t190.5 -37.5t267 -29.5t343.5 -13t341.5 12.5t270 30.5t187.5 36t117 30l37 13q19 7 33 27t14 40v471q0 21 -14.5 36t-35.5 15h-1900q-21 0 -35.5 -15t-14.5 -36v-471zM300 400h300v100h-300v-100z M700 700h1000v100h-1000v-100zM700 900h1000v100h-1000v-100zM900 200h600v200h-600v-200zM1800 400h300v100h-300v-100zM1800 600h400l100 89v210l-500 -100v-199z" />
-<glyph unicode="&#xe060;" d="M-100 0v400h1900l600 600v-400l-100 -100v100l-100 -100v-100l-200 -200v100l-100 -100v-100l-100 -100h-400v100h-300v-100h-400v100h-300v-100h-500zM100 500v300h700v-300h-700zM100 900v400h700v-400h-700zM100 1400v400h700v-400h-700zM100 1900v130q0 38 7.5 61.5 t34.5 50.5l158 158h700q-108 -109 -155 -155q-32 -31 -38.5 -52t-6.5 -62v-131h-700zM400 2400q127 126 166 166q8 8 14 13t10.5 9t12 6t11 3.5t14 2t15 0.5h20h23.5h614l-200 -200h-700zM1000 500v300h700l200 200v-300l-200 -200h-700zM1000 900v400h700l200 200v-400 l-200 -200h-700zM1000 1400v400h700l200 200v-400l-200 -200h-700zM1000 1900v131q0 29 1 40.5t11.5 31.5t32.5 42l155 155h645q55 0 55 -53v-147l-200 -200h-700zM1300 2400l200 200h600q56 0 78 -22.5t22 -77.5v-100l-200 -200v102q0 50 -22.5 74t-77.5 24h-600zM2000 800 v300l200 200v-300zM2000 1200v400l200 200v-400zM2000 1700v400l200 200v-400z" />
-<glyph unicode="&#xe061;" d="M0 1200q0 244 95 466t256 383t383 256t466 95t466 -95t383 -256t256 -383t95 -466t-95 -466t-256 -383t-383 -256t-466 -95t-466 95t-383 256t-256 383t-95 466zM300 1200q0 -183 71.5 -349.5t192 -287t287 -192t349.5 -71.5t349.5 71.5t287 192t192 287t71.5 349.5 t-71.5 349.5t-192 287t-287 192t-349.5 71.5t-349.5 -71.5t-287 -192t-192 -287t-71.5 -349.5zM654 654q-7 7 1 26l312 687q9 19 28 38t38 28l687 312q19 8 26 1t-1 -26l-312 -687q-9 -19 -28 -38t-38 -28l-687 -312q-19 -8 -26 -1zM1082 1200q0 -48 35 -83t83 -35t83 35 t35 83t-35 83t-83 35t-83 -35t-35 -83z" />
-<glyph unicode="&#xe062;" d="M200 1000v200h2000v-200h-900v-415q175 -36 287.5 -142.5t112.5 -242.5q0 -109 -73.5 -201t-200 -145.5t-276.5 -53.5t-276.5 53.5t-200 145.5t-73.5 201q0 136 112.5 242.5t287.5 142.5v415h-800zM250 1300l150 900h50q0 412 185 489q139 58 325 -88l40 40l191 -191 l-141 -141l-191 191l30 30q-133 101 -216 67q-59 -25 -91 -127.5t-32 -269.5h1450l150 -900h-1900z" />
-<glyph unicode="&#xe063;" d="M-40 726.5q28 186.5 160 318.5l1055 1055l20 20l21.5 21.5l20 20t22 21t20.5 19t22.5 20t22 17.5t24 18.5t23 16t25.5 16.5q157 95 342.5 107.5t352.5 -63.5q114 -52 199.5 -138t133 -187.5t63.5 -217.5t-2.5 -228.5t-72.5 -221t-140 -194.5l-325 -325t-381.5 -382 t-324.5 -324q-1 -1 -6.5 -7t-8.5 -8t-8 -5t-10 -3q-17 0 -41 21.5t-50.5 53.5t-32.5 38q-16 18 0 36q170 170 509 508t508 508q182 184 198 389q9 128 -40.5 244.5t-148.5 197t-226 103.5q-102 18 -191 2t-177.5 -76t-137 -102.5t-142.5 -137.5l-10.5 -10.5l-9.5 -9.5 l-11 -11l-663 -663q-26 -26 -83 -78.5t-94 -87.5t-85 -91t-74.5 -102.5t-42 -106.5t-6.5 -118q14 -99 79.5 -165.5t149 -85.5t176 4.5t159.5 90.5l136 136l650 650l341 341q39 39 47.5 84t-11 78t-51 53t-76 12t-82.5 -46q-25 -21 -69 -67.5t-49 -51.5l-223 -223l-273 -273 t-135 -134q-4 -4 -12 -13t-15 -17t-17 -17t-18.5 -13.5t-18 -4t-16.5 7.5l-104 104q-7 8 -7 18t7 17q46 46 236 239t350 353.5t218 213.5q71 65 154 92.5t168 11.5q97 -18 159.5 -84.5t79.5 -149.5t-7.5 -173t-89.5 -155q-20 -20 -43 -42.5t-50.5 -50.5t-42.5 -43 l-204.5 -204.5l-241 -241l-204.5 -204.5q-38 -38 -111.5 -117.5t-124 -132.5t-124 -113t-140.5 -92q-88 -43 -186.5 -52t-189.5 14.5t-171 81.5t-132 142q-96 162 -68 348.5z" />
-<glyph unicode="&#xe064;" d="M150 1100q0 282 139 521.5t374 379.5q57 40 97 33.5t40 -67.5v-176q0 -29 -8.5 -49t-16.5 -27.5t-23.5 -16.5t-18.5 -12q-132 -106 -207.5 -259t-75.5 -327q0 -153 59.5 -291.5t160 -239t239 -160t291.5 -59.5t291.5 59.5t239 160t160 239t59.5 291.5q0 174 -75 326 t-205 257q-3 2 -15.5 10.5t-19.5 15t-16.5 18t-14 27.5t-4.5 36v183q0 39 20.5 52.5t48.5 6.5t60 -26q238 -139 379.5 -380t141.5 -526q0 -213 -83.5 -407.5t-224 -335t-335 -224t-407.5 -83.5t-407.5 83.5t-335 224t-224 335t-83.5 407.5zM1000 1500v800q0 41 29.5 70.5 t70.5 29.5h200q41 0 70.5 -29.5t29.5 -70.5v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-200q-41 0 -70.5 29.5t-29.5 70.5z" />
-<glyph unicode="&#xe065;" d="M283 1600q0 263 115.5 472t323 327t469.5 118h9q197 0 365.5 -69t286.5 -190t185 -291t67 -367q0 -81 -16 -158t-36 -131t-59.5 -120t-64 -99t-71.5 -95q-46 -60 -66.5 -88.5t-54.5 -83.5t-49 -97t-27.5 -102.5t-12.5 -125.5q0 -100 -47 -167v-133q0 -12 -25 -37t-50 -44 l-25 -19v-50q0 -21 -15 -35.5t-36 -14.5h-500q-21 0 -35 14.5t-14 35.5v50q-11 8 -27.5 21t-44.5 40t-28 39v116q-63 68 -63 184q0 65 -12.5 125t-27.5 102.5t-48.5 97t-54.5 84t-66 88.5q-46 60 -71 94.5t-63.5 99.5t-58.5 119.5t-36 131.5t-16 158zM483 1600 q0 -77 14.5 -142.5t48.5 -128.5t60.5 -101.5t80.5 -109.5q40 -52 60.5 -80t55.5 -81.5t54 -97t40 -102t30.5 -122.5t9.5 -135h513q0 84 16 163t36.5 135t59.5 122t64 101.5t72 96.5q98 130 129 182q83 141 83 300q0 207 -94 371.5t-255.5 255t-360.5 90.5 q-316 0 -516.5 -200.5t-200.5 -516.5z" />
-<glyph unicode="&#xe066;" d="M0 1460v890q0 21 15 35.5t35 14.5h890q21 0 46 -10.5t40 -24.5l1339 -1339q14 -15 14 -36t-14 -35l-920 -919q-14 -15 -35 -15t-35 15l-1339 1339q-15 14 -25.5 39.5t-10.5 45.5zM300 1900q0 -82 59 -141q58 -59 140.5 -59t141.5 59t59 141t-59 141t-141.5 59t-140.5 -59 q-59 -59 -59 -141z" />
-<glyph unicode="&#xe067;" d="M-300 1460v890q0 21 14.5 35.5t35.5 14.5h890q20 0 45.5 -10.5t39.5 -24.5l1339 -1339q15 -15 15 -36t-15 -35l-919 -919q-14 -15 -35 -15t-36 15l-1339 1339q-14 14 -24.5 39.5t-10.5 45.5zM0 1900q0 -82 59 -141q58 -59 141 -59t141 59q59 59 59 141t-59 141 q-58 59 -141 59t-141 -59q-59 -59 -59 -141zM889 2400h301q23 0 59 -5.5t47 -12.5q27 -15 65 -53l1268 -1268q28 -28 29 -68t-29 -73l-888 -888q-15 -14 -35.5 -10.5t-35.5 18.5l-160 161l720 719q38 40 37.5 71.5t-37.5 69.5z" />
-<glyph unicode="&#xe068;" d="M100 900v209l8 19q128 351 403 442q89 30 191 30q77 0 147 -17.5t122.5 -46.5t99 -67t79 -80t59 -84t43.5 -80t28 -67t16 -46l4 -18v-194h-100v-800l-104 -100h-794l-102 100v800h-100zM248 1100h904q-2 8 -7 21t-23 51t-40 73t-60 77t-82 72.5t-106.5 51.5t-131.5 21 q-70 0 -132.5 -20t-107 -52.5t-82 -71.5t-61.5 -78.5t-40.5 -72t-23.5 -52.5zM1300 0l100 400h1000l100 -400h-1200zM1400 450v175q0 41 17 58t58 17h325v1625q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5v-1625h275q48 0 86.5 -18.5t38.5 -56.5v-175h-1000z" />
-<glyph unicode="&#xe069;" d="M-100 450v1350h100v-1000h100v1000h100v-600h100v600h100v-600h100v600h100v-600h100v600h100v-600h100v600h100v-1000h100v1000h100v-600h100v600h100v-600h100v600h100v-600h100v600h100v-600h100v600h100v-1000h100v1000h100v-600h100v600h100v-600h100v600h100v-1350 q0 -21 -14.5 -35.5t-35.5 -14.5h-2600q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe070;" d="M0 1542v295q0 22 15 42.5t35 20.5h160q-6 0 29.5 178t47.5 226q26 92 108.5 141t174.5 23q25 -7 52 -19t61.5 -29.5t49.5 -24.5q164 -74 374 -170q48 -29 80 -71q32 43 79 70l360 165q19 8 69.5 32.5t78.5 36.5q99 41 192.5 -5.5t122.5 -149.5q84 -403 76 -403h185 q20 0 35 -20t15 -42v-296q0 -20 -14 -31t-36 -11h-150v-300h-800v700h-400v-700h-800v300h-150q-22 0 -36 11t-14 31zM200 0v800h800v-800h-800zM459 1928q-3 -9 2.5 -18.5t13.5 -9.5h494l14 40l-461 277zM1400 0v800h800v-800h-800zM1415 1941l13 -41h493q9 0 14.5 10 t3.5 19l-63 291z" />
-<glyph unicode="&#xe072;" d="M100 0v2025l350 375h1450q98 0 191 -58t151 -151t58 -191v-1500l-200 -200v1600q0 300 -300 300h-1227l-200 -200h1227q124 0 212 -88t88 -212v-1400q0 -124 -88 -212t-212 -88h-1500z" />
-<glyph unicode="&#xe073;" d="M500 62v2288q0 21 15 35.5t35 14.5h1400q21 0 35.5 -14.5t14.5 -35.5v-2263q0 -32 -19.5 -39t-33.5 10l-691 617l-709 -628q-14 -15 -30.5 -10t-16.5 25z" />
-<glyph unicode="&#xe074;" d="M-287 1611q301 301 698.5 469t838.5 168q443 0 841.5 -169t699.5 -471l-202 -202q-261 263 -607 409.5t-732 146.5q-383 0 -728.5 -146t-606.5 -407zM110 1214q224 223 518.5 347.5t621.5 124.5q329 0 624.5 -125.5t519.5 -349.5l-214 -214q-182 183 -422.5 285 t-507.5 102q-266 0 -505.5 -101.5t-420.5 -282.5zM519 805q144 143 332.5 223t398.5 80q211 0 401 -81t334 -225l-194 -194q-105 106 -245 165.5t-296 59.5q-154 0 -292.5 -58.5t-244.5 -163.5zM909 416q66 66 154.5 103t186.5 37q99 0 188.5 -38t156.5 -106l-341 -342z" />
-<glyph unicode="&#xe075;" d="M100 2100q0 41 29.5 70.5t70.5 29.5h300v200h1400v-200h300q41 0 70.5 -29.5t29.5 -70.5q0 -196 -6 -326t-13.5 -211t-29.5 -140.5t-39.5 -89t-57.5 -81.5q-83 -109 -159.5 -173.5t-178.5 -106.5q-112 -45 -235.5 -68.5t-209.5 2.5q-52 -97 -71 -191v-115q0 -107 78 -200 h122v-100h100v-300h-800v300h100v100h122q78 91 78 200v95q-22 95 -92 206q-159 -8 -307 33t-274 134t-207 229q-35 59 -58.5 136.5t-35.5 145t-18 173t-7 167.5t-1 181zM295.5 1796q3.5 -100 16 -186t57.5 -174t122 -167q55 -44 89.5 -67.5t108 -51t169.5 -41.5 q-76 98 -117.5 154.5t-96 147.5t-85.5 174q-41 108 -50 178t-9 201v36h-203q-5 -104 -1.5 -204zM1507 1105q136 11 232.5 49.5t171.5 114.5q91 90 141.5 210.5t50.5 320.5q0 24 -1 98t-1 102h-201q0 -22 0.5 -74t0 -69.5t-2.5 -57t-7 -60t-13.5 -55t-22.5 -66t-33 -69.5 q-26 -51 -54.5 -98t-66 -97.5t-59 -79t-70.5 -89t-65 -80.5z" />
-<glyph unicode="&#xe076;" d="M-191 1839q13 39 46.5 54t74.5 2l370 -95l56 -100h832l-188 800h400l557 -200l343 -400l-343 -700h-1125l667 -700h299q3 0 24.5 -0.5t27.5 -0.5q104 0 177 -73t73 -176q0 -104 -73 -177t-177 -73q-103 0 -176 73.5t-73 176.5q0 50 5 50h-192l-386 405l-263 -208 q35 -73 35 -151q0 -145 -102 -247t-247 -102t-247 102t-102 247t102 247t247 102q94 0 179 -50l260 205l-334 350h-256l-106 433l-319 84q-40 13 -59 48t-7 74zM302 346q0 -62 43.5 -105.5t105.5 -43.5q61 0 105 43.5t44 105.5t-43.5 105.5t-105.5 43.5t-105.5 -43.5 t-43.5 -105.5zM1786 250q0 -27 19 -45.5t45 -18.5q27 0 45.5 18.5t18.5 45.5q0 26 -18.5 45t-45.5 19q-26 0 -45 -19t-19 -45z" />
-<glyph unicode="&#xe077;" d="M0 550v600q0 233 99 454t262.5 384.5t384.5 262.5t454 99t454 -99t384.5 -262.5t262.5 -384.5t99 -454v-600q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v600q0 191 -83 360.5t-220.5 286.5t-319.5 185t-377 68t-377 -68t-319.5 -185t-220.5 -286.5 t-83 -360.5v-600q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5zM300 50v798q0 52 34 52h253q21 0 35.5 -15t14.5 -36q6 -17 14 -48.5t22 -135.5t14 -215t-12.5 -211t-24.5 -145l-13 -44q0 -21 -14.5 -35.5t-35.5 -14.5h-253q-34 0 -34 50zM1713 450 q0 111 12.5 211t24.5 144l13 44q0 21 14.5 36t35.5 15h253q34 0 34 -52v-798q0 -50 -34 -50h-253q-21 0 -35.5 15t-14.5 35q-6 17 -14 48.5t-22 136t-14 215.5z" />
-<glyph unicode="&#xe078;" d="M0 550v600q0 233 99 454t262.5 384.5t384.5 262.5t454 99t454 -99t384 -262.5t262 -384.5t98 -454v-870q-2 -13 -9 -34t-33.5 -71.5t-65 -98.5t-111 -107.5t-163.5 -107t-230.5 -87.5t-304.5 -58q-24 -52 -73 -84t-108 -32h-100q-83 0 -141.5 58.5t-58.5 141.5 q0 82 59 141t141 59h100q104 0 164 -86q123 14 228.5 41t177 58.5t130.5 71t92.5 72.5t59 68.5t34.5 54t14 33.5v837q0 191 -83 360.5t-220.5 286.5t-319.5 185t-377 68t-377 -68t-319.5 -185t-220.5 -286.5t-83 -360.5v-600q0 -21 -14.5 -35.5t-35.5 -14.5h-100 q-21 0 -35.5 14.5t-14.5 35.5zM300 50v798q0 52 34 52h253q21 0 35.5 -15t14.5 -36q6 -17 14 -48.5t22 -135.5t14 -215t-12.5 -211t-24.5 -145l-13 -44q0 -21 -14.5 -35.5t-35.5 -14.5h-253q-34 0 -34 50zM1713 450q0 111 12.5 211t24.5 144l13 44q0 21 14.5 36t35.5 15h253 q34 0 34 -52v-457q-143 -173 -360 -233q-27 209 -27 292z" />
-<glyph unicode="&#xe079;" d="M-138 149.5q0 39.5 20 75.5l1238 2095q20 35 54.5 55t75.5 20t75.5 -20t54.5 -55l1238 -2095q20 -36 20 -75.5t-20 -74.5t-55 -55t-75 -20h-2476q-40 0 -75 20t-55 55t-20 74.5zM271 300h1958l-979 1680zM1100 437v225q0 16 11 27t27 11h225q15 0 26 -11t11 -27v-225 q0 -15 -11 -26t-26 -11h-225q-16 0 -27 11t-11 26zM1100 1262v188q0 20 14.5 35t35.5 15h200q21 0 35.5 -15t14.5 -35v-188q0 -39 -7 -74l-68 -345q-3 -16 -16.5 -29.5t-28.5 -13.5h-59q-14 0 -27.5 13.5t-16.5 29.5l-70 342q-7 35 -7 77z" />
-<glyph unicode="&#xe080;" d="M0 0v650q0 21 14.5 35.5t35.5 14.5h300q21 0 35.5 -14.5t14.5 -35.5v-650h-400zM500 0v950q0 21 14.5 35.5t35.5 14.5h300q21 0 35.5 -14.5t14.5 -35.5v-950h-400zM1000 0v1250q0 21 14.5 35.5t35.5 14.5h300q21 0 35.5 -14.5t14.5 -35.5v-1250h-400zM1500 0v1750 q0 21 14.5 35.5t35.5 14.5h300q21 0 35.5 -14.5t14.5 -35.5v-1750h-400zM2000 0v2350q0 21 14.5 35.5t35.5 14.5h300q21 0 35.5 -14.5t14.5 -35.5v-2350h-400z" />
-<glyph unicode="&#xe081;" d="M-175 1318q-6 18 6 34l390 526q13 17 30.5 19t29.5 -14l390 -532q13 -17 7 -34t-27 -17h-251v-600h1172l231 -300h-1653q-21 0 -35.5 14.5t-14.5 35.5v850h-249q-20 0 -26 18zM606 1900h1644q21 0 35.5 -14.5t14.5 -35.5v-850h251q21 0 27 -11t-7 -28l-390 -519 q-12 -17 -29.5 -17t-30.5 16l-390 520q-12 17 -6 28t26 11h249v600h-1163z" />
-<glyph unicode="&#xe082;" d="M0 1243.5q-4 -169.5 37 -340.5l290 5l20 3q-70 197 -39 416.5t161 399.5q138 191 347 288.5t439 82.5t428 -142l-145 -200q-12 -16 -6 -28t27 -12l650 12q20 0 30.5 14t4.5 34l-193 621q-6 20 -19 22t-25 -15l-148 -204l-6 4q-198 129 -428 173t-446.5 4t-415.5 -163 t-337 -315q-107 -148 -164.5 -319t-61.5 -340.5zM152 624q-6 20 4.5 34t30.5 14l650 12q20 0 26.5 -12t-5.5 -28l-145 -200q198 -127 428 -142t439 82.5t347 288.5q130 179 161 397t-37 414l309 6q65 -245 17 -509.5t-207 -483.5q-138 -192 -337 -315t-415.5 -163t-446.5 4 t-428 173l-6 4l-148 -204q-12 -17 -25 -15t-20 22z" />
-<glyph unicode="&#xe083;" d="M43 882q-87 316 0 631l271 -155q-36 -201 18 -396q52 -190 175.5 -337t294.5 -231q21 151 31 207q12 62 61 16q24 -23 212 -211t216 -217q27 -29 25.5 -42.5t-28.5 -29.5q-28 -17 -272 -151t-275 -149q-33 -18 -46 -13t-9 38l37 245q-257 103 -446 310.5t-265 484.5z M214 1650q17 547 23 609q7 71 63 23l164 -136q192 149 418 211q326 84 631 1t530 -306l-271 -159q-167 138 -377.5 185t-432.5 -10q-138 -38 -260 -120q143 -117 173 -142q15 -13 21 -25t-0.5 -22.5t-24.5 -15.5q-38 -10 -285 -71.5t-292 -71.5q-51 -13 -66 -4.5t-14 54.5z M1498 38v314q154 53 278 156.5t206 246.5q134 235 114 507q-179 -78 -215 -92q-27 -11 -37 0t-3 42q18 74 52.5 222t63 269.5t29.5 124.5q10 40 48 18q30 -16 561 -316q21 -12 21.5 -29.5t-16.5 -23.5l-215 -92q32 -204 -5.5 -404t-136.5 -375q-116 -204 -303 -351.5 t-423 -211.5q-3 -1 -9.5 -2.5t-9.5 -2.5z" />
-<glyph unicode="&#xe084;" d="M-200 550v200q0 20 17 35t38 15h592l1200 1100h353v250q0 20 13 26t29 -6l522 -390q16 -13 16 -30.5t-16 -29.5l-522 -390q-16 -13 -29 -7t-13 27v250h-237l-1200 -1100h-708q-21 0 -38 14.5t-17 35.5zM-200 1650v200q0 20 17 35t38 15h708l431 -395l-222 -203l-326 298 h-591q-21 0 -38 14.5t-17 35.5zM1216 895l222 203l325 -298h237v250q0 20 13 26t29 -6l523 -390q17 -13 17 -30.5t-17 -29.5l-523 -390q-16 -13 -29 -7t-13 27v250h-354z" />
-<glyph unicode="&#xe085;" d="M-58 1912q-6 12 6 28l380 517q12 17 29.5 17t30.5 -16l399 -518q12 -16 6.5 -28t-26.5 -12h-262q0 -96 -9.5 -176t-30 -149.5t-35.5 -108t-43 -102.5q-25 -56 -36.5 -86t-27 -83t-22 -112t-6.5 -133q0 -97 14.5 -177.5t30 -122t47.5 -114.5q28 -64 43 -102.5t35.5 -108 t30 -149.5t9.5 -176h-300q0 74 -6.5 133t-22 112t-27 83t-36.5 86q-28 64 -43 102.5t-35.5 108t-30 149.5t-9.5 176t9.5 176t30 149.5t35.5 108t43 102.5q32 73 47.5 114.5t30 122t14.5 177.5h-236q-21 0 -27 12zM942 1912q-6 12 6 28l380 517q12 17 29.5 17t30.5 -16 l399 -518q12 -16 6.5 -28t-26.5 -12h-262q0 -96 -9.5 -176t-30 -149.5t-35.5 -108t-43 -102.5q-25 -56 -36.5 -86t-27 -83t-22 -112t-6.5 -133q0 -97 14.5 -177.5t30 -122t47.5 -114.5q28 -64 43 -102.5t35.5 -108t30 -149.5t9.5 -176h-300q0 74 -6.5 133t-22 112t-27 83 t-36.5 86q-28 64 -43 102.5t-35.5 108t-30 149.5t-9.5 176t9.5 176t30 149.5t35.5 108t43 102.5q32 73 47.5 114.5t30 122t14.5 177.5h-236q-21 0 -27 12zM1942 1912q-6 12 6 28l380 517q12 17 29.5 17t30.5 -16l399 -518q13 -16 7 -28t-27 -12h-262q0 -96 -9.5 -176 t-30 -149.5t-35.5 -108t-43 -102.5q-25 -56 -36.5 -86t-27 -83t-22 -112t-6.5 -133t6.5 -133t22 -112t27 -83t36.5 -86q28 -64 43 -102.5t35.5 -108t30 -149.5t9.5 -176h-300q0 74 -6.5 133t-22 112t-27 83t-36.5 86q-28 64 -43 102.5t-35.5 108t-30 149.5t-9.5 176t9.5 176 t30 149.5t35.5 108t43 102.5q25 56 36.5 86t27 83t22 112t6.5 133h-236q-21 0 -27 12z" />
-<glyph unicode="&#xe086;" d="M14 1200q0 183 57 365.5t169 337.5q138 192 337 315t415.5 163t446.5 -4t428 -173l6 -4l148 204q12 17 25 15t19 -22l193 -621q6 -20 -4.5 -34t-30.5 -14l-650 -12q-20 0 -26.5 12t5.5 28l145 200q-198 127 -428 142t-439 -82.5t-347 -288.5q-169 -234 -169 -527 q0 -175 68 -342.5t195 -294.5q126 -126 290 -193.5t337 -69.5q189 -2 365.5 70t318.5 235q42 48 113 153q18 26 54.5 27.5t70.5 -21.5l83 -56q34 -22 46 -57.5t-5 -60.5q-18 -27 -68 -93.5t-69 -89.5q-112 -135 -273.5 -230t-322.5 -137t-313 -41q-232 2 -450 91t-389 259 q-99 99 -170.5 214t-109 228t-54.5 213t-17 196z" />
-<glyph unicode="&#xe087;" d="M-200 600v1700q0 41 29.5 70.5t70.5 29.5h2600q41 0 70.5 -29.5t29.5 -70.5v-1700q0 -41 -29.5 -70.5t-70.5 -29.5h-1100v-100q0 -56 20.5 -97t50 -60t59 -30t50.5 -12l20 -1h365q14 0 24.5 -10.5t10.5 -24.5v-165h-1600v165q0 14 10.5 24.5t25.5 10.5h369q8 0 21 1 t46.5 12t59.5 30t47 60t21 97v100h-1100q-41 0 -70.5 29.5t-29.5 70.5zM0 800h2400v1400h-2400v-1400zM2300 600h100v100h-100v-100z" />
-<glyph unicode="&#xe088;" d="M100 0v2025l350 375h1450q98 0 191 -58t151 -151t58 -191v-1500l-200 -200v1600q0 300 -300 300h-1227l-200 -200h1227q124 0 212 -88t88 -212v-1400q0 -124 -88 -212t-212 -88h-1500zM536 980.5q0 -9.5 7 -16.5l374 -375q7 -7 16.5 -7t16.5 7l690 690q16 17 0 33 l-156 154q-16 16 -34 -1l-499 -499q-7 -8 -17 -8t-17 8l-186 186q-7 7 -17 7t-17 -7l-154 -155q-7 -7 -7 -16.5z" />
-<glyph unicode="&#xe089;" d="M100 0v2025l350 375h1450q98 0 191 -58t151 -151t58 -191v-1500l-200 -200v1600q0 300 -300 300h-1227l-200 -200h1227q124 0 212 -88t88 -212v-1400q0 -124 -88 -212t-212 -88h-1500zM500 622q0 -9 6.5 -15.5t15.5 -6.5h956q9 0 15.5 6.5t6.5 15.5v102q0 35 -9 52.5 t-35 32.5q-14 8 -162.5 60.5t-193.5 71.5v90q35 10 67.5 53.5t32.5 79.5v199q0 85 -53 140.5t-147 55.5t-147 -55.5t-53 -140.5v-199q0 -36 32.5 -79.5t67.5 -53.5v-90q-45 -19 -193.5 -71.5t-162.5 -60.5q-26 -15 -35 -32.5t-9 -52.5v-102z" />
-<glyph unicode="&#xe090;" d="M0 0v100h100v100h100v2000h2000v-2000h100v-100h100v-100h-1000v300h-400v-300h-1000zM200 2300l200 200h500l100 100h400l100 -100h500l200 -200h-2000zM500 500h400v200h-400v-200zM500 900h400v200h-400v-200zM500 1300h400v200h-400v-200zM500 1700h400v200h-400 v-200zM1000 500h400v200h-400v-200zM1000 900h400v200h-400v-200zM1000 1300h400v200h-400v-200zM1000 1700h400v200h-400v-200zM1500 500h400v200h-400v-200zM1500 900h400v200h-400v-200zM1500 1300h400v200h-400v-200zM1500 1700h400v200h-400v-200z" />
-<glyph unicode="&#xe091;" d="M0.5 259.5q1.5 98.5 71.5 168.5l35 35q13 15 13 33q-16 71 9 153.5t80 136.5l898 898l-112 111q-24 24 -24.5 58t22.5 57l142 141q22 23 56 23q33 0 59 -24l155 -156q6 9 13 16l319 319q155 157 283 157q97 0 183 -86l71 -71q50 -51 71 -104.5t16.5 -99.5t-30 -96 t-55.5 -87t-73 -80l-319 -319l-15 -12l155 -156q24 -24 24.5 -57.5t-22.5 -56.5l-142 -142q-23 -23 -55 -23q-33 0 -60 25l-111 111l-898 -898q-44 -44 -107.5 -69t-125.5 -25q-33 0 -55 5q-20 0 -34 -12l-36 -36q-71 -71 -171 -71q-97 0 -164 67q-68 68 -66.5 166.5z M321 700h707l531 531l-353 354z" />
-<glyph unicode="&#xe092;" d="M-25 1200q0 166 44 325t123 293t192.5 247.5t247.5 192.5t293 123t325 44t325 -44t293.5 -123t247.5 -192.5t192 -247.5t123 -293t44 -325t-44 -325t-123 -293.5t-192 -247.5t-247.5 -192t-293.5 -123t-325 -44t-325 44t-293 123t-247.5 192t-192.5 247.5t-123 293.5 t-44 325zM229 1200q0 -186 66 -356.5t181.5 -299t277 -213.5t346.5 -105v1948q-185 -20 -346.5 -105t-277 -213.5t-181.5 -299t-66 -356.5z" />
-<glyph unicode="&#xe093;" d="M89 791q0 121 32 239t86.5 221.5t122 205t144 207t146 209t134 229.5t103.5 251q37 -125 101 -250.5t133.5 -228.5t146 -208t144.5 -206t123 -204t87.5 -221t32.5 -239q0 -126 -45.5 -239.5t-122.5 -196.5t-175.5 -144t-208 -91.5t-216.5 -30.5t-216 30t-208 90.5 t-176 142.5t-122.5 195t-45.5 239zM295 791q1 -83 45 -159t128 -127t189 -56q50 2 65 20.5t-4 42.5t-61 42q-62 28 -100 100.5t-38 157.5q0 122 17.5 257t49.5 230q13 41 -19 56q-34 17 -73 -14q-20 -17 -34 -42q-67 -113 -116.5 -253.5t-48.5 -254.5zM1566 1719 q0 83 30 163.5t78 151.5t98.5 140t101 155.5t76.5 170.5q22 -72 61 -145.5t80.5 -129.5t85.5 -120t78.5 -119.5t56.5 -124.5t22 -139q0 -104 -59.5 -186.5t-146.5 -124t-178 -41.5q-67 0 -134.5 24.5t-123.5 68t-91 111t-35 145.5zM1669 1719q1 -65 51.5 -116t129.5 -55 q25 1 32.5 10.5t-2 21t-30.5 21.5q-30 13 -49.5 50t-19.5 79q0 141 34 243q7 24 -14 30q-25 7 -45 -23l-4 -7q-33 -55 -58 -125.5t-25 -128.5z" />
-<glyph unicode="&#xe094;" d="M-100 1700v400h300v-400h-300zM300 300v2100h400v-300h1259l370 371l142 -142l-371 -370v-1259h400v-400h-2200zM700 841l859 859h-859v-859zM841 700h859v859zM1700 -100v300h400v-300h-400z" />
-<glyph unicode="&#xe095;" d="M0 0v400h100v1600h-100v400h400v-100h1600v100h400v-400h-100v-1600h100v-400h-400v100h-1600v-100h-400zM100 100h200v200h-200v-200zM100 2100h200v200h-200v-200zM300 400h100v-100h1600v100h100v1600h-100v100h-1600v-100h-100v-1600zM2100 100h200v200h-200v-200z M2100 2100h200v200h-200v-200z" />
-<glyph unicode="&#xe096;" d="M0 1000v400h119q31 165 110.5 313.5t194 263t263 194t313.5 110.5v119h400v-119q334 -62 576.5 -304.5t304.5 -576.5h119v-400h-119q-31 -165 -110.5 -313.5t-194 -263t-263 -194t-313.5 -110.5v-119h-400v119q-334 62 -576.5 304.5t-304.5 576.5h-119zM100 1100h200v200 h-200v-200zM323 1000q58 -252 241.5 -435.5t435.5 -241.5v77h400v-77q252 58 435.5 241.5t241.5 435.5h-77v400h77q-58 252 -241.5 435.5t-435.5 241.5v-77h-400v77q-252 -58 -435.5 -241.5t-241.5 -435.5h77v-400h-77zM1100 100h200v200h-200v-200zM1100 2100h200v200h-200 v-200zM2100 1100h200v200h-200v-200z" />
-<glyph unicode="&#xe097;" d="M-100 1300v400h305l795 574v226h400v-226l798 -574h302v-400h-150l-294 -900h44v-400h-400v100h-1000v-100h-400v400h44l-295 900h-149zM0 1400h200v200h-200v-200zM259 1300l295 -900h146v-100h1000v100h146l294 900h-40v224l-800 576h-200l-800 -578v-222h-41zM400 100 h200v200h-200v-200zM1100 2200h200v200h-200v-200zM1800 100h200v200h-200v-200zM2200 1400h200v200h-200v-200z" />
-<glyph unicode="&#xe098;" d="M0 0v400h259l1741 1741v259h400v-400h-259l-1741 -1741v-259h-400zM100 100h200v200h-200v-200zM2100 2100h200v200h-200v-200z" />
-<glyph unicode="&#xe099;" d="M0 0v400h136q82 471 342.5 866t655.5 655.5t866 342.5v136h400v-400h-400v61q-312 -60 -591 -210t-494.5 -365.5t-365.5 -494.5t-210 -591h61v-400h-400zM100 100h200v200h-200v-200zM2100 2100h200v200h-200v-200z" />
-<glyph unicode="&#xe100;" d="M0 0v400h100v600h-100v400h100v600h-100v400h400v-100h600v100h400v-100h600v100h400v-400h-100v-600h100v-400h-100v-600h100v-400h-400v100h-600v-100h-400v100h-600v-100h-400zM100 100h200v200h-200v-200zM100 1100h200v200h-200v-200zM100 2100h200v200h-200v-200z M300 400h100v-100h600v100h400v-100h600v100h100v600h-100v400h100v600h-100v100h-600v-100h-400v100h-600v-100h-100v-600h100v-400h-100v-600zM1100 100h200v200h-200v-200zM1100 2100h200v200h-200v-200zM2100 100h200v200h-200v-200zM2100 1100h200v200h-200v-200z M2100 2100h200v200h-200v-200z" />
-<glyph unicode="&#xe101;" d="M0 100v127q108 46 161 99q24 24 48.5 60t37.5 60l13 24l766 1930h179l738 -1914q39 -97 115 -177q34 -36 69.5 -56.5t54.5 -22.5l18 -3v-127h-800v127q52 0 90.5 25t55 62.5t20.5 82t-13 83.5l-158 426h-750q-110 -279 -176 -450q-21 -64 -11.5 -108t49 -71t88 -38.5 t105.5 -11.5v-127h-700zM695 1100h653l-222 607l-88 269zM1700 1400v60l93 46l376 894h81l364 -896l86 -46v-58h-400v58l110 50l-76 200h-353l-91 -201l110 -47v-60h-300zM2018 1800h297l-101 280l-40 121z" />
-<glyph unicode="&#xe102;" d="M500 0v114q146 13 229.5 77.5t101.5 165.5l319 1682q2 12 6 33q25 105 2 141.5t-158 72.5v114h803l2 -114q-65 -15 -103 -25t-72.5 -25t-51 -29t-32 -40t-22.5 -53.5t-15 -74.5l-284 -1682q-16 -92 39 -160t136 -83v-114h-900z" />
-<glyph unicode="&#xe103;" d="M200 0v178q82 13 141 64.5t59 130.5v1655q0 36 -0.5 52t-3 40.5t-7 34.5t-14.5 26t-23.5 23t-36 18t-49.5 18.5t-66 16.5v143h1096q114 0 229 -45t210 -124.5t155 -201.5t60 -263q0 -80 -24.5 -151.5t-64 -122t-87 -93t-95 -69.5t-87 -45.5t-64.5 -26.5l-24 -8 q12 -3 32.5 -9t80 -30t114 -54.5t120.5 -84t113.5 -115.5t80 -152.5t32.5 -192.5q0 -124 -52 -228.5t-135 -173.5t-188 -118t-209 -70.5t-201 -21.5h-1092zM900 300h299q168 0 266 96t98 270q0 90 -22 167t-66 137.5t-115.5 95t-163.5 34.5h-296v-800zM900 1400h296 q58 0 103.5 20t74.5 53t48 79t26.5 94.5t7.5 103.5q0 70 -13 129t-41.5 110.5t-81 81t-124.5 29.5h-296v-700z" />
-<glyph unicode="&#xe104;" d="M200 0v200h2000v-200h-2000zM200 1900v500h2000v-500h-100q0 146 -81.5 223t-218.5 77h-400v-1600q0 -24 14 -42t42.5 -28.5t55 -17t67.5 -9t63 -3t58 -0.5v-100h-1000v100q36 0 58 0.5t63 3t67.5 9t55 17t42.5 28.5t14 42v1600h-400q-137 0 -218.5 -77t-81.5 -223h-100z " />
-<glyph unicode="&#xe105;" d="M200 1200v200h800v800h-400q-137 0 -218.5 -77t-81.5 -223h-100v500h2000v-500h-100q0 146 -81.5 223t-218.5 77h-400v-800h800v-200h-800v-800q0 -24 14 -42t42.5 -28.5t55 -17t67.5 -9t63 -3t58 -0.5v-100h-1000v100q36 0 58 0.5t63 3t67.5 9t55 17t42.5 28.5t14 42 v800h-800z" />
-<glyph unicode="&#xe106;" d="M-100 500h200v1600h-200l250 333l250 -333h-200v-1600h200l-250 -333zM500 1900v500h2000v-500h-100q0 146 -81.5 223t-218.5 77h-400v-1800q0 -24 14 -42t42.5 -28.5t55 -17t67.5 -9t63 -3t58 -0.5v-100h-1000v100q36 0 58 0.5t63 3t67.5 9t55 17t42.5 28.5t14 42v1800 h-400q-137 0 -218.5 -77t-81.5 -223h-100z" />
-<glyph unicode="&#xe107;" d="M167 250l333 250v-200h1400v200l333 -250l-333 -250v200h-1400v-200zM200 1900v500h2000v-500h-100q0 146 -81.5 223t-218.5 77h-400v-1500q0 -24 14 -42t42.5 -28.5t55 -17t67.5 -9t63 -3t58 -0.5v-100h-1000v100q36 0 58 0.5t63 3t67.5 9t55 17t42.5 28.5t14 42v1500 h-400q-137 0 -218.5 -77t-81.5 -223h-100z" />
-<glyph unicode="&#xe108;" d="M-100 -100v300h100v2000h-100v300h300v-100h2000v100h300v-300h-100v-2000h100v-300h-300v100h-2000v-100h-300zM0 0h100v100h-100v-100zM0 2300h100v100h-100v-100zM100 200h100v-100h2000v100h100v2000h-100v100h-2000v-100h-100v-2000zM200 1600v500h2000v-500h-100 q0 146 -81.5 223t-218.5 77h-400v-1400q0 -24 14 -42t42.5 -28.5t55 -17t67.5 -9t63 -3t58 -0.5v-100h-1000v100q36 0 58 0.5t63 3t67.5 9t55 17t42.5 28.5t14 42v1400h-400q-137 0 -218.5 -77t-81.5 -223h-100zM2300 0h100v100h-100v-100zM2300 2300h100v100h-100v-100z " />
-<glyph unicode="&#xe109;" d="M0 1100v100h300v200l333 -250l-333 -250v200h-300zM700 100v2200h200v-2200h-200zM1000 350v200q0 20 14.5 35t35.5 15h1300q21 0 35.5 -15t14.5 -35v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-1300q-21 0 -35.5 14.5t-14.5 35.5zM1000 850v200q0 21 14.5 35.5t35.5 14.5h800 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM1000 1350v200q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5zM1000 1850v200 q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe110;" d="M0 350v200q0 21 14.5 35.5t35.5 14.5h1300q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-1300q-21 0 -35.5 14.5t-14.5 35.5zM0 850v200q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5zM0 1350v200q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5zM0 1850v200q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM1500 100v2200h200v-2200h-200zM1767 1150l333 250v-200h300v-100h-300v-200z" />
-<glyph unicode="&#xe111;" d="M0 150v200q0 20 14.5 35t35.5 15h2300q21 0 35.5 -15t14.5 -35v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-2300q-21 0 -35.5 14.5t-14.5 35.5zM0 750v200q0 20 14.5 35t35.5 15h1699q20 0 35 -15t15 -35v-200q0 -21 -15 -35.5t-35 -14.5h-1699q-21 0 -35.5 14.5t-14.5 35.5z M0 1350v200q0 21 14.5 35.5t35.5 14.5h2099q20 0 35 -14.5t15 -35.5v-200q0 -21 -15 -35.5t-35 -14.5h-2099q-21 0 -35.5 14.5t-14.5 35.5zM0 1950v200q0 21 14.5 35.5t35.5 14.5h1299q20 0 35 -14.5t15 -35.5v-200q0 -21 -15 -35.5t-35 -14.5h-1299q-21 0 -35.5 14.5 t-14.5 35.5z" />
-<glyph unicode="&#xe112;" d="M0 150v200q0 21 14.5 35.5t35.5 14.5h2300q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-2300q-21 0 -35.5 14.5t-14.5 35.5zM0 1350v200q0 21 14.5 35.5t35.5 14.5h2300q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-2300 q-21 0 -35.5 14.5t-14.5 35.5zM400 750v200q0 21 14.5 35.5t35.5 14.5h1500q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-1500q-21 0 -35.5 14.5t-14.5 35.5zM400 1950v200q0 21 14.5 35.5t35.5 14.5h1500q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-1500q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe113;" d="M0 150v200q0 20 14.5 35t35.5 15h2300q21 0 35.5 -15t14.5 -35v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-2300q-21 0 -35.5 14.5t-14.5 35.5zM201 1350v200q0 21 15 35.5t35 14.5h2099q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-2099q-20 0 -35 14.5 t-15 35.5zM601 750v200q0 20 15 35t35 15h1699q21 0 35.5 -15t14.5 -35v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-1699q-20 0 -35 14.5t-15 35.5zM1001 1950v200q0 21 15 35.5t35 14.5h1299q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-1299 q-20 0 -35 14.5t-15 35.5z" />
-<glyph unicode="&#xe114;" d="M0 150v200q0 21 14.5 35.5t35.5 14.5h2300q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-2300q-21 0 -35.5 14.5t-14.5 35.5zM0 750v200q0 21 14.5 35.5t35.5 14.5h2300q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-2300 q-21 0 -35.5 14.5t-14.5 35.5zM0 1350v200q0 21 14.5 35.5t35.5 14.5h2300q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-2300q-21 0 -35.5 14.5t-14.5 35.5zM0 1950v200q0 21 14.5 35.5t35.5 14.5h2300q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-2300q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe115;" d="M0 150v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 750v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5zM0 1350v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 1950v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM500 150v200q0 21 14.5 35.5t35.5 14.5h1800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-1800q-21 0 -35.5 14.5t-14.5 35.5zM500 750v200q0 21 14.5 35.5t35.5 14.5h1800 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-1800q-21 0 -35.5 14.5t-14.5 35.5zM500 1350v200q0 21 14.5 35.5t35.5 14.5h1800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-1800q-21 0 -35.5 14.5t-14.5 35.5zM500 1950v200 q0 20 14.5 35t35.5 15h1800q21 0 35.5 -15t14.5 -35v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-1800q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe116;" d="M200 1500v500h1300v-500h-100q0 146 -81.5 223t-218.5 77h-100v-1200q0 -24 14 -42t42.5 -28.5t55 -17t67.5 -9t63 -3t58 -0.5v-100h-900v100q36 0 58 0.5t63 3t67.5 9t55 17t42.5 28.5t14 42v1200h-100q-137 0 -218.5 -77t-81.5 -223h-100zM1600 1000v200h800v-200h-800 z" />
-<glyph unicode="&#xe117;" d="M0 1800v500h2000v-500h-100q0 146 -81.5 223t-218.5 77h-400v-1800q0 -24 14 -42t42.5 -28.5t55 -17t67.5 -9t63 -3t58 -0.5v-100h-1000v100q36 0 58 0.5t63 3t67.5 9t55 17t42.5 28.5t14 42v1800h-400q-137 0 -218.5 -77t-81.5 -223h-100zM1600 1000v200h300v300h200 v-300h300v-200h-300v-300h-200v300h-300z" />
-<glyph unicode="&#xe118;" d="M-300 1037v150l1100 611v-265l-789 -421l789 -445v-266zM1600 401v266l789 445l-789 421v265l1100 -611v-150z" />
-<glyph unicode="&#xe119;" d="M-300 1037v150l1100 611v-265l-789 -421l789 -445v-266zM825 0l941 2400h249l-939 -2400h-251zM1600 401v172l48 121l741 418l-478 255l83 212l706 -392v-150z" />
-<glyph unicode="&#xe120;" d="M0 300v1800q0 124 88 212t212 88h1800q124 0 212 -88t88 -212v-1800q0 -124 -88 -212t-212 -88h-1800q-124 0 -212 88t-88 212zM200 200h600v300h-600v-300zM200 600h600v300h-600v-300zM200 1000h600v300h-600v-300zM200 1400h600v300h-600v-300zM200 1900h2000v300 h-2000v-300zM900 200h600v300h-600v-300zM900 600h600v300h-600v-300zM900 1000h600v300h-600v-300zM900 1400h600v300h-600v-300zM1600 200h600v300h-600v-300zM1600 600h600v300h-600v-300zM1600 1000h600v300h-600v-300zM1600 1400h600v300h-600v-300z" />
-<glyph unicode="&#xe121;" d="M0 0l800 800h800l800 -800h-2400zM0 200v1400l700 -700zM0 1600l1200 1200l1200 -1200v-1400l-700 700l700 700h-200l-150 -150l-650 650l-998 -702l-202 202h-200z" />
-<glyph unicode="&#xe122;" d="M0 0l800 800h800l800 -800h-2400zM0 200v1400l700 -700zM0 1600l1200 1200l1200 -1200v-1400l-700 700l700 700h-200l-700 -700h-600l-700 700h-200z" />
-<glyph unicode="&#xe123;" d="M0 0l800 800h800l800 -800h-2400zM0 200v1400l700 -700zM0 1600l1200 1200l1200 -1200h-200l-700 -700h-600l-700 700h-200zM703.5 1788.5q-3.5 -11.5 3.5 -20.5l479 -569q7 -9 16.5 -10.5t16.5 7.5l477 573q7 9 3.5 20t-14.5 11h-285v460q0 40 -44 40h-311 q-45 0 -45 -40v-460h-283q-10 0 -13.5 -11.5zM1700 900l700 700v-1400z" />
-<glyph unicode="&#xe124;" d="M0 0l800 800h800l800 -800h-2400zM0 200v1400l700 -700zM0 1600l1200 1200l1200 -1200v-1400l-700 700l700 700h-200l-700 -700h-600l-700 700h-200zM702.5 1711q3.5 -11 13.5 -11h284v-460q0 -40 45 -40h311q44 0 44 40v460h284q11 0 14.5 11.5t-4.5 20.5l-479 569 q-7 9 -16.5 10.5t-16.5 -7.5l-476 -573q-7 -9 -3.5 -20z" />
-<glyph unicode="&#xe125;" d="M0 0l700 700l500 -500l500 500l700 -700h-2400zM0 200v1200l600 -600zM0 1600h1724q65 -262 282 -395l-806 -805zM1800 800l342 342q120 -42 258 -42v-900zM1900 1800q0 146 67.5 261t181 177t251.5 62q136 0 251 -67t182 -182t67 -251t-67 -251t-182 -182t-251 -67 q-140 0 -252 57t-180 172t-68 271zM2100 1750q0 -21 15 -35.5t35 -14.5h150v-150q0 -21 15 -35.5t35 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5h-100q-20 0 -35 -14.5 t-15 -35.5v-150h-150q-20 0 -35 -14.5t-15 -35.5v-100z" />
-<glyph unicode="&#xe126;" d="M0 0l700 700l500 -500l500 500l700 -700h-2400zM0 200v1200l600 -600zM0 1600h1724q65 -262 282 -395l-806 -805zM1800 800l342 342q120 -42 258 -42v-900zM1900 1800q0 120 39 216.5t107.5 157.5t158.5 93.5t195 32.5q101 0 194 -42.5t160 -113.5t106.5 -166.5 t39.5 -197.5q0 -135 -67 -245.5t-181.5 -172.5t-251.5 -62q-105 0 -195 32.5t-158.5 93.5t-107.5 157.5t-39 216.5zM2100 1750q0 -21 15 -35.5t35 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-20 0 -35 -14.5t-15 -35.5v-100z" />
-<glyph unicode="&#xe127;" d="M0 0l700 700l500 -500l500 500l700 -700h-2400zM0 200v1200l600 -600zM0 1600h1724q65 -262 281 -395l-805 -805zM1800 800l342 342q120 -42 258 -42v-900zM1909 1798q0 134 66.5 248t181 180.5t248.5 66.5t248 -66.5t180.5 -180.5t66.5 -248t-66.5 -248t-180.5 -180.5 t-248 -66.5t-248.5 66.5t-181 180.5t-66.5 248zM2033 1798q0 -106 58 -198l512 512q-92 58 -198 58q-154 0 -263 -109t-109 -263zM2207 1484q90 -57 198 -57q154 0 262.5 108.5t108.5 262.5q0 108 -57 198z" />
-<glyph unicode="&#xe128;" d="M0 200v1200l600 -600zM3 0l700 700l500 -500l500 500l700 -700h-2400zM3 1600h1897v-150q0 -70 36.5 -129t96.5 -91l-830 -830zM1800 800l407 407q69 17 119 67t67 119l7 7v-1200zM2100 1450v850h550q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -13.5 -41t-32.5 -28 l-454 -181v-250q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe129;" d="M0 0l700 700l500 -500l500 500l700 -700h-2400zM0 200v1200l600 -600zM0 1600h1800v-184q0 -85 58.5 -146.5t143.5 -67.5l-802 -802zM1800 800l400 400h200v-1000zM2000 1416v566q0 6 5 12t12 6h83v255q0 56 43.5 100.5t98.5 44.5h313q55 0 100 -45t45 -100v-255h81 q7 0 13 -6t6 -12v-566q0 -6 -6 -11t-13 -5h-764q-7 0 -12 5t-5 11zM2200 2000h400v255q0 25 -11 35t-36 10h-310q-25 0 -34 -9.5t-9 -35.5v-255z" />
-<glyph unicode="&#xe130;" d="M0 0l700 700l500 -500l500 500l700 -700h-2400zM0 200v1200l600 -600zM0 1600h1835q70 -198 253 -312l-888 -888zM1800 800l426 426q84 -26 174 -26v-1000zM2000 1738v120q0 10 6.5 26t13.5 16h187l-122 110q-7 6 -7 9t5 9l83 84q11 12 23 0l111 -120v186q0 8 15 15t25 7 h120q10 0 25 -7t15 -15v-187l111 122q11 11 19 2l85 -82q10 -11 0 -23l-121 -110h186q7 0 13.5 -16t6.5 -26v-120q0 -10 -6.5 -24t-13.5 -14h-186l122 -112q10 -11 1 -20l-82 -84q-12 -12 -24 0l-111 121v-187q0 -7 -14.5 -12.5t-25.5 -5.5h-120q-11 0 -25.5 5.5t-14.5 12.5 v186l-111 -122q-9 -9 -18 -1l-85 83q-12 12 0 24l121 112h-187q-7 0 -13.5 14t-6.5 24z" />
-<glyph unicode="&#xe131;" d="M0 50q2 1065 3 1069l373 1132q6 20 25.5 34.5t40.5 14.5h1516q22 0 41 -12t25 -32l373 -1137l3 -1069q0 -21 -14.5 -35.5t-35.5 -14.5h-2300q-21 0 -35.5 14.5t-14.5 35.5zM291 1100h409l200 -500h600l200 500h410l-304 900h-1212z" />
-<glyph unicode="&#xe132;" d="M0 50q0 -21 14.5 -35.5t35.5 -14.5h2300q21 0 35.5 14.5t14.5 35.5q-2 1065 -3 1069l-125 381h-297l135 -400h-410l-200 -500h-600l-200 500h-409l303 900h906v300h-1058q-21 0 -40.5 -14.5t-25.5 -34.5l-373 -1132zM1700 2200q0 146 67.5 261t181 177t251.5 62 q136 0 251 -67t182 -182t67 -251t-67 -251t-182 -182t-251 -67q-140 0 -252 57t-180 172t-68 271zM1900 2150q0 -21 15 -35.5t35 -14.5h150v-150q0 -21 15 -35.5t35 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 20 -14.5 35t-35.5 15h-150 v150q0 20 -14.5 35t-35.5 15h-100q-20 0 -35 -15t-15 -35v-150h-150q-20 0 -35 -15t-15 -35v-100z" />
-<glyph unicode="&#xe133;" d="M0 50q2 1065 3 1069l373 1132q6 20 25.5 34.5t40.5 14.5h1058v-300h-906l-303 -900h409l200 -500h600l200 500h410l-135 400h297l125 -381l3 -1069q0 -21 -14.5 -35.5t-35.5 -14.5h-2300q-21 0 -35.5 14.5t-14.5 35.5zM1700 2200q0 120 39 216.5t107.5 157.5t158.5 93.5 t195 32.5q101 0 194 -42.5t160 -113.5t106.5 -166.5t39.5 -197.5q0 -135 -67 -245.5t-181.5 -172.5t-251.5 -62q-105 0 -195 32.5t-158.5 93.5t-107.5 157.5t-39 216.5zM1900 2150q0 -21 15 -35.5t35 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5 h-500q-20 0 -35 -14.5t-15 -35.5v-100z" />
-<glyph unicode="&#xe134;" d="M0 50q2 1065 3 1069l373 1132q6 20 25.5 34.5t40.5 14.5h1058v-300h-906l-303 -900h409l200 -500h600l200 500h410l-135 400h297l125 -381l3 -1069q0 -21 -14.5 -35.5t-35.5 -14.5h-2300q-21 0 -35.5 14.5t-14.5 35.5zM1800 1816v566q0 6 5 12t12 6h83v255 q0 56 43.5 100.5t98.5 44.5h313q55 0 100 -45t45 -100v-255h81q7 0 13 -6t6 -12v-566q0 -6 -6 -11t-13 -5h-764q-7 0 -12 5t-5 11zM2000 2400h400v255q0 25 -10.5 35t-35.5 10h-311q-25 0 -34 -9.5t-9 -35.5v-255z" />
-<glyph unicode="&#xe135;" d="M0 50q2 1065 3 1069l373 1132q6 20 25.5 34.5t40.5 14.5h458v-300h-306l-303 -900h409l200 -500h600l200 500h410l-304 900h-306v300h458q22 0 41 -12t25 -32l373 -1137l3 -1069q0 -21 -14.5 -35.5t-35.5 -14.5h-2300q-21 0 -35.5 14.5t-14.5 35.5zM703.5 1888.5 q3.5 11.5 13.5 11.5h283v650q0 21 15 35.5t35 14.5h300q21 0 35.5 -15t14.5 -35v-650h285q11 0 14 -11t-4 -20l-476 -573q-6 -8 -14 -8q-11 0 -19 11l-479 569q-7 9 -3.5 20.5z" />
-<glyph unicode="&#xe136;" d="M0 50v1050h2q0 15 1 19l373 1132q6 20 25.5 34.5t40.5 14.5h280l-222 -300h100l-309 -900h409l200 -500h600l200 500h410l-310 900h100l-225 300h283q22 0 41 -12t25 -32l373 -1137l1 -19h2v-1050q0 -21 -14.5 -35.5t-35.5 -14.5h-2300q-21 0 -35.5 14.5t-14.5 35.5z M703 2005.5q-3 5.5 4 14.5l479 564q6 7 19 7q7 0 14 -9l476 -562q15 -20 -10 -20h-285v-674q0 -13 -8 -19t-15.5 -6.5t-26.5 -0.5h-300q-14 0 -19.5 0.5t-14.5 2.5t-12.5 7.5t-3.5 15.5v674h-283q-11 0 -14 5.5z" />
-<glyph unicode="&#xe137;" d="M0 1205q0 61 11 154l316 79q28 109 89 216l-167 279q95 123 218 218l279 -167q101 59 216 89l79 316q94 11 154 11q62 0 154 -11l79 -316q116 -30 217 -89l279 167q123 -96 217 -218l-167 -279q58 -99 90 -216l315 -79q11 -80 11 -154q0 -75 -11 -154l-315 -79 q-31 -115 -90 -217l168 -278q-96 -123 -218 -218l-279 167q-100 -58 -217 -90l-79 -315q-86 -12 -154 -12q-67 0 -154 12l-79 315q-117 32 -216 90l-279 -167q-122 94 -218 217l167 279q-60 106 -89 217l-316 79q-11 92 -11 154zM777 1205q0 -173 122.5 -295.5t295.5 -122.5 t295.5 122.5t122.5 295.5t-122.5 295.5t-295.5 122.5t-295.5 -122.5t-122.5 -295.5z" />
-<glyph unicode="&#xe138;" d="M-498 1194q0 74 11 154l315 79q31 115 90 217l-167 278q95 123 218 218l278 -167q104 60 217 89l79 316q80 11 154 11t154 -11l79 -316q113 -29 217 -89l278 167q123 -95 218 -218l-167 -278q60 -104 89 -217l316 -79q11 -80 11 -154t-11 -154l-316 -79 q-30 -114 -89 -216l167 -279q-95 -123 -218 -218l-278 167q-104 -60 -217 -89l-79 -316q-80 -11 -154 -11t-154 11l-79 316q-113 29 -217 89l-278 -167q-123 95 -218 218l167 278q-59 102 -90 217l-315 79q-11 80 -11 154zM279 1194q0 -173 122.5 -295.5t295.5 -122.5 t295.5 122.5t122.5 295.5t-122.5 295.5t-295.5 122.5t-295.5 -122.5t-122.5 -295.5zM1726 301q0 37 6 73l151 38l2 6q13 46 38 93l3 5l-80 134q46 58 105 105l133 -81l5 3q44 25 94 39l5 1l38 152q47 5 74 5q34 0 74 -5l38 -152l6 -1q48 -14 93 -39l5 -3l134 81 q60 -47 104 -105l-80 -134l3 -5q23 -42 39 -93l1 -6l152 -38q5 -45 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-42 -25 -93 -39l-6 -2l-38 -151q-47 -5 -74 -5q-34 0 -74 5l-38 151l-5 2q-49 13 -94 39l-5 2 l-133 -80q-60 46 -105 105l80 134l-3 5q-24 44 -38 93l-2 6l-151 38q-6 40 -6 74zM2085 301q0 -89 63 -152t152 -63t152 63t63 152t-63 151.5t-152 62.5t-152 -63t-63 -151z" />
-<glyph unicode="&#xe139;" d="M0 287v1825q0 37 25.5 62.5t62.5 25.5h2225q36 0 61.5 -25.5t25.5 -62.5v-1825q0 -36 -25.5 -61.5t-61.5 -25.5h-2225q-37 0 -62.5 25.5t-25.5 61.5zM200 500l606 400q36 -14 95.5 -38.5t196 -90t219.5 -117.5q69 -44 66 -1q-3 50 -83 159q-93 127 -178 176l-23 12 q44 44 134.5 144t159.5 178l69 78l11 11t28.5 24t43 30t51.5 24t57 11q43 0 91.5 -25t75.5 -50l27 -25l353 -358v958h-2000v-1500zM381 1600q0 90 64 154.5t155 64.5t155 -64.5t64 -154.5q0 -91 -64 -155t-155 -64t-155 64t-64 155z" />
-<glyph unicode="&#xe140;" d="M100 600v300q0 41 29.5 70.5t70.5 29.5h100v1400h300v-1400h100q41 0 70.5 -29.5t29.5 -70.5v-300q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5zM200 700h500v50h-500v-50zM300 0v400h300v-400h-300zM900 1100v300q0 41 29.5 70.5t70.5 29.5h100 v900h300v-900h100q41 0 70.5 -29.5t29.5 -70.5v-300q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5zM1000 1200h500v50h-500v-50zM1100 0v900h300v-900h-300zM1700 1600v300q0 41 29.5 70.5t70.5 29.5h100v400h300v-400h100q41 0 70.5 -29.5t29.5 -70.5 v-300q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5zM1800 1700h500v50h-500v-50zM1900 0v1400h300v-1400h-300z" />
-<glyph unicode="&#xe141;" d="M0 200v300q0 14 12 33q71 -43 182 -72.5t228.5 -41t191 -15.5t136.5 -4t136.5 4t191 15.5t228.5 41t182 72.5q12 -19 12 -33v-300q0 -55 -100.5 -101t-273 -72.5t-376.5 -26.5t-376.5 26.5t-273 72.5t-100.5 101zM0 700v300q0 14 12 33q71 -43 182 -72.5t228.5 -41 t191 -15.5t136.5 -4t136.5 4t191 15.5t228.5 41t182 72.5q12 -19 12 -33v-300q0 -55 -100.5 -101t-273 -72.5t-376.5 -26.5t-376.5 26.5t-273 72.5t-100.5 101zM0 1200v300q0 14 12 33q71 -43 182 -72.5t228.5 -41t191 -15.5t136.5 -4t136.5 4t191 15.5t228.5 41t182 72.5 q12 -19 12 -33v-300q0 -55 -100.5 -101t-273 -72.5t-376.5 -26.5t-376.5 26.5t-273 72.5t-100.5 101zM0 1700v300q0 54 100.5 100t273 73t376.5 27t376.5 -27t273 -73t100.5 -100v-300q0 -54 -100.5 -100t-273 -73t-376.5 -27t-376.5 27t-273 73t-100.5 100zM427 2050 q0 -27 94.5 -46t228.5 -19t228.5 19t94.5 46t-94.5 45.5t-228.5 18.5t-228.5 -18.5t-94.5 -45.5zM1800 1816v566q0 6 5 12t12 6h83v255q0 56 43.5 100.5t98.5 44.5h313q55 0 100 -45t45 -100v-255h81q7 0 13 -6t6 -12v-566q0 -6 -6 -11t-13 -5h-764q-7 0 -12 5t-5 11z M2000 2400h400v255q0 25 -10.5 35t-35.5 10h-311q-25 0 -34 -9.5t-9 -35.5v-255z" />
-<glyph unicode="&#xe142;" d="M0 200v300q0 14 12 33q71 -43 182 -72.5t228.5 -41t191 -15.5t136.5 -4t136.5 4t191 15.5t228.5 41t182 72.5q12 -19 12 -33v-300q0 -55 -100.5 -101t-273 -72.5t-376.5 -26.5t-376.5 26.5t-273 72.5t-100.5 101zM0 700v300q0 14 12 33q71 -43 182 -72.5t228.5 -41 t191 -15.5t136.5 -4t136.5 4t191 15.5t228.5 41t182 72.5q12 -19 12 -33v-300q0 -55 -100.5 -101t-273 -72.5t-376.5 -26.5t-376.5 26.5t-273 72.5t-100.5 101zM0 1200v300q0 14 12 33q71 -43 182 -72.5t228.5 -41t191 -15.5t136.5 -4t136.5 4t191 15.5t228.5 41t182 72.5 q12 -19 12 -33v-300q0 -55 -100.5 -101t-273 -72.5t-376.5 -26.5t-376.5 26.5t-273 72.5t-100.5 101zM0 1700v300q0 54 100.5 100t273 73t376.5 27t376.5 -27t273 -73t100.5 -100v-300q0 -54 -100.5 -100t-273 -73t-376.5 -27t-376.5 27t-273 73t-100.5 100zM427 2050 q0 -27 94.5 -46t228.5 -19t228.5 19t94.5 46t-94.5 45.5t-228.5 18.5t-228.5 -18.5t-94.5 -45.5zM1700 2200q0 146 67.5 261t181 177t251.5 62q136 0 251 -67t182 -182t67 -251t-67 -251t-182 -182t-251 -67q-140 0 -252 57t-180 172t-68 271zM1900 2150q0 -21 15 -35.5 t35 -14.5h150v-150q0 -21 15 -35.5t35 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 20 -14.5 35t-35.5 15h-150v150q0 20 -14.5 35t-35.5 15h-100q-20 0 -35 -15t-15 -35v-150h-150q-20 0 -35 -15t-15 -35v-100z" />
-<glyph unicode="&#xe143;" d="M0 200v300q0 14 12 33q71 -43 182 -72.5t228.5 -41t191 -15.5t136.5 -4t136.5 4t191 15.5t228.5 41t182 72.5q12 -19 12 -33v-300q0 -55 -100.5 -101t-273 -72.5t-376.5 -26.5t-376.5 26.5t-273 72.5t-100.5 101zM0 700v300q0 14 12 33q71 -43 182 -72.5t228.5 -41 t191 -15.5t136.5 -4t136.5 4t191 15.5t228.5 41t182 72.5q12 -19 12 -33v-300q0 -55 -100.5 -101t-273 -72.5t-376.5 -26.5t-376.5 26.5t-273 72.5t-100.5 101zM0 1200v300q0 14 12 33q71 -43 182 -72.5t228.5 -41t191 -15.5t136.5 -4t136.5 4t191 15.5t228.5 41t182 72.5 q12 -19 12 -33v-300q0 -55 -100.5 -101t-273 -72.5t-376.5 -26.5t-376.5 26.5t-273 72.5t-100.5 101zM0 1700v300q0 54 100.5 100t273 73t376.5 27t376.5 -27t273 -73t100.5 -100v-300q0 -54 -100.5 -100t-273 -73t-376.5 -27t-376.5 27t-273 73t-100.5 100zM427 2050 q0 -27 94.5 -46t228.5 -19t228.5 19t94.5 46t-94.5 45.5t-228.5 18.5t-228.5 -18.5t-94.5 -45.5zM1700 2200q0 120 39 216.5t107.5 157.5t158.5 93.5t195 32.5q101 0 194 -42.5t160 -113.5t106.5 -166.5t39.5 -197.5q0 -135 -67 -245.5t-181.5 -172.5t-251.5 -62 q-105 0 -195 32.5t-158.5 93.5t-107.5 157.5t-39 216.5zM1900 2150q0 -21 15 -35.5t35 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 20 -14.5 35t-35.5 15h-500q-20 0 -35 -15t-15 -35v-100z" />
-<glyph unicode="&#xe144;" d="M0 200v300q0 14 12 33q71 -43 182 -72.5t228.5 -41t191 -15.5t136.5 -4t136.5 4t191 15.5t228.5 41t182 72.5q12 -19 12 -33v-300q0 -55 -100.5 -101t-273 -72.5t-376.5 -26.5t-376.5 26.5t-273 72.5t-100.5 101zM0 700v300q0 14 12 33q71 -43 182 -72.5t228.5 -41 t191 -15.5t136.5 -4t136.5 4t191 15.5t228.5 41t182 72.5q12 -19 12 -33v-300q0 -55 -100.5 -101t-273 -72.5t-376.5 -26.5t-376.5 26.5t-273 72.5t-100.5 101zM0 1200v300q0 14 12 33q71 -43 182 -72.5t228.5 -41t191 -15.5t136.5 -4t136.5 4t191 15.5t228.5 41t182 72.5 q12 -19 12 -33v-300q0 -55 -100.5 -101t-273 -72.5t-376.5 -26.5t-376.5 26.5t-273 72.5t-100.5 101zM0 1700v300q0 54 100.5 100t273 73t376.5 27t376.5 -27t273 -73t100.5 -100v-300q0 -54 -100.5 -100t-273 -73t-376.5 -27t-376.5 27t-273 73t-100.5 100zM427 2050 q0 -27 94.5 -46t228.5 -19t228.5 19t94.5 46t-94.5 45.5t-228.5 18.5t-228.5 -18.5t-94.5 -45.5zM1609 2205q0 134 66.5 248t181 180.5t248.5 66.5t248 -66.5t180.5 -180.5t66.5 -248q0 -135 -66.5 -249t-180.5 -180.5t-248 -66.5t-248.5 66.5t-181 180.5t-66.5 249z M1733 2205q0 -106 58 -199l512 512q-89 58 -198 58q-154 0 -263 -109t-109 -262zM1907 1891q92 -58 198 -58q154 0 262.5 109t108.5 263q0 106 -57 198z" />
-<glyph unicode="&#xe145;" d="M0 409v1491q0 41 29.5 70.5t70.5 29.5h133l35 105q14 39 52.5 67t79.5 28h500q41 0 79.5 -28t52.5 -67l35 -105h933q41 0 70.5 -29.5t29.5 -70.5v-300h-1550q-67 0 -98 -69zM37 93l526 1314q15 38 55.5 65.5t81.5 27.5h2200q41 0 59.5 -27.5t3.5 -65.5l-526 -1314 q-15 -38 -55.5 -65.5t-81.5 -27.5h-2200q-41 0 -59.5 27.5t-3.5 65.5z" />
-<glyph unicode="&#xe146;" d="M0 100v1400q0 41 29.5 70.5t70.5 29.5h1708q92 -145 247.5 -222.5t344.5 -77.5v-1200q0 -41 -29.5 -70.5t-70.5 -29.5h-2200q-41 0 -70.5 29.5t-29.5 70.5zM100 1700v200q0 41 29.5 70.5t70.5 29.5h133l35 105q14 39 52.5 67t79.5 28h500q41 0 79.5 -28t52.5 -67l35 -105 h533q0 -165 56 -300h-1656zM1900 2000q0 146 67.5 261t181 177t251.5 62q136 0 251 -67t182 -182t67 -251t-67 -251t-182 -182t-251 -67q-140 0 -252 57t-180 172t-68 271zM2100 1950q0 -21 15 -35.5t35 -14.5h150v-150q0 -21 15 -35.5t35 -14.5h100q21 0 35.5 14.5 t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5h-100q-20 0 -35 -14.5t-15 -35.5v-150h-150q-20 0 -35 -14.5t-15 -35.5v-100z" />
-<glyph unicode="&#xe147;" d="M0 100v1400q0 41 29.5 70.5t70.5 29.5h1708q92 -145 247.5 -222.5t344.5 -77.5v-1200q0 -41 -29.5 -70.5t-70.5 -29.5h-2200q-41 0 -70.5 29.5t-29.5 70.5zM100 1700v200q0 41 29.5 70.5t70.5 29.5h133l35 105q14 39 52.5 67t79.5 28h500q41 0 79.5 -28t52.5 -67l35 -105 h533q0 -165 56 -300h-1656zM1900 2000q0 120 39 216.5t107.5 157.5t158.5 93.5t195 32.5q101 0 194 -42.5t160 -113.5t106.5 -166.5t39.5 -197.5q0 -135 -67 -245.5t-181.5 -172.5t-251.5 -62q-105 0 -195 32.5t-158.5 93.5t-107.5 157.5t-39 216.5zM2100 1950 q0 -21 15 -35.5t35 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-20 0 -35 -14.5t-15 -35.5v-100z" />
-<glyph unicode="&#xe148;" d="M0 100v1400q0 41 29.5 70.5t70.5 29.5h1600h102q6 -84 68 -142t147 -58h383v-1300q0 -41 -29.5 -70.5t-70.5 -29.5h-2200q-41 0 -70.5 29.5t-29.5 70.5zM100 1700v200q0 41 29.5 70.5t70.5 29.5h133l35 105q14 39 52.5 67t79.5 28h500q41 0 79.5 -28t52.5 -67l35 -105 h633v-300h-1700zM2000 1616v566q0 6 5 12t12 6h83v255q0 56 43.5 100.5t98.5 44.5h313q55 0 100 -45t45 -100v-255h81q7 0 13 -6t6 -12v-566q0 -6 -6 -11t-13 -5h-764q-7 0 -12 5t-5 11zM2200 2200h400v255q0 25 -11 35t-36 10h-310q-25 0 -34 -9.5t-9 -35.5v-255z" />
-<glyph unicode="&#xe149;" d="M0 100v1400q0 41 29.5 70.5t70.5 29.5h1805q17 -86 86 -143t159 -57t159 57t86 143h5v-1500q0 -41 -29.5 -70.5t-70.5 -29.5h-2200q-41 0 -70.5 29.5t-29.5 70.5zM100 1700v200q0 41 29.5 70.5t70.5 29.5h133l35 105q14 39 52.5 67t79.5 28h500q41 0 79.5 -28t52.5 -67 l35 -105h733v-300h-1800zM2100 1650v850h550q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -13.5 -41t-32.5 -28l-354 -141l-100 -40v-250q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe150;" d="M0 100v1400q0 41 29.5 70.5t70.5 29.5h1708h146q84 -94 200 -147t246 -53v-1300q0 -41 -29.5 -70.5t-70.5 -29.5h-2200q-41 0 -70.5 29.5t-29.5 70.5zM100 1700v200q0 41 29.5 70.5t70.5 29.5h133l35 105q14 39 52.5 67t79.5 28h500q41 0 79.5 -28t52.5 -67l35 -105h633 q0 -160 81 -300h-1781zM2000 1938v120q0 10 6.5 26t13.5 16h187l-122 110q-7 6 -7 9t5 9l83 84q11 12 23 0l111 -120v186q0 8 15 15t25 7h120q10 0 25 -7t15 -15v-187l111 122q11 11 19 2l85 -82q10 -11 0 -23l-121 -110h186q7 0 13.5 -16t6.5 -26v-120q0 -10 -6.5 -24 t-13.5 -14h-186l122 -112q10 -11 1 -20l-82 -84q-12 -12 -24 0l-111 121v-187q0 -7 -14.5 -12.5t-25.5 -5.5h-120q-11 0 -25.5 5.5t-14.5 12.5v186l-111 -122q-9 -9 -18 -1l-85 83q-12 12 0 24l121 112h-187q-7 0 -13.5 14t-6.5 24z" />
-<glyph unicode="&#xe151;" d="M0 400v1000q0 166 117 283t283 117h1000q51 0 115 -19l-181 -181h-1034q-41 0 -70.5 -29.5t-29.5 -70.5v-1200q0 -41 29.5 -70.5t70.5 -29.5h1200q41 0 70.5 29.5t29.5 70.5v434l200 200v-534q0 -166 -117.5 -283t-282.5 -117h-1000q-166 0 -283 117t-117 283zM691 420 l163 417l279 -283l-413 -163q-20 -8 -28 0.5t-1 28.5zM941 930l910 910l289 -289l-910 -910zM1938 1927l144 145q16 15 37 15t36 -15l217 -217q15 -15 15 -36.5t-15 -36.5l-145 -144z" />
-<glyph unicode="&#xe152;" d="M0 400v1000q0 166 117 283t283 117h545q-190 -80 -336 -200h-309q-41 0 -70.5 -29.5t-29.5 -70.5v-1200q0 -41 29.5 -70.5t70.5 -29.5h1200q41 0 70.5 29.5t29.5 70.5v126l200 151v-177q0 -166 -117.5 -283t-282.5 -117h-1000q-166 0 -283 117t-117 283zM403 694 q2 144 34.5 270t84 219t125 172t149 132t164.5 96t163.5 67.5t154 42t128.5 24t94 10.5v43q0 1 0.5 3t0.5 4v372q0 20 11.5 26t28.5 -6l987 -739q16 -12 16 -29.5t-16 -30.5l-985 -740q-17 -13 -28.5 -7t-12.5 27v418q0 3 -2 9v41q-52 3 -121.5 0t-144.5 -4.5t-158 -14.5 t-163 -30t-158 -50t-144 -75.5t-120.5 -106.5t-87.5 -143z" />
-<glyph unicode="&#xe153;" d="M100 400v1000q0 166 117.5 283t282.5 117h1000q69 0 139 -26l-174 -174h-1065q-41 0 -70.5 -29.5t-29.5 -70.5v-1200q0 -41 29.5 -70.5t70.5 -29.5h1200q41 0 70.5 29.5t29.5 70.5v269l200 200v-369q0 -166 -117 -283t-283 -117h-1000q-165 0 -282.5 117t-117.5 283z M516 1008q0 21 14 36l234 233q14 15 35.5 15t36.5 -15l284 -284q15 -15 36 -15t36 15l793 793q15 15 36 15t36 -15l235 -231q15 -15 15 -36t-15 -36l-1100 -1101q-15 -14 -36 -14t-36 14l-590 590q-14 15 -14 36z" />
-<glyph unicode="&#xe154;" d="M100 400v1000q0 166 117.5 283t282.5 117h1000q166 0 283 -117t117 -283v-1000q0 -166 -117 -283t-283 -117h-1000q-165 0 -282.5 117t-117.5 283zM300 300q0 -41 29.5 -70.5t70.5 -29.5h1200q41 0 70.5 29.5t29.5 70.5v1200q0 41 -29.5 70.5t-70.5 29.5h-1200 q-41 0 -70.5 -29.5t-29.5 -70.5v-1200z" />
-<glyph unicode="&#xe155;" d="M0 900v1000q0 166 117.5 283t282.5 117h1000q166 0 283 -117t117 -283h-200v100q0 41 -29.5 70.5t-70.5 29.5h-1200q-41 0 -70.5 -29.5t-29.5 -70.5v-1200q0 -41 29.5 -70.5t70.5 -29.5h100v-200q-165 0 -282.5 117t-117.5 283zM500 400v1000q0 166 117.5 283t282.5 117 h1000q166 0 283 -117t117 -283v-1000q0 -166 -117 -283t-283 -117h-1000q-165 0 -282.5 117t-117.5 283zM700 300q0 -41 29.5 -70.5t70.5 -29.5h1200q41 0 70.5 29.5t29.5 70.5v1200q0 41 -29.5 70.5t-70.5 29.5h-1200q-41 0 -70.5 -29.5t-29.5 -70.5v-1200z" />
-<glyph unicode="&#xe156;" d="M100 150v900q0 21 14.5 35.5t35.5 14.5h900q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5zM100 1350v900q0 21 14.5 35.5t35.5 14.5h900q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-900 q-21 0 -35.5 14.5t-14.5 35.5zM1300 150v900q0 21 14.5 35.5t35.5 14.5h900q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5zM1300 1350v900q0 21 14.5 35.5t35.5 14.5h900q21 0 35.5 -14.5t14.5 -35.5v-900 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe157;" d="M100 150v500q0 21 14.5 35.5t35.5 14.5h500q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5zM100 950v500q0 21 14.5 35.5t35.5 14.5h500q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5zM100 1750v500q0 21 14.5 35.5t35.5 14.5h500q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5zM900 150v500q0 21 14.5 35.5t35.5 14.5h500q21 0 35.5 -14.5t14.5 -35.5v-500 q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5zM900 950v500q0 21 14.5 35.5t35.5 14.5h500q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5zM900 1750v500q0 21 14.5 35.5t35.5 14.5h500 q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5zM1700 150v500q0 21 14.5 35.5t35.5 14.5h500q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5zM1700 950v500 q0 21 14.5 35.5t35.5 14.5h500q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5zM1700 1750v500q0 20 14.5 35t35.5 15h500q21 0 35.5 -15t14.5 -35v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5 t-14.5 35.5z" />
-<glyph unicode="&#xe158;" d="M0 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 1050v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5zM0 1650v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM500 450v200q0 21 14.5 35.5t35.5 14.5h1800q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-1800q-21 0 -35.5 14.5t-14.5 35.5zM500 1050v200q0 21 14.5 35.5t35.5 14.5h1800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-1800q-21 0 -35.5 14.5t-14.5 35.5zM500 1650v200q0 21 14.5 35.5t35.5 14.5h1800 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-1800q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe159;" d="M0 450v200q0 21 14.5 35.5t35.5 14.5h2300q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-2300q-21 0 -35.5 14.5t-14.5 35.5zM0 1050v200q0 21 14.5 35.5t35.5 14.5h2300q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-2300 q-21 0 -35.5 14.5t-14.5 35.5zM0 1650v200q0 21 14.5 35.5t35.5 14.5h2300q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-2300q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe160;" d="M0 450v200q0 21 14.5 35.5t35.5 14.5h1013q-131 -137 -158 -300h-855q-21 0 -35.5 14.5t-14.5 35.5zM0 1050v200q0 21 14.5 35.5t35.5 14.5h1550v-300h-1550q-21 0 -35.5 14.5t-14.5 35.5zM0 1650v200q0 21 14.5 35.5t35.5 14.5h1550v-300h-1550q-21 0 -35.5 14.5 t-14.5 35.5zM1161 250q-29 87 9 181.5t131 172t219 118.5q37 11 89 19t107 10.5t84 -10.5v1598q0 25 18 43t43 18h178q25 0 43 -18t18 -43v-55q39 -25 122.5 -54.5t167 -58t168 -67t146.5 -98.5t81 -136q26 -96 11.5 -180t-46 -151t-78 -118.5t-85.5 -81.5t-68 -42 q-38 -14 -42 -6.5t10 23.5l14 17q6 9 15 24t28 60t28.5 88.5t4 101t-34.5 104.5q-27 45 -88 73.5t-121.5 37.5t-129.5 23.5t-103 32.5v-1415q0 -2 -1 -5.5t-1 -5.5q-12 -114 -113.5 -217.5t-256.5 -153.5q-132 -39 -248 -32t-203.5 61.5t-115.5 141.5z" />
-<glyph unicode="&#xe161;" d="M-100 437v1613q0 62 44 106t106 44h2300q62 0 106 -44t44 -106v-1450v-163q0 -65 -42.5 -101t-107.5 -36h-851q-2 0 0 -100q0 -36 10.5 -64.5t26.5 -46.5t39.5 -30.5t44.5 -18.5t47 -9t41.5 -3t33.5 1l19 1q21 0 21 -15t-21 -15h-1118q-14 0 -19.5 7.5t0 15t18.5 7.5 l18 -1q19 -1 34.5 -1t41 3t46 9t44 18.5t38.5 30.5t25.5 46.5t10.5 64.5v100h-850q-65 0 -107.5 36t-42.5 101zM100 800h2200v1200h-2200v-1200z" />
-<glyph unicode="&#xe162;" d="M-200 500v50q0 21 14.5 35.5t35.5 14.5h250v1200q0 41 29.5 70.5t70.5 29.5h2000q41 0 70.5 -29.5t29.5 -70.5v-1200h250q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14.5 -35.5t-35.5 -14.5l-50 -50h-2600l-50 50q-21 0 -35.5 14.5t-14.5 35.5zM300 600h1800v1100h-1800 v-1100z" />
-<glyph unicode="&#xe163;" d="M100 100v2300q0 82 59 141t141 59h1800q82 0 141 -59t59 -141v-2300q0 -82 -59 -141t-141 -59h-1800q-82 0 -141 59t-59 141zM400 200h1600v2100h-1600v-2100zM1083 50q0 -49 34 -83.5t83 -34.5t83.5 34.5t34.5 83.5t-34.5 83t-83.5 34t-83 -34t-34 -83z" />
-<glyph unicode="&#xe164;" d="M500 250v1900q0 103 73.5 176.5t176.5 73.5h900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-900q-103 0 -176.5 73.5t-73.5 176.5zM700 500h1000v1500h-1000v-1500zM1023 250q0 -74 51.5 -125.5t125.5 -51.5t125.5 51.5t51.5 125.5t-51.5 125.5 t-125.5 51.5t-125.5 -51.5t-51.5 -125.5z" />
-<glyph unicode="&#xe165;" d="M-200 250v1900q0 103 73.5 176.5t176.5 73.5h900q103 0 176.5 -73.5t73.5 -176.5v-266q-84 -7 -142 -68t-58 -145v329h-1000v-1500h1000v225q0 -83 58 -144t142 -69v-262q0 -104 -73 -177t-177 -73h-900q-104 0 -177 73t-73 177zM323 250q0 -74 51.5 -125.5t125.5 -51.5 t125.5 51.5t51.5 125.5t-51.5 125.5t-125.5 51.5t-125.5 -51.5t-51.5 -125.5zM700 1052v298q0 20 15 35t36 15h449v271q0 10 11 13.5t19 -3.5l561 -465q9 -7 8 -16.5t-10 -16.5l-557 -468q-9 -7 -20.5 -4t-11.5 14v275h-449q-21 0 -36 15.5t-15 36.5zM1300 250v277 q0 3 10.5 8.5t26.5 12.5t24 14l139 117v-179h1000v1500h-1000v-283q-200 144 -200 152v281q0 103 73.5 176.5t176.5 73.5h900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-900q-103 0 -176.5 73.5t-73.5 176.5zM1823 250q0 -74 51.5 -125.5t125.5 -51.5 t125.5 51.5t51.5 125.5t-51.5 125.5t-125.5 51.5t-125.5 -51.5t-51.5 -125.5z" />
-<glyph unicode="&#xe166;" d="M-200 250v1900q0 103 73.5 176.5t176.5 73.5h900q103 0 176.5 -73.5t73.5 -176.5v-550h-200v400h-1000v-1500h1000v300h200v-550q0 -104 -73 -177t-177 -73h-900q-104 0 -177 73t-73 177zM202 1199.5q-1 9.5 7 16.5l561 465q9 7 19.5 3.5t10.5 -13.5v-271h900v271 q0 10 10.5 13.5t19.5 -3.5l561 -465q8 -7 7 -16.5t-10 -16.5l-557 -468q-8 -7 -19.5 -4t-11.5 14v275h-900v-275q0 -11 -11 -14t-20 4l-557 468q-9 7 -10 16.5zM323 250q0 -74 51.5 -125.5t125.5 -51.5t125.5 51.5t51.5 125.5t-51.5 125.5t-125.5 51.5t-125.5 -51.5 t-51.5 -125.5zM1300 250v550h200v-300h1000v1500h-1000v-400h-200v550q0 103 73.5 176.5t176.5 73.5h900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-900q-103 0 -176.5 73.5t-73.5 176.5zM1823 250q0 -74 51.5 -125.5t125.5 -51.5t125.5 51.5 t51.5 125.5t-51.5 125.5t-125.5 51.5t-125.5 -51.5t-51.5 -125.5z" />
-<glyph unicode="&#xe167;" d="M500 237v1926q0 57 40 97t97 40h1127q56 0 96 -40t40 -97v-1926q0 -57 -40 -97t-96 -40h-1127q-57 0 -97 40t-40 97zM700 1500h1000v600h-1000v-600zM790 745q0 -170 120 -290t290 -120t290 120t120 290q0 169 -120 289t-290 120t-290 -120t-120 -289zM1041 745 q0 66 46.5 112.5t112.5 46.5t112.5 -46.5t46.5 -112.5t-46.5 -113t-112.5 -47t-112.5 47t-46.5 113z" />
-<glyph unicode="&#xe168;" d="M500 500v1300h1500v-1300h-1500zM760 1150q0 -203 143.5 -346.5t346.5 -143.5t346.5 143.5t143.5 346.5t-143.5 346.5t-346.5 143.5t-346.5 -143.5t-143.5 -346.5zM965 1150q0 118 83.5 201.5t201.5 83.5t201.5 -83.5t83.5 -201.5t-83.5 -201.5t-201.5 -83.5t-201.5 83.5 t-83.5 201.5z" />
-<glyph unicode="&#xe169;" d="M200 1950q0 186 132 318t318 132t318 -132t132 -318q0 -145 -83.5 -260t-216.5 -163v-327h-200v300q0 84 -31 176.5t-75 165t-88 133t-75 93.5l-31 32v-300q7 -4 19 -11t44 -32.5t57 -54.5t48.5 -76t28.5 -97q-132 48 -214.5 163t-82.5 258zM500 600v500h300v-500h-100 v-600h-100v600h-100zM1300 1650q0 186 132 318t318 132t318 -132t132 -318q0 -145 -83.5 -260t-216.5 -162v-328h-200v300q0 84 -31 176.5t-75 165t-88 133t-75 93.5l-31 32v-300q7 -4 19 -11t44 -32.5t57 -54.5t48 -76t28 -97q-131 48 -213.5 163t-82.5 258zM1600 300v500 h300v-500h-100v-300h-100v300h-100z" />
-<glyph unicode="&#xe170;" d="M400 200v2000q0 34 32 73t97 78t153 71t212 52t261 20q170 0 316.5 -30t237 -76t141 -95.5t50.5 -92.5v-2000q0 -82 -59 -141t-141 -59h-1100q-82 0 -141 59t-59 141zM600 200h300v200h-300v-200zM600 500h300v200h-300v-200zM600 800h300v200h-300v-200zM600 1200h1100 v1000h-1100v-1000zM1000 200h300v200h-300v-200zM1000 500h300v200h-300v-200zM1000 800h300v200h-300v-200zM1400 200h300v200h-300v-200zM1400 500h300v200h-300v-200zM1400 800h300v200h-300v-200z" />
-<glyph unicode="&#xe171;" d="M500 350v1700q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-774l1045 815q17 13 36 7t19 -26v-1742q0 -21 -19 -27t-36 7l-1045 819v-779q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe172;" d="M0 350v1700q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-774l1045 815q17 13 36 7t19 -26v-796l1045 815q17 13 36 7t19 -26v-1742q0 -21 -19 -27t-36 7l-1045 819v-799q0 -21 -19 -27t-36 7l-1045 819v-779q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe173;" d="M28.5 1199.5q-2.5 17.5 13.5 30.5l1103 861q17 13 36 7t19 -26v-796l1045 815q17 13 36 7t19 -26v-1742q0 -21 -19 -27t-36 7l-1045 819v-799q0 -21 -19 -27t-36 7l-1097 859q-17 13 -19.5 30.5z" />
-<glyph unicode="&#xe174;" d="M500 382v1636q0 21 13 26.5t29 -7.5l1545 -806q16 -13 15.5 -31t-16.5 -31l-1544 -807q-16 -12 -29 -6.5t-13 26.5z" />
-<glyph unicode="&#xe175;" d="M700 450v1500q0 21 14.5 35.5t35.5 14.5h300q21 0 35.5 -14.5t14.5 -35.5v-1500q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5zM1300 450v1500q0 21 14.5 35.5t35.5 14.5h300q21 0 35.5 -14.5t14.5 -35.5v-1500q0 -21 -14.5 -35.5t-35.5 -14.5h-300 q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe176;" d="M500 550v1300q0 21 14.5 35.5t35.5 14.5h1300q21 0 35.5 -14.5t14.5 -35.5v-1300q0 -21 -14.5 -35.5t-35.5 -14.5h-1300q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe177;" d="M100 330v1742q0 20 19 26t36 -7l1045 -815v2v794q0 20 19 26t36 -7l1103 -861q16 -13 13.5 -30.5t-19.5 -30.5l-1097 -859q-17 -13 -36 -7t-19 27v799l-1045 -819q-17 -13 -36 -7t-19 27z" />
-<glyph unicode="&#xe178;" d="M-100 330v1742q0 20 19 26t36 -7l1045 -815v796q0 20 19 26t36 -7l1045 -815v774q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -15t14.5 -35v-1700q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v779l-1045 -819q-17 -13 -36 -7t-19 27v799l-1045 -819 q-17 -13 -36 -7t-19 27z" />
-<glyph unicode="&#xe179;" d="M500 330v1742q0 20 19 26t36 -7l1045 -815v774q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -15t14.5 -35v-1700q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v779l-1045 -819q-17 -13 -36 -7t-19 27z" />
-<glyph unicode="&#xe180;" d="M300 450v200q0 20 14.5 35t35.5 15h1700q21 0 35.5 -15t14.5 -35v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-1700q-21 0 -35.5 14.5t-14.5 35.5zM303.5 926q-6.5 26 6.5 43l861 1110q13 16 30.5 15t30.5 -17l859 -1110q13 -17 7 -42t-26 -25h-1742q-20 0 -26.5 26z" />
-<glyph unicode="&#xe181;" d="M0 550v1300q0 62 44 106t106 44h1400q62 0 106 -44t44 -106v-563l662 530q16 14 27 9t11 -26v-1200q0 -21 -11 -26t-27 9l-662 530v-563q0 -62 -44 -106t-106 -44h-1400q-62 0 -106 44t-44 106z" />
-<glyph unicode="&#xe182;" d="M0 0v450q0 21 14.5 35.5t35.5 14.5h1101l-737 859q-12 15 -6.5 28t24.5 13h468v951q0 19 16 34t36 15h503q19 0 32 -14.5t13 -34.5v-951h476q19 0 24.5 -13t-6.5 -28l-737 -859h1089q21 0 37.5 -15t16.5 -35v-450h-2400zM2000 200h200v100h-200v-100z" />
-<glyph unicode="&#xe183;" d="M0 1050v398q0 20 14.5 35t35.5 15h340q20 0 46 10t41 23l486 456q15 14 26 9t11 -25v-1446q0 -20 -10.5 -25t-25.5 9l-481 457q-15 14 -40.5 24t-46.5 10h-346q-21 0 -35.5 14.5t-14.5 35.5zM1202 855q0 21 15 36l305 305l-305 305q-15 14 -15 35.5t15 35.5l108 108 q14 15 35.5 15t35.5 -15l305 -305l305 305q15 15 36 15t36 -15l107 -108q15 -15 15 -36t-15 -36l-304 -304l304 -305q15 -14 15 -35.5t-15 -36.5l-107 -107q-15 -15 -36.5 -15t-35.5 15l-305 304l-305 -304q-14 -15 -35.5 -15t-35.5 15l-108 107q-15 15 -15 36z" />
-<glyph unicode="&#xe184;" d="M0 1050v398q0 20 14.5 35t35.5 15h340q20 0 46 10t41 23l486 456q15 14 26 9t11 -25v-1446q0 -20 -10.5 -25t-25.5 9l-481 457q-15 14 -40.5 24t-46.5 10h-346q-21 0 -35.5 14.5t-14.5 35.5zM1160 1792l159 122q122 -148 189 -331t67 -383q0 -195 -63.5 -373t-180.5 -325 l-155 127q199 252 199 571q0 166 -56 317.5t-159 274.5z" />
-<glyph unicode="&#xe185;" d="M0 1050v398q0 20 14.5 35t35.5 15h340q20 0 46 10t41 23l486 456q15 14 26 9t11 -25v-1446q0 -20 -10.5 -25t-25.5 9l-481 457q-15 14 -40.5 24t-46.5 10h-346q-21 0 -35.5 14.5t-14.5 35.5zM1160 1792l159 122q122 -148 189 -331t67 -383q0 -195 -63.5 -373t-180.5 -325 l-155 127q199 252 199 571q0 166 -56 317.5t-159 274.5zM1477 2036l158 123q162 -201 251 -446.5t89 -512.5q0 -266 -87.5 -509.5t-247.5 -442.5l-154 127q138 174 213.5 384.5t75.5 440.5q0 234 -78 448t-220 388zM1793 2281l158 122q203 -252 313.5 -560t110.5 -643 q0 -336 -111 -644t-314 -561l-155 127q182 225 281 501t99 577q0 302 -99.5 578.5t-282.5 502.5z" />
-<glyph unicode="&#xe186;" d="M-100 1250q0 20 14.5 35t35.5 15h553q9 137 67 261.5t150.5 217t217 150.5t262.5 67v554q0 21 14.5 35.5t35.5 14.5t35.5 -14.5t14.5 -35.5v-554q184 -12 339.5 -106.5t251 -250t108.5 -339.5h301h250q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-551 q-11 -185 -106.5 -341.5t-251.5 -252t-341 -107.5v-549q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v549q-138 9 -263 67.5t-217.5 151.5t-150.5 218.5t-67 263.5h-552q-21 0 -35.5 14.5t-14.5 35.5zM602 1200q18 -240 188.5 -411t409.5 -189v500h100v-497v-4 q158 12 291 94.5t215 215.5t93 291h-499v100h499q-20 239 -190.5 408.5t-408.5 187.5v-496h-100v496q-238 -19 -408 -188.5t-189 -407.5h497v-100h-498z" />
-<glyph unicode="&#xe187;" d="M21 1200q0 21 14 35l430 430q14 14 24.5 9.5t10.5 -24.5v-250h500v500h-250q-20 0 -24.5 10.5t9.5 24.5l430 430q14 14 35 14t35 -14l428 -428q15 -15 10.5 -25.5t-25.5 -11.5h-248v-500h500v250q0 20 10.5 24.5t24.5 -9.5l430 -430q14 -14 14 -35t-14 -35l-430 -430 q-14 -14 -24.5 -10t-10.5 25v250h-500v-500h250q21 0 25 -10.5t-10 -24.5l-430 -430q-14 -14 -35 -14t-35 14l-430 430q-14 14 -9.5 24.5t24.5 10.5h250v500h-500v-250q0 -21 -10.5 -25t-24.5 10l-430 430q-14 14 -14 35z" />
-<glyph unicode="&#xe188;" d="M110 1189q0 119 85 203.5t204 84.5t204 -84.5t85 -203.5q0 -120 -85 -204.5t-204 -84.5t-204 84.5t-85 204.5zM908 1189q0 119 85 203.5t204 84.5t203.5 -84.5t84.5 -203.5q0 -120 -84.5 -204.5t-203.5 -84.5t-204 84.5t-85 204.5zM1706 1189q0 119 85 203.5t204 84.5 t203.5 -84.5t84.5 -203.5q0 -120 -84.5 -204.5t-203.5 -84.5t-204 84.5t-85 204.5z" />
-<glyph unicode="&#xe189;" d="M202 1200q0 45 5 100h291q-8 -53 -8 -100t8 -100h-291q-5 55 -5 100zM428 569l205 205q61 -80 141 -141l-205 -205q-81 67 -141 141zM428 1831q60 74 141 141l205 -205q-80 -61 -141 -141zM801 1200q0 165 117 282t282 117t282 -117t117 -282t-117 -282t-282 -117 t-282 117t-117 282zM1005 1200q0 -81 57 -138t138 -57t138 57t57 138t-57 138t-138 57t-138 -57t-57 -138zM1100 207v291q53 -8 100 -8t100 8v-291q-55 -5 -100 -5t-100 5zM1100 1902v291q55 5 100 5t100 -5v-291q-53 8 -100 8t-100 -8zM1626 633q80 61 141 141l205 -205 q-63 -78 -141 -141zM1626 1767l205 205q78 -63 141 -141l-205 -205q-61 80 -141 141zM1902 1100q8 53 8 100t-8 100h291q5 -55 5 -100t-5 -100h-291z" />
-<glyph unicode="&#xe190;" d="M2 1200q0 45 5 100h374q-6 -50 -6 -100t6 -100h-374q-5 55 -5 100zM286 427l265 265q61 -80 141 -141l-265 -265q-77 64 -141 141zM286 1973q64 77 141 141l265 -265q-76 -59 -141 -141zM600 1200q0 163 80.5 301t218.5 218.5t301 80.5t301 -80.5t218.5 -218.5t80.5 -301 t-80.5 -301t-218.5 -218.5t-301 -80.5t-301 80.5t-218.5 218.5t-80.5 301zM809 1200q0 -162 114.5 -276.5t276.5 -114.5t276.5 114.5t114.5 276.5t-114.5 276.5t-276.5 114.5t-276.5 -114.5t-114.5 -276.5zM1100 7v374q58 -7 100 -7t100 7v-374q-66 -6 -100 -6t-100 6z M1100 2019v374q55 5 100 5t100 -5v-374q-50 6 -100 6t-100 -6zM1708 551q80 61 141 141l265 -265q-64 -77 -141 -141zM1708 1849l265 265q77 -64 141 -141l-265 -265q-65 82 -141 141zM2019 1100q7 58 7 100t-7 100h374q5 -55 5 -100t-5 -100h-374z" />
-<glyph unicode="&#xe191;" d="M-25 1200q0 167 44 325.5t123 293t192 247.5t247.5 192t293.5 123t325 44q249 0 476 -97t391 -261t261 -391t97 -476t-97 -476t-261 -391t-391 -261t-476 -97q-166 0 -325 44t-293.5 123t-247.5 192t-192 247.5t-123 293t-44 325.5zM491 1048q0 -21 15 -35.5t36 -14.5 h456v-462q0 -21 14.5 -36t35.5 -15h304q21 0 36 15t15 36v462h455q21 0 36 14.5t15 35.5v304q0 21 -15 35.5t-36 14.5h-455v456q0 21 -15 36t-36 15h-304q-21 0 -35.5 -15t-14.5 -36v-456h-456q-21 0 -36 -14.5t-15 -35.5v-304z" />
-<glyph unicode="&#xe192;" d="M-25 1200q0 167 44 325.5t123 293t192 247.5t247.5 192t293.5 123t325 44q249 0 476 -97t391 -261t261 -391t97 -476t-97 -476t-261 -391t-391 -261t-476 -97q-166 0 -325 44t-293.5 123t-247.5 192t-192 247.5t-123 293t-44 325.5zM600 1050q0 -21 14.5 -35.5 t35.5 -14.5h1100q21 0 35.5 14.5t14.5 35.5v300q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-300z" />
-<glyph unicode="&#xe193;" d="M-26 1200q0 232 92 461t268 405t405 268t461 92t461 -92t405 -268t268 -405t92 -461t-92 -461t-268 -405t-405 -268t-461 -92t-461 92t-405 268t-268 405t-92 461zM620 882q0 -21 14 -36l213 -212q14 -14 35 -14t35 14l283 283l283 -283q14 -14 35 -14t36 14l212 212 q14 15 14 36t-14 35l-283 283l283 283q14 14 14 35t-14 35l-212 213q-15 14 -36 14t-35 -14l-283 -283l-283 283q-14 14 -35 14t-35 -14l-213 -213q-14 -14 -14 -35t14 -35l283 -283l-283 -283q-14 -14 -14 -35z" />
-<glyph unicode="&#xe194;" d="M-26 1200q0 232 92 461t268 405t405 268t461 92t461 -92t405 -268t268 -405t92 -461t-92 -461t-268 -405t-405 -268t-461 -92t-461 92t-405 268t-268 405t-92 461zM482 1189.5q0 -13.5 10 -22.5l516 -517q10 -10 23.5 -10t23.5 10l851 851q10 10 10 23.5t-10 23.5 l-215 211q-10 10 -23.5 10t-23.5 -10l-589 -589q-10 -10 -23.5 -10t-22.5 10l-257 256q-10 10 -23.5 10t-22.5 -10l-214 -213q-10 -10 -10 -23.5z" />
-<glyph unicode="&#xe195;" d="M-25 1200q0 167 44 325.5t123 293t192 247.5t247.5 192t293.5 123t325 44q249 0 476 -97t391 -261t261 -391t97 -476t-97 -476t-261 -391t-391 -261t-476 -97q-166 0 -325 44t-293.5 123t-247.5 192t-192 247.5t-123 293t-44 325.5zM719 1476q0 -11 7 -18q6 -8 18 -8h269 q23 0 25 23q5 74 47 112t118 38q54 0 88 -32t34 -82q0 -28 -13 -54.5t-34 -46.5t-31 -28t-20 -15q-177 -129 -177 -288v-102q0 -5 10 -15t15 -10h256q10 0 17.5 7t7.5 17q2 94 29 145t100 98q49 31 74 49t50 43t35 52t16 64.5t6 91.5q0 96 -40.5 172t-108 122t-148 69.5 t-166.5 23.5q-220 0 -346.5 -112t-137.5 -316zM1000 450q0 -21 14.5 -35.5t35.5 -14.5h305q20 0 35 14.5t15 35.5v300q0 21 -15 35.5t-35 14.5h-305q-21 0 -35.5 -14.5t-14.5 -35.5v-300z" />
-<glyph unicode="&#xe196;" d="M-25 1200q0 167 44 325.5t123 293t192 247.5t247.5 192t293.5 123t325 44q249 0 476 -97t391 -261t261 -391t97 -476t-97 -476t-261 -391t-391 -261t-476 -97q-166 0 -325 44t-293.5 123t-247.5 192t-192 247.5t-123 293t-44 325.5zM900 550q0 -21 14.5 -35.5t35.5 -14.5 h600q21 0 35.5 14.5t14.5 35.5v200q0 20 -14.5 35t-35.5 15h-150v650q0 21 -14.5 35.5t-35.5 14.5h-400q-21 0 -35.5 -14.5t-14.5 -35.5v-200q0 -21 14.5 -35.5t35.5 -14.5h150v-400h-150q-21 0 -35.5 -15t-14.5 -35v-200zM1100 1650q0 -21 14.5 -35.5t35.5 -14.5h200 q21 0 35.5 14.5t14.5 35.5v200q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-200z" />
-<glyph unicode="&#xe197;" d="M-25 1200q0 167 44 325.5t123 293t192 247.5t247.5 192t293.5 123t325 44q249 0 476 -97t391 -261t261 -391t97 -476t-97 -476t-261 -391t-391 -261t-476 -97q-166 0 -325 44t-293.5 123t-247.5 192t-192 247.5t-123 293t-44 325.5zM1000 450q0 -21 14.5 -35.5 t35.5 -14.5h300q21 0 35.5 14.5t14.5 35.5v300q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-300zM1000 1550q0 -58 10 -112l92 -464q4 -23 22.5 -48.5t37.5 -25.5h78q19 0 37.5 25.5t22.5 48.5l90 477q10 45 10 99v400q0 21 -14.5 35.5t-35.5 14.5 h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-400z" />
-<glyph unicode="&#xe198;" d="M-25 1200q0 166 44 325t123 293t192.5 247.5t247.5 192.5t293 123t325 44t325 -44t293.5 -123t247.5 -192.5t192 -247.5t123 -293t44 -325t-44 -325t-123 -293.5t-192 -247.5t-247.5 -192t-293.5 -123t-325 -44t-325 44t-293 123t-247.5 192t-192.5 247.5t-123 293.5 t-44 325zM300 1200q0 -183 71.5 -349.5t192 -287t287 -192t349.5 -71.5t349.5 71.5t287 192t192 287t71.5 349.5t-71.5 349.5t-192 287t-287 192t-349.5 71.5t-349.5 -71.5t-287 -192t-192 -287t-71.5 -349.5zM621 1519.5q0 20.5 15 35.5l209 209q14 15 35 15t36 -15 l284 -284l285 284q14 14 35 14t35 -14l210 -209q14 -15 14 -36t-14 -35l-284 -284l283 -284q15 -15 15 -36t-15 -35l-209 -209q-14 -15 -35 -15t-36 15l-284 284l-284 -285q-14 -14 -35 -14t-36 14l-209 210q-14 14 -14 35t14 35l284 285l-284 284q-15 15 -15 35.5z" />
-<glyph unicode="&#xe199;" d="M-25 1200q0 166 44 325t123 293t192.5 247.5t247.5 192.5t293 123t325 44t325 -44t293.5 -123t247.5 -192.5t192 -247.5t123 -293t44 -325t-44 -325t-123 -293.5t-192 -247.5t-247.5 -192t-293.5 -123t-325 -44t-325 44t-293 123t-247.5 192t-192.5 247.5t-123 293.5 t-44 325zM300 1200q0 -183 71.5 -349.5t192 -287t287 -192t349.5 -71.5t349.5 71.5t287 192t192 287t71.5 349.5t-71.5 349.5t-192 287t-287 192t-349.5 71.5t-349.5 -71.5t-287 -192t-192 -287t-71.5 -349.5zM582 1089.5q0 13.5 10 23.5l214 213q9 10 22.5 10t23.5 -10 l157 -156q9 -10 22.5 -10t23.5 10l490 489q9 10 22.5 10t23.5 -10l215 -211q10 -10 10 -23.5t-10 -23.5l-751 -751q-10 -10 -23.5 -10t-23.5 10l-213 213q-6 7 -22.5 24t-23.5 23l-157 157q-10 9 -10 22.5z" />
-<glyph unicode="&#xe200;" d="M-25 1200q0 166 44 325t123 293t192.5 247.5t247.5 192.5t293 123t325 44t325 -44t293.5 -123t247.5 -192.5t192 -247.5t123 -293t44 -325t-44 -325t-123 -293.5t-192 -247.5t-247.5 -192t-293.5 -123t-325 -44t-325 44t-293 123t-247.5 192t-192.5 247.5t-123 293.5 t-44 325zM300 1200q0 -259 140 -480l1240 1240q-221 140 -480 140q-183 0 -349.5 -71.5t-287 -192t-192 -287t-71.5 -349.5zM720 440q221 -140 480 -140q183 0 349.5 71.5t287 192t192 287t71.5 349.5q0 259 -140 480z" />
-<glyph unicode="&#xe201;" d="M-25 1200q0 166 44 325t123 293t192.5 247.5t247.5 192.5t293 123t325 44t325 -44t293.5 -123t247.5 -192.5t192 -247.5t123 -293t44 -325t-44 -325t-123 -293.5t-192 -247.5t-247.5 -192t-293.5 -123t-325 -44t-325 44t-293 123t-247.5 192t-192.5 247.5t-123 293.5 t-44 325zM300 1200q0 -183 71.5 -349.5t192 -287t287 -192t349.5 -71.5t349.5 71.5t287 192t192 287t71.5 349.5t-71.5 349.5t-192 287t-287 192t-349.5 71.5t-349.5 -71.5t-287 -192t-192 -287t-71.5 -349.5zM605 1284q4 16 19 16h276v447q0 20 14.5 35t35.5 15h500 q21 0 35.5 -15t14.5 -35v-447h269q14 0 18 -15t-5 -26l-564 -743q-9 -11 -22 -10t-21 13l-565 738q-9 11 -5 27z" />
-<glyph unicode="&#xe202;" d="M-25 1200q0 166 44 325t123 293t192.5 247.5t247.5 192.5t293 123t325 44t325 -44t293.5 -123t247.5 -192.5t192 -247.5t123 -293t44 -325t-44 -325t-123 -293.5t-192 -247.5t-247.5 -192t-293.5 -123t-325 -44t-325 44t-293 123t-247.5 192t-192.5 247.5t-123 293.5 t-44 325zM300 1200q0 -183 71.5 -349.5t192 -287t287 -192t349.5 -71.5t349.5 71.5t287 192t192 287t71.5 349.5t-71.5 349.5t-192 287t-287 192t-349.5 71.5t-349.5 -71.5t-287 -192t-192 -287t-71.5 -349.5zM605 1116q-4 16 5 27l565 738q8 12 21 13t22 -10l564 -743 q9 -11 5 -26t-18 -15h-269v-447q0 -20 -14.5 -35t-35.5 -15h-500q-21 0 -35.5 15t-14.5 35v447h-276q-15 0 -19 16z" />
-<glyph unicode="&#xe203;" d="M52 1778q-10 48 20 85q31 37 78 37h1926l77 323q8 34 35.5 55.5t61.5 21.5h250q41 0 70.5 -29.5t29.5 -70.5t-29.5 -70.5t-70.5 -29.5h-171l-432 -1800q-8 -39 -35.5 -69.5t-61.5 -30.5h-109q9 -29 9 -50q0 -62 -44 -106t-106 -44t-106 44t-44 106q0 21 9 50h-518 q9 -29 9 -50q0 -62 -44 -106t-106 -44t-106 44t-44 106q0 21 9 50h-109q-41 0 -70.5 29.5t-29.5 70.5t29.5 70.5t70.5 29.5h1221l95 400h-1466q-35 0 -62.5 22t-35.5 56zM275 1700l22 -100h103v100h-125zM319 1500l22 -100h59v100h-81zM364 1300l22 -100h14v100h-36z M500 1000h100v100h-100v-100zM500 1200h100v100h-100v-100zM500 1400h100v100h-100v-100zM500 1600h100v100h-100v-100zM700 1000h100v100h-100v-100zM700 1200h100v100h-100v-100zM700 1400h100v100h-100v-100zM700 1600h100v100h-100v-100zM900 1000h100v100h-100v-100z M900 1200h100v100h-100v-100zM900 1400h100v100h-100v-100zM900 1600h100v100h-100v-100zM1100 1000h100v100h-100v-100zM1100 1200h100v100h-100v-100zM1100 1400h100v100h-100v-100zM1100 1600h100v100h-100v-100zM1300 1000h100v100h-100v-100zM1300 1200h100v100h-100 v-100zM1300 1400h100v100h-100v-100zM1300 1600h100v100h-100v-100zM1500 1000h100v100h-100v-100zM1500 1200h100v100h-100v-100zM1500 1400h100v100h-100v-100zM1500 1600h100v100h-100v-100zM1700 1000h100v100h-100v-100zM1700 1200h100v100h-100v-100zM1700 1400h100 v100h-100v-100zM1700 1600h100v100h-100v-100zM1900 1200h10l24 100h-34v-100zM1900 1400h58l23 100h-81v-100zM1900 1600h103l22 100h-125v-100z" />
-<glyph unicode="&#xe204;" d="M100 59v1382q0 25 19.5 42t46.5 17h134v500q0 113 50.5 223.5t132 192.5t191 133t221.5 51h510q112 0 221.5 -51t191 -133t132 -192.5t50.5 -223.5v-500h134q27 0 46.5 -17t19.5 -42v-1382q0 -25 -19.5 -42t-46.5 -17h-1968q-27 0 -46.5 17t-19.5 42zM700 1500h900v500 q0 104 -48.5 152t-151.5 48h-500q-103 0 -151.5 -48t-48.5 -152v-500zM950 929q0 -54 27 -99.5t73 -72.5v-257q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v257q46 27 73 72.5t27 99.5q0 83 -58.5 141.5t-141.5 58.5t-141.5 -58.5t-58.5 -141.5z" />
-<glyph unicode="&#xe205;" d="M100 59v1382q0 25 19.5 42t46.5 17h1434v500q0 104 -48.5 152t-151.5 48h-500q-103 0 -151.5 -48t-48.5 -152v-100h-400v100q0 113 50.5 223.5t132 192.5t191 133t221.5 51h510q112 0 221.5 -51t191 -133t132 -192.5t50.5 -223.5v-500h134q27 0 46.5 -17t19.5 -42v-1382 q0 -25 -19.5 -42t-46.5 -17h-1968q-27 0 -46.5 17t-19.5 42zM950 929q0 -54 27 -99.5t73 -72.5v-257q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v257q46 27 73 72.5t27 99.5q0 83 -58.5 141.5t-141.5 58.5t-141.5 -58.5t-58.5 -141.5z" />
-<glyph unicode="&#xe206;" d="M702 1348l335 1004q7 20 26 34t40 14h660q21 0 29 -13t0 -32l-408 -713q-9 -19 -1 -32t29 -13l253 3q20 0 28.5 -13t-1.5 -31l-242 -614q-10 -19 -1.5 -32t29.5 -13h149q21 0 26.5 -11.5t-7.5 -28.5l-637 -843q-13 -17 -19 -14t-2 23l132 627q4 20 -8 34.5t-32 14.5h-148 q-20 0 -31 14.5t-5 33.5l130 505q5 20 -5.5 34t-30.5 14h-253q-21 0 -31 14t-4 34z" />
-<glyph unicode="&#xe207;" d="M-17 1076.5q0 20.5 14 35.5l325 325q14 14 35 14t35 -14l391 -391q15 -15 35.5 -15t35.5 15l1049 1049q14 14 35.5 14.5t35.5 -14.5l327 -322q15 -14 15 -35t-15 -35l-1447 -1448q-15 -14 -36 -14t-35 14l-325 325l-70 70l-391 391q-14 15 -14 35.5z" />
-<glyph unicode="&#xe208;" d="M300 595q0 23 17 40l565 565l-565 565q-17 17 -17 41t17 40l238 238q17 16 40 16t40 -16l566 -565l565 565q16 16 40 16t40 -16l238 -238q16 -16 16 -40t-16 -41l-564 -565l564 -564q16 -17 16 -40.5t-16 -40.5l-238 -238q-16 -17 -40 -17t-41 17l-564 564l-565 -565 q-16 -16 -40 -16t-41 16l-238 239q-17 17 -17 40z" />
-<glyph unicode="&#xe209;" d="M-50 1799q0 36 22 64q31 37 78 37h349q-26 -38 -26 -79q0 -34 15 -61q29 -60 129 -60h83v-100h100v-100h-100v-100h700v300h100v-100h100v100q10 1 25.5 4t47 18.5t42.5 38.5q15 30 15 57q0 38 -32 82h378l77 323q8 34 35.5 55.5t61.5 21.5h250q41 0 70.5 -29.5 t29.5 -70.5t-29.5 -70.5t-70.5 -29.5h-171l-432 -1800q-8 -39 -35.5 -69.5t-61.5 -30.5h-109q9 -24 9 -50q0 -62 -44 -106t-106 -44t-106 44t-44 106q0 21 9 50h-518q9 -24 9 -50q0 -62 -44 -106t-106 -44t-106 44t-44 106q0 21 9 50h-109q-41 0 -70.5 29.5t-29.5 70.5 t29.5 70.5t70.5 29.5h1221l95 400h-1466q-35 0 -62.5 21.5t-35.5 56.5l-200 900q-2 14 -2 21zM175 1700l22 -100h103v100h-125zM219 1500l22 -100h59v100h-81zM264 1300l22 -100h14v100h-36zM400 1000h100v100h-100v-100zM400 1200h100v100h-100v-100zM400 1400h100v100 h-100v-100zM400 1600h100v100h-100v-100zM502 1813q0 5 5 12l476 568q6 8 15 8q11 0 18 -8l480 -567q4 -5 4 -12q0 -14 -15 -14h-285v-250q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v250h-283q-15 0 -15 13zM600 1000h100v100h-100v-100zM600 1200 h100v100h-100v-100zM800 1000h100v100h-100v-100zM800 1200h100v100h-100v-100zM1000 1000h100v100h-100v-100zM1000 1200h100v100h-100v-100zM1200 1000h100v100h-100v-100zM1200 1200h100v100h-100v-100zM1400 1000h100v100h-100v-100zM1400 1200h100v100h-100v-100z M1400 1400h100v100h-100v-100zM1600 1000h100v100h-100v-100zM1600 1200h100v100h-100v-100zM1600 1400h100v100h-100v-100zM1600 1600h100v100h-100v-100zM1800 1200h10l24 100h-34v-100zM1800 1400h58l15 63l8 37h-81v-100zM1800 1600h103l22 100h-125v-100z" />
-<glyph unicode="&#xe210;" d="M-50 1799q0 36 22 64q31 37 78 37h376l174 -206v-94h79l121 -144v-56h47l5 -6q59 -76 153 -76q43 0 81.5 20t63.5 53l50 61v-52h100v100h-60l160 194v-94h100v100h-95l165 200h406l77 323q7 34 34.5 55.5t62.5 21.5h250q41 0 70.5 -29.5t29.5 -70.5t-29.5 -70.5 t-70.5 -29.5h-171l-432 -1800q-8 -39 -35.5 -69.5t-61.5 -30.5h-109q9 -29 9 -50q0 -62 -44 -106t-106 -44t-106 44t-44 106q0 21 9 50h-518q9 -29 9 -50q0 -62 -44 -106t-106 -44t-106 44t-44 106q0 21 9 50h-109q-41 0 -70.5 29.5t-29.5 70.5t29.5 70.5t70.5 29.5h1221 l95 400h-1466q-35 0 -62.5 22t-35.5 56l-200 900q-2 14 -2 21zM175 1700l22 -100h103v100h-125zM219 1500l22 -100h59v100h-81zM264 1300l22 -100h14v100h-36zM400 1000h100v100h-100v-100zM400 1200h100v100h-100v-100zM400 1400h100v100h-100v-100zM400 1600h100v100h-100 v-100zM502 2082q0 18 15 18h283v250q0 20 14.5 35t35.5 15h300q21 0 35.5 -15t14.5 -35v-250h285q15 0 15 -17q0 -9 -5 -14l-476 -573q-6 -8 -14 -8q-11 0 -19 11l-479 569q-5 7 -5 14zM600 1000h100v100h-100v-100zM600 1200h100v100h-100v-100zM600 1400h100v100h-100 v-100zM800 1000h100v100h-100v-100zM800 1200h100v100h-100v-100zM1000 1000h100v100h-100v-100zM1000 1200h100v100h-100v-100zM1200 1000h100v100h-100v-100zM1200 1200h100v100h-100v-100zM1400 1000h100v100h-100v-100zM1400 1200h100v100h-100v-100zM1400 1400h100v100 h-100v-100zM1600 1000h100v100h-100v-100zM1600 1200h100v100h-100v-100zM1600 1400h100v100h-100v-100zM1600 1600h100v100h-100v-100zM1800 1200h10l24 100h-34v-100zM1800 1400h58l15 63l8 37h-81v-100zM1800 1600h103l22 100h-125v-100z" />
-<glyph unicode="&#xe211;" d="M201 1200q0 18 16 31l1043 806q16 13 28 7.5t12 -26.5v-518h849q21 0 36 -15.5t15 -35.5v-498q0 -20 -15 -35.5t-36 -15.5h-849v-518q0 -21 -12 -26.5t-28 6.5l-1043 807q-16 13 -16 31z" />
-<glyph unicode="&#xe212;" d="M200 951v498q0 20 15.5 35.5t35.5 15.5h849v518q0 21 12 26.5t28 -7.5l1043 -806q17 -13 17 -31t-17 -31l-1042 -807q-17 -12 -29 -6.5t-12 26.5v518h-849q-20 0 -35.5 15.5t-15.5 35.5z" />
-<glyph unicode="&#xe213;" d="M356 1288q6 12 26 12h518v849q0 20 15.5 35.5t35.5 15.5h498q20 0 35.5 -15.5t15.5 -35.5v-849h518q21 0 26.5 -12t-6.5 -28l-807 -1043q-13 -17 -31 -17t-30 17l-807 1042q-13 17 -7 29z" />
-<glyph unicode="&#xe214;" d="M356 1112q-6 12 7 28l806 1043q13 17 31 17t31 -17l806 -1042q13 -17 7 -29t-26 -12h-518v-849q0 -20 -15.5 -35.5t-35.5 -15.5h-498q-20 0 -35.5 15.5t-15.5 35.5v849h-518q-20 0 -26 12z" />
-<glyph unicode="&#xe215;" d="M9 293q0 14 10 25l413 412l-252 252q-10 11 -7 19t17 10l899 115q14 2 22.5 -7t7.5 -23l-115 -899q-1 -14 -10 -17t-19 7l-252 252l-412 -413q-11 -10 -25.5 -10t-24.5 10l-242 242q-10 11 -10 25zM1281 1304l115 899q2 14 10.5 17t18.5 -7l252 -252l412 413 q11 10 25.5 10t24.5 -10l242 -242q10 -10 10 -25t-10 -25l-413 -413l252 -252q10 -10 7 -18t-17 -10l-899 -115q-14 -2 -22.5 7t-7.5 23z" />
-<glyph unicode="&#xe216;" d="M10 46q-2 -14 6.5 -22.5t22.5 -6.5l899 114q14 2 17 10.5t-7 18.5l-252 252l413 413q10 10 10 24.5t-10 24.5l-242 242q-10 10 -24.5 10t-24.5 -10l-413 -412l-252 251q-10 10 -18.5 7t-10.5 -17zM1281.5 1550.5q0.5 14.5 10.5 24.5l412 413l-252 252q-10 10 -7 18.5 t17 10.5l899 114q14 2 23 -7t7 -23l-114 -898q-2 -14 -10.5 -17t-18.5 7l-252 251l-413 -412q-10 -10 -24.5 -10t-25.5 10l-242 242q-10 10 -9.5 24.5z" />
-<glyph unicode="&#xe217;" d="M-25 1206q0 248 96.5 473.5t260 389t389 260t473.5 96.5t473.5 -96.5t389 -260t260 -389t96.5 -473.5t-96.5 -473.5t-260 -389t-389 -260t-473.5 -96.5t-473.5 96.5t-389 260t-260 389t-96.5 473.5zM506 1206.5q0 -18.5 16 -32.5l640 -533q16 -13 27 -7.5t11 25.5v341 h550q21 0 35.5 14.5t14.5 35.5v300q0 21 -14.5 35.5t-35.5 14.5h-550v353q0 21 -11 26.5t-27 -8.5l-640 -533q-16 -13 -16 -31.5z" />
-<glyph unicode="&#xe218;" d="M-25 1206q0 248 96.5 473.5t260 389t389 260t473.5 96.5t473.5 -96.5t389 -260t260 -389t96.5 -473.5t-96.5 -473.5t-260 -389t-389 -260t-473.5 -96.5t-473.5 96.5t-389 260t-260 389t-96.5 473.5zM600 1050q0 -21 14.5 -35.5t35.5 -14.5h550v-341q0 -20 11 -25.5 t28 7.5l639 533q16 14 16 32.5t-16 31.5l-639 533q-17 13 -28 8t-11 -26v-353h-550q-21 0 -35.5 -14.5t-14.5 -35.5v-300z" />
-<glyph unicode="&#xe219;" d="M75 1206q0 248 96.5 473.5t260 389t389 260t473.5 96.5t473.5 -96.5t389 -260t260 -389t96.5 -473.5t-96.5 -473.5t-260 -389t-389 -260t-473.5 -96.5t-473.5 96.5t-389 260t-260 389t-96.5 473.5zM721 1211q5 -11 26 -11h353v-550q0 -21 14.5 -35.5t35.5 -14.5h300 q21 0 35.5 14.5t14.5 35.5v550h350q21 0 26 11t-8 27l-535 624q-13 16 -33 16t-33 -16l-537 -624q-14 -16 -9 -27z" />
-<glyph unicode="&#xe220;" d="M-25 1206q0 248 96.5 473.5t260 389t389 260t473.5 96.5t473.5 -96.5t389 -260t260 -389t96.5 -473.5t-96.5 -473.5t-260 -389t-389 -260t-473.5 -96.5t-473.5 96.5t-389 260t-260 389t-96.5 473.5zM620.5 1189q-5.5 -11 8.5 -27l538 -624q13 -16 33 -16t33 16l535 624 q13 16 8 27t-26 11h-350v550q0 20 -14.5 35t-35.5 15h-300q-21 0 -35.5 -15t-14.5 -35v-550h-353q-21 0 -26.5 -11z" />
-<glyph unicode="&#xe221;" d="M-25 1200q0 166 44 325t123 293t192.5 247.5t247.5 192.5t293 123t325 44t325 -44t293.5 -123t247.5 -192.5t192 -247.5t123 -293t44 -325t-44 -325t-123 -293.5t-192 -247.5t-247.5 -192t-293.5 -123t-325 -44t-325 44t-293 123t-247.5 192t-192.5 247.5t-123 293.5 t-44 325zM300 1200q0 -183 71.5 -349.5t192 -287t287 -192t349.5 -71.5t349.5 71.5t287 192t192 287t71.5 349.5t-71.5 349.5t-192 287t-287 192t-349.5 71.5t-349.5 -71.5t-287 -192t-192 -287t-71.5 -349.5zM900 739v922q0 11 6.5 14.5t14.5 -3.5l774 -455q8 -7 7.5 -17 t-8.5 -17l-773 -455q-8 -7 -14.5 -3.5t-6.5 14.5z" />
-<glyph unicode="&#xe222;" d="M74 1200.5q0 17.5 16 29.5l1070 789q16 12 28 6t12 -26v-452q47 -4 98.5 -11t135 -25.5t162 -44.5t171.5 -71t172 -102t155.5 -140.5t131 -182.5t88.5 -233t36 -287q-35 84 -92.5 152t-126.5 113t-151 80.5t-165.5 53.5t-170 31.5t-166 15.5t-152 4.5t-128.5 -0.5v-500 q0 -21 -12 -27t-28 7l-1068 791q-16 12 -16 29.5z" />
-<glyph unicode="&#xe223;" d="M50 450q2 153 36 287t88.5 233t131 182.5t155.5 140.5t172 102t171.5 71t162 44.5t135 25.5t98.5 11v452q0 20 12 26t28 -6l1070 -789q16 -12 16 -29.5t-16 -29.5l-1068 -791q-17 -13 -28.5 -7t-12.5 27v500q-55 3 -128 0.5t-152 -4.5t-165.5 -15.5t-170 -31.5 t-165.5 -53.5t-151 -80.5t-126.5 -113t-92.5 -152z" />
-<glyph unicode="&#xe224;" d="M606 518l682 682l-682 682l367 367l1050 -1049l-1050 -1049z" />
-<glyph unicode="&#xe225;" d="M381 1200l1049 1049l367 -367l-681 -682l682 -682l-368 -367z" />
-<glyph unicode="&#xe226;" d="M520 727l490 469v20l-468 457l169 173l299 -293v823l837 -713l-480 -459l479 -468l-836 -713v840l-324 -310zM1251 545l238 203l-238 232v-435zM1251 1427l237 226l-237 201v-427z" />
-<glyph unicode="&#xe228;" d="M406 800h430q0 -273 264 -351v598q-8 3 -24.5 7t-24.5 7q-73 21 -128.5 40t-121.5 49t-114 63t-95.5 80.5t-77 102.5t-48 128.5t-18.5 159.5q0 118 36 220t97.5 176t145.5 129.5t177.5 87.5t195.5 43v160h200v-162q124 -13 225.5 -45t188 -90t146 -139.5t92.5 -199 t33 -264.5h-431q-4 81 -16 135.5t-39.5 100.5t-76 74t-122.5 41v-522q45 -5 68.5 -10.5t42 -13.5t33.5 -12q143 -39 210 -67q402 -167 402 -572q0 -141 -48.5 -261.5t-141.5 -213t-237.5 -150.5t-328.5 -72v-157h-200v162q-144 18 -271.5 79.5t-221.5 156.5t-148 225 t-53 277zM878 1724q0 -85 45 -130t177 -90v460q-97 -18 -159.5 -77.5t-62.5 -162.5zM1300 433q156 14 228.5 73.5t72.5 192.5q0 111 -72 173.5t-229 105.5v-545z" />
-<glyph unicode="&#xe229;" d="M500 1000v300h193q-124 218 -124 425q0 97 30.5 187.5t94 169.5t152.5 138.5t214 93.5t271 34q344 0 532.5 -189.5t186.5 -558.5h-402q0 5 -1 16q-3 35 -5.5 56.5t-11.5 64.5t-21.5 71.5t-37 64.5t-56 57.5t-79.5 37t-108 15.5q-129 0 -210.5 -80t-81.5 -207 q0 -67 14.5 -116.5t100.5 -279.5h449v-300h-351q16 0 16 -131q0 -68 -18 -125t-56.5 -107t-73.5 -83t-95 -82l5 -6q67 42 111 56t92 14q28 0 63 -4t51.5 -6.5t65.5 -12.5t55 -11q154 -36 232 -36q70 0 129 25.5t133 104.5l178 -304q-101 -99 -221.5 -146t-242.5 -47 q-177 0 -324 53q-60 21 -89.5 30t-87 18.5t-118.5 9.5q-191 0 -342 -117l-185 274q337 218 337 487q0 47 -13 96.5t-30 49.5h-321z" />
-<glyph unicode="&#xe230;" d="M-396 1300l635 864l664 -864h-403v-600h921l385 -500h-1656q-62 0 -106 44t-44 106v950h-396zM598 2100h1656q62 0 104 -45t42 -108v-947h400l-634 -864l-665 864h399v600h-917z" />
-<glyph unicode="&#xe231;" d="M101 1176q-5 161 32.5 316t110 287.5t179 245.5t234.5 193.5t281.5 128t315.5 52.5q42 2 122 -2q29 -1 34.5 -13.5t-14.5 -25.5q-230 -148 -361.5 -390.5t-121.5 -523.5q7 -213 96.5 -403.5t234.5 -326t342.5 -212t411.5 -69.5q88 4 147 16q34 7 39.5 -2.5t-15.5 -32.5 q-160 -177 -374 -277t-464 -108q-162 -5 -318 32.5t-289 109.5t-246.5 178t-194.5 233.5t-129 280t-53 313.5z" />
-<glyph unicode="&#xe234;" d="M-113 1211q4 5 16 11l2452 1204q18 10 25 3t-2 -25l-1253 -2407q-20 -37 -25 5v1198h-1192q-14 0 -19.5 3t-1.5 8zM731 1419q2 -19 22 -19h496q26 0 86 57l684 607q14 15 10.5 18.5t-21.5 -6.5l-1260 -629q-19 -9 -17 -28z" />
-<glyph unicode="&#xe235;" d="M31 134q-3 21 17 26q46 16 85 38t66.5 42.5t53 51.5t40 52.5t31.5 57.5t24 53.5t21 54.5q23 61 59 105.5t75.5 66.5t74 31.5t66.5 9.5q125 2 200 -73q75 -74 82 -180t-58 -191q-40 -45 -79 -71q-161 -107 -485 -108q-108 0 -251 12q-20 2 -22 22zM814 860 q141 258 162 285q15 20 76 79t126 118q39 35 336.5 267.5t588.5 458t292 225.5q22 16 46.5 18.5t40.5 -12.5q34 -34 5 -74q-1 -1 -220.5 -286.5t-458 -594t-277.5 -356.5q-56 -70 -110 -121.5t-82 -71.5q-12 -8 -83 -50.5t-136 -80.5l-66 -38q-15 -6 -25 -1.5t-12 16.5 q-19 71 -66 117q-43 44 -120 66q-32 9 -17 36z" />
-<glyph unicode="&#xe236;" d="M100 0l316 634l328 -328zM463 768l1188 1187l44 45h-174l-618 -618l-3 2v137l579 579h317l51 52q28 28 68 28.5t69 -25.5l137 137q29 29 70.5 29t70.5 -29l133 -133q29 -29 29 -71t-29 -71l-136 -137q26 -29 25.5 -68.5t-28.5 -67.5l-1385 -1384z" />
-<glyph unicode="&#xe237;" d="M125 1390q0 160 50 310.5t141 271.5t212 212t271.5 141t310.5 50t310.5 -50t271.5 -141t212 -212t141 -271.5t50 -310.5q0 -286 -158 -532l610 -610q15 -15 15 -36.5t-15 -37.5l-221 -221q-15 -15 -37 -15t-37 15l-610 610q-244 -158 -532 -158q-160 0 -310.5 50 t-271.5 141t-212 212t-141 271.5t-50 310.5zM438 1390q0 -182 90 -337t245 -245t337 -90t337 90t245 245t90 337t-90 337t-245 245t-337 90t-337 -90t-245 -245t-90 -337zM700 1350v100q0 21 14.5 35.5t35.5 14.5h250v250q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5 t14.5 -35.5v-250h250q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-250v-250q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v250h-250q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe238;" d="M100 1390q0 160 50 310.5t141 271.5t212 212t271.5 141t310.5 50t310.5 -50t271.5 -141t212 -212t141 -271.5t50 -310.5q0 -286 -158 -532l610 -610q15 -15 15 -36.5t-15 -37.5l-221 -221q-15 -15 -37 -15t-37 15l-610 610q-244 -158 -532 -158q-160 0 -310.5 50 t-271.5 141t-212 212t-141 271.5t-50 310.5zM413 1390q0 -182 90 -337t245 -245t337 -90t337 90t245 245t90 337t-90 337t-245 245t-337 90t-337 -90t-245 -245t-90 -337zM700 1350v100q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5 t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe239;" d="M712 1902q0 133 65.5 246t178.5 178.5t246 65.5q203 0 346.5 -143.5t143.5 -346.5q0 -133 -65.5 -246t-178.5 -178.5t-246 -65.5q-202 0 -346 144t-144 346zM867 1977q-1 -43 10.5 -64t28.5 -21q20 0 38.5 23t21.5 56q4 38 45.5 72t96 53t101.5 19h13q2 -1 7 -1 q48 0 66 35q17 36 -19 66q-27 22 -74 30q-136 0 -235.5 -76.5t-99.5 -191.5zM893 155q0 50 59 90t153 56v1023q23 -9 97 -9t98 9v-1023q93 -16 152 -56t59 -90q0 -64 -90.5 -109t-218.5 -45t-218.5 45t-90.5 109z" />
-<glyph unicode="&#xe240;" d="M-200 600v1200q0 41 29.5 70.5t70.5 29.5v-1400q-41 0 -70.5 29.5t-29.5 70.5zM0 500v1400q0 41 29.5 70.5t70.5 29.5h100v-1600h-100q-41 0 -70.5 29.5t-29.5 70.5zM300 400v1600q0 41 29.5 70.5t70.5 29.5h1600q41 0 70.5 -29.5t29.5 -70.5v-1600q0 -41 -29.5 -70.5 t-70.5 -29.5h-1600q-41 0 -70.5 29.5t-29.5 70.5zM596 690q14 -44 57.5 -70t104.5 -26q14 0 37.5 3.5t61 17t68 34.5t53 60.5t22.5 90.5v571l600 137v-441q0 1 -22 2t-57.5 -2.5t-64.5 -13.5q-88 -33 -135 -96t-26 -126q15 -47 63 -74.5t112 -27.5q12 0 35 3.5t58 15 t64.5 28.5t51 50t21.5 74v881q0 39 -26 39l4 -1l-749 -185q-29 -8 -29 -53v-661q0 1 -22 2.5t-57.5 -2t-64.5 -13.5q-88 -30 -134.5 -92.5t-25.5 -124.5zM2200 400v1600h100q41 0 70.5 -29.5t29.5 -70.5v-1400q0 -41 -29.5 -70.5t-70.5 -29.5h-100zM2500 500v1400 q41 0 70.5 -29.5t29.5 -70.5v-1200q0 -41 -29.5 -70.5t-70.5 -29.5z" />
-<glyph unicode="&#xe241;" d="M0 1200q0 244 95 466t256 383t383 256t466 95q157 0 309.5 -41.5t282 -115t240 -176.5t189.5 -223t125 -258t51 -279l1 -7h252q28 0 28 -20q0 -11 -8 -20l-390 -570q-12 -17 -30 -17t-30 17l-390 570q-8 9 -8 20q0 20 28 20h247q-7 159 -81.5 306.5t-194 255.5 t-282.5 173t-339 65q-183 0 -349.5 -71.5t-287 -192t-192 -287t-71.5 -349.5q0 -133 33.5 -252.5t89 -208.5t129.5 -163.5t153.5 -124t162 -84t154 -50t130.5 -15.5q196 0 333 43.5t265 143.5q58 46 126 108q17 16 44 16q44 0 79 -38l68 -73q33 -35 33 -76q0 -29 -19 -48 q-2 -2 -17.5 -17t-38.5 -35t-61 -50q-78 -59 -155 -103.5t-178 -85t-224.5 -62t-264.5 -21.5q-86 0 -186.5 23t-211 72t-216.5 118t-202 169.5t-168.5 218.5t-115 272t-42.5 323zM800 750v500q0 21 14.5 35.5t35.5 14.5h50v152q0 104 69.5 176t169.5 72h122q100 0 169.5 -72 t69.5 -176v-152h50q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM1100 1300h200v152q0 22 -10.5 35t-28.5 13h-122q-18 0 -28.5 -13t-10.5 -35v-152z" />
-<glyph unicode="&#xe242;" d="M501.5 1017.5q-5.5 17.5 7.5 33.5q966 1282 985 1307q10 17 19 14.5t5 -22.5l-213 -905q-7 -19 2 -32t30 -13h469q20 0 26 -12t-7 -28q-967 -1305 -984 -1327q-14 -18 -22.5 -14.5t-2.5 29.5l216 916q9 36 -36 36h-469q-20 0 -25.5 17.5z" />
-<glyph unicode="&#xe243;" d="M476 1674q0 147 57.5 281t154 231t231 154.5t281.5 57.5t281.5 -57.5t231 -154.5t154 -231t57.5 -281q0 -48 -12 -110.5t-24 -101.5l-12 -39q-86 -219 -249.5 -569.5t-284.5 -591.5l-121 -241q-9 -19 -21 -19t-21 19q-52 102 -134 266.5t-258.5 540.5t-262.5 595 q-48 144 -48 251zM870 1674q0 -137 96.5 -234t233.5 -97t234 97t97 234t-97 233.5t-234 96.5q-136 0 -233 -97t-97 -233z" />
-<glyph unicode="&#xe245;" d="M5 1181q0 191 153 344.5t400 221.5q-32 -94 -32 -187q0 -155 79.5 -294.5t215 -239.5t324 -158.5t398.5 -58.5q5 0 15 0.5t14 0.5q-123 -110 -304 -174t-388 -64q-184 0 -354 53l-349 -183q-17 -10 -26 -3t-4 26l84 308q-107 83 -166.5 187.5t-59.5 220.5zM708 1593 q0 163 115.5 301t314 218.5t433.5 80.5t433.5 -80.5t314 -218.5t115.5 -301q0 -114 -58.5 -217.5t-164.5 -185.5l83 -304q5 -18 -3.5 -25t-25.5 2l-345 180q-171 -51 -349 -51q-235 0 -433.5 80.5t-314 219t-115.5 301.5z" />
-<glyph unicode="&#xe246;" d="M12 1366q0 135 60 261t170 228t256 178.5t327 118t375 41.5q242 0 462 -65.5t379 -176t253.5 -264t94.5 -321.5t-94.5 -321.5t-253.5 -264t-379 -176t-462 -65.5q-249 0 -481 71l-483 -298q-18 -10 -27 -2.5t-3 26.5l113 475q-146 112 -226.5 255t-80.5 300z" />
-<glyph unicode="&#xe247;" d="M150 845q0 200 99 370t269 269t370 99q174 0 331 -80l394 394l-252 252q-10 10 -7 18.5t17 10.5l899 114q14 2 23 -7t7 -23l-121 -899q-2 -14 -10.5 -17t-18.5 7l-245 252l-384 -384q104 -173 104 -376q0 -200 -99 -370t-268.5 -269t-369.5 -99t-370 99t-269 269t-99 370 zM550 845q0 -140 99 -238.5t239 -98.5t238.5 99t98.5 238q0 140 -99 239t-238 99q-140 0 -239 -99t-99 -239z" />
-<glyph unicode="&#xe248;" d="M466 1678q0 150 61 286.5t163.5 235.5t241.5 157.5t289 58.5q200 0 371 -99t271.5 -269t100.5 -370q0 -128 -46 -249.5t-123.5 -214.5t-180 -160t-214.5 -95v-363h300q39 0 69.5 -40.5t30.5 -84.5v-135q0 -45 -30.5 -89.5t-69.5 -44.5h-300v-266q0 -45 -30.5 -89.5 t-69.5 -44.5h-200q-39 0 -69.5 44.5t-30.5 89.5v266h-300q-39 0 -69.5 44.5t-30.5 89.5v135q0 44 30.5 84.5t69.5 40.5h300v369q-229 64 -381.5 262.5t-152.5 450.5zM878 1678q0 -140 99 -239t238 -99t238.5 99t99.5 239t-99.5 239t-238.5 99t-238 -99t-99 -239z" />
-<glyph unicode="&#xe251;" d="M-100 1552v498q0 21 14.5 35.5t35.5 14.5h150q0 41 14 76t35 60t55.5 46t65.5 34t77 25.5t77 18.5l77.5 15t67.5 14q166 37 242 53t213.5 33.5t246.5 15.5t240 -20t219 -36t235 -51q11 -3 48 -11t56 -12.5t56 -14.5t59 -18t54.5 -22t52.5 -27.5t43 -33t36 -40.5t21.5 -48 t8.5 -57h150q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-150q0 -80 -54.5 -141t-133.5 -69l-712 -78q-28 -4 -65 3q-20 -15 -45 -15h-300q-27 0 -45 15q-38 -7 -66 -3l-691 80q-79 8 -133.5 69t-54.5 141h-150q-21 0 -35.5 15t-14.5 35zM75 450 q0 103 45 189.5t119.5 142.5t168 87t192.5 31q1 4 2.5 11t8 24t14.5 30t21.5 24t28.5 11h125q0 -14 2.5 -45.5t2 -50.5t-5 -42t-20 -35t-41.5 -14q-24 -2 -35 -29.5t-4.5 -57t27.5 -35.5q11 -3 30 -6.5t25.5 -6.5t12.5 -15.5t6 -36.5v-126h-125q-24 0 -43 25t-26 50l-6 25 q-39 0 -60 -1t-52 -5t-47.5 -13.5t-33.5 -25.5t-24.5 -42.5t-7.5 -62.5t7.5 -62.5t24.5 -42.5t33.5 -25.5t47.5 -13.5t52 -5t60 -1v-300q-99 0 -192.5 31t-168 87t-119.5 142.5t-45 189.5zM200 1502q0 -41 29 -73.5t70 -37.5l691 -80q36 -4 79.5 62t62.5 122l36 110 q5 13 9.5 45.5t9.5 57t21 44.5t42 20t42 -20.5t21 -44.5t10 -57t9 -45l36 -110q11 -31 20 -53.5t26 -58.5t36.5 -55t38.5 -17l712 78q41 5 70 37.5t29 73.5v600q0 40 -29 70.5t-71 39.5q-216 44 -427 81q-40 7 -126 24.5t-137.5 27t-125 18t-134.5 8.5q-63 0 -140 -9 t-131 -19t-143.5 -27.5t-131.5 -25.5q-204 -38 -408 -78q-41 -8 -68.5 -38.5t-27.5 -71.5v-598zM304 1672v308q0 32 23 57.5t54 28.5l723 78h2q26 0 37.5 -14.5t4.5 -38.5l-144 -516q-9 -31 -38 -49.5t-61 -14.5l-523 72q-32 5 -55 31.5t-23 57.5zM700 0v300h1200v-300 h-1200zM1352 2091q-7 22 3 38t33 16l733 -79q31 -3 54 -28.5t23 -57.5v-308q0 -32 -23 -58.5t-54 -30.5l-525 -72q-32 -4 -61 14.5t-38 49.5zM2000 0v300h400v-300h-400z" />
-<glyph unicode="&#xe252;" d="M-100 1552v498q0 21 14.5 35.5t35.5 14.5h150q0 41 14 76t35 60t55.5 46t65.5 34t77 25.5t77 18.5l77.5 15t67.5 14q166 37 242 53t213.5 33.5t246.5 15.5t240 -20t219 -36t235 -51q11 -3 48 -11t56 -12.5t56 -14.5t59 -18t54.5 -22t52.5 -27.5t43 -33t36 -40.5t21.5 -48 t8.5 -57h150q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-150q0 -80 -54.5 -141t-133.5 -69l-712 -78q-28 -4 -65 3q-20 -15 -45 -15h-300q-27 0 -45 15q-38 -7 -66 -3l-691 80q-79 8 -133.5 69t-54.5 141h-150q-21 0 -35.5 15t-14.5 35zM200 1502 q0 -41 29 -73.5t70 -37.5l691 -80q36 -4 79.5 62t62.5 122l36 110q5 13 9.5 45.5t9.5 57t21 44.5t42 20t42 -20.5t21 -44.5t10 -57t9 -45l36 -110q11 -31 20 -53.5t26 -58.5t36.5 -55t38.5 -17l712 78q41 5 70 37.5t29 73.5v550v50q0 40 -29 70.5t-71 39.5q-216 44 -427 81 q-40 7 -126 24.5t-137.5 27t-125 18t-134.5 8.5q-63 0 -140 -9t-131 -19t-143.5 -27.5t-131.5 -25.5q-204 -38 -408 -78q-41 -8 -68.5 -38.5t-27.5 -71.5v-598zM304 1672v308q0 32 23 57.5t54 28.5l722 78h3q26 0 37.5 -14.5t4.5 -38.5l-145 -516q-8 -30 -37 -49t-61 -15 l-523 72q-32 5 -55 31.5t-23 57.5zM800 550q0 122 60.5 226t164 164t225.5 60q147 0 262.5 -83t160.5 -217h127q41 0 70.5 -29.5t29.5 -70.5h500v-100h-500q0 -41 -29.5 -70.5t-70.5 -29.5h-131q-46 -135 -159.5 -217.5t-259.5 -82.5q-122 0 -225.5 60t-164 164t-60.5 226z M1000 550q0 -104 73 -177t177 -73t177 73t73 177t-73 177t-177 73t-177 -73t-73 -177zM1352 2091q-7 22 3 38t33 16l733 -79q31 -3 54 -28.5t23 -57.5v-308q0 -32 -23 -58.5t-54 -30.5l-525 -72q-32 -4 -61 14.5t-38 49.5z" />
-<glyph unicode="&#xe253;" d="M200 0v1700q0 138 84.5 245t215.5 141v164q0 21 14.5 35.5t35.5 14.5h50v200q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5v-200h50q21 0 35.5 -14.5t14.5 -35.5v-164q131 -34 215.5 -141t84.5 -245v-1700q0 -41 -29.5 -70.5t-70.5 -29.5h-800q-41 0 -70.5 29.5 t-29.5 70.5zM300 0h50v1700h-50v-1700zM1300 0v1700q0 138 84.5 245t215.5 141v164q0 21 14.5 35.5t35.5 14.5h50v100h-100v100h100q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5h100q0 41 29.5 70.5t70.5 29.5h200q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5 t-70.5 -29.5h-200q-41 0 -70.5 29.5t-29.5 70.5h-100v-100h50q21 0 35.5 -14.5t14.5 -35.5v-164q131 -34 215.5 -141t84.5 -245v-1700q0 -41 -29.5 -70.5t-70.5 -29.5h-800q-41 0 -70.5 29.5t-29.5 70.5zM1400 0h50v1700h-50v-1700z" />
-<glyph unicode="&#xe254;" d="M-100 162v496l400 1604h2q8 77 82.5 138.5t165.5 61.5t165.5 -62t82.5 -138h2l400 -1604v-496q-7 -8 -22 -21.5t-71.5 -48t-124.5 -61t-184.5 -48t-247.5 -21.5t-246.5 20.5t-186 50t-122.5 59t-73 50.5zM350 1763q0 -82 57.5 -132.5t142.5 -50.5t143 50.5t58 132.5 l-2 20q-1 4 -3 24.5t-4 26.5l-81 343q0 46 -32.5 78t-78.5 32t-78.5 -33t-32.5 -79l-81 -349q-3 -13 -6 -43q-2 -14 -2 -20zM995 2366q24 95 98 148q76 53 171.5 46.5t147.5 -63.5l1 1l1264 -1066l290 -401q-1 -6 -2.5 -16t-12 -43.5t-26.5 -68t-48 -86.5t-72.5 -102 t-105 -110.5t-142.5 -116.5q-106 -77 -211.5 -128t-180 -68.5t-134 -24t-88.5 -2.5l-30 4l-291 402l-615 1535l2 1q-39 64 -15 159zM1152 2299q-7 -46 20 -83l139 -331q4 -12 20 -38q6 -13 9 -17q48 -66 126 -73.5t144 42.5q69 49 86 123t-30 143q-2 3 -2 1l1 -3l-12 16 q-29 32 -36 38l-266 230v1q-27 37 -72 44t-83 -20q-37 -27 -44 -73z" />
-<glyph unicode="&#xe255;" d="M-196 1150q0 14 32 45.5t94 74t141 84.5t186.5 78.5t216.5 53.5l426 214v-232q138 -37 278 -107t230 -136l350 246q16 12 28.5 6t12.5 -27q-12 -21 -30 -55t-47.5 -115.5t-29.5 -134.5q0 -52 26.5 -126t53.5 -121l26 -48q0 -21 -12 -27t-29 6l-349 246q-31 -23 -82 -52 t-124 -68t-102 -55v-199l-223 125q-117 -26 -223 -26q-132 0 -267 31.5t-236 77.5t-182 96t-123 89.5t-42 55.5zM152 1253q0 -41 29 -70.5t71 -29.5q41 0 70.5 29.5t29.5 70.5t-29.5 70.5t-70.5 29.5q-42 0 -71 -29.5t-29 -70.5zM505 2151q0 14 32 46t94 74t141 83.5 t186.5 77.5t216.5 53l426 214v-232q137 -38 277 -108t231 -136l351 245q16 12 28.5 5.5t12.5 -26.5q-12 -21 -30 -55t-48 -115.5t-30 -134.5t26.5 -126.5t52.5 -121.5l26 -47q0 -21 -12 -27t-29 6l-348 247q-32 -23 -83.5 -52t-123.5 -67.5t-103 -55.5v-199l-223 126 q-115 -26 -221 -26q-133 0 -268 32t-236 78t-181.5 96.5t-122.5 90t-42 55.5zM601 149q0 14 32 45.5t94.5 74t141.5 84.5t186.5 78.5t216.5 53.5l428 214v-232q138 -37 277.5 -107t228.5 -136l348 246q17 12 29 6t12 -27q-12 -21 -29.5 -55t-47 -115.5t-29.5 -134.5 q0 -52 26.5 -126t52.5 -122l27 -47q0 -21 -12.5 -27t-28.5 6l-348 246q-31 -23 -81 -51.5t-124 -68.5t-101 -55v-199l-225 125q-117 -26 -224 -26q-132 0 -267 31.5t-236 77.5t-182 96t-123 89.5t-42 55.5zM853 2252q0 -41 29.5 -70.5t70.5 -29.5t70.5 29.5t29.5 70.5 t-29.5 70.5t-70.5 29.5t-70.5 -29.5t-29.5 -70.5zM948 252q0 -41 29.5 -70.5t70.5 -29.5t70.5 29.5t29.5 70.5t-29.5 70.5t-70.5 29.5t-70.5 -29.5t-29.5 -70.5z" />
-<glyph unicode="&#xe256;" d="M76 1031q12 37 50 53l982 408q37 16 91.5 16t92.5 -16l982 -408q38 -16 50 -53t-9 -72l-564 -873q-11 -19 -17 -27.5t-19 -22.5t-27 -20t-36.5 -11t-51.5 -5q-44 0 -144 99.5t-178 198.5l-78 100q-12 -16 -33 -43t-78 -95.5t-106 -121t-102 -95.5t-81 -43q-29 0 -51.5 5 t-36.5 11t-27 20t-19 22.5t-17 27.5l-564 873q-21 35 -9 72zM180 1003l620 -870l331 353l-317 -185l-548 699zM300 1326v374q0 41 27 82t65 57l228 98l158 318q9 19 30.5 32t41.5 13h150v50q0 21 15 35.5t35 14.5h300q21 0 35.5 -15t14.5 -35v-50h150q21 0 42 -13t30 -32 q156 -316 157 -317l229 -99q38 -16 65 -57t27 -82v-374l-900 374zM400 1476l706 293q-6 20 -6 31v199q-16 -1 -81 -14t-72 -16l-516 -222q-10 -4 -20.5 -20t-10.5 -27v-224zM1294 1769l706 -293v224q0 11 -10.5 27t-20.5 20l-516 222q-5 2 -73 15t-80 14v-198q0 -11 -6 -31z " />
-<glyph unicode="&#xe257;" d="M-157 1199.5q1 21.5 16 35.5l764 765h200h1477q41 0 70.5 -29.5t29.5 -70.5v-1500q0 -41 -29.5 -70.5t-70.5 -29.5h-1677l-767 863q-14 15 -13 36.5zM972 876q0 -18 13 -31l182 -182q13 -13 31 -13t31 13l247 247l247 -247q13 -13 31 -13t31 13l182 182q13 13 13 31 t-13 31l-247 247l247 247q13 13 13 31t-13 31l-182 182q-13 13 -31 13t-31 -13l-247 -247l-248 247q-13 13 -30.5 13t-30.5 -13l-183 -182q-12 -13 -12 -31t12 -31l248 -247l-247 -248q-13 -12 -13 -30z" />
-<glyph unicode="&#xe258;" d="M0 650q0 76 54 130t131 54q52 0 96 -27l223 366l-219 340q-43 -28 -100 -28q-76 0 -130.5 56t-54.5 132q0 77 54.5 135.5t130.5 58.5q78 0 131 -46.5t53 -120.5h436l299 473q-89 54 -89 140q0 77 54.5 132t130.5 55q77 0 131 -52t54 -128q0 -94 -89 -148l299 -472h436 q0 74 53 120.5t131 46.5q75 0 130 -62t55 -140q0 -77 -54 -131t-131 -54q-54 0 -100 30l-219 -338l223 -366q44 28 96 28q75 0 130 -59.5t55 -137.5t-55 -137.5t-130 -59.5q-79 0 -131.5 43.5t-52.5 116.5h-474l-258 -375q43 -28 64.5 -57.5t21.5 -74.5q0 -77 -54.5 -132.5 t-130.5 -55.5q-77 0 -131 51t-54 127q0 89 87 144l-258 373h-475q0 -73 -52.5 -116.5t-131.5 -43.5q-74 0 -129.5 65.5t-55.5 144.5z" />
-<glyph unicode="&#xe259;" d="M0 0v1000h1000v-1000h-1000zM0 1100v200h200v-200h-200zM0 1400v1000h1000v-1000h-1000zM100 100h800v800h-800v-800zM100 1500h800v800h-800v-800zM200 200v600h600v-600h-600zM200 1600v600h600v-600h-600zM300 1100v200h200v-200h-200zM700 1100v200h600h200h200v-400 h-400v200h-600zM1100 1500v200h200v-200h-200zM1100 1900v400h200v-400h-200zM1200 0v200h500v200h200v-200h-200v-200h-500zM1200 400v400h600v200h200v-400h-400v-200h-400zM1400 1400v1000h1000v-1000h-1000zM1500 1500h800v800h-800v-800zM1600 1600v600h600v-600h-600z M1900 0v200h300v200h200v-400h-500zM1900 1100v200h200v-200h-200zM2200 500v200h200v-200h-200zM2200 800v500h200v-500h-200z" />
-<glyph unicode="&#xe260;" d="M0 0v200h300v-200h-300zM0 300v2100h200v-2100h-200zM300 300v2100h200v-2100h-200zM400 0v200h200v-200h-200zM700 0v200h200v-200h-200zM700 300v2100h400v-2100h-400zM1000 0v200h200v-200h-200zM1200 300v2100h200v-2100h-200zM1300 0v200h200v-200h-200zM1600 0v200 h200v-200h-200zM1600 300v2100h200v-2100h-200zM1900 300v2100h200v-2100h-200zM2000 0v200h400v-200h-400zM2200 300v2100h200v-2100h-200z" />
-<glyph unicode="&#xe261;" d="M0 196v300q61 0 113 -11t95.5 -34.5t66.5 -39t59 -44.5q45 -36 72.5 -49.5t73.5 -13.5q32 0 57.5 8t40.5 18.5t48 36.5q36 29 59 44.5t66.5 39t95 34.5t112.5 11t113 -11t95.5 -34.5t66.5 -39t59 -44.5q33 -26 48 -36.5t40.5 -18.5t57.5 -8q33 0 58 8t40.5 18.5 t48.5 36.5q35 28 59 44.5t66.5 39.5t95 34t113.5 11t113 -11t95 -34t67.5 -39.5t58.5 -44.5q32 -26 47.5 -36.5t40.5 -18.5t58 -8v-300q-61 0 -113.5 11t-95 34t-66.5 39.5t-59 44.5q-45 36 -72.5 49.5t-73.5 13.5q-33 0 -58 -8t-40.5 -18.5t-48.5 -36.5q-35 -28 -59 -44.5 t-66.5 -39.5t-95 -34t-113.5 -11t-113 11t-94.5 34t-66.5 39.5t-59 44.5q-33 26 -48.5 36.5t-40.5 18.5t-58 8q-32 0 -57.5 -8t-40.5 -18.5t-48 -36.5q-35 -28 -59 -44.5t-66.5 -39.5t-94.5 -34t-113 -11t-113.5 11t-95 34t-66.5 39.5t-59 44.5q-45 36 -72.5 49.5 t-73.5 13.5zM0 696v300q61 0 113 -11t95.5 -34.5t66.5 -39t59 -44.5q45 -36 72.5 -49.5t73.5 -13.5q32 0 57.5 8t40.5 18.5t48 36.5q36 29 59 44.5t66.5 39t95 34.5t112.5 11t113 -11t95.5 -34.5t66.5 -39t59 -44.5q33 -26 48 -36.5t40.5 -18.5t57.5 -8q33 0 58 8t40.5 18.5 t48.5 36.5q35 28 59 44.5t66.5 39.5t95 34t113.5 11t113 -11t95 -34t67.5 -39.5t58.5 -44.5q32 -26 47.5 -36.5t40.5 -18.5t58 -8v-300q-61 0 -113.5 11t-95 34t-66.5 39.5t-59 44.5q-45 36 -72.5 49.5t-73.5 13.5q-33 0 -58 -8t-40.5 -18.5t-48.5 -36.5q-35 -28 -59 -44.5 t-66.5 -39.5t-95 -34t-113.5 -11t-113 11t-94.5 34t-66.5 39.5t-59 44.5q-33 26 -48.5 36.5t-40.5 18.5t-58 8q-32 0 -57.5 -8t-40.5 -18.5t-48 -36.5q-35 -28 -59 -44.5t-66.5 -39.5t-94.5 -34t-113 -11t-113.5 11t-95 34t-66.5 39.5t-59 44.5q-45 36 -72.5 49.5 t-73.5 13.5zM400 1020v880q0 19 23 53.5t56 68.5q26 25 50 49.5t49.5 50l38.5 38.5l147 145q92 94 227 94q55 0 107 -16q73 -22 140 -74l-128 -128q-30 20 -64 30q-29 9 -55 9q-59 0 -100 -42l-147 -145q-88 -78 -144 -133h400q0 26 20 54t59 68q26 25 50 49.5t49.5 50 l38.5 38.5q43 41 147 145q92 94 227 94q55 0 107 -16q93 -28 165 -109t103 -174h-185q-14 34 -50.5 65.5t-84.5 45.5q-29 9 -55 9q-59 0 -100 -42q-63 -63 -147 -145q-17 -17 -65.5 -60t-78.5 -73v-767q-18 5 -63 24t-86 29t-92 10q-50 0 -139.5 -24t-154.5 -48l-65 -24v-53 q0 -20 -37 -31.5t-83 -11.5q-28 0 -54 4.5t-26 11.5zM600 1300h400v100h-400v-100zM600 1600h400v100h-400v-100z" />
-<glyph unicode="&#xe262;" d="M0 196v300q61 0 113 -11t95.5 -34.5t66.5 -39t59 -44.5q45 -37 72 -50t74 -13q32 0 57.5 8t40.5 18.5t48 36.5q36 29 59 44.5t66.5 39t95 34.5t112.5 11t113 -11t95.5 -34.5t66.5 -39t59 -44.5q45 -36 72.5 -49.5t73.5 -13.5q33 0 58 8t40.5 18.5t48.5 36.5 q35 28 59 44.5t66.5 39.5t95 34t113.5 11t113 -11.5t94.5 -34t67 -39t58.5 -44.5q33 -26 48.5 -36.5t40.5 -18.5t58 -8v-300q-61 0 -113.5 11t-95 34t-66.5 39.5t-59 44.5q-33 26 -48 36.5t-40.5 18.5t-57.5 8q-33 0 -58 -8t-40.5 -18.5t-48.5 -36.5q-35 -28 -59 -44.5 t-66.5 -39.5t-95 -34t-113.5 -11t-113 11t-94.5 34t-66.5 39.5t-59 44.5q-33 26 -48.5 36.5t-40.5 18.5t-58 8q-32 0 -57.5 -8t-40.5 -18.5t-48 -36.5q-35 -28 -59 -44.5t-66.5 -39.5t-94.5 -34t-113 -11t-113.5 11t-95 34t-66.5 39.5t-59 44.5q-45 36 -72.5 49.5 t-73.5 13.5zM0 696v300q61 0 113 -11t95.5 -34.5t66.5 -39t59 -44.5q45 -37 72 -50t74 -13q32 0 57.5 8t40.5 18.5t48 36.5q36 29 59 44.5t66.5 39t95 34.5t112.5 11t113 -11t95.5 -34.5t66.5 -39t59 -44.5q45 -36 72.5 -49.5t73.5 -13.5q33 0 58 8t40.5 18.5t48.5 36.5 q35 28 59 44.5t66.5 39.5t95 34t113.5 11t113 -11.5t94.5 -34t67 -39t58.5 -44.5q33 -26 48.5 -36.5t40.5 -18.5t58 -8v-300q-61 0 -113.5 11t-95 34t-66.5 39.5t-59 44.5q-33 26 -48 36.5t-40.5 18.5t-57.5 8q-33 0 -58 -8t-40.5 -18.5t-48.5 -36.5q-35 -28 -59 -44.5 t-66.5 -39.5t-95 -34t-113.5 -11t-113 11t-94.5 34t-66.5 39.5t-59 44.5q-33 26 -48.5 36.5t-40.5 18.5t-58 8q-32 0 -57.5 -8t-40.5 -18.5t-48 -36.5q-35 -28 -59 -44.5t-66.5 -39.5t-94.5 -34t-113 -11t-113.5 11t-95 34t-66.5 39.5t-59 44.5q-45 36 -72.5 49.5 t-73.5 13.5zM705 1093q15 159 126 272t269 130v755q0 21 14.5 35.5t35.5 14.5t35.5 -14.5t14.5 -35.5v-755q167 -19 281 -142t118 -292q-52 -32 -107 -77q-4 -3 -10 -9t-10 -9.5t-12 -6.5t-18 -3t-19 3t-13 6t-12.5 10t-11.5 9q-40 32 -69.5 52.5t-85 50t-124.5 44.5 t-148 15q-137 0 -254 -53zM1300 1800v500q616 87 641 92q19 3 23 -7.5t-10 -24.5z" />
-<glyph unicode="&#xe263;" d="M1.5 557.5q2.5 108.5 27.5 210t90 218.5t166 218l212 212l283 -283l141 141l71 -70l919 919l-106 106q-15 15 -15 35.5t15 35.5l71 70q14 15 35 15t35 -15l425 -424q14 -14 14 -35t-14 -36l-71 -70q-14 -15 -35 -15t-36 15l-106 106l-919 -919l71 -71l-142 -142l283 -282 l-212 -213q-79 -79 -168 -136.5t-172 -87.5t-168 -46t-160 -14.5t-143.5 9t-123 22.5t-95 27.5t-62.5 22.5l-21 10q-6 13 -16 36.5t-31.5 97t-33 149t-9 184zM148 219q7 -19 19 -52q34 -14 73 -26t106.5 -25t134 -16.5t151.5 6.5t165 36t169 80.5t167 132.5l142 142l-54 53 l-141 -141q-82 -82 -174.5 -136.5t-182 -77t-171.5 -30.5t-163 2.5t-135 22.5t-106 29z" />
-<glyph unicode="&#xe264;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h2300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-2300q-21 0 -35.5 14.5t-14.5 35.5zM0 1362q0 20 12 46t27 38l1122 926q16 13 39 12.5t39 -13.5l1122 -924q15 -12 27 -38.5t12 -46.5q0 -22 -15 -42t-35 -20 h-250v-800h150q21 0 35.5 -14t14.5 -35v-100q0 -21 -14.5 -36t-35.5 -15h-2100q-21 0 -35.5 15t-14.5 36v100q0 21 14.5 35t35.5 14h150v800h-250q-20 0 -35 20t-15 42zM500 500h200v800h-200v-800zM900 500h200v800h-200v-800zM1300 500h200v800h-200v-800zM1700 500h200 v800h-200v-800z" />
-<glyph unicode="&#xe265;" d="M100 0v2400h2200v-2400h-300v100q0 41 -29.5 70.5t-70.5 29.5h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-100h-200v100q0 41 -29.5 70.5t-70.5 29.5h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-100h-300zM500 700h1400v117q0 51 -22 79.5t-69 55.5q-4 2 -53.5 32.5t-94 55.5 t-118.5 58.5t-143 54.5v196q35 11 57 32.5t30.5 54t10.5 54t2 59.5v200q0 136 -75 218t-225 82t-225 -82t-75 -218v-200q0 -39 2 -60.5t10.5 -54t30.5 -53.5t57 -32v-196q-69 -21 -143 -54.5t-118.5 -58.5t-94 -55.5t-53.5 -32.5q-47 -27 -69 -55.5t-22 -79.5v-117z" />
-<glyph unicode="&#xe266;" d="M300 1500v250q0 21 14.5 35.5t35.5 14.5h250v600q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5v-600h800v600q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5v-600h250q21 0 35.5 -14.5t14.5 -35.5v-250q0 -60 -27.5 -131t-71.5 -141t-97.5 -146.5t-107 -160 t-97.5 -168.5t-71.5 -185t-27.5 -198v-170h-200v-200h-400v200h-200v170q0 98 -27.5 198t-71.5 185t-97.5 168.5t-107 160t-97.5 146.5t-71.5 141t-27.5 131zM700 1550q0 -21 15 -35.5t35 -14.5h900q21 0 35.5 14.5t14.5 35.5t-14.5 35.5t-35.5 14.5h-900q-20 0 -35 -14.5 t-15 -35.5zM800 1350q0 -21 15 -35.5t35 -14.5h700q21 0 35.5 14.5t14.5 35.5t-14.5 35.5t-35.5 14.5h-700q-20 0 -35 -14.5t-15 -35.5zM900 1150q0 -21 15 -35.5t35 -14.5h500q21 0 35.5 14.5t14.5 35.5t-14.5 35.5t-35.5 14.5h-500q-20 0 -35 -14.5t-15 -35.5zM1000 950 q0 -21 14.5 -35.5t35.5 -14.5h300q21 0 35.5 14.5t14.5 35.5t-14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5z" />
-<glyph unicode="&#xe267;" d="M200 94q0 5 1 6h-1v2225q0 52 44 88.5t106 36.5t106 -36.5t44 -88.5v-2225q0 -51 -43 -82t-107 -31q-65 0 -107.5 28.5t-42.5 78.5zM600 1050v1300q8 -6 24 -16t72 -36t120 -46t168 -36t216 -16q79 0 157 19t140.5 46t129 57t136.5 52.5t147.5 33t177 -3t212.5 -54.5 v-1300q-113 41 -212.5 54.5t-177 3t-147.5 -33t-136.5 -52.5t-129 -57t-140.5 -46t-157 -19q-112 0 -215 15.5t-170 37.5t-118 44t-74 37z" />
-<glyph unicode="&#xe268;" d="M-100 300v1100h2600v-1100q0 -41 -29.5 -70.5t-70.5 -29.5h-2400q-41 0 -70.5 29.5t-29.5 70.5zM-100 1700v300q0 41 29.5 70.5t70.5 29.5h2400q41 0 70.5 -29.5t29.5 -70.5v-300h-2600zM100 400h700v300h-700v-300zM1200 1100h800v100h-800v-100zM2100 1100h100v100 h-100v-100zM2300 1100h100v100h-100v-100z" />
-<glyph unicode="&#xe269;" d="M-100 300v1700q0 41 29.5 70.5t70.5 29.5h2500q41 0 70.5 -29.5t29.5 -70.5v-1700q0 -41 -29.5 -70.5t-70.5 -29.5h-2500q-41 0 -70.5 29.5t-29.5 70.5zM100 400h2300v1500h-2300v-1500zM200 500v300h300v-300h-300zM200 900v300h500v-300h-500zM200 1300v300h300v-300 h-300zM200 1700v100h300v-100h-300zM600 500v300h1200v-300h-1200zM600 1300v300h300v-300h-300zM600 1700v100h300v-100h-300zM800 900v300h300v-300h-300zM1000 1300v300h300v-300h-300zM1000 1700v100h300v-100h-300zM1200 900v300h300v-300h-300zM1400 1300v300h300 v-300h-300zM1400 1700v100h300v-100h-300zM1600 900v300h300v-300h-300zM1800 1300v300h500v-300h-500zM1800 1700v100h500v-100h-500zM1900 500v300h400v-300h-400zM2000 900v300h300v-300h-300z" />
-<glyph unicode="&#xe270;" d="M-200 300v1700q0 41 29.5 70.5t70.5 29.5h1100v200h100v400h100v-400h100v-200h1100q41 0 70.5 -29.5t29.5 -70.5v-1700q0 -41 -29.5 -70.5t-70.5 -29.5h-2500q-41 0 -70.5 29.5t-29.5 70.5zM0 400h2300v1500h-2300v-1500zM100 500v300h300v-300h-300zM100 900v300h500 v-300h-500zM100 1300v300h300v-300h-300zM100 1700v100h300v-100h-300zM500 500v300h1200v-300h-1200zM500 1300v300h300v-300h-300zM500 1700v100h300v-100h-300zM700 900v300h300v-300h-300zM900 1300v300h300v-300h-300zM900 1700v100h300v-100h-300zM1100 900v300h300 v-300h-300zM1300 1300v300h300v-300h-300zM1300 1700v100h300v-100h-300zM1500 900v300h300v-300h-300zM1700 1300v300h500v-300h-500zM1700 1700v100h500v-100h-500zM1800 500v300h400v-300h-400zM1900 900v300h300v-300h-300z" />
-<glyph unicode="&#xe271;" d="M100 1700v400q16 12 47.5 32.5t138 72t225 91t306 72t383.5 32.5q143 0 281 -16.5t244 -43t201 -58.5t162 -64t116 -58.5t72 -43.5l24 -16v-400q-8 -227 -50.5 -430t-108 -355t-148 -283.5t-172 -222.5t-178.5 -164.5t-168.5 -118t-141 -74t-97.5 -40.5l-36 -12 q-13 4 -36.5 11.5t-96 40.5t-143 74.5t-167 117.5t-180 165.5t-170.5 222t-150 283.5t-106 354.5t-51 430.5zM400 1705q7 -206 53 -405h747v-980q45 20 90.5 45.5t109.5 71t123 99t124 132.5t119 169t102 210t79 253h-747v800h-200q-135 0 -300 -53t-300 -119v-223z" />
-<glyph unicode="&#xe273;" d="M100 0v1214l2200 372v-1229zM100 1414l900 986q449 0 628 -16q328 -29 481 -140q183 -134 191 -430v-28z" />
-<glyph unicode="&#xe274;" d="M148 1750q0 122 47.5 233.5t128.5 192.5t192.5 128.5t233.5 47.5t233.5 -47.5t192.5 -128.5t128.5 -192.5t47.5 -233.5q0 -76 -20 -150h419l267 800h194l-262 -800h450l-300 -1600h-700l-246 1305q-173 -157 -404 -157q-122 0 -233.5 47.5t-192.5 128.5t-128.5 192.5 t-47.5 233.5zM275 1720l5 -29q13 -130 100 -238l13 -17l285 284h-403zM278 1786l21 -6h379l-286 285l-14 -17q-85 -109 -98 -240zM435 1392l17 -14q109 -85 240 -98l22 -2l6 21v379zM435 2108l285 -286v402l-30 -4q-128 -11 -238 -99zM780 1276l23 3q134 12 245 99l17 14 l-285 286v-402zM780 1822l285 286l-17 14q-108 85 -240 98l-22 2l-6 -21v-379zM809 1734l296 -296l14 17q87 109 101 246l3 33h-414zM822 1780h402l-3 23q-12 134 -99 245l-14 17z" />
-<glyph unicode="&#xe275;" d="M100 1834q0 140 91 238.5t220 98.5q75 0 139 -21q18 69 54 120q84 121 237 121q217 0 346 -146q92 56 188 56q31 0 61 -6q133 -28 209 -153q52 29 114.5 21.5t116.5 -35t92.5 -75t42.5 -97.5q3 -33 3 -59.5t-3 -46.5t-5.5 -33.5t-10 -27.5t-11.5 -20.5t-14 -20.5 q-23 -29 -65.5 -58t-73.5 -44l-31 -15v-31h261q178 0 267 -116q42 -56 50.5 -142t-8 -185t-56.5 -245q-119 -435 -514 -500v-212q0 -83 -61 -141.5t-145 -58.5h-1200q-82 0 -138 58t-56 142v900v417q0 59 -25 116.5t-50 108t-25 92.5zM307 1830.5q11 -50.5 31.5 -101.5 t41 -120.5t20.5 -127.5v-369q0 -40 26.5 -70.5t73.5 -30.5t73.5 30t26.5 70v286l3 12q2 3 6 -8q1 -2 1 -3q27 -84 95 -84q35 0 53 39.5t22 93.5q3 53 21 98.5t60 82t103 45.5q15 2 93.5 4.5t172 6t205 17t200.5 34.5t149 61.5t60 95.5q0 70 -61 99t-132.5 16t-106.5 -51 q-2 6 -6 16t-18 36t-30 47.5t-41.5 42t-53.5 27.5q-75 14 -140.5 -32.5t-102.5 -142.5q-55 265 -294 255q-61 -3 -104 -35.5t-61.5 -77.5t-28 -89t-9.5 -75v-31l-8 8t-21.5 18.5t-33.5 25.5t-42 24.5t-48.5 19.5t-51.5 6.5t-53 -10.5q-60 -28 -80.5 -68t-9.5 -90.5zM500 350 q0 -41 29.5 -70.5t70.5 -29.5t70.5 29.5t29.5 70.5v730q0 -74 -54 -136.5t-146 -62.5v-531zM900 350q0 -41 29.5 -70.5t70.5 -29.5t70.5 29.5t29.5 70.5v1156q-15 -2 -38.5 -6.5t-68 -20t-55.5 -34.5q-38 -63 -38 -200v-895zM1300 350q0 -41 29.5 -70.5t70.5 -29.5 t70.5 29.5t29.5 70.5v1205q-103 -15 -200 -27v-1178zM1800 615q37 12 68 25t74.5 40.5t77.5 61t66 88t50 120.5q99 361 60 413q-28 37 -108 37h-288v-700v-85z" />
-<glyph unicode="&#xe276;" d="M-100 450v98q0 20 14.5 35t35.5 15h1300q21 0 35.5 -15t14.5 -35v-98q0 -21 -14.5 -35.5t-35.5 -14.5h-1300q-21 0 -35.5 14.5t-14.5 35.5zM-50 300h1300q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM-50 702q0 84 39 155t116.5 126t204 86t290.5 31 t290.5 -31t204 -86t116.5 -126t39 -155h-1300zM1202 1700v200h718l121 500h659v-197h-488l-62 -303h550v-200h-116l-180 -1700h-904l-182 1700h-116z" />
-<glyph unicode="&#xe277;" d="M600 50v1000q0 21 14.5 35.5t35.5 14.5h50v350q0 50 -50 200t-50 200v497l50 50l50 -50v-547h100v547l50 50l50 -50v-547h100v547l50 50l50 -50v-497q0 -40 -25 -109t-50 -148t-25 -143v-350h50q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5zM1400 50v1000q0 21 14.5 35.5t35.5 14.5h50v900q0 84 35 155.5t83 114.5t101.5 73t87.5 42t43 12q13 0 21.5 -1.5t18.5 -13.5t10 -35v-1347v-950q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe278;" d="M-3 872q100 285 260 539t400 498q446 455 1037 660l89 -273q-523 -228 -906 -607t-608 -908zM435 726q8 18 23.5 50.5t67.5 129t110.5 188.5t150.5 212.5t188 218.5t220.5 196.5t233.5 169t204.5 127t150.5 84.5l56 29l660 -1979v-369q0 -47 -31.5 -69.5t-76.5 -8.5 l-84 29q-45 15 -76.5 58.5t-31.5 90.5v255l-100 33v-388q0 -104 -83 -78l-197 62q-46 16 -83 60t-37 89v389l-100 33v-145q0 -46 -32.5 -72.5t-78.5 -16.5l-78 18q-46 10 -78.5 50.5t-32.5 87.5v178zM761 734l590 -198q86 98 82 231t-98 227q-99 99 -239 99t-239 -99 q-43 -48 -67 -113t-26 -106zM1162 1402q0 -72 51 -123t123 -51t122 51q51 51 51 123t-51 122q-50 51 -122 51t-123 -51q-51 -50 -51 -122zM1608 669.5q0 -52.5 38 -89.5q37 -38 89.5 -38t90.5 38q37 37 37 89.5t-37 89.5q-38 37 -90.5 37t-89.5 -37q-38 -37 -38 -89.5z M1648 1401.5q0 -114.5 81 -195.5q64 -64 154 -77.5t167 27.5l-179 515q-84 -16 -142 -73q-81 -82 -81 -196.5zM1986 602q0 -62 43 -106q44 -44 106.5 -44t106.5 44t44 106t-44 106t-106.5 44t-106.5 -44q-43 -44 -43 -106z" />
-<glyph unicode="&#xe279;" d="M-100 467v189l9 3q33 10 93 38t89 38q8 -25 19 -95.5t31 -118t61 -73.5q27 -17 57 -19t56 7t56 27.5t52 37t50 40.5t45 33q13 -23 31 -68.5t31.5 -78.5t40.5 -65.5t62 -45.5q29 -8 51.5 -9t47 11.5t43 26.5t40.5 36.5t37.5 41t34.5 40t33 34.5q15 -18 35.5 -52.5 t38.5 -62t40.5 -55.5t52 -43.5t63.5 -15.5q33 0 62.5 15.5t52.5 43t40.5 55t38.5 62.5t35 53q20 -18 55.5 -59t61 -68.5t66 -47.5t81.5 -13q33 6 59.5 26t45 51.5t31 61.5t27 68t25.5 58l73 -54q29 -23 51.5 -38t56 -31.5t60.5 -20t57 7.5t53 41q25 32 37.5 74.5t21.5 98.5 t17 83q28 -9 76 -28.5t82 -34.5l34 -16v-189q0 -48 -27.5 -92.5t-64 -74.5t-93.5 -59.5t-94.5 -44t-88.5 -32.5q-385 -131 -932 -131q-528 0 -907 123q-43 14 -76 26t-83.5 34t-87.5 46t-72.5 54.5t-54.5 69.5t-19 81zM-100 827v473h6q22 79 123 150t271 126v124 q44 85 100 122v328q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-240q49 15 100 27v413q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-380q90 11 200 16v164q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-164q110 -5 200 -16v380 q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-413q51 -12 100 -27v240q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-328q25 -16 50 -46.5t38 -53.5l12 -22v-136q358 -131 394 -264h6v-474q-7 3 -46 21.5t-55.5 25.5t-52 17t-57 8.5 t-48.5 -11.5t-47 -33q-26 -30 -40 -71t-23.5 -102.5t-14.5 -80.5q-17 11 -43.5 31.5t-47.5 38t-49 35t-52 26.5t-53 9t-56 -13q-31 -15 -55.5 -47t-37.5 -61.5t-30 -74.5t-27 -65q-18 17 -52.5 56.5t-58 63.5t-61.5 44.5t-78 20.5q-38 -3 -73 -29.5t-54 -54.5t-47 -75 t-40 -64q-14 19 -41.5 63.5t-47 74t-54 56t-72.5 29.5q-31 3 -61 -7.5t-56.5 -33.5t-46.5 -45t-46 -53t-40 -46q-11 21 -34.5 84t-50 103.5t-66.5 60.5q-27 13 -55.5 13t-53 -9t-53 -26.5t-48.5 -34t-47 -38.5t-43 -33q-7 25 -16 82.5t-23 100t-40 72.5q-67 75 -306 -27z M51 1242q4 -11 11 -21.5t19 -20t21 -16.5t26 -16t24 -12.5t26 -12t21 -9.5q210 -98 460.5 -134.5t540.5 -36.5q632 0 1001 172q2 1 18.5 8.5l22 10t21 11t23 13.5t20.5 13.5t19.5 16t13.5 17t10 19.5t-7 23t-29.5 26.5t-42 27.5t-49.5 27.5t-47.5 23t-39.5 18t-22 10.5h-51 q-40 -36 -100 -65.5t-105.5 -44.5t-115.5 -34q-257 -69 -540 -69t-540 69q-70 19 -115.5 34t-105.5 44.5t-100 65.5h-51q-3 -2 -35 -16.5t-64.5 -31.5t-67 -37t-54.5 -39.5t-16 -33.5zM400 2400q0 4 0.5 12t6 36t15 60t30 84t48.5 108q44 -89 69 -164t28 -106l3 -30 q0 -41 -29.5 -70.5t-70.5 -29.5t-70.5 29.5t-29.5 70.5zM418 1713q-28 -29 2 -61t96.5 -57t112 -39t78.5 -22q223 -54 493 -54t494 54q34 8 78.5 22t111.5 39t96.5 57t1.5 61q-13 -13 -32 -13h-100q-21 0 -35.5 14.5t-14.5 35.5v56q-41 14 -100 28v-84q0 -21 -14.5 -35.5 t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v120q-86 11 -200 16v-236q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v236q-112 -5 -200 -16v-20q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-35 0 -47 35q-49 -12 -103 -29v-56q0 -21 -14.5 -35.5 t-35.5 -14.5h-100q-5 0 -13 3t-13 7zM700 2600q0 4 0.5 12t6 36t15 60t30 84t48.5 108q44 -89 69 -164t28 -106l3 -30q0 -41 -29.5 -70.5t-70.5 -29.5t-70.5 29.5t-29.5 70.5zM1100 2400q0 4 0.5 12t6 36t15 60t30 84t48.5 108q44 -89 69 -164t28 -106l3 -30 q0 -41 -29.5 -70.5t-70.5 -29.5t-70.5 29.5t-29.5 70.5zM1500 2600q0 4 0.5 12t6 36t15 60t30 84t48.5 108q44 -89 69 -164t28 -106l3 -30q0 -41 -29.5 -70.5t-70.5 -29.5t-70.5 29.5t-29.5 70.5zM1800 2400q0 4 0.5 12t6 36t15 60t30 84t48.5 108q44 -89 69 -164t28 -106 l3 -30q0 -41 -29.5 -70.5t-70.5 -29.5t-70.5 29.5t-29.5 70.5z" />
-<glyph unicode="&#xe280;" d="M-100 200v1900h1100v200h100v400h100v-400h100v-200h1100v-1900h-2500zM0 1400h200v500h-200v-500zM300 700h1700v1200h-1700v-1200zM2100 1400h200v500h-200v-500z" />
-<glyph unicode="&#xe281;" d="M6.5 2010q2.5 23 17.5 38l143 144q15 14 38 16.5t40 -8.5l284 -184q17 -11 29 -34t11 -44l-3 -52q-1 -21 9 -46t25 -39l306 -302l-192 -179l-300 295q-15 15 -40 24.5t-46 8.5l-52 -2q-20 -1 -43 11t-34 29l-184 284q-11 17 -8.5 40zM54 376q0 42 29 70l1152 1152 q-64 195 11.5 387.5t259.5 296.5q97 55 193 74t198.5 -2t196.5 -88l-497 -266l278 -446l483 243q12 -171 -65.5 -301t-224.5 -213q-115 -64 -244 -75t-242 30l-1004 -1004l-141 -141q-29 -29 -71 -29t-71 29l-212 212q-29 29 -29 71zM1233 646l353 370l642 -588 q16 -14 16 -34.5t-14 -35.5l-350 -350q-15 -14 -35.5 -14t-34.5 16z" />
-<glyph unicode="&#xe282;" d="M0 0v700h100v-700h-100zM100 800v700h100v-700h-100zM200 0v700h1000l100 -100v-500l-100 -100h-1000zM200 1600v700h100v-700h-100zM300 550h900v50h-900v-50zM300 800v700h1000l100 -100v-500l-100 -100h-1000zM400 1350h900v50h-900v-50zM400 1600v700h1000l100 -100 v-500l-100 -100h-1000zM500 2150h900v50h-900v-50zM1400 100v500h300l702 -250l-702 -250h-300zM1500 450h200v50h-200v-50zM1500 900v500h100h200l702 -250l-702 -250h-300zM1600 1250h200v50h-200v-50zM1600 1700v500h100h200l702 -250l-702 -250h-300zM1700 2050h200v50 h-200v-50z" />
-<glyph unicode="&#xe283;" d="M-100 400l704 200l489 1850l369 -1706l269 833l192 -977l477 -200h-571l-91 260l-333 -729l-335 1269l-270 -800h-900z" />
-<glyph unicode="&#xe284;" d="M-200 1500l1003 800q0 -4 3.5 -22.5t15.5 -51t29.5 -68.5t49.5 -73t72 -67t100 -49t130 -19q96 0 172.5 36t117.5 85t67.5 102.5t34.5 86.5t7 40l998 -800l-400 -400l-400 267v-1267q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v1267l-400 -267z " />
-<glyph unicode="&#xe285;" d="M300 0l300 2200v200h1300v-200l300 -2200h-700l-200 1600h-100l-200 -1600h-700z" />
-<glyph unicode="&#xe286;" d="M-196 492q-3 29 1.5 52t14 43t9.5 25l628 1241q7 18 31 38t45 29l467 194v236q0 21 15 35.5t35 14.5h402q20 0 34 -14.5t14 -35.5v-236l468 -194q22 -9 46 -29t31 -38l628 -1241q0 -5 9 -25t14 -43t2 -52t-31 -61t-81 -60q-45 -24 -82.5 -30t-62 1t-48 26t-36.5 38 t-31.5 46t-30.5 40l-466 761q-4 13 -11 17.5t-12.5 -1.5t-5.5 -19v-1200q0 -21 -13.5 -35.5t-34.5 -14.5h-1002q-21 0 -35.5 14.5t-14.5 35.5v1200q0 13 -5.5 19t-12 1.5t-10.5 -17.5l-466 -761q-11 -13 -29.5 -40t-32 -46t-36.5 -38.5t-48 -26t-62.5 -0.5t-82.5 30 q-53 28 -80.5 60t-30.5 61z" />
-<glyph unicode="&#xe287;" d="M-50 450l250 250l-250 250l250 250l-250 250l250 250l-250 250l300 300l250 -250l250 250l250 -250l250 250l250 -250l250 250l250 -250l250 250l300 -300l-250 -250l250 -250l-250 -250l250 -250l-250 -250l250 -250l-300 -300l-250 250l-250 -250l-250 250l-250 -250 l-250 250l-250 -250l-250 250l-250 -250z" />
-<glyph unicode="&#xe288;" d="M121 483q82 52 139.5 149.5t77 213.5t8 233.5t-70 222.5t-154.5 168q-45 190 4.5 328.5t184.5 253.5q165 -76 284.5 -68.5t198 73.5t124.5 142t65 139l18 62h500q3 -13 9 -34.5t31 -81t56.5 -108.5t89 -100.5t125 -75t167 -14t212.5 65.5q135 -114 184.5 -253t4.5 -328 q-81 -52 -135 -135.5t-76 -176.5t-18.5 -195t31 -192t79 -166.5t119.5 -120.5q-8 -155 -101 -277.5t-227 -139.5q-124 93 -177 123q-184 105 -357 45q-106 -37 -217 -136h-100q-53 47 -105 79.5t-96.5 51t-91.5 24t-84.5 3t-80 -16t-74 -28t-70.5 -39.5t-65 -43.5t-63 -46.5 q-14 -11 -21 -16q-134 17 -227 138.5t-101 276.5zM1074 2050q0 -73 51.5 -124.5t124.5 -51.5t124.5 51.5t51.5 124.5t-51.5 124.5t-124.5 51.5t-124.5 -51.5t-51.5 -124.5z" />
-<glyph unicode="&#xe289;" d="M199 1918q-3 77 11.5 137t30.5 105.5t30 69.5l14 25l815 -834v1179q10 -2 28 -7t70 -27t99.5 -52t105 -86.5t99 -126t70 -174.5t28.5 -227v-400l-157 -404l161 -141q25 77 79 133q98 98 254.5 91t264.5 -115l94 -94q109 -107 118 -258q11 -154 -95 -260q-96 -96 -238 -96 q-78 0 -152 31t-131 88l-380 373l-72 25l-46 -62v-528q0 -158 -102.5 -270.5t-247.5 -112.5t-247.5 112.5t-102.5 270.5v133q0 159 102.5 271.5t247.5 112.5q47 0 98.5 -11t51.5 -27v200l-395 161q-57 72 -269 283q-87 87 -142 180.5t-73.5 174t-21.5 157.5zM800 283 q0 -74 44.5 -128.5t105.5 -54.5t105.5 54.5t44.5 128.5v133q0 75 -44.5 129.5t-105.5 54.5t-105.5 -54.5t-44.5 -129.5v-133zM1788 840q5 -74 60 -129l95 -94q59 -61 139 -61q59 0 96 37q42 40 37 107q-5 74 -60 129l-94 94q-61 61 -140 61q-58 0 -96 -38q-42 -40 -37 -106z " />
-<glyph unicode="&#xe290;" d="M0 910q0 142 51.5 279.5t136.5 246t191.5 192t220.5 130.5v242h250q0 150 72.5 253.5t194.5 128.5q130 27 249.5 -42.5t179.5 -209.5q53 -124 146 -149q79 -22 191 23l-173 51l260 77l-130 238l238 -130l77 260l76 -260l239 130l-130 -238l260 -77l-260 -76l130 -239 l-239 130l-76 -260l-77 260l-238 -130l98 178q-100 -45 -190 -45q-43 0 -83 10q-141 39 -211 205q-51 118 -140 166t-177 30q-29 -6 -54 -17t-50.5 -33t-43 -52.5t-28.5 -77t-11 -104.5h250v-242q292 -91 446 -318t154 -530q0 -183 -71.5 -349.5t-192 -287t-287 -192 t-349.5 -71.5t-349.5 71.5t-287 192t-192 287t-71.5 349.5zM700 1800h50v100h-50v-100z" />
-<glyph unicode="&#xe291;" d="M192.5 1531.5q-1.5 20.5 1.5 81.5t14 121t40.5 141t74.5 150.5t123 140.5t178.5 121t249 81.5t326.5 31.5t326.5 -31t249 -83t179 -119.5t122.5 -142t74.5 -149t40.5 -142t14.5 -119.5t1.5 -83l-2 -31l-106 -200l-100 -500l-350 -100l-117 -200h-666l-117 200l-350 100 l-100 500l-105 200q-1 11 -2.5 31.5zM500 600h100l300 -300h600l300 300h100l-200 -500h-100l-100 -100h-600l-100 100h-100zM600 1130q0 -54 38.5 -92t91.5 -38h100q54 0 104.5 36t68.5 87l54 154q18 51 -7.5 87t-79.5 36h-240q-53 0 -91.5 -38.5t-38.5 -91.5v-140z M1046 724q13 -24 54 -24h200q41 0 54.5 24t-9.5 59l-89 134q-23 34 -55.5 34t-55.5 -34l-89 -134q-23 -35 -10 -59zM1343 1277l54 -154q18 -51 69 -87t104 -36h100q54 0 92 38t38 92v140q0 53 -38 91.5t-92 38.5h-240q-53 0 -79 -36t-8 -87z" />
-<glyph unicode="&#xe292;" d="M0 1300h1200l-500 -550v-650h300v-100h-800v100h300v650zM1300 100v1200q0 55 31 108.5t75 97.5l88 88t75 97.5t31 108.5v300h500v-300q0 -55 31 -108.5t75 -97.5l88 -88t75 -97.5t31 -108.5v-1200q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5z M1400 100h50v1100h-50v-1100zM1600 2200v200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5v-200h-500z" />
-<glyph unicode="&#xe293;" d="M-138 779l150 150l438 -279q3 8 8.5 21t27 53t47.5 77t71 85t96 86v197q-10 -29 -34 -48.5t-55 -20.5q-41 -2 -72 26t-33 69l-1 14q-2 30 -2 47q0 505 232 774.5t667 269.5q434 0 666 -269.5t232 -774.5q0 -17 -2 -47l-1 -14q-1 -40 -30 -67.5t-69 -27.5h-5 q-37 0 -63 26.5t-30 63.5v-294q255 -228 300 -496q0 -77 -22 -140.5t-57.5 -104t-78 -71t-85 -46t-78 -25t-57.5 -11.5l-22 -2h-1450zM703 1267q12 33 47 33q21 0 35.5 -15t14.5 -35v-215q94 47 200 65v100h800v-100q90 -42 200 -123v273q0 20 15 35t35 15t34.5 -14.5 t15.5 -34.5v4q0 427 -172.5 636t-525.5 209q-350 0 -523 -206.5t-176 -626.5zM1000 1300q0 44 52.5 91t131.5 78t152 31q-57 38 -57 100q0 50 35.5 85.5t85.5 35.5t85.5 -35.5t35.5 -85.5q0 -64 -57 -100q117 0 226.5 -66t109.5 -134h-800z" />
-<glyph unicode="&#xe294;" d="M100 1900h300h1500v-100h178q87 0 164.5 -33t107.5 -105q14 -35 14.5 -104t-14 -156.5t-40.5 -176t-68.5 -171t-93.5 -133.5q-151 -151 -248 -413v-208q0 -124 -88 -212t-212 -88h-900q-124 0 -212 88t-88 212v1300zM400 2000v100q0 41 59 70.5t141 29.5h500v100 q-82 0 -141 29.5t-59 70.5t59 70.5t141 29.5h100q82 0 141 -29.5t59 -70.5t-59 -70.5t-141 -29.5v-100h500q82 0 141 -29.5t59 -70.5v-100h-1500zM500 300h50v1300h-50v-1300zM1900 937q47 64 107 126q45 44 76 115t41.5 142t10 135t-16 104.5t-40.5 40.5h-178v-100v-563z " />
-<glyph unicode="&#xe295;" d="M0 300h2300l-232 -200l-67 -45q-35 -23 -89 -39t-94 -16h-1335q-41 0 -95 16t-89 39l-66 45zM200 700v1200h1900v-300h100q124 0 212 -88t88 -212v-200q0 -124 -88 -212t-212 -88h-100v-100q0 -124 -88 -212t-212 -88h-1300q-124 0 -212 88t-88 212zM747 1277 q0 -34 12 -66t43.5 -71t53 -62t73.5 -74q137 -135 197 -216l24 -33l24 33q60 81 197 216q52 51 73.5 74t53 62t43.5 71t12 66q0 95 -71 166.5t-165 71.5q-95 0 -166 -77q-69 77 -164 77q-96 0 -168 -71.5t-72 -166.5zM2100 1000h100q41 0 70.5 29.5t29.5 70.5v200 q0 41 -29.5 70.5t-70.5 29.5h-100v-400z" />
-<glyph unicode="&#xe296;" d="M-100 1466q0 14 15 24t35 10h250v200h2100v-200h250q21 0 35.5 -10t14.5 -24t-11.5 -33t-28.5 -32l-260 -195v-906q0 -83 -58.5 -141.5t-141.5 -58.5h-1700q-83 0 -141.5 58.5t-58.5 141.5v906l-260 195q-17 13 -28.5 32t-11.5 33zM100 1850q0 21 15 35.5t35 14.5h50 q0 88 116 144t284 56h400v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h400q168 0 284 -56t116 -144h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-2200q-20 0 -35 14.5t-15 35.5zM300 300h50v1200h-50v-1200z" />
-<glyph unicode="&#xe297;" d="M300 0v2000q0 165 117.5 282.5t282.5 117.5h1000q165 0 282.5 -117.5t117.5 -282.5v-2000h-200v200h-1400v-200h-200zM485 772q1 -3 2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74zM487 1367l61 -122l63 123q13 32 -7.5 61.5t-55.5 29.5t-54.5 -30 t-6.5 -62zM500 1900h1400v200q0 41 -29.5 70.5t-70.5 29.5h-1200q-41 0 -70.5 -29.5t-29.5 -70.5v-200zM585 472l2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74zM585 1672q1 -3 2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74zM587 1067 l61 -122l63 123q13 32 -7.5 61.5t-55.5 29.5t-54.5 -30t-6.5 -62zM685 772q1 -3 2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74zM685 1372q1 -3 2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74zM782 1692q0 -14 5 -25l61 -122l63 123 q19 49 -23 76q-35 22 -71 6q-34 -16 -35 -58zM785 472l2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74zM787 1067l61 -122l63 123q13 32 -7.5 61.5t-55.5 29.5t-54.5 -30t-6.5 -62zM885 772q1 -3 2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1 q-45 -21 -27 -74zM885 1372q1 -3 2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74zM982 1692q0 -14 5 -25l61 -122l63 123q19 49 -23 76q-35 22 -71 6q-34 -16 -35 -58zM985 472l2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74zM987 1067 l61 -122l63 123q13 32 -7.5 61.5t-55.5 29.5t-54.5 -30t-6.5 -62zM1085 772q1 -3 2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74zM1085 1372q1 -3 2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74zM1182 1692q0 -14 5 -25l61 -122l63 123 q19 49 -23 76q-35 22 -71 6q-35 -15 -35 -58zM1185 472l2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74zM1187 1067l61 -122l63 123q13 32 -7.5 61.5t-55.5 29.5t-54.5 -30t-6.5 -62zM1285 772q1 -3 2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1 q-45 -21 -27 -74zM1285 1372q1 -3 2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74zM1382 1692q0 -14 5 -25l61 -122l63 123q19 49 -23 76q-35 22 -71 6q-35 -15 -35 -58zM1385 472l2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74z M1387 1067l61 -122l63 123q13 32 -7.5 61.5t-55.5 29.5t-54.5 -30t-6.5 -62zM1485 772q1 -3 2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74zM1485 1372q1 -3 2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74zM1582 1692q0 -14 5 -25 l61 -122l63 123q19 49 -23 76q-35 22 -71 6q-35 -15 -35 -58zM1585 472l2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74zM1587 1067l61 -122l63 123q13 32 -7.5 61.5t-55.5 29.5t-54.5 -30t-6.5 -62zM1685 772q1 -3 2 -5l61 -122l63 123q21 54 -24 77 q-37 19 -75 1q-45 -21 -27 -74zM1685 1372q1 -3 2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74zM1785 472l2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74zM1785 1072q1 -3 2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1 q-45 -21 -27 -74zM1785 1672q1 -3 2 -5l61 -122l63 123q21 54 -24 77q-37 19 -75 1q-45 -21 -27 -74z" />
-<glyph unicode="&#xe298;" d="M100 2100h300h100q5 6 14 15.5t41 37.5t69.5 54t99 57t128.5 53.5t158.5 38t189.5 15.5q109 0 217 -9t226.5 -32.5t223.5 -58.5t201 -91.5t164.5 -127.5t109.5 -170.5t41 -216.5q0 -115 -26.5 -225t-69 -196.5t-94 -166t-103.5 -143t-94.5 -117t-69 -99t-26.5 -78.5 q1 -5 3 -13.5t3 -33.5t-2 -47.5t-15.5 -50.5t-34 -48t-61.5 -33.5t-93 -13.5h-1100q-82 0 -141 59t-59 141v586zM200 0l200 200v100h1500v-100l200 -200h-1900zM1300 900h100v-100h-79q20 -45 54.5 -72.5t74.5 -27.5q62 0 106 58.5t44 141.5v700q0 83 -44 141.5t-106 58.5 q-40 0 -74.5 -27.5t-54.5 -72.5h79v-100h-100v-100h100v-100h-100v-100h100v-100h-100v-100h100v-100h-100v-100zM1900 1175q15 14 49.5 43.5t51 45.5t44 46.5t41.5 59t30 69t22.5 91.5t6.5 112q0 64 -16 113.5t-40.5 78t-58.5 47.5t-65 26t-65 9v-741z" />
-<glyph unicode="&#xe299;" d="M0 250v1900q0 104 73 177t177 73h1900q104 0 177 -73t73 -177v-1900q0 -104 -73 -177t-177 -73h-1900q-104 0 -177 73t-73 177zM300 900h600v-600h600v600h600v600h-600v600h-600v-600h-600v-600z" />
-<glyph unicode="&#xe300;" d="M0 250v1900q0 104 73 177t177 73h1900q104 0 177 -73t73 -177v-1900q0 -104 -73 -177t-177 -73h-1900q-104 0 -177 73t-73 177zM400 300h500v800h600v-800h500v1800h-500v-600h-600v600h-500v-1800z" />
-<glyph unicode="&#xe301;" d="M400 1550q0 21 14.5 35.5t35.5 14.5h250v-501q0 -105 33 -192t88 -145t128 -98.5t151 -59t158 -18.5q97 0 194 39.5t174 106t125.5 163.5t48.5 204v501h250q21 0 35.5 -14.5t14.5 -35.5t-14.5 -38t-34.5 -20l-51 -9v-384q0 -112 -33 -212.5t-85 -173t-120 -131.5 t-133 -94.5t-129 -56.5v-118l300 -136v-177h-1100v177l300 136v118q-64 21 -129 56.5t-133 94.5t-120 131.5t-85 173t-33 212.5v384l-51 9q-20 3 -34.5 20t-14.5 38zM800 1161v339h900v-339q0 -32 -13 -79t-46.5 -106.5t-82 -109.5t-129.5 -84.5t-179 -34.5t-179 34.5 t-129.5 84.5t-82 109.5t-46.5 106.5t-13 79zM800 1600v350q0 122 60.5 226t164 164t225.5 60t226 -60t164 -164t60 -226v-350h-900zM900 1161q0 -29 25 -93.5t75 -117.5v70q-24 42 -37 82.5t-13 58.5v239h-50v-239zM900 1700h50v250q0 94 50 178v66q-100 -102 -100 -244 v-250z" />
-<glyph unicode="&#xe302;" d="M374 1450q0 171 68.5 328.5t184 273.5t272 188.5t326.5 82.5v-594q-145 -19 -252 -127.5t-107 -251.5t107 -252t252 -127v-371h50v371q145 18 252 127t107 252t-107 251.5t-252 127.5v594q170 -10 326.5 -82.5t272 -188.5t184 -273.5t68.5 -328.5q0 -296 -178.5 -528.5 t-456.5 -312.5l538 -538q29 -29 20.5 -50t-49.5 -21h-200q-41 0 -91.5 21t-79.5 50l-158 158q-29 29 -79.5 50t-91.5 21h-100q-41 0 -91.5 -21t-79.5 -50l-158 -158q-29 -29 -79.5 -50t-91.5 -21h-200q-41 0 -49.5 21t20.5 50l538 538q-278 80 -456.5 312.5t-178.5 528.5z M968 1324q52 -30 112 -30q94 0 160 66t66 160q0 60 -30 112q109 -10 183.5 -90.5t74.5 -191.5q0 -118 -83 -201t-201 -83q-111 0 -191.5 74.5t-90.5 183.5z" />
-<glyph unicode="&#xe303;" d="M0 1300v100l400 395v305h-200v100h200v200h100v-200h200v-100h-200v-305l400 -395v-100h-100v-700h1500v-600h100v-100h-2300v1400h-100zM900 700v400h1100l300 -300v-100h-1400zM1000 100h100v400h-100v-400zM1200 100h100v400h-100v-400zM1400 100h100v400h-100v-400z M1600 100h100v400h-100v-400zM1800 100h100v400h-100v-400zM2000 100h100v400h-100v-400z" />
-<glyph unicode="&#xe304;" d="M0 1250v100q0 21 14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5v50l250 600l250 -600v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-600h100v100h100v300h3q19 173 150.5 304 t326.5 176l120 120v150q0 20 14.5 35t35.5 15t35.5 -15t14.5 -35v-150l119 -120q196 -45 327.5 -176t150.5 -304h3v-300h100v-100h100v600h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5v50l250 600l250 -600v-50 q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-1300h-2300v1300h-50q-21 0 -35.5 14.5t-14.5 35.5zM400 100h100v400h-100v-400zM600 100h100v400h-100v-400zM800 100h100v400h-100v-400zM1600 100h100 v400h-100v-400zM1800 100h100v400h-100v-400zM2000 100h100v400h-100v-400z" />
-<glyph unicode="&#xe305;" d="M0 -100v600h2400v-600h-2400zM200 600v200h200l400 1200v200h200v100h400v-100h200v-200l400 -1200h200v-200h-2000zM1100 1000h200v300h-200v-300zM1100 1500h200v200h-200v-200zM1100 1800h200v100h-200v-100z" />
-<glyph unicode="&#xe306;" d="M-200 1100v100h100q48 0 168 61.5t223.5 135t108.5 103.5v100h-400v100h100q44 0 166 50t227 100t107 50v100h-200v100h100q44 0 141 50t177 100t82 50h600q2 0 82 -50t177 -100t141 -50h100v-100h-200v-100q2 0 107 -50t227 -100t166 -50h100v-100h-400v-100 q5 -30 108.5 -103.5t223.5 -135t168 -61.5h100v-100h-500v-500h300v-500h-2400v500h300v500h-500zM500 800h200v300h-200v-300zM900 800h200v300h-200v-300zM1300 800h200v300h-200v-300zM1700 800h200v300h-200v-300z" />
-<glyph unicode="&#xe307;" d="M-304 797q0 164 81 303t220 220t303 81q50 0 108 -10l147 409h-155q-41 0 -70.5 29.5t-29.5 70.5t29.5 70.5t70.5 29.5h267q69 0 104 -42t16 -105l-55 -153h885l122 300h-139q-41 0 -70.5 16t-29.5 37t29 41.5t70 27.5l402 66q41 7 70 -18.5t29 -66.5q0 -42 -29.5 -72.5 t-70.5 -30.5h-53l-3 -23l-124 -334l167 -282q107 40 213 40q164 0 303 -81t220 -220t81 -303t-81 -303t-220 -220t-303 -81q-223 0 -391.5 145t-203.5 362h-205q-42 0 -71 29l-696 697l-37 -103q140 -79 224 -219.5t84 -306.5q0 -164 -81 -303t-220 -220t-303 -81t-303 81 t-220 220t-81 303zM-104 797q0 -167 118.5 -285.5t285.5 -118.5t285.5 118.5t118.5 285.5q0 102 -47.5 190t-129.5 144l-133 -368q-11 -30 -37 -48t-57 -18q-18 0 -34 6q-39 14 -56.5 51.5t-3.5 76.5l132 366q-5 0 -18 2t-20 2q-167 0 -285.5 -118.5t-118.5 -285.5z M841 1500l519 -519l193 519h-712zM1543 900h63q18 107 72 200t136 161l-84 142zM1809 700q33 -134 142 -220.5t249 -86.5q167 0 285.5 118.5t118.5 285.5t-118.5 285.5t-285.5 118.5q-47 0 -107 -16l187 -314q4 -8 12 -34t8 -37q0 -41 -29.5 -70.5t-70.5 -29.5h-391z M1811 900h219l-111 186q-79 -76 -108 -186z" />
-<glyph unicode="&#xe308;" d="M20 1200q0 223 88.5 444t257.5 390q167 167 382.5 256.5t451.5 89.5t452 -89.5t382 -256.5q170 -169 258.5 -390t88.5 -444t-88.5 -444t-258.5 -390q-166 -167 -382 -256.5t-452 -89.5t-451.5 89.5t-382.5 256.5q-169 169 -257.5 390t-88.5 444zM181 1200 q0 -249 113 -469l269 197q-55 130 -55 272t55 272l-269 197q-113 -220 -113 -469zM685.5 1063q36.5 -137 138.5 -239q75 -76 172 -116t204 -40t204 40t172 116q76 75 116 172t40 204t-40 204t-116 172q-75 76 -172 116t-204 40t-204 -40t-172 -116q-102 -102 -138.5 -239 t0 -274zM731 294q220 -114 469 -114t469 114l-197 269q-130 -55 -272 -55t-272 55zM731 2106l197 -269q130 55 272 55t272 -55l197 269q-220 114 -469 114t-469 -114zM1837 928l269 -197q113 220 113 469t-113 469l-269 -197q55 -130 55 -272t-55 -272z" />
-<glyph unicode="&#xe309;" d="M11 1200q0 202 143.5 345.5t345.5 143.5q116 0 216.5 -51.5t169.5 -140.5l625 369q-11 49 -11 84q0 145 102.5 247.5t247.5 102.5t247.5 -102.5t102.5 -247.5t-102.5 -247.5t-247.5 -102.5q-137 0 -237 94l-639 -377q15 -63 15 -117q0 -50 -14 -113l641 -379 q100 92 234 92q145 0 247.5 -102.5t102.5 -247.5t-102.5 -247.5t-247.5 -102.5t-247.5 102.5t-102.5 247.5q0 39 12 87l-624 368q-68 -90 -169.5 -142t-218.5 -52q-202 0 -345.5 143.5t-143.5 345.5z" />
-<glyph unicode="&#xe310;" d="M0 900v1100q0 124 88 212t212 88h1800q124 0 212 -88t88 -212v-1100q0 -124 -88 -212t-212 -88h-1000l-600 -600v600h-200q-124 0 -212 88t-88 212z" />
-<glyph unicode="&#xe312;" d="M34 316q0 21 14 35l50 51q15 14 36 14t35 -14l50 -50l586 586q34 34 76.5 102t64.5 110.5t75 146.5q49 99 151.5 246.5t156.5 201.5l607 607q53 53 127 53q75 0 127 -52l213 -213q52 -50 52 -127q0 -75 -52 -127l-607 -607q-54 -54 -201.5 -156.5t-247.5 -152.5 q-92 -46 -143.5 -73t-116 -68t-98.5 -75l-587 -586l50 -49q14 -15 14 -35.5t-14 -35.5l-51 -50q-14 -15 -35 -15t-35 15l-283 283q-14 14 -14 35zM1139 1285q210 195 308 293l609 608l-59 58l-608 -608q-38 -38 -115.5 -146.5t-134.5 -204.5zM1788 400q0 130 91 221t221 91 t221.5 -91t91.5 -221t-91.5 -221.5t-221.5 -91.5t-221 91.5t-91 221.5z" />
-<glyph unicode="&#xe313;" d="M107 382q-21 177 21 404q193 -137 353 -297q196 -196 356 -435q-221 -38 -392 -16.5t-243 93.5q-74 74 -95 251zM226 1121q147 374 415 641q257 257 609 400q282 -175 507 -400q121 -120 231 -263t158 -219.5t80 -135.5q-143 -330 -389 -576q-275 -275 -668 -423 q-187 322 -449 583q-216 216 -494 393zM524 1485q0 -27 21 -50l87 -87l-54 -55q-21 -20 -21 -49.5t21 -49.5q21 -21 49 -21q27 0 50 21l54 55l88 -88q20 -20 49 -20q30 0 50 20q20 22 20 50q0 29 -20 49l-88 88l101 101l88 -88q20 -20 49 -20q30 0 50 20q20 22 20 50 q0 29 -20 49l-87 88l100 101l88 -88q20 -20 49 -20q30 0 50 20q20 22 20 50q0 29 -20 49l-87 88l59 59q20 20 20 49q0 30 -20 50q-22 20 -50 20q-29 0 -49 -20l-60 -59l-87 87q-19 21 -50 21q-30 0 -49 -21q-21 -21 -21 -49q0 -27 21 -50l87 -87l-101 -101l-87 87 q-19 21 -50 21q-30 0 -49 -21q-21 -21 -21 -49q0 -27 21 -50l87 -87l-101 -101l-87 87q-20 21 -50 21t-49 -21q-21 -21 -21 -49zM1667 2281q212 33 376 10t233 -92q72 -72 93.5 -242.5t-16.5 -391.5q-160 239 -356 435q-147 147 -330 281z" />
-<glyph unicode="&#xe314;" d="M-99 283q3 9 9 24t26 59t43 85.5t60.5 93.5t76.5 92q228 222 573 567l11 -2v142l389 401l347 -354q-900 -895 -1042 -1037q-63 -63 -116 -151.5t-74 -145.5l-22 -57zM1077 1887l495 494l990 -990q-5 -8 -13 -21.5t-37.5 -57t-62 -81t-84.5 -93.5t-106 -94t-126.5 -82.5 t-145.5 -60t-163.5 -26t-180.5 20.5q0 85 -9 200t-18 188l-9 72zM1218 1887l55 -55l354 353l-55 55z" />
-<glyph unicode="&#xe315;" d="M-66 353q2 -33 29.5 -72t84.5 -97q56 -54 97 -83.5t73 -31.5q37 48 125.5 149.5t148.5 161.5q8 8 38 41t46.5 48t48 36.5t63.5 33.5l104 188l-200 199l-188 -103q-12 -33 -33 -64t-37.5 -48t-47.5 -46t-40 -38q-60 -59 -160.5 -146t-151.5 -128zM321 1339 q-21 366 330 719q130 130 288.5 207t329 94t349.5 -50.5t333 -221.5t221.5 -333t50.5 -349.5t-94.5 -328.5t-207.5 -288q-166 -167 -349 -254t-371 -75l-15 15l-848 848zM1733 250q0 -90 63.5 -153.5t153.5 -63.5t153.5 63.5t63.5 153.5t-63.5 153.5t-153.5 63.5 t-153.5 -63.5t-63.5 -153.5z" />
-<glyph unicode="&#xe316;" d="M75 1200q0 229 89 437t240 359t359 240t437 89t437 -89t359 -240t240 -359t89 -437t-89 -437t-240 -359t-359 -240t-437 -89t-437 89t-359 240t-240 359t-89 437zM1170 1550q0 -74 53 -127t127 -53t127 53t53 127t-53 127t-127 53t-127 -53t-53 -127zM1470 1850 q0 -74 53 -127t127 -53t127 53t53 127t-53 127t-127 53t-127 -53t-53 -127zM1770 1350q0 -74 53 -127t127 -53t127 53t53 127t-53 127t-127 53t-127 -53t-53 -127z" />
-<glyph unicode="&#xe317;" d="M225 510.5q-4 10.5 11 24.5l474 465h-356q-21 0 -25 10.5t10 24.5l475 465h-256q-21 0 -25 10.5t10 24.5l474 465h-156q-20 0 -24 10.5t10 24.5l367 360q15 14 36 14t36 -14l367 -360q15 -14 10.5 -24.5t-24.5 -10.5h-156l474 -465q14 -14 10 -24.5t-24 -10.5h-256 l474 -465q14 -14 10 -24.5t-25 -10.5h-355l474 -465q14 -14 10 -24.5t-25 -10.5h-750v-400l100 -100h-700l100 100v400h-750q-21 0 -25 10.5z" />
-<glyph unicode="&#xe318;" d="M200 1400q0 105 65 186.5t165 104.5q-30 79 -30 159q0 122 60.5 226t164 164t225.5 60q38 0 81 -8q41 93 127 150.5t192 57.5q136 0 235.5 -92.5t111.5 -226.5q51 19 103 19q124 0 212 -88t88 -212q0 -71 -34 -137q105 -48 169.5 -145.5t64.5 -217.5q0 -139 -85 -246 t-216 -140q0 -2 0.5 -7t0.5 -7q4 -72 -17 -134.5t-61 -102t-90.5 -57t-112 0.5t-119.5 71v-678l100 -100h-700l100 100v638q-48 -68 -114.5 -101.5t-133 -31t-132 33t-115 82t-79 125t-26.5 154.5q3 65 18 113q-95 27 -156.5 106.5t-61.5 180.5z" />
-<glyph unicode="&#xe319;" d="M100 50v1900q0 21 14.5 35.5t35.5 14.5h1650v-1950q0 -21 -14.5 -35.5t-35.5 -14.5h-1600q-21 0 -35.5 14.5t-14.5 35.5zM500 2100v250q0 20 16.5 35t37.5 15h1596q21 0 35.5 -14.5t14.5 -35.5v-1900q0 -21 -14.5 -35.5t-35.5 -14.5h-250v1700h-1400z" />
-<glyph unicode="&#xe320;" d="M-100 -50v1600q0 21 14.5 35.5t35.5 14.5h1650v-1650q0 -21 -14.5 -35.5t-35.5 -14.5h-1600q-21 0 -35.5 14.5t-14.5 35.5zM300 1750v200q0 20 16.5 35t37.5 15h1596q21 0 35.5 -14.5t14.5 -35.5v-1600q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5 v1350h-1346q-21 0 -37.5 15t-16.5 35zM700 2150v200q0 20 16.5 35t37.5 15h1596q21 0 35.5 -14.5t14.5 -35.5v-1600q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v1350h-1346q-21 0 -37.5 15t-16.5 35z" />
-<glyph unicode="&#xe321;" d="M200 2264v136h2000v-136q0 -41 -29.5 -70.5t-70.5 -29.5h-1800q-41 0 -70.5 29.5t-29.5 70.5zM300 2100h1800l-700 -1100v-600l-400 -400v1000zM509 2000l617 -971h100l-618 971h-99z" />
-<glyph unicode="&#xe322;" d="M-3 564l312 1274q30 120 136 182t225 29l430 -149h300l424 149q119 33 225 -29t135 -182l313 -1274q18 -83 6.5 -150t-52 -111.5t-98.5 -49.5q-89 -8 -202.5 58.5t-184.5 167.5l-254 363q-78 -42 -162 -42q-94 0 -173.5 46.5t-126.5 125.5q-47 -79 -126.5 -125.5 t-173.5 -46.5q-86 0 -167 44l-255 -365q-71 -101 -185 -167.5t-203 -58.5t-131 99.5t-12 211.5zM500 1600h100v-100h100v100h100v100h-100v100h-100v-100h-100v-100zM762 1150q0 -78 55 -133t133 -55t133 55t55 133t-55 133t-133 55t-133 -55t-55 -133zM1362 1150 q0 -78 55 -133t133 -55t133 55t55 133t-55 133t-133 55t-133 -55t-55 -133zM1560 1650q0 -37 26.5 -63.5t63.5 -26.5t63.5 26.5t26.5 63.5t-26.5 63.5t-63.5 26.5t-63.5 -26.5t-26.5 -63.5zM1760 1450q0 -37 26.5 -63.5t63.5 -26.5t63.5 26.5t26.5 63.5t-26.5 63.5 t-63.5 26.5t-63.5 -26.5t-26.5 -63.5zM1760 1850q0 -37 26.5 -63.5t63.5 -26.5t63.5 26.5t26.5 63.5t-26.5 63.5t-63.5 26.5t-63.5 -26.5t-26.5 -63.5zM1960 1650q0 -37 26.5 -63.5t63.5 -26.5t63.5 26.5t26.5 63.5t-26.5 63.5t-63.5 26.5t-63.5 -26.5t-26.5 -63.5z" />
-<glyph unicode="&#xe323;" d="M0 300v900q0 124 88 212t212 88h900q124 0 212 -88t88 -212v-900q0 -124 -88 -212t-212 -88h-900q-124 0 -212 88t-88 212zM170 350q0 -74 53 -127t127 -53t127 53t53 127t-53 127t-127 53t-127 -53t-53 -127zM170 1150q0 -74 53 -127t127 -53t127 53t53 127t-53 127 t-127 53t-127 -53t-53 -127zM570 750q0 -74 53 -127t127 -53t127 53t53 127t-53 127t-127 53t-127 -53t-53 -127zM939 1600l599 598q88 88 212.5 88t211.5 -88l637 -636q87 -88 87 -212.5t-87 -211.5l-637 -637q-73 -72 -175 -84t-187 38v296q24 -37 64 -59t86 -22 q74 0 127 53t53 127t-53 127t-127 53q-46 0 -86 -22t-64 -59v351q0 124 -88 212t-212 88h-361zM970 350q0 -74 53 -127t127 -53t127 53t53 127t-53 127t-127 53t-127 -53t-53 -127zM970 1150q0 -74 53 -127t127 -53t127 53t53 127t-53 127t-127 53t-127 -53t-53 -127z M1570 1850q0 -74 53 -127t127 -53t127 53t53 127t-53 127t-127 53t-127 -53t-53 -127zM2070 1350q0 -74 53 -127t127 -53t127 53t53 127t-53 127t-127 53t-127 -53t-53 -127z" />
-<glyph unicode="&#xe324;" d="M200 300v1800q0 124 88 212t212 88h1500q124 0 212 -88t88 -212v-1800q0 -124 -88 -212t-212 -88h-1500q-124 0 -212 88t-88 212zM500 320q0 -8 6 -14t14 -6h260q8 0 14 6t6 14v160q0 8 -6 14t-14 6h-260q-8 0 -14 -6t-6 -14v-160zM500 620q0 -8 6 -14t14 -6h260 q8 0 14 6t6 14v160q0 8 -6 14t-14 6h-260q-8 0 -14 -6t-6 -14v-160zM500 920q0 -8 6 -14t14 -6h260q8 0 14 6t6 14v160q0 8 -6 14t-14 6h-260q-8 0 -14 -6t-6 -14v-160zM500 1220q0 -8 6 -14t14 -6h260q8 0 14 6t6 14v160q0 8 -6 14t-14 6h-260q-8 0 -14 -6t-6 -14v-160z M500 1700q0 -41 29.5 -70.5t70.5 -29.5h1300q41 0 70.5 29.5t29.5 70.5v300q0 41 -29.5 70.5t-70.5 29.5h-1300q-41 0 -70.5 -29.5t-29.5 -70.5v-300zM900 320q0 -8 6 -14t14 -6h260q8 0 14 6t6 14v160q0 8 -6 14t-14 6h-260q-8 0 -14 -6t-6 -14v-160zM900 620q0 -8 6 -14 t14 -6h260q8 0 14 6t6 14v160q0 8 -6 14t-14 6h-260q-8 0 -14 -6t-6 -14v-160zM900 920q0 -8 6 -14t14 -6h260q8 0 14 6t6 14v160q0 8 -6 14t-14 6h-260q-8 0 -14 -6t-6 -14v-160zM900 1220q0 -8 6 -14t14 -6h260q8 0 14 6t6 14v160q0 8 -6 14t-14 6h-260q-8 0 -14 -6 t-6 -14v-160zM1300 320q0 -8 6 -14t14 -6h260q8 0 14 6t6 14v160q0 8 -6 14t-14 6h-260q-8 0 -14 -6t-6 -14v-160zM1300 620q0 -8 6 -14t14 -6h260q8 0 14 6t6 14v160q0 8 -6 14t-14 6h-260q-8 0 -14 -6t-6 -14v-160zM1300 920q0 -8 6 -14t14 -6h260q8 0 14 6t6 14v160 q0 8 -6 14t-14 6h-260q-8 0 -14 -6t-6 -14v-160zM1300 1220q0 -8 6 -14t14 -6h260q8 0 14 6t6 14v160q0 8 -6 14t-14 6h-260q-8 0 -14 -6t-6 -14v-160zM1700 320q0 -8 6 -14t14 -6h260q8 0 14 6t6 14v760q0 8 -6 14t-14 6h-260q-8 0 -14 -6t-6 -14v-760zM1700 1220 q0 -8 6 -14t14 -6h260q8 0 14 6t6 14v160q0 8 -6 14t-14 6h-260q-8 0 -14 -6t-6 -14v-160z" />
-<glyph unicode="&#xe325;" d="M600 401l330 1400l-220 381l440 220l440 -220l-220 -381l330 -1401l-550 -500z" />
-<glyph unicode="&#xe326;" d="M-100 300v1400q0 75 62.5 137.5t137.5 62.5h650v-500q0 -82 34 -116t116 -34h300q82 0 116 34t34 116v497v3h750q41 0 70.5 -29.5t29.5 -70.5v-1400q0 -75 -62.5 -137.5t-137.5 -62.5h-2000q-41 0 -70.5 29.5t-29.5 70.5zM150 2000l100 100h700l-100 -100h-700zM800 1400 v500q243 241 250 250q20 22 45.5 34.5t41.5 13.5l16 2h347q41 0 70.5 -29.5t29.5 -70.5h652q60 0 104 -41t44 -109v-1400l-100 -100v1450q0 41 -29.5 70.5t-70.5 29.5h-750l100 100h-50q-200 -202 -200 -203v-497q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5 t-29.5 70.5zM946 1550q0 -44 30.5 -74.5t73.5 -30.5q44 0 74.5 30.5t30.5 74.5q0 43 -30.5 73.5t-74.5 30.5t-74 -30t-30 -74z" />
-<glyph unicode="&#xe327;" d="M100 300v1800q0 124 88 212t212 88h1700q124 0 212 -88t88 -212v-1800q0 -124 -88 -212t-212 -88h-1700q-124 0 -212 88t-88 212zM300 200h400v600h-100v900h-300v-1500zM800 200h400v600h-100v900h-200v-900h-100v-600zM1300 200h400v600h-100v900h-200v-900h-100v-600z M1800 200h400v1500h-300v-900h-100v-600z" />
-<glyph unicode="&#xe328;" d="M-101 653.5q0 12.5 1.5 34.5t5.5 35t11.5 29.5t18.5 25.5t28 15.5t39 6.5h137h685h1175q24 0 42.5 -7t29 -22t17 -28.5t8.5 -37.5t2.5 -38t0.5 -39v-16v-297q0 -9 1.5 -42.5t0 -50t-6 -42.5t-17.5 -43t-34 -27q-24 -12 -61 -10h-34h-1395h-528h-19q-13 0 -19 1 q-46 5 -67 39.5t-21 83.5v361q0 9 -0.5 32.5t-0.5 36zM52 1225q0 14 1 24t7.5 26t10.5 24.5t15 25t15.5 23t16.5 23t15 20.5q109 151 191 262q2 3 17.5 24.5t23.5 31.5q27 37 73 37q37 0 69 -24l111 -81q168 -124 503 -370.5t503 -370.5h-526h-524h-103q-2 0 -12.5 -1 t-16.5 -1q-10 0 -12 2q-31 23 -91 69l-244 186q-14 10 -23 22t-14.5 23t-5.5 25zM828 2007q1 19 6 39.5t21 35t42 22.5q59 19 168 55.5t143 47.5q8 2 52.5 19t78 26t62.5 9q72 0 93 -65q32 -96 47 -143l393 -1191q-98 72 -147 107l1 -1l-193 141q2 -1 5.5 -3.5t5.5 -4.5 q-428 310 -642 466l-87 267q-4 11 -14.5 38t-16 44.5t-12.5 44.5t-6 46zM1600 450q0 -62 44 -106t106 -44t106 44t44 106t-44 106t-106 44t-106 -44t-44 -106zM1768 1794q25 78 44 139l60 189q3 8 8.5 28.5t9.5 32.5t12 27.5t17 25.5q28 29 68 29q30 0 70 -14 q92 -28 164 -52l277 -88q25 -8 40.5 -22t20.5 -34t6 -39t-5.5 -45t-12 -43.5t-15.5 -43.5t-13 -37q-126 -398 -380 -1194q-150 459 -341 1036q-2 5 -13 30t-16 44t-1 31z" />
-<glyph unicode="&#xe329;" d="M-100 200v1200h800v50h-800l400 350h400v100h800v-700h800v-1000h-2400zM200 500h400v100h-300v100h100v100h100v100h100v100h-100v100h-300v-100h300v-100h-100v-100h-100v-100h-100v-200zM700 1950l350 350h850v-700h800v-1050l-350 -350v1050h-800v700h-850z M1000 1600h100v-500h100v600h-200v-100zM1700 400h300v100h100v200h-100v100h100v100h-100v100h-300v-100h300v-100h-300v-100h300v-200h-300v-100z" />
-<glyph unicode="&#xe330;" d="M0 1205q0 196 61 380t172.5 332.5t260 260t332.5 172.5t380 61t379.5 -61t332 -172.5t260 -260t172.5 -332.5t61 -380q0 -163 -43.5 -319.5t-121 -288.5t-189 -243.5t-243.5 -189t-288.5 -121t-319.5 -43.5q-196 0 -380 61t-332.5 172.5t-260 260t-172.5 332t-61 379.5z M200 1206q0 -307 172 -563l71 147l294 -98l108 -292l-132 -70q230 -130 493 -130q249 0 468 116l-160 84l108 292l295 98l91 -189q203 270 203 605q0 91 -17 182l-121 -141l-273 207l13 341l203 4q-194 264 -503 364l67 -119l-380 -156l-381 158l64 111q-299 -102 -488 -358 l192 -4l13 -341l-273 -207l-111 130q-16 -90 -16 -171zM819 1335l381 271l380 -268l-145 -438h-470z" />
-<glyph unicode="&#xe331;" d="M100 250q0 21 15 35.5t35 14.5h50v100h-50q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5h50v100h-50q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5h50v100h-50q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5h50v100h-50q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5h50v100h-50 q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5h50v100h-50q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5h50v100h-50q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5h50v100h-50q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5h50v225l250 175h1350q186 0 293 -108t107 -292v-1300l-100 -200 v1500q0 134 -83 217t-217 83h-1287l-140 -100h1327q124 0 212 -88t88 -212v-1500q0 -124 -88 -212t-212 -88h-1500v200h-50q-20 0 -35 14.5t-15 35.5z" />
-<glyph unicode="&#xe332;" d="M22 1202q0 160 42.5 313t118.5 282.5t185 238.5t238.5 185t282.5 118.5t313 42.5t313 -42.5t282.5 -118.5t238.5 -185t185 -238.5t118.5 -282.5t42.5 -313t-42.5 -313t-118.5 -282.5t-185 -238.5t-238.5 -185t-282.5 -118.5t-313 -42.5t-313 42.5t-282.5 118.5 t-238.5 185t-185 238.5t-118.5 282.5t-42.5 313zM278 1202q0 -187 73.5 -358.5t197 -295t295 -197t358.5 -73.5q188 0 359 73.5t295 197t197 294.5t73 359t-73 359t-197 295t-295 197t-359 73t-359 -73t-294.5 -197t-197 -295t-73.5 -359zM404 1300q0 41 29.5 70.5 t70.5 29.5t70.5 -29.5t29.5 -70.5t-29.5 -70.5t-70.5 -29.5t-70.5 29.5t-29.5 70.5zM504 1600q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5t-29.5 -70.5t-70.5 -29.5t-70.5 29.5t-29.5 70.5zM532 700h394q117 -112 276 -112q160 0 275 112h395q-117 -156 -292.5 -246.5 t-377.5 -90.5t-377.5 90.5t-292.5 246.5zM804 1800q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5t-29.5 -70.5t-70.5 -29.5t-70.5 29.5t-29.5 70.5zM1018 984q0 68 43.5 119t109.5 62l274 401q15 20 33 11t11 -32l-138 -454q35 -50 35 -107q0 -76 -54 -130t-130 -54 t-130 54t-54 130zM1104 1900q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5t-29.5 -70.5t-70.5 -29.5t-70.5 29.5t-29.5 70.5zM1404 1800q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5t-29.5 -70.5t-70.5 -29.5t-70.5 29.5t-29.5 70.5zM1704 1600q0 41 29.5 70.5 t70.5 29.5t70.5 -29.5t29.5 -70.5t-29.5 -70.5t-70.5 -29.5t-70.5 29.5t-29.5 70.5zM1804 1300q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5t-29.5 -70.5t-70.5 -29.5t-70.5 29.5t-29.5 70.5z" />
-<glyph unicode="&#xe333;" d="M415 1326l134 224l-134 224l228 127l-5 261l261 -5l127 228l224 -134l224 134l127 -228l261 5l-5 -261l228 -127l-134 -224l134 -224l-228 -127l5 -261l-261 5l-127 -228l-224 134l-224 -134l-127 228l-261 -5l5 261zM623 1725l101 -160l-48 -65l169 130l-65 94l110 61 l-3 127l124 -2l58 110l101 -65l130 169l-65 -48l-153 101l-95 -170l-196 4l3 -194zM700 -100v889l112 2l159 -285l279 168l280 -168l158 285l112 -2v-888l-550 499z" />
-<glyph unicode="&#xe334;" d="M79 600q0 41 29.5 70.5t70.5 29.5h38l250 300l133 700h1q31 183 159.5 317.5t309.5 174.5l-1 1q-1 1 -1 2l-36 110q-13 39 7 67t61 28h200q41 0 61 -28t7 -67l-36 -110q0 -1 -1 -1l-1 -2q181 -40 309.5 -174.5t159.5 -317.5h1l133 -700l250 -300h38q41 0 70.5 -29.5 t29.5 -70.5t-27.5 -81t-65.5 -55q-17 -7 -49.5 -18t-139 -39t-219 -50t-282.5 -39.5t-338 -17.5t-335.5 17t-287 41t-215 48t-142.5 41l-48 17q-38 15 -65.5 55t-27.5 81zM264 600h78l290 331l132 731q12 73 49 145.5t88 116.5l-38 47q-135 -121 -163 -290l-140 -725z M936 200q138 -10 264 -10t264 10q-30 -81 -102 -132t-162 -51t-162 51t-102 132z" />
-<glyph unicode="&#xe335;" d="M200 250v100q0 21 14.5 35.5t35.5 14.5h1900q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-150l-200 -200h-1200l-200 200h-150q-21 0 -35.5 14.5t-14.5 35.5zM700 452v335q0 62 28.5 113.5t71.5 73.5v226q0 82 59 141t141 59h500q82 0 141 -59 t59 -141v-748h-1000zM880 1788q7 57 39 118.5t72 122.5t83.5 124.5t77 121t50.5 116t6 105.5q145 -94 263 -278q130 -201 148 -383q20 -206 -120 -289q-69 -40 -172 -46q69 37 83 104.5t-15 132.5t-76.5 120t-93.5 74q-7 -35 -29.5 -73t-47.5 -66.5t-45.5 -63t-28 -66 t9.5 -73.5t63 -87q-108 34 -172 80t-83 97.5t-12 108.5z" />
-<glyph unicode="&#xe336;" d="M10 110l71 212l848 849l-424 424q103 103 223 146.5t227.5 23t185.5 -98.5l495 495l-70 70q-29 29 -29 71t29 71t70.5 29t70.5 -29l566 -566q29 -29 29 -70.5t-29 -70.5q-29 -30 -71 -29.5t-71 29.5l-70 70l-495 -495q78 -78 98.5 -185.5t-23 -227.5t-146.5 -223 l-424 424l-849 -848zM1217 1588l47 -47l510 504l-44 45z" />
-<glyph unicode="&#xe337;" d="M500 250v1900q0 103 73.5 176.5t176.5 73.5h900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-900q-103 0 -176.5 73.5t-73.5 176.5zM700 500h1000v1500h-1000v-1500zM1023 250q0 -74 51.5 -125.5t125.5 -51.5t125.5 51.5t51.5 125.5t-51.5 125.5 t-125.5 51.5t-125.5 -51.5t-51.5 -125.5z" />
-<glyph unicode="&#xe338;" d="M-100 234l71 212l1060 1061l-35 35q-14 15 -12 38t20 41l691 691q18 18 41 20.5t38 -12.5l177 -176l919 -919l-742 -36l-36 -743l-919 920l-1061 -1061zM1123 1556l45 -44l638 637l-45 45z" />
-<glyph unicode="&#xe339;" d="M-102 933q10 44 140 120q78 45 162 79v28q0 151 60.5 285.5t169 235.5t269.5 160t351 59q154 0 287.5 -42.5t231 -118t167.5 -171t113 -209.5q19 -21 41.5 -33t46.5 -14t48 13.5t41 49.5l1 6q13 77 33 122t50 66.5t72 24.5t99 -4q7 -1 18.5 -3.5t45 -10t63.5 -15.5 t67 -21t63.5 -26t44.5 -30t17 -34q-1 -33 -3 -57t-5 -46t-5 -32.5t-8 -36t-9 -37.5q-10 -43 -31.5 -56.5t-67.5 -14.5l-135 -10q-137 -29 -301.5 -158t-217.5 -233l34 -171q8 -41 28.5 -84.5t41.5 -63.5q20 -21 5.5 -35.5t-55.5 -14.5h-200q-16 0 -29 2.5t-20.5 7 t-10.5 10.5t-0.5 14t10.5 16q20 20 29 64t1 84l-17 83q-105 -34 -238 -50l-26 -133q-8 -41 0.5 -84t29.5 -64q8 -8 10.5 -16t-0.5 -14t-10.5 -10.5t-20.5 -7t-29 -2.5h-200q-16 0 -29 2.5t-20.5 7t-10.5 10.5t-0.5 14t10.5 16q21 21 41.5 64t28.5 84l23 115q-71 -3 -144 -3 q-111 0 -202 7l4 -19q8 -40 28.5 -83.5t40.5 -64.5q21 -21 6.5 -35.5t-56.5 -14.5h-200q-41 0 -55.5 14.5t5.5 35.5q21 21 30 64.5t1 83.5l-8 42q-82 13 -139 29l-34 -171q-8 -41 0.5 -84t29.5 -64t6 -35.5t-56 -14.5h-200q-27 0 -43.5 7.5t-18 19t11.5 25.5 q21 21 41.5 65.5t28.5 85.5l49 251q-8 5 -28.5 16.5t-27 16t-20.5 16.5t-19.5 23.5t-12.5 30.5t-11 43h-235q-75 0 -67 33z" />
-<glyph unicode="&#xe340;" d="M-98 1317q-4 58 30 114t97 69q99 21 187.5 5t123.5 -64q110 80 247.5 106.5t275 3t275.5 -88.5q185 -88 263 -113q83 -26 128 -18q32 6 55 19t36.5 32.5t21.5 36.5t17.5 42t16.5 39q-93 -4 -195.5 11t-183.5 39.5t-148.5 49t-104.5 42.5l-36 17q-12 5 -30 14.5t-49.5 36 t-36 52t41 57.5t151.5 57q60 14 127 16t131.5 -8t127 -25.5t122.5 -38t109.5 -43.5t95.5 -45t72.5 -39t48.5 -29l4 2q-33 33 -76 71t-130 98t-174.5 102.5t-204 67.5t-224.5 10q-14 13 -26.5 28.5t-22 34t-12 36t6.5 33.5t30 27t62.5 16.5t100.5 1.5q79 -5 163.5 -34 t155.5 -71.5t139 -92.5t120 -99.5t91.5 -90t60.5 -65.5l21 -25q11 -7 60.5 -25.5t119 -56.5t149.5 -100q70 -55 103.5 -86t51 -65t12.5 -64.5t-27 -79.5q-13 -31 -26.5 -51t-23 -27t-19 -8.5t-13.5 0.5t-8 5q43 -48 4 -79q-34 -27 -87.5 -37t-108.5 -9t-109 2t-100.5 -9.5 t-71.5 -38.5q-48 -52 -97 -134.5t-85.5 -158t-92.5 -168.5t-115 -162q15 -6 42 -13t49.5 -13.5t44 -14.5t33 -19t9.5 -24t-8.5 -24t-18 -17.5t-23 -11.5t-29.5 -6.5t-31 -3t-35 -0.5t-33.5 2t-33.5 2.5t-29 2.5q-204 -161 -291 -166q-38 -3 -36 27q3 45 78 110q16 15 35 29 q-49 5 -169.5 4t-216 7.5t-150.5 37.5q-48 26 -91.5 76t-70.5 97t-64 96t-73 72q-20 13 -57.5 29.5t-67 31.5t-62 38t-56 59.5t-35.5 85.5q-33 132 -34.5 174t25.5 186q-6 21 -28 24t-48 -4.5t-55 -9t-50 10.5q-34 22 -38 80zM773 845q9 -3 14 -5t26 -14.5t36 -27.5 t36.5 -44t36 -64t26 -88t13.5 -115q39 -10 166 -37t218 -52q25 46 37.5 100t12.5 98.5t-3.5 82.5t-9.5 59l-5 22q-9 -4 -25 -10.5t-64.5 -18t-95 -14t-108 12t-112.5 49.5q-106 73 -184 70q-15 -1 -15 -4zM2076 1476q-10 -26 6.5 -53t50.5 -40q33 -12 63 -2.5t40 35.5t-7 53 t-50 39q-33 13 -63.5 3.5t-39.5 -35.5z" />
-<glyph unicode="&#xe341;" d="M42 1200q0 158 41.5 308t116 277t181.5 234t234 181.5t277 116t308 41.5t308 -41.5t277 -116t234 -181.5t181.5 -234t116 -277t41.5 -308t-41.5 -308t-116 -277t-181.5 -234t-234 -181.5t-277 -116t-308 -41.5t-308 41.5t-277 116t-234 181.5t-181.5 234t-116 277 t-41.5 308zM492 1477q-2 -24 3 -45.5t18.5 -53t17.5 -42.5q9 -26 11.5 -60.5t10 -59.5t31.5 -49q36 -36 51 -53t30 -51.5t12 -71.5q17 -18 35.5 -34t42.5 -30.5t40.5 -24t47.5 -23t44 -19t49 -19t45 -17.5q68 -28 101 -44q22 -39 54 -64q66 -54 153 -41q11 -23 0 -53.5 t-29 -54.5t-32 -57t-10 -61q22 -34 35 -52t36 -44.5t48.5 -42t55.5 -21.5q-1 -11 -6 -23t-8.5 -20t-2 -20t12.5 -26q109 -3 235 63t209 156q46 44 71 70.5t59 69.5t52 87t23 92q-13 12 -27.5 15.5t-25 2t-29 -6.5t-28.5 -7q-26 30 -70.5 43t-92.5 22.5t-76 31.5 q-21 -1 -67.5 -1t-74.5 -1t-67 -6t-70 -16q-7 -3 -27 -15t-41 -24t-44 -21.5t-42.5 -7.5t-29.5 19q-7 10 -7.5 29t1 41t0.5 32q-9 19 -26.5 26.5t-41 11.5t-35.5 11q1 9 6 32.5t7 37.5t-5 31t-25 26q-28 6 -45 0t-35 -20.5t-36 -20.5q-56 -19 -79 36q-20 49 0 104 q13 37 41 48q24 -5 87.5 -4.5t85.5 -9.5q24 -8 45.5 -30t44.5 -38.5t58 -16.5q23 20 28.5 42t1 55.5t-3.5 49.5q9 21 40 54t39 53q6 16 8 53.5t6 51.5q11 42 41 67.5t80 50.5q-10 40 21 73q16 0 48 -3t49.5 -3.5t40.5 9t41 31.5q-20 46 -62 86t-75.5 60t-98.5 53.5t-88 46.5 q4 7 3 44t0 45q106 -37 215 -30l3 14q8 47 -8.5 78t-51 47t-72 26.5t-79 25t-64.5 33.5l-6 -5h-63l-5 6q-44 -34 -95.5 -50.5t-127.5 -28.5q-78 -12 -116 -21q-22 -6 -54.5 2.5t-47.5 8.5q-54 0 -102 -29.5t-101 -80.5q-18 -16 -19.5 -30t7 -23t16 -22.5t5.5 -26.5 q-4 -45 -18.5 -89.5t-41 -104t-35.5 -83.5q-29 -78 -33 -151zM1036 1835q5 20 35 54t29 56q22 -26 57 -20q3 3 27 31t41 37q1 -41 34.5 -114t35.5 -109q-23 5 -81.5 13t-102.5 19.5t-75 32.5z" />
-<glyph unicode="&#xe342;" d="M0 400v700l306 -200h694v-100h400v100h700l300 200v-700q0 -82 -59 -141t-141 -59h-2000q-82 0 -141 59t-59 141zM0 1250v450q0 82 59 141t141 59h300v100h200q0 124 88 212t212 88h400q124 0 212 -88t88 -212h200v-100h300q82 0 141 -59t59 -141v-450l-350 -250h-650 v148h-400v-148h-650zM900 1900h600v100q0 41 -29.5 70.5t-70.5 29.5h-400q-41 0 -70.5 -29.5t-29.5 -70.5v-100z" />
-<glyph unicode="&#xe343;" d="M0 300v100q0 82 59 141t141 59h2000q82 0 141 -59t59 -141v-100q0 -82 -59 -141t-141 -59h-2000q-82 0 -141 59t-59 141zM59 663l346 1439q9 40 45 69t77 29h1346q41 0 77 -29t45 -69l346 -1439q-68 37 -141 37h-2000q-73 0 -141 -37zM195 800h90l307 1279q1 7 10 14 t15 7h-90q-6 0 -14.5 -7t-9.5 -14zM1900 300h100v100h-100v-100zM2100 300h100v100h-100v-100z" />
-<glyph unicode="&#xe344;" d="M0 300v1300h400q41 0 70.5 -29.5t29.5 -70.5v-1100q0 -41 -29.5 -70.5t-70.5 -29.5h-400zM600 600v800q0 66 40 120l289 386l192 383q26 51 74 81t105 30h100q83 0 141.5 -58.5t58.5 -141.5v-300l-56 -300h656q83 0 141.5 -58.5t58.5 -141.5v-200q0 -84 -59 -141l-86 -87 l-389 -583q-28 -42 -72 -65.5t-94 -23.5h-500q-48 0 -89 21l-158 79h-153q-83 0 -141.5 58.5t-58.5 141.5zM800 600h200l200 -100h500l400 600l100 100v200h-900l100 500v300h-100l-200 -400l-300 -400v-800z" />
-<glyph unicode="&#xe345;" d="M0 800v1300h400q41 0 70.5 -29.5t29.5 -70.5v-1100q0 -41 -29.5 -70.5t-70.5 -29.5h-400zM600 1100v800q0 82 59 141t141 59h153l158 79q40 21 89 21h500q50 0 94 -23.5t72 -65.5l390 -584l85 -86q59 -57 59 -141v-200q0 -83 -58.5 -141.5t-141.5 -58.5h-656l52 -261 q4 -17 4 -39v-300q0 -83 -58.5 -141.5t-141.5 -58.5h-100q-57 0 -105 30t-74 81l-192 383l-289 386q-40 54 -40 120zM800 1100l300 -400l200 -400h100v300l-100 500h900v200l-100 100l-400 600h-500l-200 -100h-200v-800z" />
-<glyph unicode="&#xe346;" d="M0 400v1300h300q41 0 70.5 -29.5t29.5 -70.5v-1100q0 -41 -29.5 -70.5t-70.5 -29.5h-300zM500 600q0 -28 15 -52.5t40 -37.5l400 -200q23 -10 45 -10h672q33 0 60 20.5t36 51.5l179 628h336q77 0 139 25.5t100 68.5t58 96t20 110t-20 110t-58 96t-100 68.5t-139 25.5 q-290 0 -690 -2l175 230q23 29 20.5 67t-29.5 64l-166 166q-23 23 -54.5 28t-60.5 -9l-922 -454q-26 -13 -41 -37.5t-15 -52.5v-1000zM700 662v876l802 395l54 -53l-246 -321q-17 -23 -20 -51t10 -54q27 -54 90 -54q686 1 985 1q26 0 42 -5t21 -17.5t6 -21.5t-1 -28.5 t-2 -28.5t2 -28t1 -28.5t-6 -21.5t-21 -17t-42 -5h-503q-34 0 -60.5 -20.5t-35.5 -52.5l-180 -627h-572z" />
-<glyph unicode="&#xe347;" d="M-200 1300q0 -57 20 -110t58 -96t100 -68.5t139 -25.5h336l179 -628q10 -32 36.5 -52t59.5 -20h672q23 0 45 11l400 200q25 13 40 36.5t15 52.5v1000q0 28 -15 52.5t-41 37.5l-922 454q-29 14 -60.5 9t-54.5 -28l-166 -166q-26 -26 -28.5 -64t19.5 -67l176 -230 q-402 2 -691 2q-148 0 -240 -92q-77 -77 -77 -208zM-44 1300q0 48 18.5 74.5t50.5 26.5q284 0 980 -1h5h1q28 0 52 14.5t37 39.5q27 55 -10 105l-246 321l54 53l802 -395v-876l-324 -162h-572l-179 627q-10 32 -36.5 52.5t-60.5 20.5h-503q-69 0 -69 100zM2000 500v1100 q0 41 29.5 70.5t70.5 29.5h300v-1300h-300q-41 0 -70.5 29.5t-29.5 70.5z" />
-<glyph unicode="&#xe348;" d="M247 1538q-5 -32 9 -60l454 -922q13 -26 37.5 -41t52.5 -15h1000q29 0 52.5 15t36.5 40l200 400q11 19 11 45v672q0 33 -20 60t-52 36l-628 179v336q0 77 -25.5 139t-68.5 99.5t-96 57t-110 19.5t-110 -19.5t-96 -57t-68.5 -99.5t-25.5 -139q0 -289 2 -691l-230 176 q-29 23 -67 20.5t-64 -29.5l-166 -166q-23 -23 -28 -55zM467 1502l54 54l320 -246q51 -38 106 -10q24 12 38.5 41t14.5 59v983q0 26 5 42.5t17.5 22t20.5 7t29 0t28 -1.5t28 1.5t29 0t20.5 -7t17.5 -22t5 -42.5v-511q0 -34 20.5 -60.5t52.5 -36.5l627 -179v-572l-162 -324 h-876zM700 0v300q0 41 29.5 70.5t70.5 29.5h1100q41 0 70.5 -29.5t29.5 -70.5v-300h-1300z" />
-<glyph unicode="&#xe349;" d="M247 867.5q5 -31.5 28 -54.5l166 -166q26 -26 64 -28.5t67 19.5l230 176q-2 -402 -2 -691q0 -102 44.5 -178t111.5 -111.5t144 -35.5t144 35.5t111.5 111.5t44.5 178v336l628 179q32 10 52 36.5t20 60.5v671q0 25 -11 43l-200 399q-26 52 -89 52h-1000q-64 0 -90 -53 l-454 -919q-14 -29 -9 -60.5zM467 901l395 799h876l162 -317v-573l-627 -179q-32 -10 -52.5 -36.5t-20.5 -59.5v-512q0 -22 -4.5 -37.5t-10 -23t-18 -11.5t-19.5 -4.5t-24.5 0.5t-23.5 1t-23.5 -1t-24.5 -0.5t-19.5 4.5t-18 11.5t-10 23t-4.5 37.5v977q0 31 -14.5 62.5 t-38.5 43.5q-22 11 -45 11q-33 0 -61 -22l-321 -246zM700 2100v181v119h1300v-300h-1q-3 -40 -31.5 -70t-67.5 -30h-1100q-39 0 -67.5 30t-31.5 70h-1z" />
-<glyph unicode="&#xe350;" d="M0 0v700h200v-500h500v-200h-700zM0 1700v700h700v-200h-500v-500h-200zM400 450v600q0 21 10.5 25t24.5 -10l209 -209l344 344l-344 344l-209 -209q-14 -14 -24.5 -10t-10.5 25v600q0 21 14.5 35.5t35.5 14.5h600q21 0 25 -10.5t-10 -24.5l-209 -209l344 -344l344 344 l-209 209q-14 14 -10 24.5t25 10.5h600q21 0 35.5 -14.5t14.5 -35.5v-600q0 -21 -10.5 -25t-24.5 10l-209 209l-344 -344l344 -344l209 209q14 14 24.5 10t10.5 -25v-600q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -25 10.5t10 24.5l209 209l-344 344l-344 -344l209 -209 q14 -14 10 -24.5t-25 -10.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM1700 0v200h500v500h200v-700h-700zM1700 2200v200h700v-700h-200v500h-500z" />
-<glyph unicode="&#xe351;" d="M0 0v1700l400 400h140q0 149 105.5 254.5t254.5 105.5h152q105 100 248 100h300q149 0 254.5 -105.5t105.5 -254.5v-100h340v-1700l-400 -400h-1900zM300 1700h240v200h-40zM660 1700h780v200h-780v-200zM660 2100h280v100q0 73 28 140h-68q-99 0 -169.5 -70.5 t-70.5 -169.5zM1060 2100h380q0 99 -70.5 169.5t-169.5 70.5h-94q-46 -63 -46 -140v-100zM1314 2440q108 -37 177 -130t69 -210h280v100q0 99 -70.5 169.5t-169.5 70.5h-286zM1560 1700h290l200 200h-490v-200z" />
-<glyph unicode="&#xe352;" d="M0 296v1571l100 53v132q9 5 26.5 14t76 32t121 40.5t158 32t192.5 14.5t186.5 -13t148.5 -31.5t104.5 -36.5t66.5 -31l20 -13q7 5 21.5 13.5t64.5 30t106 38t146.5 30t187.5 13.5t191.5 -13.5t160.5 -33.5t118.5 -39.5t77.5 -32.5l26 -14v-132l100 -53v-1571 q-100 48 -300 91v-372l-147 201l-153 -201v432q-50 7 -100 7q-110 0 -235 -22t-195 -44l-70 -22q-28 10 -77 24.5t-181 39t-242 24.5t-285 -39.5t-295 -78.5zM300 695q9 3 69.5 22t88.5 25.5t96.5 14.5t147.5 8q164 0 398 -68v1197q-158 112 -398 112q-81 0 -152 -7 t-115 -17t-76 -20.5t-45 -17.5l-14 -7v-1242zM1300 697q234 68 398 68q79 0 147.5 -8t96.5 -14.5t88.5 -25.5t69.5 -22v1242q-5 3 -14 7.5t-44 16.5t-77 21t-114 16.5t-153 7.5q-240 0 -398 -112v-1197z" />
-<glyph unicode="&#xe353;" d="M0 400v1400q0 82 59 141t141 59h400v-2v-98q0 -95 53 -147.5t149 -52.5h796q96 0 149 52.5t53 147.5v98v2h400q83 0 141.5 -58.5t58.5 -141.5v-1400q0 -83 -58.5 -141.5t-141.5 -58.5h-2000q-82 0 -141 59t-59 141zM300 590q0 -37 29.5 -63.5t70.5 -26.5h700 q41 0 70.5 26.5t29.5 63.5v720q0 37 -29.5 63.5t-70.5 26.5h-700q-41 0 -70.5 -26.5t-29.5 -63.5v-720zM441 723v63q0 22 5.5 32.5t21.5 19.5q7 4 49.5 19t95 34t75.5 28v56q-22 6 -42 33t-20 49v123q0 52 32.5 86t90.5 34t90.5 -34t32.5 -86v-123q0 -22 -20 -49t-41 -33 v-56q27 -11 119 -43.5t101 -37.5q15 -9 20.5 -20t5.5 -32v-63q0 -5 -4 -9.5t-9 -4.5h-589q-6 0 -10 4.5t-4 9.5zM700 1900v98q0 41 30.5 71.5t71.5 30.5h198v92q0 42 29.5 75t70.5 33h200q41 0 70.5 -33t29.5 -75v-92h198q41 0 71.5 -30.5t30.5 -71.5v-98q0 -41 -30.5 -70.5 t-71.5 -29.5h-796q-41 0 -71.5 29.5t-30.5 70.5zM1400 500h500v100h-500v-100zM1400 700h700v100h-700v-100zM1400 900h700v100h-700v-100zM1400 1100h700v100h-700v-100zM1400 1300h700v100h-700v-100z" />
-<glyph unicode="&#xe354;" d="M0 300v400h2400v-400q0 -82 -59 -141t-141 -59h-400v200h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-400q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-200h-1000v200h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5 t-35.5 14.5h-400q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-200h-400q-82 0 -141 59t-59 141zM0 800v1300q0 82 59 141t141 59h2000q82 0 141 -59t59 -141v-1300h-2400zM300 1090q0 -37 29.5 -63.5t70.5 -26.5h700q41 0 70.5 26.5t29.5 63.5 v720q0 37 -29.5 63.5t-70.5 26.5h-700q-41 0 -70.5 -26.5t-29.5 -63.5v-720zM447 1222v64q0 21 5 31.5t21 20.5q8 5 99.5 36.5t120.5 44.5v56q-21 5 -41.5 32.5t-20.5 48.5v123q0 52 33 86.5t91 34.5t90.5 -34.5t32.5 -86.5v-123q0 -21 -20.5 -48.5t-41.5 -32.5v-56 q29 -13 120.5 -44.5t99.5 -36.5q16 -10 21.5 -20.5t5.5 -31.5v-64q0 -5 -4.5 -9t-9.5 -4h-589q-13 0 -13 13zM1400 1000h500v100h-500v-100zM1400 1200h700v100h-700v-100zM1400 1400h700v100h-700v-100zM1400 1600h700v100h-700v-100zM1400 1800h700v100h-700v-100z" />
-<glyph unicode="&#xe355;" d="M0 1400q0 102 16.5 185.5t43 138t58.5 98.5t64 76.5t58.5 62t43 64.5t16.5 75q0 48 -10.5 96t-25 83.5t-29 63.5t-25.5 43l-10 14h800q-4 -5 -11 -15t-24 -41.5t-30 -64.5t-24 -82t-11 -97q0 -40 16 -75t42 -64.5t57 -62t62.5 -76.5t57.5 -98.5t42 -138t16 -185.5 q0 -139 -40.5 -295.5t-98.5 -288t-115.5 -249.5t-98 -216t-40.5 -151q0 -67 31 -100h169v-100h-800v100h169q31 31 31 100q0 46 -29.5 124t-74 164.5t-96.5 199.5t-96.5 223t-74 241t-29.5 248zM100 1400q0 -100 21.5 -206t66.5 -222.5t77 -187t91 -190.5q64 -131 90 -194 h80q-24 60 -100 215q-46 93 -70.5 145.5t-64.5 148t-61 165t-38 158t-17 166.5q0 71 10 130.5t22.5 96t38 76t41 57.5t47.5 52q9 10 25 34t29.5 40t24.5 16h-87q-8 0 -16.5 -9t-20 -25t-17.5 -22q-34 -36 -49.5 -54t-44 -61t-42 -83t-25 -104.5t-11.5 -141.5zM1200 507 q0 83 22 155.5t57.5 123t78 93.5t85 74t78 56.5t57.5 48t22 42.5q0 44 -25 94t-50 78l-25 28h600q-4 -4 -11 -11.5t-24 -30t-30 -45t-24 -54t-11 -59.5q0 -20 21.5 -43.5t56.5 -49.5t76.5 -58t83.5 -75.5t77 -94t56.5 -121.5t21.5 -151t-19 -146t-48.5 -107t-66 -72t-73 -46 t-66 -24t-48.5 -10l-19 -2h147v-100h-800v100h154q-8 0 -21 1t-49.5 9t-70 22t-74 44.5t-70 72t-49.5 108.5t-20 150zM1300 507q0 -130 58 -207h92q-75 66 -75 207q0 56 15 106t34.5 83t56.5 69.5t61 55t68 50.5q103 74 136 129h-86q-29 -34 -104 -88q-47 -34 -72 -53.5 t-66 -60t-62.5 -78t-38.5 -94t-17 -119.5z" />
-<glyph unicode="&#xe356;" d="M-100 1300v100q0 82 59 141t141 59v-500q-83 0 -141.5 58.5t-58.5 141.5zM200 1100v500q0 41 29.5 70.5t70.5 29.5h400l1400 500v-1700l-1400 500h-75l93 -601q7 -41 -18 -70t-67 -29h-166q-41 0 -76.5 29t-42.5 69l-116 630q-32 30 -32 72zM717 1522l1283 458v78 l-1283 -458v-78zM2200 500v1700q0 41 29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5v-1700q0 -41 -29.5 -70.5t-70.5 -29.5t-70.5 29.5t-29.5 70.5z" />
-<glyph unicode="&#xe357;" d="M-100 900v250h200v50h-200v100h200v300q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v200q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-500h1000v500q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-200q0 41 29.5 70.5 t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-300h200v-100h-200v-50h200v-250h-200v-300q0 -41 -29.5 -70.5t-70.5 -29.5h-100q-41 0 -70.5 29.5t-29.5 70.5v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-100q-41 0 -70.5 29.5t-29.5 70.5v500h-1000v-500q0 -41 -29.5 -70.5 t-70.5 -29.5h-100q-41 0 -70.5 29.5t-29.5 70.5v200q0 -41 -29.5 -70.5t-70.5 -29.5h-100q-41 0 -70.5 29.5t-29.5 70.5v300h-200zM200 1550h100v50h-100v-50zM500 1750h100v50h-100v-50zM1800 1750h100v50h-100v-50zM2100 1550h100v50h-100v-50z" />
-<glyph unicode="&#xe358;" d="M0 400v1200q0 124 88 212t212 88h400v100q0 124 88 212t212 88h400q124 0 212 -88t88 -212v-100h400q124 0 212 -88t88 -212v-1200q0 -124 -88 -212t-212 -88h-1800q-124 0 -212 88t-88 212zM900 1900h600v100q0 41 -29.5 70.5t-70.5 29.5h-400q-41 0 -70.5 -29.5 t-29.5 -70.5v-100z" />
-<glyph unicode="&#xe359;" d="M100 738v311q0 18 1 26.5t9.5 16.5t24.5 8h765v278q0 11 10 14t18 -4l572 -476q8 -6 8 -14q0 -12 -10 -19l-569 -479q-8 -7 -18.5 -4t-10.5 14v290h-765q-21 0 -28 8t-7 30zM400 50v550h400v-190q0 -74 37.5 -119.5t102.5 -45.5q47 0 98 40l552 476q70 54 70 137 q0 87 -58 129l-571 480q-46 36 -91 36q-65 0 -102.5 -45.5t-37.5 -119.5v-178h-400v1150q0 21 14.5 35.5t35.5 14.5h1150v-650q0 -21 14.5 -35.5t35.5 -14.5h650v-1650q0 -21 -14.5 -35.5t-35.5 -14.5h-1800q-21 0 -35.5 14.5t-14.5 35.5zM1700 1850v550l600 -600h-550 q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe360;" d="M200 50q0 -21 14.5 -35.5t35.5 -14.5h1800q21 0 35.5 14.5t14.5 35.5v395l-180 -152q-20 -16 -29.5 -22t-23.5 -11t-31 -5q-63 0 -99.5 44.5t-36.5 110.5v190h-665q-78 0 -106.5 29t-28.5 109v333q0 73 36 101t99 28h665v178q0 66 36.5 110.5t98.5 44.5q46 0 89 -34 l176 -155v356h-650q-21 0 -35.5 14.5t-14.5 35.5v650h-1150q-21 0 -35.5 -15t-14.5 -35v-2300zM1000 738v311q0 51 35 51h765v278q0 11 10 14t18 -4l572 -476q8 -6 8 -14q0 -12 -10 -19l-568 -479q-9 -7 -19.5 -4t-10.5 14v290h-765q-21 0 -28 8t-7 30zM1500 1850v550 l600 -600h-550q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe361;" d="M100 200q0 41 29.5 70.5t70.5 29.5h159l200 200h112q-40 140 -58 300h-261l-220 223q-29 30 -28.5 71.5t29.5 70.5t71 28.5t71 -29.5l161 -164h164v64q0 108 30 212q-15 9 -16 10l-214 204v352l-84 88q-29 29 -28 70.5t30 70.5q30 29 71.5 28t70.5 -31l140 -145v-347 l119 -114q83 119 209 185.5t272 66.5q145 0 269.5 -65t207.5 -181l123 110v343l132 145q28 31 69.5 33t71.5 -26q31 -28 33 -69t-26 -72l-80 -88v-356l-229 -204q-1 0 -1 -1l-2 -1q32 -102 32 -218q1 -24 0 -64h159l164 164q29 29 70.5 29t70.5 -29q30 -29 30 -70.5 t-30 -70.5l-223 -223h-254q-18 -165 -57 -300h111l200 -200h159q41 0 70.5 -29.5t29.5 -70.5t-29.5 -70.5t-70.5 -29.5h-241l-200 200h-108q-155 -300 -451 -300t-451 300h-108l-200 -200h-241q-41 0 -70.5 29.5t-29.5 70.5zM900 1775v24q0 133 105 225l-92 101 q-13 15 -13 34v141q0 21 14.5 35.5t35.5 14.5t35.5 -14.5t14.5 -35.5v-122l92 -100q55 21 108 21t108 -21l92 100v122q0 21 14.5 35.5t35.5 14.5t35.5 -14.5t14.5 -35.5v-141q0 -19 -13 -34l-92 -101q105 -92 105 -225v-24q-144 69 -300 69t-300 -69z" />
-<glyph unicode="&#xe362;" d="M-93 1800q0 80 56.5 136.5t136.5 56.5t136.5 -56.5t56.5 -136.5q0 -73 -49 -127l614 -523l285 966q-60 18 -98 68.5t-38 115.5q0 80 56.5 136.5t136.5 56.5t136.5 -56.5t56.5 -136.5q0 -65 -39 -116t-100 -69l296 -965l603 525q-46 56 -46 125q0 80 56.5 136.5 t136.5 56.5t136.5 -56.5t56.5 -136.5t-56.5 -136.5t-136.5 -56.5q-23 0 -51 7l-249 -964v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1500q-20 0 -35 14.5t-15 35.5v100l-255 962q-25 -5 -45 -5q-80 0 -136.5 56.5t-56.5 136.5zM274 1516l226 -853v-63h81v63l-203 764zM400 0v350 q0 21 15 35.5t35 14.5h1500q21 0 35.5 -14.5t14.5 -35.5v-350h-1600zM500 100h81v200h-81v-200zM926 1029l65 -55l249 845l-41 134zM1563 1029l17 -71l516 449l23 106z" />
-<glyph unicode="&#xe363;" d="M-150 1148.5q12 107.5 54 265.5q12 46 12 105t-8.5 106.5t-16.5 94.5t-11 68.5t7 29.5q31 8 77 -53t100 -166q48 -94 61 -178.5t2 -151t-25 -130t-12 -142.5t34 -162q10 -27 24.5 -60t27 -59.5t25.5 -54.5t21.5 -49.5t13.5 -39t3 -27.5t-11 -11q-28 -5 -78.5 28t-79.5 61 q-91 92 -139 163.5t-70.5 163t-10.5 199zM-24.5 2231q9.5 83 35.5 155t51.5 119t41.5 60q12 10 19 -19q3 -11 18 -144q18 -158 53 -251q22 -59 56 -125.5t57.5 -110t44.5 -108t27 -135.5q7 -92 0 -169.5t-23.5 -138t-37.5 -102.5t-41.5 -64t-36.5 -22q-8 0 -8.5 25.5 t2.5 71.5t4.5 98.5t-4.5 118.5t-22 121q-19 66 -53.5 124t-65.5 94.5t-63 98t-48 136.5q-16 84 -6.5 167zM250.5 193.5q6.5 59.5 48.5 108.5l353 -353q-49 -42 -108.5 -48.5t-112.5 16.5t-97 67t-67 97t-16.5 112.5zM398 402l1258 1258l354 -354l-1258 -1258zM1752 1755 l444 445l354 -354l-445 -445z" />
-<glyph unicode="&#xe364;" d="M-80 803q0 125 87 213.5t210 88.5h2q-1 34 -1.5 52t-0.5 20v3v7q0 140 67 265.5t183.5 202t251.5 76.5q51 0 103 -11q65 211 241.5 345.5t398.5 134.5q109 0 212 -34.5t185.5 -98.5t144.5 -148.5t96 -190t34 -217.5v-3q126 -4 234 -78t170 -192.5t62 -250.5 q0 -149 -80 -277t-212 -205h-708v239h185q51 0 93 26t64 71t17 95.5t-37 91.5l-2 2l-2 3l-479 565q-53 67 -141 67q-84 0 -139 -67l-475 -567l-2 -2l-2 -3q-32 -41 -37 -91t17 -95q22 -44 64.5 -70t92.5 -26h183v-239h-836q-107 0 -175.5 90t-68.5 208zM806.5 910 q-3.5 8 3.5 17l473 570q6 8 15 8q12 0 18 -9l479 -566q8 -9 4.5 -17.5t-14.5 -8.5h-285v-662q0 -21 -9 -29.5t-30 -8.5l-320 -4q-41 0 -41 38v664h-280q-10 0 -13.5 8z" />
-<glyph unicode="&#xe365;" d="M-180 797q0 126 87 214.5t210 88.5h2q-1 34 -1.5 52t-0.5 20v3v7q0 140 67 265.5t183.5 201.5t251.5 76q58 0 103 -11q65 212 241.5 346.5t398.5 134.5q182 0 337 -92.5t245 -251t90 -345.5v-3q126 -4 234 -78t170 -192.5t62 -250.5q0 -149 -80 -277t-212 -205h-463 l65 77l2 2l2 3q30 39 35 86t-16 90q-20 43 -60 67.5t-88 24.5h-135v511q0 82 -56 135.5t-142 53.5h-300q-86 0 -141.5 -53.5t-55.5 -134.5v-512h-138q-47 0 -87 -24.5t-61 -66.5q-21 -43 -16 -90t35 -86l2 -2l2 -3l66 -78h-594q-107 0 -175.5 89.5t-68.5 207.5zM703.5 692 q3.5 8 13.5 8h283v662q0 38 41 38h320q39 0 39 -39v-661h285q11 0 14 -8.5t-4 -17.5l-479 -567q-8 -9 -18 -9q-9 0 -15 9l-476 568q-7 9 -3.5 17z" />
-<glyph unicode="&#xe366;" d="M0 1200q0 225 80 430t225 367l211 -212q-103 -120 -159.5 -270t-56.5 -314q0 -183 71 -349.5t191 -287t287 -191.5t351 -71q145 0 255.5 34t227.5 109l-151 212q-12 17 -6 28.5t27 10.5h683q21 0 31.5 -14t4.5 -34l-221 -644q-6 -20 -19 -22t-25 15l-148 204l-6 -4 q-145 -95 -320 -145t-333 -51q-257 0 -482 95t-381.5 256.5t-246.5 382t-90 465.5zM404 2096q121 107 260 176l114 -276q-87 -46 -163 -112zM821 2338q140 46 279 57v-300q-80 -8 -165 -34zM1300 2095v300q131 -11 251 -48l-116 -278q-81 20 -135 26zM1648 1980l115 279 q97 -52 187 -125l-213 -213q-43 32 -89 59zM1921 1737l213 213q59 -72 109 -161l-279 -116q-22 35 -43 64zM2075 1427l279 126q6 -21 13 -61t12.5 -66t8.5 -26h-303q-3 0 -10 27z" />
-<glyph unicode="&#xe367;" d="M111 713l1875 1040l375 -650l-1398 -807l-812 343zM117 379l155 82l467 -210l-422 -218zM900 2400h800q0 -138 -84.5 -245t-215.5 -141v-449l-200 -106v555q-131 34 -215.5 141t-84.5 245zM1005 226l1393 811l70 -119l-1393 -811z" />
-<glyph unicode="&#xe368;" d="M200 600v1100q0 166 117.5 283t282.5 117h1100q166 0 283 -117t117 -283v-1100q0 -166 -117 -283t-283 -117h-1100q-165 0 -282.5 117t-117.5 283zM400 500q0 -41 29.5 -70.5t70.5 -29.5h1300q41 0 70.5 29.5t29.5 70.5v1300q0 41 -29.5 70.5t-70.5 29.5h-1300 q-41 0 -70.5 -29.5t-29.5 -70.5v-1300zM697 1367q13 33 53 33h800q40 0 53 -34.5t-12 -67.5l-382 -530q-24 -33 -59 -35.5t-59 30.5l-382 538q-25 33 -12 66z" />
-<glyph unicode="&#xe369;" d="M200 600v1100q0 165 117.5 282.5t282.5 117.5h1100q166 0 283 -117.5t117 -282.5v-1100q0 -166 -117 -283t-283 -117h-1100q-165 0 -282.5 117t-117.5 283zM400 500q0 -41 29.5 -70.5t70.5 -29.5h1300q41 0 70.5 29.5t29.5 70.5v1300q0 41 -29.5 70.5t-70.5 29.5h-1300 q-41 0 -70.5 -29.5t-29.5 -70.5v-1300zM900 750v800q0 40 34.5 53t67.5 -12l530 -382q33 -24 35.5 -59t-30.5 -59l-538 -382q-33 -25 -66 -12t-33 53z" />
-<glyph unicode="&#xe370;" d="M200 600v1100q0 166 117.5 283t282.5 117h1100q166 0 283 -117t117 -283v-1100q0 -166 -117 -283t-283 -117h-1100q-165 0 -282.5 117t-117.5 283zM400 500q0 -41 29.5 -70.5t70.5 -29.5h1300q41 0 70.5 29.5t29.5 70.5v1300q0 41 -29.5 70.5t-70.5 29.5h-1300 q-41 0 -70.5 -29.5t-29.5 -70.5v-1300zM697 934.5q-13 34.5 12 67.5l382 530q24 33 59 35.5t59 -30.5l382 -538q25 -33 12 -66t-53 -33h-800q-40 0 -53 34.5z" />
-<glyph unicode="&#xe371;" d="M58 1017q-55 345 85 658q92 204 254.5 359t371 239.5t431.5 84.5q166 0 324 -47.5t289.5 -132t240 -204t179.5 -258.5t103.5 -301t16.5 -327q-32 -335 -245 -604.5t-532 -379.5q-324 -111 -662 -24.5t-569 339.5q-232 253 -287 598zM646 1045q11 -39 47.5 -92t67.5 -58 q25 -4 75.5 5t70.5 22q11 9 20 7t13 -6t11 -12t14 -12t23 -4.5t24.5 -5t8.5 -21.5q-3 -27 -1 -51.5t16 -49.5q3 -5 12.5 -20.5t14 -23.5t8.5 -22t4 -26q0 -15 -14.5 -52.5t-3.5 -64.5q12 -29 17.5 -88.5t14 -113.5t30.5 -81q19 -23 104 5q53 17 117 140q5 11 22 29t22 29 q2 22 -6 45q1 17 13.5 30t31.5 25.5t27 21.5q15 17 16.5 37t-9 56.5t-11.5 39.5q-12 56 43 126q11 13 40 45t42.5 49t28 48t17.5 62q-14 -11 -28 -16.5t-24.5 -8t-25 1t-22 5.5t-23 12.5t-20.5 14t-22.5 18t-21.5 17.5q-18 15 -33 52.5t-26 50.5q-17 22 3.5 41t43.5 8 q25 -12 43 -57t34 -83.5t36 -38.5q33 0 72 24t56 41t53 56q-5 35 10.5 58t50.5 20q29 -3 48.5 -32t35.5 -32q10 -2 25 1.5t23.5 0t17.5 -21.5q11 -24 32 -114q0 -1 2.5 -14t5 -24t6.5 -24t9 -20.5t11 -7.5q23 0 30.5 24t7 56.5t3.5 40.5q15 32 59.5 73.5t75.5 48.5 q7 -7 11.5 -41t18.5 -38q24 -7 25 66q1 86 -27 195q-96 383 -399 585q-27 18 -50 17.5t-48.5 -7t-47.5 -3.5q-3 16 -20.5 21t-27.5 -10q-7 -11 -1 -38t-2 -31q-14 -7 -42 -4.5t-72 -1.5t-67 -19q-1 -1 -23.5 -17t-33.5 -21.5t-29 -11.5t-27.5 3t-12.5 32q23 3 32 20.5 t5.5 36.5t-14.5 28q-29 24 -160 14q-100 -7 -138.5 -21.5t-71.5 -62.5q-21 -27 -9 -48.5t34.5 -33t45 -29t22.5 -36.5q17 5 33.5 18.5t25 22t28.5 10.5t43 -15q44 -11 7 -45q-24 -22 -40 -23h-2q-25 13 -51.5 12.5t-44.5 -7.5t-44 -18.5t-43 -15.5q-119 -32 -135 -58 q3 -5 11 -13t14 -14.5t9.5 -14t-2 -14.5t-20.5 -14q-6 -3 -24 -2.5t-30.5 -3.5t-12.5 -19q0 -4 -1 -17t-1 -19.5v-18.5t2 -17.5t4.5 -14t8 -11.5t12.5 -5t17.5 0.5t23.5 8.5q39 18 113 83q19 16 30.5 23t25.5 4.5t27 -18.5q7 -9 23.5 -19t26.5 -20.5t10 -27.5q36 -10 35 10 q0 19 -46 89q-14 21 -12 23q14 13 49.5 -25.5t48.5 -60.5q2 -4 5 -9.5t9 -14.5t11.5 -16t12.5 -12t13 -4t11 9q4 6 0.5 16t-9 18t-4.5 15.5t12 10.5q24 1 33 -29.5t22 -36.5q4 -2 28 -9t38 -14.5t22 -18.5q32 -49 -10 -76.5t-87 -17.5q-34 7 -83 -5q-8 -2 -17 -15.5t-19 -21 t-22 -0.5q-48 32 -76 47q-11 6 -5.5 31.5t-14.5 27.5q-39 9 -119 -13q-15 -4 -57.5 -2t-52.5 -9q-20 -12 -41 -35t-45.5 -56.5t-34.5 -44.5q-37 -43 -21 -92q5 -16 -4.5 -52.5t-3.5 -56.5zM776 1733q-13 -15 21 -22q48 -9 85 4l11 6q47 41 14 102q-24 43 -66 59 q-45 14 -60 -26q4 -7 12 -17.5t13.5 -19.5t10 -19t3.5 -21t-8 -21q-5 -8 -18.5 -14t-17.5 -11zM1484.5 481q-0.5 -17 8.5 -31.5t26 -14.5q33 0 54.5 45t24.5 84q1 7 4 29.5t4 35t-3.5 29.5t-16.5 27q-13 -18 -33.5 -42t-30.5 -37t-20.5 -38t-15.5 -56q-1 -14 -1.5 -31z" />
-<glyph unicode="&#xe372;" d="M0 1200q0 163 43 318.5t120.5 287.5t188 242.5t242.5 188t287.5 120.5t318.5 43t318.5 -43t287.5 -120.5t242.5 -188t188 -242.5t120.5 -287.5t43 -318.5t-43 -318.5t-120.5 -287.5t-188 -242.5t-242.5 -188t-287.5 -120.5t-318.5 -43t-318.5 43t-287.5 120.5t-242.5 188 t-188 242.5t-120.5 287.5t-43 318.5zM237 1294h267q9 165 48 310h-230q-69 -151 -85 -310zM238 1104q16 -161 86 -310h228q-39 145 -48 310h-266zM437 1794h184q74 163 192 294q-222 -97 -376 -294zM440 604q149 -189 367 -287q-114 128 -187 287h-180zM684 1104 q10 -163 57 -310h364v310h-421zM684 1294h421v310h-364q-47 -145 -57 -310zM822 604q36 -64 78.5 -119t82.5 -92t68 -59.5t54 -38.5v309h-283zM822 1794h283v310q-26 -16 -54 -38.5t-68 -60t-82.5 -92.5t-78.5 -119zM1295 295q61 37 138.5 113.5t144.5 195.5h-283v-309z M1295 794h365q46 149 56 310h-421v-310zM1295 1294h421q-10 163 -56 310h-365v-310zM1295 1794h283q-35 64 -77.5 119t-83 92.5t-68.5 60t-54 38.5v-310zM1584 2092q118 -128 196 -298h187q-154 199 -383 298zM1590 314q224 98 374 290h-184q-74 -162 -190 -290zM1848 794 h233q69 151 85 310h-270q-9 -165 -48 -310zM1848 1604q39 -145 48 -310h271q-16 164 -85 310h-234z" />
-<glyph unicode="&#xe373;" d="M200 100v1500h1300v-1500q0 -41 -29.5 -70.5t-70.5 -29.5h-1100q-41 0 -70.5 29.5t-29.5 70.5zM300 150h50v1350h-50v-1350zM300 1700l300 200h500l300 -200h-1100zM700 2000v105q0 41 29 68t71 27h100q42 0 71 -27t29 -68v-105h-300zM1210 2129q0 29 20.5 49.5 t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM1410 2029q0 29 20.5 49.5t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM1410 2229q0 29 20.5 49.5t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5 t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM1610 1929q0 29 20.5 49.5t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM1610 2129q0 29 20.5 49.5t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM1610 2329 q0 29 20.5 49.5t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM1810 1829q0 29 20.5 49.5t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM1810 2029q0 29 20.5 49.5t49.5 20.5t49.5 -20.5 t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM1810 2229q0 29 20.5 49.5t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM1810 2429q0 29 20.5 49.5t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5 t-20.5 49.5zM2010 1729q0 29 20.5 49.5t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM2010 1929q0 29 20.5 49.5t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM2010 2129q0 29 20.5 49.5 t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM2010 2329q0 29 20.5 49.5t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM2010 2529q0 29 20.5 49.5t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5 t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM2210 1629q0 29 20.5 49.5t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM2210 1829q0 29 20.5 49.5t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM2210 2029 q0 29 20.5 49.5t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM2210 2229q0 29 20.5 49.5t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM2210 2429q0 29 20.5 49.5t49.5 20.5t49.5 -20.5 t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5zM2210 2629q0 29 20.5 49.5t49.5 20.5t49.5 -20.5t20.5 -49.5t-20.5 -49.5t-49.5 -20.5t-49.5 20.5t-20.5 49.5z" />
-<glyph unicode="&#xe374;" d="M200 296l65 309l879 1487l-209 236l50 87l693 -400l-50 -87l-310 64l-879 -1487zM536 -100l142 282l1223 1222l-141 283l70 71l566 -566l-71 -71l-282 142l-1223 -1223z" />
-<glyph unicode="&#xe375;" d="M-156 347l1057 923l72 -73l601 602l142 -142l-601 -601l72 -73l-923 -1056zM1217 2217l283 283l110 -100v-142l-142 -141h-141zM1504 1940v141l141 142h141q211 -211 425 -424q72 -72 126.5 -158t84 -165.5t48.5 -159t24 -144.5t5.5 -115.5t-2.5 -78.5l-3 -28l-36 35 q-1 13 -5.5 36.5t-30 97.5t-63 149t-114.5 182.5t-176 206.5q-38 -38 -77 -55.5t-68.5 -15.5t-53 9.5t-36.5 16.5l-12 10z" />
-<glyph unicode="&#xe376;" d="M-54 348l1057 923l72 -73l592 592l141 -142l-591 -591l72 -73l-923 -1056zM1405 2153l301 283l692 -706v-425l-94 -70z" />
-<glyph unicode="&#xe377;" d="M-162 191l1634 2381q24 33 69 40t78 -17q28 -20 43.5 -52t21 -57.5t32.5 -50.5t79 -35q71 -14 233.5 -63t241.5 -63q179 -46 111 -282q-7 -21 -107 -316q-24 -76 -175 -76h-400v-200h-200v-200h-200v-200h-200v-200h-200v-200h-200v-200h-200v-200h-200v-200h-200z M51 248q6 -32 32.5 -50.5t58.5 -12.5t50.5 32.5t12.5 58.5t-33 50t-58 12q-32 -5 -50.5 -32t-12.5 -58zM1282 1932l799 -123q74 157 85 191q10 29 -4.5 61.5t-52.5 40.5l-535 145q-67 14 -117 -59z" />
-<glyph unicode="&#xe378;" d="M20 1160q0 252 98.5 481.5t264.5 395.5t395.5 264.5t481.5 98.5t481.5 -98.5t395.5 -264.5t264.5 -395.5t98.5 -481.5t-98.5 -481.5t-264.5 -395.5t-395.5 -264.5t-481.5 -98.5t-481.5 98.5t-395.5 264.5t-264.5 395.5t-98.5 481.5zM323 1100q19 -375 260.5 -616.5 t616.5 -260.5v577h100v-577q248 12 447.5 126t318.5 310t131 441h-597v100h597q-9 185 -80.5 347t-189.5 280t-280 189.5t-347 80.5v-597h-100v597q-246 -12 -442 -131t-309.5 -318.5t-125.5 -447.5h577v-100h-577z" />
-<glyph unicode="&#xe379;" d="M0 400v1700q0 124 88 212t212 88h1700q124 0 212 -88t88 -212v-1700q0 -124 -88 -212t-212 -88h-1700q-124 0 -212 88t-88 212zM289 1250q0 -175 68.5 -334.5t183.5 -274.5t274.5 -183.5t334.5 -68.5t334.5 68.5t274.5 183.5t183.5 274.5t68.5 334.5t-68.5 334.5 t-183.5 274.5t-274.5 183.5t-334.5 68.5t-334.5 -68.5t-274.5 -183.5t-183.5 -274.5t-68.5 -334.5zM455 1250q0 141 55 269.5t148.5 222t222 148.5t269.5 55t269.5 -55t222 -148.5t148.5 -222t55 -269.5t-55 -269.5t-148.5 -222t-222 -148.5t-269.5 -55t-269.5 55 t-222 148.5t-148.5 222t-55 269.5zM565 1250q0 -76 54.5 -130.5t130.5 -54.5t130.5 54.5t54.5 130.5t-54.5 130.5t-130.5 54.5t-130.5 -54.5t-54.5 -130.5zM962 1650q0 -78 55.5 -133t132.5 -55q78 0 133 55t55 133t-55 133t-133 55q-77 0 -132.5 -55t-55.5 -133zM1083 1650 q0 28 19.5 47.5t47.5 19.5t48 -19.5t20 -47.5t-20 -47.5t-48 -19.5t-47.5 19.5t-19.5 47.5zM1365 1250q0 -76 54.5 -130.5t130.5 -54.5t130.5 54.5t54.5 130.5t-54.5 130.5t-130.5 54.5t-130.5 -54.5t-54.5 -130.5z" />
-<glyph unicode="&#xe380;" d="M0 400v1700q0 124 88 212t212 88h1700q124 0 212 -88t88 -212v-1700q0 -124 -88 -212t-212 -88h-1700q-124 0 -212 88t-88 212zM278.5 1259q7.5 -371 380.5 -764h979q373 392 380 764.5t-351 751.5h-1038q-358 -381 -350.5 -752zM421 1287.5q-7 312.5 275 612.5h904 q283 -300 275.5 -612.5t-304.5 -687.5h-846q-297 375 -304 687.5zM700 1300h200v400h-200v-400zM1000 700h300v100q0 91 -42 155.5t-108 64.5t-108 -65t-42 -155v-100zM1400 1300h200v400h-200v-400z" />
-<glyph unicode="&#xe381;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM575 1351q0 -134 52.5 -231t146.5 -135q14 -6 27 -6q21 0 37 13t21 35l18 71q12 42 -18 76q-52 61 -52 155 q0 73 27 142.5t76.5 126t128.5 91t174 34.5q157 0 248 -83t91 -226q0 -189 -72 -315t-179 -126q-59 0 -92 42q-31 39 -19 91q6 26 35 121q44 142 44 201q0 73 -41 118t-108 45q-85 0 -143 -75t-58 -185q0 -76 27 -142q-142 -487 -153 -536q-33 -138 -4 -347q2 -16 14 -26 t28 -10q20 0 35 18q125 162 163 299q7 25 85 252q38 -36 93.5 -57.5t112.5 -21.5q146 0 262 82t181 227.5t65 327.5q0 79 -25.5 157t-76.5 146.5t-120.5 120.5t-165 82.5t-202.5 30.5q-150 0 -277.5 -50.5t-210.5 -133.5t-129 -186.5t-46 -212.5z" />
-<glyph unicode="&#xe382;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM270 1630q0 -20 27 -39q219 -173 304 -240q-298 -234 -304 -241q-19 -16 -19 -40q0 -12 143.5 -105t286.5 -181 l144 -87l352 293l348 -302q498 323 548 357q15 10 21 17t3.5 13t-7 9.5t-17.5 11.5t-21 14l-301 240q39 30 118 90t139 105.5t62 46.5q26 12 26 36q0 30 -33 44l-513 330q-14 8 -32 8q-19 0 -34 -12l-319 -266l-319 266q-13 12 -33 12q-14 0 -27 -8l-515 -332 q-28 -16 -28 -40zM752 1350l450 281l446 -280l-448 -281zM794 608l370 -234q13 -8 27 -8q15 0 27 8l374 238l-392 330z" />
-<glyph unicode="&#xe383;" d="M0 528v737q12 -68 39 -123t60.5 -91t78 -63t85.5 -41t88.5 -22t80.5 -10t68 -1v-106q0 -9 2.5 -16.5t8 -14t10 -10t12 -9t9.5 -7.5t10.5 -7.5t12.5 -9t10 -10t9.5 -14.5t5.5 -18q-59 0 -122 -5.5t-151 -20.5t-172.5 -50.5t-144.5 -87.5zM0 1474v676q0 103 73.5 176.5 t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1052q119 131 119 331q0 62 -19 121.5t-42.5 99.5t-67.5 87.5t-70 69.5t-74 62q-44 36 -65.5 54.5t-41.5 45t-20 46.5q0 21 14.5 43.5t30.5 37.5t51 44q36 30 55.5 48t52 55.5t50 72 t31.5 87.5t14 111q0 59 -2.5 99t-11 86t-25 78.5t-45 63.5t-69.5 54q35 7 63 10q28 4 41.5 6t38.5 7t38 11.5t28 15.5t21.5 22.5t6.5 30.5h-591q-10 0 -32.5 -1.5t-77.5 -10.5t-109 -24.5t-120 -47.5t-118 -75t-94.5 -112.5t-57.5 -154.5zM150 234q-9 122 106 219 q118 99 292 110q28 2 41 2q160 0 275.5 -79.5t123.5 -194.5q7 -90 -57 -169t-174 -122h-406q-88 36 -142.5 98t-58.5 136zM309 1357q-40 145 5 268q45 119 143 145q22 6 47 6q92 0 174 -81t116 -206q24 -98 14.5 -183.5t-53.5 -148.5t-109 -81q-22 -6 -47 -6q-92 0 -174 81 t-116 206zM1400 1400h400v-400h100v400h400v100h-400v400h-100v-400h-400v-100z" />
-<glyph unicode="&#xe384;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM378 1137q0 -163 116.5 -250t339.5 -87h1264q30 0 33 13.5t-19 29.5q-159 119 -218.5 227.5t-87.5 317.5 q-12 84 -57 161.5t-114 135.5t-161.5 92.5t-193.5 34.5q-79 0 -151.5 -24.5t-126.5 -62t-99.5 -87.5t-74 -97.5t-47.5 -94.5q-206 1 -304.5 -73.5t-98.5 -235.5z" />
-<glyph unicode="&#xe385;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM288 1824l4 -127l256 -37l450 -560v-277l-228 -33l-24 -134h882l16 144h-244v300l436 421l205 42l59 137h-800 l44 -137l182 -25l-269 -279l-316 423l229 22l18 120h-900z" />
-<glyph unicode="&#xe386;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM500 900q0 -89 43.5 -165.5t114.5 -127t160.5 -79t181.5 -28.5h400q92 0 181.5 28.5t160.5 79t114.5 127 t43.5 165.5v319q0 34 -23.5 57.5t-57.5 23.5l-88 7q-39 0 -68 27.5t-32 68.5q0 180 -121.5 288.5t-309.5 108.5h-300q-184 0 -292 -108t-108 -292v-500zM848 1401q0 41 29 69.5t69 28.5h257q40 0 68.5 -28.5t28.5 -69.5q0 -40 -28.5 -68.5t-68.5 -28.5h-257q-40 0 -69 28.5 t-29 68.5zM853 895q0 38 27 65t65 27h517q38 0 65 -27t27 -65q0 -39 -27 -66t-65 -27h-517q-38 0 -65 27t-27 66z" />
-<glyph unicode="&#xe387;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM413 1200q0 -98 28 -204q14 12 346.5 314.5t349.5 317.5q-8 8 -145.5 133t-151.5 137q-197 -101 -312 -288.5 t-115 -409.5zM476 910q91 -255 324 -391v685q0 -5 -23.5 -29t-58.5 -55.5t-77 -68.5t-77 -66.5t-61 -51.5t-27 -23zM900 469q106 -54 280 -54.5t289 47.5q127 51 236.5 137.5t180.5 205.5h-986v-336zM907 1934q1 -1 68.5 -60.5t150.5 -133t170 -152t145.5 -134.5t58.5 -63 v538q-119 56 -313 56q-142 0 -280 -51zM1600 900h331q46 143 52 267.5t-25 259.5q-27 128 -140 262.5t-218 191.5v-981z" />
-<glyph unicode="&#xe388;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM266 817q-11 -30 15 -55q199 -179 416.5 -270.5t472.5 -91.5q197 0 398 75t360 192q37 28 24 66q-14 39 -56 39 q-14 0 -28 -6q-336 -143 -689 -143q-399 0 -841 214q-16 8 -29 8q-31 0 -43 -28zM688 1128q0 -158 89.5 -252.5t239.5 -94.5q104 0 175.5 28t146.5 100q2 -3 9.5 -14t12.5 -19.5t15 -22.5t17.5 -23.5t18 -23t18 -19.5t17.5 -14.5t16 -7.5t14 2q37 21 113 70t102 72l9 7 q9 7 9.5 8t7.5 8t7 10.5t3 11.5t0 15.5t-6 17.5t-10.5 21.5t-17.5 25.5q-2 2 -11 14l-12 16t-11 16t-11.5 18.5t-10.5 18t-10 20.5t-6.5 21t-5 23.5t-1.5 23.5v346q0 32 -3 65.5t-13 79.5t-26.5 87t-46.5 82.5t-70 71.5t-99.5 49t-132.5 19q-100 0 -165 -6.5t-126.5 -26.5 t-99 -57.5t-66 -98.5t-45.5 -152q-6 -29 9.5 -51t47.5 -29l196 -22q23 1 40 19t22 44q9 45 41 70t83 25t77 -38q8 -12 8.5 -43t-2.5 -56l-4 -25q-226 -27 -321 -70q-110 -48 -170.5 -142t-60.5 -218zM1026 1163q0 78 62.5 121.5t151.5 48.5q2 -16 4.5 -41t0.5 -79.5 t-17 -81.5q-44 -82 -106 -82q-29 0 -49.5 13.5t-29.5 34t-13 37t-4 29.5zM1712 800q6 -20 47 -20h1q16 0 72 10t83 10q42 0 56 -3t20 -18t-7.5 -57.5t-61.5 -161.5q-4 -10 -8 -34t-1.5 -49.5t16.5 -29.5q12 0 17.5 -1t16 6t14 9.5t11.5 10.5l8 8q42 35 72 95t41.5 118 t10.5 107.5t-15 66.5q-19 23 -68.5 33.5t-78.5 10.5q-139 0 -223 -60q-32 -22 -23 -51z" />
-<glyph unicode="&#xe389;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM500 1300h200v-632q0 -71 24.5 -125.5t61.5 -85.5t88.5 -50.5t98 -25.5t98.5 -6h94q111 0 180.5 7.5t95 16.5 t59.5 27v281q-116 -74 -218 -74q-61 0 -121.5 29.5t-60.5 55.5v582h400v300h-400v400h-257q0 -6 -1 -18q-3 -61 -7 -93t-25 -82t-62 -97q-41 -48 -103 -75.5t-103 -30.5l-42 -4v-300zM1642 550q0 -86 61 -147t147 -61t147 61t61 147t-61 147t-147 61t-147 -61t-61 -147z" />
-<glyph unicode="&#xe390;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM270 1233q0 -125 32.5 -240t86 -203.5t125 -163.5t146 -126t153.5 -86q-27 62 -224.5 602.5t-222.5 621.5 q-40 -84 -68 -199t-28 -206zM395 1689q18 0 98.5 2.5t154.5 4.5l73 2q15 0 15 -15t-15 -17l-124 -9l343 -1019l210 631l-141 389l-104 9q-14 0 -14 15q0 16 16 16l41 -3q40 -3 95.5 -5.5t93.5 -2.5q25 0 58 1t62.5 2.5t55 3.5t41.5 3l16 1q15 0 15 -15q1 -2 0 -5.5t-4.5 -7 t-9.5 -4.5l-124 -9l341 -1015l110 370q59 187 59 264q0 52 -15 104t-31.5 84.5t-43.5 77.5q-8 14 -23.5 39t-22.5 37.5t-16 31t-12.5 35t-3.5 33.5q0 54 34.5 93.5t100.5 39.5l70 -3q-10 11 -29.5 29t-84 64.5t-134 82.5t-176.5 65t-215 29q-122 0 -245.5 -39.5 t-221.5 -102.5t-174 -137.5t-119 -149.5zM885 389q101 -42 270 -42q185 0 317 59l-303 811q-240 -708 -284 -828zM1553 440l47 27q204 119 322 324.5t118 441.5q0 227 -108 425l-38 -13q6 -41 6 -86q0 -144 -65 -303z" />
-<glyph unicode="&#xe391;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM800 400h700v100h-200v1400h200v100h-700v-100h200v-1400h-200v-100z" />
-<glyph unicode="&#xe392;" d="M0 250q0 -103 73.5 -176.5t176.5 -73.5h1900q104 0 177 73t73 177v1900q0 103 -73.5 176.5t-176.5 73.5h-1900q-103 0 -176.5 -73.5t-73.5 -176.5v-1900zM400 1418q0 40 26.5 62.5t73.5 19.5h300q18 0 28 1.5t26 11.5t24.5 30t15 60t6.5 97v200q0 59 7.5 69t54.5 11h188 q41 0 78.5 -45t54.5 -90l17 -45h400q75 0 137.5 -29.5t62.5 -70.5l2 -55q1 -55 2.5 -123t0 -170.5t-5.5 -204.5t-16 -218t-29.5 -218t-47.5 -197.5t-67.5 -163.5t-92.5 -109t-121 -41q-78 0 -141 -3.5t-89.5 -7.5t-47 -5.5t-28.5 2t-19 14.5t-15.5 29t-3.5 47t4 57t8 77 t7 90q3 50 35 79t75.5 34t86.5 3t73 -9l30 -7v-100h-100q-36 0 -49.5 -25t1 -50t48.5 -25h125q34 0 54.5 52.5t22.5 119t-2 128.5q-2 25 -21 40t-51.5 22t-66 10t-78 8t-74.5 13q-41 11 -73 38t-46.5 53t-26.5 46.5t-18 20.5q-8 0 -10.5 -70.5t-15.5 -141t-46 -70.5 q-85 0 -271.5 31t-225.5 70q-46 46 -89.5 199.5t-65 282.5t-21.5 166zM400 1600l400 380v-281q0 -29 -29 -64t-90 -35h-281zM1400 1100q4 -5 29 9.5t57.5 32t48.5 17.5q25 0 83.5 -31t81.5 -28q40 4 -8 95q-48 90 -119 159q-47 45 -73 46q-33 0 -59.5 -73t-36.5 -146.5 t-4 -80.5z" />
-<glyph unicode="&#xe393;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM247 900h470l316 496l-111 304h-464l109 -296zM966 1000l417 -700h469l-418 700l617 1100h-469z" />
-<glyph unicode="&#xe394;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM657 940q11 -32 29 -61q47 -6 81 7t66 34.5t59 27.5q30 -38 64 -106t63.5 -131.5t66.5 -127t87 -110.5t109 -64 q67 -19 143 -11.5t139 38t112 78t62.5 109t-9.5 130.5q-32 -1 -121 -34.5t-143 -22.5q-58 11 -112 67t-89 119t-78.5 135t-75.5 103q96 86 132.5 119.5t111 108t124 139.5t91.5 138q104 16 146 117q35 84 12 167q-20 71 -68 79q-57 10 -125 -76q-46 25 -107 48t-133 42 t-143 23.5t-132 -5t-104.5 -45.5t-56.5 -97q-6 -37 -5.5 -72t16.5 -64t46 -37q56 28 147.5 27.5t178.5 -21t156 -51.5q-74 -109 -169 -202.5t-233 -210.5q-94 90 -196 44q-78 -34 -123 -129q-53 -112 -19 -222z" />
-<glyph unicode="&#xe395;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM380 1187q0 -113 30 -221t84 -199t131 -168t168 -131t199 -84t221 -30t221 30t199 84t168 131t131 168t84 199 t30 221t-30 221t-84 199t-131 168t-168 131t-199 84t-221 30t-221 -30t-199 -84t-168 -131t-131 -168t-84 -199t-30 -221zM539 1186l3 1q67 0 148 4.5t238 27.5t294 63q21 -40 39 -81q-1 0 -2.5 -0.5t-2.5 -1.5q-112 -36 -212.5 -99t-171 -133t-110.5 -119t-68 -93 q-155 189 -155 431zM558 1348q36 143 129 259t224 182q124 -172 234 -363q-294 -75 -587 -78zM812 644q15 26 34 53.5t64.5 78.5t98.5 95t136.5 93.5t178.5 83.5q97 -257 138 -489q-121 -47 -249 -47q-223 0 -401 132zM1085 1848q62 12 128 12q245 0 433 -157 q-16 -20 -38.5 -42.5t-62 -54.5t-99 -65.5t-127.5 -60.5q-102 183 -234 368zM1390 1341q94 40 175.5 94.5t119.5 90t65 67.5q128 -167 137 -376q-150 27 -303 27q-83 0 -147 -7q-34 77 -47 104zM1493 1089q61 8 118 8q135 0 265 -35q-23 -124 -91 -232.5t-170 -184.5 q-43 222 -122 444z" />
-<glyph unicode="&#xe396;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM299 918q0 -12 1 -18h900v100v700h-200v-700h-462l13 72q57 296 397 367l4 69q-237 -22 -406 -125 q-122 -75 -184 -189.5t-62 -230.5q0 -4 -0.5 -18.5t-0.5 -26.5zM1300 900h900v98q0 211 -254 367q-122 75 -258 100t-354 25h-33v-90h33q140 0 253 -24t184.5 -63.5t118 -92t64 -107.5t11.5 -112l-465 -1v300h-200v-400z" />
-<glyph unicode="&#xe397;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h550v-1867q0 -13 7 -16t17 7l376 342l377 -342q9 -10 16 -7t7 16v1867h550q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5z" />
-<glyph unicode="&#xe398;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM467 1819q0 -76 53.5 -129.5t129.5 -53.5t129.5 53.5t53.5 129.5t-53.5 129.5t-129.5 53.5t-129.5 -53.5 t-53.5 -129.5zM500 500h300v1000h-300v-1000zM1000 500h300v551q0 51 10 75q13 32 18 43t20 32.5t36 29.5t51 8q82 0 123.5 -56.5t41.5 -153.5v-529h300v665q0 51 -1.5 90t-7 72t-10 57t-17 43t-22.5 31t-31 21t-37 13.5t-47 7t-55 3t-66 0.5q-83 0 -146 -17.5t-96 -45.5 t-48.5 -56t-15.5 -54v170h-300q2 -39 2 -289t-1 -481z" />
-<glyph unicode="&#xe399;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM369 300h631v453l-157 122l41 62l116 -89v252h200v-190l214 116l36 -68l-250 -136v-147l374 203l37 -68l-411 -223 v-287h808l-826 1923z" />
-<glyph unicode="&#xe400;" d="M0 250v1900q0 104 73 177t177 73h1900q104 0 177 -73t73 -177v-1900q0 -104 -73 -177t-177 -73h-1900q-104 0 -177 73t-73 177zM400 1500h200l297 -350l3 2v-283l231 232l720 -552l-558 714l238 237h-283l2 3l-350 297v200z" />
-<glyph unicode="&#xe401;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM400 700h500q141 0 231 73.5t90 216.5q0 210 -155 254q60 29 84 79.5t24 127.5q0 136 -63.5 192.5t-210.5 56.5 h-500v-1000zM600 900v200h251q80 0 116 -20t36 -89q0 -55 -36 -72.5t-109 -18.5h-258zM600 1300v200h218q28 0 45.5 -1t39 -6.5t34 -15.5t21 -29t8.5 -46q0 -57 -34.5 -79.5t-97.5 -22.5h-234zM1291 1056q0 -168 97.5 -274t264.5 -106q80 0 149 25.5t110 62.5t64 73.5 t24 62.5h-197q-57 -63 -147 -63q-79 0 -122.5 43t-47.5 120h514q0 224 -83 325t-264 101q-160 0 -261 -104.5t-101 -265.5zM1400 1500h500v100h-500v-100zM1486 1100q7 191 161 191q50 0 84 -19.5t47.5 -47.5t20 -56.5t5.5 -47.5l-2 -20h-316z" />
-<glyph unicode="&#xe402;" d="M0 250v1900q0 104 73 177t177 73h1900q104 0 177 -73t73 -177v-1900q0 -104 -73 -177t-177 -73h-1900q-104 0 -177 73t-73 177zM400 1100q0 -135 68 -249.5t181 -180.5q-49 57 -49 130v200q0 82 59 141t141 59h800q83 0 141.5 -58.5t58.5 -141.5v-200q0 -73 -49 -130 q113 66 181 180.5t68 249.5v100q0 96 -20.5 166.5t-73.5 133.5l-6 400l-400 -200h-600l-400 200v-400q-100 -131 -100 -300v-100zM800 800h200v300h-200v-300zM1100 700h200v100h-200v-100zM1400 800h200v300h-200v-300z" />
-<glyph unicode="&#xe403;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM500 700q0 -124 88 -212t212 -88h800q124 0 212 88t88 212v200q0 124 -88 212t-212 88h-800q-124 0 -212 -88 t-88 -212v-200zM568 2100l149 -486v-314h183v337l123 463h-164l-63 -260l-65 260h-163zM647 987v82h267v-82h-90v-482h-87v482h-90zM914 573v348h77v-319q0 -16 5 -22q5 -7 16 -7q9 0 21 9q13 8 24 23v316h77v-416h-77v45q-22 -26 -45 -38q-23 -14 -44 -14q-27 0 -41 19 q-13 17 -13 56zM1000 1461q0 -37 1 -53t7.5 -39t21.5 -38q26 -27 49 -38t60 -11q76 0 123 47q38 39 38 129v295q0 83 -39 121q-47 47 -110 47q-67 0 -117 -44q-22 -20 -28 -47.5t-6 -73.5v-295zM1100 1450v311q0 3 4 6t9 5.5t7 4.5q5 5 31 5q21 0 28 -6q1 -1 6.5 -4t10 -5.5 t4.5 -5.5v-311q0 -4 -4 -8.5t-10.5 -8.5t-7.5 -5q-7 -7 -35 -7q-23 0 -27 6q-1 1 -5.5 5t-7.5 8.5t-3 9.5zM1210 505v564h78v-182q18 21 34 29q16 10 35 10q36 0 56 -26q20 -28 20 -78v-231q0 -44 -19 -68q-18 -24 -52 -24q-23 0 -41 9q-15 7 -33 29v-32h-78zM1288 584 q11 -11 19 -15q8 -5 18 -5q15 0 21 9q7 8 7 29v215q0 21 -8 32q-9 11 -24 11q-9 0 -17 -4t-16 -13v-259zM1399.5 1367.5q0.5 -6.5 1.5 -16.5t3.5 -16.5t6.5 -12.5q13 -18 25.5 -26t34.5 -8q44 0 80 21q4 2 17 6t22.5 8t9.5 8v-31h100v600h-100v-439q0 -4 -9.5 -8t-21 -7.5 t-14.5 -5.5q-12 -9 -40 -9q-15 3 -15 18v451h-100v-490q0 -7 -0.5 -21.5t0 -21zM1491 622v187q0 55 33 88q33 34 85 34q53 0 81 -31q29 -32 29 -91v-106h-148v-79q0 -34 7 -45q9 -13 27 -13t27 11q7 10 7 47v29h80v-31q0 -64 -29 -96q-30 -33 -87 -33q-51 0 -82 34 q-30 35 -30 95zM1571 767h68v43q0 26 -8 37q-7 12 -26 12t-26 -12q-8 -9 -8 -37v-43z" />
-<glyph unicode="&#xe404;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM415 1350q0 -90 18 -167t45.5 -134t76.5 -116t93.5 -99.5t115.5 -98.5q92 -75 224.5 -141.5t224 -98.5t155.5 -47 q75 -16 97.5 -7t37.5 60q3 14 3.5 40t-3 52.5t1 65t14 77.5t38 90t72.5 102q147 172 212 274q250 392 -6 648q-70 71 -164 95.5t-185.5 8t-181.5 -56t-159.5 -90.5t-113.5 -102q-54 -63 -85 -95.5t-56 -49t-44.5 -16.5h-48.5q4 2 23.5 7.5t30.5 11t26 16t23.5 27.5t10.5 41 q4 39 -28 65.5t-77.5 35t-86.5 -0.5q-32 -7 -63 -18.5t-77.5 -41t-80 -70t-58.5 -110.5t-25 -157z" />
-<glyph unicode="&#xe405;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-71l-1047 -1160l-190 268q30 81 30 164q0 199 -140.5 340t-339.5 141t-339.5 -141t-140.5 -340q0 -130 64.5 -240.5t175 -175t240.5 -64.5q61 0 129 20l508 -384l1050 927v-1184 q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM328 1351q0 160 112.5 273t272.5 113t272.5 -113t112.5 -273t-112.5 -272.5t-272.5 -112.5t-272.5 112.5t-112.5 272.5z" />
-<glyph unicode="&#xe406;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM474.5 1156q25.5 -189 131.5 -334q94 -128 234 -197t309 -69q73 0 154 14q27 4 65 15q26 -53 56.5 -79t72.5 -45 q75 -34 187 -34q36 0 43 50q5 36 -8.5 81t-41.5 52l-10 2q-24 7 -35 10.5t-33.5 16.5t-41.5 31q168 107 253.5 296t69.5 418q-20 294 -205 469.5t-475 175.5q-20 0 -62 -2q-126 -8 -236 -56t-186 -120.5t-127.5 -152t-78.5 -164.5q-61 -189 -35.5 -378zM843 1335 q5 147 46 260.5t106 160.5q50 38 127 47q26 3 51 3q101 0 165.5 -43t98.5 -98q76 -123 80.5 -340.5t-64.5 -371.5q-2 1 -5 4.5t-4 5.5q-35 30 -76.5 50.5t-76.5 28t-64.5 10.5t-46.5 2l-17 -1q-32 0 -59 -42.5t-28 -77.5q-3 -38 37 -41q123 -7 177 -98q-48 -16 -107 -16 q-125 0 -200 64q-69 59 -107.5 195t-32.5 298z" />
-<glyph unicode="&#xe407;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM493 1019q0 -143 54 -273.5t155 -230.5q101 -101 231 -155.5t273 -54.5t273.5 54.5t231.5 155.5t154.5 231 t53.5 273t-53.5 273.5t-154.5 231.5t-231.5 154.5t-273.5 53.5q-142 0 -271.5 -53t-229.5 -153v448q0 44 -31.5 75t-74.5 31q-44 0 -75 -31t-31 -75v-955zM705 1019q0 207 146 355q148 146 355 146t355 -146q147 -149 147 -355t-147 -355q-149 -147 -355 -147t-355 147 q-146 148 -146 355zM856 970q0 -72 51 -122.5t123 -50.5q71 0 122 50.5t51 122.5q0 71 -51 122t-122 51q-72 0 -123 -51t-51 -122z" />
-<glyph unicode="&#xe408;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM659 969q-9 -260 131.5 -431t372.5 -194q155 -16 284.5 60t204 215.5t79.5 310.5q0 268 -126.5 419t-354.5 176 q-100 11 -204.5 -28.5t-188.5 -113.5t-139 -184t-59 -230zM895 2000q7 -25 27 -40.5t46 -15.5q10 0 19 3q90 23 208 23q134 0 256.5 -30t205.5 -84q19 -12 41 -12q42 0 64 35q17 25 10 56t-33 48q-102 66 -244.5 102t-299.5 36q-137 0 -246 -28q-31 -9 -46 -35 q-16 -28 -8 -58zM928 1808q6 -22 24 -36t40 -14q8 0 17 3q81 21 176 21q109 0 214 -29t182 -80q17 -11 36 -11q36 0 55 29q16 24 10 50q-5 28 -28 42q-95 63 -217 97.5t-251 34.5q-112 0 -211 -27q-27 -6 -41 -30q-13 -26 -6 -50zM945 1635q4 -20 19.5 -33t35.5 -13l12 1 q94 17 176 17q190 0 327 -90q14 -10 32 -10q31 0 47 26q13 20 8.5 43t-24.5 36q-167 109 -388 109q-101 0 -200 -20q-21 -3 -36 -23q-14 -20 -9 -43zM972 944q5 140 76 230.5t152 90.5h6q106 -3 160 -83q58 -84 53 -249q-4 -147 -66.5 -229.5t-168.5 -82.5q-100 3 -156 85 q-61 88 -56 238z" />
-<glyph unicode="&#xe409;" d="M0 250v1900q0 104 73 177t177 73h1900q104 0 177 -73t73 -177v-1900q0 -104 -73 -177t-177 -73h-1900q-104 0 -177 73t-73 177zM300 850q0 -212 117 -321q13 -12 26 -21.5t29.5 -16t28 -11.5t33 -8t30.5 -4.5t35 -2.5t33 -1h37h35q79 0 148 21.5t125.5 65.5t89.5 120.5 t33 178.5v700q0 17 11 29t28 17t30.5 7t25.5 2q57 0 81 -19q1 -1 6.5 -5t8.5 -7t6 -9.5t3 -14.5v-132l150 -65l150 65v132q0 171 -111.5 283t-288.5 112t-288.5 -112t-111.5 -283v-700q0 -51 -31 -72t-69 -21t-69 21t-31 72v250h-300v-250zM1300 850q0 -200 127 -302 q116 -93 263 -93q179 0 294.5 112.5t115.5 282.5v270l-300 -4v-266q0 -17 -11.5 -29.5t-30 -17t-32 -6.5t-26.5 -2t-26.5 2t-32 6.5t-30 17t-11.5 29.5v290l-150 -65l-150 65v-290z" />
-<glyph unicode="&#xe410;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q104 0 177 -73t73 -177v-1900q0 -103 -73.5 -176.5t-176.5 -73.5h-1900q-103 0 -176.5 73.5t-73.5 176.5zM292 1200q0 -89 69 -151l139 -249v-150q0 -50 50 -50h100q50 0 50 50v550q0 88 -59 149t-145 61t-145 -61t-59 -149 zM616 1466l10 -3q78 -36 126 -108t48 -155v-77l10 15q169 152 387 152q222 0 391 -152l12 -15v77q0 83 48 155t126 108l13 3l-2 9q-58 192 -221 313.5t-363 121.5q-201 0 -364 -121.5t-220 -313.5zM800 700h800v300l4 53q-174 157 -399 157q-116 0 -224 -42.5t-181 -122.5 v-345zM1700 650q0 -50 50 -50h100q50 0 50 50v87l5 58l139 252q69 64 69 153q0 87 -60.5 148.5t-147.5 61.5t-146 -61.5t-59 -148.5v-550z" />
-<glyph unicode="&#xe411;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-550v1000h300v300h-299v167q0 71 33 102t126 31h140v400h-400q-48 0 -89 -11t-70 -27.5t-52 -43.5t-37.5 -51.5t-25 -59t-15.5 -59t-7.5 -58.5t-3 -49.5 t-0.5 -40.5v-300h-200v-300h200v-1000h-950q-103 0 -176.5 73.5t-73.5 176.5z" />
-<glyph unicode="&#xe412;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM346 604q249 -161 549 -161q191 0 358.5 60.5t286.5 162t205 233.5t128 276t42 288q0 31 -1 46q107 78 179 186 q-96 -43 -206 -57q117 71 158 199q-103 -63 -228 -87q-50 53 -117.5 83t-143.5 30q-148 0 -253.5 -105.5t-105.5 -253.5q0 -42 9 -81q-220 11 -412 110t-327 264q-48 -85 -48 -180q0 -92 43 -170.5t116 -127.5q-83 1 -162 44v-4q0 -129 82 -228t206 -124q-46 -12 -95 -12 q-34 0 -67 6q34 -108 126.5 -177.5t208.5 -71.5q-196 -153 -446 -153q-38 0 -85 5z" />
-<glyph unicode="&#xe413;" d="M0 250v1350h551q-66 -143 -66 -300q0 -146 56.5 -278.5t152.5 -228t228.5 -152.5t277.5 -57t277.5 57t228.5 152.5t152.5 228t56.5 278.5q0 157 -66 300h551v-1350q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM0 1700v450q0 89 57 158.5t143 86.5 v-595h100v600h100v-600h100v600h100v-600h89q-49 -51 -82 -100h-607zM648 1300q0 150 74 277t201 201t277 74t277 -74t201 -201t74 -277t-74 -277t-201 -201t-277 -74t-277 74t-201 201t-74 277zM700 1811v589h1450q103 0 176.5 -73.5t73.5 -176.5v-450h-607 q-98 145 -254.5 230t-338.5 85q-144 0 -272.5 -54t-227.5 -150zM766 1300q0 -180 127 -307t307 -127t307 127t127 307t-127 307t-307 127t-307 -127t-127 -307zM1800 1900q0 -41 29.5 -70.5t70.5 -29.5h200q41 0 70.5 29.5t29.5 70.5v200q0 41 -29.5 70.5t-70.5 29.5h-200 q-41 0 -70.5 -29.5t-29.5 -70.5v-200z" />
-<glyph unicode="&#xe414;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM300 400q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-600 q-41 0 -70.5 -29.5t-29.5 -70.5v-600zM300 1400q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600zM484 700q0 89 63.5 152.5t152.5 63.5t152.5 -63.5t63.5 -152.5t-63.5 -152.5 t-152.5 -63.5t-152.5 63.5t-63.5 152.5zM484 1700q0 89 63.5 152.5t152.5 63.5t152.5 -63.5t63.5 -152.5t-63.5 -152.5t-152.5 -63.5t-152.5 63.5t-63.5 152.5zM1300 400q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-600 q-41 0 -70.5 -29.5t-29.5 -70.5v-600zM1300 1400q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600zM1484 700q0 89 63.5 152.5t152.5 63.5t152.5 -63.5t63.5 -152.5t-63.5 -152.5 t-152.5 -63.5t-152.5 63.5t-63.5 152.5zM1484 1700q0 89 63.5 152.5t152.5 63.5t152.5 -63.5t63.5 -152.5t-63.5 -152.5t-152.5 -63.5t-152.5 63.5t-63.5 152.5z" />
-<glyph unicode="&#xe415;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM358 1501l76 -97q108 75 126 75q83 0 155 -259q102 -376 130 -476q96 -259 237 -259q228 0 555 425 q318 407 328 642q15 313 -234 320q-336 10 -454 -375q63 26 119 26q122 0 108 -137q-7 -83 -108 -242q-102 -158 -152 -158q-64 0 -118 245q-17 64 -65 367q-22 137 -79.5 201t-151.5 55q-79 -7 -238 -144q-72 -66 -234 -209z" />
-<glyph unicode="&#xe416;" d="M0 250v1900q0 104 73 177t177 73h1900q104 0 177 -73t73 -177v-1900q0 -104 -73 -177t-177 -73h-1900q-104 0 -177 73t-73 177zM400 1225q0 -145 102.5 -247.5t247.5 -102.5t247.5 102.5t102.5 247.5t-102.5 247.5t-247.5 102.5t-247.5 -102.5t-102.5 -247.5zM1300 1225 q0 -145 102.5 -247.5t247.5 -102.5t247.5 102.5t102.5 247.5t-102.5 247.5t-247.5 102.5t-247.5 -102.5t-102.5 -247.5z" />
-<glyph unicode="&#xe417;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM283 1221q0 -112 44 -214.5t118 -176.5t176.5 -118t214.5 -44q124 0 236 53t191 149l8 10l-90 208l-20 -37 q-47 -91 -134.5 -144t-190.5 -53q-152 0 -259.5 107.5t-107.5 259.5t107.5 259.5t259.5 107.5q110 0 203 -60t133 -158l170 -387l20 -44q59 -137 148.5 -200.5t224.5 -64.5q161 0 269 95t108 237q0 134 -68.5 203t-216.5 117l-46 15q-101 31 -138.5 57t-37.5 81 q0 50 35 82.5t88 32.5q82 0 134 -75l10 -14l148 76l-10 18q-94 165 -275 165q-141 0 -225 -79t-84 -210q0 -66 21 -115.5t66.5 -87t101.5 -64.5t141 -55q102 -34 136.5 -59.5t34.5 -82.5q0 -69 -55.5 -113t-144.5 -44q-45 1 -76.5 13t-55 37.5t-38.5 52t-36 73.5 q-74 168 -167 386l-7 17q-70 163 -204 252t-307 89q-112 0 -214.5 -44t-176.5 -118t-118 -176.5t-44 -214.5z" />
-<glyph unicode="&#xe418;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q104 0 177 -73t73 -177v-1900q0 -103 -73.5 -176.5t-176.5 -73.5h-1900q-103 0 -176.5 73.5t-73.5 176.5zM400 620q0 -91 64 -154.5t154 -63.5t154 63.5t64 154.5q0 90 -64 154t-154 64t-154 -64t-64 -154zM400 1170 q154 0 293.5 -58t247.5 -167q109 -109 166.5 -249.5t57.5 -295.5h315q0 143 -40 282.5t-110.5 258.5t-171 220t-219 172.5t-257.5 111.5t-282 40v-315zM400 1728q177 0 347.5 -48t315.5 -133.5t267.5 -208.5t209 -268.5t134.5 -317.5t48 -352h314q0 223 -59.5 436t-166 393 t-258.5 332t-331.5 258t-390.5 165t-430 59v-315z" />
-<glyph unicode="&#xe419;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM309 1630q-1 -133 67 -251q-17 -80 -17 -162q0 -172 66.5 -328t179 -269.5t268.5 -180.5t327 -68q95 0 196 24 q103 -50 217 -50q138 0 255 67.5t185.5 184t68.5 254.5q0 149 -81 276q5 47 5 86q0 171 -66.5 327.5t-179 269.5t-268.5 180.5t-328 67.5q-58 0 -126 -10q-122 79 -269 80q-136 0 -251 -66.5t-182 -181.5t-67 -250zM799.5 964.5q-11.5 43.5 4 79.5t62.5 48q35 9 63 -6 t47.5 -45.5t36.5 -63.5t40 -65t48 -45q46 -24 106 -25.5t116.5 21.5t85.5 66q26 44 24 80t-29.5 65t-62 48t-74.5 30q-27 8 -84.5 22t-92.5 23.5t-81.5 29t-80.5 44.5q-78 55 -103.5 148t12.5 181q34 79 110 124t170 58q229 33 369 -66q41 -30 73.5 -79t38.5 -104t-48 -91 q-38 -20 -62.5 -16t-49.5 31t-41.5 56.5t-39 59.5t-42.5 41q-43 23 -106 25t-119.5 -25t-70.5 -79q-9 -34 3.5 -62t36.5 -45.5t62.5 -32.5t69.5 -22.5t71 -16t54 -12.5q52 -14 88 -26.5t80.5 -34t77 -52t53.5 -70.5q31 -62 32 -129t-29 -128t-83 -110.5t-135.5 -78.5 t-179.5 -29q-232 0 -345 130q-23 26 -43.5 65.5t-32 83z" />
-<glyph unicode="&#xe420;" d="M0 250v1900q0 103 73.5 176.5t176.5 73.5h1900q103 0 176.5 -73.5t73.5 -176.5v-1900q0 -104 -73 -177t-177 -73h-1900q-103 0 -176.5 73.5t-73.5 176.5zM430 1222q0 -266 172 -461q208 -235 584 -235q163 0 310 52q150 51 278 151l15 11l-86 132l-39 -27 q-84 -60 -160 -91q-142 -60 -307 -60q-239 0 -404 129q-185 146 -185 394q0 225 159 385q176 178 468 178q159 0 286 -65q198 -101 198 -331q0 -158 -73 -252q-69 -92 -136 -92q-29 0 -41 16q-14 19 -14 38l8 43q2 8 16 56l121 407h-209l-22 -70q-2 4 -8.5 15.5t-12.5 20 t-12 14.5q-57 57 -158 57q-168 0 -283 -148q-113 -145 -113 -312q0 -146 77 -228q77 -84 192 -84q114 0 194 74q24 21 45 51q11 -39 45 -73q50 -53 139 -53q166 0 294 151q127 150 127 358q0 265 -200 424q-187 150 -474 150q-352 0 -576 -218q-215 -207 -215 -507z M1015 1159q0 103 64 212q60 105 141 105q38 0 61 -25q23 -28 23 -66q0 -77 -59 -218q-56 -132 -137 -132q-44 0 -68 32q-25 36 -25 92z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/web/base/fonts/glyphicons-regular.ttf b/openQRM-5.3.50-CE/src/web/base/fonts/glyphicons-regular.ttf
deleted file mode 100644
index 42d0591..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/fonts/glyphicons-regular.ttf and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/fonts/glyphicons-regular.woff b/openQRM-5.3.50-CE/src/web/base/fonts/glyphicons-regular.woff
deleted file mode 100644
index 6d892ed..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/fonts/glyphicons-regular.woff and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/fonts/glyphiconshalflings-regular.eot b/openQRM-5.3.50-CE/src/web/base/fonts/glyphiconshalflings-regular.eot
deleted file mode 100644
index bd59ccd..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/fonts/glyphiconshalflings-regular.eot and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/fonts/glyphiconshalflings-regular.otf b/openQRM-5.3.50-CE/src/web/base/fonts/glyphiconshalflings-regular.otf
deleted file mode 100644
index b058f1c..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/fonts/glyphiconshalflings-regular.otf and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/fonts/glyphiconshalflings-regular.svg b/openQRM-5.3.50-CE/src/web/base/fonts/glyphiconshalflings-regular.svg
deleted file mode 100644
index 0fb4587..0000000
--- a/openQRM-5.3.50-CE/src/web/base/fonts/glyphiconshalflings-regular.svg
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
-<font-face units-per-em="1200" ascent="960" descent="-240" />
-<missing-glyph horiz-adv-x="500" />
-<glyph />
-<glyph />
-<glyph unicode="&#xd;" />
-<glyph unicode=" " />
-<glyph unicode="*" d="M100 500v200h259l-183 183l141 141l183 -183v259h200v-259l183 183l141 -141l-183 -183h259v-200h-259l183 -183l-141 -141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259z" />
-<glyph unicode="+" d="M0 400v300h400v400h300v-400h400v-300h-400v-400h-300v400h-400z" />
-<glyph unicode="&#x20ac;" d="M100 500l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-63 -32t-65.5 -67t-50 -107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-207 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z" />
-<glyph unicode="&#x2212;" d="M200 400h900v300h-900v-300z" />
-<glyph unicode="&#x2709;" d="M0 100l400 400l200 -200l200 200l400 -400h-1200zM0 300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z" />
-<glyph unicode="&#x270f;" d="M-13 -13l333 112l-223 223zM187 403l214 -214l614 614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13z" />
-<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#xe001;" d="M0 1200h1200l-500 -550v-550h300v-100h-800v100h300v550z" />
-<glyph unicode="&#xe002;" d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q18 -55 86 -75.5t147 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z" />
-<glyph unicode="&#xe003;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z" />
-<glyph unicode="&#xe005;" d="M100 784q0 64 28 123t73 100.5t104.5 64t119 20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z" />
-<glyph unicode="&#xe006;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447z" />
-<glyph unicode="&#xe007;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM237 700l196 -142l-73 -226l192 140l195 -141l-74 229l193 140h-235l-77 211l-78 -211h-239z" />
-<glyph unicode="&#xe008;" d="M0 0v143l400 257v100q-37 0 -68.5 74.5t-31.5 125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5 -74.5v-100l400 -257v-143h-1200z" />
-<glyph unicode="&#xe009;" d="M0 0v1100h1200v-1100h-1200zM100 100h100v100h-100v-100zM100 300h100v100h-100v-100zM100 500h100v100h-100v-100zM100 700h100v100h-100v-100zM100 900h100v100h-100v-100zM300 100h600v400h-600v-400zM300 600h600v400h-600v-400zM1000 100h100v100h-100v-100z M1000 300h100v100h-100v-100zM1000 500h100v100h-100v-100zM1000 700h100v100h-100v-100zM1000 900h100v100h-100v-100z" />
-<glyph unicode="&#xe010;" d="M0 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM0 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5zM600 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM600 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe011;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 450v200q0 21 14.5 35.5t35.5 14.5h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe012;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v200q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5 t-14.5 -35.5v-200zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe013;" d="M29 454l419 -420l818 820l-212 212l-607 -607l-206 207z" />
-<glyph unicode="&#xe014;" d="M106 318l282 282l-282 282l212 212l282 -282l282 282l212 -212l-282 -282l282 -282l-212 -212l-282 282l-282 -282z" />
-<glyph unicode="&#xe015;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233zM300 600v200h100v100h200v-100h100v-200h-100v-100h-200v100h-100z" />
-<glyph unicode="&#xe016;" d="M23 694q0 200 142 342t342 142t342 -142t142 -342q0 -141 -78 -262l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300 299q-120 -77 -261 -77q-200 0 -342 142t-142 342zM176 694q0 -136 97 -233t234 -97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300 601h400v200h-400v-200z" />
-<glyph unicode="&#xe017;" d="M23 600q0 183 105 331t272 210v-166q-103 -55 -165 -155t-62 -220q0 -177 125 -302t302 -125t302 125t125 302q0 120 -62 220t-165 155v166q167 -62 272 -210t105 -331q0 -118 -45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5 zM500 750q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-400z" />
-<glyph unicode="&#xe018;" d="M100 1h200v300h-200v-300zM400 1v500h200v-500h-200zM700 1v800h200v-800h-200zM1000 1v1200h200v-1200h-200z" />
-<glyph unicode="&#xe019;" d="M26 601q0 -33 6 -74l151 -38l2 -6q14 -49 38 -93l3 -5l-80 -134q45 -59 105 -105l133 81l5 -3q45 -26 94 -39l5 -2l38 -151q40 -5 74 -5q27 0 74 5l38 151l6 2q46 13 93 39l5 3l134 -81q56 44 104 105l-80 134l3 5q24 44 39 93l1 6l152 38q5 40 5 74q0 28 -5 73l-152 38 l-1 6q-16 51 -39 93l-3 5l80 134q-44 58 -104 105l-134 -81l-5 3q-45 25 -93 39l-6 1l-38 152q-40 5 -74 5q-27 0 -74 -5l-38 -152l-5 -1q-50 -14 -94 -39l-5 -3l-133 81q-59 -47 -105 -105l80 -134l-3 -5q-25 -47 -38 -93l-2 -6l-151 -38q-6 -48 -6 -73zM385 601 q0 88 63 151t152 63t152 -63t63 -151q0 -89 -63 -152t-152 -63t-152 63t-63 152z" />
-<glyph unicode="&#xe020;" d="M100 1025v50q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-50q0 -11 -7 -18t-18 -7h-1050q-11 0 -18 7t-7 18zM200 100v800h900v-800q0 -41 -29.5 -71t-70.5 -30h-700q-41 0 -70.5 30 t-29.5 71zM300 100h100v700h-100v-700zM500 100h100v700h-100v-700zM500 1100h300v100h-300v-100zM700 100h100v700h-100v-700zM900 100h100v700h-100v-700z" />
-<glyph unicode="&#xe021;" d="M1 601l656 644l644 -644h-200v-600h-300v400h-300v-400h-300v600h-200z" />
-<glyph unicode="&#xe022;" d="M100 25v1150q0 11 7 18t18 7h475v-500h400v-675q0 -11 -7 -18t-18 -7h-850q-11 0 -18 7t-7 18zM700 800v300l300 -300h-300z" />
-<glyph unicode="&#xe023;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM173 600q0 -176 125 -301.5t302 -125.5t302 125.5t125 301.5 q0 177 -125 302t-302 125t-302 -125t-125 -302zM500 500v400h100v-300h200v-100h-300z" />
-<glyph unicode="&#xe024;" d="M-100 0l431 1200h209l-21 -300h162l-20 300h208l431 -1200h-538l-41 400h-242l-40 -400h-539zM488 500h224l-27 300h-170z" />
-<glyph unicode="&#xe025;" d="M0 0v400h490l-290 300h200v500h300v-500h200l-290 -300h490v-400h-1100zM813 200h175v100h-175v-100z" />
-<glyph unicode="&#xe026;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM173 600q0 -176 125 -301.5t302 -125.5t302 125.5t125 301.5 q0 177 -125 302t-302 125t-302 -125t-125 -302zM350 600h150v300h200v-300h150l-250 -300z" />
-<glyph unicode="&#xe027;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM173 600q0 -176 125 -301.5t302 -125.5t302 125.5t125 301.5 q0 177 -125 302t-302 125t-302 -125t-125 -302zM350 600h150v-300h200v300h150l-250 300z" />
-<glyph unicode="&#xe028;" d="M0 25v475l200 700h800q199 -700 200 -700v-475q0 -11 -7 -18t-18 -7h-1150q-11 0 -18 7t-7 18zM200 500h200l50 -200h300l50 200h200l-97 500h-606z" />
-<glyph unicode="&#xe029;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM173 601q0 -176 125 -301.5t302 -125.5t302 125.5t125 301.5 q0 177 -125 302t-302 125t-302 -125t-125 -302zM500 397v401l297 -200z" />
-<glyph unicode="&#xe030;" d="M23 600q0 -118 45.5 -224.5t123 -184t184 -123t224.5 -45.5t224.5 45.5t184 123t123 184t45.5 224.5h-150q0 -177 -125 -302t-302 -125t-302 125t-125 302t125 302t302 125q136 0 246 -81l-146 -146h400v400l-145 -145q-157 122 -355 122q-118 0 -224.5 -45.5t-184 -123 t-123 -184t-45.5 -224.5z" />
-<glyph unicode="&#xe031;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5q198 0 355 -122l145 145v-400h-400l147 147q-112 80 -247 80q-177 0 -302 -125t-125 -302h-150zM100 0v400h400l-147 -147q112 -80 247 -80q177 0 302 125t125 302h150q0 -118 -45.5 -224.5t-123 -184t-184 -123 t-224.5 -45.5q-198 0 -355 122z" />
-<glyph unicode="&#xe032;" d="M100 0h1100v1200h-1100v-1200zM200 100v900h900v-900h-900zM300 200v100h100v-100h-100zM300 400v100h100v-100h-100zM300 600v100h100v-100h-100zM300 800v100h100v-100h-100zM500 200h500v100h-500v-100zM500 400v100h500v-100h-500zM500 600v100h500v-100h-500z M500 800v100h500v-100h-500z" />
-<glyph unicode="&#xe033;" d="M0 100v600q0 41 29.5 70.5t70.5 29.5h100v200q0 82 59 141t141 59h300q82 0 141 -59t59 -141v-200h100q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5zM400 800h300v150q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-150z" />
-<glyph unicode="&#xe034;" d="M100 0v1100h100v-1100h-100zM300 400q60 60 127.5 84t127.5 17.5t122 -23t119 -30t110 -11t103 42t91 120.5v500q-40 -81 -101.5 -115.5t-127.5 -29.5t-138 25t-139.5 40t-125.5 25t-103 -29.5t-65 -115.5v-500z" />
-<glyph unicode="&#xe035;" d="M0 275q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 127 70.5 231.5t184.5 161.5t245 57t245 -57t184.5 -161.5t70.5 -231.5v-300q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v275v25q0 116 -49.5 227t-131 192.5t-192.5 131t-227 49.5t-227 -49.5t-192.5 -131t-131 -192.5 t-49.5 -227v-300zM200 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14zM800 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14z" />
-<glyph unicode="&#xe036;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM688 459l141 141l-141 141l71 71l141 -141l141 141l71 -71l-141 -141l141 -141l-71 -71l-141 141l-141 -141z" />
-<glyph unicode="&#xe037;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM700 857l69 53q111 -135 111 -310q0 -169 -106 -302l-67 54q86 110 86 248q0 146 -93 257z" />
-<glyph unicode="&#xe038;" d="M0 401v400h300l300 200v-800l-300 200h-300zM702 858l69 53q111 -135 111 -310q0 -170 -106 -303l-67 55q86 108 86 248q0 145 -93 257zM889 951l7 -8q123 -151 123 -344q0 -189 -119 -339l-7 -8l81 -66l6 8q142 178 142 405q0 230 -144 408l-6 8z" />
-<glyph unicode="&#xe039;" d="M0 0h500v500h-200v100h-100v-100h-200v-500zM0 600h100v100h400v100h100v100h-100v300h-500v-600zM100 100v300h300v-300h-300zM100 800v300h300v-300h-300zM200 200v100h100v-100h-100zM200 900h100v100h-100v-100zM500 500v100h300v-300h200v-100h-100v-100h-200v100 h-100v100h100v200h-200zM600 0v100h100v-100h-100zM600 1000h100v-300h200v-300h300v200h-200v100h200v500h-600v-200zM800 800v300h300v-300h-300zM900 0v100h300v-100h-300zM900 900v100h100v-100h-100zM1100 200v100h100v-100h-100z" />
-<glyph unicode="&#xe040;" d="M0 200h100v1000h-100v-1000zM100 0v100h300v-100h-300zM200 200v1000h100v-1000h-100zM500 0v91h100v-91h-100zM500 200v1000h200v-1000h-200zM700 0v91h100v-91h-100zM800 200v1000h100v-1000h-100zM900 0v91h200v-91h-200zM1000 200v1000h200v-1000h-200z" />
-<glyph unicode="&#xe041;" d="M1 700v475q0 10 7.5 17.5t17.5 7.5h474l700 -700l-500 -500zM148 953q0 -42 29 -71q30 -30 71.5 -30t71.5 30q29 29 29 71t-29 71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71z" />
-<glyph unicode="&#xe042;" d="M2 700v475q0 11 7 18t18 7h474l700 -700l-500 -500zM148 953q0 -42 30 -71q29 -30 71 -30t71 30q30 29 30 71t-30 71q-29 30 -71 30t-71 -30q-30 -29 -30 -71zM701 1200h100l700 -700l-500 -500l-50 50l450 450z" />
-<glyph unicode="&#xe043;" d="M100 0v1025l175 175h925v-1000l-100 -100v1000h-750l-100 -100h750v-1000h-900z" />
-<glyph unicode="&#xe044;" d="M200 0l450 444l450 -443v1150q0 20 -14.5 35t-35.5 15h-800q-21 0 -35.5 -15t-14.5 -35v-1151z" />
-<glyph unicode="&#xe045;" d="M0 100v700h200l100 -200h600l100 200h200v-700h-200v200h-800v-200h-200zM253 829l40 -124h592l62 124l-94 346q-2 11 -10 18t-18 7h-450q-10 0 -18 -7t-10 -18zM281 24l38 152q2 10 11.5 17t19.5 7h500q10 0 19.5 -7t11.5 -17l38 -152q2 -10 -3.5 -17t-15.5 -7h-600 q-10 0 -15.5 7t-3.5 17z" />
-<glyph unicode="&#xe046;" d="M0 200q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-150q-4 8 -11.5 21.5t-33 48t-53 61t-69 48t-83.5 21.5h-200q-41 0 -82 -20.5t-70 -50t-52 -59t-34 -50.5l-12 -20h-150q-41 0 -70.5 -29.5t-29.5 -70.5v-600z M356 500q0 100 72 172t172 72t172 -72t72 -172t-72 -172t-172 -72t-172 72t-72 172zM494 500q0 -44 31 -75t75 -31t75 31t31 75t-31 75t-75 31t-75 -31t-31 -75zM900 700v100h100v-100h-100z" />
-<glyph unicode="&#xe047;" d="M53 0h365v66q-41 0 -72 11t-49 38t1 71l92 234h391q67 -181 82 -222q16 -45 -5.5 -88.5t-74.5 -43.5v-66h417v66q-34 1 -74 43q-18 19 -33 42t-21 37l-6 13l-385 998h-93l-399 -1006q-24 -48 -52 -75q-12 -12 -33 -25t-36 -20l-15 -7v-66zM416 521l178 457l46 -140 l116 -317h-340z" />
-<glyph unicode="&#xe048;" d="M100 0v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1 39.5t-5.5 26t-15.5 21t-29 13.5t-49 14v71h471q76 0 145.5 -37.5t115 -111.5t45.5 -167q0 -55 -11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5 -58t47.5 -91.5t21.5 -129 q0 -84 -59 -156.5t-142 -111t-162 -38.5h-500zM400 200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400zM400 700h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5v-379z" />
-<glyph unicode="&#xe049;" d="M200 0v57q77 7 134.5 40.5t65.5 80.5l173 849q10 56 -10 74t-91 37q-6 1 -10.5 2.5t-9.5 2.5v57h425l2 -57q-33 -8 -62 -25.5t-46 -37t-29.5 -38t-17.5 -30.5l-5 -12l-128 -825q-10 -52 14 -82t95 -36v-57h-500z" />
-<glyph unicode="&#xe050;" d="M-75 200h75v800h-75l125 167l125 -167h-75v-800h75l-125 -167zM300 900v300h150h700h150v-300h-50q0 29 -8 48.5t-18.5 30t-33.5 15t-39.5 5.5t-50.5 1h-200v-850l100 -50v-100h-400v100l100 50v850h-200q-34 0 -50.5 -1t-40 -5.5t-33.5 -15t-18.5 -30t-8.5 -48.5h-49z " />
-<glyph unicode="&#xe051;" d="M33 51l167 125v-75h800v75l167 -125l-167 -125v75h-800v-75zM100 901v300h150h700h150v-300h-50q0 29 -8 48.5t-18 30t-33.5 15t-40 5.5t-50.5 1h-200v-650l100 -50v-100h-400v100l100 50v650h-200q-34 0 -50.5 -1t-39.5 -5.5t-33.5 -15t-18.5 -30t-8 -48.5h-50z" />
-<glyph unicode="&#xe052;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 350q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM0 650q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1000q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 950q0 -20 14.5 -35t35.5 -15h600q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-600q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
-<glyph unicode="&#xe053;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 650q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM200 350q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM200 950q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
-<glyph unicode="&#xe054;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1000q-21 0 -35.5 15 t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-600 q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe055;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100 q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe056;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM300 50v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800 q-21 0 -35.5 15t-14.5 35zM300 650v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 950v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15 h-800q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe057;" d="M-101 500v100h201v75l166 -125l-166 -125v75h-201zM300 0h100v1100h-100v-1100zM500 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35 v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 650q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100 q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100z" />
-<glyph unicode="&#xe058;" d="M1 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 650 q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM801 0v1100h100v-1100 h-100zM934 550l167 -125v75h200v100h-200v75z" />
-<glyph unicode="&#xe059;" d="M0 275v650q0 31 22 53t53 22h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53zM900 600l300 300v-600z" />
-<glyph unicode="&#xe060;" d="M0 44v1012q0 18 13 31t31 13h1112q19 0 31.5 -13t12.5 -31v-1012q0 -18 -12.5 -31t-31.5 -13h-1112q-18 0 -31 13t-13 31zM100 263l247 182l298 -131l-74 156l293 318l236 -288v500h-1000v-737zM208 750q0 56 39 95t95 39t95 -39t39 -95t-39 -95t-95 -39t-95 39t-39 95z " />
-<glyph unicode="&#xe062;" d="M219 725q0 -116 60 -249q65 -114 158.5 -231.5t154.5 -178.5l61 -61q22 25 59.5 69t132 167t163.5 231q70 142 70 258q0 117 -57.5 218.5t-156.5 161t-216 59.5q-116 0 -215 -61t-156.5 -163.5t-57.5 -219.5zM431 752q0 92 64.5 157t156.5 65t157 -65t65 -157t-65 -156.5 t-157 -64.5t-156.5 64.5t-64.5 156.5z" />
-<glyph unicode="&#xe063;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM173 600q0 -176 125 -301.5t302 -125.5v854q-177 0 -302 -125t-125 -302z " />
-<glyph unicode="&#xe064;" d="M117 406q0 94 34 186t88.5 172.5t112 159t115 177t87.5 194.5q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50 -125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6 -211.5 53t-161.5 138.5t-64 210.5zM243 414q14 -82 59.5 -136 t136.5 -80l16 98q-7 6 -18 17t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5 -156z" />
-<glyph unicode="&#xe065;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5q366 -6 397 -14l-186 -186h-311q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v125l200 200v-225q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM436 341l161 50l412 412l-114 113l-405 -405zM994 1015l114 -113l113 113l-21 85l-92 28z" />
-<glyph unicode="&#xe066;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h261l2 -80q-133 -32 -218 -120h-145q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-53q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5 zM423 524q30 38 81.5 64t103 35.5t99 14t77.5 3.5l29 -1v-209l360 324l-359 318v-216q-7 0 -19 -1t-48 -8t-69.5 -18.5t-76.5 -37t-76.5 -59t-62 -88t-39.5 -121.5z" />
-<glyph unicode="&#xe067;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-169q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM342 632l283 -284l566 567l-136 137l-430 -431l-147 147z" />
-<glyph unicode="&#xe068;" d="M0 603l300 296v-198h200v200h-200l300 300l295 -300h-195v-200h200v198l300 -296l-300 -300v198h-200v-200h195l-295 -300l-300 300h200v200h-200v-198z" />
-<glyph unicode="&#xe069;" d="M200 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-1100l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe070;" d="M0 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-487l500 487v-1100l-500 488v-488l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe071;" d="M136 550l564 550v-487l500 487v-1100l-500 488v-488z" />
-<glyph unicode="&#xe072;" d="M200 0l900 550l-900 550v-1100z" />
-<glyph unicode="&#xe073;" d="M200 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-800zM600 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
-<glyph unicode="&#xe074;" d="M200 150q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v800q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
-<glyph unicode="&#xe075;" d="M0 0v1100l500 -487v487l564 -550l-564 -550v488z" />
-<glyph unicode="&#xe076;" d="M0 0v1100l500 -487v487l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-500 -488v488z" />
-<glyph unicode="&#xe077;" d="M300 0v1100l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438z" />
-<glyph unicode="&#xe078;" d="M100 250v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5zM100 500h1100l-550 564z" />
-<glyph unicode="&#xe079;" d="M136 550v1l551 550l198 -197l-352 -353l352 -353l-198 -198z" />
-<glyph unicode="&#xe080;" d="M315 198l198 -198l552 550l-1 1l-551 550l-198 -197l353 -353z" />
-<glyph unicode="&#xe081;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM300 500h200v-200h200v200h200v200h-200v200h-200v-200h-200v-200z" />
-<glyph unicode="&#xe082;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM300 500h600v200h-600v-200z" />
-<glyph unicode="&#xe083;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM247 459l212 -212l141 141l141 -141l213 212l-142 141l142 142l-213 212 l-141 -142l-141 142l-212 -212l141 -142z" />
-<glyph unicode="&#xe084;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM270 551l276 -277l411 411l-175 174l-236 -236l-102 102z" />
-<glyph unicode="&#xe085;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM364 700h143q4 0 11.5 -1t11 -0.5t6.5 3t3 8.5t1 11t3.5 8.5t3.5 6t5.5 4 t6.5 2.5t9 1.5t9 0.5h11.5h12.5q19 0 30 -10t11 -26q0 -21 -4.5 -27.5t-26.5 -21.5q-5 -1 -12.5 -3.5t-27 -13.5t-34 -27t-26.5 -46.5t-11 -68.5h200q5 3 14 8t31.5 25.5t39.5 46t31 69t14 93.5q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3q-50 0 -90.5 -12t-75 -38.5 t-53.5 -74.5t-19 -114zM500 300h200v100h-200v-100z" />
-<glyph unicode="&#xe086;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM400 300h400v100h-100v300h-300v-100h100v-200h-100v-100zM500 800h200 v100h-200v-100z" />
-<glyph unicode="&#xe087;" d="M0 500v200h194q15 60 36 104.5t55.5 86t88 69t126.5 40.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h6h165h32v-200h-203q-25 -102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98 200.5h-194zM290 500q24 -73 79.5 -127.5t130.5 -78.5v206 h200v-206q149 48 201 206h-201v200h200q-25 74 -76 127.5t-124 76.5v-204h-200v203q-75 -24 -130 -77.5t-79 -125.5h209v-200h-210z" />
-<glyph unicode="&#xe088;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM173 600q0 -176 125 -301.5t302 -125.5t302 125.5t125 301.5 q0 177 -125 302t-302 125t-302 -125t-125 -302zM384 465l135 135l-135 135l81 81l135 -135l135 135l81 -81l-135 -135l135 -135l-81 -81l-135 136l-135 -136z" />
-<glyph unicode="&#xe089;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM173 600q0 -176 125 -301.5t302 -125.5t302 125.5t125 301.5 q0 177 -125 302t-302 125t-302 -125t-125 -302zM350 537l113 113l87 -87l204 204l113 -113l-317 -317z" />
-<glyph unicode="&#xe090;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM173 600q0 -119 66 -225l586 587q-105 65 -225 65q-177 0 -302 -125 t-125 -302zM381 235q104 -62 219 -62q177 0 302 125.5t125 301.5q0 117 -62 219z" />
-<glyph unicode="&#xe091;" d="M0 547l600 453v-300h600v-300h-600v-301z" />
-<glyph unicode="&#xe092;" d="M0 400v300h600v300l600 -453l-600 -448v301h-600z" />
-<glyph unicode="&#xe093;" d="M204 600l450 600l444 -600h-298v-600h-300v600h-296z" />
-<glyph unicode="&#xe094;" d="M104 600h296v600h300v-600h298l-449 -600z" />
-<glyph unicode="&#xe095;" d="M0 200q5 105 27 193t68 167t113 135t166.5 91.5t225.5 42.5v271l600 -453l-600 -448v301q-94 -2 -182.5 -20t-170.5 -52.5t-147 -92.5t-100 -135z" />
-<glyph unicode="&#xe096;" d="M0 0v400l129 -129l294 294l142 -142l-294 -294l129 -129h-400zM635 777l142 -142l294 294l129 -129v400h-400l129 -129z" />
-<glyph unicode="&#xe097;" d="M34 176l295 295l-129 129h400v-400l-129 130l-295 -295zM600 600v400l129 -129l295 295l142 -142l-295 -294l129 -130h-400z" />
-<glyph unicode="&#xe101;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM456 851l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5 t21.5 34.5l58 302q4 20 -8 34.5t-33 14.5h-207q-20 0 -32 -14.5t-8 -34.5zM500 300h200v100h-200v-100z" />
-<glyph unicode="&#xe102;" d="M0 800h100v-200h400v300h200v-300h400v200h100v100h-111v6t-1 15t-3 18l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40 -35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2 -8 -3 -18t-1 -15v-6h-111v-100z M100 0h400v400h-400v-400zM200 900q-3 0 14 48t35 96l18 47l214 -191h-281zM700 0v400h400v-400h-400zM731 900l202 197q5 -12 12 -32.5t23 -64t25 -72t7 -28.5h-269z" />
-<glyph unicode="&#xe103;" d="M0 -22v143l216 193q-9 53 -13 83t-5.5 94t9 113t38.5 114t74 124q47 60 99.5 102.5t103 68t127.5 48t145.5 37.5t184.5 43.5t220 58.5q0 -189 -22 -343t-59 -258t-89 -181.5t-108.5 -120t-122 -68t-125.5 -30t-121.5 -1.5t-107.5 12.5t-87.5 17t-56.5 7.5l-99 -55z M238.5 300.5q19.5 -6.5 86.5 76.5q55 66 367 234q70 38 118.5 69.5t102 79t99 111.5t86.5 148q22 50 24 60t-6 19q-7 5 -17 5t-26.5 -14.5t-33.5 -39.5q-35 -51 -113.5 -108.5t-139.5 -89.5l-61 -32q-369 -197 -458 -401q-48 -111 -28.5 -117.5z" />
-<glyph unicode="&#xe104;" d="M111 408q0 -33 5 -63q9 -56 44 -119.5t105 -108.5q31 -21 64 -16t62 23.5t57 49.5t48 61.5t35 60.5q32 66 39 184.5t-13 157.5q79 -80 122 -164t26 -184q-4 -23 -14 -51.5t-20 -49t-24 -49.5q-10 -19 -14.5 -29t-12 -26t-9 -23.5t-3 -19t2.5 -15.5t11 -9.5t19.5 -5 t30.5 2.5t42 8q57 20 91 34t87.5 44.5t87 64t65.5 88.5t47 122q38 172 -44.5 341.5t-246.5 278.5q22 -44 43 -129q39 -159 -32 -154q-15 2 -33 9q-79 33 -120.5 100t-44 175.5t48.5 257.5q-13 -8 -34 -23.5t-72.5 -66.5t-88.5 -105.5t-60 -138t-8 -166.5q2 -12 8 -41.5 t8 -43t6 -39.5t3.5 -39.5t-1 -33.5t-6 -31.5t-13.5 -24t-21 -20.5t-31 -12q-38 -10 -67 13t-40.5 61.5t-15 81.5t10.5 75q-52 -46 -83.5 -101t-39 -107t-7.5 -85z" />
-<glyph unicode="&#xe105;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5t145.5 -23.5t132.5 -59t116.5 -83.5t97 -90t74.5 -85.5t49 -63.5t20 -30l26 -40l-26 -40q-6 -10 -20 -30t-49 -63.5t-74.5 -85.5t-97 -90t-116.5 -83.5t-132.5 -59t-145.5 -23.5 t-145.5 23.5t-132.5 59t-116.5 83.5t-97 90t-74.5 85.5t-49 63.5t-20 30zM120 600q7 -10 40.5 -58t56 -78.5t68 -77.5t87.5 -75t103 -49.5t125 -21.5t123.5 20t100.5 45.5t85.5 71.5t66.5 75.5t58 81.5t47 66q-1 1 -28.5 37.5t-42 55t-43.5 53t-57.5 63.5t-58.5 54 q49 -74 49 -163q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l105 105q-37 24 -75 72t-57 84l-20 36z" />
-<glyph unicode="&#xe106;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5q61 0 121 -17l37 142h148l-314 -1200h-148l37 143q-82 21 -165 71.5t-140 102t-109.5 112t-72 88.5t-29.5 43zM119 600q37 -48 65.5 -82.5t84 -93t118.5 -100t126 -60.5l37 141 q-107 18 -178.5 101.5t-71.5 193.5q0 85 46 158q-97 -83 -227 -258zM377 656q49 -124 154 -191l47 47l23 87q-30 28 -59.5 69t-43.5 68l-15 26zM780 161l38 145q22 15 45 34t45.5 43.5t40.5 44.5t40.5 49.5t34 44.5t32 44t24.5 34q-83 113 -139 175l38 146 q68 -54 132.5 -125.5t87.5 -103.5t36 -52l26 -40l-26 -40q-7 -12 -25.5 -38t-63.5 -79.5t-95.5 -102.5t-124 -100t-146.5 -79z" />
-<glyph unicode="&#xe107;" d="M-97.5 34q13.5 -34 50.5 -34h1294q37 0 50.5 35.5t-7.5 67.5l-642 1056q-20 33 -48 36t-48 -29l-642 -1066q-21 -32 -7.5 -66zM155 200l445 723l445 -723h-345v100h-200v-100h-345zM500 600l100 -300l100 300v100h-200v-100z" />
-<glyph unicode="&#xe108;" d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44t106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -20 -13 -28.5t-32 0.5l-94 78h-222l-94 -78q-19 -9 -32 -0.5t-13 28.5 v64q0 22 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5z" />
-<glyph unicode="&#xe109;" d="M0 50q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v750h-1100v-750zM0 900h1100v150q0 21 -14.5 35.5t-35.5 14.5h-150v100h-100v-100h-500v100h-100v-100h-150q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 100v100h100v-100h-100zM100 300v100h100v-100h-100z M100 500v100h100v-100h-100zM300 100v100h100v-100h-100zM300 300v100h100v-100h-100zM300 500v100h100v-100h-100zM500 100v100h100v-100h-100zM500 300v100h100v-100h-100zM500 500v100h100v-100h-100zM700 100v100h100v-100h-100zM700 300v100h100v-100h-100zM700 500 v100h100v-100h-100zM900 100v100h100v-100h-100zM900 300v100h100v-100h-100zM900 500v100h100v-100h-100z" />
-<glyph unicode="&#xe110;" d="M0 200v200h259l600 600h241v198l300 -295l-300 -300v197h-159l-600 -600h-341zM0 800h259l122 -122l141 142l-181 180h-341v-200zM678 381l141 142l122 -123h159v198l300 -295l-300 -300v197h-241z" />
-<glyph unicode="&#xe111;" d="M0 400v600q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5z" />
-<glyph unicode="&#xe112;" d="M100 600v200h300v-250v-26v-55.5t3.5 -50t11 -47.5t22 -37t35.5 -31.5t53.5 -18t74.5 -7.5t74.5 8t53.5 18.5t35.5 32t22 38t11 48t3.5 49.5v54v25v250h300v-200q0 -42 -3 -83t-15 -104t-31.5 -116t-58 -109.5t-89 -96.5t-129 -65.5t-174.5 -25.5t-174.5 25.5t-129 65.5 t-89 96.5t-58 109.5t-31.5 116t-15 104t-3 83zM100 900v300h300v-300h-300zM800 900v300h300v-300h-300z" />
-<glyph unicode="&#xe113;" d="M-1 410l198 -198l353 353l353 -353l198 198l-550 552z" />
-<glyph unicode="&#xe114;" d="M99 797l551 -551l550 551l-198 198l-353 -352l-352 352z" />
-<glyph unicode="&#xe115;" d="M-198 700l299 283l300 -283h-203v-400h385l215 -200h-800v600h-196zM402 1000l215 -200h381v-400h-199l300 -283l299 283h-200v600h-796z" />
-<glyph unicode="&#xe116;" d="M18 939q-5 24 10 42q14 19 39 19h896l38 162q5 17 18.5 27.5t30.5 10.5h94q20 0 35 -14.5t15 -35.5t-15 -35.5t-35 -14.5h-54l-201 -961q-2 -4 -6 -10.5t-19 -17.5t-33 -11h-31v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50q0 -21 -14.5 -35.5 t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h535l48 200h-633q-32 0 -54.5 21t-27.5 43z" />
-<glyph unicode="&#xe117;" d="M0 0v800h1200v-800h-1200zM0 900v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-100h-1200z" />
-<glyph unicode="&#xe118;" d="M1 0l300 700h1200l-300 -700h-1200zM1 400v600h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-200h-1000z" />
-<glyph unicode="&#xe119;" d="M302 300h198v600h-198l298 300l298 -300h-198v-600h198l-298 -300z" />
-<glyph unicode="&#xe120;" d="M0 600l300 298v-198h600v198l300 -298l-300 -297v197h-600v-197z" />
-<glyph unicode="&#xe121;" d="M0 100v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM31 400l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5 -22.5t23.5 -45.5l172 -732h-1138zM800 100h100v100h-100v-100z M1000 100h100v100h-100v-100z" />
-<glyph unicode="&#xe122;" d="M-101 600v50q0 24 25 49t50 38l25 13v-250l-11 5.5t-24 14t-30 21.5t-24 27.5t-11 31.5zM100 500v250v8v8v7t0.5 7t1.5 5.5t2 5t3 4t4.5 3.5t6 1.5t7.5 0.5h200l675 250v-850l-675 200h-38l47 -276q2 -12 -3 -17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35 q-55 337 -55 351zM1100 200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35 -15q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe123;" d="M74 350q0 21 13.5 35.5t33.5 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29 -10.5t3 -29.5q-18 -36 -18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q20 0 33.5 -14.5t13.5 -35.5q0 -20 -13 -40t-31 -27q-22 -9 -63 -23 t-167.5 -37t-251.5 -23t-245.5 20.5t-178.5 41.5l-58 20q-18 7 -31 27.5t-13 40.5zM497 110q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6t-103 6z" />
-<glyph unicode="&#xe124;" d="M21 445l233 -45l-78 -224l224 78l45 -233l155 179l155 -179l45 233l224 -78l-78 224l234 45l-180 155l180 156l-234 44l78 225l-224 -78l-45 233l-155 -180l-155 180l-45 -233l-224 78l78 -225l-233 -44l179 -156z" />
-<glyph unicode="&#xe125;" d="M0 200v600h200v-600h-200zM300 275v400q0 37 20 63l145 196l96 198q14 28 38 48t51 20h50q39 0 69.5 -40.5t30.5 -84.5v-150l-28 -125h328q39 0 69.5 -40.5t30.5 -84.5v-100q0 -43 -29 -74l-238 -344q-37 -57 -83 -57h-250q-7 0 -41.5 25t-66.5 50l-31 25h-61 q-100 0 -100 75z" />
-<glyph unicode="&#xe126;" d="M0 400v600h200v-600h-200zM300 525v400q0 75 100 75h61q123 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5 -84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5 -40.5h-50q-27 0 -51 20t-38 48l-96 198l-145 196 q-20 26 -20 63z" />
-<glyph unicode="&#xe127;" d="M8 200v600h200v-600h-200zM308 275q0 -13 83 -94t90 -81h341q15 0 28.5 19.5t20.5 41.5l130 339h107q84 0 138.5 39t54.5 111t-53.5 110t-138.5 38h-302l85 121q11 15 10.5 34t-13.5 32l-110 112q-22 22 -53 6l-362 -230q-6 -4 -15.5 -10.5t-25 -26t-15.5 -36.5v-525z M408 289v503l339 236l86 -83l-147 -183q-17 -23 -5 -47q2 -3 4 -5.5t4 -4t5.5 -2.5t5 -1.5t6 -1t6.5 -0.5h7.5h6.5h457q22 0 30.5 -25t-0.5 -50t-30 -25h-203q-15 0 -28.5 -20t-19.5 -41l-131 -339h-293z" />
-<glyph unicode="&#xe128;" d="M-101 651q0 -72 55 -111t139 -39h107l130 -339q6 -21 19.5 -41t29.5 -20h341q8 0 94 80.5t86 93.5v526q0 17 -15 35.5t-30 27.5l-15 10l-365 230q-32 14 -54 -6l-109 -113q-13 -13 -13.5 -32t10.5 -34l85 -121q-101 1 -302 1q-85 0 -139 -38t-54 -110zM-1 601v100h476 h6.5h7.5t6.5 0.5t6.5 1t5.5 1.5t5 2.5l4 4t3.5 5.5q13 24 -5 46l-145 184l87 83l343 -237v-502l-107 -89h-293l-131 339q-6 20 -19.5 40.5t-28.5 20.5h-222zM1000 201v600h200v-600h-200z" />
-<glyph unicode="&#xe129;" d="M97 719l230 -363q4 -6 10.5 -15.5t26 -25t36.5 -15.5h525q13 0 94 83t81 90v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39 139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5 -13.5l-112 -110q-22 -22 -6 -53zM172 739l83 86l183 -146 q22 -18 47 -5q3 1 5.5 3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6v7.5v7v456q0 22 25 31t50 -0.5t25 -30.5v-203q0 -15 20 -28.5t41 -19.5l339 -131v-293l-89 -100h-503zM400 0v200h600v-200h-600z" />
-<glyph unicode="&#xe130;" d="M1 585q-15 -31 7 -53l112 -110q13 -13 32 -13.5t34 10.5l121 85q0 -51 -0.5 -153.5t-0.5 -148.5q0 -84 38.5 -138t110.5 -54t111 55t39 139v106l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5 -14t-28.5 -28l-10 -15zM76 565l237 339h503 l89 -100v-294l-340 -130q-21 -7 -40.5 -20.5t-19.5 -28.5v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24 13 -46 -5l-184 -146zM305 1104v200h600v-200h-600z" />
-<glyph unicode="&#xe131;" d="M22 600q0 157 77.5 290.5t210.5 210.5t290 77t290 -77t210.5 -210.5t77.5 -290.5t-77.5 -290t-210.5 -210.5t-290 -77.5t-290 77.5t-210.5 210.5t-77.5 290zM298 500h300v-194l402 294l-402 299v-198h-300v-201z" />
-<glyph unicode="&#xe132;" d="M22 600q0 157 77.5 290.5t210.5 210.5t290 77t290 -77t210.5 -210.5t77.5 -290.5t-77.5 -290t-210.5 -210.5t-290 -77.5t-290 77.5t-210.5 210.5t-77.5 290zM200 600l400 -294v194h300v201h-298v198z" />
-<glyph unicode="&#xe133;" d="M22 600q0 157 77.5 290.5t210.5 210.5t290 77t290 -77t210.5 -210.5t77.5 -290.5t-77.5 -290t-210.5 -210.5t-290 -77.5t-290 77.5t-210.5 210.5t-77.5 290zM302 599h197v-300h201v300h194l-294 401z" />
-<glyph unicode="&#xe134;" d="M22 600q0 157 77.5 290.5t210.5 210.5t290 77t290 -77t210.5 -210.5t77.5 -290.5t-77.5 -290t-210.5 -210.5t-290 -77.5t-290 77.5t-210.5 210.5t-77.5 290zM306 602l294 -402l298 402h-197v300h-201v-300h-194z" />
-<glyph unicode="&#xe135;" d="M24 600q0 154 78 287t211 211t287 78t287 -78t211 -211t78 -287t-78 -287t-211 -211t-287 -78t-287 78t-211 211t-78 287zM254 780q-8 -33 5.5 -92.5t7.5 -87.5q0 -9 17 -44t16 -60q12 0 23 -5.5t23 -15t20 -13.5q16 -8 34 -15t40 -14.5t34 -12.5q22 -8 53 -31.5 t59.5 -38.5t57.5 -11q8 -18 -15 -55t-20 -57q42 -71 87 -80q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q104 -3 221 112q30 29 47 47t34.5 49.5t20.5 62.5q-14 9 -37.5 9t-35.5 7q-14 8 -49 15.5t-52 18.5q-9 0 -39.5 -0.5t-46.5 -1.5t-39 -6.5t-39 -16.5q-50 -35 -66 -12 q-4 2 -3.5 25.5t0.5 25.5q-6 13 -26.5 17t-24.5 7q2 22 -2 41t-16.5 28t-38.5 -20q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q12 -19 32 -37.5t34 -27.5l14 -8q0 3 9.5 39.5t5.5 57.5q-4 23 14.5 44.5t22.5 31.5q5 14 10 35t8.5 31t15.5 22.5 t34 22.5q-6 17 10 36q8 0 23.5 -1.5t24.5 -1.5t20.5 4.5t20.5 15.5q-10 23 -30.5 42.5t-38 30t-49 26.5t-43.5 23q11 41 1 44q31 -13 58.5 -14.5t39.5 3.5l11 4q6 36 -17 53.5t-64 28.5t-56 23q-20 -3 -37 1q-16 -13 -37.5 -21.5t-34 -12t-44 -8.5t-38.5 -6 q-15 -3 -45.5 0.5t-45.5 -2.5q-22 -8 -52.5 -27t-33.5 -34q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -90.5t-29.5 -79.5zM518 916q3 12 16 30t16 25q10 -10 18.5 -10t14 6t14.5 14.5t16 12.5q0 -17 8 -41.5t16.5 -44.5t9.5 -24q-9 2 -39.5 6t-52 10t-37.5 16z" />
-<glyph unicode="&#xe136;" d="M0 164.5q0 21.5 15 37.5l600 599q-33 101 6 201.5t135 154.5q164 92 306 -9l-259 -138l145 -232l251 126q13 -175 -151 -267q-123 -70 -253 -23l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5z" />
-<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M0 196v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 596v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5zM0 996v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM600 596h500v100h-500v-100zM800 196h300v100h-300v-100zM900 996h200v100h-200v-100z" />
-<glyph unicode="&#xe138;" d="M100 1100v100h1000v-100h-1000zM150 1000h900l-350 -500v-300l-200 -200v500z" />
-<glyph unicode="&#xe139;" d="M0 200v200h1200v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500z M500 1000h200v100h-200v-100z" />
-<glyph unicode="&#xe140;" d="M0 0v400l129 -129l200 200l142 -142l-200 -200l129 -129h-400zM0 800l129 129l200 -200l142 142l-200 200l129 129h-400v-400zM729 329l142 142l200 -200l129 129v-400h-400l129 129zM729 871l200 200l-129 129h400v-400l-129 129l-200 -200z" />
-<glyph unicode="&#xe141;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM173 600q0 -176 125.5 -301.5t301.5 -125.5q177 0 302 125.5t125 301.5 q0 177 -125 302t-302 125q-176 0 -301.5 -125t-125.5 -302zM291 655q0 23 16 39t38 16q23 0 39 -16t16 -39t-16 -39t-39 -16q-22 0 -38 16t-16 39zM400 850q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5zM513 609q0 32 21 56.5 t52 29.5l122 126l1 1q-9 14 -9 28q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-16 0 -29 10l-55 -145q17 -22 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-62 25.5t-26 61.5zM800 655q0 23 16 39t39 16q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16t-16 39z " />
-<glyph unicode="&#xe142;" d="M-40 375q-13 -95 35 -173q35 -57 94 -89t129 -32q63 0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84t-3 96q-27 87 -117 104q-20 2 -29 2q-46 0 -79.5 -17t-67.5 -51l-388 -396l-7 -7l69 -67l377 373q20 22 39 38q23 23 50 23q38 0 53 -36 q16 -39 -20 -75l-547 -547q-52 -52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44 41l348 348q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51 -175.5q-7 -101 -98 -192l-252 -249l-253 -256l7 -7l69 -60l517 511 q67 67 95 157t11 183q-16 87 -67 154t-130 103q-69 33 -152 33q-107 0 -197 -55q-39 -23 -111 -95l-512 -512q-68 -68 -81 -163z" />
-<glyph unicode="&#xe143;" d="M99 785q0 64 28 122.5t73 100t104.5 64t119 20.5t120 -38.5t105.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100t27 -122.5q0 -70 -55.5 -151.5t-129.5 -151t-182.5 -181t-182.5 -212.5q-62 85 -145.5 174t-150 152.5t-127 127t-94 124.5t-33.5 118z M229 785q0 -31 29.5 -75t64.5 -80.5t97 -97.5q17 -16 25 -24q101 -98 204 -217q85 97 209 219q127 125 163 171q48 62 48 104q0 78 -53.5 132.5t-120.5 54.5q-85 0 -147 -91l-102 -147l-97 150q-58 88 -141 88q-68 0 -123.5 -55.5t-55.5 -131.5z" />
-<glyph unicode="&#xe144;" d="M57 353q0 -95 66 -159l141 -142q66 -66 159 -66t159 66l283 283q66 66 66 159t-66 159l-141 141q-3 4 -19 17l-105 -105l212 -212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66 -159zM269 706q0 -93 66 -159l141 -141q3 -3 9.5 -9t8.5 -8 l106 105l-212 212l389 389l247 -247l-95 -96l17 -17q47 -47 78 -100l29 29q35 35 62.5 88t27.5 96q0 93 -66 159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159z" />
-<glyph unicode="&#xe145;" d="M200 100v953q0 21 30 46t81 48t129 38t163 15t162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5zM300 300h600v700h-600v-700zM496 150q0 -43 30.5 -73.5t73.5 -30.5t73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5 t-73.5 -30.5t-30.5 -73.5z" />
-<glyph unicode="&#xe146;" d="M0 0l303 380l207 208l-210 212h300l267 279l-35 36q-15 14 -15 35t15 35q14 15 35 15t35 -15l283 -282q15 -15 15 -36t-15 -35q-14 -15 -35 -15t-35 15l-36 35l-279 -267v-300l-212 210l-208 -207z" />
-<glyph unicode="&#xe148;" d="M295 433h139q5 -77 48.5 -126.5t117.5 -64.5v335q-6 1 -15.5 4t-11.5 3q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5t-16.5 99q0 92 44 159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5 -84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5 v-307l64 -14q34 -7 64 -16.5t70 -31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152 17 -237 104q-40 40 -52.5 93.5t-15.5 139.5zM466 889q0 -36 9 -60t31 -38t36 -19.5t47 -13.5q7 -2 11 -3v274q-61 -8 -97.5 -37.5t-36.5 -102.5zM700 237 q170 18 170 151q0 64 -44 99.5t-126 60.5v-311z" />
-<glyph unicode="&#xe149;" d="M100 600v100h166q-24 49 -44 104q-10 26 -14.5 55.5t-3 72.5t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34 89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -28 16.5 -69.5t28 -62.5t41.5 -72h241v-100h-197q8 -50 -2.5 -115 t-31.5 -94q-41 -59 -99 -113q35 11 84 18t70 7q32 1 102 -16t104 -17q76 0 136 30l50 -147q-41 -25 -80.5 -36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24 -11l-55 145l16.5 11t15.5 10t13.5 9.5t14.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221z" />
-<glyph unicode="&#xe150;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM602 900l298 300l298 -300h-198v-900h-200v900h-198z" />
-<glyph unicode="&#xe151;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v200h100v-100h200v-100h-300zM700 400v100h300v-200h-99v-100h-100v100h99v100h-200zM700 700v500h300v-500h-100v100h-100v-100h-100zM801 900h100v200h-100v-200z" />
-<glyph unicode="&#xe152;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v500h300v-500h-100v100h-100v-100h-100zM700 700v200h100v-100h200v-100h-300zM700 1100v100h300v-200h-99v-100h-100v100h99v100h-200zM801 200h100v200h-100v-200z" />
-<glyph unicode="&#xe153;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 100v400h300v-500h-100v100h-200zM800 1100v100h200v-500h-100v400h-100zM901 200h100v200h-100v-200z" />
-<glyph unicode="&#xe154;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 400v100h200v-500h-100v400h-100zM800 800v400h300v-500h-100v100h-200zM901 900h100v200h-100v-200z" />
-<glyph unicode="&#xe155;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h500v-200h-500zM700 400v200h400v-200h-400zM700 700v200h300v-200h-300zM700 1000v200h200v-200h-200z" />
-<glyph unicode="&#xe156;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h200v-200h-200zM700 400v200h300v-200h-300zM700 700v200h400v-200h-400zM700 1000v200h500v-200h-500z" />
-<glyph unicode="&#xe157;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q162 0 281 -118.5t119 -281.5v-300q0 -165 -118.5 -282.5t-281.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500z" />
-<glyph unicode="&#xe158;" d="M0 400v300q0 163 119 281.5t281 118.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-163 0 -281.5 117.5t-118.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM400 300l333 250l-333 250v-500z" />
-<glyph unicode="&#xe159;" d="M0 400v300q0 163 117.5 281.5t282.5 118.5h300q163 0 281.5 -119t118.5 -281v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 700l250 -333l250 333h-500z" />
-<glyph unicode="&#xe160;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -162 -118.5 -281t-281.5 -119h-300q-165 0 -282.5 118.5t-117.5 281.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 400h500l-250 333z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/web/base/fonts/glyphiconshalflings-regular.ttf b/openQRM-5.3.50-CE/src/web/base/fonts/glyphiconshalflings-regular.ttf
deleted file mode 100644
index c63c068..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/fonts/glyphiconshalflings-regular.ttf and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/fonts/glyphiconshalflings-regular.woff b/openQRM-5.3.50-CE/src/web/base/fonts/glyphiconshalflings-regular.woff
deleted file mode 100644
index 4c778ff..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/fonts/glyphiconshalflings-regular.woff and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/active.png b/openQRM-5.3.50-CE/src/web/base/img/active.png
deleted file mode 100644
index 94b9a47..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/active.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/active_small.png b/openQRM-5.3.50-CE/src/web/base/img/active_small.png
deleted file mode 100644
index 816a9c9..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/active_small.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/add.png b/openQRM-5.3.50-CE/src/web/base/img/add.png
deleted file mode 100644
index d72c64d..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/add.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/ajax-loader.gif b/openQRM-5.3.50-CE/src/web/base/img/ajax-loader.gif
deleted file mode 100644
index e5ddc57..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/ajax-loader.gif and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/appliance.png b/openQRM-5.3.50-CE/src/web/base/img/appliance.png
deleted file mode 100644
index ec8c184..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/appliance.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/auth.png b/openQRM-5.3.50-CE/src/web/base/img/auth.png
deleted file mode 100644
index bd2d50b..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/auth.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/background.png b/openQRM-5.3.50-CE/src/web/base/img/background.png
deleted file mode 100644
index 6371f54..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/background.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/clone.png b/openQRM-5.3.50-CE/src/web/base/img/clone.png
deleted file mode 100644
index 163a104..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/clone.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/close.png b/openQRM-5.3.50-CE/src/web/base/img/close.png
deleted file mode 100644
index 112f1ca..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/close.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/cloud.png b/openQRM-5.3.50-CE/src/web/base/img/cloud.png
deleted file mode 100644
index 1ffffe9..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/cloud.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/console.png b/openQRM-5.3.50-CE/src/web/base/img/console.png
deleted file mode 100644
index 218569a..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/console.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/conten_bg.gif b/openQRM-5.3.50-CE/src/web/base/img/conten_bg.gif
deleted file mode 100644
index c872b9c..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/conten_bg.gif and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/datacenter.png b/openQRM-5.3.50-CE/src/web/base/img/datacenter.png
deleted file mode 100644
index 483b39e..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/datacenter.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/de.gif b/openQRM-5.3.50-CE/src/web/base/img/de.gif
deleted file mode 100644
index 10df61c..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/de.gif and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/deployment.png b/openQRM-5.3.50-CE/src/web/base/img/deployment.png
deleted file mode 100644
index be00fea..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/deployment.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/disable.png b/openQRM-5.3.50-CE/src/web/base/img/disable.png
deleted file mode 100644
index 294e5c1..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/disable.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/down.png b/openQRM-5.3.50-CE/src/web/base/img/down.png
deleted file mode 100644
index 7cd0571..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/down.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/dummy-chart.png b/openQRM-5.3.50-CE/src/web/base/img/dummy-chart.png
deleted file mode 100644
index a4c97c9..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/dummy-chart.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/edit.png b/openQRM-5.3.50-CE/src/web/base/img/edit.png
deleted file mode 100644
index 7d241bf..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/edit.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/en.gif b/openQRM-5.3.50-CE/src/web/base/img/en.gif
deleted file mode 100644
index cc372f7..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/en.gif and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/enable.png b/openQRM-5.3.50-CE/src/web/base/img/enable.png
deleted file mode 100644
index ec9bbd7..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/enable.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/enterprise.png b/openQRM-5.3.50-CE/src/web/base/img/enterprise.png
deleted file mode 100644
index 2283da4..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/enterprise.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/error.png b/openQRM-5.3.50-CE/src/web/base/img/error.png
deleted file mode 100644
index 0a0e82d..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/error.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/error_small.png b/openQRM-5.3.50-CE/src/web/base/img/error_small.png
deleted file mode 100644
index f64b8ef..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/error_small.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/export.png b/openQRM-5.3.50-CE/src/web/base/img/export.png
deleted file mode 100644
index 9ae7349..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/export.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/favicon.ico b/openQRM-5.3.50-CE/src/web/base/img/favicon.ico
deleted file mode 100644
index 2bdd231..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/favicon.ico and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/filepicker_icons.gif b/openQRM-5.3.50-CE/src/web/base/img/filepicker_icons.gif
deleted file mode 100644
index 3459dba..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/filepicker_icons.gif and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/glyphicons/glyphicons-white.png b/openQRM-5.3.50-CE/src/web/base/img/glyphicons/glyphicons-white.png
deleted file mode 100644
index 327f949..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/glyphicons/glyphicons-white.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/glyphicons/glyphicons-white.svg b/openQRM-5.3.50-CE/src/web/base/img/glyphicons/glyphicons-white.svg
deleted file mode 100644
index a2be78a..0000000
--- a/openQRM-5.3.50-CE/src/web/base/img/glyphicons/glyphicons-white.svg
+++ /dev/null
@@ -1,4259 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="glyphicons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="463px" height="1993px" viewBox="0 0 463 1993" enable-background="new 0 0 463 1993" xml:space="preserve">
-<g id="e-mail_2_">
-	<path fill="#FFFFFF" d="M446.195,1978.243c-0.541,0-1.002,0.342-1.41,1.046c-0.422,0.727-0.636,1.438-0.636,2.115
-		c0,0.385,0.086,0.694,0.255,0.924c0.159,0.214,0.38,0.316,0.676,0.316c0.54,0,1-0.441,1.368-1.313
-		c0.393-0.928,0.59-1.662,0.59-2.183c0-0.266-0.074-0.479-0.23-0.654C446.656,1978.325,446.455,1978.243,446.195,1978.243z"/>
-	<path fill="#FFFFFF" d="M455.5,1969h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C458,1970.125,456.875,1969,455.5,1969z M448.688,1982.438c0.082,0.108,0.215,0.16,0.407,0.16c0.439,0,0.899-0.308,1.368-0.915
-		c0.479-0.625,0.724-1.473,0.724-2.519c0-1.554-0.647-2.638-1.979-3.314c-0.841-0.432-1.802-0.648-2.854-0.648
-		c-1.938,0-3.516,0.599-4.688,1.779c-1.053,1.065-1.587,2.36-1.587,3.849c0,1.649,0.623,2.976,1.854,3.938
-		c1.097,0.858,2.457,1.293,4.043,1.293c1.087,0,2.117-0.202,3.062-0.603c0.516-0.212,1.056-0.518,1.608-0.907l0.381-0.271
-		l0.86,1.319l-0.146,0.113c-0.851,0.659-1.785,1.168-2.776,1.512c-0.993,0.346-2.037,0.521-3.104,0.521
-		c-2.496,0-4.459-0.791-5.837-2.351c-1.143-1.293-1.722-2.847-1.722-4.616c0-1.981,0.724-3.686,2.148-5.062
-		c1.494-1.451,3.432-2.188,5.756-2.188c1.896,0,3.49,0.506,4.74,1.503c1.33,1.062,2.005,2.489,2.005,4.243
-		c0,1.38-0.427,2.582-1.269,3.573c-0.851,1.001-1.839,1.509-2.939,1.509c-0.597,0-1.065-0.177-1.396-0.521
-		c-0.226-0.234-0.373-0.479-0.444-0.732c-0.142,0.196-0.292,0.368-0.449,0.513c-0.535,0.487-1.188,0.733-1.938,0.733
-		c-0.771,0-1.418-0.28-1.93-0.835c-0.509-0.547-0.767-1.314-0.767-2.284c0-1.106,0.381-2.157,1.13-3.121
-		c0.764-0.979,1.715-1.476,2.83-1.476c0.672,0,1.205,0.192,1.584,0.571c0.127,0.13,0.238,0.355,0.331,0.495l0.215-0.697h2.089
-		l-1.204,4.066c-0.068,0.239-0.121,0.405-0.159,0.559c0,0-0.08,0.338-0.08,0.438
-		C448.554,1982.202,448.599,1982.319,448.688,1982.438z"/>
-</g>
-<g id="skype_1_">
-	<path fill="#FFFFFF" d="M410,1971.5v19c0,1.375-1.125,2.5-2.5,2.5h-19c-1.375,0-2.5-1.125-2.5-2.5v-19c0-1.375,1.125-2.5,2.5-2.5
-		h19C408.875,1969,410,1970.125,410,1971.5z M407.221,1984.488c0.002-1.018-0.297-1.962-0.811-2.757
-		c0.028-0.282,0.045-0.568,0.045-0.858c0.012-4.656-3.755-8.439-8.412-8.451c-0.432-0.001-0.852,0.04-1.265,0.103
-		c-0.776-0.502-1.698-0.798-2.69-0.801c-2.756-0.007-4.996,2.224-5.002,4.979c-0.002,0.912,0.244,1.766,0.67,2.503
-		c-0.104,0.527-0.162,1.07-0.164,1.628c-0.012,4.656,3.755,8.44,8.411,8.452c0.674,0.002,1.327-0.085,1.956-0.232
-		c0.659,0.315,1.395,0.498,2.174,0.5C404.936,1989.559,407.213,1987.292,407.221,1984.488z M402.146,1981.391
-		c-0.576-1.112-1.855-1.521-2.982-1.828c-0.874-0.239-3.353-0.492-2.971-1.916c0.296-1.104,2.124-1.233,2.958-0.786
-		c0.771,0.411,1.159,2.489,2.348,1.72c1.097-0.712,0.104-2.204-0.64-2.735c-1.043-0.744-2.452-0.847-3.684-0.669
-		c-1.146,0.166-2.321,0.707-2.801,1.829c-0.502,1.175-0.13,2.543,0.901,3.285c0.985,0.709,2.261,0.866,3.398,1.188
-		c0.972,0.272,2.188,1.071,1.41,2.233c-0.604,0.897-2.159,1.088-3.073,0.618c-0.941-0.486-1.087-2.564-2.353-2.249
-		c-1.34,0.334-0.464,2.136,0.086,2.761c0.867,0.987,2.186,1.296,3.452,1.296C400.618,1986.137,403.565,1984.158,402.146,1981.391
-		C401.953,1981.02,402.336,1981.762,402.146,1981.391z"/>
-</g>
-<g id="rss_1_">
-	<path fill="#FFFFFF" d="M359.5,1969h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C362,1970.125,360.875,1969,359.5,1969z M344.182,1988.98c-1.205,0-2.182-0.977-2.182-2.182c0-1.204,0.977-2.181,2.182-2.181
-		c1.203,0,2.182,0.977,2.182,2.181C346.363,1988.005,345.385,1988.98,344.182,1988.98z M349.653,1989
-		c0-2.057-0.798-3.994-2.242-5.447c-1.443-1.451-3.354-2.251-5.41-2.251v-3.148c5.826,0,10.803,5.021,10.803,10.848L349.653,1989
-		L349.653,1989z M355.217,1989c0-7.323-6.021-13.281-13.217-13.281v-3.147c8.91,0,16.364,7.37,16.364,16.43L355.217,1989
-		L355.217,1989z"/>
-</g>
-<g id="last_x5F_fm_2_">
-	<path fill="#FFFFFF" d="M311.5,1969h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C314,1970.125,312.875,1969,311.5,1969z M307.354,1986.256c-1.807-0.008-2.957-0.823-3.739-2.646l-0.195-0.437l-1.702-3.88
-		c-0.536-1.305-1.885-2.179-3.36-2.179c-2.023,0-3.671,1.646-3.671,3.671c0,2.024,1.646,3.673,3.671,3.673
-		c1.372,0,2.62-0.756,3.256-1.972l0.194-0.371l0.902,2.083l-0.077,0.095c-1.055,1.285-2.613,2.022-4.276,2.022
-		c-3.049,0-5.529-2.481-5.529-5.53c0-3.05,2.48-5.53,5.529-5.53c2.308,0,4.169,1.242,5.109,3.408l0.073,0.172
-		c0.239,0.561,0.997,2.328,1.671,3.863c0.469,1.065,0.84,1.717,2.056,1.758c0.001,0,0.003,0,0.005,0c1.2,0,2.002-0.658,2.002-1.564
-		c0-0.818-0.493-1.016-1.709-1.421c-2.09-0.688-3.3-1.437-3.3-3.221c0-1.755,1.21-2.889,3.081-2.889c1.229,0,2.129,0.54,2.754,1.649
-		l0.104,0.182l-1.479,0.756l-0.101-0.142c-0.377-0.527-0.778-0.754-1.343-0.754c-0.716,0-1.234,0.486-1.234,1.157
-		c0,0.79,0.571,1.005,1.761,1.378l0.461,0.146c1.804,0.589,2.849,1.301,2.849,3.199
-		C311.116,1984.829,309.499,1986.256,307.354,1986.256z"/>
-</g>
-<g id="flickr_2_">
-	<g>
-		<path fill="#FFFFFF" d="M263.5,1969h-19c-1.381,0-2.5,1.119-2.5,2.5v19c0,1.381,1.119,2.5,2.5,2.5h19c1.381,0,2.5-1.119,2.5-2.5
-			v-19C266,1970.119,264.881,1969,263.5,1969z M249.5,1984.25c-1.935,0-3.5-1.566-3.5-3.5s1.565-3.5,3.5-3.5
-			c1.934,0,3.5,1.566,3.5,3.5S251.434,1984.25,249.5,1984.25z M258.5,1984.25c-1.935,0-3.5-1.566-3.5-3.5s1.565-3.5,3.5-3.5
-			c1.934,0,3.5,1.566,3.5,3.5S260.434,1984.25,258.5,1984.25z"/>
-	</g>
-	<g opacity="0.3">
-		<circle fill="#FFFFFF" cx="249.5" cy="1980.75" r="3.5"/>
-	</g>
-</g>
-<g id="vimeo_1_">
-	<path fill="#FFFFFF" d="M215.5,1969h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C218,1970.125,216.875,1969,215.5,1969z M210.372,1983.898c-2.188,2.834-4.036,4.252-5.551,4.252
-		c-0.937,0-1.729-0.865-2.377-2.595c-0.434-1.586-0.864-3.172-1.299-4.758c-0.479-1.729-0.997-2.594-1.549-2.594
-		c-0.12,0-0.541,0.252-1.262,0.757l-0.756-0.973c0.793-0.696,1.571-1.395,2.341-2.092c1.058-0.912,1.851-1.393,2.38-1.44
-		c1.248-0.119,2.017,0.732,2.306,2.56c0.312,1.971,0.527,3.194,0.649,3.676c0.358,1.634,0.756,2.449,1.188,2.449
-		c0.337,0,0.841-0.527,1.514-1.585c0.674-1.058,1.033-1.86,1.082-2.414c0.096-0.913-0.267-1.37-1.082-1.37
-		c-0.385,0-0.781,0.086-1.189,0.254c0.793-2.57,2.308-3.82,4.541-3.748c1.658,0.048,2.438,1.116,2.342,3.207
-		C213.579,1979.046,212.486,1981.184,210.372,1983.898z"/>
-</g>
-<g id="posterous_x5F_spaces">
-	<path fill="#FFFFFF" d="M167.5,1969h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C170,1970.125,168.875,1969,167.5,1969z M157,1989c0,0.553-0.448,1-1,1h-6c-0.553,0-1-0.447-1-1v-6c0-0.553,0.447-1,1-1h6
-		c0.552,0,1,0.447,1,1V1989z M157,1979c0,0.553-0.448,1-1,1h-6c-0.553,0-1-0.447-1-1v-6c0-0.553,0.447-1,1-1h6c0.552,0,1,0.447,1,1
-		V1979z M167,1989c0,0.553-0.448,1-1,1h-6c-0.553,0-1-0.447-1-1v-6c0-0.553,0.447-1,1-1h6c0.552,0,1,0.447,1,1V1989z M167,1979
-		c0,0.553-0.448,1-1,1h-6c-0.553,0-1-0.447-1-1v-6c0-0.553,0.447-1,1-1h6c0.552,0,1,0.447,1,1V1979z M153,1978.156
-		c-1.191,0-2.156-0.966-2.156-2.156s0.965-2.156,2.156-2.156c1.19,0,2.155,0.966,2.155,2.156S154.191,1978.156,153,1978.156z
-		 M165.156,1976c0-1.189-0.965-2.156-2.155-2.156c-1.191,0-2.156,0.966-2.156,2.156s0.965,2.156,2.156,2.156
-		C164.191,1978.156,165.156,1977.189,165.156,1976z M155.156,1986c0-1.189-0.965-2.156-2.155-2.156
-		c-1.191,0-2.156,0.966-2.156,2.156s0.965,2.156,2.156,2.156C154.191,1988.156,155.156,1987.189,155.156,1986z M165.156,1986
-		c0-1.189-0.965-2.156-2.155-2.156c-1.191,0-2.156,0.966-2.156,2.156s0.965,2.156,2.156,2.156
-		C164.191,1988.156,165.156,1987.189,165.156,1986z"/>
-</g>
-<g id="instagram">
-	<g>
-		<path fill="#FFFFFF" d="M104.888,1975H104v-6h-1v6h-1v-6h-1v6h-1v-5.949c-1.139,0.233-2,1.245-2,2.449v4.5h6.067
-			C104.31,1975.642,104.586,1975.309,104.888,1975z"/>
-		<path fill="#FFFFFF" d="M117.155,1980c0,3.949-3.204,7.154-7.154,7.154s-7.155-3.205-7.155-7.154c0-1.072,0.243-2.087,0.667-3H98
-			v13.5c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5V1977h-5.513C116.912,1977.913,117.155,1978.928,117.155,1980z"/>
-		<path fill="#FFFFFF" d="M119.5,1969H105v5.889c1.29-1.263,3.053-2.043,5-2.043c2.469,0,4.646,1.252,5.932,3.154H122v-4.5
-			C122,1970.125,120.875,1969,119.5,1969z M120,1974c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h2
-			c0.55,0,1,0.45,1,1V1974z"/>
-	</g>
-	<path opacity="0.3" fill="#FFFFFF" enable-background="new    " d="M120,1974c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1v-2
-		c0-0.55,0.45-1,1-1h2c0.55,0,1,0.45,1,1V1974z"/>
-	<rect x="104" y="1969" opacity="0.5" fill="#FFFFFF" enable-background="new    " width="1" height="6"/>
-	<rect x="102" y="1969" opacity="0.5" fill="#FFFFFF" enable-background="new    " width="1" height="6"/>
-	<rect x="100" y="1969" opacity="0.5" fill="#FFFFFF" enable-background="new    " width="1" height="6"/>
-	<g opacity="0.3">
-		<g>
-			<path fill="#FFFFFF" d="M110,1975.656c-0.458,0-0.892,0.09-1.306,0.222c0.499,0.368,0.826,0.954,0.826,1.622
-				c0,1.115-0.903,2.021-2.021,2.021c-0.667,0-1.254-0.328-1.623-0.827c-0.131,0.415-0.223,0.849-0.223,1.307
-				c0,2.397,1.946,4.344,4.346,4.344c2.398,0,4.344-1.946,4.344-4.344S112.399,1975.656,110,1975.656z"/>
-		</g>
-		<g>
-			<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M110,1975.656c-0.458,0-0.892,0.09-1.306,0.222
-				c0.499,0.368,0.826,0.954,0.826,1.622c0,1.115-0.903,2.021-2.021,2.021c-0.667,0-1.254-0.328-1.623-0.827
-				c-0.131,0.415-0.223,0.849-0.223,1.307c0,2.397,1.946,4.344,4.346,4.344c2.398,0,4.344-1.946,4.344-4.344
-				S112.399,1975.656,110,1975.656z"/>
-		</g>
-	</g>
-	<path fill="#FFFFFF" d="M110,1974.479c-3.049,0-5.521,2.475-5.521,5.521c0,3.048,2.473,5.521,5.521,5.521s5.521-2.474,5.521-5.521
-		C115.521,1976.953,113.049,1974.479,110,1974.479z M110,1984.344c-2.399,0-4.346-1.945-4.346-4.344s1.946-4.344,4.346-4.344
-		c2.398,0,4.344,1.945,4.344,4.344S112.399,1984.344,110,1984.344z"/>
-</g>
-<g id="twitter">
-	<path fill="#FFFFFF" d="M71.5,1969h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C74,1970.125,72.875,1969,71.5,1969z M69.143,1977.908c0.006,0.152,0.01,0.309,0.01,0.464c0,4.738-3.605,10.2-10.199,10.2
-		c-2.025,0-3.909-0.594-5.495-1.611c0.28,0.033,0.565,0.051,0.854,0.051c1.68,0,3.226-0.572,4.452-1.534
-		c-1.569-0.027-2.892-1.064-3.349-2.488c0.219,0.043,0.443,0.062,0.675,0.062c0.327,0,0.643-0.045,0.944-0.125
-		c-1.642-0.328-2.876-1.777-2.876-3.516c0-0.017,0-0.028,0-0.044c0.482,0.268,1.035,0.431,1.624,0.446
-		c-0.962-0.643-1.596-1.739-1.596-2.982c0-0.657,0.177-1.273,0.485-1.802c1.768,2.168,4.409,3.596,7.39,3.745
-		c-0.062-0.264-0.093-0.536-0.093-0.818c0-1.979,1.605-3.583,3.585-3.583c1.031,0,1.963,0.435,2.617,1.132
-		c0.815-0.161,1.583-0.459,2.275-0.871c-0.268,0.839-0.836,1.54-1.575,1.983c0.726-0.084,1.416-0.277,2.059-0.563
-		C70.45,1976.771,69.843,1977.401,69.143,1977.908z"/>
-</g>
-<g id="facebook_1_">
-	<path fill="#FFFFFF" d="M26,1971.5v19c0,1.375-1.125,2.5-2.5,2.5H18v-10h3v-3h-3l0.005-1.673c0-0.9,0.302-1.327,1.596-1.327H21v-4
-		c0,0-1,0-4,0s-3,3-3,4s0,3,0,3h-2v3h2v10H4.5c-1.375,0-2.5-1.125-2.5-2.5v-19c0-1.375,1.125-2.5,2.5-2.5h19
-		C24.875,1969,26,1970.125,26,1971.5z"/>
-</g>
-<g id="readability">
-	<path fill="#FFFFFF" d="M455.5,1921h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C458,1922.125,456.875,1921,455.5,1921z M441,1938.501c0,0.33-0.17,0.499-0.499,0.499h-1.003c-0.329,0-0.498-0.169-0.498-0.499
-		V1937l-1.396-2.491c-0.415-0.378-0.681-0.923-0.681-1.509c0-1.158,0.88-2.1,2.038-2.1c1.156,0,2.036,0.94,2.036,2.1v5.501H441z
-		 M450,1935v3h-8v-3.451c1-1.09,2.549-1.647,4.05-1.647s2.87,0.559,3.991,1.573L450,1935z M450,1933v0.773l-0.117-0.15
-		c-1.089-0.982-2.461-1.523-3.908-1.523c-1.446,0-2.781,0.541-3.87,1.523l-0.104,0.15V1933c0-1.121-0.714-2.151-1.74-2.626
-		l-0.104-0.036l0.014-0.083c0.765-2.563,3.161-4.354,5.837-4.354s5.075,1.79,5.841,4.354l0.022,0.083l-0.13,0.036
-		C450.714,1930.849,450,1931.879,450,1933z M454.438,1934.535l-1.393,2.512l-0.046,0.578v0.876c0,0.33-0.169,0.499-0.499,0.499
-		h-1.002c-0.329,0-0.499-0.169-0.499-0.499V1933c0-1.158,0.894-2.1,2.051-2.1s2.074,0.94,2.074,2.1
-		C455.125,1933.586,454.872,1934.131,454.438,1934.535z"/>
-</g>
-<g id="stumbleupon">
-	<path fill="#FFFFFF" d="M407.5,1921h-19c-1.381,0-2.5,1.119-2.5,2.5v19c0,1.381,1.119,2.5,2.5,2.5h19c1.381,0,2.5-1.119,2.5-2.5
-		v-19C410,1922.119,408.881,1921,407.5,1921z M398.756,1929.14c-0.146-0.116-0.547-0.188-0.806-0.188c-0.24,0-0.95,0.054-0.95,0.55
-		v7c0,2.811-1.929,3.854-3.963,3.854c-1.089,0-2.098,0.074-2.866-0.644c-0.853-0.795-1.171-1.936-1.171-3.212v-2.5h3v2.5
-		c0,0.766,0.635,0.925,1,0.925c0.364,0,1-0.159,1-0.925v-7c0-2.252,1.604-3.95,4-3.95c2.395,0,4,1.698,4,3.95v1.318l-1.5,0.646
-		l-1.5-0.646v-1.318C399,1929.273,398.828,1929.198,398.756,1929.14z M407,1936.5c0,2.252-1.705,3.95-4.101,3.95
-		c-1.041,0-1.878-0.332-2.632-0.937c-0.915-0.731-1.269-1.803-1.269-3.015v-2.899l1.5,0.648l1.5-0.648v2.899
-		c0,0.496,0.76,0.55,1,0.55c0.239,0,1-0.054,1-0.55v-2.658l3-0.039L407,1936.5L407,1936.5z"/>
-</g>
-<g id="spotify">
-	<path fill="#FFFFFF" d="M359.5,1921h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C362,1922.125,360.875,1921,359.5,1921z M349.625,1941.562c-3.048-0.3-5.15-2.739-5.035-6.254
-		c0.105-3.312,3.21-5.855,5.91-5.56c2.983,0.328,4.811,2.312,4.811,5.947C355.199,1939.141,352.812,1941.875,349.625,1941.562z
-		 M353.808,1928.271c-1.028-0.686-2.509-1.094-3.96-1.094c-0.625,0-1.217,0.072-1.76,0.217c-0.055,0.016-0.113,0.022-0.17,0.022
-		c-0.3,0-0.562-0.203-0.641-0.494c-0.046-0.169-0.021-0.348,0.066-0.501c0.089-0.152,0.232-0.262,0.403-0.307
-		c0.662-0.176,1.374-0.266,2.114-0.266c1.717,0,3.421,0.48,4.678,1.317c0.146,0.097,0.247,0.246,0.281,0.42
-		c0.035,0.173,0,0.351-0.098,0.497c-0.122,0.186-0.328,0.295-0.551,0.295C354.043,1928.38,353.916,1928.343,353.808,1928.271z
-		 M353.944,1929.671c-0.105,0.161-0.284,0.257-0.478,0.257c-0.112,0-0.221-0.031-0.312-0.094c-0.91-0.604-2.012-0.908-3.271-0.908
-		c-0.556,0-1.151,0.061-1.77,0.178l-0.11,0.012c-0.271,0-0.505-0.194-0.556-0.462c-0.028-0.152,0.005-0.306,0.092-0.432
-		c0.086-0.124,0.215-0.207,0.361-0.233c0.691-0.134,1.362-0.2,1.993-0.2c1.479,0,2.786,0.368,3.886,1.094
-		C354.041,1929.055,354.115,1929.409,353.944,1929.671z M355.615,1926.213c-0.139,0.217-0.375,0.348-0.633,0.348
-		c-0.146,0-0.287-0.043-0.41-0.121c-1.11-0.715-2.842-1.144-4.627-1.144c-0.772,0-1.489,0.082-2.072,0.237
-		c-0.063,0.017-0.128,0.025-0.194,0.025c-0.342,0-0.641-0.231-0.728-0.562c-0.053-0.195-0.024-0.398,0.076-0.574
-		c0.103-0.174,0.267-0.297,0.46-0.348c0.706-0.188,1.558-0.287,2.459-0.287c2.096,0,4.079,0.504,5.443,1.381
-		C355.739,1925.396,355.84,1925.865,355.615,1926.213z"/>
-	<path fill="#FFFFFF" d="M350.059,1932.349l-0.059-0.001c-1,0-2.214,1.232-2.278,3.218c-0.032,0.976,0.155,1.798,0.557,2.375
-		c0.372,0.536,0.907,0.829,1.561,0.852c1.41,0,2.289-1.165,2.352-3.117c0.034-1.062-0.145-1.925-0.528-2.491
-		C351.299,1932.652,350.765,1932.371,350.059,1932.349z"/>
-</g>
-<g id="badoo">
-	<path fill="#FFFFFF" d="M311.5,1921h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C314,1922.125,312.875,1921,311.5,1921z M307.105,1939.854c-1.348,1.35-3.139,2.092-5.044,2.092
-		c-1.906,0-3.697-0.742-5.044-2.092c-1.348-1.347-2.09-3.139-2.09-5.043v-9.548c0-0.584,0.476-1.06,1.06-1.06s1.06,0.476,1.06,1.06
-		v4.476c1.344-1.331,3.124-2.062,5.016-2.062c1.906,0,3.697,0.742,5.044,2.089c1.348,1.35,2.089,3.141,2.089,5.046
-		C309.194,1936.718,308.452,1938.508,307.105,1939.854z"/>
-	<path fill="#FFFFFF" d="M302.061,1929.795c-1.341,0-2.6,0.521-3.546,1.469c-0.948,0.947-1.47,2.208-1.47,3.547
-		c0,1.341,0.521,2.601,1.469,3.547c0.946,0.946,2.205,1.47,3.546,1.47c1.34,0,2.6-0.522,3.546-1.47
-		c0.948-0.946,1.471-2.206,1.471-3.547c0-1.339-0.522-2.6-1.471-3.547C304.659,1930.314,303.4,1929.795,302.061,1929.795z
-		 M300.295,1937.032c-0.954,0-1.731-0.776-1.731-1.73s0.777-1.73,1.731-1.73s1.73,0.776,1.73,1.73S301.25,1937.032,300.295,1937.032
-		z"/>
-</g>
-<g id="quora">
-	<path fill="#FFFFFF" d="M263.5,1921h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C266,1922.125,264.875,1921,263.5,1921z M258.671,1938.875l0.098,0.025c0.419,0.108,0.549,0.935,0.498,1.328
-		c-0.058,0.453-0.314,0.503-0.423,0.503c-0.185,0-1.145-0.018-1.878-0.347c-0.453-0.201-0.894-0.451-1.286-1.237
-		c-0.381,0.111-0.646,0.152-0.646,0.152c-0.523,0.091-1.042,0.138-1.541,0.138c-2.259,0-4.188-0.944-5.436-2.658
-		c-1.414-1.942-1.771-4.604-0.958-7.118c0.689-2.131,2.748-4.7,6.284-4.929c0.21-0.015,0.415-0.021,0.616-0.021
-		c3.854,0,6.525,2.53,6.803,6.447c0.215,3.052-0.99,5.705-3.232,7.144C257.979,1938.701,258.346,1938.794,258.671,1938.875z"/>
-	<path fill="#FFFFFF" d="M253.727,1926.939c-0.164,0-0.334,0.011-0.51,0.031c-0.564,0.071-1.026,0.287-1.271,0.466
-		c-0.866,0.636-1.449,2.247-1.521,4.209c-0.079,2.165,0.484,4.146,1.403,4.929c0.481,0.412,1.211,0.646,2,0.646
-		c0.377,0,0.743-0.054,1.073-0.158c-0.532-0.902-1.421-0.961-1.769-0.982c-0.23-0.021-0.391-0.135-0.377-0.415
-		c0.019-0.397,0.408-1.193,0.87-1.193c0,0,1.575-0.172,2.81,0.899c0.033,0.027,0.062,0.062,0.092,0.099
-		c0.919-2.064,0.863-5.478-0.16-7.124C256.039,1927.821,255.261,1926.939,253.727,1926.939z"/>
-</g>
-<g id="_x34_square_2_">
-	<g opacity="0.3">
-		<circle fill="#FFFFFF" cx="201.129" cy="1931.486" r="4.805"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M218,1923.5c0-1.375-1.125-2.5-2.5-2.5h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19
-			c1.375,0,2.5-1.125,2.5-2.5v-11.842l-4.646,4.104l0.99,0.989l-6.836,6.835l-6.305-6.305c-0.025,0.001-0.05,0.008-0.074,0.008
-			c-2.653,0-4.805-2.148-4.805-4.806c0-2.653,2.15-4.805,4.805-4.805c2.344,0,4.291,1.68,4.715,3.901l1.664-1.664l3.285,3.284
-			l7.207-8.172V1923.5L218,1923.5z"/>
-	</g>
-	<g opacity="0.5">
-		<g>
-			<g>
-				<path fill="#FFFFFF" d="M205.652,1933.051l1.861,2.869l3.279-3.717l-3.285-3.284l-1.664,1.664
-					c0.056,0.293,0.091,0.594,0.091,0.903C205.935,1932.037,205.823,1932.559,205.652,1933.051z"/>
-			</g>
-			<g>
-				<path fill="#FFFFFF" d="M207.504,1939.932l-4.768-3.937c0.02-0.007,0.034-0.02,0.053-0.025
-					c-0.498,0.185-1.026,0.306-1.586,0.313l6.305,6.305l6.836-6.835l-0.99-0.989L207.504,1939.932z"/>
-			</g>
-		</g>
-		<g>
-			<g opacity="0.3">
-				<path fill="#FFFFFF" d="M205.652,1933.051l1.861,2.869l3.279-3.717l-3.285-3.284l-1.664,1.664
-					c0.056,0.293,0.091,0.594,0.091,0.903C205.935,1932.037,205.823,1932.559,205.652,1933.051z"/>
-			</g>
-			<g opacity="0.3">
-				<path fill="#FFFFFF" d="M207.504,1939.932l-4.768-3.937c0.02-0.007,0.034-0.02,0.053-0.025
-					c-0.498,0.185-1.026,0.306-1.586,0.313l6.305,6.305l6.836-6.835l-0.99-0.989L207.504,1939.932z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g id="skitch_2_">
-	<path fill="#FFFFFF" d="M167.5,1921h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C170,1922.125,168.875,1921,167.5,1921z M162.289,1935.718c-1.854,2.161-1.058,3.602-1.257,4.276
-		c-0.2,0.674-0.352,0.748-1.35,0.523c-0.998-0.226-4.021-1.224-6.043-2.871c-2.021-1.648-3.495-3.072-3.495-6.144
-		s2.247-3.797,3.046-3.97c0.798-0.177,1.999,0.174,1.922,0.998c-0.072,0.822-0.799,0.899-1.146,1.023
-		c0.748,0.049,0.947,0.041,2.346-1.604c1.397-1.645,5.573-3.919,8.035-1.457C167.525,1929.673,164.142,1933.555,162.289,1935.718z"
-		/>
-</g>
-<g id="youtube_1_">
-	<g>
-		<path fill="#FFFFFF" d="M109.431,1930.793c0.118,0,0.32-0.04,0.348-0.068c0.049-0.051,0.222-0.124,0.222-0.224v-3.106
-			c0-0.068-0.168-0.113-0.213-0.154c-0.047-0.041-0.189-0.062-0.281-0.062c-0.105,0-0.288,0.033-0.31,0.054
-			c-0.044,0.043-0.196,0.093-0.196,0.162v3.106c0,0.106,0.118,0.184,0.157,0.229
-			C109.182,1930.757,109.324,1930.793,109.431,1930.793z"/>
-		<path fill="#FFFFFF" d="M119.5,1921h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-			v-19C122,1922.125,120.875,1921,119.5,1921z M112,1926h1v4.506c0,0.135,0.097,0.174,0.152,0.184c0.01,0,0.275-0.004,0.396-0.087
-			c0.083-0.055,0.451-0.126,0.451-0.212V1926h1v6h-1v-0.308c0,0.086-0.381,0.159-0.486,0.22c-0.242,0.138-0.57,0.207-0.803,0.207
-			c-0.309,0-0.44-0.116-0.602-0.336c-0.15-0.208-0.109-0.496-0.109-0.882V1926z M110.611,1926.261c0.318,0.312,0.39,0.72,0.39,1.208
-			v2.947c0,0.54-0.067,0.974-0.379,1.289c-0.314,0.316-0.698,0.477-1.232,0.477c-0.519,0-0.77-0.166-1.085-0.49
-			c-0.314-0.322-0.303-0.759-0.303-1.297v-2.957c0-0.498,0.017-0.902,0.344-1.202c0.323-0.296,0.636-0.446,1.168-0.446
-			C110.004,1925.788,110.295,1925.947,110.611,1926.261z M105.311,1924l0.653,2.604l0.621-2.604h1.643l-1.228,4.629V1932h-1.827
-			l0.009-3.139l-1.5-4.861H105.311z M117,1938c0,1.656-1.343,3-3,3h-8c-1.657,0-3-1.344-3-3v-2c0-1.656,1.343-3,3-3h8
-			c1.657,0,3,1.344,3,3V1938z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M114.027,1939.969c-0.313,0-0.563-0.104-0.742-0.309c-0.183-0.21-0.274-0.506-0.274-0.88v-1.87
-			c0-0.333,0.101-0.607,0.3-0.814c0.201-0.209,0.455-0.312,0.775-0.312c0.324,0,0.573,0.096,0.742,0.284
-			c0.173,0.188,0.26,0.473,0.26,0.842v0.961h-1.48v0.885c0,0.239,0.03,0.405,0.09,0.509c0.073,0.115,0.189,0.175,0.349,0.175
-			c0.162,0,0.28-0.05,0.351-0.149c0.064-0.09,0.096-0.26,0.096-0.532v-0.189h0.597v0.214c0,0.4-0.089,0.702-0.266,0.896
-			C114.647,1939.873,114.388,1939.969,114.027,1939.969z M114.053,1936.314c-0.195,0-0.296,0.084-0.347,0.154
-			c-0.066,0.094-0.1,0.234-0.1,0.434v0.521h0.885v-0.521c0-0.196-0.032-0.338-0.099-0.433
-			C114.341,1936.399,114.241,1936.314,114.053,1936.314z M107.676,1939.916c-0.146,0-0.253-0.048-0.325-0.146
-			c-0.077-0.105-0.116-0.272-0.116-0.498v-3.383h0.573v3.095c0,0.122,0.022,0.212,0.069,0.272c0.037,0.049,0.107,0.106,0.238,0.106
-			c0.077,0,0.167-0.034,0.271-0.104c0.096-0.064,0.184-0.146,0.261-0.244l0.021-3.125h0.575v3.966h-0.574v-0.633l-0.177,0.209
-			c-0.137,0.161-0.276,0.283-0.418,0.364C107.938,1939.875,107.803,1939.916,107.676,1939.916z M111.617,1939.909
-			c-0.135,0-0.253-0.027-0.36-0.081c-0.105-0.054-0.202-0.138-0.297-0.255l-0.178-0.222v0.504H110.2v-5.447h0.582v1.998l0.177-0.216
-			c0.096-0.116,0.199-0.206,0.305-0.268c0.1-0.057,0.204-0.086,0.307-0.086c0.213,0,0.37,0.074,0.48,0.226
-			c0.116,0.16,0.175,0.401,0.175,0.719v2.312c0,0.272-0.054,0.48-0.162,0.618C111.962,1939.844,111.816,1939.909,111.617,1939.909z
-			 M111.205,1936.3c-0.069,0-0.14,0.018-0.207,0.05c-0.065,0.033-0.128,0.084-0.189,0.148l-0.026,2.665
-			c0.101,0.147,0.171,0.202,0.24,0.235c0.068,0.037,0.146,0.056,0.229,0.056c0.129,0,0.226-0.043,0.29-0.129
-			c0.059-0.077,0.088-0.19,0.088-0.346v-2.151c0-0.16-0.035-0.288-0.104-0.38C111.452,1936.352,111.342,1936.3,111.205,1936.3z
-			 M105.47,1939.855v-4.826h-0.901v-0.621h2.477v0.621h-0.902v4.826H105.47z"/>
-	</g>
-</g>
-<g id="github_2_">
-	<path fill="#FFFFFF" d="M71.5,1921h-19c-1.381,0-2.5,1.119-2.5,2.5v19c0,1.381,1.119,2.5,2.5,2.5h19c1.381,0,2.5-1.119,2.5-2.5v-19
-		C74,1922.119,72.881,1921,71.5,1921z M60,1937h-2v-3h2V1937z M63,1938h-2v-1h2V1938z M66,1937h-2v-3h2V1937z M65,1928L65,1928l4-2
-		l0.062,4c0.724,0.867,0.938,1.782,0.938,3v1c0,1.844-1.011,3.438-2.494,4.304C67.81,1937.953,68,1937.501,68,1937v-2
-		c0-1.104-0.896-2-2-2h-8c-1.104,0-2,0.896-2,2v2c0,0.501,0.189,0.953,0.494,1.304C55.01,1937.438,54,1935.844,54,1934v-1
-		c0-1.143,0.354-2.158,1-3v-4l4,1.998L65,1928z"/>
-</g>
-<g id="behance">
-	<path id="behance_2_" fill="#FFFFFF" d="M20.022,1934h-3.167c0.027-0.55,0.146-1.908,1.618-1.908
-		C20.25,1932.092,20.022,1934,20.022,1934z M10.508,1934H8v2l2.578-0.016c0.85,0,1.446-0.107,1.446-0.896
-		C12.025,1934.086,11.428,1934,10.508,1934z M11.66,1930.979c0-0.934-0.714-0.979-1.48-0.979H8v2h2.344
-		C11.098,1932,11.66,1931.802,11.66,1930.979z M26,1923.5v19c0,1.375-1.125,2.5-2.5,2.5h-19c-1.375,0-2.5-1.125-2.5-2.5v-19
-		c0-1.375,1.125-2.5,2.5-2.5h19C24.875,1921,26,1922.125,26,1923.5z M16,1930h5v-1h-5V1930z M14.209,1935.1
-		c0-1.22-0.357-2.201-1.55-2.544c0.85-0.409,1.085-1.109,1.085-2.07c0-1.822-0.808-2.484-2.744-2.484c-1.938,0-5,0-5,0v10h5
-		C12.768,1938,14.209,1937.089,14.209,1935.1z M16.855,1935H22c0-3-1.061-4.256-3.473-4.256c-2.15,0-3.618,1.568-3.618,3.695
-		c0,2.192,1.351,3.801,3.618,3.801c2.269,0,3.455-1.594,3.473-2.239c0,0-1.531-0.001-1.97-0.001
-		c-0.312,0.344-0.812,0.625-1.469,0.625C17.48,1936.625,16.91,1936,16.855,1935z"/>
-</g>
-<g id="pinboard_2_">
-	<path fill="#FFFFFF" d="M458,1875.5c0-1.381-1.119-2.5-2.5-2.5h-19c-1.382,0-2.5,1.119-2.5,2.5v19c0,1.381,1.118,2.5,2.5,2.5h19
-		c1.381,0,2.5-1.119,2.5-2.5V1875.5z M445.307,1885.994l-2.307,2.316v-2.828l-0.026,0.018L440,1882h-2l5-5v2l3.498,2.974
-		l-0.017,0.026h2.828l-2.377,2.371l5.58,7.139L445.307,1885.994z"/>
-</g>
-<g id="forrst_1_">
-	<path fill="#FFFFFF" d="M407.5,1873h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C410,1874.125,408.875,1873,407.5,1873z M398,1894v-2.874l4.104-2.229l-0.368-0.676L398,1890.25v-1.474l2.501-1.358
-		l-0.367-0.678L398,1887.9v-1.9h-2v2.518l-1.16-0.884l-0.409,0.616l1.569,1.215V1894h-6.312l8.135-19.229l8.26,19.229H398z"/>
-</g>
-<g id="linked_x5F_in_2_">
-	<path fill="#FFFFFF" d="M359.5,1873h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C362,1874.125,360.875,1873,359.5,1873z M346,1892h-0.13H343v-10h3V1892z M344.5,1880.641c-1.011,0-1.828-0.817-1.828-1.828
-		c0-1.01,0.817-1.827,1.828-1.827c1.01,0,1.828,0.817,1.828,1.827C346.328,1879.823,345.51,1880.641,344.5,1880.641z M357,1892h-3
-		v-5.293c0-1.249-0.532-2.101-1.649-2.101c-0.854,0-1.025,0.574-1.249,1.129c-0.082,0.198-0.102,0.476-0.102,0.753V1892h-3
-		c0,0,0.041-9.128,0-10h3v1.703c0-0.632,0.708-1.734,3.062-1.734c2.354,0,2.938,0.074,2.938,3.381C357,1888.657,357,1892,357,1892z"
-		/>
-</g>
-<g id="read_x5F_it_x5F_later_1_">
-	<path fill="#FFFFFF" d="M311.5,1873H306v18.667c0,0.184-0.106,0.228-0.235,0.098l-3.765-3.426l-3.766,3.426
-		c-0.129,0.13-0.234,0.087-0.234-0.098V1873h-5.5c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19
-		c1.375,0,2.5-1.125,2.5-2.5v-19C314,1874.125,312.875,1873,311.5,1873z"/>
-</g>
-<g id="deviantart_2_">
-	<path fill="#FFFFFF" d="M263.5,1873h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C266,1874.125,264.875,1873,263.5,1873z M254,1887v1h-9c-0.019-0.134,0-0.488,0-0.626c0-1.42,0.729-3.147,2.459-4.207
-		c1.046-0.641,2.332-1.084,4.062-1.25l-0.043,0.688c-2.666,0.562-3.66,2.051-3.966,3.679l-0.134,0.714L252,1887v-7h2V1887z
-		 M264,1888h-9v-4h2v3c0,0,3.457-0.016,4.646-0.016c0.183-1.821-1.459-3.984-6.303-3.984c-0.103,0-0.233,0-0.333,0l0.011-0.896
-		c0.101,0,0.222-0.007,0.322-0.007c2.699,0,4.395,0.203,6.115,1.257c1.729,1.06,2.541,2.248,2.541,3.668
-		C264,1887.159,264,1888,264,1888z"/>
-</g>
-<g id="dribbble">
-	<path id="dribbble_2_" fill="#FFFFFF" d="M200.944,1889.446c-1.007-1.212-1.558-2.73-1.558-4.307l0.034-0.011
-		c0.837,0,3.767-0.068,6.804-0.95c0.135,0.269,0.265,0.54,0.389,0.812c-0.02,0.006-0.038,0.012-0.058,0.018
-		C203.354,1886.045,201.484,1888.609,200.944,1889.446z M203.114,1879.108c-1.758,0.883-3.059,2.509-3.53,4.409
-		c0.834-0.008,3.183-0.095,5.866-0.774C204.474,1881.038,203.472,1879.607,203.114,1879.108z M202.125,1890.562
-		c1.167,0.865,2.548,1.321,4.004,1.321c0.858,0,1.695-0.16,2.488-0.476c-0.132-0.729-0.523-2.628-1.374-4.889
-		C203.893,1887.743,202.457,1889.971,202.125,1890.562z M210.459,1879.975c-1.214-1.02-2.745-1.578-4.33-1.578
-		c-0.437,0-0.866,0.041-1.284,0.122c0.404,0.561,1.405,1.991,2.34,3.687C209.138,1881.438,210.137,1880.372,210.459,1879.975z
-		 M208.931,1886.108c0.71,2.001,1.073,3.669,1.219,4.442c1.359-1.015,2.296-2.511,2.606-4.168c-0.412-0.113-1.413-0.351-2.651-0.351
-		C209.705,1886.033,209.311,1886.059,208.931,1886.108z M218,1875.5v19c0,1.375-1.125,2.5-2.5,2.5h-19c-1.375,0-2.5-1.125-2.5-2.5
-		v-19c0-1.375,1.125-2.5,2.5-2.5h19C216.875,1873,218,1874.125,218,1875.5z M214.459,1885.129c0-4.593-3.737-8.329-8.33-8.329
-		s-8.329,3.736-8.329,8.329s3.736,8.33,8.329,8.33S214.459,1889.722,214.459,1885.129z M207.899,1883.59
-		c0.13,0.272,0.467,1.045,0.467,1.045c0.465-0.052,0.961-0.078,1.476-0.078c1.361,0,2.524,0.183,3.025,0.273
-		c-0.062-1.374-0.53-2.665-1.363-3.761C211.095,1881.546,209.955,1882.708,207.899,1883.59z"/>
-</g>
-<g id="zootool_2_">
-	<path fill="#FFFFFF" d="M167.5,1873h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C170,1874.125,168.875,1873,167.5,1873z M158.819,1892.907c-2.104-0.609-2.744-3.9-3.898-5.392
-		c-0.744,0.176-1.002,0.833-2.065,0.688c-1.386-2.174,1.028-5.653,3.098-3.671c1.469-1.247,2.914-2.518,4.016-4.13
-		c-1.309-0.604-3.623-1.05-4.818-0.459c-0.631-0.166-0.722-1.034-0.572-1.722c0.546-2.529,5.021-1.299,6.769-0.344
-		c2.131-2.683,3.037,2.46,0.344,2.867c-1.172,2.041-2.894,3.53-4.589,5.048c1.054,1.005,1.863,3.909,3.557,4.244
-		c0.956,0.188,1.805-0.536,2.639-0.573C164.179,1891.767,161.115,1893.573,158.819,1892.907z"/>
-</g>
-<g id="xing">
-	<path fill="#FFFFFF" d="M119.5,1873h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C122,1874.125,120.875,1873,119.5,1873z M100.47,1888l3.202-5.036l-1.088-2.964h4.632l1.112,3.036L105.17,1888H100.47z
-		 M116.517,1894h-4.689l-4.17-6.997l6.165-11.003h4.684l-6.161,10.997L116.517,1894z"/>
-</g>
-<g id="evernote_1_">
-	<path fill="#FFFFFF" d="M67,1886c-0.46,0.05-1.138-0.596-1.647-0.596c-0.389,0-1.254,0.717-1.353,0.596c-0.101-0.12,0.268-3,1-3
-		S67.773,1885.916,67,1886z M74,1875.5v19c0,1.375-1.125,2.5-2.5,2.5h-19c-1.375,0-2.5-1.125-2.5-2.5v-19c0-1.375,1.125-2.5,2.5-2.5
-		h19C72.875,1873,74,1874.125,74,1875.5z M54,1881c0,0,2.346,0,2.812,0c0.938,0,1.188-0.766,1.188-0.991c0-0.225,0-2.812,0-2.812
-		L54,1881z M69,1880c0-0.571-1.048-1-2-1s-4,0-4,0s-0.566-1.803-1.503-1.803c-0.938,0-1.239-0.005-1.874,0
-		C58.989,1877.205,59,1877.225,59,1878s0,1.438,0,2c0,2-0.546,2-1,2h-3c-0.631-0.042-1,0.301-1,0.818c0,0.52,0.741,5.466,1.76,6.484
-		c0.591,0.592,4.205,1.003,4.967,1.003c0.761,0,0.508-2.817,0.72-2.817s0.444,1.274,1.644,1.579
-		c1.199,0.303,2.828,0.064,2.911,0.933c0.111,1.143-0.016,3-0.755,3H64c-0.714,0-0.763-1,0-1c0.508,0,1,0,1,0v-1c0,0-2.89-0.804-3,1
-		c-0.103,1.65-0.381,2.619,0,3s0.333,0,3.245,0C69.786,1895,69,1880.571,69,1880z"/>
-</g>
-<g id="instapaper_2_">
-	<path fill="#FFFFFF" d="M23.5,1873h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C26,1874.125,24.875,1873,23.5,1873z M17,1878h-2v14h2v1h-7v-1h2v-14h-2v-1h7V1878z"/>
-</g>
-<g id="wordpress">
-	<path fill="#FFFFFF" d="M455.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C458,1826.125,456.875,1825,455.5,1825z M445.547,1827.818c3.864,0,6.389,2.701,6.389,2.701s-0.263-0.028-0.694-0.028
-		c-0.955,0-1.354,0.687-1.354,1.329c0,0.599,0.359,1.043,0.784,1.754c0.424,0.711,0.899,1.56,0.899,2.66
-		c0,0.728-0.243,1.529-0.591,2.643l-1.105,3.699l-3.409-10.146c0,0,1.239-0.095,1.241-0.095c0.146-0.018,0.148-0.134,0.146-0.169
-		c-0.002-0.034-0.019-0.146-0.151-0.146c-0.024,0.001-1.431,0.109-2.333,0.109c-0.848,0-2.235-0.104-2.295-0.109l0,0
-		c-0.149,0-0.162,0.134-0.162,0.159c-0.002,0.056,0.015,0.146,0.137,0.154c0.015,0.001,1.038,0.089,1.038,0.089l1.416,3.885
-		l-2.104,6.312l-3.426-10.188c0,0,1.238-0.096,1.24-0.096c0.144-0.018,0.147-0.134,0.146-0.169c-0.002-0.034-0.02-0.146-0.152-0.146
-		c-0.024,0.001-2.851,0.09-3.254,0.09C439.068,1830.158,442.147,1827.818,445.547,1827.818z M436.694,1836.672
-		c0-1.25,0.448-2.958,0.969-4.054c0.338,1.096,4.118,11.429,4.467,12.238C439.618,1843.762,436.694,1840.994,436.694,1836.672z
-		 M445.547,1845.525c-0.847,0-1.929-0.098-2.701-0.419c0.438-1.201,2.848-8.276,2.848-8.276s2.842,7.628,3.026,8.113
-		C447.618,1845.429,446.553,1845.525,445.547,1845.525z M449.998,1844.325l-0.466,0.271l2.818-8.151
-		c0.443-1.106,0.646-2.067,0.646-3.034c0-0.309-0.021-0.596-0.057-0.862l0.374-0.123c0.709,1.293,1.084,2.762,1.084,4.247
-		C454.4,1839.809,452.714,1842.741,449.998,1844.325z"/>
-</g>
-<g id="tumblr">
-	<path fill="#FFFFFF" d="M407.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C410,1826.125,408.875,1825,407.5,1825z M397.647,1845.25c-0.343,0-0.583-0.002-0.935,0c-1.545,0.012-3.713-0.436-3.713-2.936
-		V1836h-2v-3c0,0,1.554-0.021,2.477-1.096s0.902-1.881,0.957-2.904H397v4h4v3h-4v5.816c0,0.342,0.979,0.853,1.818,0.853
-		c0.812,0,1.522-0.322,2.182-0.735v2.812C400.458,1845.033,400.006,1845.25,397.647,1845.25z M404.5,1845.581
-		c-1.146,0-2.081-0.935-2.081-2.081s0.935-2.081,2.081-2.081c1.146,0,2.081,0.935,2.081,2.081S405.646,1845.581,404.5,1845.581z"/>
-</g>
-<g id="amazon">
-	<path fill="#FFFFFF" d="M350.281,1837.688c-0.265,0.479-0.631,0.818-1.06,0.818c-0.821,0-0.966-0.869-0.966-1.136
-		c0-1.11,1.076-1.644,2.146-1.703C350.401,1835.667,350.612,1837.094,350.281,1837.688z M362,1827.5v19c0,1.375-1.125,2.5-2.5,2.5
-		h-19c-1.375,0-2.5-1.125-2.5-2.5v-19c0-1.375,1.125-2.5,2.5-2.5h19C360.875,1825,362,1826.125,362,1827.5z M350.401,1833.424
-		c0,0-2.258,0.268-3.211,0.694c-1.468,0.643-2.308,1.955-2.308,3.601c0,2.109,1.29,3.473,3.286,3.473
-		c1.382,0,2.212-0.317,3.22-1.285c0.225,0.337,1.008,1.637,1.377,1.423s1.759-1.079,2.156-1.422c0.266-0.221,0.644-0.403,0.016-1.25
-		c-0.31-0.403-0.791-0.971-0.791-1.704l0.003-3.465c0.006-1.263-0.392-4.543-3.906-4.543c-3.054,0-4.464,0.382-5.027,3.412
-		c-0.07,0.386,0.147,0.716,0.572,0.808l1.963,0.215c0.311-0.018,0.556-0.279,0.622-0.634c0.119-0.596,0.558-0.95,1.237-0.95
-		c0.289,0,0.583,0.1,0.768,0.383C350.552,1832.439,350.401,1833.424,350.401,1833.424z M349.695,1845c2.778,0,5.607-1.215,7.58-2.67
-		c0.229-0.169,0.322-0.421,0.244-0.658c-0.076-0.234-0.303-0.391-0.562-0.391c-0.094,0-0.186,0.019-0.272,0.057
-		c-2.146,0.91-4.594,1.428-6.895,1.428c-3.175,0-6.158-1.047-8.414-2.141c-0.095-0.045-0.188-0.079-0.281-0.079
-		c-0.193,0-0.361,0.112-0.43,0.287c-0.072,0.188-0.017,0.397,0.149,0.55C343.375,1843.692,346.199,1845,349.695,1845z
-		 M359.045,1840.329c-0.282-0.351-1.268-0.444-1.461-0.444c-0.508,0-1.474,0.064-2.239,0.604c-0.198,0.139-0.286,0.316-0.227,0.507
-		c0.053,0.167,0.21,0.208,0.47,0.208c0.005,0,0.01,0,0.016,0c0.355,0,1.051-0.203,1.548-0.203c0.502,0,0.667,0,0.759,0.212
-		c0.091,0.212-0.084,0.673-0.688,2.186c-0.062,0.155-0.245,1.057,0.067,1.135c0.312,0.078,0.561-0.235,0.672-0.328
-		C359.135,1843.221,359.418,1840.791,359.045,1840.329z"/>
-</g>
-<g id="picasa">
-	<path fill="#FFFFFF" d="M311.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C314,1826.125,312.875,1825,311.5,1825z M301.871,1829.146c1.125,0,2.129,0.098,3.129,0.562c0,0.111,0,5.018,0,5.377
-		c0-0.243-5.72-5.24-5.928-5.429C299.959,1829.326,300.935,1829.146,301.871,1829.146z M294.127,1837
-		c0-2.962,1.638-5.63,4.274-6.984c0.091,0.082,2.841,2.578,2.974,2.699c-0.138,0.123-6.749,6.131-6.962,6.325
-		C294.229,1838.359,294.127,1837.675,294.127,1837z M298,1843.812c-1.25-0.729-2.521-1.896-3.245-3.908
-		c0.091-0.082,3.245-2.711,3.245-2.949C298,1837.316,298,1843.605,298,1843.812z M299,1844.312c0-0.334,0-2.07,0-3.359h9.854
-		c-0.999,1.674-2.604,2.798-4.167,3.423C303.124,1845.001,300.438,1845.042,299,1844.312z M309.312,1840c-0.125,0-3.312,0-3.312,0
-		c0-1,0-9.374,0-9.812c1.259,0.685,3.188,2.709,3.583,4.541C309.978,1836.562,309.938,1838.062,309.312,1840z"/>
-</g>
-<g id="blogger">
-	<path fill="#FFFFFF" d="M256.616,1839.128h-5.167c-0.511,0-0.925,0.416-0.925,0.927c0,0.512,0.414,0.927,0.925,0.927h5.167
-		c0.511,0,0.926-0.415,0.926-0.927C257.542,1839.544,257.127,1839.128,256.616,1839.128z"/>
-	<path fill="#FFFFFF" d="M251.455,1835.959h2.573c0.536,0,0.973-0.438,0.973-0.973c0-0.536-0.437-0.974-0.973-0.974h-2.573
-		c-0.536,0-0.973,0.438-0.973,0.974C250.483,1835.521,250.919,1835.959,251.455,1835.959z"/>
-	<path fill="#FFFFFF" d="M263.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C266,1826.125,264.875,1825,263.5,1825z M261,1840c0,2.45-2.549,4-5,4h-4c-2.451,0-5-1.55-5-4v-5c0-2.45,1.549-4,4-4h3
-		c2.45,0,4.306,1.521,4.306,3.972c0.039,0.544,0.481,0.954,1.009,0.954l0.875,0.074c0.446,0,0.812,0.364,0.812,0.811L261,1840
-		L261,1840z"/>
-</g>
-<g id="yahoo">
-	<path fill="#FFFFFF" d="M215.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C218,1826.125,216.875,1825,215.5,1825z M214.412,1833.372l-2.051,0.416L208,1838v3h2.438l-0.157,1.438l-8.818,0.013
-		l0.235-1.354l2.287-0.324L204,1838l-4.523-5.599l-2.561-0.375l-0.037-1.266l8.995-0.002l-0.171,1.196l-2.293,0.219l3.164,4.239
-		l2.687-2.791l-1.82-0.253L207,1832h8L214.412,1833.372z"/>
-</g>
-<g id="jolicloud">
-	<path fill="#FFFFFF" d="M167.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5
-		v-19C170,1826.125,168.875,1825,167.5,1825z M166.981,1841c-0.418,0-12.64,0-12.64,0c-2.997,0-4.561-1.217-4.561-3.374
-		s1.298-3.095,4.026-3.09c0.583-1.458,2.243-3.653,4.991-3.653s4.951,1.978,5.258,4.238c0.368,2.717,0.896,3.832,3.062,5.453
-		C167.389,1840.776,167.399,1841,166.981,1841z"/>
-</g>
-<g id="google_x5F_plus">
-	<path fill="#FFFFFF" d="M103.424,1841.49c-0.157-0.12-0.424-0.256-0.424-0.571c0,0,0-0.646,0-1.063
-		c-1.375,0.021-4.437-0.201-5-3.506v7.374c1.723-1.479,4.686-1.643,5.897-1.646C103.825,1841.729,103.586,1841.615,103.424,1841.49z
-		"/>
-	<path fill="#FFFFFF" d="M103.988,1838.301c0.159,0,0.315-0.021,0.468-0.062c1.336-0.363,2-2.218,1.479-4.131
-		c-0.454-1.665-1.673-2.873-2.899-2.873c-0.159,0-0.316,0.021-0.469,0.062c-0.635,0.172-1.141,0.688-1.424,1.452
-		c-0.292,0.787-0.312,1.738-0.056,2.677C101.541,1837.092,102.76,1838.301,103.988,1838.301z"/>
-	<path fill="#FFFFFF" d="M119.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v6.764c0.75-4.162,6.03-4.264,6.088-4.264H110v0.002
-		c0,0.692-0.928,0.82-1.74,0.924c-0.207,0.026-0.441,0.062-0.629,0.104c1.397,0.781,1.534,2.086,1.534,3.81
-		c0,2.041-1.172,3.021-2.036,3.737c-0.54,0.447-0.96,0.8-0.96,1.247c0,0.437,0.59,0.914,1.27,1.467
-		c1.152,0.938,2.732,2.221,2.732,4.395c0,1.357-0.407,2.457-1.188,3.314H119.5c1.375,0,2.5-1.125,2.5-2.5v-19
-		C122,1826.125,120.875,1825,119.5,1825z M121,1835h-4v4h-1v-4h-4v-1h4v-4h1v4h4V1835z"/>
-	<path fill="#FFFFFF" d="M103.885,1843.354c-0.132,0-0.266,0.006-0.4,0.015c-1.132,0.076-2.172,0.468-2.928,1.103
-		c-0.738,0.619-1.115,1.396-1.062,2.188c0.067,1.013,0.864,1.871,2.01,2.344h4.063c1.438-0.568,2.396-1.688,2.313-2.912
-		C107.779,1844.555,106.022,1843.354,103.885,1843.354z"/>
-</g>
-<g id="dropbox">
-	<polygon fill="#FFFFFF" points="57.516,1835.5 61.997,1838.302 66.477,1835.493 62.02,1832.688 	"/>
-	<path fill="#FFFFFF" d="M71.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C74,1826.125,72.875,1825,71.5,1825z M62.176,1845.263c-0.082,0.052-0.172,0.077-0.268,0.077s-0.186-0.025-0.268-0.079
-		l-3.702-2.346l4.062-3.337l3.922,3.297L62.176,1845.263z M70.969,1833.084c-0.03,0.013-2.324,1.746-3.194,2.413
-		c0,0,2.64,2.105,3.019,2.397s0.707,0.309,0.207,0.651s-5.481,3.576-5.481,3.576l-3.479-3.023l-3.524,2.933
-		c0,0-5.74-3.475-5.74-3.734c0-0.216,0.122-0.338,0.199-0.396c0.007-0.006,2.188-1.735,3.035-2.406
-		c-0.846-0.672-3.038-2.4-3.038-2.4c-0.098-0.069-0.267-0.188-0.267-0.396c0-0.229,0.185-0.347,0.274-0.402l5.147-3.313
-		c0.08-0.054,0.175-0.081,0.272-0.081c0.119,0,0.235,0.042,0.326,0.118l3.188,2.661l3.195-2.661
-		c0.106-0.087,0.247-0.116,0.344-0.116c0.031,0,0.196,0.004,0.315,0.082l5.132,3.296c0.17,0.07,0.332,0.195,0.332,0.438
-		C71.234,1832.962,71.084,1833.031,70.969,1833.084z"/>
-</g>
-<g id="pinterest">
-	<path fill="#FFFFFF" d="M23.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C26,1826.125,24.875,1825,23.5,1825z M15.203,1841.402c-0.771,0-1.562-0.317-2.061-0.789c-0.333,0.958-0.784,2.267-0.854,2.521
-		c-0.347,1.252-1.26,2.503-1.636,2.982c-0.098,0.124-0.219,0.184-0.35,0.184c-0.21,0-0.383-0.148-0.412-0.355
-		c-0.196-1.35-0.182-2.567,0.032-3.477c0.158-0.669,1.32-4.642,1.53-5.357c-0.09-0.22-0.266-0.738-0.266-1.422
-		c0-1.454,0.882-2.594,2.008-2.594c0.895,0,1.494,0.655,1.494,1.63c0,0.562-0.216,1.264-0.444,2.005
-		c-0.123,0.398-0.25,0.81-0.345,1.208c-0.081,0.34-0.015,0.665,0.185,0.917c0.211,0.268,0.548,0.421,0.922,0.421
-		c1.43,0,2.508-1.896,2.508-4.411c0-1.908-1.297-3.094-3.385-3.094c-2.638,0-4.062,2.03-4.062,3.941c0,0.641,0.164,1.13,0.515,1.543
-		c0.202,0.239,0.281,0.415,0.188,0.766l-0.181,0.711c-0.077,0.294-0.3,0.477-0.582,0.477c-0.088,0-0.178-0.019-0.267-0.055
-		c-1.252-0.512-1.999-1.881-1.999-3.661c0-2.867,2.479-5.833,6.63-5.833c3.697,0,5.906,2.732,5.906,5.374
-		C20.283,1838.724,18.146,1841.402,15.203,1841.402z"/>
-</g>
-<g id="electrical_x5F_socket_x5F_us">
-	<path fill="#FFFFFF" d="M454,1777h-17c-1.65,0-3,1.35-3,3v17c0,1.65,1.35,3,3,3h17c1.649,0,3-1.35,3-3v-17
-		C457,1778.35,455.65,1777,454,1777z M450.377,1796.047l-9.791-0.01c-4.97-5.225-5.065-10.072-0.298-15.125l10.384-0.021
-		C455.44,1785.943,455.347,1790.822,450.377,1796.047z"/>
-	<path fill="#FFFFFF" d="M440.961,1782c-3.763,4-3.67,8,0.293,13h8.455c3.963-5,4.056-9,0.295-13H440.961z M443,1788h-2v-4h2V1788z
-		 M447,1794h-3v-1c0-1.172,0.595-2.2,1.5-2.2c0.904,0,1.5,1.028,1.5,2.2V1794z M450,1788h-2v-4h2V1788z"/>
-</g>
-<g id="electrical_x5F_socket_x5F_eu">
-	<circle fill="#FFFFFF" cx="397.5" cy="1784.5" r="0.675"/>
-	<path fill="#FFFFFF" d="M397.5,1795.453c-3.833,0-6.952-3.12-6.952-6.953s3.119-6.953,6.952-6.953s6.952,3.12,6.952,6.953
-		S401.333,1795.453,397.5,1795.453z M401.5,1786.651c-1.021,0-1.851,0.829-1.851,1.849s0.83,1.849,1.851,1.849
-		c1.02,0,1.85-0.829,1.85-1.849S402.52,1786.651,401.5,1786.651z M393.5,1786.651c-1.021,0-1.851,0.829-1.851,1.849
-		s0.83,1.849,1.851,1.849c1.02,0,1.85-0.829,1.85-1.849S394.52,1786.651,393.5,1786.651z M397.5,1782.622
-		c-1.035,0-1.879,0.842-1.879,1.878s0.844,1.878,1.879,1.878s1.879-0.842,1.879-1.878S398.535,1782.622,397.5,1782.622z"/>
-	<path fill="#FFFFFF" d="M406,1777h-17c-1.65,0-3,1.35-3,3v17c0,1.65,1.35,3,3,3h17c1.649,0,3-1.35,3-3v-17
-		C409,1778.35,407.65,1777,406,1777z M397.5,1797.105c-4.746,0-8.606-3.86-8.606-8.605c0-4.746,3.86-8.605,8.606-8.605
-		s8.605,3.859,8.605,8.605C406.106,1793.245,402.246,1797.105,397.5,1797.105z"/>
-</g>
-<g id="riflescope_1_">
-	<g id="riflescope">
-		<path fill="#FFFFFF" d="M350.602,1777c-6.837,0-12.397,5.562-12.397,12.398s5.562,12.397,12.397,12.397S363,1796.235,363,1789.398
-			C363,1782.561,357.438,1777,350.602,1777z M351,1798.771V1793h-1v5.771c-5-0.254-8.52-3.771-8.771-8.771H347v-1h-5.771
-			c0.253-5,3.771-8.722,8.771-8.975V1786h1v-5.975c5,0.253,8.722,3.975,8.975,8.975H354v1l5.969-0.016
-			C359.716,1794.984,356,1798.52,351,1798.771z"/>
-	</g>
-	<g opacity="0.5">
-		<rect x="350" y="1789" fill="#FFFFFF" width="1" height="1"/>
-	</g>
-</g>
-<g id="hand_x5F_saw">
-	<path fill="#FFFFFF" d="M312.697,1778.264c-1.514-0.272-3.24-0.963-4.749-1.264c-1.507-0.301-0.88-1.342-1.761-1.951
-		c-0.452-0.312-1.152-0.217-1.466,0.235l-16.342,23.81l2.614,1.906h2v-2h2v-2h2v-2h2v-2h2v-2h2v-2h2v-2h2v-2c0,0,3.1,0,4,0
-		c0.899,0,1.555-0.167,1.75-0.758s0.873-2.59,1.069-3.165C314.094,1780.071,314.273,1778.658,312.697,1778.264z M291.139,1797.614
-		c0.425-0.079,0.831,0.202,0.909,0.628c0.078,0.425-0.203,0.831-0.628,0.908c-0.425,0.078-0.831-0.203-0.908-0.629
-		C290.433,1798.098,290.714,1797.689,291.139,1797.614z M311.662,1781c-0.117,0.337-0.853,1.904-0.853,1.904l-7.987-1.229
-		l1.748-2.559c0.312-0.451,0.636-0.702,1.175-0.592l5.35,1.452C311.632,1780.087,311.779,1780.66,311.662,1781z"/>
-</g>
-<g id="classic_x5F_hammer">
-	<path fill="#FFFFFF" d="M260.08,1784.518l-5.914,5.912l0.727,0.729l-9.233,10.564l-4.2-4.199l10.564-9.234l0.728,0.728l5.913-5.913
-		L260.08,1784.518z M259.062,1776.641l-3.009,2.829l8.984,9.185l0.946-0.707v-4.243L259.062,1776.641z"/>
-</g>
-<g id="claw_x5F_hammer">
-	<path fill="#FFFFFF" d="M211.157,1784.43l-6.011,6.011l0.728,0.727l-9.234,10.566l-4.2-4.2l10.565-9.234l0.727,0.729l6.012-6.011
-		L211.157,1784.43z M216.106,1783.015c-2.137-2.137-4.243-4.241-4.243-4.241h-1.413l-1.415,1.414v1.413l3.182,3.184
-		c0,0,1.125,0.996,2.475-0.354c3.536,3.536,3.89,6.719,3.89,6.719l0.354,0.354C218.935,1791.5,219.642,1786.551,216.106,1783.015z
-		 M208.682,1779.833l1.415-1.414v-1.415L209,1776l-2.828,2.829l1.096,1.004H208.682z"/>
-</g>
-<g id="nails">
-	<path fill="#FFFFFF" d="M169.96,1789.078l-0.707,0.707l-2.828-1.415l-12.229,12.228l-2.842,1.402l1.428-2.816l12.228-12.228
-		l-1.414-2.828l0.707-0.707L169.96,1789.078z M155.847,1776.85l-0.5,0.865l2.098,2.366l-8.792,14.864l-0.648,3.09l2.382-2.09
-		l8.792-14.864l3.098,0.634l0.5-0.865L155.847,1776.85z"/>
-</g>
-<g id="spray">
-	<path fill="#FFFFFF" d="M112,1784h-11l3-2h5L112,1784z M121.5,1784.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S121.5,1785.092,121.5,1784.706z M119.5,1783.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S119.5,1784.092,119.5,1783.706z M121.5,1782.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S121.5,1783.092,121.5,1782.706z M117.5,1782.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S117.5,1783.092,117.5,1782.706z M119.5,1781.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S119.5,1782.092,119.5,1781.706z M115.5,1781.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S115.5,1782.092,115.5,1781.706z M121.5,1780.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S121.5,1781.092,121.5,1780.706z M117.5,1780.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S117.5,1781.092,117.5,1780.706z M113.5,1780.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S113.5,1781.092,113.5,1780.706z M119.5,1779.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S119.5,1780.092,119.5,1779.706z M115.5,1779.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S115.5,1780.092,115.5,1779.706z M111.5,1779.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S111.5,1780.092,111.5,1779.706z M121.5,1778.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S121.5,1779.092,121.5,1778.706z M117.5,1778.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S117.5,1779.092,117.5,1778.706z M113.5,1778.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S113.5,1779.092,113.5,1778.706z M119.5,1777.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S119.5,1778.092,119.5,1777.706z M115.5,1777.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S115.5,1778.092,115.5,1777.706z M121.5,1776.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S121.5,1777.092,121.5,1776.706z M117.5,1776.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S117.5,1777.092,117.5,1776.706z M119.5,1775.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S119.5,1776.092,119.5,1775.706z M121.5,1774.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7
-		s0.314,0.7,0.7,0.7S121.5,1775.092,121.5,1774.706z M108,1779.949c0-0.549-0.45-0.949-1-0.949h-1c-0.55,0-1,0.4-1,0.949
-		c0,0.035,0,1.051,0,1.051h3C108,1781,108,1779.984,108,1779.949z M113,1785v15c0,0.55-0.45,1-1,1h-11c-0.55,0-1-0.45-1-1v-15H113z
-		 M101.5,1786H101v13.5h0.5V1786z"/>
-</g>
-<g id="global">
-	<path fill="#FFFFFF" d="M62,1777c-6.627,0-12,5.373-12,12s5.373,12,12,12s12-5.373,12-12S68.627,1777,62,1777z M58.129,1780.116
-		c-0.665,0.731-1.359,1.698-1.925,2.939h-1.833C55.355,1781.79,56.643,1780.771,58.129,1780.116z M53.217,1784.957h2.304
-		c-0.251,0.918-0.417,1.954-0.48,3.1h-2.664C52.48,1786.959,52.775,1785.918,53.217,1784.957z M53.236,1793.057
-		c-0.446-0.96-0.749-2.001-0.858-3.1h2.662c0.063,1.146,0.229,2.182,0.48,3.1H53.236z M54.401,1794.957h1.804
-		c0.549,1.204,1.218,2.146,1.864,2.87C56.624,1797.179,55.369,1796.188,54.401,1794.957z M61.05,1798.054
-		c-0.541-0.34-1.814-1.282-2.828-3.097h2.828V1798.054z M61.05,1793.057h-3.646c-0.287-0.893-0.492-1.921-0.565-3.1h4.211V1793.057
-		L61.05,1793.057z M61.05,1788.057h-4.211c0.073-1.179,0.278-2.207,0.565-3.1h3.646V1788.057z M61.05,1783.057h-2.828
-		c1.014-1.812,2.287-2.757,2.828-3.097V1783.057z M70.823,1784.957c0.441,0.961,0.736,2.002,0.843,3.1h-2.704
-		c-0.064-1.146-0.23-2.182-0.481-3.1H70.823z M69.669,1783.057h-1.873c-0.574-1.259-1.279-2.236-1.953-2.974
-		C67.358,1780.736,68.669,1781.77,69.669,1783.057z M62.95,1779.96c0.541,0.34,1.813,1.283,2.827,3.097H62.95V1779.96z
-		 M62.95,1784.957h3.645c0.288,0.893,0.493,1.921,0.566,3.1H62.95V1784.957z M62.95,1789.957h4.211
-		c-0.073,1.179-0.278,2.207-0.566,3.1H62.95V1789.957z M62.95,1798.055v-3.098h2.827
-		C64.764,1796.771,63.488,1797.716,62.95,1798.055z M65.902,1797.86c0.656-0.729,1.337-1.683,1.895-2.903h1.843
-		C68.656,1796.208,67.376,1797.213,65.902,1797.86z M70.804,1793.057H68.48c0.251-0.918,0.417-1.953,0.481-3.1h2.702
-		C71.553,1791.056,71.251,1792.097,70.804,1793.057z"/>
-</g>
-<g id="globe_x5F_af">
-	<path fill="#FFFFFF" d="M14,1777.417c-4.515,0-8.713,2.715-10.567,6.831c-1.877,4.17-1.068,9.191,2.015,12.564
-		c3.081,3.369,7.993,4.63,12.315,3.146c4.246-1.457,7.34-5.373,7.767-9.843C26.171,1783.404,20.747,1777.417,14,1777.417z
-		 M9.809,1782.441c0.319-0.931,2.039,0.542,1.117,1.35c-0.221,0.194-1.419,0.162-1.165-0.117c0.102-0.11,0.258-0.111,0.359-0.252
-		C10.383,1783.058,9.973,1782.729,9.809,1782.441z M17.977,1795.363c-0.031,0.369-0.289,1.285-0.792,1.285
-		c-0.365,0-0.36-0.515-0.324-0.765c0.135-0.894,0.515-1.061,1-1.73C18.197,1794.438,18.008,1794.989,17.977,1795.363z
-		 M19.123,1788.993c-0.439,0.469-1.096,1.211-1.814,1.208c-0.489-0.002-0.536-1.513-1.126-1.793c-0.3-0.143-0.718,0.196-0.477,0.49
-		c0.264,0.318,0.261,0.751,0.598,1.026c0.583,0.479,1.105,1.027,1.867,0.441c-0.077,0.894-0.754,1.399-1.279,2.045
-		c-0.295,0.363-0.531,0.771-0.436,1.255c0.08,0.408,0.374,0.961,0.045,1.334c-0.217,0.247-0.706,0.385-0.725,0.773
-		c0.056,0.146,0.077,0.296,0.065,0.449c-0.104,0.215-0.327,0.356-0.442,0.577c-0.219,0.422-0.675,1.242-1.165,1.401
-		c-0.239,0.078-0.856,0.282-1.045,0.045c-0.499-0.628-0.325-2.09-0.617-2.824c-0.192-0.484,0.171-0.724,0.178-1.176
-		c0.005-0.346-0.233-0.637-0.396-0.922c-0.208-0.365-0.165-0.61-0.149-1.007c0.013-0.376-0.351-0.189-0.555-0.309
-		c-0.229-0.133-0.254-0.431-0.579-0.228c-0.279,0.172-1.142,0.316-1.462,0.262c-0.464-0.08-1.027-1.08-1.146-1.495
-		c-0.109-0.389,0.187-0.762,0.078-1.088c-0.115-0.343-0.016-0.658,0.211-0.927c0.345-0.408,0.759-1.094,1.203-1.36
-		c0.315-0.188,0.728-0.006,1.103-0.107c0.335-0.091,0.834-0.212,1.189-0.13c0.372,0.084-0.047,0.451,0.198,0.588
-		c0.287,0.157,0.494,0.299,0.765,0.471c0.277,0.176,0.381-0.319,0.582-0.368c0.243-0.059,0.576-0.094,0.823-0.044
-		c0.479,0.102,1.458-0.229,0.978-0.939c-0.169-0.25-0.624-0.322-0.88-0.43c-0.317-0.132-0.127-0.671-0.554-0.649
-		c-0.319,0.079,0.117,0.411,0.01,0.598c-0.197,0.339-0.569-0.376-0.62-0.468c-0.061-0.107-0.757-1.071-0.979-0.862
-		c-0.074,0.071,1.174,1.492,0.226,1.215c-0.003-0.375-0.39-0.413-0.594-0.662c-0.284-0.347-0.513-0.191-0.828,0.084
-		c-0.311,0.271-0.758,0.647-1.131,0.826c-0.814,0.392-0.688-0.448-0.664-0.936c0.015-0.326,0.498-0.175,0.672-0.25
-		c0.528-0.233,0.011-0.48-0.125-0.703c0.155-0.232,1.094-0.509,1.358-0.578c0.595-0.158,1.094-0.646,1.82-0.285
-		c0.095,0.045,1.007-0.524,0.356-0.687c-0.723-0.431-0.754,0.193-1.302,0.361c-0.005-0.604-1.481-0.658-0.928-1.467
-		c0.453-0.66,0.82-0.752,2.102-0.846c0.937-0.062,1.39-0.031,1.593,0.141s0.265,0.79-0.224,0.853
-		c0.092,0.807,0.937,0.062,1.259-0.146c0.531-0.341,1.656-0.131,1.808-0.253s-0.101-0.469,0.032-0.688
-		c0.125-0.207,0.44-0.103,0.482,0.108c0.574,0.092,0.846-0.334,1.454,0.071c1.841,1.226,3.268,2.99,3.994,5.846
-		c0.326,1.281,0.387,2.713,0.013,2.609c-0.251-0.069-0.13-0.629-0.297-0.789c-0.433,0.102-1.163,0.822-1.352,1.221
-		c-0.118,0.249,0.115,1.214-0.402,1.214c-0.209,0-0.312-0.771-0.343-0.9c-0.089-0.38-0.158-0.782-0.324-1.139
-		c-0.188-0.406-0.36-0.149-0.659-0.209c-0.384-0.075-0.295-0.591-0.837-0.637C19.232,1788.166,19.058,1788.562,19.123,1788.993z"/>
-</g>
-<g id="collapse_x5F_top">
-	<path fill="#FFFFFF" d="M440,1751h11c2.204,0,4-1.794,4-4v-11c0-2.206-1.796-4-4-4h-11c-2.205,0-4,1.794-4,4v11
-		C436,1749.206,437.795,1751,440,1751z M438,1735c0-0.55,0.449-1,1-1h13c0.55,0,1,0.45,1,1v13c0,0.55-0.45,1-1,1h-13
-		c-0.551,0-1-0.45-1-1V1735z M441.5,1744c-0.551,0-0.733-0.576-0.408-1.02l3.815-5.3c0.325-0.441,0.858-0.496,1.185-0.053
-		l3.815,5.379c0.325,0.442,0.143,0.992-0.407,0.992L441.5,1744L441.5,1744z"/>
-</g>
-<g id="collapse">
-	<path fill="#FFFFFF" d="M388,1736v11c0,2.205,1.794,4,4,4h11c2.206,0,4-1.795,4-4v-11c0-2.205-1.794-4-4-4h-11
-		C389.794,1732,388,1733.795,388,1736z M404,1734c0.55,0,1,0.45,1,1v13c0,0.55-0.45,1-1,1h-13c-0.55,0-1-0.45-1-1v-13
-		c0-0.55,0.45-1,1-1H404z M395,1737.5c0-0.55,0.576-0.733,1.019-0.408l5.3,3.816c0.442,0.325,0.496,0.857,0.054,1.184l-5.379,3.816
-		c-0.442,0.325-0.992,0.142-0.992-0.408L395,1737.5L395,1737.5z"/>
-</g>
-<g id="expand">
-	<path fill="#FFFFFF" d="M355,1732h-11c-2.205,0-4,1.794-4,4v11c0,2.206,1.795,4,4,4h11c2.205,0,4-1.794,4-4v-11
-		C359,1733.794,357.205,1732,355,1732z M357,1748c0,0.55-0.45,1-1,1h-13c-0.55,0-1-0.45-1-1v-13c0-0.55,0.45-1,1-1h13
-		c0.55,0,1,0.45,1,1V1748z M353.5,1739c0.55,0,0.732,0.576,0.408,1.02l-3.816,5.3c-0.325,0.441-0.858,0.496-1.184,0.053
-		l-3.816-5.379c-0.325-0.442-0.142-0.992,0.408-0.992L353.5,1739L353.5,1739z"/>
-</g>
-<g id="security_x5F_camera_1_">
-	<path id="security_x5F_camera" fill="#FFFFFF" d="M299,1729h8c0,1.861-1.278,3.412-3,3.858v4.486l-2,1.062v-5.548
-		C300.278,1732.412,299,1730.861,299,1729z M309.856,1735.471l-18.747,10.402l0.402,0.732l8.112,3.438l13.982-8.073
-		L309.856,1735.471z M313.981,1742.633l-13.93,8.107l0.698,1.188l13.929-8.106L313.981,1742.633z M291.172,1749.208l2,3.464
-		l4.219-2.188l-4.675-2.092L291.172,1749.208z"/>
-</g>
-<g id="restart">
-	<path fill="#FFFFFF" d="M259.63,1730.414c0.665,0.354,1.291,0.772,1.874,1.244l-2.133,2.132c-0.286-0.215-0.583-0.413-0.895-0.593
-		L259.63,1730.414z M246.035,1732.043l2.113,2.115c0.501-0.431,1.047-0.807,1.635-1.118l-1.146-2.765
-		C247.692,1730.751,246.819,1731.346,246.035,1732.043z M263.34,1733.496l-2.134,2.135c0.151,0.205,0.297,0.416,0.432,0.635
-		l2.795-1.156C264.11,1734.541,263.746,1734.002,263.34,1733.496z M255,1732.05c0.464,0.052,0.914,0.146,1.354,0.265l1.153-2.786
-		c-0.803-0.246-1.644-0.404-2.507-0.478V1732.05L255,1732.05z M251.354,1732.387c0.529-0.162,1.08-0.274,1.646-0.338v-2.998
-		c-0.968,0.079-1.902,0.273-2.792,0.57L251.354,1732.387z M264.361,1746.035l-6.835,0.002c-0.275-0.006-0.37,0.174-0.21,0.396
-		l1.513,2.12c-1.495,0.961-2.828,1.424-4.828,1.432v0.008c-5-0.001-9.005-4.03-9.003-9.001c0-2.231,0.817-4.271,2.162-5.842
-		l-2.115-2.115c-1.889,2.12-3.047,4.904-3.047,7.963c0,6.615,5.003,11.994,12.003,11.994v-0.002c2-0.006,4.512-0.644,6.529-1.961
-		l0.059-0.039l1.477,2.046c0.162,0.224,0.362,0.188,0.443-0.073l2.206-6.438C264.796,1746.259,264.637,1746.041,264.361,1746.035z
-		 M262.749,1738.729c0.038,0.161,0.07,0.271,0.101,0.271h3.028c-0.074,0-0.188-1.001-0.336-1.535L262.749,1738.729z"/>
-</g>
-<g id="cloud_x5F_download">
-	<g>
-		<path fill="#FFFFFF" d="M201.173,1746.001L204,1746v-6.616c0-0.274,0.132-0.384,0.407-0.384l3.202,0.001
-			c0.275,0,0.391,0.108,0.391,0.384v6.616h2.85c0.148,0,0.195,0.143,0.104,0.26l-4.793,5.667c-0.052,0.065-0.119,0.088-0.187,0.088
-			c-0.053,0-0.104-0.029-0.144-0.083l-4.765-5.681C200.977,1746.134,201.025,1746.001,201.173,1746.001z M214.339,1737.969
-			c0-0.011,0.002-0.02,0.002-0.029c0-3.805-3.009-6.889-6.719-6.889c-3.001,0-5.543,2.02-6.404,4.804
-			c-0.332-0.07-0.676-0.108-1.028-0.108c-2.773,0-5.023,2.593-5.023,5.438c0,0.18,0.009-0.184,0.025,0.816c-0.007,0-0.015,0-0.021,0
-			c-1.641,0-2.968,1.346-2.968,3.025c0,1.493,0.949,2.975,2.432,2.975c0.479,0,2.896,0,5.942,0l-0.658-0.784l-0.021-0.024
-			l-0.02-0.024c-0.396-0.517-0.469-1.188-0.189-1.755c0.276-0.562,0.846-0.91,1.484-0.91h1.376v-5.116
-			c0-1.074,0.819-1.884,1.972-1.884h3c1.146,0,1.979,0.792,1.979,1.884v5.116h1.35c0.639,0,1.208,0.351,1.484,0.914
-			c0.279,0.571,0.206,1.248-0.194,1.765l-0.02,0.025l-0.021,0.023l-0.652,0.771c2.7,0,4.629,0,4.629,0
-			c1.719-1,2.925-2.777,2.925-4.818C219,1740.506,216.927,1738.062,214.339,1737.969z"/>
-	</g>
-</g>
-<g id="cloud_x5F_upload">
-	<g>
-		<path fill="#FFFFFF" d="M154.098,1743.733l4.734-5.701c0.04-0.054,0.091-0.083,0.144-0.083c0.066,0,0.135,0.021,0.187,0.088
-			l4.793,5.667c0.091,0.117,0.044,0.26-0.104,0.26H161v6.616c0,0.275-0.115,0.384-0.391,0.384l-3.202,0.036
-			c-0.275,0-0.407-0.108-0.407-0.384V1744l-2.797-0.016C154.055,1743.984,154.007,1743.852,154.098,1743.733z M167.339,1737.918
-			c0-0.011,0.002-0.02,0.002-0.029c0-3.805-3.009-6.889-6.719-6.889c-3.001,0-5.543,2.019-6.404,4.804
-			c-0.332-0.071-0.676-0.108-1.028-0.108c-2.773,0-5.023,2.593-5.023,5.438c0,0.179,0.009-0.184,0.025,0.816
-			c-0.007,0-0.015,0-0.021,0c-1.641,0-2.968,1.346-2.968,3.024c0,1.494,0.949,2.976,2.432,2.976c0.572,0,4.499,0,8.366,0v-2.387
-			h-1.827c-0.677,0-1.281-0.369-1.574-0.965c-0.296-0.602-0.22-1.313,0.2-1.859l0.021-0.027l0.022-0.026l4.75-5.663
-			c0.345-0.428,0.846-0.672,1.384-0.672c0.557,0,1.07,0.242,1.419,0.668l4.781,5.653l0.022,0.026l0.021,0.025
-			c0.423,0.547,0.502,1.264,0.205,1.87c-0.293,0.599-0.896,0.97-1.574,0.97H162v2.387c3.625,0,7.075,0,7.075,0
-			c1.719-1,2.925-2.777,2.925-4.818C172,1740.455,169.927,1738.011,167.339,1737.918z"/>
-	</g>
-</g>
-<g id="smoking">
-	<path fill="#FFFFFF" d="M119.05,1738.984l-3.535-3.535l4.45-4.449l3.536,3.535L119.05,1738.984z M100.986,1749.979
-		c-1.755,2.028,1.507,5.291,3.535,3.535L100.986,1749.979z M118.1,1739.936l-3.536-3.535l-12.582,12.583l3.535,3.534L118.1,1739.936
-		z M100.282,1747.662c0.443-0.074-0.517-1.625-1.048-3.016c-1.16-3.039,1.145-4.252-0.597-7.642
-		c-0.636-1.237-1.323-2.305-1.767-2.188c-0.337,0.088,0.621,2.376,0.174,4.043c-1.111,4.146-0.629,5.59,1.66,7.903
-		C98.907,1746.969,99.837,1747.736,100.282,1747.662z M97.821,1732.359c0.482,2.216,1.719,2.53,2.297,4.525
-		s-0.018,4.346,0.278,4.354c0.51,0.014,1.646-1.895,1.394-4.957c-0.168-2.041-1.135-2.896-1.852-4.792
-		c-0.716-1.896-0.511-4.454-0.896-4.14S97.338,1730.145,97.821,1732.359z"/>
-</g>
-<g id="crown">
-	<path fill="#FFFFFF" d="M69.5,1749h-15c-0.275,0-0.5,0.225-0.5,0.5v3.5h16v-3.5C70,1749.225,69.775,1749,69.5,1749z M55.808,1752
-		H55v-2h0.808V1752z"/>
-	<path fill="#FFFFFF" d="M73,1733.066c-1.067,0-1.935,0.866-1.935,1.934c0,0.479,0.181,0.909,0.468,1.246L65.5,1741.5l-2.958-9.652
-		c0.802-0.235,1.392-0.969,1.392-1.848c0-1.066-0.866-1.934-1.934-1.934c-1.068,0-1.935,0.866-1.935,1.934
-		c0,0.869,0.577,1.596,1.366,1.839l-2.854,9.661l-6.135-5.226c0.303-0.341,0.49-0.783,0.49-1.274c0-1.066-0.866-1.934-1.934-1.934
-		c-1.068,0-1.935,0.866-1.935,1.934c0,1.068,0.866,1.934,1.935,1.934c0.153,0,0.302-0.021,0.444-0.057L54,1746.5v1
-		c0,0.275,0.225,0.5,0.5,0.5h15c0.274,0,0.5-0.225,0.5-0.5v-1l2.485-9.645c0.165,0.046,0.334,0.077,0.515,0.077
-		c1.066,0,1.934-0.864,1.934-1.934C74.934,1733.934,74.067,1733.066,73,1733.066z M55.808,1747H55v-0.631l-2.266-8.532l1.043,0.89
-		l2.029,7.644L55.808,1747L55.808,1747z M59.908,1743.259l-0.646-0.55l2.73-9.239l0.41,1.343L59.908,1743.259z M70.958,1738.928
-		l-5.156,4.489l-0.17-0.706l5.56-4.842L70.958,1738.928z"/>
-</g>
-<g id="bug">
-	<path fill="#FFFFFF" d="M25,1751c0,0.553-0.448,1-1,1h-2.414l-2-2H18.51c-0.883,1.695-2.284,3-4.51,3c-2.227,0-3.627-1.305-4.511-3
-		H8.414l-2,2H4c-0.553,0-1-0.447-1-1s0.447-1,1-1h1.586l2-2h1.12c-0.302-1.037-0.477-2.088-0.576-3H5.518l-2.199-2.235
-		c-0.387-0.394-0.382-1.025,0.013-1.413c0.394-0.387,1.026-0.383,1.414,0.012L6.355,1743H8c-0.008-0.402,0-0.643,0-0.643
-		c0-0.756,0.106-1.463,0.299-2.115c-0.054-0.035-0.113-0.059-0.161-0.104L6,1738.097v-3.52l-0.845-0.874
-		c-0.383-0.397-0.371-1.03,0.025-1.414c0.397-0.383,1.031-0.372,1.414,0.025L8,1733.771v3.471l1.189,1.137
-		c1.097-1.574,2.845-2.521,4.811-2.521c1.94,0,3.67,0.924,4.769,2.463l1.231-1.1v-3.434l1.319-1.451
-		c0.372-0.407,1.006-0.438,1.413-0.067c0.409,0.372,0.438,1.005,0.067,1.413l-0.8,0.879v3.558l-2.292,2.045
-		c-0.008,0.008-0.02,0.01-0.028,0.017c0.205,0.67,0.32,1.398,0.32,2.18c0,0,0.008,0.239,0,0.643h1.586l1.644-1.645
-		c0.392-0.391,1.023-0.391,1.414,0c0.392,0.392,0.392,1.023,0,1.414L22.414,1745H19.87c-0.102,0.912-0.275,1.963-0.576,3h1.12l2,2
-		H24C24.552,1750,25,1750.447,25,1751z M17,1735.248v-0.239c0-0.898-0.416-1.701-1.051-2.252l0.921-1.011
-		c0.084-0.092,0.13-0.212,0.13-0.337V1730c0-0.276-0.225-0.5-0.5-0.5c-0.276,0-0.5,0.224-0.5,0.5v1.216l-0.917,1.007
-		c-0.338-0.134-0.702-0.214-1.083-0.214s-0.744,0.08-1.083,0.214L12,1731.216V1730c0-0.276-0.225-0.5-0.5-0.5
-		c-0.276,0-0.5,0.224-0.5,0.5v1.409c0,0.125,0.046,0.245,0.13,0.337l0.921,1.011c-0.635,0.552-1.051,1.354-1.051,2.252v0.239
-		c0.917-0.439,1.93-0.689,3-0.689C15.07,1734.559,16.083,1734.809,17,1735.248z"/>
-</g>
-<g id="file_x5F_export">
-	<path fill="#FFFFFF" d="M452,1698h-7.65c-0.282,0-0.35-0.104-0.35-0.384c0,0,0-2.716,0-3.111c0-0.395,0.125-0.505,0.35-0.505H452
-		v-2.779c0-0.147,0.165-0.195,0.282-0.104l5.713,4.764c0.054,0.04,0.079,0.091,0.079,0.145c0,0.065-0.03,0.135-0.097,0.186
-		l-5.685,4.793c-0.117,0.091-0.295,0.044-0.295-0.104V1698H452z M453.196,1702.071c-0.327,0.255-0.479,0.376-0.835,0.376
-		c-0.86,0-1.36-0.695-1.36-1.551V1699h-6.65c-1.047,0-1.35-0.316-1.35-1.384v-3.329c0-1.051,0.604-1.287,1.35-1.287s6.65,0,6.65,0
-		v-1.779c0-0.854,0.496-1.552,1.354-1.552c0.354,0,0.605,0.121,0.887,0.34l1.761,1.55V1688h-6.5c-0.275,0-0.5-0.225-0.5-0.5v-6.5
-		h-11.5c-0.275,0-0.5,0.225-0.5,0.5v23c0,0.275,0.225,0.5,0.5,0.5h18c0.274,0,0.5-0.225,0.5-0.5v-3.949L453.196,1702.071z
-		 M449.5,1687h5.5l-6-6v5.5C449,1686.775,449.225,1687,449.5,1687z"/>
-</g>
-<g id="file_x5F_import">
-	<path fill="#FFFFFF" d="M403,1686.5v-5.5l6,6h-5.5C403.225,1687,403,1686.775,403,1686.5z M402.5,1688c-0.275,0-0.5-0.225-0.5-0.5
-		v-6.5h-11.5c-0.275,0-0.5,0.225-0.5,0.5v11.5h4v-1.779c0-0.973,0.516-1.65,1.396-1.65c0.353,0,0.589,0.106,0.913,0.356l5.711,4.799
-		c0.37,0.278,0.583,0.767,0.583,1.298c0,0.528-0.26,1.027-0.7,1.37l-5.521,4.755c-0.366,0.285-0.612,0.399-0.979,0.399
-		c-0.885,0-1.403-0.679-1.403-1.651V1699h-4v5.5c0,0.275,0.225,0.5,0.5,0.5h18c0.274,0,0.5-0.225,0.5-0.5V1688H402.5z M395,1700.896
-		c0,0.147,0.177,0.194,0.294,0.104l5.685-4.793c0.065-0.051,0.098-0.119,0.098-0.186c0-0.054-0.026-0.104-0.079-0.145l-5.713-4.764
-		c-0.117-0.092-0.283-0.043-0.283,0.104V1694h-7.65c-0.35,0-0.35,0.244-0.35,0.505s0,3.111,0,3.111c0,0.28,0.066,0.384,0.35,0.384
-		H395V1700.896z"/>
-</g>
-<g id="suitcase">
-	<path fill="#FFFFFF" d="M359,1686h-4v-1c0-1.654-1.347-3-3-3h-4c-1.654,0-3,1.346-3,3v1h-4c-1.65,0-3,1.35-3,3v12
-		c0,1.65,1.35,3,3,3h18c1.649,0,3-1.35,3-3v-12C362,1687.35,360.65,1686,359,1686z M342.5,1702h-2c-0.275,0-0.5-0.225-0.5-0.5v-2
-		c0-0.275,0.159-0.341,0.354-0.146l2.293,2.293C342.841,1701.841,342.775,1702,342.5,1702z M342.646,1688.354l-2.293,2.293
-		c-0.193,0.194-0.354,0.13-0.354-0.146v-2c0-0.275,0.225-0.5,0.5-0.5h2C342.775,1688,342.841,1688.159,342.646,1688.354z M353,1686
-		h-6v-1c0-0.552,0.449-1,1-1h4c0.551,0,1,0.448,1,1V1686z M360,1701.5c0,0.275-0.226,0.5-0.5,0.5h-2
-		c-0.275,0-0.341-0.159-0.146-0.354l2.293-2.293c0.194-0.194,0.354-0.13,0.354,0.146L360,1701.5L360,1701.5z M360,1690.5
-		c0,0.275-0.159,0.341-0.354,0.146l-2.293-2.293c-0.193-0.194-0.129-0.354,0.146-0.354h2c0.274,0,0.5,0.225,0.5,0.5L360,1690.5
-		L360,1690.5z"/>
-	<path opacity="0.3" fill="#FFFFFF" enable-background="new    " d="M340.354,1690.646c-0.193,0.193-0.354,0.129-0.354-0.146v-2
-		c0-0.275,0.225-0.5,0.5-0.5h2c0.274,0,0.341,0.159,0.146,0.354L340.354,1690.646z M340.354,1699.354
-		c-0.193-0.193-0.354-0.129-0.354,0.146v2c0,0.275,0.225,0.5,0.5,0.5h2c0.274,0,0.341-0.159,0.146-0.354L340.354,1699.354z
-		 M359.646,1690.646c0.194,0.193,0.354,0.129,0.354-0.146v-2c0-0.275-0.226-0.5-0.5-0.5h-2c-0.275,0-0.341,0.159-0.146,0.354
-		L359.646,1690.646z M357.354,1701.646c-0.193,0.193-0.129,0.354,0.146,0.354h2c0.274,0,0.5-0.225,0.5-0.5v-2
-		c0-0.275-0.159-0.341-0.354-0.146L357.354,1701.646z"/>
-</g>
-<g id="dumbbell">
-	<path fill="#FFFFFF" d="M315,1693v-1h-2v-3c0-0.553-0.448-1-1-1h-1c-0.553,0-1,0.447-1,1v-2c0-0.55-0.45-1-1-1h-1
-		c-0.55,0-1,0.45-1,1v5h-10v-5c0-0.55-0.45-1-1-1h-1c-0.55,0-1,0.45-1,1v2c0-0.553-0.448-1-1-1h-1c-0.553,0-1,0.447-1,1v3h-2v1h2
-		v0.5h-2v2.5h2v3c0,0.553,0.447,1,1,1h1c0.552,0,1-0.447,1-1v2c0,0.55,0.45,1,1,1h1c0.55,0,1-0.45,1-1v-5h10v5c0,0.55,0.45,1,1,1h1
-		c0.55,0,1-0.45,1-1v-2c0,0.553,0.447,1,1,1h1c0.552,0,1-0.447,1-1v-3h2v-2.5h-2v-0.5H315z M293,1689.5h-1v-0.5h1V1689.5z
-		 M296,1687.5h-1v-0.5h1V1687.5z M309,1687.5h-1v-0.5h1V1687.5z M312,1689.5h-1v-0.5h1V1689.5z"/>
-</g>
-<g id="bullhorn">
-	<path fill="#FFFFFF" d="M265,1682c-0.55,0-1,0.45-1,1v17c0,0.55,0.45,1,1,1s1-0.45,1-1v-17C266,1682.45,265.55,1682,265,1682z"/>
-	<path fill="#FFFFFF" d="M241,1691v1c0,1.104,0.896,2,2,2v-5C241.896,1689,241,1689.896,241,1691z"/>
-	<path fill="#FFFFFF" d="M245,1688c-0.55,0-1,0.45-1,1v5c0,0.286,0.125,0.541,0.318,0.723l1.165,6.294
-		c0.101,0.541,0.633,0.983,1.183,0.983h1.668c0.55,0,0.931-0.444,0.847-0.988l-0.935-6.012H249l14,5v-17l-14,5H245z M262,1684.419
-		v0.784l-12.826,4.581V1689L262,1684.419z"/>
-</g>
-<g id="vases">
-	<path fill="#FFFFFF" d="M217.929,1699.928C217.929,1696,214,1695,214,1694s1-2,1-2h-6c0,0,1,1,1,2s-4,1.855-4,5.928
-		c0,4.073,3.538,4.072,3.538,4.072H208v0.542V1705h8v-0.458V1704h-1.473C214.528,1704,217.929,1703.855,217.929,1699.928z
-		 M210.099,1696.287c-1.101,0.791-2.349,1.688-2.349,3.641c0,1.092,0.338,1.711,0.747,2.072h-0.918
-		c-0.333-0.453-0.578-1.104-0.578-2.072c0-2.21,1.418-3.229,2.557-4.047c0.395-0.283,0.772-0.559,1.044-0.881h0.862
-		C211.143,1695.531,210.602,1695.926,210.099,1696.287z"/>
-	<path fill="#FFFFFF" d="M202,1703c0-2,3.929-7,3.929-12s-2.929-5-2.929-7c0-1.697,1-3,1-3h-8c0,0,1,1.303,1,3c0,2-3,2-3,7
-		s4,10,4,12c0,0.5-0.125,0.812-0.312,1H196v1h8v-1h-1.688C202.125,1703.812,202,1703.5,202,1703z M197.562,1699.059
-		c-1.142-2.328-2.562-5.228-2.562-8.059c0-2.664,0.916-3.59,1.724-4.441c0.178-0.188,0.361-0.559,0.533-0.559h0.874
-		c-0.247,0-0.532,0.627-0.793,0.902c-0.78,0.821-1.586,1.651-1.586,4.116c0,2.716,1.392,5.546,2.512,7.83
-		c0.4,0.816,0.738,1.511,0.996,2.15h-0.794C198.226,1700.427,197.92,1699.789,197.562,1699.059z"/>
-</g>
-<g id="nameplate_x5F_alt">
-	<g>
-		<path fill="#FFFFFF" d="M170,1697v-1v-12c0-1.1-0.9-2-2-2h-20c-1.101,0-2,0.9-2,2v12v1H170z M160,1686h7v1h-7V1686z M160,1688h7v1
-			h-7V1688z M160,1690h7v1h-7V1690z M160,1692h7v1h-7V1692z M160,1694h5v1h-5V1694z M149,1686.9c0-0.498,0.446-0.9,1-0.9h7
-			c0.553,0,1,0.402,1,0.9v7.198c0,0.498-0.447,0.9-1,0.9h-7c-0.554,0-1-0.402-1-0.9V1686.9z"/>
-		<path fill="#FFFFFF" d="M146,1698v4c0,1.1,0.899,2,2,2h4v-2h-1.5c-0.275,0-0.5-0.225-0.5-0.5v-1c0-0.275,0.225-0.5,0.5-0.5h4
-			c0.274,0,0.5,0.225,0.5,0.5v1c0,0.275-0.226,0.5-0.5,0.5H153v2h10v-2h-1.5c-0.275,0-0.5-0.225-0.5-0.5v-1
-			c0-0.275,0.225-0.5,0.5-0.5h4c0.274,0,0.5,0.225,0.5,0.5v1c0,0.275-0.226,0.5-0.5,0.5H164v2h4c1.1,0,2-0.9,2-2v-4H146z"/>
-		<path fill="#FFFFFF" d="M150.465,1692.143c0-0.281,0.053-0.396,0.269-0.521c0.174-0.101,1.649-0.577,2.196-0.812v-0.558
-			c-0.289-0.077-0.616-0.529-0.616-0.818c0-0.671,0-1.226,0-1.226c0-0.663,0.433-1.205,1.231-1.209
-			c0.8,0.004,1.231,0.546,1.231,1.209c0,0,0,0.555,0,1.226c0,0.289-0.326,0.741-0.615,0.818v0.558
-			c0.547,0.234,2.022,0.712,2.195,0.812c0.215,0.123,0.269,0.238,0.269,0.521c0,0.115,0,0.634,0,0.634
-			c0,0.072-0.062,0.134-0.134,0.134h-2.946H150.6c-0.074,0-0.135-0.062-0.135-0.134
-			C150.465,1692.775,150.465,1692.258,150.465,1692.143z"/>
-	</g>
-	<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M170,1698h-24v-1h24V1698z"/>
-</g>
-<g id="nameplate">
-	<path fill="#FFFFFF" d="M120,1685h-4.002c0,0.008,0.002,0.014,0.002,0.021V1686c0,1.27-0.741,2-2.021,2h-7.957
-		c-1.279,0-2.021-0.73-2.021-2v-0.979c0-0.009,0.001-0.015,0.002-0.021H100c-1.104,0-2,0.896-2,2v14c0,1.104,0.896,2,2,2h20
-		c1.104,0,2-0.896,2-2v-14C122,1685.896,121.104,1685,120,1685z M110,1699.1c0,0.498-0.447,0.9-1,0.9h-7c-0.554,0-1-0.402-1-0.9
-		v-7.198c0-0.498,0.446-0.9,1-0.9h7c0.553,0,1,0.402,1,0.9V1699.1z M117,1700h-5v-1h5V1700z M119,1698h-7v-1h7V1698z M119,1696h-7
-		v-1h7V1696z M119,1694h-7v-1h7V1694z M119,1692h-7v-1h7V1692z"/>
-	<path fill="#FFFFFF" d="M106.021,1687h7.957c0.551,0,1.021-0.45,1.021-1v-0.979c0-0.551-0.472-1.021-1.021-1.021H112v-0.916
-		c0-0.55-0.45-1.084-1-1.084h-2c-0.55,0-1,0.534-1,1.084V1684h-1.979c-0.551,0-1.021,0.472-1.021,1.021V1686
-		C105,1686.55,105.471,1687,106.021,1687z"/>
-	<path fill="#FFFFFF" d="M102.412,1697.138c0-0.282,0.053-0.396,0.269-0.521c0.173-0.101,1.649-0.577,2.196-0.812v-0.558
-		c-0.289-0.077-0.616-0.529-0.616-0.818c0-0.671,0-1.226,0-1.226c0-0.663,0.432-1.205,1.231-1.209
-		c0.8,0.004,1.231,0.546,1.231,1.209c0,0,0,0.555,0,1.226c0,0.289-0.327,0.741-0.616,0.818v0.558
-		c0.547,0.234,2.023,0.712,2.196,0.812c0.215,0.123,0.268,0.238,0.268,0.521c0,0.115,0,0.634,0,0.634
-		c0,0.072-0.061,0.134-0.134,0.134h-2.945h-2.945c-0.074,0-0.135-0.062-0.135-0.134
-		C102.412,1697.771,102.412,1697.253,102.412,1697.138z"/>
-</g>
-<g id="book_x5F_open">
-	<path fill="#FFFFFF" d="M73,1685.8v-1.323c0,0-2.292-1.327-5.74-1.327s-5.26,1.25-5.26,1.25s-1.812-1.25-5.261-1.25
-		c-3.447,0-5.739,1.327-5.739,1.327v1.323l-1,0.531v0.021v15.688c0,0,4.53-1.578,7-1.578c2.469,0,5,0.885,5,0.885
-		s2.532-0.885,5-0.885c0.306,0,0.643,0.024,1,0.066v4.324l1.53-2.016l1.47,2.016v-3.72c2,0.431,3,0.906,3,0.906v-15.687v-0.021
-		L73,1685.8z M61,1698.03c-1-0.292-2.584-0.679-3.98-0.679c-2.246,0-3.02,0.403-4.02,0.698v-12.417c0,0,1.125-0.699,4.02-0.699
-		c1.694,0,2.98,0.418,3.98,1.127V1698.03z M71,1698.051c-1-0.295-1.773-0.699-4.021-0.699c-1.396,0-2.98,0.388-3.979,0.68v-11.971
-		c1-0.709,2.286-1.125,3.979-1.125c2.896,0,4.021,0.698,4.021,0.698V1698.051z"/>
-</g>
-<g id="shopping_x5F_bag_1_">
-	<path id="shopping_x5F_bag" fill="#FFFFFF" d="M21.6,1684v-1c0-1.985-1.615-3.601-3.6-3.601h-3c-0.961,0-1.831,0.384-2.478,1H11
-		c-1.985,0-3.601,1.614-3.601,3.601H6l-4,4v17h19l4-4v-17H21.6z M20.4,1683v1h-2.8c0-1.586-1.038-2.921-2.464-3.399H18
-		C19.324,1680.601,20.4,1681.677,20.4,1683z M8.6,1688v-2h7.8v2H8.6z M12.6,1684v-1c0-0.523,0.173-1.005,0.459-1.399H14
-		c1.324,0,2.399,1.076,2.399,2.399H12.6z M11,1681.601h0.684c-0.182,0.432-0.283,0.903-0.283,1.399v1H8.6
-		C8.6,1682.677,9.676,1681.601,11,1681.601z M5,1687.999L7,1686H7.4v2L5,1687.999L5,1687.999z M20.5,1688h-2.9v-2h4.9L20.5,1688z"/>
-</g>
-<g id="fullscreen">
-	<path fill="#FFFFFF" d="M458,1633v7h-2v-5h-5v-2H458z M436,1640v-5h5v-2h-7v7H436z M456,1650v5h-5v2h7v-1v-6H456z M436,1650h-2v7h7
-		v-2h-5V1650z"/>
-	<path fill="#FFFFFF" d="M451.561,1641.561l2.086,2.087c0.194,0.193,0.354,0.129,0.354-0.146v-6c0-0.274-0.226-0.5-0.5-0.5h-6
-		c-0.275,0-0.342,0.159-0.146,0.354l2.086,2.086l-3.438,3.438l-3.439-3.438l2.085-2.085c0.194-0.194,0.129-0.354-0.146-0.354h-6
-		c-0.275,0-0.5,0.226-0.5,0.5v6c0,0.275,0.158,0.341,0.354,0.146l2.087-2.087l3.439,3.438l-3.44,3.44l-2.086-2.086
-		c-0.194-0.194-0.354-0.13-0.354,0.146v6c0,0.275,0.225,0.5,0.5,0.5h6c0.274,0,0.341-0.159,0.146-0.354l-2.086-2.086l3.44-3.439
-		l3.438,3.438l-2.087,2.087c-0.194,0.194-0.129,0.354,0.146,0.354h6c0.274,0,0.5-0.225,0.5-0.5v-6c0-0.275-0.159-0.341-0.354-0.146
-		l-2.085,2.084l-3.439-3.438L451.561,1641.561z"/>
-</g>
-<g id="hand_x5F_down">
-	<path opacity="0.3" fill="#FFFFFF" enable-background="new    " d="M398.726,1650.692L405,1648.9v-5.728l-1.618-3.174H403v7.328
-		c0,0-5,0.766-5,3.297c0,0.494,0,0.817,0,1.029C398,1651.208,398.296,1650.814,398.726,1650.692z"/>
-	<path fill="#FFFFFF" d="M397,1659.021c-1.491,0-3-1.116-3-3.25c0-1.877,0.009-4.904,0.015-6.908l-2.292,1.754
-		c-0.396,0.306-0.961,0.267-1.314-0.088l-1.66-1.663c-0.303-0.303-0.378-0.765-0.189-1.148l4.545-9.189
-		c0.169-0.341,0.518-0.526,0.897-0.526h10c0.379,0,0.725,0.184,0.895,0.521l2,3.983c0.069,0.14,0.105,0.276,0.105,0.433v6.717
-		c0,0.446-0.296,0.839-0.727,0.962l-6.273,1.792v3.362C400,1657.904,398.491,1659.021,397,1659.021z M395.021,1645.833
-		c0.151,0,0.305,0.034,0.444,0.104c0.342,0.168,0.535,0.681,0.534,1.062c0,0,0,6.771,0,9.771c0,0.923,0.517,0.745,1,0.745
-		c0.482,0,1,0.178,1-0.745v-5.115c0-0.446,0.296-0.839,0.726-0.962L405,1648.9v-5.728l-1.618-3.174h-8.76l-3.953,7.99l0.535,0.521
-		l3.21-2.464C394.592,1645.91,394.806,1645.833,395.021,1645.833z M393,1633v1.188v1.75V1636h0.013c0.034,0.52,0.46,1,0.987,1h11
-		c0.526,0,0.953-0.48,0.986-1H406v-0.062V1633H393z"/>
-</g>
-<g id="hand_x5F_up">
-	<path opacity="0.3" fill="#FFFFFF" enable-background="new    " d="M357,1641.037l-6.274-1.792
-		c-0.43-0.123-0.726-0.517-0.726-0.962c0,0.212,0,0.535,0,1.029c0,2.53,5,3.297,5,3.297V1650h0.342l0.121-0.162l1.537-3.074
-		V1641.037z"/>
-	<path fill="#FFFFFF" d="M356,1652h-10c-0.381,0-0.729-0.217-0.897-0.558l-4.545-9.223c-0.188-0.384-0.112-0.846,0.189-1.147
-		l1.659-1.663c0.356-0.354,0.921-0.395,1.315-0.088l2.292,1.754c-0.006-2.004-0.015-5.031-0.015-6.908c0-2.134,1.509-3.146,3-3.146
-		c1.49,0,3,1.013,3,3.146v3.362l6.273,1.792c0.431,0.123,0.727,0.516,0.727,0.962V1647c0,0.155-0.036,0.309-0.105,0.447l-2,4
-		C356.725,1651.786,356.379,1652,356,1652z M346.622,1650h8.76l1.618-3.236v-5.727l-6.274-1.792
-		c-0.43-0.123-0.726-0.517-0.726-0.962v-5.116c0-0.922-0.518-0.698-1-0.698c-0.483,0-1-0.224-1,0.698c0,2.999,0,9.833,0,9.833
-		c0.001,0.382-0.192,0.831-0.534,1c-0.341,0.171-0.749,0.132-1.052-0.102l-3.21-2.457l-0.535,0.536L346.622,1650z M357,1653h-11
-		c-0.549,0-1,0.45-1,1v3h13v-3C358,1653.45,357.551,1653,357,1653z"/>
-</g>
-<g id="hand_x5F_left">
-	<path fill="#FFFFFF" d="M304,1654h-6.717c-0.446,0-0.84-0.296-0.962-0.726l-1.793-6.274h-3.361c-2.134,0-3.167-1.509-3.167-3
-		c0-0.791,0.221-1.53,0.771-2.082c0.418-0.419,1.174-0.918,2.396-0.918c1.877,0,4.903,0.009,6.908,0.015l-1.754-2.292
-		c-0.305-0.397-0.268-0.961,0.088-1.314l1.662-1.66c0.304-0.302,0.766-0.379,1.148-0.189l9.222,4.546
-		c0.343,0.169,0.559,0.517,0.559,0.896v10c0,0.379-0.214,0.726-0.554,0.896l-4,2C304.309,1653.964,304.155,1654,304,1654z
-		 M298.038,1652h5.727l3.236-1.618v-8.76l-8.022-3.953l-0.536,0.535l2.457,3.21c0.232,0.303,0.271,0.7,0.103,1.041
-		s-0.517,0.545-0.896,0.545c-0.001,0-0.002,0-0.003,0c0,0-6.853-0.011-9.851-0.011c-0.424,0-0.688,0.37-0.688,1.011s0.234,1,0.688,1
-		h5.033c0.445,0,0.839,0.296,0.961,0.726L298.038,1652z M311,1640c-0.55,0-1,0.451-1,1v11c0,0.551,0.45,1,1,1h3v-13H311z"/>
-	<path opacity="0.3" fill="#FFFFFF" enable-background="new    " d="M299.906,1652h-1.831l-1.794-6.274
-		c-0.122-0.43-0.515-0.726-0.961-0.726c0.213,0,0.536,0,1.029,0C299.077,1645,299.747,1650,299.906,1652z"/>
-</g>
-<g id="hand_x5F_right">
-	<path opacity="0.3" fill="#FFFFFF" enable-background="new    " d="M256.131,1652h1.832l1.793-6.274
-		c0.123-0.43,0.515-0.726,0.961-0.726c-0.212,0-0.536,0-1.029,0C256.96,1645,256.29,1650.021,256.131,1652z"/>
-	<path fill="#FFFFFF" d="M258.717,1654H252c-0.155,0-0.31-0.036-0.447-0.105l-4-2c-0.339-0.17-0.553-0.516-0.553-0.895v-10
-		c0-0.381,0.216-0.729,0.558-0.896l9.222-4.546c0.385-0.188,0.846-0.111,1.148,0.189l1.663,1.66
-		c0.354,0.354,0.393,0.917,0.087,1.314l-1.753,2.292c2.004-0.006,5.03-0.015,6.908-0.015c2.134,0,3.167,1.509,3.167,3
-		s-1.033,3-3.167,3h-3.362l-1.793,6.274C259.556,1653.704,259.163,1654,258.717,1654z M252.236,1652h5.728l1.793-6.274
-		c0.123-0.43,0.515-0.726,0.961-0.726h5.033c0.921,0,0.655-0.517,0.655-1s0.266-1.011-0.655-1.011c-2.999,0-9.852,0.011-9.852,0.011
-		c-0.001,0-0.002,0-0.003,0c-0.38,0-0.727-0.204-0.896-0.545s-0.13-0.744,0.102-1.047l2.457-3.207l-0.536-0.533l-8.021,3.954v8.76
-		L252.236,1652z M245,1640h-3v13h3c0.55,0,1-0.449,1-1v-11C246,1640.451,245.55,1640,245,1640z"/>
-</g>
-<g id="thumbs_x5F_down">
-	<polygon opacity="0.3" fill="#FFFFFF" enable-background="new    " points="211,1637 209,1637 209,1639 214,1646 216,1646 
-		216,1644 215,1643 	"/>
-	<path fill="#FFFFFF" d="M211,1637l4,6l1,1v2h-9l1,5v3h-1l-2-4l-3-4v-8h2l2-1H211 M211,1635h-5c-0.312,0-0.617,0.072-0.896,0.211
-		l-1.578,0.789H202c-1.104,0-2,0.896-2,2v8c0,0.433,0.14,0.854,0.399,1.2l2.893,3.854l1.919,3.839
-		c0.339,0.679,1.032,1.105,1.789,1.105h1c1.104,0,2-0.896,2-2v-3c0-0.132-0.014-0.265-0.039-0.394l-0.521-2.606H216
-		c1.104,0,2-0.896,2-2v-2c0-0.53-0.211-1.039-0.586-1.414l-0.86-0.86l-3.89-5.835C212.293,1635.334,211.669,1635,211,1635L211,1635z
-		 M198,1636h-4v13h4c0.55,0,1-0.45,1-1v-11C199,1636.45,198.55,1636,198,1636z"/>
-</g>
-<g id="thumbs_x5F_up">
-	<polygon opacity="0.3" fill="#FFFFFF" enable-background="new    " points="167,1646 168,1645 168,1643 166,1643 160,1652 
-		163,1652 	"/>
-	<path fill="#FFFFFF" d="M160,1635v3l-1,5h9v2l-1,1l-4,6h-5l-2-1h-2v-8l3-4l2-4H160 M160,1633h-1c-0.757,0-1.45,0.428-1.789,1.105
-		l-1.919,3.839l-2.893,3.854c-0.26,0.348-0.399,0.768-0.399,1.2v8c0,1.104,0.896,2,2,2h1.527l1.578,0.789
-		c0.278,0.139,0.584,0.211,0.896,0.211h5c0.669,0,1.293-0.334,1.664-0.892l3.89-5.834l0.86-0.86
-		c0.375-0.375,0.586-0.884,0.586-1.414v-2c0-1.104-0.896-2-2-2h-6.562c0,0,0.562-2.868,0.562-3v-3
-		C162,1633.896,161.104,1633,160,1633L160,1633z M150,1641h-4v13h4c0.55,0,1-0.45,1-1v-11C151,1641.45,150.55,1641,150,1641z"/>
-</g>
-<g id="hdd">
-	<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M120,1653h-1v1h1V1653z"/>
-	<g>
-		<path fill="#FFFFFF" d="M120,1650c0.512,0,0.985,0.141,1.408,0.367l-3.463-14.393c-0.12-0.535-0.669-0.976-1.219-0.976h-13.455
-			c-0.55,0-1.099,0.438-1.219,0.976l-3.461,14.393c0.422-0.228,0.896-0.367,1.408-0.367H120z M103.025,1636.209
-			c0.021-0.094,0.165-0.209,0.247-0.209h0.897c-0.082,0-0.227,0.115-0.247,0.209L100.846,1649c-0.626,0-0.895,0-0.896,0
-			L103.025,1636.209z"/>
-		<path fill="#FFFFFF" d="M120,1651h-20c-1.101,0-2,0.9-2,2v1c0,1.1,0.899,2,2,2h20c1.1,0,2-0.9,2-2v-1
-			C122,1651.9,121.1,1651,120,1651z M118,1654h-1v-1h1V1654z M120,1654h-1v-1h1V1654z"/>
-	</g>
-</g>
-<g id="briefcase">
-	<g>
-		<path fill="#FFFFFF" d="M72,1638h-3v-1h-2c0-1.654-1.347-3-3-3h-4c-1.654,0-3,1.346-3,3h-2v1h-3c-1.101,0-2,0.9-2,2v4.5l3.5,2.5
-			H60v-1.48h4v1.48h6.5l3.5-2.5v-4.5C74,1638.9,73.1,1638,72,1638z M60,1636h4c0.551,0,1,0.448,1,1v1h-6v-1
-			C59,1636.448,59.449,1636,60,1636z"/>
-		<path fill="#FFFFFF" d="M64,1648v1h-4v-1h-6.938L50,1646v7c0,1.1,0.899,2,2,2h20c1.1,0,2-0.9,2-2v-7l-3,2H64z"/>
-	</g>
-</g>
-<g id="globe">
-	<path fill="#FFFFFF" d="M14.253,1637.074c-0.281,0.143-0.464,0.462-0.688,0.673c-0.217,0.046-0.426-0.029-0.564-0.202
-		c0.021,0.418-0.536,0.677-0.646,1.109c0.7,0.469,1.792,0.47,2.596,0.644C14.906,1638.547,14.262,1637.87,14.253,1637.074z"/>
-	<path fill="#FFFFFF" d="M14,1633.417c-6.397,0-11.583,5.187-11.583,11.583s5.186,11.583,11.583,11.583
-		c6.396,0,11.583-5.187,11.583-11.583S20.397,1633.417,14,1633.417z M20.33,1652.812c-1.025,1.121-2.896,2.225-4.438,2.188
-		c-0.307-0.389,0.022-0.541,0.035-0.895c-0.833-0.175-1.319-0.931-1.745-1.599c-0.134-0.843,1.018-1.558,0.708-2.255
-		c-0.547,0.073-1.102-0.064-1.535-0.412c-0.219-0.175-0.398-0.396-0.539-0.638c-0.328-0.166-0.668-0.308-1.01-0.441
-		c-1.07-0.423-2.235-0.802-3.042-1.667c0.066-0.804-0.399-1.24-0.92-1.763c-0.547-0.548-0.29-0.974-0.535-1.693
-		c-0.166-0.483-0.429-0.883-0.394-1.409c0.035-0.518,0.153-1.021,0.338-1.506c0.35-0.923,0.854-1.767,0.943-2.771
-		c0.071-0.42-0.606-0.539-0.089-1.027c0.547-0.516,1.23-1.092,2.027-1.092c0.406,0,0.625,0.208,1.022,0.11
-		c0.382-0.095,0.772-0.157,1.161-0.219c0.798-0.123,1.578-0.271,2.229-0.782l0.055,0.057h0.627l0.057-0.055
-		c0.883,0.73,3.048,0.446,2.754,2.104l-0.026,0.136c-0.75,0.06-1.448-0.047-2.159-0.294c-0.011,0.286,0.042,0.604-0.028,0.887
-		c1.151,0.659,2.659,1.154,3.243,2.46c-0.494,0.621-1.124,0.341-1.791,0.341c-0.215,0.235-0.293,0.414-0.209,0.73
-		c-0.54,0.273-1.041,0.562-1.21,1.181c-0.089,0.321-0.023,0.756-0.145,1.052c-0.166,0.406-0.611,0.653-0.781,1.072
-		c-0.048,0.554,0.255,1.024-0.264,1.466c-0.801-0.002-0.87-0.648-1.479-0.851c-0.543-0.178-1.171-0.024-1.732-0.135
-		c-0.758,0.292-0.682,2.246,0.384,1.878c0.491-0.17,0.531-0.538,1.16-0.416c0.514,0.262,0.21,0.859,0.166,1.271
-		c0.334,0.201,0.831,0.064,1.034,0.488c0.044,0.272-0.104,0.801,0.063,1.024c0.368,0.59,1.529-0.381,1.833-0.485
-		c0.882-0.306,1.877-0.211,2.794-0.248c0.691,0.545,1.792,0.268,2.393,0.973c0.405-0.068,0.733-0.298,1.098,0.037
-		C22.246,1650.955,21.25,1651.928,20.33,1652.812z"/>
-</g>
-<g id="rabbit">
-	<path fill="#FFFFFF" d="M457.329,1593.678c-1.809-1.413-2.821-1.543-3.286-1.822c0,0-3.639-4.533-7.509-4.771
-		c-2.856-0.176-1.99,1.208-1.395,1.771c3.816-0.532,7.354,2.748,8.094,3.484l-0.041,0.024c-0.912-0.561-5.012-2.913-8.345-2.126
-		c-3.774,0.888-0.771,2.168-0.771,2.168s3.368,1.723,6.683,1.59c-0.321,0.625-0.35,1.484-1.472,1.688
-		c-0.924,0.166-2.841-0.799-3.907-1.304c-2.687-1.264-5.718-1.451-7.98,0.213c-0.469-0.655-1.78-0.866-3.113-0.59
-		c-1.334,0.277-1.563,2.183-0.889,2.629c0.574,0.381,1.617-0.4,1.814,0.211c-0.378,1.877-0.345,1.876,0.084,3.595
-		c0.428,1.718,1.902,1.89,2.78,2.438c1.105,0.691,1.564,2.652,2.996,3.41c1.232,0.652,3.826,0.34,5.357,0.496
-		c-1.896,1.406-1.541,2.906,2.143,0c0.815,0.056,2.285,0.271,2.41-0.562c0.068-0.46-1.171-0.606-1.781-0.844
-		c1.771-2.062,2.47-4.656,3.896-6.229c0.904-0.997,3.541,0.062,4.77-0.915c0.394-0.312,0.045-0.704-0.043-0.793
-		c0.084,0.072,0.433,0.281,0.908-0.806C459.281,1595.382,459.062,1595.031,457.329,1593.678z M447.454,1605.017
-		c-1.606-0.448-2.768-0.603-3.84-0.891c-0.106-3.024-1.776-3.541-1.887-3.573c-0.11-0.031,0.691-0.242,1.996,0.656
-		c1.812,1.249,4.041,0.188,4.041,0.188S448.352,1603.392,447.454,1605.017z M456.357,1594.839c-0.128,0.347-0.591,0.492-1.031,0.329
-		c-0.442-0.165-0.696-0.577-0.568-0.924c0.128-0.345,0.59-0.491,1.032-0.326C456.23,1594.082,456.486,1594.494,456.357,1594.839z"/>
-</g>
-<g id="turtle">
-	<path fill="#FFFFFF" d="M408.806,1593.098c-1.526-0.172-2.174,0.021-2.535,2.088l-0.012,0.067c-0.48,0.936-1.286,0.69-1.768,0.158
-		c-1.104-2.945-3.741-5.411-7.992-5.411c-5.185,0-8.499,3.373-8.499,7.396v0.278c-2,0.812-4.164,2.324-2.349,2.324
-		c1.066,0,1.349,0,2.349,0h0.005c0.152,1,0.57,1.091,1.183,1.464l-0.491,2.506c-0.107,0.54-0.421,1.23-0.695,1.506
-		c-0.275,0.276-0.05,0.524,0.5,0.524h2c0.55,0,0.774-0.225,0.5-0.5c-0.275-0.275-0.412-0.941-0.305-1.481l0.343-1.709
-		c0.43,0.115,0.894,0.215,1.388,0.295l0.083,0.415c0.108,0.54-0.028,1.206-0.304,1.48c-0.276,0.275-0.05,0.5,0.5,0.5h2
-		c0.55,0,0.774-0.225,0.5-0.5c-0.275-0.274-0.588-0.94-0.696-1.48l-0.037-0.186c0.648,0.043,1.323,0.067,2.021,0.067
-		c0.488,0,0.968-0.014,1.435-0.034l-0.229,1.151c-0.108,0.539-0.422,1.205-0.696,1.48c-0.275,0.275-0.05,0.5,0.5,0.5h2
-		c0.55,0,0.774-0.225,0.5-0.5c-0.275-0.275-0.412-0.941-0.304-1.48l0.266-1.327c0.883-0.115,1.687-0.281,2.382-0.499l0.165,0.826
-		c0.108,0.539-0.028,1.205-0.304,1.48c-0.276,0.275-0.05,0.5,0.5,0.5h2c0.55,0,0.774-0.225,0.5-0.5
-		c-0.275-0.275-0.588-0.941-0.696-1.48l-0.343-1.714c0.667-1.306,3.28-3.51,5.197-3.906l1.35-0.104
-		c0.563-0.001,0.846-0.091,0.98-0.709c0.16-0.73,0.266-0.96,0.307-2.085C412.031,1593.665,408.806,1593.098,408.806,1593.098z"/>
-</g>
-<g id="pin_x5F_flag">
-	<path fill="#FFFFFF" d="M357.506,1587.564l-1.769-1.769c-0.193-0.194-0.547-0.159-0.784,0.079l-6.914,6.913
-		c-0.238,0.238-0.273,0.592-0.078,0.786l0.354,0.354l-10.606,10.606l-0.707,2.121l2.121-0.707l10.606-10.605l9.192,9.191
-		l0.354-7.424l7.42-0.358L357.506,1587.564z M349.68,1593.883l-0.447-0.447l6.376-6.377l0.447,0.447L349.68,1593.883z"/>
-</g>
-<g id="iphone_x5F_shake_1_">
-	<g id="iphone_1_">
-		<g opacity="0.3">
-			<g>
-				<rect x="297" y="1589" fill="#FFFFFF" width="10" height="15"/>
-			</g>
-		</g>
-		<g id="body_1_">
-			<g>
-				<path fill="#FFFFFF" d="M306.5,1585h-9c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h9c1.375,0,2.5-1.125,2.5-2.5
-					v-19C309,1586.125,307.875,1585,306.5,1585z M302,1608.271c-0.979,0-1.771-0.793-1.771-1.771s0.793-1.771,1.771-1.771
-					c0.978,0,1.771,0.793,1.771,1.771S302.979,1608.271,302,1608.271z M297,1604v-15h10v15H297z"/>
-			</g>
-		</g>
-	</g>
-	<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M294,1602.654l-3.222-12.021
-		c-0.354-1.328,0.439-2.705,1.769-3.061l1.793-0.48c-0.213,0.459-0.34,0.968-0.34,1.506v2.727l-0.9,0.241l0.9,3.359V1602.654z
-		 M310,1602.654l3.232-12.021c0.355-1.328-0.427-2.705-1.755-3.061l-1.801-0.48c0.213,0.459,0.322,0.968,0.322,1.506v2.727
-		l0.899,0.241l-0.899,3.359L310,1602.654L310,1602.654z"/>
-</g>
-<g id="pushpin">
-	<path fill="#FFFFFF" d="M264.728,1590.929l-5.657-5.657c-0.39-0.39-1.022-0.391-1.414,0c-0.391,0.393-0.391,1.024,0,1.416
-		l0.707,0.707l-4.948,4.949c-1.562-1.562-4.242-1.415-6.363,0.707l4.242,4.242l-8.485,8.485l-0.707,2.12l2.121-0.707l8.485-8.484
-		l4.242,4.242c2.121-2.121,2.27-4.803,0.706-6.363l4.95-4.949l0.707,0.707c0.392,0.391,1.023,0.391,1.415,0
-		C265.119,1591.952,265.118,1591.319,264.728,1590.929z M254.641,1593.594l-0.476-0.476l5.133-5.022l0.438,0.449L254.641,1593.594z"
-		/>
-</g>
-<g id="candle">
-	<path fill="#FFFFFF" d="M206.083,1584.042c0.709,2.979-7.333,7.812-0.619,9.942c-1.922-1.901,0.474-2.715,0.786-4.297
-		c1.201,0.5,2.979,3.25,1.016,4.312C212.729,1593.667,209.562,1586.312,206.083,1584.042z"/>
-	<path fill="#FFFFFF" d="M215.5,1605h-19c-0.275,0-0.5,0.225-0.5,0.5v1c0,0.275,0.225,0.5,0.5,0.5h1.5l2,2h12l2-2h1.5
-		c0.274,0,0.5-0.225,0.5-0.5v-1C216,1605.225,215.775,1605,215.5,1605z"/>
-	<path fill="#FFFFFF" d="M209,1595h-5c-1.101,0-2,0.9-2,2v2.265c-0.561,0.284-1,1.014-1,1.868v3.353h10V1597
-		C211,1595.9,210.1,1595,209,1595z"/>
-</g>
-<g id="bell">
-	<path fill="#FFFFFF" d="M155.356,1606.995c0.403,1.071,1.432,1.838,2.645,1.838s2.237-0.767,2.643-1.837
-		c-0.836,0.062-1.717,0.104-2.643,0.104C157.073,1607.1,156.193,1607.059,155.356,1606.995z"/>
-	<path fill="#FFFFFF" d="M168.209,1602h-0.375l-2.5-3l-1.334-7h-0.014c-0.405-2.45-2.279-4.393-4.687-4.921
-		c0.004-0.01,0.013-0.02,0.016-0.028l0.367-1.102c0.174-0.522-0.134-0.949-0.684-0.949h-2c-0.55,0-0.857,0.427-0.685,0.949
-		l0.367,1.102c0.003,0.01,0.012,0.02,0.017,0.028c-2.406,0.528-4.28,2.471-4.688,4.921H152l-1.334,7l-2.5,3h-0.375
-		c-0.55,0-1,0.45-1,1s0.42,1.161,0.934,1.358c0,0,4.275,1.642,10.275,1.642s10.274-1.642,10.274-1.642
-		c0.515-0.197,0.935-0.81,0.935-1.358S168.759,1602,168.209,1602z M153.639,1592.384l-1.315,7.308l-2.905,3.31h-0.783l2.966-3.559
-		l1.399-7.252c0.189-1.146,0.79-2.154,1.632-2.902l0.382,0.476C154.313,1590.37,153.796,1591.438,153.639,1592.384z"/>
-</g>
-<g id="certificate">
-	<g>
-		<polygon fill="#FFFFFF" points="114.88,1601.088 113.296,1603.938 110.5,1602.26 107.704,1603.938 106.12,1601.088 105,1601.105 
-			105,1610 110.5,1605 116,1609.993 116,1601.105 		"/>
-		<path fill="#FFFFFF" d="M117.512,1593.5l1.342-2.238l-2.281-1.268l0.044-2.609l-2.609,0.042l-1.269-2.28l-2.237,1.344
-			l-2.238-1.344l-1.268,2.28l-2.609-0.042l0.043,2.609l-2.281,1.268l1.343,2.238l-1.343,2.238l2.281,1.268l-0.043,2.609l2.609-0.042
-			l1.268,2.28l2.238-1.344l2.237,1.344l1.269-2.28l2.609,0.042l-0.044-2.609l2.281-1.268L117.512,1593.5z M109.698,1589.451
-			l-1.01-0.65l-0.576,1.104l-1.245-0.021l0.028,1.268l-1.099,0.612l0.653,0.936l-1.693,1.303l0.48-0.649l-1.008-1.604l1.712-0.913
-			l-0.03-1.941l1.959,0.041l0.95-1.705l1.53,1.011l0.65-0.479L109.698,1589.451z"/>
-	</g>
-</g>
-<g id="dashboard">
-	<path fill="#FFFFFF" d="M60.041,1591c0,0.55-0.45,1-1,1s-1-0.45-1-1s0.45-1,1-1S60.041,1590.45,60.041,1591z M56.041,1592
-		c-0.55,0-1,0.45-1,1s0.45,1,1,1s1-0.45,1-1S56.591,1592,56.041,1592z M62.041,1591c0.55,0,1-0.45,1-1s-0.45-1-1-1s-1,0.45-1,1
-		S61.491,1591,62.041,1591z M64.779,1593.227c-0.102-0.049-0.249,0.005-0.325,0.117l-2.744,4.008
-		c-0.868,0.146-1.531,0.898-1.531,1.81c0,1.016,0.824,1.84,1.839,1.84c1.016,0,1.839-0.824,1.839-1.84c0-0.4-0.132-0.77-0.35-1.071
-		l1.385-4.534C64.931,1593.423,64.881,1593.275,64.779,1593.227z M55.041,1595c-0.55,0-1,0.45-1,1s0.45,1,1,1s1-0.45,1-1
-		S55.591,1595,55.041,1595z M73.82,1596.979c0,6.507-5.293,11.8-11.799,11.8s-11.8-5.293-11.8-11.8
-		c0-6.506,5.293-11.799,11.8-11.799S73.82,1590.474,73.82,1596.979z M71.261,1596.979c0-5.095-4.146-9.239-9.24-9.239
-		s-9.241,4.146-9.241,9.239c0,5.095,4.146,9.239,9.241,9.239C67.115,1606.219,71.261,1602.074,71.261,1596.979z M69.041,1595
-		c-0.55,0-1,0.45-1,1s0.45,1,1,1s1-0.45,1-1S69.591,1595,69.041,1595z M69.041,1593c0-0.55-0.45-1-1-1s-1,0.45-1,1s0.45,1,1,1
-		S69.041,1593.55,69.041,1593z M65.041,1590c-0.55,0-1,0.45-1,1s0.45,1,1,1s1-0.45,1-1S65.591,1590,65.041,1590z"/>
-	<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M64.771,1602c-0.713,0.692-1.683,1.123-2.754,1.123
-		s-2.041-0.431-2.754-1.123h-3.945c1.532,2.039,3.962,3.366,6.703,3.366c2.74,0,5.171-1.327,6.702-3.366H64.771z"/>
-</g>
-<g id="blog">
-	<path fill="#FFFFFF" d="M20,1586H6.5l-2.5,1.75v0.25v2H3.5c-0.275,0-0.5,0.225-0.5,0.5s0.225,0.5,0.5,0.5H4v1H3.5
-		c-0.275,0-0.5,0.225-0.5,0.5s0.225,0.5,0.5,0.5H4v1H3.5c-0.275,0-0.5,0.225-0.5,0.5s0.225,0.5,0.5,0.5H4v1H3.5
-		c-0.275,0-0.5,0.225-0.5,0.5s0.225,0.5,0.5,0.5H4v1H3.5c-0.275,0-0.5,0.225-0.5,0.5s0.225,0.5,0.5,0.5H4v1H3.5
-		c-0.275,0-0.5,0.225-0.5,0.5s0.225,0.5,0.5,0.5H4v1H3.5c-0.275,0-0.5,0.225-0.5,0.5s0.225,0.5,0.5,0.5H4v1H3.5
-		c-0.275,0-0.5,0.225-0.5,0.5s0.225,0.5,0.5,0.5H4v1H3.5c-0.275,0-0.5,0.225-0.5,0.5s0.225,0.5,0.5,0.5H4v2h15c1.649,0,3-1.35,3-3
-		v-15c0-1.65-1.351-3-3-3H5.734l1.392-1c0,0,12.572,0,12.875,0c1.78,0,3,1.219,3,3c0,1,0,15,0,15l1-2c0,0,0-11,0-13
-		C24,1587.562,22.5,1586,20,1586z M10,1589v19H5v-1h0.5c0.274,0,0.5-0.225,0.5-0.5s-0.226-0.5-0.5-0.5H5v-1h0.5
-		c0.274,0,0.5-0.225,0.5-0.5s-0.226-0.5-0.5-0.5H5v-1h0.5c0.274,0,0.5-0.225,0.5-0.5s-0.226-0.5-0.5-0.5H5v-1h0.5
-		c0.274,0,0.5-0.225,0.5-0.5s-0.226-0.5-0.5-0.5H5v-1h0.5c0.274,0,0.5-0.225,0.5-0.5s-0.226-0.5-0.5-0.5H5v-1h0.5
-		c0.274,0,0.5-0.225,0.5-0.5s-0.226-0.5-0.5-0.5H5v-1h0.5c0.274,0,0.5-0.225,0.5-0.5s-0.226-0.5-0.5-0.5H5v-1h0.5
-		c0.274,0,0.5-0.225,0.5-0.5s-0.226-0.5-0.5-0.5H5v-1h0.5c0.274,0,0.5-0.225,0.5-0.5s-0.226-0.5-0.5-0.5H5v-1H10z"/>
-	<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M5,1589v1h0.5c0.274,0,0.5,0.225,0.5,0.5s-0.226,0.5-0.5,0.5H5
-		v1h0.5c0.274,0,0.5,0.225,0.5,0.5s-0.226,0.5-0.5,0.5H5v1h0.5c0.274,0,0.5,0.225,0.5,0.5s-0.226,0.5-0.5,0.5H5v1h0.5
-		c0.274,0,0.5,0.225,0.5,0.5s-0.226,0.5-0.5,0.5H5v1h0.5c0.274,0,0.5,0.225,0.5,0.5s-0.226,0.5-0.5,0.5H5v1h0.5
-		c0.274,0,0.5,0.225,0.5,0.5s-0.226,0.5-0.5,0.5H5v1h0.5c0.274,0,0.5,0.225,0.5,0.5s-0.226,0.5-0.5,0.5H5v1h0.5
-		c0.274,0,0.5,0.225,0.5,0.5s-0.226,0.5-0.5,0.5H5v1h0.5c0.274,0,0.5,0.225,0.5,0.5s-0.226,0.5-0.5,0.5H5v1h5v-19H5z"/>
-</g>
-<g id="soccer_x5F_ball">
-	<path fill="#FFFFFF" d="M446.056,1536.889c-6.647,0-12.056,5.408-12.056,12.057c0,6.647,5.407,12.055,12.056,12.055
-		c6.647,0,12.056-5.408,12.056-12.056C458.112,1542.296,452.702,1536.889,446.056,1536.889z M454.074,1554.985l-0.907-1.888
-		l-2.944,0.985l-1.079,2.916l1.592,0.838c-1.398,0.739-2.99,1.162-4.68,1.162c-1.792,0-3.472-0.478-4.93-1.301l1.327-0.699
-		l-1.078-2.916l-2.944-0.985l-0.707,1.47c-1.088-1.606-1.724-3.542-1.724-5.623c0-0.585,0.061-1.155,0.156-1.714l1.112,1.301
-		l2.73-2.076l-0.129-3.41l-1.919-0.03c1.209-1.648,2.904-2.915,4.878-3.586l-0.636,1.111l3.806,1.579l3.805-1.559l-0.674-1.188
-		c2.037,0.656,3.786,1.947,5.025,3.639l-2.028,0.032l-0.128,3.41l2.729,2.076l1.207-1.411c0.109,0.593,0.174,1.199,0.174,1.824
-		C456.111,1551.213,455.348,1553.301,454.074,1554.985z"/>
-	<polygon fill="#FFFFFF" points="442.195,1547.646 443.648,1552 448.352,1552 449.805,1547.616 446,1544.941 	"/>
-</g>
-<g id="podium">
-	<polygon fill="#FFFFFF" points="405,1545 405,1538 396.5,1538 393,1541.5 401.5,1541.5 401.5,1548.5 409.5,1548.5 409.5,1559 
-		413,1555.5 413,1545 	"/>
-	<path fill="#FFFFFF" d="M401,1542h-8v1h-4l-4,3.5h8v0.5h-8v12h8h8h8v-10h-8V1542z M392,1552h-1v1h-1v1h-1v1h3v1h-4v-1v-1h1v-1h1v-1
-		h1v-1h-3v-1h3v1h1V1552z M398,1545v5h-1v-5h-1v-1h2V1545z M403,1556h3v-1v-1h-3v-1h3v-1h-3v-1h3v1h1v1h-1v1h1v1v1h-1v1h-3V1556z"/>
-</g>
-<g id="sampler">
-	<g>
-		<path fill="#FFFFFF" d="M342.296,1552h2.224l2.832-3.809l1.604,1.192l-1.943,2.615h1.247l1.5-2.019l1.604,1.192L350.75,1552h1.245
-			l0.17-0.229l0.308,0.229h1.768l-11.19-8.244c-0.446-0.322-1.074-0.297-1.396,0.149l-2.93,4.013
-			c-0.322,0.447-0.222,1.206,0.226,1.528L342.296,1552z M346.549,1547.595l-2.984,4.013l-1.604-1.191l2.981-4.014L346.549,1547.595z
-			 M342.535,1544.611l1.605,1.193l-2.982,4.012l-1.605-1.191L342.535,1544.611z"/>
-		<path fill="#FFFFFF" d="M347.645,1545.33l1.757,1.277l4.438-1.498l0.639,1.896l-3.094,1.044l0.991,0.721l2.424-0.816l0.639,1.895
-			l-1.079,0.364l-0.411-0.299l1.402,1.02l0.406-0.138l0.194,0.574l-0.085-0.062l1.47,1.068l-4.395-13.332
-			c-0.172-0.521-0.739-0.809-1.262-0.636l-4.748,1.563c-0.521,0.173-0.809,0.741-0.637,1.263L347.645,1545.33z M352.88,1542.267
-			l0.64,1.896l-4.737,1.598l-0.641-1.894L352.88,1542.267z M351.92,1539.424l0.641,1.896l-4.736,1.597l-0.642-1.896L351.92,1539.424
-			z"/>
-		<path fill="#FFFFFF" d="M358,1553h-20c-0.554,0-1,0.447-1,1v5c0,0.553,0.446,1,1,1h20c0.553,0,1-0.447,1-1v-5
-			C359,1553.447,358.553,1553,358,1553z M340,1559h-2v-5h2V1559z M343,1559h-2v-5h2V1559z M346,1559h-2v-5h2V1559z M349,1559h-2v-5
-			h2V1559z M352,1559h-2v-5h2V1559z M355.5,1558c-0.828,0-1.5-0.672-1.5-1.5s0.672-1.5,1.5-1.5s1.5,0.672,1.5,1.5
-			S356.328,1558,355.5,1558z"/>
-		<path fill="#FFFFFF" d="M362.982,1539.889l-4.764-1.514c-0.524-0.166-1.09,0.126-1.256,0.65l-1.307,4.104l0.694,2.108l4.409,1.451
-			l-0.627,1.896l-3.004-0.989l-0.406-1.229l0.795,2.412l2.303,0.759l-0.625,1.898l-0.898-0.297l0.389,1.182l0.196,0.063
-			l-0.087,0.267l-0.038-0.115l0.638,1.936l4.238-13.326C363.799,1540.62,363.507,1540.055,362.982,1539.889z M361.073,1545.738
-			l-4.748-1.564l0.625-1.898l4.748,1.563L361.073,1545.738z M362.012,1542.89l-4.749-1.563l0.625-1.9l4.75,1.564L362.012,1542.89z"
-			/>
-	</g>
-	<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M340,1554h-2v5h2V1554z M343,1554h-2v5h2V1554z M346,1554h-2v5
-		h2V1554z M349,1554h-2v5h2V1554z M352,1554h-2v5h2V1554z M355.349,1550.932l0.407-0.138l0.194,0.574L355.349,1550.932z
-		 M352.375,1548.77l2.424-0.816l0.639,1.895l-1.079,0.364L352.375,1548.77z M349.401,1546.607l4.438-1.498l0.639,1.896l-3.094,1.044
-		L349.401,1546.607z M347.823,1542.917l-0.641-1.896l4.737-1.599l0.641,1.896L347.823,1542.917z M348.142,1543.866l4.738-1.601
-		l0.64,1.896l-4.737,1.598L348.142,1543.866z M360.134,1548.587l-3.004-0.989l-0.778-2.358l4.409,1.451L360.134,1548.587z
-		 M362.012,1542.89l-4.749-1.563l0.625-1.9l4.75,1.564L362.012,1542.89z M361.073,1545.738l-4.748-1.564l0.625-1.898l4.748,1.563
-		L361.073,1545.738z M358.686,1552.321l0.196,0.063l-0.087,0.267L358.686,1552.321z M359.821,1549.538l-0.625,1.897l-0.898-0.296
-		l-0.778-2.36L359.821,1549.538z M343.564,1551.607l-1.604-1.192l2.981-4.014l1.605,1.192L343.564,1551.607z M342.535,1544.611
-		l1.605,1.193l-2.982,4.012l-1.605-1.191L342.535,1544.611z M348.955,1549.385l-1.943,2.615h-2.492l2.832-3.809L348.955,1549.385z
-		 M350.75,1552h-2.491l1.5-2.02l1.604,1.193L350.75,1552z M352.473,1552h-0.478l0.17-0.229L352.473,1552z"/>
-</g>
-<g id="piano">
-	<path fill="#FFFFFF" d="M311,1537h-17c-1.65,0-3,1.35-3,3v18c0,1.65,1.35,3,3,3h17c1.649,0,3-1.35,3-3v-18
-		C314,1538.35,312.65,1537,311,1537z M312,1544v15h-4v-6h1v-9h-3v9h1v6h-4v-6h1v-9h-3v9h1v6h-4v-6h1v-9h-3v9h1v6h-4v-15v-1h19V1544z
-		"/>
-	<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M312,1544h-19v-1h19V1544z"/>
-</g>
-<g id="wallet">
-	<path fill="#FFFFFF" d="M264.516,1540H258c0-0.553-0.447-1-1-1h-3h-0.47c0,0-0.594,0-1.03,0.5c-0.072,0.09-2.5,2.5-2.5,2.5h0.006
-		c0,0.011-0.006,0.021-0.006,0.031V1547c0,0.55,0.45,1,1,1h3c0.55,0,1-0.45,1-1v-4.969c0-0.012,2-2.031,2-2.031h0.5l-1,1h7.5
-		c0.55,0,1,0.45,1,1v14.5l1-1v-14C266,1540.547,265.266,1540,264.516,1540z M252.5,1546.545c-0.576,0-1.045-0.467-1.045-1.045
-		s0.469-1.045,1.045-1.045s1.045,0.467,1.045,1.045S253.076,1546.545,252.5,1546.545z"/>
-	<polygon fill="#FFFFFF" points="251.5,1540 244.5,1540 243.5,1541 250.5,1541 	"/>
-	<path fill="#FFFFFF" d="M263,1542h-7.5h-0.003c0,0.011,0.003,0.021,0.003,0.031V1547c0,1.104-0.397,1.5-1.5,1.5h-3
-		c-1.104,0-1.5-0.396-1.5-1.5v-4.969c0-0.012,0.003-0.021,0.003-0.031H249.5c0,0-5.5,0-6.5,0s-2,1-2,2c0,2,0,14,0,14
-		c0,0.55,0.45,1,1,1c0,0,19,0,20,0s2-1,2-2s0-14,0-14C264,1542.45,263.55,1542,263,1542z"/>
-</g>
-<g id="tie">
-	<path fill="#FFFFFF" d="M207.7,1542.984l2.199-3.81l-4.399-2.19l-4.4,2.19l2.2,3.81l-3.3,14l5.5,5.016l5.5-5L207.7,1542.984z"/>
-</g>
-<g id="calculator">
-	<g opacity="0.5">
-		<path fill="#FFFFFF" d="M152,1545c-0.551,0-1-0.449-1-1v-3c0-0.551,0.449-1,1-1h13c0.551,0,1,0.449,1,1v3c0,0.551-0.449,1-1,1H152
-			z"/>
-	</g>
-	<path fill="#FFFFFF" d="M166,1537h-15c-1.657,0-3,1.344-3,3v18c0,1.656,1.343,3,3,3h15c1.657,0,3-1.344,3-3v-18
-		C169,1538.344,167.657,1537,166,1537z M154,1557.8c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6
-		c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1557.8z M154,1554.8c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2
-		v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1554.8z M154,1551.8c0,0.11-0.09,0.2-0.2,0.2h-2.6
-		c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1551.8z M154,1548.8c0,0.11-0.09,0.2-0.2,0.2
-		h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1548.8z M158,1557.8
-		c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1557.8z
-		 M158,1554.8c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2
-		V1554.8z M158,1551.8c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6
-		c0.11,0,0.2,0.09,0.2,0.2V1551.8z M158,1548.8c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6
-		c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1548.8z M162,1557.8c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2
-		v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1557.8z M162,1554.8c0,0.11-0.09,0.2-0.2,0.2h-2.6
-		c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1554.8z M162,1551.8c0,0.11-0.09,0.2-0.2,0.2
-		h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1551.8z M162,1548.8
-		c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1548.8z
-		 M166,1557.8c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-7.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2
-		V1557.8z M166,1548.8c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6
-		c0.11,0,0.2,0.09,0.2,0.2V1548.8z M166,1544c0,0.55-0.45,1-1,1h-13c-0.55,0-1-0.45-1-1v-3c0-0.55,0.45-1,1-1h13c0.55,0,1,0.45,1,1
-		V1544z"/>
-</g>
-<g id="playing_x5F_dices">
-	<path fill="#FFFFFF" d="M123.985,1545.379l-6.363-6.364c-1.166-1.167-3.076-1.167-4.242,0l-5.985,5.985H111c1.649,0,3,1.35,3,3
-		v3.51c0.321-0.486,0.874-0.81,1.5-0.81c0.992,0,1.8,0.808,1.8,1.8s-0.808,1.8-1.8,1.8c-0.626,0-1.179-0.321-1.5-0.81v2.958
-		c1.146,0.662,2.644,0.516,3.621-0.463l6.363-6.364C125.152,1548.455,125.152,1546.545,123.985,1545.379z M115.5,1544.3
-		c-0.992,0-1.8-0.808-1.8-1.8s0.808-1.8,1.8-1.8s1.8,0.808,1.8,1.8S116.492,1544.3,115.5,1544.3z M120.5,1549.3
-		c-0.992,0-1.8-0.808-1.8-1.8s0.808-1.8,1.8-1.8s1.8,0.808,1.8,1.8S121.492,1549.3,120.5,1549.3z M110,1546h-9c-1.65,0-3,1.35-3,3v9
-		c0,1.65,1.35,3,3,3h9c1.649,0,3-1.35,3-3v-9C113,1547.35,111.65,1546,110,1546z M101.5,1559.3c-0.993,0-1.8-0.808-1.8-1.8
-		s0.807-1.8,1.8-1.8s1.8,0.808,1.8,1.8S102.493,1559.3,101.5,1559.3z M101.5,1551.3c-0.993,0-1.8-0.808-1.8-1.8s0.807-1.8,1.8-1.8
-		s1.8,0.808,1.8,1.8S102.493,1551.3,101.5,1551.3z M105.5,1555.3c-0.993,0-1.8-0.808-1.8-1.8s0.807-1.8,1.8-1.8s1.8,0.808,1.8,1.8
-		S106.493,1555.3,105.5,1555.3z M109.5,1559.3c-0.993,0-1.8-0.808-1.8-1.8s0.807-1.8,1.8-1.8s1.8,0.808,1.8,1.8
-		S110.493,1559.3,109.5,1559.3z M109.5,1551.3c-0.993,0-1.8-0.808-1.8-1.8s0.807-1.8,1.8-1.8s1.8,0.808,1.8,1.8
-		S110.493,1551.3,109.5,1551.3z"/>
-</g>
-<g id="gamepad">
-	<path fill="#FFFFFF" d="M74.968,1555.361l-3.128-12.744c-0.394-1.603-2.015-2.551-3.604-2.105L64,1542h-3l-4.304-1.488
-		c-1.589-0.443-3.211,0.504-3.604,2.105l-3.128,12.744c-0.394,1.604,0.254,3.002,1.438,3.108c1.186,0.107,2.928-0.911,3.873-2.264
-		l2.551-3.65c0.499,0.273,1.062,0.443,1.673,0.443c1.28,0,2.39-0.695,3-1.724c0.609,1.027,1.719,1.724,3,1.724
-		c0.59,0,1.137-0.16,1.625-0.418l2.532,3.625c0.944,1.353,2.688,2.371,3.872,2.264C74.714,1558.363,75.361,1556.965,74.968,1555.361
-		z M57,1546h-1v-1h-1v-1h1v-1h1v1h1v1h-1V1546z M59.5,1551.38c-1.039,0-1.88-0.842-1.88-1.88c0-1.039,0.841-1.88,1.88-1.88
-		s1.88,0.841,1.88,1.88C61.38,1550.538,60.539,1551.38,59.5,1551.38z M65.5,1551.38c-1.039,0-1.88-0.842-1.88-1.88
-		c0-1.039,0.841-1.88,1.88-1.88s1.88,0.841,1.88,1.88C67.38,1550.538,66.539,1551.38,65.5,1551.38z M66.5,1545.396
-		c-0.493,0-0.896-0.403-0.896-0.896s0.403-0.896,0.896-0.896s0.896,0.403,0.896,0.896S66.993,1545.396,66.5,1545.396z
-		 M68.5,1547.396c-0.493,0-0.896-0.403-0.896-0.896s0.403-0.896,0.896-0.896s0.896,0.403,0.896,0.896S68.993,1547.396,68.5,1547.396
-		z M68.5,1543.396c-0.493,0-0.896-0.403-0.896-0.896s0.403-0.896,0.896-0.896s0.896,0.403,0.896,0.896
-		S68.993,1543.396,68.5,1543.396z M70.5,1545.396c-0.493,0-0.896-0.403-0.896-0.896s0.403-0.896,0.896-0.896
-		s0.896,0.403,0.896,0.896S70.993,1545.396,70.5,1545.396z"/>
-</g>
-<g id="filter">
-	<path fill="#FFFFFF" d="M4,1537v1.361c0,0.55,0.45,1,1,1h18c0.55,0,1-0.45,1-1V1537H4z"/>
-	<path fill="#FFFFFF" d="M12,1551v10l4-4v-6l7-11H5L12,1551z M14.256,1550.709h-0.993L7.085,1541h0.993L14.256,1550.709z"/>
-</g>
-<g id="sort">
-	<path fill="#FFFFFF" d="M454,1493.5v16c0,0.275-0.226,0.5-0.5,0.5h-2c-0.275,0-0.5-0.225-0.5-0.5V1496h-13.459
-		c-0.274,0-0.541-0.225-0.541-0.5v-2c0-0.275,0.267-0.5,0.541-0.5H453.5C453.775,1493,454,1493.225,454,1493.5z M433.5,1497
-		c-0.275,0-0.5,0.225-0.5,0.5v16c0,0.275,0.225,0.5,0.5,0.5h16c0.274,0,0.5-0.225,0.5-0.5V1497H433.5z M457.5,1489h-15.959
-		c-0.274,0-0.541,0.225-0.541,0.5v2c0,0.275,0.267,0.5,0.541,0.5H455v13.5c0,0.275,0.225,0.5,0.5,0.5h2c0.274,0,0.5-0.225,0.5-0.5
-		v-16C458,1489.225,457.775,1489,457.5,1489z"/>
-</g>
-<g id="more_x5F_items">
-	<g>
-		<path fill="#FFFFFF" d="M407.5,1489h-15.958c-0.275,0-0.542,0.225-0.542,0.5v2.5h13.5h0.5v1.5l0.03,15.5h2.47
-			c0.274,0,0.5-0.225,0.5-0.5v-19C408,1489.225,407.775,1489,407.5,1489z"/>
-	</g>
-	<path fill="#FFFFFF" d="M387.5,1493c-0.275,0-0.5,0.225-0.5,0.5v19c0,0.275,0.225,0.5,0.5,0.5h16c0.274,0,0.5-0.225,0.5-0.5V1493
-		H387.5z"/>
-</g>
-<g id="tree_x5F_deciduous_1_">
-	<path fill="#FFFFFF" d="M360,1499c0-1.618-0.964-3.002-2.346-3.633c0.214-0.411,0.346-0.871,0.346-1.367c0-1.658-1.345-3-3-3
-		c-0.364,0-0.708,0.074-1.031,0.193c-0.157-1.788-1.642-3.193-3.469-3.193c-1.428,0-2.649,0.855-3.194,2.081
-		c-0.263-0.048-0.53-0.081-0.806-0.081c-2.484,0-4.5,2.014-4.5,4.5c0,0.562,0.114,1.094,0.304,1.59
-		c-1.319,0.314-2.304,1.493-2.304,2.91c0,1.371,0.926,2.514,2.181,2.873c-0.105,0.359-0.165,0.732-0.181,1.127
-		c-0.131,3.348,4,5.438,6,2.621V1512l-1,1h7l-1-1v-6.778c2,1.841,4.125,0.216,4-2.222c-0.002-0.047-0.013-0.091-0.015-0.137
-		C358.716,1502.422,360,1500.867,360,1499z"/>
-</g>
-<g id="tree_x5F_conifer_1_">
-	<path fill="#FFFFFF" d="M312.502,1508c0.274,0,0.34-0.157,0.144-0.35l-4.739-4.65h3.558c0.275,0,0.34-0.157,0.144-0.35l-4.739-4.65
-		h2.559c0.274,0,0.339-0.157,0.145-0.35l-4.74-4.65h1.559c0.274,0,0.339-0.157,0.144-0.35l-3.673-3.604
-		c-0.196-0.192-0.518-0.192-0.715,0l-3.672,3.604c-0.196,0.191-0.132,0.35,0.144,0.35h1.559l-4.74,4.65
-		c-0.194,0.191-0.131,0.35,0.145,0.35h2.559l-4.74,4.65c-0.195,0.191-0.132,0.35,0.145,0.35h3.558l-4.739,4.65
-		c-0.196,0.191-0.133,0.35,0.144,0.35H300v4l-1,1h7l-1-1v-4H312.502z"/>
-</g>
-<g id="bowling_1_">
-	<path fill="#FFFFFF" d="M254,1489.75c-6.213,0-11.25,5.037-11.25,11.25s5.037,11.25,11.25,11.25s11.25-5.037,11.25-11.25
-		S260.213,1489.75,254,1489.75z M255.5,1499.3c-0.992,0-1.8-0.808-1.8-1.8s0.808-1.8,1.8-1.8s1.8,0.808,1.8,1.8
-		S256.492,1499.3,255.5,1499.3z M256.7,1494.5c0-0.992,0.808-1.8,1.8-1.8s1.8,0.808,1.8,1.8s-0.808,1.8-1.8,1.8
-		S256.7,1495.492,256.7,1494.5z M261.5,1501.3c-0.992,0-1.8-0.808-1.8-1.8s0.808-1.8,1.8-1.8s1.8,0.808,1.8,1.8
-		S262.492,1501.3,261.5,1501.3z"/>
-</g>
-<g id="table_x5F_tennis_1_">
-	<g>
-		<g>
-			<path fill="#FFFFFF" d="M213.521,1492.119l-0.004,0.005C213.618,1492.222,213.521,1492.119,213.521,1492.119z"/>
-		</g>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M213.5,1512.671c-1.199,0-2.171-0.974-2.171-2.171c0-1.199,0.972-2.172,2.171-2.172
-			c1.2,0,2.172,0.973,2.172,2.172C215.672,1511.697,214.7,1512.671,213.5,1512.671z M206.014,1508.412
-			c2.582,0.162,5.072-1.166,7.197-3.291c3.396-3.397,4.539-8.746,0.297-12.988c-4.242-4.243-9.6-3.107-12.996,0.289
-			c-2.125,2.125-3.458,4.61-3.299,7.189l0.166,0.164l8.483,8.485L206.014,1508.412z M198.916,1509.194
-			c-0.88,0.888-2.323,2.585-2.739,3.115c-0.473-0.032-1.053-0.52-1.7-1.146c-0.697-0.717-1.107-1.222-1.142-1.694
-			c0.531-0.416,2.229-1.856,3.119-2.735c0.522-0.521,1.259-1.035,1.586-1.962l1.883-1.035l1.993,1.992l-1.035,1.884
-			C199.954,1507.938,199.435,1508.67,198.916,1509.194z"/>
-	</g>
-	<g opacity="0.3">
-		<g>
-			<path fill="#FFFFFF" d="M197.379,1499.776l-0.166-0.165c0.051,0.828,0.251,1.668,0.635,2.508c0.449,1.113,0.421,2.007,0.192,2.65
-				l1.883-1.034l1.993,1.993l-0.989,1.839c0.646-0.229,1.466-0.24,2.579,0.209c0.84,0.384,1.678,0.584,2.508,0.636l-0.15-0.15
-				L197.379,1499.776z"/>
-		</g>
-	</g>
-</g>
-<g id="ax_1_">
-	<g id="ax_2_">
-		<path fill="#FFFFFF" d="M153,1499.564v1.413l-0.106-0.015c-2.52,2.52-5.355,5.294-5.73,5.669
-			c-1.417,1.418-2.156,3.539-2.156,3.539l2.812,2.828c0,0,0.7-2.122,2.117-3.537c1.417-1.419,10.418-10.377,10.418-10.377
-			l-3.463-3.535L153,1499.564z"/>
-		<path fill="#FFFFFF" d="M161.717,1489.186l-4.949,4.949l5.307,5.306c0,0,0.354,2.69,0.354,4.597
-			c5.656,1.414,9.191-4.95,9.191-4.95L161.717,1489.186z M158.732,1494.686l-0.55-0.551l3.535-3.535l0.551,0.551L158.732,1494.686z"
-			/>
-	</g>
-</g>
-<g id="rugby">
-	<g opacity="0.3">
-		<path fill="#FFFFFF" d="M121.645,1497.351c-0.237,1.337-0.648,2.768-1.273,4.205c-0.4-0.732-2.02-3.514-4.685-6.173
-			c-1.885-1.879-3.831-3.234-5.072-4.008c1.434-0.59,2.853-0.971,4.174-1.182c1.009,0.738,2.162,1.676,3.295,2.805
-			C119.637,1494.549,120.836,1496.145,121.645,1497.351z M105.316,1505.722c-1.822-1.816-3.704-3.143-4.946-3.931
-			c-0.447,1.145-0.771,2.273-0.975,3.346c1.062,0.764,2.307,1.757,3.526,2.974c1.554,1.549,2.754,3.143,3.561,4.347
-			c1.062-0.186,2.186-0.484,3.32-0.91C109.192,1510.495,107.659,1508.061,105.316,1505.722z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M110.614,1491.375c-2.119,0.868-4.258,2.176-6.096,4.008c-1.934,1.93-3.276,4.188-4.148,6.408
-			c1.242,0.788,3.124,2.113,4.946,3.931c2.344,2.339,3.876,4.773,4.486,5.824c2.312-0.862,4.676-2.229,6.681-4.229
-			c1.748-1.741,3.018-3.75,3.888-5.761c-0.4-0.732-2.02-3.514-4.685-6.173C113.802,1493.504,111.855,1492.148,110.614,1491.375z
-			 M111.292,1497.386c-0.133,0.132-0.31,0.205-0.495,0.205c-0.187,0-0.362-0.073-0.495-0.205l-0.874-0.874l-1.01,1.01l0.874,0.875
-			c0.132,0.133,0.205,0.309,0.205,0.494c0,0.187-0.073,0.362-0.205,0.495c-0.133,0.132-0.31,0.205-0.495,0.205
-			c-0.187,0-0.362-0.073-0.495-0.205l-0.874-0.874l-1.01,1.01l0.874,0.875c0.132,0.133,0.205,0.309,0.205,0.494
-			c0,0.187-0.073,0.362-0.205,0.495c-0.133,0.132-0.31,0.205-0.495,0.205c-0.187,0-0.362-0.073-0.495-0.205l-0.874-0.874
-			l-0.547,0.548c-0.133,0.132-0.31,0.205-0.495,0.205s-0.362-0.073-0.495-0.205c-0.271-0.272-0.271-0.717,0-0.989l0.547-0.549
-			l-0.876-0.875c-0.132-0.134-0.205-0.31-0.205-0.495c0-0.187,0.073-0.362,0.205-0.495c0.133-0.132,0.31-0.205,0.495-0.205
-			c0.187,0,0.362,0.073,0.495,0.205l0.876,0.876l1.01-1.011l-0.876-0.875c-0.132-0.134-0.205-0.31-0.205-0.495
-			c0-0.187,0.073-0.362,0.205-0.495c0.133-0.132,0.31-0.205,0.495-0.205c0.187,0,0.362,0.073,0.495,0.205l0.876,0.876l1.01-1.011
-			l-0.876-0.875c-0.132-0.134-0.205-0.31-0.205-0.495c0-0.187,0.073-0.362,0.205-0.495c0.133-0.132,0.31-0.205,0.495-0.205
-			c0.187,0,0.362,0.073,0.495,0.205l0.876,0.876l0.593-0.593c0.133-0.132,0.31-0.204,0.495-0.204c0.187,0,0.362,0.072,0.495,0.204
-			c0.132,0.134,0.205,0.31,0.205,0.495c0,0.187-0.073,0.362-0.205,0.495l-0.593,0.592l0.874,0.875
-			c0.132,0.133,0.205,0.309,0.205,0.494C111.497,1497.077,111.424,1497.253,111.292,1497.386z"/>
-		<path fill="#FFFFFF" d="M99.396,1505.137c-0.575,3.023-0.24,5.579,0.735,6.551c0.949,0.948,3.418,1.287,6.352,0.77
-			c-0.807-1.204-2.007-2.798-3.561-4.347C101.701,1506.895,100.458,1505.899,99.396,1505.137z"/>
-		<path fill="#FFFFFF" d="M120.871,1491.009c-0.921-0.917-3.271-1.263-6.084-0.814c1.009,0.739,2.162,1.676,3.295,2.805
-			c1.555,1.551,2.754,3.146,3.562,4.354C122.162,1494.421,121.824,1491.959,120.871,1491.009z"/>
-	</g>
-</g>
-<g id="baseball_1_">
-	<circle fill="#FFFFFF" cx="71" cy="1509" r="3.125"/>
-	<path fill="#FFFFFF" d="M74.026,1491.597l-2.122-2.122c-0.338-0.339-0.79-0.524-1.271-0.524c-0.482,0-0.936,0.187-1.274,0.528
-		l-6.067,6.067c-0.686,0.685-2.396,3.106-3.084,4.482c-0.703,1.405-1.431,2.856-2.159,3.588l-5.86,5.86l-0.495-0.495
-		c-0.193-0.194-0.513-0.194-0.707,0l-0.505,0.506c-0.193,0.193-0.193,0.513,0,0.707l2.828,2.828c0.194,0.193,0.513,0.193,0.707,0
-		l0.505-0.505c0.194-0.193,0.194-0.513,0.001-0.707l-0.496-0.494l5.861-5.861c0.73-0.73,2.184-1.457,3.588-2.16
-		c1.377-0.688,3.799-2.398,4.482-3.083l6.07-6.069c0.34-0.339,0.524-0.791,0.524-1.272S74.365,1491.936,74.026,1491.597z
-		 M64.467,1497.225c-0.979,0.979-3.079,2.922-3.079,2.922c0.783-1.327,2.014-3.021,2.497-3.502l6.087-6.088l0.582,0.581
-		L64.467,1497.225z"/>
-</g>
-<g id="flower_3_">
-	<g>
-		<path fill="#FFFFFF" d="M13.549,1494.349c0.428,0.429,0.729,0.942,0.951,1.483c0.221-0.541,0.522-1.056,0.951-1.483
-			c0.631-0.63,1.445-1.002,2.271-1.215c-0.264-2.691-3.221-4.816-3.221-4.816s-2.958,2.125-3.223,4.816
-			C12.104,1493.347,12.918,1493.719,13.549,1494.349z"/>
-	</g>
-	<path fill="#FFFFFF" d="M18.919,1504.184c0.265-0.34,0.573-0.733-0.003,0.004c-0.418,0.536-0.229,0.295-0.003,0.006
-		c-0.909,1.17-0.721,2.278-0.604,2.948L16,1509.449v-7.664c2.409-0.291,4.818-1.863,5.629-4.225
-		c0.485-1.416,0.552-3.021,0.331-4.496c-0.719-0.045-1.485-0.064-2.169-0.064c0.129-1-0.061-2.604-0.061-2.604
-		s-0.65-0.113-1.566-0.113c0.914,1.154,1.102,3.84,1.102,3.84l-0.993,0.256c-1.226,0.316-2.177,1.01-2.661,2.198l-1.11,2.724
-		l-1.111-2.724c-0.484-1.188-1.435-1.882-2.661-2.198l-0.993-0.256c0,0,0.188-2.686,1.103-3.84c-0.916,0-1.567,0.113-1.567,0.113
-		S9.08,1492,9.209,1493c-0.685,0-1.45,0.02-2.169,0.064c-0.222,1.475-0.155,3.08,0.331,4.495c0.81,2.361,3.22,3.935,5.629,4.226
-		v7.664l-2.31-2.309c0.115-0.67,0.306-1.779-0.604-2.949c0.226,0.289,0.415,0.531-0.003-0.005c-0.576-0.737-0.27-0.344-0.003-0.004
-		c-1.07-1.368-2.35-1.294-5.081-2.088c0,6.377,3.575,6.193,5.008,5.775l2.992,2.991V1513h1.5H16v-2.137l2.992-2.992
-		c1.434,0.418,5.008,0.602,5.008-5.775C21.268,1502.89,19.99,1502.814,18.919,1504.184z"/>
-</g>
-<g id="comments">
-	<path fill="#FFFFFF" d="M455,1442h-18c-1.65,0-3,1.35-3,3v11c0,1.65,1.35,3,3,3h2v6l6-6h10c1.649,0,3-1.35,3-3v-11
-		C458,1443.35,456.65,1442,455,1442z"/>
-</g>
-<g id="share_x5F_alt">
-	<path fill="#FFFFFF" d="M404.5,1457c-0.904,0-1.722,0.352-2.342,0.915l-6.412-3.782c0.086-0.365,0.145-0.74,0.145-1.133
-		c0-0.404-0.062-0.791-0.155-1.167l6.395-3.771c0.625,0.576,1.453,0.938,2.371,0.938c1.934,0,3.5-1.566,3.5-3.5s-1.566-3.5-3.5-3.5
-		c-1.935,0-3.5,1.566-3.5,3.5c0,0.291,0.046,0.569,0.112,0.84l-6.254,3.688c-0.895-1.158-2.28-1.918-3.858-1.918
-		c-2.701,0-4.892,2.188-4.892,4.891s2.189,4.891,4.892,4.891c1.59,0,2.987-0.771,3.882-1.944l6.241,3.681
-		c-0.072,0.281-0.123,0.57-0.123,0.874c0,1.934,1.565,3.5,3.5,3.5c1.934,0,3.5-1.566,3.5-3.5S406.434,1457,404.5,1457z"/>
-</g>
-<g id="life_x5F_preserver">
-	<path fill="#FFFFFF" d="M358.344,1444.656c-2.229-2.229-5.191-3.456-8.344-3.456c-3.153,0-6.115,1.228-8.345,3.456
-		c-4.601,4.602-4.601,12.087,0,16.688c2.229,2.229,5.191,3.456,8.345,3.456c3.152,0,6.114-1.228,8.344-3.456
-		C362.944,1456.743,362.944,1449.257,358.344,1444.656z M346.236,1456.764c-2.074-2.074-2.074-5.451,0-7.526
-		c1.006-1.005,2.343-1.56,3.765-1.56s2.759,0.555,3.764,1.56s1.559,2.342,1.559,3.764s-0.554,2.759-1.559,3.765
-		c-1.006,1.006-2.343,1.56-3.764,1.56S347.242,1457.77,346.236,1456.764z M356.367,1455.718c0.36-0.849,0.555-1.768,0.555-2.718
-		c0-0.949-0.192-1.869-0.555-2.718l2.688-1.973c1.516,2.932,1.516,6.446,0.001,9.378L356.367,1455.718z M354.691,1443.943
-		l-1.974,2.688c-0.849-0.36-1.768-0.555-2.718-0.555s-1.869,0.192-2.717,0.555l-1.974-2.689c1.434-0.743,3.029-1.144,4.689-1.144
-		C351.661,1442.8,353.259,1443.199,354.691,1443.943z M340.943,1448.312l2.691,1.972c-0.361,0.848-0.554,1.767-0.554,2.717
-		s0.191,1.869,0.554,2.717l-2.69,1.975C339.429,1454.76,339.429,1451.243,340.943,1448.312z M345.309,1462.057l1.975-2.688
-		c0.848,0.362,1.768,0.556,2.718,0.556s1.869-0.192,2.718-0.556l1.972,2.689c-1.433,0.743-3.028,1.144-4.688,1.144
-		C348.339,1463.2,346.741,1462.801,345.309,1462.057z"/>
-</g>
-<g id="bicycle">
-	<path fill="#FFFFFF" d="M312,1450.991c-0.749,0-1.463,0.144-2.125,0.394l-1.68-2.816l1.241-3.338
-		c0.028-0.075,0.027-0.152,0.036-0.229H310c0.55,0,1-0.484,1-1.035c0-0.549-0.444-0.934-0.986-0.844l-4.027,0.663
-		c-0.542,0.09-0.985,0.404-0.985,0.681s0.45,0.535,1,0.535h1.389l-1.217,3h-8.855l0.554-1.533c0.256-0.842-0.275-1.467-1.2-1.467
-		H294c-0.554,0-1,0.447-1,1s0.446,1,1,1h1.552l-1.475,4.093c-0.352-0.062-0.709-0.102-1.077-0.102c-3.33,0-6.039,2.709-6.039,6.039
-		s2.709,6.039,6.039,6.039s6.039-2.709,6.039-6.039c0-2.256-1.244-4.224-3.081-5.261l0.37-1.027l6.965,6.965
-		c0.188,0.188,0.44,0.293,0.707,0.293h2.046c0.467,2.869,2.955,5.069,5.954,5.069c3.33,0,6.039-2.709,6.039-6.039
-		S315.33,1450.991,312,1450.991z M297.039,1457.03c0,2.228-1.812,4.039-4.039,4.039c-2.228,0-4.039-1.812-4.039-4.039
-		c0-2.228,1.812-4.039,4.039-4.039c0.13,0,0.252,0.026,0.379,0.038l-1.319,3.662c-0.188,0.52,0.082,1.093,0.603,1.278
-		c0.111,0.041,0.227,0.061,0.339,0.061c0.409,0,0.794-0.253,0.939-0.661l1.326-3.68
-		C296.335,1454.417,297.039,1455.643,297.039,1457.03z M308.144,1452.388c-1.081,0.899-1.839,2.17-2.088,3.612h-0.624l1.869-5.026
-		L308.144,1452.388z M309.188,1454.141l1.108,1.859h-2.187C308.301,1455.283,308.672,1454.643,309.188,1454.141z M303.601,1455.186
-		l-5.187-5.186h7.114L303.601,1455.186z M312,1461.069c-1.893,0-3.472-1.312-3.908-3.069H312c0.553,0,1-0.447,1-1
-		c0-0.155-0.15-0.622-0.204-0.712l-1.867-3.134c0.344-0.097,0.698-0.163,1.071-0.163c2.228,0,4.039,1.812,4.039,4.039
-		C316.039,1459.257,314.228,1461.069,312,1461.069z"/>
-</g>
-<g id="temple_x5F_buddhist_2_">
-	<path fill="#FFFFFF" d="M268,1454v-1c0,0,0,0-1,0s-4.892-2.375-5-3v-1h4v-1c0,0,0,0-1,0s-4.892-2-5-2v-1h2v-1c0,0,0,0-1,0
-		s-3.892-2-4-2c-0.191,0-5.81,0-6,0c-0.109,0-3,2-4,2s-1,0-1,0v1h2v1c-0.109,0-4,2-5,2s-1,0-1,0v1h4v1c-0.109,0.625-4,3-5,3
-		s-1,0-1,0v1h5v5h-3v5h24v-5h-3v-5H268z M249,1457h-2v-3h2V1457z M253,1457h-2v-3h2V1457z M257,1457h-2v-3h2V1457z M261,1457h-2v-3
-		h2V1457z"/>
-</g>
-<g id="temple_x5F_hindu_2_">
-	<rect x="194" y="1460" fill="#FFFFFF" width="24" height="6"/>
-	<path fill="#FFFFFF" d="M216,1457h-2l-4-12v-2h-2v-1h-4v1h-2v2l-4,12h-2v2h20V1457z M207,1455h-2v-3h2V1455z M207,1450h-2v-2h2
-		V1450z M207,1447h-2v-1h2V1447z"/>
-</g>
-<g id="temple_x5F_islam_2_">
-	<path fill="#FFFFFF" d="M170.5,1449c0.274,0,0.5-0.225,0.5-0.5v-0.5l-2.5-6l-2.5,6v0.5c0,0.275,0.225,0.5,0.5,0.5h0.5v2h-0.5
-		c-0.275,0-0.5,0.225-0.5,0.5v1c0,0.275,0.225,0.5,0.5,0.5h0.5v6h-1v-1h-1v-3h-0.029c-0.248-2.317-2.193-4.215-4.775-4.805L159,1449
-		v-1.5c0-0.275-0.226-0.5-0.5-0.5c-0.275,0-0.5,0.225-0.5,0.5v1.5l-1.195,1.195c-2.582,0.59-4.527,2.486-4.775,4.805H152v3h-1v1h-1
-		v-6h0.5c0.274,0,0.5-0.225,0.5-0.5v-1c0-0.275-0.226-0.5-0.5-0.5H150v-2h0.5c0.274,0,0.5-0.225,0.5-0.5v-0.5l-2.5-6l-2.5,6v0.5
-		c0,0.275,0.225,0.5,0.5,0.5h0.5v2h-0.5c-0.275,0-0.5,0.225-0.5,0.5v1c0,0.275,0.225,0.5,0.5,0.5h0.5v13h23v-13h0.5
-		c0.274,0,0.5-0.225,0.5-0.5v-1c0-0.275-0.226-0.5-0.5-0.5H170v-2H170.5z M151,1464h-1v-4h1V1464z M153,1464h-1v-4h1V1464z
-		 M155,1464h-1v-4h1V1464z M163,1464h-1v-4h1V1464z M165,1464h-1v-4h1V1464z M167,1464h-1v-4h1V1464z"/>
-</g>
-<g id="temple_x5F_christianity_x5F_church">
-	<path fill="#FFFFFF" d="M107,1454h11l3,3v1h-14V1454z M122,1465v1h-1H99v-14h-1v-1l4-3.949V1444h-2v-1h2v-2h1v2h2v1h-2v3.051
-		l4,3.949v1h-1v7h15v6H122z M109,1460h-1v4h1V1460z M111,1460h-1v4h1V1460z M113,1460h-1v4h1V1460z M115,1460h-1v4h1V1460z
-		 M117,1460h-1v4h1V1460z M119,1460h-1v4h1V1460z"/>
-</g>
-<g id="webcam_1_">
-	<g opacity="0.5">
-		<path fill="#FFFFFF" d="M65.343,1451.498c0,1.569-1.274,2.845-2.845,2.845c-1.48,0-2.685-1.138-2.817-2.583
-			c0.331,0.189,0.708,0.306,1.118,0.306c1.252,0,2.266-1.015,2.266-2.267c0-0.41-0.114-0.787-0.305-1.118
-			C64.206,1448.814,65.343,1450.02,65.343,1451.498z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M64.914,1458.914c3.657-1.053,6.346-4.423,6.346-8.414c0-4.661-3.912-8.473-8.51-8.734v5.941
-			c1.883,0.248,3.594,1.844,3.594,3.793s-1.711,3.545-3.594,3.793V1459h-0.5v-3.707c-1.883-0.248-3.595-1.844-3.595-3.793
-			s1.712-3.545,3.595-3.793v-5.941c-4.599,0.263-8.511,4.073-8.511,8.734c0,3.991,2.688,7.361,6.347,8.414l-5.379,5.379
-			C54.318,1464.682,54.45,1465,55,1465h2c0.55,0,1.317-0.318,1.707-0.707l1.586-1.586C60.682,1462.318,61.45,1462,62,1462h1
-			c0.55,0,1.317,0.318,1.707,0.707l1.586,1.586C66.682,1464.682,67.45,1465,68,1465h2c0.55,0,0.682-0.318,0.293-0.707
-			L64.914,1458.914z"/>
-	</g>
-</g>
-<g id="microphone">
-	<path fill="#FFFFFF" d="M23,1449.5c0,0.275-0.224,0.537-0.493,0.582L22,1450.167v3.841c0,3.906-3,6.041-5,6.687v1.174l3,1.364V1465
-		H9v-1.77l3-1.363v-1.174c-2-0.646-5-2.779-5-6.687v-3.841l-0.507-0.085C6.223,1450.037,6,1449.775,6,1449.5s0.225-0.5,0.5-0.5H9v1
-		v4.008c0,3.612,2.983,5.133,5.577,5.133c2.593,0,5.423-2.188,5.423-5.133V1450v-1h2.5C22.775,1449,23,1449.225,23,1449.5z
-		 M10,1453.391V1450h9v3.391c0,0.929-1.045,4.144-4.5,4.144S10,1454.318,10,1453.391z M11,1453.391c0,0.243,0.23,1.289,1,2.109
-		v-0.697c-0.364-0.63-0.5-1.234-0.5-1.412V1451H11V1453.391z M19,1449h-9v-3.5c0-2.485,2.015-4.5,4.5-4.5c2.484,0,4.5,2.015,4.5,4.5
-		V1449z M12,1443.059c-0.617,0.631-1,1.491-1,2.441v2.5h0.5v-2.5c0-0.652,0.187-1.257,0.5-1.777V1443.059z"/>
-</g>
-<g id="hospital_x5F_h_2_">
-	<path fill="#FFFFFF" d="M458,1395.5c0-1.381-1.119-2.5-2.5-2.5h-19c-1.382,0-2.5,1.119-2.5,2.5v19c0,1.381,1.118,2.5,2.5,2.5h19
-		c1.381,0,2.5-1.119,2.5-2.5V1395.5z M454,1414h-5v-8h-6v8h-5v-18h5v6h6v-6h5V1414z"/>
-</g>
-<g id="hospital_2_">
-	<path fill="#FFFFFF" d="M410,1395.5c0-1.381-1.119-2.5-2.5-2.5h-19c-1.381,0-2.5,1.119-2.5,2.5v19c0,1.381,1.119,2.5,2.5,2.5h19
-		c1.381,0,2.5-1.119,2.5-2.5V1395.5z M407,1408h-6v6h-6v-6h-6v-6h6v-6h6v6h6V1408z"/>
-</g>
-<g id="kettle">
-	<g>
-		<polygon fill="#FFFFFF" points="357,1414 342,1414 342,1415 340,1417 359,1417 357,1415 		"/>
-		<path fill="#FFFFFF" d="M361.833,1400.354c0-5.646-7.04-7.062-11.833-7.062s-7,2.709-7,2.709h-1h-3l3,9.145V1411
-			c0,1.1,0.899,2,2,2h11c2.618,0,2-2.396,2-2.396C357,1408.938,361.833,1406,361.833,1400.354z M357,1397.841
-			c1.018,0.051,2.453,0.515,2.453,2.737c0,2.938-1.283,3.6-2.453,4.676V1397.841z M354,1408c0,1.1-0.675,2-1.5,2
-			c-0.551,0-1.029-0.406-1.29-1H352v-1h-1v-1h1v-1h-1v-1h1v-1h-1v-1h1v-1h-1v-1h1v-1h-0.79c0.261-0.594,0.739-1,1.29-1
-			c0.825,0,1.5,0.9,1.5,2V1408z"/>
-	</g>
-	<path opacity="0.3" fill="#FFFFFF" enable-background="new    " d="M352.5,1399c-0.551,0-1.029,0.406-1.29,1H352v1h-1v1h1v1h-1v1h1
-		v1h-1v1h1v1h-1v1h1v1h-0.79c0.261,0.594,0.739,1,1.29,1c0.825,0,1.5-0.9,1.5-2v-7C354,1399.9,353.325,1399,352.5,1399z"/>
-</g>
-<g id="grater">
-	<path fill="#FFFFFF" d="M307,1393h-10c-2.2,0-4,1.8-4,4v2v18h2v-2h14v2h2v-19v-1C311,1394.8,309.2,1393,307,1393z M295,1396
-		c0-0.55,0.45-1,1-1h12c0.55,0,1,0.45,1,1v2h-14V1396z M296.484,1405.411c0.46,0,0.79,0.476,0.624,0.905l-0.631,1.232l-0.608-1.216
-		C295.696,1405.9,296.009,1405.411,296.484,1405.411z M296.478,1401.55l-0.608-1.216c-0.463-1.165,1.681-1.159,1.239-0.018
-		L296.478,1401.55z M296.868,1403.334c-0.463-1.165,1.681-1.159,1.239-0.018l-0.631,1.232L296.868,1403.334z M297.815,1400.08
-		c0-1.027,1.662-0.72,1.293,0.236l-0.631,1.232l-0.608-1.216C297.831,1400.239,297.815,1400.159,297.815,1400.08z M298.484,1405.411
-		c0.46,0,0.79,0.476,0.624,0.905l-0.631,1.232l-0.608-1.216C297.696,1405.9,298.009,1405.411,298.484,1405.411z M298.868,1403.334
-		c-0.463-1.165,1.681-1.159,1.239-0.018l-0.631,1.232L298.868,1403.334z M299.815,1400.08c0-1.027,1.662-0.72,1.293,0.236
-		l-0.631,1.232l-0.608-1.216C299.831,1400.239,299.815,1400.159,299.815,1400.08z M300.484,1405.411c0.46,0,0.79,0.476,0.624,0.905
-		l-0.631,1.232l-0.608-1.216C299.696,1405.9,300.009,1405.411,300.484,1405.411z M300.868,1403.334
-		c-0.463-1.165,1.681-1.159,1.239-0.018l-0.631,1.232L300.868,1403.334z M301.815,1400.08c0-1.027,1.662-0.72,1.293,0.236
-		l-0.631,1.232l-0.608-1.216C301.831,1400.239,301.815,1400.159,301.815,1400.08z M302.484,1405.411c0.46,0,0.79,0.476,0.624,0.905
-		l-0.631,1.232l-0.608-1.216C301.696,1405.9,302.009,1405.411,302.484,1405.411z M302.868,1403.334
-		c-0.463-1.165,1.681-1.159,1.239-0.018l-0.631,1.232L302.868,1403.334z M303.815,1400.08c0-1.027,1.662-0.72,1.293,0.236
-		l-0.631,1.232l-0.608-1.216C303.831,1400.239,303.815,1400.159,303.815,1400.08z M304.484,1405.411c0.46,0,0.79,0.476,0.624,0.905
-		l-0.631,1.232l-0.608-1.216C303.696,1405.9,304.009,1405.411,304.484,1405.411z M304.868,1403.334
-		c-0.463-1.165,1.681-1.159,1.239-0.018l-0.631,1.232L304.868,1403.334z M305.815,1400.08c0-1.027,1.662-0.72,1.293,0.236
-		l-0.631,1.232l-0.608-1.216C305.831,1400.239,305.815,1400.159,305.815,1400.08z M306.484,1405.411c0.46,0,0.79,0.476,0.624,0.905
-		l-0.631,1.232l-0.608-1.216C305.696,1405.9,306.009,1405.411,306.484,1405.411z M306.868,1403.334
-		c-0.463-1.165,1.681-1.159,1.239-0.018l-0.631,1.232L306.868,1403.334z M295.484,1402.411c0.46,0,0.79,0.476,0.624,0.905
-		l-0.631,1.232l-0.608-1.216C294.696,1402.9,295.009,1402.411,295.484,1402.411z M294.868,1409.334
-		c-0.463-1.165,1.681-1.159,1.239-0.018l-0.631,1.232L294.868,1409.334z M297.108,1412.316l-0.631,1.232l-0.608-1.216
-		C295.406,1411.169,297.549,1411.175,297.108,1412.316z M296.868,1409.334c-0.463-1.165,1.681-1.159,1.239-0.018l-0.631,1.232
-		L296.868,1409.334z M299.108,1412.316l-0.631,1.232l-0.608-1.216C297.406,1411.169,299.549,1411.175,299.108,1412.316z
-		 M298.868,1409.334c-0.463-1.165,1.681-1.159,1.239-0.018l-0.631,1.232L298.868,1409.334z M301.108,1412.316l-0.631,1.232
-		l-0.608-1.216C299.406,1411.169,301.549,1411.175,301.108,1412.316z M300.868,1409.334c-0.463-1.165,1.681-1.159,1.239-0.018
-		l-0.631,1.232L300.868,1409.334z M303.108,1412.316l-0.631,1.232l-0.608-1.216C301.406,1411.169,303.549,1411.175,303.108,1412.316
-		z M302.868,1409.334c-0.463-1.165,1.681-1.159,1.239-0.018l-0.631,1.232L302.868,1409.334z M305.108,1412.316l-0.631,1.232
-		l-0.608-1.216C303.406,1411.169,305.549,1411.175,305.108,1412.316z M304.868,1409.334c-0.463-1.165,1.681-1.159,1.239-0.018
-		l-0.631,1.232L304.868,1409.334z M307.108,1412.316l-0.631,1.232l-0.608-1.216C305.406,1411.169,307.549,1411.175,307.108,1412.316
-		z M306.868,1409.334c-0.463-1.165,1.681-1.159,1.239-0.018l-0.631,1.232L306.868,1409.334z M309.108,1412.316l-0.631,1.232
-		l-0.608-1.216C307.406,1411.169,309.549,1411.175,309.108,1412.316z M309.108,1406.316l-0.631,1.232l-0.608-1.216
-		C307.406,1405.169,309.549,1405.175,309.108,1406.316z M309.108,1400.316l-0.631,1.232l-0.608-1.216
-		C307.406,1399.169,309.549,1399.175,309.108,1400.316z"/>
-</g>
-<g id="pot">
-	<path fill="#FFFFFF" d="M267.5,1402H265v-2h-21v2h-2.5c-0.275,0-0.5,0.154-0.5,0.344c0,0.19,0.18,0.479,0.399,0.645l2.601,1.949
-		V1414c0,1.104,0.896,2,2,2h17c1.104,0,2-0.896,2-2v-9.062l2.6-1.949c0.22-0.165,0.4-0.454,0.4-0.645
-		C268,1402.154,267.775,1402,267.5,1402z M245.5,1414H245v-12h0.5V1414z M243,1398.5c0-0.275,0.225-0.5,0.5-0.5h0.5
-		c0-1.186,1.8-2,4-2h4v-1.5c0-0.276,0.224-0.5,0.5-0.5h4c0.275,0,0.5,0.224,0.5,0.5v1.5h4c2.2,0,4,0.814,4,2h0.5
-		c0.274,0,0.5,0.225,0.5,0.5s-0.226,0.5-0.5,0.5h-22C243.225,1399,243,1398.775,243,1398.5z"/>
-</g>
-<g id="coffe_x5F_cup">
-	<g>
-		<path fill="#FFFFFF" d="M196.325,1416l0.667,0.445c0.458,0.305,1.282,0.555,1.833,0.555h13.349c0.55,0,1.375-0.25,1.833-0.555
-			l0.667-0.445l2.325-2h-23L196.325,1416z"/>
-		<path fill="#FFFFFF" d="M216,1401h-1v-3h-19v8v3v1c0,1.656,1.343,3,3,3h13c1.657,0,3-1.344,3-3v-1h1c1.653,0,3-1.346,3-3v-2
-			C219,1402.346,217.654,1401,216,1401z M207.709,1406.957c-0.631,0.618-1.348,1.319-1.967,2.166l-0.242,0.331l-0.242-0.331
-			c-0.62-0.847-1.335-1.548-1.967-2.167c-1.017-0.994-1.818-1.78-1.818-2.728c0-1.27,1.119-2.383,2.396-2.383
-			c0.627,0,1.196,0.273,1.639,0.777c0.459-0.504,1.038-0.777,1.661-0.777c1.257,0,2.358,1.113,2.358,2.383
-			C209.526,1405.176,208.725,1405.962,207.709,1406.957z M217,1406c0,0.552-0.449,1-1,1h-1v-1v-3h1c0.551,0,1,0.448,1,1V1406z"/>
-	</g>
-	<path opacity="0.3" fill="#FFFFFF" enable-background="new    " d="M207.709,1406.957c-0.631,0.618-1.348,1.319-1.967,2.166
-		l-0.242,0.331l-0.242-0.331c-0.62-0.847-1.335-1.548-1.967-2.167c-1.017-0.994-1.818-1.78-1.818-2.728
-		c0-1.27,1.119-2.383,2.396-2.383c0.627,0,1.196,0.273,1.639,0.777c0.459-0.504,1.038-0.777,1.661-0.777
-		c1.257,0,2.358,1.113,2.358,2.383C209.526,1405.176,208.725,1405.962,207.709,1406.957z"/>
-</g>
-<g id="french_x5F_press">
-	<path fill="#FFFFFF" d="M165,1396c0-0.55-0.9-1-2-1h-5v-1c1.1,0,2-0.45,2-1s-0.9-1-2-1h-1c-1.101,0-2,0.45-2,1s0.899,1,2,1v1h-5
-		c-1.101,0-2,0.45-2,1v1h15V1396z"/>
-	<path fill="#FFFFFF" d="M169.5,1400.375c-0.438-1.059-1.75-1.375-2.724-1.375H165v-1h-15h-3l3,3v13c0,1.65,1.35,3,3,3h9
-		c1.649,0,3-1.35,3-3v-2.085c0.526-1.427,1.312-2.958,2.483-4.13C169.245,1406.024,169.983,1401.541,169.5,1400.375z M151.5,1414
-		H151v-13h0.5V1414z M166.07,1406.371c-0.395,0.395-0.746,0.82-1.069,1.262V1402v-1h1.776
-		C167.625,1401,167.635,1404.806,166.07,1406.371z"/>
-</g>
-<g id="tea_x5F_kettle">
-	<path fill="#FFFFFF" d="M112.64,1402c0.334-0.215,0.569-0.572,0.569-1c0-0.668-0.542-1.209-1.209-1.209s-1.209,0.541-1.209,1.209
-		c0,0.428,0.272,0.797,0.568,1c-1.501,0-3.359,1.102-3.359,2h8C116,1403.102,114.219,1402,112.64,1402z"/>
-	<path fill="#FFFFFF" d="M119,1408.037v-2.938c0.05,0.481,0.427,0.9,0.926,0.9c0.017,0,0.034,0,0.051,0
-		c0.529,0,0.971-0.415,0.998-0.95l0.008-0.14c0.01-0.154,0.019-0.31,0.019-0.466c0-6.735-3.191-10.444-8.984-10.444
-		s-8.983,3.709-8.983,10.444c0,0.156,0.008,0.312,0.018,0.466l0.008,0.14c0.028,0.553,0.508,0.975,1.049,0.949
-		c0.427-0.021,0.771-0.309,0.896-0.691v1.969c-1.821,1.356-2.5,3.225-2.5,3.225l-4.383-2.789l-1.495,1.494L103.5,1417H118
-		c0,0,4-0.229,4-4C121.637,1410.862,120.312,1409.205,119,1408.037z M116,1406v-1h-8v1c-0.757,0.126-1.42,0.359-2,0.652v-2.152
-		c0-0.275-0.226-0.5-0.5-0.5c-0.215,0-0.396,0.14-0.466,0.332c0.03-5.604,2.313-8.332,6.98-8.332c4.7,0,6.984,2.762,6.984,8.444
-		c0,0.016-0.001,0.029-0.002,0.046c-0.005-0.271-0.228-0.49-0.498-0.49c-0.275,0-0.5,0.225-0.5,0.5v2.727
-		C116.897,1406.418,116,1406,116,1406z"/>
-</g>
-<g id="celebration_1_">
-	<path id="celebration" fill="#FFFFFF" d="M71,1395h-5v-2c0-0.55,0.45-1,1-1h3c0.55,0,1,0.45,1,1V1395z M62,1404H50l5,5.5v6.5h-3v1
-		h8v-1h-3v-6.5L62,1404z M74,1404v12c0,0.55-0.45,1-1,1h-9c-0.55,0-1-0.45-1-1v-12c0-2,3-3,3-5v-3h5v3C71,1401,74,1402,74,1404z
-		 M64.5,1405H64v11h0.5V1405z"/>
-</g>
-<g id="skull">
-	<path fill="#FFFFFF" d="M14,1393c-11.107,0-10.056,9-10.056,9L5,1404l1,5l3.5,1l1.168,2h6.664l1.168-2l3.5-1l1-5l1.055-2
-		C24.055,1402,25.107,1393,14,1393z M10.3,1407h-1c-0.715,0-1.3-0.585-1.3-1.3v-1.4c0-0.715,0.585-1.3,1.3-1.3h2.4
-		c0.715,0,1.105,0.553,0.869,1.227l-0.541,1.547C11.793,1406.447,11.015,1407,10.3,1407z M15,1410h-2
-		c-0.55,0-0.75-0.375-0.445-0.832l0.891-1.336c0.306-0.457,0.806-0.457,1.109,0l0.891,1.336C15.75,1409.625,15.55,1410,15,1410z
-		 M20,1405.7c0,0.715-0.585,1.3-1.3,1.3h-1c-0.716,0-1.493-0.553-1.729-1.227l-0.541-1.548c-0.236-0.674,0.155-1.227,0.87-1.227h2.4
-		c0.715,0,1.3,0.585,1.3,1.3V1405.7z"/>
-	<polygon fill="#FFFFFF" points="17,1414 11,1414 8,1411 7,1411 9,1416 10,1416 11,1417 17,1417 18,1416 19,1416 21,1411 20,1411 	
-		"/>
-</g>
-<g id="bomb">
-	<path fill="#FFFFFF" d="M460,1348.449l-2.604-0.766l1.301-2.382l-2.383,1.302l-0.764-2.604l-0.767,2.604l-2.381-1.302l1.301,2.382
-		l-2.604,0.766l1.727,0.507c-0.545,0.228-1.258,0.416-1.905,0.233c-0.621-0.175-1.113-0.676-1.464-1.488
-		c-0.801-1.87-2.562-2.88-4.284-2.525c-1.625,0.333-2.675,1.824-2.675,3.824H440v2.422c-3,1.236-6.002,4.561-6.002,8.477
-		c0,4.972,4.03,9,9.002,9c4.971,0,9-4.028,9-9c0-3.916-2-7.239-6-8.477V1349h-2.5c0-2,0.969-2.659,1.875-2.845
-		c1.057-0.215,2.446,0.289,3.165,1.966c0.474,1.104,1.185,1.785,2.111,2.045c0.277,0.078,0.558,0.104,0.832,0.104
-		c0.711,0,1.383-0.225,1.896-0.453l-0.976,1.781l2.381-1.301l0.767,2.603l0.764-2.604l2.383,1.301l-1.301-2.382L460,1348.449z
-		 M441,1350h0.5v1H441V1350z"/>
-</g>
-<g id="scissors">
-	<path fill="#FFFFFF" d="M408.96,1359.299l-0.941-0.941c-1.436-1.435-3.875-1.549-5.186-0.235c-0.375,0.375-0.636,0.832-0.791,1.331
-		l-1.608-1.417L402,1354c0,0,0-1.008,0-4.004c0-5.996-5-6.996-5-6.996v11.793l-8.148-8.339c0,0-2.729,4.243,1.508,8.481
-		c2.119,2.118,2.688,2.832,2.688,2.832l3.952,1.61v2.006c0-0.239-0.961-0.385-1.5-0.385c-1.931,0-3.5,1.721-3.5,3.835v1.33
-		c0,2.114,1.569,3.835,3.5,3.835c1.93,0,3.5-1.721,3.5-3.835v-5.276l0.459-0.618l0.725,0.247l3.801,3.73
-		c0.761,0.76,1.796,1.194,2.823,1.194c0.915,0,1.764-0.341,2.381-0.959c0.676-0.676,1.02-1.602,0.956-2.605
-		C410.084,1360.92,409.665,1360.004,408.96,1359.299z M397,1366.165c0,0.995-0.688,1.835-1.5,1.835c-0.812,0-1.5-0.84-1.5-1.835
-		v-1.33c0-0.995,0.688-1.835,1.5-1.835c0.812,0,1.5,0.84,1.5,1.835V1366V1366.165z M407.782,1363.07
-		c-0.31,0.308-0.693,0.373-0.963,0.373c-0.501,0-1.009-0.224-1.396-0.609l-0.941-0.941c-0.36-0.359-0.575-0.817-0.604-1.29
-		c-0.027-0.424,0.104-0.803,0.369-1.066c0.307-0.309,0.69-0.372,0.961-0.372c0.5,0,1.01,0.222,1.396,0.607l0.941,0.941
-		c0.359,0.36,0.575,0.818,0.604,1.29C408.177,1362.427,408.046,1362.806,407.782,1363.07z"/>
-</g>
-<g id="leather">
-	<path fill="#FFFFFF" d="M361.787,1354.286c0.626-2.62-0.166-4.354-1.89-5.812C354.35,1351.205,353,1345,353,1345h-5
-		c0,0-1.351,6.209-6.898,3.479c-1.723,1.459-2.515,3.196-1.889,5.816c3.332,2.172,2.783,8.085,0,9.874
-		c0.099,2.021,1.458,3.923,3.28,4.155c1.855-1.393,4.138-3.324,7.507-0.324h1c3.369-3,5.649-1.068,7.507,0.324
-		c1.822-0.232,3.182-2.151,3.28-4.173C359.004,1362.362,358.455,1356.458,361.787,1354.286z M350.5,1350.263
-		c-0.976,0-1.764-0.788-1.764-1.763s0.788-1.763,1.764-1.763c0.975,0,1.763,0.788,1.763,1.763S351.475,1350.263,350.5,1350.263z"/>
-</g>
-<g id="fabric_1_">
-	<polygon id="fabric" fill="#FFFFFF" points="313,1352 315.5,1349.5 312.5,1346.5 310,1349 307.5,1346.5 305,1349 302.5,1346.5 
-		300,1349 297.5,1346.5 295,1349 292.5,1346.5 289.5,1349.5 292,1352 289.5,1354.5 292,1357 289.5,1359.5 292,1362 289.5,1364.5 
-		292.5,1367.5 295,1365 297.5,1367.5 300,1365 302.5,1367.5 305,1365 307.5,1367.5 310,1365 312.5,1367.5 315.5,1364.5 313,1362 
-		315.5,1359.5 313,1357 315.5,1354.5 	"/>
-</g>
-<g id="sweater">
-	<path fill="#FFFFFF" d="M268.729,1362.876l-6.283-12.407c-0.097-0.258-0.518-0.557-0.771-0.665l-4.675-1.94v-2.362
-		c0-0.275-0.208-0.5-0.482-0.5H252.5c-0.275,0-0.5,0.225-0.5,0.5v2.362l-4.667,1.94c-0.253,0.108-0.666,0.407-0.763,0.665
-		l-6.282,12.407c0,0.275-1.011,1.417,0.864,2.417s2.282-0.5,2.907-1.209l4.655-7.609c0.087-0.262,0.285-0.25,0.285,0.025v11.5v0.5
-		c0,0.276,0.224,0.5,0.5,0.5h10.018c0.276,0,0.482-0.224,0.482-0.5v-0.5v-11.5c0-0.275,0.207-0.287,0.293-0.025l4.659,7.609
-		c0.625,0.709,1.033,2.209,2.908,1.209S268.729,1363.151,268.729,1362.876z"/>
-</g>
-<g id="pants">
-	<path fill="#FFFFFF" d="M200,1347l-3,22h7l2-16h1l2,16h7l-3-22v-2h-13V1347z"/>
-</g>
-<g id="t-shirt">
-	<path fill="#FFFFFF" d="M162.016,1346c0.01,0.083-0.547,3.5-3.983,3.5c-3.438,0-4.012-3.415-4-3.5L144,1354l4,4l4-2.671V1368
-		c0,0.55,0.45,1,1,1h10c0.55,0,1-0.45,1-1v-12.671l4,2.671l4-4L162.016,1346z"/>
-</g>
-<g id="cardio">
-	<polygon fill="#FFFFFF" points="112.047,1369.688 108.697,1356.996 106,1365 97,1365 104.035,1363 108.927,1344.504 
-		112.621,1361.562 115.311,1353.226 117.229,1363 122,1365 116.294,1365 115.38,1362.399 	"/>
-</g>
-<g id="bullets">
-	<g id="bullets_1_">
-		<g>
-			<path fill="#FFFFFF" d="M52,1361h-1v-7h1V1361z M53,1346h-1v7h1V1346z M50,1369h1v-7h-1V1369z M62,1362l1,1v5l-1,1H52v-7H62z
-				 M62,1363h-9v0.5h9V1363z M67,1352h-1v-5h1h2l7.021,2.5L69,1352H67z M67,1348.5h2v-0.5h-2V1348.5z M64,1353H54v-7h10l1,1v5
-				L64,1353z M55,1347.5h9v-0.5h-9V1347.5z M67,1363l7.021,2.5L67,1368h-2h-1v-5h1H67z M67,1364h-2v0.5h2V1364z M68,1355l7.021,2.5
-				L68,1360h-2h-1v-5h1H68z M68,1356h-2v0.5h2V1356z M64,1360l-1,1H53v-7h10l1,1V1360z M63,1355h-9v0.5h9V1355z"/>
-		</g>
-	</g>
-</g>
-<g id="settings_1_">
-	<path fill="#FFFFFF" d="M17.859,1358.845l6.42,5.879c0.207,0.186,0.214,0.496,0.021,0.692l-3.504,3.502
-		c-0.195,0.195-0.508,0.188-0.693-0.017l-5.768-6.36L17.859,1358.845z M5.28,1352.518c0.277-0.013,0.664,0.137,0.861,0.33
-		l2.997,2.956l1.918-1.797L8,1350.992c-0.197-0.193-0.349-0.577-0.336-0.854l0.022-0.518c0.013-0.277-0.166-0.627-0.397-0.776
-		l-2.84-1.841c-0.23-0.151-0.58-0.114-0.775,0.081l-1.438,1.438c-0.194,0.194-0.231,0.546-0.082,0.776l1.832,2.843
-		c0.15,0.231,0.5,0.411,0.777,0.398L5.28,1352.518z M25.578,1351.026l-4.828,2.432L17.969,1349l4.975-2.657
-		c-1.933-1.376-4.003-1.227-5.885-0.168c-2.468,1.391-3.556,4.263-2.712,6.843l-11.518,11.519c-0.39,0.389-0.39,1.024,0,1.414
-		l2.122,2.121c0.389,0.389,1.024,0.389,1.413,0l1.415-1.414l10.039-10.04c1.534,0.547,3.302,0.428,4.861-0.448
-		C24.561,1355.11,25.751,1353.396,25.578,1351.026z"/>
-</g>
-<g id="tablet">
-	<path fill="#FFFFFF" d="M447,1300v-2h-1v-4h-1v4h-1v2h-11v19h25v-19H447z M436,1307h-2v-5h2V1307z M454,1314h-17v-12h17V1314z
-		 M457,1307h-2v-5h2V1307z"/>
-	<g opacity="0.5">
-		<rect x="437" y="1302" fill="#FFFFFF" width="17" height="12"/>
-	</g>
-	<g opacity="0.3">
-		<rect x="455" y="1302" fill="#FFFFFF" width="2" height="5"/>
-	</g>
-	<g opacity="0.3">
-		<rect x="434" y="1302" fill="#FFFFFF" width="2" height="5"/>
-	</g>
-</g>
-<g id="birthday_x5F_cake_2_">
-	<g opacity="0.5">
-		<path fill="#FFFFFF" d="M390,1297c0,0.553,0.446,1,1,1c0.553,0,1-0.447,1-1c0,0,0-1-1-3C390,1296,390,1297,390,1297z M394,1292
-			c1,2,1,3,1,3c0,0.553-0.447,1-1,1c-0.554,0-1-0.447-1-1C393,1295,393,1294,394,1292z M398,1294c1,2,1,3,1,3c0,0.553-0.447,1-1,1
-			c-0.554,0-1-0.447-1-1C397,1297,397,1296,398,1294z M402,1292c1,2,1,3,1,3c0,0.553-0.447,1-1,1c-0.554,0-1-0.447-1-1
-			C401,1295,401,1294,402,1292z M406,1297c0,0.553-0.447,1-1,1c-0.554,0-1-0.447-1-1c0,0,0-1,1-3C406,1296,406,1297,406,1297z"/>
-	</g>
-	<path fill="#FFFFFF" d="M388.059,1312.461c0.593,0.67,0.562,1.725,0.791,2.544c0.818-0.575,1.89-1.817,3.002-1.274
-		c0.896,0.436,1.084,1.68,1.506,2.479c0.666-0.677,1.398-1.968,2.502-1.846c1.101,0.09,1.575,1.481,2.146,2.231
-		c0.545-0.771,1.054-2.144,2.147-2.231c1.137,0,1.771,1.16,2.5,1.846c0.382-0.807,0.615-2.046,1.493-2.475
-		c1.13-0.553,2.166,0.724,3.015,1.271c0.198-0.815,0.195-1.877,0.779-2.54c0.838-0.95,2.164-0.121,3.061,0.272v-0.723V1312v-4
-		h-0.062c-0.271-0.995-1.938-1.915-3.938-2.642V1304c0,0-0.442-0.851-1-1.221v-3.279c0-0.275-0.226-0.5-0.5-0.5h-1
-		c-0.275,0-0.5,0.225-0.5,0.5v2.4c-0.316-0.097-0.646-0.188-1-0.269v-4.133c0-0.275-0.226-0.5-0.5-0.5h-1
-		c-0.275,0-0.5,0.225-0.5,0.5v3.797c-0.639-0.077-1.306-0.132-2-0.158v-1.639c0-0.275-0.226-0.5-0.5-0.5h-1
-		c-0.275,0-0.5,0.225-0.5,0.5v1.639c-0.695,0.026-1.362,0.081-2,0.158v-3.797c0-0.275-0.226-0.5-0.5-0.5h-1
-		c-0.275,0-0.5,0.225-0.5,0.5v4.133c-0.354,0.081-0.685,0.172-1,0.269v-2.4c0-0.275-0.226-0.5-0.5-0.5h-1
-		c-0.275,0-0.5,0.225-0.5,0.5v3.047v0.232c-0.559,0.37-1,1.221-1,1.221v1.234c-2.28,0.744-3.65,1.715-3.938,2.766H385v4v0.015
-		c0,0,0,0.296,0,0.718C385.144,1312.67,387.333,1311.639,388.059,1312.461z M390.176,1303.873c0,0,0.199,0.127,0.324,0.127h1
-		c0.274,0,0.5-0.225,0.5-0.5v-0.562c0.308-0.102,0.652-0.197,1.029-0.288c0.064,0.2,0.247,0.351,0.471,0.351h1
-		c0.274,0,0.5-0.225,0.5-0.5v-0.201c0.613-0.076,1.276-0.133,2-0.16v2.361c0,0.275,0.225,0.5,0.5,0.5h1c0.274,0,0.5-0.225,0.5-0.5
-		v-2.361c0.723,0.027,1.386,0.084,2,0.16v1.201c0,0.275,0.225,0.5,0.5,0.5h1c0.274,0,0.5-0.225,0.5-0.5v-0.843
-		c0.364,0.089,0.701,0.183,1,0.28v0.562c0,0.275,0.225,0.5,0.5,0.5h1c0.125,0,0.235-0.051,0.324-0.127
-		c0.815,0.84-2.422,1.678-2.891,1.791c-1.612,0.389-3.278,0.532-4.935,0.532c-1.657,0-3.321-0.145-4.935-0.532
-		C392.598,1305.551,389.359,1304.713,390.176,1303.873C390.264,1303.949,390.176,1303.873,390.176,1303.873z M388.883,1307h0.509
-		c0.861,0.767,2.116,1.145,3.204,1.438c1.757,0.476,3.587,0.688,5.404,0.688c1.816,0,3.646-0.213,5.403-0.688
-		c1.089-0.293,2.344-0.671,3.204-1.438h0.51c0.258,0.134,2.521,1.085,2.368,1.561c-0.169,0.531-1.025,0.881-1.473,1.089
-		c-3.057,1.424-6.692,1.717-10.014,1.717c-3.32,0-6.955-0.289-10.015-1.706c-0.444-0.206-1.304-0.553-1.473-1.083
-		C386.359,1308.092,388.621,1307.136,388.883,1307z M411,1314.439v1.894c0,1.688-2.409,2.586-3.686,3.022
-		c-2.966,1.016-6.196,1.312-9.314,1.312c-3.037,0-6.166-0.286-9.067-1.229c-1.326-0.431-3.933-1.337-3.933-3.104
-		c0,0,0-1.062,0-1.894l0.088-0.027c0.632-0.195,1.196-0.557,1.822-0.766c0.293,0.914,0.188,2.297,1.11,2.87
-		c1.138,0.708,2.298-0.702,3.16-1.261c0.468,0.835,0.638,2.206,1.648,2.587c1.249,0.472,2.122-1.109,2.868-1.813
-		c0.621,0.772,1.104,2.287,2.3,2.287c1.183,0,1.688-1.496,2.288-2.285c0.75,0.654,1.458,2.079,2.645,1.879
-		c1.174-0.199,1.421-1.78,1.882-2.653c0.189,0.114,0.729,0.539,0.729,0.539c0.766,0.601,1.98,1.454,2.782,0.41
-		c0.55-0.714,0.519-1.72,0.758-2.553C409.713,1313.848,411,1314.439,411,1314.439z"/>
-</g>
-<g id="pizza">
-	<path fill="#FFFFFF" d="M355.834,1298.041l-0.893-2.736c-3.713,1.297-7.109,3.287-10.37,6.602c-3.26,3.313-5.304,6.656-6.6,10.37
-		l2.715,0.911C343.729,1306.062,348.938,1301.041,355.834,1298.041z"/>
-	<path fill="#FFFFFF" d="M356.403,1299.688c0,0-5.216,2.562-8.652,6.062c-3.438,3.5-5.396,7.986-5.396,7.986l8.646,2.882v1.784
-		c0,0.624,0.498,1.244,1.106,1.38l0.785,0.174c0.609,0.136,1.107-0.265,1.107-0.888v-1.45l1,0.333v3.884
-		c0,0.624,0.608,1.295,1.201,1.492l1.973,0.617c0.592,0.196,0.826-0.151,0.826-0.775v-3.884l1,0.333v2.551
-		c0,0.624,0.483,1.295,1.075,1.492l0.849,0.282c0.592,0.197,1.076-0.15,1.076-0.774v-3.691L356.403,1299.688z M351.509,1315.642
-		l-5.896-1.979c0,0-0.005-1.531,0.96-2.604c1.316-1.318,3.461-1.318,4.776,0C352.609,1312.317,352.652,1314.314,351.509,1315.642z
-		 M352.584,1308.209c-0.679,0.678-1.776,0.678-2.454,0c-0.677-0.677-0.677-1.775,0-2.453c0.678-0.678,1.775-0.678,2.454,0
-		C353.261,1306.434,353.261,1307.532,352.584,1308.209z M356.258,1315.204c-0.498,0.498-1.305,0.498-1.801,0
-		c-0.498-0.496-0.498-1.302,0-1.8c0.496-0.498,1.303-0.498,1.801,0C356.754,1313.902,356.754,1314.708,356.258,1315.204z
-		 M355.294,1308.939c-1.08-1.078-1.081-2.834,0-3.916c0.401-0.401,0.898-0.636,1.417-0.735l1.793,5.151
-		C357.464,1309.969,356.164,1309.811,355.294,1308.939z M360.419,1316.043c-0.587,0.587-1.537,0.587-2.124,0
-		c-0.586-0.585-0.586-1.535,0-2.122c0.587-0.587,1.537-0.587,2.124,0C361.004,1314.508,361.004,1315.458,360.419,1316.043z"/>
-</g>
-<g id="cutlery">
-	<path fill="#FFFFFF" d="M308.5,1297.028c-0.167,0-3.5,0.972-3.5,3.972v9h-0.5c-0.275,0-0.5,0.225-0.5,0.5v10
-		c0,0.275,0.225,0.5,0.5,0.5h4c0.274,0,0.5-0.225,0.5-0.5v-9.5c0,0,0-12.972,0-13.472S308.667,1297.028,308.5,1297.028z"/>
-	<path fill="#FFFFFF" d="M300,1297.528V1303c-0.309,0-0.648,0-1,0v-5.472l-0.5-0.5l-0.5,0.5V1303c-0.353,0-0.692,0-1,0v-5.472
-		l-0.5-0.5l-0.5,0.5v4.972c0,1,1,3,1,4v3.5h-0.5c-0.275,0-0.5,0.225-0.5,0.5v10c0,0.275,0.225,0.5,0.5,0.5h4
-		c0.274,0,0.5-0.225,0.5-0.5v-10c0-0.275-0.226-0.5-0.5-0.5H300v-3.5c0-1.5,1-3,1-4v-4.972l-0.5-0.5L300,1297.528z"/>
-</g>
-<g id="fast_x5F_food_1_">
-	<path fill="#FFFFFF" d="M264.125,1298.969l-0.629,3.031H269v2h-1.158l-1.801,17H257l-1.82-17h-1.158v-2h7.183l1.202-5H269v1.969
-		H264.125z M244.5,1321h7c1.648,0,3-1.35,3-3h-13C241.5,1319.65,242.851,1321,244.5,1321z M248.001,1310
-		c-4.501,0-6.501,1.779-6.501,3.979h13C254.5,1311.779,252.502,1310,248.001,1310z M254.5,1315.021h-13c-0.275,0-0.5,0.225-0.5,0.5
-		v0.979c0,0.275,0.225,0.5,0.5,0.5h13c0.274,0,0.5-0.225,0.5-0.5v-0.979C255,1315.245,254.775,1315.021,254.5,1315.021z"/>
-</g>
-<g id="beer">
-	<path fill="#FFFFFF" d="M217.276,1306.161c-0.587-0.771-1.493-1.161-2.666-1.161H212v-0.312c0,0,1.18-0.52,1.696-1.168
-		c0.298-0.407,0.521-0.707,0.412-2.082c-0.108-1.375-2.266-2.594-3.663-1.862c-0.509-0.84-1.15-1.328-2.088-1.525
-		c-0.197-0.042-0.402-0.062-0.608-0.062c-0.691,0-1.343,0.229-1.876,0.561c-0.699-0.79-1.837-1.459-3.461-1.459
-		c-0.99,0-1.834,0.43-2.377,1.211c-0.256,0.366-0.427,0.78-0.533,1.2c-0.428-0.139-0.896-0.212-1.396-0.212
-		c-1.714,0-3.106,1.512-3.106,3.369c0,1.037,1,1.781,1,3.172v4.17v9c0,1.104,0.839,2,1.942,2h12c1.104,0,2.058-0.896,2.058-2v-2
-		v-0.117c2-0.334,4.161-1.43,5.144-5.008C217.881,1309.191,218.153,1307.312,217.276,1306.161z M201,1317.498c0,0.55-0.45,1-1,1
-		s-1-0.45-1-1c0,0,0-4.936,0-5.311c1.312,0,2-1.095,2-1.984C201,1310.844,201,1317.498,201,1317.498z M205,1317.498
-		c0,0.55-0.45,1-1,1s-1-0.45-1-1v-8.953c0-0.559,0.047-1.445,0.375-1.998c0.25-0.422,1.625-0.609,1.625-0.609V1317.498z M209,1316
-		v1.498c0,0.55-0.45,1-1,1s-1-0.45-1-1v-11.779c0.97-0.117,2-0.266,2-0.266V1316z M203.641,1304.266
-		c-1.278,0.188-1.781,1.281-1.844,2.267c-0.038,0.601-0.235,1.328-0.747,1.328c-0.568,0-0.831-0.462-0.951-0.845
-		c-0.085-0.27-0.099,0.013-0.099,0.013v2.862c0,0.478-0.33,1-1.001,1s-0.999-0.532-0.999-1.016v-3.688
-		c0-2.226-2.142-4.095-0.031-5.078c1.219-0.5,2.578,0.922,2.578,0.922s-0.135-2.981,2.031-3.078
-		c2.108-0.094,2.708,1.441,2.938,2.547c0.5-1.292,1.438-1.938,2.438-1.75c0.983,0.234,1.483,1.688,1.483,1.688
-		c0.688-0.75,3-0.854,3,0.642C212.438,1304.401,204.465,1304.145,203.641,1304.266z M215.362,1311.5
-		c-0.636,2.312-2.361,3.029-3.361,3.35V1314v-7h2.883c0.695,0,0.953,0.213,1.075,0.374
-		C216.169,1307.65,216.113,1308.763,215.362,1311.5z"/>
-	<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M201,1317.498c0,0.55-0.45,1-1,1s-1-0.45-1-1
-		c0,0,0-4.936,0-5.311c1.312,0,2-1.095,2-1.984C201,1310.844,201,1317.498,201,1317.498z"/>
-	<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M205,1317.498c0,0.55-0.45,1-1,1s-1-0.45-1-1v-8.953
-		c0-0.559,0.047-1.445,0.375-1.998c0.25-0.422,1.625-0.609,1.625-0.609V1317.498z"/>
-	<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M209,1316v1.498c0,0.55-0.45,1-1,1s-1-0.45-1-1v-11.779
-		c0.97-0.117,2-0.266,2-0.266V1316z"/>
-</g>
-<g id="drink">
-	<path fill="#FFFFFF" d="M165.496,1305l2.625-8h-1.939l-2.675,8h-4.183c0.123-0.48,0.196-0.98,0.196-1.5
-		c0-3.32-2.701-6.021-6.021-6.021c-3.32,0-6.021,2.701-6.021,6.021s2.701,6.021,6.021,6.021c1.557,0,2.972-0.6,4.042-1.571L160,1321
-		h7l3-16H165.496z M148.801,1302.923c0.084-0.919,0.378-1.637,0.983-2.399l0.139-0.176l2.853,2.854h-3.785l-0.21-0.06
-		L148.801,1302.923z M149.794,1306.467c-0.621-0.779-0.909-1.472-0.992-2.375l-0.049-0.292h4.021l-2.842,2.843L149.794,1306.467z
-		 M153.2,1308.01l-0.061,0.21l-0.219-0.021c-0.918-0.085-1.635-0.379-2.398-0.982l-0.176-0.14l2.854-2.854V1308.01L153.2,1308.01z
-		 M153.2,1302.775l-2.853-2.852l0.175-0.14c0.773-0.615,1.465-0.9,2.377-0.983l0.3-0.04L153.2,1302.775L153.2,1302.775z
-		 M157.216,1300.523c0.605,0.764,0.9,1.478,0.992,2.448l0.03,0.229h-4.015l2.854-2.854L157.216,1300.523z M153.8,1298.99l0.06-0.21
-		l0.22,0.021c0.919,0.085,1.637,0.379,2.398,0.981l0.176,0.14l-2.854,2.854V1298.99L153.8,1298.99z M156.477,1307.216
-		c-0.772,0.614-1.465,0.899-2.45,0.992l-0.227,0.03v-4.015l2.853,2.854L156.477,1307.216z M157.049,1306.624l-2.963-2.963
-		l4.146-0.002l-0.031,0.331c-0.095,0.902-0.444,1.753-1.012,2.46L157.049,1306.624z"/>
-</g>
-<g id="cake_2_">
-	<polygon fill="#FFFFFF" points="121,1313.429 99,1317 99,1313 121,1309.429 	"/>
-	<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M121,1317.429L99,1321v-4l22-3.571V1317.429z M121,1305.143
-		l-22,3.715V1313l22-3.571V1305.143z"/>
-	<path fill="#FFFFFF" d="M108,1297c8,0,13,0,13,6.143l-22,3.715L108,1297z"/>
-</g>
-<g id="ring_2_">
-	<path fill="#FFFFFF" d="M61.565,1307.406l-2.619-2.812c0,0,1.303,0.781,2.583,0.781c1.281,0,2.417-0.781,2.417-0.781
-		L61.565,1307.406z M67.855,1303.646l-3.13,3.131c1.743,1.021,3.251,3.11,3.111,5.957c-0.134,2.723-3.186,5.744-6.392,5.744
-		s-6.355-2.961-6.492-5.744c-0.142-2.847,1.366-4.938,3.11-5.957l-3.131-3.131c-2.84,2.209-3.664,4.452-3.652,7.281
-		c0.022,5.459,3.846,9.828,10.173,9.828c6.325,0,10.136-4.369,10.157-9.828C71.623,1308.1,70.696,1305.855,67.855,1303.646z
-		 M61.488,1298.709c-0.44,0-0.856-0.09-1.25-0.232L58.946,1303c0,0,1.192,0.891,2.506,0.891c1.312,0,2.494-0.891,2.494-0.891
-		l-1.285-4.5C62.291,1298.625,61.9,1298.709,61.488,1298.709z M58.631,1297.314L54.946,1301l2,2l2.208-5.151
-		C58.961,1297.688,58.787,1297.512,58.631,1297.314z M67.946,1301l-2,2l-2.187-5.101c0.202-0.16,0.384-0.341,0.547-0.538
-		L67.946,1301z M59.691,1297c0.476,0.436,1.103,0.709,1.797,0.709c0.693,0,1.321-0.273,1.797-0.709H59.691z"/>
-</g>
-<g id="shield">
-	<path fill="#FFFFFF" d="M14,1297c-7,0-11,3-11,3v4c0.479,14.129,11,17,11,17s10.521-2.871,11-17v-4C25,1300,21,1297,14,1297z
-		 M14,1317.799V1308H6.527c-0.278-1.213-0.473-2.548-0.526-4.053v-2.232c1.417-0.693,4-1.715,6-1.715c0.098,0,1.899,0,2,0v8
-		l7.344-0.016l0.129,0.016C19.985,1314.464,15.794,1317,14,1317.799z"/>
-</g>
-<g id="keyboard_x5F_wired_1_">
-	<path id="keyboard_x5F_wired" fill="#FFFFFF" d="M452,1265h4v3h-4V1265z M453,1264h3v-3h-3V1264z M456,1255h-5v1h5V1255z M456,1257
-		h-5v3h5V1257z M452,1261h-3v3h3V1261z M441,1261v3h3v-3H441z M439,1268h12v-3h-12V1268z M445,1261v3h3v-3H445z M450,1255h-3v1h3
-		V1255z M438,1255h-3v1h3V1255z M440,1261h-5v3h5V1261z M459,1253v17c0,0.55-0.45,1-1,1h-25c-0.551,0-1-0.45-1-1v-17
-		c0-0.55,0.449-1,1-1h11v-2h1v-4h1v4h1v2h11C458.55,1252,459,1252.45,459,1253z M457,1254h-23v15h23V1254z M438,1257h-3v3h3V1257z
-		 M438,1265h-3v3h3V1265z M442,1255h-3v1h3V1255z M446,1257h-3v3h3V1257z M442,1257h-3v3h3V1257z M446,1255h-3v1h3V1255z M450,1257
-		h-3v3h3V1257z"/>
-</g>
-<g id="keyboard_x5F_wireless_4_">
-	<path fill="#FFFFFF" d="M412,1253v17c0,0.55-0.45,1-1,1h-25c-0.55,0-1-0.45-1-1v-17c0-0.55,0.45-1,1-1h25
-		C411.55,1252,412,1252.45,412,1253z M410,1254h-23v15h23V1254z M406,1264h3v-3h-3V1264z M409,1255h-5v1h5V1255z M405,1268h4v-3h-4
-		V1268z M394,1261v3h3v-3H394z M392,1268h12v-3h-12V1268z M409,1257h-5v3h5V1257z M405,1261h-3v3h3V1261z M398,1261v3h3v-3H398z
-		 M395,1257h-3v3h3V1257z M391,1255h-3v1h3V1255z M393,1261h-5v3h5V1261z M391,1257h-3v3h3V1257z M391,1265h-3v3h3V1265z M399,1257
-		h-3v3h3V1257z M399,1255h-3v1h3V1255z M395,1255h-3v1h3V1255z M403,1257h-3v3h3V1257z M403,1255h-3v1h3V1255z"/>
-</g>
-<g id="credit_x5F_card">
-	<g>
-		<g>
-			<path fill="#FFFFFF" d="M362,1252h-24c-0.55,0-1,0.45-1,1v3h26v-3C363,1252.45,362.55,1252,362,1252z"/>
-		</g>
-		<g>
-			<path fill="#FFFFFF" d="M337,1270c0,0.55,0.45,1,1,1h24c0.55,0,1-0.45,1-1v-11h-26V1270z M361,1261h1v1h-1V1261z M359,1261h1v1
-				h-1V1261z M350,1261h8v1h-8V1261z M339,1266h7v3h-7V1266z"/>
-		</g>
-	</g>
-	<g opacity="0.3">
-		<rect x="339" y="1266" fill="#FFFFFF" width="7" height="3"/>
-	</g>
-</g>
-<g id="flag_1_">
-	<path fill="#FFFFFF" d="M295,1249.75c0,0.086,0,22.25,0,22.25h-0.03c0.02,0,0.03-0.086,0.03,0c0,0.689-0.672,1.125-1.5,1.125
-		s-1.5-0.372-1.5-1.062c0-0.086,0.011-0.062,0.029-0.062H292c0,0,0-22.164,0-22.25c0-0.69,0.672-1.25,1.5-1.25
-		S295,1249.061,295,1249.75z M302,1251c-4,0-6-1.5-6-1.5v13c0,0,2,1.5,6,1.5s5.5-3.5,11-1.5c0-0.881,0-12.068,0-13
-		C307.5,1247.5,306,1251,302,1251z"/>
-</g>
-<g id="electrical_x5F_plug">
-	<path fill="#FFFFFF" d="M262.5,1255H260v-6c0-0.553-0.448-1-1-1c-0.553,0-1,0.447-1,1v6h-8v-6c0-0.553-0.448-1-1-1
-		c-0.553,0-1,0.447-1,1v6h-2.5c-0.276,0-0.5,0.224-0.5,0.5v2.5c0,3,5,6.482,5,11.301V1271h2v2h4v-2h2v-1.699
-		c0-4.817,5-8.301,5-11.301v-2.5C263,1255.224,262.776,1255,262.5,1255z M255.5,1264h-3c-0.276,0-0.5-0.224-0.5-0.5
-		s0.224-0.5,0.5-0.5h3c0.275,0,0.5,0.224,0.5,0.5S255.776,1264,255.5,1264z M256.5,1262h-5c-0.275,0-0.5-0.225-0.5-0.5
-		s0.225-0.5,0.5-0.5h5c0.274,0,0.5,0.225,0.5,0.5S256.775,1262,256.5,1262z M257.5,1260h-7c-0.275,0-0.5-0.225-0.5-0.5
-		s0.225-0.5,0.5-0.5h7c0.274,0,0.5,0.225,0.5,0.5S257.775,1260,257.5,1260z M258.5,1258h-9c-0.275,0-0.5-0.225-0.5-0.5
-		s0.225-0.5,0.5-0.5h9c0.274,0,0.5,0.225,0.5,0.5S258.775,1258,258.5,1258z"/>
-</g>
-<g id="vcard">
-	<path fill="#FFFFFF" d="M195,1249v18.509V1273h3v-1c0-0.553,0.447-1,1-1h5c0.552,0,1,0.447,1,1v1h2v-1c0-0.553,0.447-1,1-1h5
-		c0.552,0,1,0.447,1,1v1h3v-24H195z M213,1266h-14c0-1,0-0.957,0-1.171c0-0.732,0.354-1.033,0.912-1.351
-		c0.448-0.255,2.088-1.403,4.088-2.012v-1.959c-1-0.315-1-1.252-1-2c0-1.738,0-2,0-2c0-1.722,0.913-3,3-3s3,1.278,3,3v2
-		c0,0.74,0,1.685-1,2v1.959c2,0.607,3.639,1.757,4.088,2.012c0.557,0.316,0.912,0.617,0.912,1.351C213,1265.043,213,1265,213,1266z"
-		/>
-</g>
-<g id="bank_1_">
-	<path fill="#FFFFFF" d="M170,1272.5c0,0.276-0.225,0.5-0.5,0.5h-23c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h23
-		c0.275,0,0.5,0.224,0.5,0.5V1272.5z M146,1259.385c0-0.268,0.178-0.682,0.395-0.85l11.211-9.26
-		c0.217-0.168,0.572-0.152,0.789,0.016l11.211,9.234c0.217,0.168,0.396,0.593,0.396,0.858c0,0.267-0.226,0.615-0.5,0.615H167v8h1.5
-		c0.274,0,0.5,0.214,0.5,0.489v1c0,0.274-0.226,0.511-0.5,0.511h-21c-0.275,0-0.5-0.235-0.5-0.511v-1c0-0.275,0.225-0.489,0.5-0.489
-		h1.5v-8h-2.5C146.225,1260,146,1259.65,146,1259.385z M153,1268v-8h-2v8H153z M157,1268v-8h-2v8H157z M161,1268v-8h-2v8H161z
-		 M165,1260h-2v8h2V1260z"/>
-</g>
-<g id="spade">
-	<g id="spade_1_">
-		<path fill="#FFFFFF" d="M121.705,1253.538l-4.242-4.243c-0.195-0.194-0.514-0.194-0.707,0l-0.708,0.707
-			c-0.194,0.194-0.194,0.513,0,0.707l1.062,1.062l-9.192,9.191l-0.707-0.707l-1.414,1.414l-2.828-2.828l-2.121,2.121
-			c-4.95,4.949-1.938,11.129-1.938,11.129s6.18,3.014,11.13-1.937l2.121-2.122l-2.829-2.828l1.415-1.414l-0.707-0.707l9.191-9.192
-			l1.062,1.062c0.193,0.193,0.513,0.193,0.707,0l0.707-0.707C121.899,1254.051,121.899,1253.732,121.705,1253.538z M110.21,1267.498
-			l0.535,0.535l-1.415,1.414c-3.812,3.812-8.402,2.383-9.66,1.884c-0.054-0.135-0.119-0.315-0.188-0.521
-			c1.721,0.561,5.908,1.507,9.312-1.897L110.21,1267.498z"/>
-	</g>
-</g>
-<g id="buoy_1_">
-	<path fill="#FFFFFF" d="M72.534,1264.328c-0.681-0.544-1.611-1.288-3.339-1.288c-1.727,0-2.657,0.744-3.338,1.288
-		c-0.525,0.421-0.79,0.632-1.466,0.632c-0.674,0-0.938-0.211-1.464-0.632c-0.68-0.543-1.61-1.288-3.337-1.288
-		s-2.656,0.745-3.336,1.289c-0.524,0.42-0.788,0.631-1.46,0.631s-0.937-0.211-1.46-0.631c-0.681-0.544-1.61-1.289-3.336-1.289v3
-		c0.673,0,0.937,0.211,1.461,0.631c0.68,0.544,1.608,1.289,3.335,1.289c1.726,0,2.655-0.745,3.335-1.289
-		c0.523-0.42,0.788-0.631,1.461-0.631c0.674,0,0.938,0.211,1.464,0.632c0.68,0.543,1.61,1.288,3.337,1.288
-		c1.729,0,2.659-0.745,3.339-1.288c0.526-0.421,0.79-0.632,1.465-0.632c0.676,0,0.938,0.211,1.466,0.632
-		c0.68,0.543,1.61,1.288,3.339,1.288v-3C73.324,1264.96,73.061,1264.749,72.534,1264.328z"/>
-	<path fill="#FFFFFF" d="M69.196,1268.04c-1.727,0-2.657,0.744-3.338,1.288c-0.525,0.421-0.79,0.632-1.466,0.632
-		c-0.674,0-0.938-0.211-1.464-0.632c-0.68-0.543-1.61-1.288-3.337-1.288s-2.656,0.745-3.336,1.289
-		c-0.524,0.42-0.788,0.631-1.46,0.631s-0.937-0.211-1.46-0.631c-0.681-0.544-1.61-1.289-3.336-1.289v3
-		c0.673,0,0.937,0.211,1.461,0.631c0.68,0.544,1.608,1.289,3.335,1.289c1.726,0,2.655-0.745,3.335-1.289
-		c0.523-0.42,0.788-0.631,1.461-0.631c0.674,0,0.938,0.211,1.464,0.632c0.68,0.543,1.61,1.288,3.337,1.288
-		c1.729,0,2.659-0.745,3.339-1.288c0.526-0.421,0.79-0.632,1.465-0.632c0.676,0,0.938,0.211,1.466,0.632
-		c0.68,0.543,1.61,1.288,3.339,1.288v-3c-0.677,0-0.939-0.211-1.466-0.632C71.854,1268.784,70.923,1268.04,69.196,1268.04z"/>
-	<path fill="#FFFFFF" d="M63.862,1263.155c0.153,0.123,0.278,0.282,0.561,0.282s0.349-0.16,0.499-0.28
-		c0.278-0.225,0.628-0.501,1.067-0.765c-0.054-2.265-1.777-4.096-3.988-4.344v-7.551c0-0.274-0.226-0.499-0.499-0.499h-0.002
-		c-0.274,0-0.499,0.225-0.499,0.499v7.549c-2.101,0.235-3.751,1.906-3.956,4.02c0.669-0.299,1.497-0.522,2.548-0.522
-		C61.841,1261.544,63.106,1262.552,63.862,1263.155z"/>
-	<path fill="#FFFFFF" d="M63,1250v5c0,0,6.342-5.43,6.538-5.605c0.195-0.175,0.124-0.352-0.129-0.311
-		C69.156,1249.125,63,1250,63,1250z"/>
-</g>
-<g id="pool_1_">
-	<path fill="#FFFFFF" d="M18.98,1249.166c-0.358-0.107-0.721-0.161-1.072-0.161c-0.87,0-1.656,0.329-2.273,0.948
-		c-0.617,0.617-1.038,1.036-1.46,1.45c-0.405,0.396-0.81,0.802-1.381,1.374C12.375,1253.195,12,1253.609,12,1254H8
-		c0.554-0.553,1.437-1.327,1.437-1.327s0.849-0.831,1.472-1.453c0.274-0.275,0.612-0.417,1.005-0.417c0.176,0,0.36,0.029,0.55,0.086
-		c0.224,0.066,0.439,0.172,0.637,0.304l1.279-1.279c-0.416-0.334-0.894-0.595-1.397-0.746c-0.358-0.107-0.721-0.161-1.072-0.161
-		c-0.87,0-1.656,0.329-2.273,0.948c-0.617,0.617-1.038,1.036-1.461,1.451c-0.404,0.396-0.808,0.803-1.38,1.373
-		C6.375,1253.195,6,1253.734,6,1254v8.795c0,0.109,0.455,0.165,0.797,0.165c0.551,0,1.203-0.149,1.203-0.433V1262h0.002
-		c0,0,2.463-0.96,3.59-0.96s1.723,0.423,2.408,0.626V1254c0.554-0.553,1.041-0.939,1.437-1.327c0.423-0.414,0.849-0.831,1.471-1.453
-		c0.274-0.275,0.613-0.417,1.006-0.417c0.177,0,0.36,0.029,0.55,0.086c0.67,0.201,1.17,0.695,1.349,1.111h1.852
-		C21.281,1250.875,20.312,1249.566,18.98,1249.166z M12,1260H8v-1h4V1260z M12,1257H8v-1h4V1257z"/>
-	<path fill="#FFFFFF" d="M21.196,1268.04c-1.727,0-2.657,0.744-3.338,1.288c-0.525,0.421-0.79,0.632-1.466,0.632
-		c-0.674,0-0.938-0.211-1.464-0.632c-0.68-0.543-1.61-1.288-3.337-1.288s-2.656,0.745-3.336,1.289
-		c-0.524,0.42-0.788,0.631-1.46,0.631s-0.937-0.211-1.46-0.631c-0.681-0.544-1.61-1.289-3.336-1.289v3
-		c0.673,0,0.937,0.211,1.461,0.631c0.68,0.544,1.608,1.289,3.335,1.289c1.726,0,2.655-0.745,3.335-1.289
-		c0.523-0.42,0.788-0.631,1.461-0.631c0.674,0,0.938,0.211,1.464,0.632c0.68,0.543,1.61,1.288,3.337,1.288
-		c1.729,0,2.659-0.745,3.339-1.288c0.526-0.421,0.79-0.632,1.465-0.632c0.676,0,0.938,0.211,1.466,0.632
-		c0.68,0.543,1.61,1.288,3.339,1.288v-3c-0.676,0-0.939-0.211-1.466-0.632C23.854,1268.784,22.923,1268.04,21.196,1268.04z"/>
-	<path fill="#FFFFFF" d="M21.196,1263.04c-1.727,0-2.657,0.744-3.338,1.288c-0.525,0.421-0.79,0.632-1.466,0.632
-		c-0.674,0-0.938-0.211-1.464-0.632c-0.68-0.543-1.61-1.288-3.337-1.288s-2.656,0.745-3.336,1.289
-		c-0.524,0.42-0.788,0.631-1.46,0.631s-0.937-0.211-1.46-0.631c-0.681-0.544-1.61-1.289-3.336-1.289v3
-		c0.673,0,0.937,0.211,1.461,0.631c0.68,0.544,1.608,1.289,3.335,1.289c1.726,0,2.655-0.745,3.335-1.289
-		c0.523-0.42,0.788-0.631,1.461-0.631c0.674,0,0.938,0.211,1.464,0.632c0.68,0.543,1.61,1.288,3.337,1.288
-		c1.729,0,2.659-0.745,3.339-1.288c0.526-0.421,0.79-0.632,1.465-0.632c0.676,0,0.938,0.211,1.466,0.632
-		c0.68,0.543,1.61,1.288,3.339,1.288v-3c-0.676,0-0.939-0.211-1.466-0.632C23.854,1263.784,22.923,1263.04,21.196,1263.04z"/>
-</g>
-<g id="barcode">
-	<path id="barcode_1_" fill="#FFFFFF" d="M434,1201h2v21h-2V1201z M445,1201h-4v21h4V1201z M448,1201h-2v21h2V1201z M452,1201h-2v21
-		h2V1201z M458,1201h-2v21h2V1201z M455,1201h-2v21h2V1201z M437,1222h2v-21h-2V1222z M434,1225h3v-2h-3V1225z M438,1225h2v-2h-2
-		V1225z M441,1225h2v-2h-2V1225z M444,1225h2v-2h-2V1225z M447,1225h2v-2h-2V1225z M450,1225h2v-2h-2V1225z M454,1225h4v-2h-4V1225z
-		"/>
-</g>
-<g id="qrcode">
-	<path id="qrcode_1_" fill="#FFFFFF" d="M394,1209h-6v-6h6V1209z M396,1211h-10v-10h10V1211z M395,1202h-8v8h8V1202z M408,1203h-6v6
-		h6V1203z M410,1201v10h-10v-10H410z M409,1202h-8v8h8V1202z M388,1223h6v-6h-6V1223z M386,1215h10v10h-10V1215z M387,1224h8v-8h-8
-		V1224z M404,1217h-2h-4v4h4v-2h4v-2v-2h-2V1217z M408,1220h2v-2h-2V1220z M398,1225h5v-2h-5V1225z M403,1221v2h2v-2H403z M408,1217
-		h2v-5h-2V1217z M407,1212h-2v2h2V1212z M399,1208h-2v2h2V1208z M399,1202h-2v4h2V1202z M388,1212h-2v2h2V1212z M391,1214v-2h-2v2
-		H391z M408,1223h-3v2h5v-2v-2h-2V1223z M399,1212h-6v2h6v2h2h2v-4h-2H399z"/>
-</g>
-<g id="sheriffs_x5F_star">
-	<path fill="#FFFFFF" d="M360.154,1216.659c-0.354,0-0.68,0.104-0.96,0.274l-2.234-3.657l2.191-3.378
-		c0.288,0.188,0.633,0.299,1.003,0.299c1.021,0,1.847-0.826,1.847-1.846c0-1.021-0.826-2.021-1.847-2.021
-		c-1.02,0-1.847,0.67-1.847,1.67h-4.356l-2.989-4.717c0.528-0.324,0.885-0.815,0.885-1.481c0-1.02-0.826-1.802-1.846-1.802
-		c-1.021,0-1.847,0.848-1.847,1.866c0,0.668,0.356,1.083,0.889,1.407l-2.988,4.727h-4.361c0-1-0.826-1.67-1.847-1.67
-		c-1.02,0-1.846,0.915-1.846,1.936c0,1.02,0.826,1.889,1.846,1.889c0.372,0,0.716-0.09,1.007-0.279l2.192,3.391l-2.236,3.666
-		c-0.281-0.172-0.608-0.272-0.963-0.272c-1.02,0-1.846,0.826-1.846,1.846c0,1.021,0.826,2.095,1.846,2.095
-		c1.021,0,1.847-0.598,1.847-1.598h4.742l2.582,3.732c-0.517,0.328-0.862,0.777-0.862,1.435c0,1.021,0.826,1.784,1.847,1.784
-		c1.02,0,1.846-0.857,1.846-1.878c0-0.656-0.344-0.997-0.859-1.325l2.582-3.748h4.739c0,1,0.827,1.601,1.847,1.601
-		c1.021,0,1.847-0.952,1.847-1.973C362.002,1217.61,361.174,1216.659,360.154,1216.659z M354.54,1216h-2.993l-1.545,2.25
-		l-0.002,0.064l-1.543-2.314h-2.993l1.451-2.568l-1.451-2.432h2.818l1.718-2.748l0.002-0.033l1.718,2.781h2.82l-1.452,2.432
-		L354.54,1216z"/>
-</g>
-<g id="delete">
-	<path fill="#FFFFFF" d="M313,1205h-14.769h-2l-7.646,7.646c-0.194,0.193-0.204,0.521-0.021,0.727l7.668,8.627H313
-		c0.55,0,1-0.45,1-1v-15C314,1205.45,313.55,1205,313,1205z M309.669,1215.933c0.169,0.169,0.169,0.446,0,0.615l-1.822,1.822
-		c-0.169,0.169-0.446,0.169-0.615,0l-2.472-2.472l-2.475,2.475c-0.169,0.169-0.445,0.169-0.615,0l-1.822-1.822
-		c-0.17-0.17-0.17-0.447,0-0.615l2.476-2.475l-2.479-2.477c-0.169-0.171-0.169-0.446,0-0.615l1.823-1.823
-		c0.169-0.169,0.445-0.169,0.615,0l2.477,2.478l2.475-2.475c0.168-0.17,0.445-0.17,0.615,0l1.822,1.822
-		c0.169,0.17,0.169,0.446,0,0.615l-2.476,2.475L309.669,1215.933z"/>
-</g>
-<g id="boat_2_">
-	<path fill="#FFFFFF" d="M262.081,1206.605l-2.292-0.981c-0.006-0.015-1.567-3.176-1.567-3.176
-		c-0.122-0.247-0.447-0.448-0.722-0.448H256v-0.5c0-0.275-0.226-0.5-0.5-0.5h-3c-0.275,0-0.5,0.225-0.5,0.5v0.5h-1.5
-		c-0.275,0-0.602,0.201-0.725,0.447c0,0-1.566,3.154-1.574,3.181l-2.283,0.979c-0.505,0.216-0.919,0.844-0.919,1.394v3.741l9-3.741
-		l9,3.741V1208C263,1207.45,262.586,1206.822,262.081,1206.605z M246,1210.242V1208c0-0.149,0.175-0.415,0.312-0.474l5.163-2.214
-		c0.079-0.033,1.285-0.282,1.525-0.301V1207c0,0.108,0.029,0.209,0.062,0.307L246,1210.242z M262,1210.242l-7.062-2.937
-		c0.032-0.098,0.062-0.198,0.062-0.307v-1.983c0.183,0.016,1.477,0.276,1.525,0.297l5.161,2.213c0.139,0.06,0.312,0.324,0.312,0.475
-		L262,1210.242L262,1210.242z"/>
-	<path fill="#FFFFFF" d="M264.74,1214.164l-9.815-4.081c-0.508-0.211-1.34-0.211-1.848,0l-9.816,4.081
-		c-0.508,0.211-0.694,0.771-0.414,1.244l5.646,8.73c0.279,0.475,0.51,0.86,1.51,0.86s4-3.979,4-3.979s3,3.979,4,3.979
-		s1.229-0.387,1.51-0.86l5.645-8.73C265.435,1214.936,265.248,1214.375,264.74,1214.164z M250,1223.667l-6.203-8.698l0.858,0.031
-		l5.484,6.984l3.172-1.845L250,1223.667z"/>
-</g>
-<g id="fishes_2_">
-	<path fill="#FFFFFF" d="M219.006,1200.533c0-0.275-0.184-0.37-0.408-0.212l-3.509,2.452c-1.036-0.759-3.084-1.895-5.083-2.443
-		l0.005-2.318l-4.261,2.135c-3.837,0.591-6.704,2.905-6.705,3.341c-0.001,0.5,3.805,3.509,8.5,3.52
-		c0.777,0.002,1.501-0.099,2.217-0.258l2.226,1.259l0.005-1.991c1.001-0.557,2.39-1.23,3.093-1.741l3.48,2.47
-		c0.225,0.159,0.416,0.064,0.417-0.21c0,0-1.054-1.768-1.052-2.955C217.935,1202.391,219.006,1200.533,219.006,1200.533z
-		 M203.531,1203.479c-0.553,0-1-0.446-1-1c0-0.553,0.447-1,1-1c0.554,0,1,0.447,1,1
-		C204.531,1203.032,204.084,1203.479,203.531,1203.479z M211.985,1210.5c0-0.275-0.184-0.37-0.406-0.211l-3.496,2.461
-		c-1.038-0.756-3.082-1.887-5.082-2.433V1208l-4.265,2.145c-3.835,0.6-6.699,2.922-6.699,3.355c0,0.5,3.812,3.5,8.506,3.5
-		c0.777,0,1.507-0.104,2.224-0.263l2.234,1.253v-1.991c1-0.559,2.379-1.237,3.082-1.749l3.482,2.461
-		c0.226,0.159,0.414,0.064,0.414-0.211c0,0-1.06-1.766-1.06-2.953C210.919,1212.36,211.985,1210.5,211.985,1210.5z
-		 M196.517,1213.469c-0.553,0-1-0.447-1-1s0.447-1,1-1s1,0.447,1,1S197.069,1213.469,196.517,1213.469z M219.949,1220.51
-		c0-0.274-0.185-0.37-0.408-0.211l-3.479,2.461c-1.038-0.756-3.062-1.887-5.062-2.433v-2.317l-4.281,2.145
-		c-3.836,0.6-6.71,2.922-6.71,3.355c0,0.5,3.808,3.5,8.501,3.5c0.779,0,1.523-0.103,2.24-0.263L213,1228v-1.991
-		c1-0.559,2.36-1.237,3.062-1.749l3.476,2.461c0.225,0.159,0.408,0.064,0.408-0.211c0,0-1.061-1.766-1.061-2.953
-		C218.886,1222.37,219.949,1220.51,219.949,1220.51z M204.48,1223.479c-0.553,0-1-0.446-1-1c0-0.553,0.447-1,1-1
-		c0.554,0,1,0.447,1,1C205.48,1223.032,205.033,1223.479,204.48,1223.479z"/>
-</g>
-<g id="fins">
-	<path fill="#FFFFFF" d="M154,1202.375h-0.021c-0.104-1-1.245-1.999-2.479-1.999c-1.234,0-2.375,0.999-2.479,1.999H149l-4,16.042
-		v4.958c0,0,1.812,2,6.5,2c4.688,0,6.5-2,6.5-2v-4.958L154,1202.375z M151.5,1209.202c-1.108,0-2.005-0.726-2.005-1.833
-		c0-0.057,0.02-0.197,0.02-0.197c0.012-0.117,0.032-0.316,0.063-0.428c0,0,0.81-3.489,0.81-3.494c0-0.614,0.498-1.123,1.113-1.123
-		s1.112,0.492,1.112,1.105c0,0.006-0.002,0.008-0.002,0.008l0.812,3.419c0.031,0.11,0.051,0.396,0.062,0.515
-		c0,0,0.021,0.139,0.021,0.195C153.505,1208.477,152.608,1209.202,151.5,1209.202z M160.131,1200.015l-0.018,0.014
-		c-0.671-0.749-2.18-0.892-3.181-0.168c-1.001,0.723-1.34,2.199-0.839,3.071l-0.017,0.014l6.153,15.345l2.904,4.02
-		c0,0,2.64,0.561,6.439-2.187c3.799-2.747,4.097-5.429,4.097-5.429l-2.904-4.019L160.131,1200.015z M162.103,1207.013
-		c-0.897,0.649-2.051,0.587-2.699-0.311c-0.032-0.046-0.099-0.171-0.099-0.171c-0.059-0.104-0.16-0.275-0.199-0.385
-		c0,0-1.388-3.303-1.391-3.307c-0.36-0.498-0.254-1.202,0.244-1.562c0.499-0.359,1.189-0.253,1.55,0.244
-		c0.002,0.004,0.002,0.008,0.004,0.011l2.658,2.293c0.09,0.071,0.273,0.293,0.353,0.381l0.122,0.159c0,0-0.023-0.061,0.009-0.014
-		C163.304,1205.25,163.001,1206.365,162.103,1207.013z"/>
-</g>
-<g id="oxygen_x5F_bottle">
-	<path fill="#FFFFFF" d="M121,1199h-2c-0.55,0-1,0.45-1,1h-1c0-0.55-0.45-1-1-1s-1,0.45-1,1h-1v1h1v1h-0.5
-		c-0.275,0-0.5,0.225-0.5,0.5v1.642c-1.724,0.446-3,1.997-3,3.858v17c0,0.553,0.446,1,1,1h8c0.553,0,1-0.447,1-1v-17
-		c0-1.861-1.277-3.412-3-3.858v-1.642c0-0.275-0.226-0.5-0.5-0.5H117v-1h1c0,0.55,0.45,1,1,1h2c0.55,0,1-0.45,1-1v-1
-		C122,1199.45,121.55,1199,121,1199z M112.5,1225H112v-17h0.5V1225z"/>
-	<path fill="#FFFFFF" d="M107,1204.142v-1.642c0-0.275-0.226-0.5-0.5-0.5H106v-2c0-0.55-0.45-1-1-1s-1,0.45-1,1v2h-0.5
-		c-0.275,0-0.5,0.225-0.5,0.5v1.642c-1.724,0.446-3,1.997-3,3.858v17c0,0.553,0.446,1,1,1h8c0.553,0,1-0.447,1-1v-17
-		C110,1206.139,108.723,1204.588,107,1204.142z M101.5,1225H101v-17h0.5V1225z"/>
-</g>
-<g id="scuba_x5F_diving_2_">
-	<path fill="#FFFFFF" d="M71.208,1204.338l-7.325-0.783c-0.319,0-0.451,0.248-0.367,0.539l1.449,5.152
-		c0.12,0.417,0.563,0.696,0.99,0.642l5.249-0.717c0.42-0.062,0.774-0.47,0.774-0.896v-3.075
-		C71.979,1204.779,71.626,1204.385,71.208,1204.338z"/>
-	<path fill="#FFFFFF" d="M61.064,1203.559c-0.01,0-0.02,0-0.029,0l-7.223,0.779c-0.418,0.047-0.771,0.441-0.771,0.862v3.076
-		c0,0.425,0.354,0.834,0.774,0.895l5.229,0.718c0.425,0.056,0.87-0.228,0.989-0.643l1.448-5.152
-		C61.582,1203.755,61.402,1203.559,61.064,1203.559z"/>
-	<path fill="#FFFFFF" d="M75.5,1204H74c0-2.054-2.843-2.493-4.352-2.836c-2.262-0.514-4.614-1.031-6.941-1.078
-		c-2.345-0.047-4.743,0.512-7.018,1.021C54,1201.483,51,1201.725,51,1204h-1.5c-0.275,0-0.5,0.225-0.5,0.5v4.979
-		c0,0.275,0.225,0.5,0.5,0.5H51c0,1.062,0.827,1.987,1.883,2.104l6.91,0.801c0.221,0.022,0.435,0.009,0.65-0.035
-		c0.117,0.087,0.262,0.151,0.452,0.151h3c0.191,0,0.334-0.062,0.452-0.151c0.217,0.044,0.431,0.059,0.651,0.035l7.117-0.778
-		c1.056-0.117,1.883-1.043,1.883-2.104h1.5c0.274,0,0.5-0.225,0.5-0.5v-5C76,1204.225,75.775,1204,75.5,1204z M73,1210
-		c0,0.55-0.447,1.05-0.994,1.11l-7.115,0.778c-0.547,0.062-1.033-1.315-1.207-1.838l-0.367-1.104
-		c-0.161-0.481-0.065-1.667-0.815-1.667s-0.656,1.186-0.816,1.667l-0.367,1.104c-0.174,0.521-0.866,1.898-1.414,1.838l-6.907-0.801
-		c-0.547-0.061-0.994-0.561-0.994-1.109v-0.5v-4.979v-0.5c0-0.55,0.422-0.995,0.961-1.104c1.355-0.269,2.715-0.524,4.076-0.771
-		c1.77-0.321,3.653-0.812,5.463-0.812c1.73,0,3.534,0.467,5.229,0.772c1.427,0.259,2.851,0.528,4.271,0.812
-		c0.539,0.108,1,0.555,1,1.104v0.5v5V1210H73z"/>
-	<path fill="#FFFFFF" d="M69,1219c0-0.55-0.45-1-1-1c0,0-1,0.016-1.267,0c-0.604-1.771-2.258-3-4.233-3c-2.485,0-4.5,2.015-4.5,4.5
-		s2.015,4.5,4.5,4.5c1.977,0,3.583-1.229,4.188-3c0.609,0,1.312,0,1.312,0c0.55,0,1-0.45,1-1h5v-1H69z M62.5,1222
-		c-1.381,0-2.5-1.119-2.5-2.5s1.119-2.5,2.5-2.5s2.5,1.119,2.5,2.5S63.881,1222,62.5,1222z"/>
-</g>
-<g id="snorkel_x5F_diving_2_">
-	<path fill="#FFFFFF" d="M27.5,1204H26c0-2.054-2.843-2.493-4.352-2.836c-2.262-0.514-4.614-1.031-6.941-1.078
-		c-2.345-0.047-4.743,0.512-7.018,1.021C6,1201.483,3,1201.725,3,1204H1.5c-0.275,0-0.5,0.225-0.5,0.5v4.979
-		c0,0.275,0.225,0.5,0.5,0.5H3c0,1.062,0.827,1.987,1.883,2.104l6.91,0.801c0.221,0.022,0.435,0.009,0.65-0.035
-		c0.117,0.087,0.262,0.151,0.452,0.151h3c0.191,0,0.334-0.062,0.452-0.151c0.217,0.044,0.431,0.059,0.651,0.035l7.117-0.778
-		c1.056-0.117,1.883-1.043,1.883-2.104h1.5c0.274,0,0.5-0.225,0.5-0.5v-5C28,1204.225,27.775,1204,27.5,1204z M25,1210
-		c0,0.55-0.447,1.05-0.994,1.11l-7.115,0.778c-0.547,0.062-1.033-1.315-1.207-1.838l-0.367-1.104
-		c-0.161-0.481-0.065-1.667-0.815-1.667s-0.656,1.186-0.816,1.667l-0.367,1.104c-0.174,0.521-0.866,1.898-1.414,1.838l-6.907-0.801
-		c-0.547-0.061-0.994-0.561-0.994-1.109v-0.5v-4.979v-0.5c0-0.55,0.422-0.995,0.961-1.104c1.355-0.269,2.715-0.524,4.076-0.771
-		c1.77-0.321,3.653-0.812,5.463-0.812c1.73,0,3.534,0.467,5.229,0.772c1.427,0.259,2.851,0.528,4.271,0.812
-		c0.539,0.108,1,0.555,1,1.104v0.5v5V1210H25z"/>
-	<path fill="#FFFFFF" d="M13.064,1203.559c-0.01,0-0.02,0-0.029,0l-7.223,0.779c-0.418,0.047-0.771,0.441-0.771,0.862v3.076
-		c0,0.425,0.354,0.834,0.774,0.895l5.229,0.718c0.425,0.056,0.87-0.228,0.989-0.643l1.448-5.152
-		C13.582,1203.755,13.402,1203.559,13.064,1203.559z"/>
-	<path fill="#FFFFFF" d="M23.208,1204.338l-7.325-0.783c-0.319,0-0.451,0.248-0.367,0.539l1.449,5.152
-		c0.12,0.417,0.563,0.696,0.99,0.642l5.249-0.717c0.42-0.062,0.774-0.47,0.774-0.896v-3.075
-		C23.979,1204.779,23.626,1204.385,23.208,1204.338z"/>
-	<path fill="#FFFFFF" d="M9,1222h12v3H9V1222z M22,1222v3h4v-3H22z M10,1218.735c0-0.671-0.282-0.503-0.741-0.646
-		c-0.432-0.135-0.377-1.184,0.117-1.219c0.928-0.066,0.624-1.145,0.624-1.871H8.75c-0.55,0-0.75,1-0.75,1
-		c-2.611,0-5.25,1.656-5.25,4.5S5.389,1225,8,1225v-3c-1.224,0-2.25-0.023-2.25-1.5S6.777,1219,8,1219c0,0,0.2,1,0.75,1H10
-		C10,1220,10,1219.98,10,1218.735z"/>
-</g>
-<g id="divide_1_">
-	<path fill="#FFFFFF" d="M455,1166.5c0,0.276-0.225,0.5-0.5,0.5h-17c-0.276,0-0.5-0.224-0.5-0.5v-3c0-0.276,0.224-0.5,0.5-0.5h17
-		c0.275,0,0.5,0.224,0.5,0.5V1166.5z M448,1157.5c0-0.276-0.225-0.5-0.5-0.5h-3c-0.276,0-0.5,0.224-0.5,0.5v3
-		c0,0.276,0.224,0.5,0.5,0.5h3c0.275,0,0.5-0.224,0.5-0.5V1157.5z M448,1169.5c0-0.276-0.225-0.5-0.5-0.5h-3
-		c-0.276,0-0.5,0.224-0.5,0.5v3c0,0.276,0.224,0.5,0.5,0.5h3c0.275,0,0.5-0.224,0.5-0.5V1169.5z"/>
-</g>
-<g id="asterisk">
-	<path fill="#FFFFFF" d="M407.5,1163h-4.653l3.016-3.016c0.196-0.197,0.196-0.521,0-0.717l-2.117-2.117
-		c-0.196-0.196-0.52-0.196-0.717,0l-3.027,3.027v-4.679c0-0.275-0.226-0.5-0.5-0.5h-3c-0.275,0-0.5,0.225-0.5,0.5v4.665l-3.02-3.018
-		c-0.196-0.196-0.52-0.196-0.716,0l-2.118,2.119c-0.197,0.194-0.197,0.518,0,0.716l3.019,3.018H388.5c-0.275,0-0.5,0.225-0.5,0.5v3
-		c0,0.275,0.225,0.5,0.5,0.5h4.679l-3.029,3.029c-0.194,0.194-0.194,0.519,0,0.716l2.118,2.118c0.197,0.194,0.521,0.194,0.716,0
-		l3.018-3.018v4.653c0,0.275,0.225,0.5,0.5,0.5h3c0.274,0,0.5-0.225,0.5-0.5v-4.665l3.024,3.025c0.196,0.195,0.521,0.195,0.717,0
-		l2.118-2.119c0.195-0.195,0.195-0.52,0-0.716l-3.024-3.025h4.665c0.274,0,0.5-0.225,0.5-0.5v-3
-		C408,1163.225,407.775,1163,407.5,1163z"/>
-</g>
-<g id="female">
-	<path fill="#FFFFFF" d="M355,1171.042h-3v-3.399v-0.232c3-0.743,5.639-3.683,5.639-7.189c0-4.066-3.365-7.376-7.432-7.376
-		c-4.068,0-7.543,3.31-7.543,7.376c0,3.419,2.336,6.293,5.336,7.126v0.297v3.399h-3c-0.554,0-1,0.697-1,1.25v1.351
-		c0,0.554,0.446,1.333,1,1.333h3v2.667c0,0.554,0.446,1.333,1,1.333h2c0.553,0,1-0.779,1-1.333v-2.667h3c0.553,0,1-0.779,1-1.333
-		v-1.351C356,1171.739,355.553,1171.042,355,1171.042z M346.775,1160.22c0-1.86,1.515-3.376,3.375-3.376
-		c1.861,0,3.377,1.516,3.377,3.376c0,1.861-1.516,3.376-3.377,3.376C348.289,1163.596,346.775,1162.081,346.775,1160.22z"/>
-</g>
-<g id="male_1_">
-	<path fill="#FFFFFF" d="M312.703,1154.078l-8.99,1.146c-0.188,0.023-0.235,0.156-0.103,0.29l2.52,2.52l-3.938,3.937
-		c-0.999-0.506-2.124-0.797-3.316-0.797c-4.067,0-7.376,3.31-7.376,7.376c0,4.067,3.309,7.376,7.376,7.376
-		c4.066,0,7.376-3.309,7.376-7.376c0-1.376-0.385-2.659-1.043-3.763l3.837-3.837l2.454,2.518c0.133,0.135,0.266,0.086,0.291-0.102
-		l1.208-8.988C313.023,1154.189,312.89,1154.055,312.703,1154.078z M298.875,1171.925c-1.861,0-3.376-1.515-3.376-3.376
-		c0-1.86,1.515-3.376,3.376-3.376c1.86,0,3.376,1.516,3.376,3.376C302.251,1170.41,300.737,1171.925,298.875,1171.925z"/>
-</g>
-<g id="chat_1_">
-	<path fill="#FFFFFF" d="M265.885,1163.338c0,4.568-5.32,8.271-11.884,8.271c-1.713,0-3.339-0.256-4.811-0.707l-4.831,2.979
-		c-0.238,0.125-0.376,0.015-0.305-0.247l1.135-4.746c-1.912-1.469-3.074-3.416-3.074-5.552c0-4.567,5.32-8.271,11.885-8.271
-		C260.564,1155.065,265.885,1158.77,265.885,1163.338z"/>
-</g>
-<g id="conversation_1_">
-	<path fill="#FFFFFF" d="M216.937,1168.137c0.068,0.248-0.063,0.354-0.291,0.234l-3.444-1.807c-1.067,0.329-2.247,0.516-3.49,0.516
-		c-4.768,0-8.632-2.689-8.632-6.007c0-3.318,3.864-6.009,8.632-6.009s8.633,2.689,8.633,6.009c0,1.551-0.851,2.958-2.236,4.023
-		L216.937,1168.137z M209.43,1168.908c-5.705,0-10.173-3.299-10.173-7.512c0-0.649,0.119-1.275,0.319-1.872
-		c-3.237,0.894-5.528,3.089-5.528,5.659c0,1.572,0.863,3.002,2.267,4.082l-0.84,3.082c-0.067,0.25,0.064,0.356,0.294,0.235
-		l3.494-1.83c1.083,0.334,2.278,0.522,3.539,0.522c2.821,0,5.321-0.935,6.92-2.376
-		C209.624,1168.902,209.528,1168.908,209.43,1168.908z"/>
-</g>
-<g id="anchor">
-	<path fill="#FFFFFF" d="M169.434,1168.096l-6.434,0.919c-0.272,0.039-0.336,0.229-0.143,0.425l1.706,1.685
-		c-1.207,1.3-2.563,2.227-4.563,2.635v-13.299c1-0.692,1.979-1.981,1.979-3.459c0-2.206-1.808-4.001-4.013-4.001
-		c-2.207,0-3.984,1.795-3.984,4.001c0,1.478,1.019,2.767,2.019,3.459v13.297c-2-0.407-3.404-1.338-4.613-2.643l1.669-1.681
-		c0.193-0.193,0.125-0.385-0.147-0.424l-6.436-0.92c-0.272-0.039-0.468,0.152-0.429,0.425l0.92,6.436
-		c0.039,0.271,0.229,0.336,0.423,0.142l1.848-1.849c2.189,2.317,5.289,3.758,8.72,3.758c3.416,0,6.499-1.467,8.686-3.779
-		l1.875,1.875c0.194,0.194,0.385,0.132,0.424-0.142l0.92-6.436C169.897,1168.248,169.706,1168.057,169.434,1168.096z
-		 M157.954,1159.11c-1.164,0-2.11-0.946-2.11-2.11s0.946-2.11,2.11-2.11s2.109,0.946,2.109,2.11S159.118,1159.11,157.954,1159.11z"
-		/>
-</g>
-<g id="google_x5F_maps">
-	<path fill="#FFFFFF" d="M110,1153.023c-3.999,0-7.24,3.241-7.24,7.239c0,1.062,0.484,2.502,0.484,2.502
-		c1.922,4.931,6.543,14.025,6.543,14.025c0.059,0.124,0.136,0.186,0.213,0.186s0.153-0.062,0.213-0.186
-		c0,0,4.621-9.096,6.543-14.025c0,0,0.483-1.439,0.483-2.502C117.24,1156.266,113.999,1153.023,110,1153.023z M110,1163.568
-		c-1.825,0-3.306-1.479-3.306-3.306s1.479-3.305,3.306-3.305s3.305,1.479,3.305,3.305S111.825,1163.568,110,1163.568z"/>
-</g>
-<g id="flash_1_">
-	<path fill="#FFFFFF" d="M60.316,1167.355c0.078-0.265-0.082-0.355-0.356-0.355h-4.687c-0.274,0-0.354-0.297-0.18-0.508
-		c0,0,9.653-12.826,9.842-13.073c0.143-0.231,0.298-0.185,0.247,0.084c-0.073,0.341-2.134,9.046-2.134,9.046
-		c-0.1,0.257,0.045,0.451,0.32,0.451h4.686c0.275,0,0.363,0.178,0.195,0.396c0,0-9.667,13.057-9.841,13.274
-		c-0.175,0.218-0.335,0.217-0.247-0.157S60.316,1167.355,60.316,1167.355z"/>
-</g>
-<g id="rotation_x5F_lock">
-	<path fill="#FFFFFF" d="M17,1162.483V1164h0.5c0.274,0,0.5,0.225,0.5,0.5v5c0,0.275-0.226,0.5-0.5,0.5h-7
-		c-0.275,0-0.5-0.225-0.5-0.5v-5c0-0.275,0.225-0.5,0.5-0.5H11v-1.517c0-1.394,1.05-2.483,2.389-2.483h1.223
-		C15.95,1160,17,1161.091,17,1162.483z M13,1164h2v-1.517c0-0.298-0.149-0.483-0.39-0.483h-1.223c-0.239,0-0.389,0.186-0.389,0.483
-		L13,1164L13,1164z"/>
-	<path fill="#FFFFFF" d="M28.699,1164.4L24.8,1170.1c-0.165,0.222-0.436,0.222-0.601,0L20.3,1164.4c-0.165-0.222-0.075-0.4,0.2-0.4
-		h2.47c-0.188-4.312-4.187-8-8.97-8c-4.963,0-9,4.037-9,9c0,6.459,5.867,8.976,8.517,8.976c2.65,0,4.309-0.561,5.987-1.863
-		l0.004,0.004c0.364-0.295,1.004-0.857,1.252-1.088c0.302-0.28,0.854-0.183,1.229,0.222l0.683,0.73
-		c0.375,0.402,0.435,0.962,0.133,1.242c-0.196,0.183-0.327,0.344-1.17,1.021c-1.885,1.426-4.302,2.717-8.218,2.717
-		S2,1173.168,2,1165c0-6.617,5.383-12,12-12c6.411,0,11.78,5.219,11.973,10.93l0.004,0.07H28.5
-		C28.774,1164,28.865,1164.181,28.699,1164.4z"/>
-</g>
-<g id="albums">
-	<path fill="#FFFFFF" d="M433,1110v14c-0.554,0-1-0.447-1-1v-12C432,1110.447,432.447,1110,433,1110z"/>
-	<path fill="#FFFFFF" d="M459,1110v14c0.553,0,1-0.447,1-1v-12C460,1110.447,459.553,1110,459,1110z"/>
-	<path fill="#FFFFFF" d="M435,1109h1v16h-1c-0.554,0-1-0.447-1-1v-14C434,1109.447,434.447,1109,435,1109z"/>
-	<path fill="#FFFFFF" d="M457,1109h-1v16h1c0.553,0,1-0.447,1-1v-14C458,1109.447,457.553,1109,457,1109z"/>
-	<path fill="#FFFFFF" d="M454,1108h-16c-0.551,0-1,0.45-1,1v16c0,0.55,0.449,1,1,1h16c0.55,0,1-0.45,1-1v-16
-		C455,1108.45,454.55,1108,454,1108z M451,1120c0,1.469-2.021,1.71-2.302,1.71c-0.846,0-1.55-0.396-1.752-1.021
-		c-0.275-0.853,0.461-1.796,1.607-2.218c0.647-0.237,1.444-0.155,1.444-0.146v-4.407l-6,1.369c0,0,0,3.899,0,5.712
-		s-2.102,2.057-2.417,2.057c-0.815,0-1.439-0.374-1.629-0.955c-0.271-0.834,0.441-1.77,1.604-2.174
-		c0.646-0.225,1.441-0.137,1.441-0.131v-6.604c0-0.245,0.072-0.469,0.291-0.529l7.491-1.854l-0.039-0.01
-		c0.218,0,0.257,0.169,0.257,0.394C451,1111.192,451,1118.531,451,1120z"/>
-</g>
-<g id="pin">
-	<g>
-		<path fill="#FFFFFF" d="M398.023,1105.078c-2.705,0-4.898,2.193-4.898,4.897c0,2.705,2.193,4.898,4.898,4.898
-			s4.898-2.193,4.898-4.898C402.921,1107.271,400.729,1105.078,398.023,1105.078z M398.216,1107.854
-			c-0.923-0.063-2.467,0.602-2.553,1.438c-0.085,0.834-1.022,1.28-0.989-0.06c0-1.571,1.588-2.688,3.35-2.688
-			C399.439,1106.801,399.139,1107.918,398.216,1107.854z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M397.046,1115.759c0,0,0,10.485,0,10.902s0.298,0.788,0.978,0.788c0.681,0,0.978-0.361,0.978-0.788
-			s0-10.902,0-10.902C398.686,1115.881,397.359,1115.881,397.046,1115.759z"/>
-	</g>
-	<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M399,1125.991c0,0.37,0,0.612,0,0.67
-		c0,0.427-0.297,0.788-0.978,0.788c-0.68,0-0.978-0.371-0.978-0.788c0-0.056,0-0.299,0-0.67c-1.226,0.206-2.112,0.776-2.112,1.458
-		c0,0.854,1.383,1.545,3.09,1.545c1.705,0,3.088-0.691,3.088-1.545C401.111,1126.77,400.224,1126.197,399,1125.991z"/>
-</g>
-<g id="zoom_x5F_out">
-	<path fill="#FFFFFF" d="M345.5,1116c-0.275,0-0.5-0.225-0.5-0.5v-1c0-0.275,0.225-0.5,0.5-0.5h7c0.274,0,0.5,0.225,0.5,0.5v1
-		c0,0.275-0.226,0.5-0.5,0.5H345.5z"/>
-	<path fill="#FFFFFF" d="M363.219,1127.257l-2.213,2.212c-0.202,0.202-0.534,0.202-0.736,0l-6.098-6.099
-		c-1.537,0.993-3.362,1.577-5.323,1.577c-5.431,0-9.849-4.418-9.849-9.85c0-5.431,4.418-9.849,9.849-9.849s9.849,4.418,9.849,9.849
-		c0,1.961-0.584,3.786-1.575,5.323l6.098,6.099C363.422,1126.722,363.422,1127.054,363.219,1127.257z M355.568,1115.099
-		c0-3.706-3.014-6.72-6.72-6.72s-6.72,3.014-6.72,6.72s3.014,6.721,6.72,6.721S355.568,1118.805,355.568,1115.099z"/>
-</g>
-<g id="zoom_x5F_in">
-	<path fill="#FFFFFF" d="M315.469,1127.257l-2.213,2.212c-0.202,0.202-0.534,0.202-0.736,0l-6.098-6.099
-		c-1.537,0.993-3.362,1.577-5.323,1.577c-5.431,0-9.849-4.418-9.849-9.85c0-5.431,4.418-9.849,9.849-9.849s9.849,4.418,9.849,9.849
-		c0,1.961-0.584,3.786-1.575,5.323l6.098,6.099C315.672,1126.722,315.672,1127.054,315.469,1127.257z M307.818,1115.099
-		c0-3.706-3.014-6.72-6.72-6.72s-6.72,3.014-6.72,6.72s3.014,6.721,6.72,6.721S307.818,1118.805,307.818,1115.099z M304.5,1114H302
-		v-2.5c0-0.275-0.226-0.5-0.5-0.5h-1c-0.275,0-0.5,0.225-0.5,0.5v2.5h-2.5c-0.275,0-0.5,0.225-0.5,0.5v1c0,0.275,0.225,0.5,0.5,0.5
-		h2.5v2.5c0,0.275,0.225,0.5,0.5,0.5h1c0.274,0,0.5-0.225,0.5-0.5v-2.5h2.5c0.274,0,0.5-0.225,0.5-0.5v-1
-		C305,1114.225,304.775,1114,304.5,1114z"/>
-</g>
-<g id="pen_1_">
-	<polygon fill="#FFFFFF" points="243,1129 249.438,1125.938 246.156,1122.656 	"/>
-	<path fill="#FFFFFF" d="M265.953,1107.412l-1.33-1.331c-0.39-0.39-1.025-0.39-1.414,0l-1.369,1.369
-		c-0.391-0.349-0.991-0.345-1.366,0.03l-0.519,0.52h-1.748h-1.414l-5.793,5.793v1.363l0.024,0.024l6.183-6.182h1.748l-0.446,0.446
-		l-11.876,11.876l4.08,4.081l13.841-13.842c0.375-0.375,0.379-0.977,0.031-1.366l1.368-1.369
-		C266.342,1108.438,266.342,1107.801,265.953,1107.412z"/>
-</g>
-<g id="brush_1_">
-	<path fill="#FFFFFF" d="M218.875,1106.747c-0.019,0.018-8.705,11.299-9.562,12.367c-0.856,1.068-1.674,1.751-1.926,1.938
-		s-2.85,1.692-2.85,1.692c-0.193,0.084-0.333-0.01-0.371-0.157c-0.115-0.449-0.326-0.846-0.654-1.172
-		c-0.334-0.332-0.744-0.527-1.203-0.653c-0.214-0.059-0.261-0.199-0.164-0.365c0,0,1.406-2.582,1.611-2.845
-		c0.203-0.262,1.143-1.187,2.027-1.978c0.884-0.791,11.952-9.339,12.17-9.501c0.282-0.215,0.67-0.265,0.868-0.066
-		C219.021,1106.206,219.074,1106.466,218.875,1106.747z M200.438,1121.766c-0.754,0.004-2.094,0.406-2.745,2.131
-		c-0.452,1.198-1.016,2.754-3.217,3.498c-0.11,0.038-0.184,0.149-0.168,0.268c0.014,0.117,0.109,0.209,0.228,0.219
-		c0.944,0.083,1.768,0.123,2.508,0.12c2.168-0.006,3.754-0.361,4.852-1.085c0.388-0.259,0.789-0.71,0.789-0.71
-		c0.857-1.122,0.754-2.716-0.242-3.705C201.906,1121.969,201.191,1121.764,200.438,1121.766z"/>
-</g>
-<g id="direction_1_">
-	<path fill="#FFFFFF" d="M169.775,1104.963c0.121-0.246,0.02-0.35-0.229-0.228l-24.521,12.044c-0.247,0.121-0.225,0.221,0.052,0.221
-		H157l0.024,11.975c0,0.275,0.101,0.298,0.222,0.051L169.775,1104.963z M153.533,1115c-0.275,0-0.3-0.35-0.053-0.471l12.598-6.295
-		c0.246-0.121,0.304-0.07,0.108,0.125l-6.843,6.067c-0.194,0.194-0.579,0.572-0.854,0.572L153.533,1115L153.533,1115z"/>
-</g>
-<g id="cloud_2_">
-	<path fill="#FFFFFF" d="M119.276,1114.969c0-0.011,0.002-0.02,0.002-0.029c0-3.805-3.009-6.889-6.719-6.889
-		c-3.001,0-5.543,2.02-6.404,4.804c-0.332-0.07-0.676-0.108-1.027-0.108c-2.774,0-5.024,2.593-5.024,5.438
-		c0,0.18,0.009-0.184,0.026,0.816c-0.007,0-0.016,0-0.021,0c-1.64,0-2.968,1.346-2.968,3.025c0,1.493,0.95,2.975,2.432,2.975
-		c1.482,0,21.441,0,21.441,0c1.719-1,2.925-2.777,2.925-4.818C123.938,1117.506,121.864,1115.062,119.276,1114.969z"/>
-</g>
-<g id="sun">
-	<path fill="#FFFFFF" d="M62,1112.117c-2.662,0-4.883,2.222-4.883,4.883s2.221,4.883,4.883,4.883s4.883-2.222,4.883-4.883
-		S64.662,1112.117,62,1112.117z M66.901,1110.624l2.848-2.847l1.476,1.475l-2.847,2.847
-		C67.951,1111.545,67.455,1111.05,66.901,1110.624z M55.623,1112.099l-2.848-2.847l1.477-1.475l2.847,2.847
-		C56.545,1111.05,56.049,1111.545,55.623,1112.099z M54.012,1118H50v-2h4.012C53.923,1116,53.923,1118,54.012,1118z M61,1109.013
-		V1105h2v4.013C63,1108.924,61,1108.924,61,1109.013z M63,1124.987V1129h-2v-4.013C61,1125.076,63,1125.076,63,1124.987z M74,1116v2
-		h-4.013c0.09,0,0.09-2,0-2H74z M68.377,1121.901l2.846,2.846l-1.475,1.476l-2.848-2.847
-		C67.455,1122.95,67.951,1122.455,68.377,1121.901z M57.1,1123.377l-2.847,2.846l-1.477-1.475l2.847-2.848
-		C56.05,1122.455,56.545,1122.95,57.1,1123.377z"/>
-</g>
-<g id="moon_1_">
-	<path fill="#FFFFFF" d="M23.688,1124.859c-2.094,2.326-4.995,3.74-8.376,3.85c-6.582,0.214-12.09-4.921-12.305-11.467
-		c-0.214-6.544,4.946-12.022,11.528-12.236c0.414-0.014,0.822,0.005,1.228,0.023c0.394,0.018,0.456,0.221,0.197,0.387
-		c-3.008,1.93-4.958,5.326-4.833,9.141c0.188,5.772,5.046,10.298,10.85,10.11c0.502-0.017,0.998-0.056,1.479-0.153
-		C23.906,1124.422,23.969,1124.547,23.688,1124.859z"/>
-</g>
-<g id="retweet_x5F_2_1_">
-	<path fill="#FFFFFF" d="M448.211,1074l3.848,5H435.5c-0.827,0-1.5-0.673-1.5-1.5v-9.5h-3.96l6.345-8.639l6.646,8.639H439v6H448.211
-		z M458,1071v-9.475c0-0.827-0.631-1.525-1.457-1.525h-16.56l3.848,5H453v6h-3.988l6.646,8.639l6.345-8.639H458z"/>
-</g>
-<g id="gbp">
-	<path fill="#FFFFFF" d="M405.59,1075.041c-1.072,1.145-1.816,1.295-2.619,1.295c-0.773,0-1.548-0.182-2.322-0.361
-		c-0.772-0.149-1.547-0.332-2.351-0.332c-0.565,0-1.071,0.092-2.024,0.693l-0.059-0.061c1.309-1.054,2.438-2.066,2.438-3.963
-		c0-0.552-0.045-1.312-0.161-1.312H402v-3h-4.492c-1.113-3-1.146-3.05-1.146-3.962c0-1.686,1.19-2.872,2.916-2.872
-		c3.036,0,3.111,2.834,3.2,3.834h4.02c0.028-5-2.694-7.479-7.188-7.479c-5,0-7.619,3.037-7.619,6.228
-		c0,1.679,0.665,3.252,1.24,4.252H391v3h3.208c0.253,0,0.429,0.9,0.429,1.463c0,2.197-1.696,3.787-3.363,4.87l1.847,2.735
-		c1.159-0.902,2.352-1.175,3.422-1.175c1.311,0,2.084,0.285,2.946,0.587c0.834,0.301,1.757,0.532,3.244,0.532
-		c1.519,0,3.215-0.545,4.644-1.93L405.59,1075.041z"/>
-</g>
-<g id="usd_1_">
-	<path fill="#FFFFFF" d="M358.561,1073.455c0-4.971-4.656-5.98-6.125-6.381c-0.477-0.133-0.436-0.252-1.436-0.365v-5.217
-		c2,0.359,2.44,1.508,2.54,3.508h4.306c0-5-2.846-6.955-6.846-7.379V1056h-2v1.598c-3.316,0.369-6.521,2.511-6.521,6.566
-		c0,4.11,3.029,5.365,6.024,6.225c0.165,0.049,0.33,0.095,0.495,0.141v5.984c-1.565-0.466-2.636-1.514-2.636-3.514h-4.305
-		c-0.045,4,3.082,6.906,6.939,7.384V1082h2v-1.57C356,1080.053,358.561,1077.197,358.561,1073.455z M346.779,1063.764
-		c0-1.481,1.066-2.188,2.222-2.405v4.604C347.217,1065.357,346.779,1064.887,346.779,1063.764z M351,1076.672v-5.447
-		c2,0.543,3.005,1.247,3.005,2.785C354.005,1075.836,353,1076.492,351,1076.672z"/>
-</g>
-<g id="euro_1_">
-	<path fill="#FFFFFF" d="M308.529,1072c-0.317,3-1.696,4.75-4.236,4.75c-2.351,0-3.774-1.758-4.507-3.75h4.812l0.805-3h-6.211
-		c-0.018-0.288-0.022-1-0.016-1h6.422l0.805-3h-6.737c0.689-3,2.139-3.844,4.628-3.844c2.062,0,3.924,1.844,4.188,3.844h4.021
-		c-0.502-5-4.056-7.887-8.208-7.887c-4.696,0-7.837,2.887-8.892,7.887h-2.999l-0.805,3h3.423c-0.008,0-0.002,0.714,0.014,1h-2.632
-		l-0.805,3h3.881c1.125,4.385,4.229,7.792,8.813,7.792c4.629,0,7.833-3.792,8.257-8.792H308.529z"/>
-</g>
-<g id="bluetooth_1_">
-	<path id="bluetooth" fill="#FFFFFF" d="M260.469,1064.371l-8.368-7.137v8.237l-2.997-2.929l-1.684,1.723l4.681,4.574v0.195
-		l-4.907,4.688l1.665,1.741l3.242-3.099v8.397l8.356-7.128l-4.79-4.679L260.469,1064.371z M254.511,1062.455l2.365,2.019
-		l-2.365,2.26V1062.455z M256.887,1073.518l-2.376,2.027v-4.351L256.887,1073.518z"/>
-</g>
-<g id="chevron-left">
-	<polygon fill="#FFFFFF" points="197.808,1069 208.301,1058.507 211.973,1062.179 205.161,1069 211.978,1075.816 208.302,1079.492 	
-		"/>
-</g>
-<g id="chevron-right">
-	<polygon fill="#FFFFFF" points="166.228,1069 155.734,1058.507 152.062,1062.179 158.874,1069 152.058,1075.816 155.733,1079.492 	
-		"/>
-</g>
-<g id="share">
-	<path fill="#FFFFFF" d="M121.098,1069.293l-10.678,7.91c-0.223,0.164-0.402,0.072-0.402-0.203l-0.006-5.002
-		c-3.017-0.023-9.574-0.105-11.512,4.505c0.139-9.503,9.264-10.8,11.505-10.976l-0.005-4.515c0-0.274,0.182-0.366,0.401-0.202
-		l10.695,7.889C121.318,1068.862,121.319,1069.129,121.098,1069.293z"/>
-</g>
-<g id="unshare">
-	<path fill="#FFFFFF" d="M73.5,1076.503c-1.938-4.61-8.495-4.528-11.513-4.505L61.982,1077c0,0.275-0.181,0.367-0.401,0.203
-		l-10.679-7.91c-0.222-0.164-0.221-0.431,0-0.594l10.695-7.89c0.221-0.163,0.402-0.071,0.402,0.203l-0.005,4.515
-		C64.236,1065.703,73.361,1067,73.5,1076.503z"/>
-</g>
-<g id="play_x5F_button_1_">
-	<path fill="#FFFFFF" d="M14,1081.25c-6.755,0-12.25-5.495-12.25-12.25s5.495-12.25,12.25-12.25s12.25,5.495,12.25,12.25
-		S20.755,1081.25,14,1081.25z M14,1060c-4.963,0-9,4.037-9,9s4.037,9,9,9s9-4.037,9-9S18.963,1060,14,1060z M18.939,1069.172
-		l-7.728,4.545c-0.109,0.094-0.212,0.045-0.212-0.108v-9.216c0-0.153,0.102-0.202,0.21-0.108l7.734,4.545
-		C19.054,1068.922,19.048,1069.078,18.939,1069.172z"/>
-</g>
-<g id="circle_x5F_arrow_x5F_down">
-	<path fill="#FFFFFF" d="M433.75,1020.938c0,6.73,5.455,12.188,12.188,12.188s12.188-5.457,12.188-12.188
-		c0-6.73-5.455-12.188-12.188-12.188S433.75,1014.207,433.75,1020.938z M447.5,1015c0.274,0,0.5,0.225,0.5,0.5v5.5h3.5
-		c0.274,0,0.354,0.171,0.175,0.38l-5.351,6.24c-0.179,0.209-0.472,0.21-0.65,0.001l-5.38-6.242
-		c-0.181-0.209-0.103-0.379,0.174-0.379H444v-5.5c0-0.275,0.225-0.5,0.5-0.5H447.5L447.5,1015z"/>
-</g>
-<g id="circle_x5F_arrow_x5F_top">
-	<path fill="#FFFFFF" d="M398.938,1033.125c6.731,0,12.188-5.457,12.188-12.188c0-6.731-5.456-12.188-12.188-12.188
-		c-6.731,0-12.188,5.457-12.188,12.188C386.75,1027.668,392.206,1033.125,398.938,1033.125z M397.5,1027c-0.275,0-0.5-0.225-0.5-0.5
-		v-5.5h-3.532c-0.275,0-0.354-0.17-0.174-0.379l5.38-6.242c0.18-0.209,0.473-0.208,0.651,0.001l5.35,6.24
-		c0.179,0.209,0.101,0.38-0.175,0.38H401v5.5c0,0.275-0.226,0.5-0.5,0.5H397.5z"/>
-</g>
-<g id="circle_x5F_arrow_x5F_right">
-	<path fill="#FFFFFF" d="M337.75,1020.938c0,6.731,5.457,12.188,12.188,12.188c6.731,0,12.188-5.456,12.188-12.188
-		c0-6.731-5.457-12.188-12.188-12.188C343.207,1008.75,337.75,1014.206,337.75,1020.938z M344,1019.5c0-0.275,0.225-0.5,0.5-0.5h5.5
-		v-3.532c0-0.274,0.173-0.355,0.384-0.18l6.398,5.329c0.211,0.176,0.211,0.465,0,0.641l-6.398,5.329
-		c-0.211,0.177-0.384,0.096-0.384-0.18V1023h-5.5c-0.275,0-0.5-0.225-0.5-0.5V1019.5z"/>
-</g>
-<g id="circle_x5F_arrow_x5F_left">
-	<path fill="#FFFFFF" d="M301.938,1008.75c-6.729,0-12.188,5.456-12.188,12.188c0,6.732,5.457,12.188,12.188,12.188
-		c6.731,0,12.188-5.456,12.188-12.188C314.126,1014.206,308.668,1008.75,301.938,1008.75z M308,1022.5c0,0.275-0.226,0.5-0.5,0.5
-		H302v3.407c0,0.274-0.173,0.355-0.384,0.18l-6.398-5.329c-0.211-0.176-0.211-0.465,0-0.641l6.398-5.329
-		c0.211-0.177,0.384-0.096,0.384,0.18V1019h5.5c0.274,0,0.5,0.225,0.5,0.5V1022.5z"/>
-</g>
-<g id="resize_x5F_full_1_">
-	<path fill="#FFFFFF" d="M243.53,1023.445l2.52,2.518l4.126-4.126c0.134-0.134,0.364-0.133,0.497,0.001l2.42,2.42
-		c0.133,0.133,0.133,0.361-0.001,0.496l-4.126,4.125l2.518,2.521c0.136,0.133,0.086,0.266-0.102,0.288l-8.989,1.146
-		c-0.188,0.023-0.321-0.111-0.296-0.299l1.144-8.988C243.264,1023.359,243.396,1023.312,243.53,1023.445z M264.767,1018.453
-		l1.145-8.988c0.024-0.188-0.108-0.322-0.296-0.299l-8.989,1.146c-0.188,0.022-0.236,0.155-0.103,0.288l2.519,2.521l-4.126,4.125
-		c-0.134,0.135-0.134,0.363-0.001,0.496l2.42,2.42c0.133,0.133,0.363,0.135,0.497,0l4.126-4.125l2.519,2.518
-		C264.609,1018.688,264.742,1018.641,264.767,1018.453z"/>
-</g>
-<g id="resize_x5F_small_1_">
-	<path fill="#FFFFFF" d="M203.75,1031.129l-2.519-2.518l-4.127,4.126c-0.134,0.134-0.362,0.133-0.498-0.001l-2.418-2.42
-		c-0.134-0.134-0.135-0.361,0-0.496l4.127-4.125l-2.52-2.521c-0.133-0.133-0.086-0.266,0.102-0.289l8.99-1.146
-		c0.188-0.023,0.32,0.111,0.297,0.299l-1.145,8.988C204.016,1031.215,203.883,1031.263,203.75,1031.129z M207.959,1010.973
-		l-1.146,8.988c-0.022,0.188,0.109,0.322,0.297,0.299l8.99-1.146c0.188-0.023,0.234-0.156,0.103-0.289l-2.521-2.521l4.127-4.125
-		c0.135-0.135,0.134-0.362,0-0.496l-2.418-2.42c-0.135-0.133-0.364-0.135-0.498,0l-4.127,4.125l-2.518-2.518
-		C208.117,1010.738,207.984,1010.785,207.959,1010.973z"/>
-</g>
-<g id="up_x5F_arrow_1_">
-	<path fill="#FFFFFF" d="M166.181,1022H161v8.487c0,0.274-0.237,0.513-0.514,0.513h-4.977c-0.274,0-0.511-0.237-0.511-0.513V1022
-		h-5.182c-0.274,0-0.361-0.188-0.193-0.404l8.068-10.428c0.168-0.218,0.443-0.215,0.611,0.002l8.069,10.425
-		C166.543,1021.812,166.455,1022,166.181,1022z"/>
-</g>
-<g id="down_x5F_arrow_1_">
-	<path fill="#FFFFFF" d="M101.819,1020H107v-8.487c0-0.274,0.236-0.513,0.513-0.513h4.977c0.274,0,0.512,0.237,0.512,0.513V1020
-		h5.181c0.275,0,0.362,0.188,0.194,0.404l-8.069,10.428c-0.168,0.217-0.443,0.216-0.611-0.002l-8.068-10.425
-		C101.457,1020.188,101.545,1020,101.819,1020z"/>
-</g>
-<g id="right_x5F_arrow_2_">
-	<path fill="#FFFFFF" d="M61,1029.181V1024h-8.487c-0.275,0-0.513-0.237-0.513-0.513v-4.978c0-0.273,0.236-0.511,0.513-0.511H61
-		v-5.181c0-0.275,0.187-0.362,0.403-0.194l10.429,8.069c0.218,0.168,0.216,0.442-0.002,0.61l-10.426,8.069
-		C61.188,1029.543,61,1029.455,61,1029.181z"/>
-</g>
-<g id="left_x5F_arrow_2_">
-	<path fill="#FFFFFF" d="M14.596,1029.375l-10.424-8.069c-0.218-0.168-0.22-0.442-0.002-0.61l10.427-8.069
-		c0.218-0.168,0.403-0.081,0.403,0.194v5.18h8.488c0.275,0,0.512,0.236,0.512,0.511v4.978c0,0.274-0.235,0.513-0.512,0.513H15v5.181
-		C15,1029.455,14.813,1029.543,14.596,1029.375z"/>
-</g>
-<g id="cart_x5F_in_1_">
-	<path fill="#FFFFFF" d="M458,962h-2.5c-0.464,0-0.866,0.318-0.974,0.77l-0.766,3.23h-4.065l-1.649,2H449v1h-1v-0.944L446.396,970
-		H447v1h-1v-0.521l-0.503,0.608c-0.313,0.418-0.859,0.729-1.45,0.729c-0.598,0-1.153-0.277-1.528-0.762L442.472,971H442v-0.561
-		L440.787,969H440v-0.936L438.263,966H434.5c-0.304,0-0.591,0.138-0.78,0.374c-0.189,0.237-0.263,0.547-0.196,0.843l2,9
-		c0.102,0.458,0.508,0.783,0.977,0.783h14.656l-0.946,4H438c-0.554,0-1,0.447-1,1s0.446,1,1,1h1.092
-		c-0.057,0.157-0.092,0.324-0.092,0.5c0,0.828,0.672,1.5,1.5,1.5c0.827,0,1.5-0.672,1.5-1.5c0-0.176-0.036-0.343-0.093-0.5h5.185
-		c-0.057,0.157-0.093,0.324-0.093,0.5c0,0.828,0.673,1.5,1.5,1.5c0.828,0,1.5-0.672,1.5-1.5c0-0.176-0.035-0.343-0.092-0.5H451
-		c0.473,0,0.866-0.5,0.971-1h0.002l4.318-18H458c0.553,0,1-0.447,1-1S458.553,962,458,962z M437,973h-0.144l-0.222-1H437V973z
-		 M437,971h-0.588l-0.222-1H437V971z M437,969h-1.031l-0.224-1H437V969z M439,975h-1v-1h1V975z M439,973h-1v-1h1V973z M439,971h-1
-		v-1h1V971z M439,969h-1v-1h1V969z M441,975h-1v-1h1V975z M441,973h-1v-1h1V973z M441,971h-1v-1h1V971z M443,975h-1v-1h1V975z
-		 M443,973h-1v-1h1V973z M445,975h-1v-1h1V975z M445,973h-1v-1h1V973z M447,975h-1v-1h1V975z M447,973h-1v-1h1V973z M449,975h-1v-1
-		h1V975z M449,973h-1v-1h1V973z M449,971h-1v-1h1V971z M451,975h-1v-1h1V975z M451,973h-1v-1h1V973z M451,971h-1v-1h1V971z M451,969
-		h-1v-1h1V969z M452.104,973H452v-1h0.341L452.104,973z M452.727,970.372L452.577,971H452v-1h0.809L452.727,970.372z M453.031,969
-		H452v-1h1.254L453.031,969z M439.068,964.317c-0.091-0.117-0.044-0.317,0.104-0.317H442v-2.5c0-0.275,0.225-0.5,0.5-0.5h3
-		c0.274,0,0.5,0.225,0.5,0.5v2.5h2.849c0.147,0,0.196,0.188,0.104,0.306l-4.764,5.734c-0.04,0.053-0.091,0.076-0.144,0.076
-		c-0.066,0-0.136-0.037-0.187-0.104L439.068,964.317z"/>
-</g>
-<g id="cart_x5F_out_1_">
-	<path fill="#FFFFFF" d="M410,962h-2.5c-0.463,0-0.866,0.318-0.974,0.77l-0.766,3.23h-3.785c0.355,0.479,0.416,0.893,0.17,1.394
-		C401.901,967.895,401,968,401,968v1h-1v-1h-1v3h-7v-1h1v-1h-1v-1h-0.826c-0.555,0-1.053-0.102-1.299-0.6
-		c-0.236-0.479-0.185-0.967,0.11-1.4H386.5c-0.304,0-0.59,0.138-0.78,0.374c-0.189,0.237-0.262,0.547-0.196,0.843l2,9
-		c0.103,0.458,0.508,0.783,0.978,0.783h14.655l-0.946,4H390c-0.554,0-1,0.447-1,1s0.446,1,1,1h1.092
-		c-0.056,0.157-0.092,0.324-0.092,0.5c0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5c0-0.176-0.036-0.343-0.092-0.5h5.184
-		c-0.056,0.157-0.092,0.324-0.092,0.5c0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5c0-0.176-0.036-0.343-0.093-0.5H403
-		c0.473,0,0.867-0.5,0.971-1h0.002l4.318-18H410c0.553,0,1-0.447,1-1S410.553,962,410,962z M389,973h-0.144l-0.222-1H389V973z
-		 M389,971h-0.587l-0.223-1H389V971z M389,969h-1.031l-0.223-1H389V969z M391,975h-1v-1h1V975z M391,973h-1v-1h1V973z M391,971h-1
-		v-1h1V971z M391,969h-1v-1h1V969z M393,975h-1v-1h1V975z M393,973h-1v-1h1V973z M395,975h-1v-1h1V975z M395,973h-1v-1h1V973z
-		 M397,975h-1v-1h1V975z M397,973h-1v-1h1V973z M399,975h-1v-1h1V975z M399,973h-1v-1h1V973z M401,975h-1v-1h1V975z M401,973h-1v-1
-		h1V973z M401,971h-1v-1h1V971z M403,975h-1v-1h1V975z M403,973h-1v-1h1V973z M403,971h-1v-1h1V971z M403,969h-1v-1h1V969z
-		 M404.104,973H404v-1h0.341L404.104,973z M404.727,970.372L404.578,971H404v-1h0.809L404.727,970.372z M405.031,969H404v-1h1.254
-		L405.031,969z M391.174,967c-0.148,0-0.196-0.133-0.105-0.251l4.765-5.681c0.04-0.054,0.091-0.083,0.144-0.083
-		c0.066,0,0.135,0.021,0.187,0.088l4.793,5.667c0.091,0.117,0.044,0.26-0.104,0.26H398v2.5c0,0.275-0.226,0.5-0.5,0.5h-3
-		c-0.275,0-0.5-0.225-0.5-0.5V967H391.174z"/>
-</g>
-<g id="remove_x5F_2">
-	<path fill="#FFFFFF" d="M353.195,972.996l5.648-5.648c0.221-0.222,0.221-0.585,0-0.806l-2.383-2.383
-		c-0.222-0.222-0.583-0.222-0.806,0l-5.648,5.648l-5.653-5.651c-0.222-0.222-0.584-0.222-0.805,0l-2.383,2.384
-		c-0.223,0.22-0.223,0.582,0,0.806l5.651,5.651l-5.649,5.649c-0.22,0.221-0.22,0.584,0,0.806l2.383,2.383
-		c0.222,0.22,0.586,0.22,0.806,0l5.649-5.649l5.646,5.646c0.222,0.221,0.585,0.221,0.807,0l2.384-2.384
-		c0.22-0.22,0.22-0.583,0-0.807L353.195,972.996z"/>
-</g>
-<g id="ok_x5F_2">
-	<path fill="#FFFFFF" d="M313.008,967.27c0.196,0.193,0.197,0.511,0.003,0.705l-14.475,14.475c-0.194,0.193-0.514,0.193-0.707,0
-		l-3.245-3.246c-0.195-0.194-0.515-0.513-0.707-0.707l-3.906-3.907c-0.195-0.192-0.195-0.512,0-0.707l3.246-3.246
-		c0.194-0.193,0.513-0.193,0.707,0l3.906,3.906c0.194,0.194,0.514,0.194,0.707,0l10.492-10.492c0.194-0.193,0.515-0.194,0.71-0.002
-		L313.008,967.27z"/>
-</g>
-<g id="electricity">
-	<path fill="#FFFFFF" d="M253.201,978.496c0.055-0.271-0.127-0.49-0.402-0.49h-1.478c-0.274,0-0.438-0.216-0.358-0.479l1.295-5.047
-		c0.076-0.265-0.084-0.479-0.359-0.479h-2.528c-0.275,0-0.431-0.214-0.347-0.476l3.349-10.05c0.086-0.262,0.381-0.476,0.653-0.476
-		h6.607c0.275,0,0.402,0.203,0.283,0.45l-4.08,7.131c-0.119,0.248,0.008,0.448,0.283,0.445l2.528-0.026
-		c0.275-0.004,0.398,0.195,0.275,0.441l-2.426,6.143c-0.123,0.246,0.002,0.447,0.276,0.447h1.498c0.273,0,0.361,0.178,0.191,0.395
-		l-6.379,8.437c-0.168,0.217-0.265,0.174-0.209-0.097L253.201,978.496z"/>
-</g>
-<g id="unlock">
-	<path fill="#FFFFFF" d="M215.338,970H214v-5.002c0-3.083-2.894-5.998-5.947-5.998h-5.105c-3.055,0-5.946,2.915-5.946,5.998V966h4
-		v-1.002c0-1.4,0.628-1.998,2-1.998h5c1.372,0,2,0.598,2,1.998V970h-14.338c-0.365,0-0.662,0.263-0.662,0.587v13.826
-		c0,0.324,0.297,0.587,0.662,0.587h19.676c0.365,0,0.662-0.263,0.662-0.587v-13.826C216,970.263,215.703,970,215.338,970z
-		 M206.5,977.431V980c0,0.275-0.226,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5v-2.569c-0.597-0.347-1-0.983-1-1.723
-		c0-1.104,0.896-1.999,2-1.999c1.104,0,2,0.895,2,1.999C207.5,976.446,207.096,977.084,206.5,977.431z"/>
-</g>
-<g id="lock">
-	<path fill="#FFFFFF" d="M167.338,970H166v-5.002c0-3.083-2.894-5.998-5.947-5.998h-5.105c-3.055,0-5.946,2.915-5.946,5.998V970
-		h-1.338c-0.365,0-0.662,0.263-0.662,0.587v13.826c0,0.324,0.297,0.587,0.662,0.587h19.676c0.365,0,0.662-0.263,0.662-0.587v-13.826
-		C168,970.263,167.703,970,167.338,970z M153,964.998c0-1.4,0.628-1.998,2-1.998h5c1.372,0,2,0.598,2,1.998V970h-9V964.998z
-		 M158.5,977.431V980c0,0.275-0.226,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5v-2.569c-0.597-0.347-1-0.983-1-1.723
-		c0-1.104,0.896-1.999,2-1.999c1.104,0,2,0.895,2,1.999C159.5,976.446,159.096,977.084,158.5,977.431z"/>
-</g>
-<g id="shopping_x5F_cart">
-	<path fill="#FFFFFF" d="M123,962h-2.5c-0.463,0-0.866,0.318-0.974,0.77l-0.766,3.23H99.5c-0.304,0-0.59,0.138-0.78,0.374
-		c-0.189,0.237-0.262,0.547-0.196,0.843l2,9c0.103,0.458,0.509,0.783,0.978,0.783h14.656l-0.947,4H103c-0.554,0-1,0.447-1,1
-		s0.446,1,1,1h1.092c-0.056,0.157-0.092,0.324-0.092,0.5c0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5
-		c0-0.176-0.036-0.343-0.092-0.5h5.184c-0.056,0.157-0.092,0.324-0.092,0.5c0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5
-		c0-0.176-0.036-0.343-0.092-0.5H116c0.473,0,0.867-0.5,0.971-1h0.002l4.318-18H123c0.553,0,1-0.447,1-1S123.553,962,123,962z
-		 M102,973h-0.144l-0.222-1H102V973z M102,971h-0.587l-0.223-1H102V971z M102,969h-1.031l-0.223-1H102V969z M104,975h-1v-1h1V975z
-		 M104,973h-1v-1h1V973z M104,971h-1v-1h1V971z M104,969h-1v-1h1V969z M106,975h-1v-1h1V975z M106,973h-1v-1h1V973z M106,971h-1v-1
-		h1V971z M106,969h-1v-1h1V969z M108,975h-1v-1h1V975z M108,973h-1v-1h1V973z M108,971h-1v-1h1V971z M108,969h-1v-1h1V969z M110,975
-		h-1v-1h1V975z M110,973h-1v-1h1V973z M110,971h-1v-1h1V971z M110,969h-1v-1h1V969z M112,975h-1v-1h1V975z M112,973h-1v-1h1V973z
-		 M112,971h-1v-1h1V971z M112,969h-1v-1h1V969z M114,975h-1v-1h1V975z M114,973h-1v-1h1V973z M114,971h-1v-1h1V971z M114,969h-1v-1
-		h1V969z M116,975h-1v-1h1V975z M116,973h-1v-1h1V973z M116,971h-1v-1h1V971z M116,969h-1v-1h1V969z M117.104,973H117v-1h0.341
-		L117.104,973z M117.578,971H117v-1h0.809L117.578,971z M118.031,969H117v-1h1.254L118.031,969z"/>
-</g>
-<g id="upload">
-	<path fill="#FFFFFF" d="M62,985.25c-6.755,0-12.25-5.495-12.25-12.25s5.495-12.25,12.25-12.25s12.25,5.495,12.25,12.25
-		S68.755,985.25,62,985.25z M62,964c-4.963,0-9,4.037-9,9s4.037,9,9,9s9-4.037,9-9S66.963,964,62,964z M67.688,974H65v4.469
-		c0,0.275-0.226,0.5-0.5,0.5h-5c-0.275,0-0.5-0.225-0.5-0.5V974h-2.766c-0.191,0-0.253-0.28-0.136-0.433l5.648-7.374
-		c0.116-0.152,0.31-0.188,0.428-0.035l5.646,7.428C67.941,973.737,67.879,974,67.688,974z"/>
-</g>
-<g id="download_1_">
-	<path fill="#FFFFFF" d="M26.25,973c0,6.755-5.495,12.25-12.25,12.25S1.75,979.755,1.75,973S7.245,960.75,14,960.75
-		S26.25,966.245,26.25,973z M23,973c0-4.963-4.037-9-9-9s-9,4.037-9,9s4.037,9,9,9S23,977.963,23,973z M19.823,972.414l-5.646,7.428
-		c-0.118,0.152-0.312,0.117-0.428-0.035L8.1,972.433C7.982,972.28,8.043,972,8.235,972H11v-4.469c0-0.275,0.225-0.5,0.5-0.5h5
-		c0.274,0,0.5,0.225,0.5,0.5V972h2.688C19.879,972,19.941,972.263,19.823,972.414z"/>
-</g>
-<g id="ban">
-	<path fill="#FFFFFF" d="M446,912.75c-6.756,0-12.25,5.495-12.25,12.25s5.494,12.25,12.25,12.25c6.755,0,12.25-5.495,12.25-12.25
-		S452.755,912.75,446,912.75z M446,916c1.766,0,3.408,0.519,4.801,1.4l-12.4,12.399c-0.882-1.392-1.399-3.035-1.399-4.801
-		C437,920.037,441.036,916,446,916z M446,934c-1.766,0-3.408-0.518-4.8-1.399l12.399-12.398c0.882,1.391,1.398,3.034,1.398,4.799
-		C455,929.963,450.963,934,446,934z"/>
-</g>
-<g id="ok">
-	<path fill="#FFFFFF" d="M398,912.75c-6.755,0-12.25,5.495-12.25,12.25s5.495,12.25,12.25,12.25s12.25-5.495,12.25-12.25
-		S404.755,912.75,398,912.75z M398,934c-4.963,0-9-4.037-9-9s4.037-9,9-9s9,4.037,9,9S402.963,934,398,934z M404.061,922.987
-		l-7.512,7.511c-0.127,0.128-0.337,0.128-0.465,0l-2.132-2.133c-0.128-0.128-0.339-0.337-0.466-0.465l-1.566-1.567
-		c-0.128-0.127-0.128-0.336,0-0.465l2.134-2.133c0.128-0.128,0.337-0.128,0.464,0l1.567,1.566c0.128,0.127,0.337,0.127,0.465,0
-		l4.896-4.895c0.128-0.128,0.338-0.129,0.468-0.002l2.146,2.117C404.188,922.651,404.188,922.859,404.061,922.987z"/>
-</g>
-<g id="remove_2_">
-	<path fill="#FFFFFF" d="M350,912.75c-6.755,0-12.25,5.495-12.25,12.25s5.495,12.25,12.25,12.25s12.25-5.495,12.25-12.25
-		S356.755,912.75,350,912.75z M350,934c-4.963,0-9-4.037-9-9s4.037-9,9-9s9,4.037,9,9S354.963,934,350,934z M355.646,922.16
-		l-2.843,2.843l2.839,2.839c0.195,0.195,0.195,0.514,0,0.707l-2.094,2.094c-0.193,0.195-0.512,0.195-0.707,0l-2.839-2.839
-		l-2.843,2.843c-0.193,0.193-0.513,0.193-0.707,0l-2.095-2.094c-0.192-0.194-0.192-0.514,0-0.707l2.844-2.843l-2.846-2.845
-		c-0.194-0.195-0.194-0.514,0-0.707l2.095-2.094c0.192-0.195,0.512-0.195,0.707,0l2.845,2.845l2.843-2.843
-		c0.193-0.193,0.512-0.193,0.707,0l2.094,2.094C355.84,921.648,355.84,921.967,355.646,922.16z"/>
-</g>
-<g id="circle_x5F_exclamation_x5F_mark">
-	<path fill="#FFFFFF" d="M302,912.75c-6.766,0-12.25,5.484-12.25,12.25s5.484,12.25,12.25,12.25c6.765,0,12.25-5.484,12.25-12.25
-		S308.765,912.75,302,912.75z M304,932.5c0,0.275-0.226,0.5-0.5,0.5h-3c-0.275,0-0.5-0.225-0.5-0.5v-3c0-0.275,0.225-0.5,0.5-0.5h3
-		c0.274,0,0.5,0.225,0.5,0.5V932.5z M304,921.5c0,0.275-0.044,0.721-0.099,0.99l-0.899,4.77c-0.053,0.271-0.322,0.74-0.599,0.74
-		h-0.784c-0.275,0-0.545-0.471-0.601-0.74l-0.92-4.645c-0.055-0.271-0.1-0.84-0.1-1.115v-4c0-0.275,0.225-0.5,0.5-0.5h3
-		c0.274,0,0.5,0.225,0.5,0.5L304,921.5L304,921.5z"/>
-</g>
-<g id="circle_x5F_info">
-	<path fill="#FFFFFF" d="M254,912.75c-6.766,0-12.25,5.484-12.25,12.25s5.484,12.25,12.25,12.25c6.765,0,12.25-5.484,12.25-12.25
-		S260.765,912.75,254,912.75z M253,918.5c0-0.275,0.225-0.5,0.5-0.5h2c0.274,0,0.5,0.225,0.5,0.5v2c0,0.275-0.226,0.5-0.5,0.5h-2
-		c-0.275,0-0.5-0.225-0.5-0.5V918.5z M258,931.5c0,0.275-0.226,0.5-0.5,0.5h-6c-0.275,0-0.5-0.225-0.5-0.5v-2
-		c0-0.275,0.225-0.5,0.5-0.5h1.5v-4h-1.5c-0.275,0-0.5-0.225-0.5-0.5v-2c0-0.275,0.225-0.5,0.5-0.5h4c0.274,0,0.5,0.225,0.5,0.5v6.5
-		h1.5c0.274,0,0.5,0.225,0.5,0.5V931.5z"/>
-</g>
-<g id="circle_x5F_question_x5F_mark">
-	<path fill="#FFFFFF" d="M208.047,932.5c0,0.275-0.226,0.5-0.5,0.5H204.5c-0.275,0-0.5-0.225-0.5-0.5v-3c0-0.275,0.225-0.5,0.5-0.5
-		h3.047c0.274,0,0.5,0.225,0.5,0.5V932.5z M206,912.75c-6.766,0-12.25,5.484-12.25,12.25s5.484,12.25,12.25,12.25
-		c6.765,0,12.25-5.484,12.25-12.25S212.765,912.75,206,912.75z M208.85,924.832c-0.967,0.631-1.256,1.175-1.288,2.424
-		c-0.003,0.137-0.113,0.244-0.25,0.244h-2.562c-0.068,0-0.25-0.182-0.25-0.25v-1.02c0-1.069,0.576-2.011,1.766-2.878
-		c0.093-0.063,0.983-0.646,0.983-1.448c0-0.666-0.501-1.131-1.22-1.131c-1.021,0-1.593,0.513-1.646,1.49
-		c-0.008,0.133-0.117,0.235-0.25,0.235H204h-2.562c-0.067,0-0.135-0.028-0.182-0.078c-0.047-0.049-0.072-0.116-0.068-0.185
-		c0.141-2.717,1.904-4.273,4.845-4.273c2.229,0,4.629,1.209,4.629,3.864C210.662,923.607,210.256,923.943,208.85,924.832z"/>
-</g>
-<g id="circle_x5F_ok">
-	<path fill="#FFFFFF" d="M166.662,916.338c-4.784-4.784-12.54-4.784-17.324,0s-4.784,12.54,0,17.324s12.54,4.784,17.324,0
-		C171.445,928.878,171.446,921.122,166.662,916.338z M165.061,921.987l-8.512,8.511c-0.127,0.128-0.337,0.128-0.465,0l-5.164-5.165
-		c-0.128-0.127-0.128-0.336,0-0.465l2.134-2.133c0.128-0.128,0.337-0.128,0.464,0l2.567,2.566c0.128,0.127,0.337,0.127,0.465,0
-		l5.896-5.895c0.128-0.128,0.338-0.129,0.468-0.002l2.146,2.118C165.188,921.651,165.188,921.859,165.061,921.987z"/>
-</g>
-<g id="circle_x5F_remove">
-	<path fill="#FFFFFF" d="M118.662,916.338c-4.784-4.784-12.54-4.784-17.324,0s-4.784,12.54,0,17.324s12.54,4.784,17.324,0
-		C123.445,928.878,123.446,921.122,118.662,916.338z M113.535,930.656c-0.194,0.194-0.514,0.194-0.707,0L110,927.828l-2.828,2.828
-		c-0.194,0.194-0.513,0.194-0.707,0l-2.121-2.121c-0.195-0.193-0.195-0.512,0-0.707l2.828-2.828l-2.828-2.828
-		c-0.195-0.195-0.195-0.514,0-0.707l2.121-2.121c0.194-0.194,0.512-0.194,0.707,0l2.828,2.828l2.828-2.828
-		c0.194-0.194,0.513-0.194,0.707,0l2.12,2.121c0.195,0.193,0.195,0.513,0,0.707L112.828,925l2.827,2.828
-		c0.195,0.195,0.195,0.514,0,0.707L113.535,930.656z"/>
-</g>
-<g id="circle_x5F_minus">
-	<path fill="#FFFFFF" d="M62,912.75c-6.766,0-12.25,5.484-12.25,12.25s5.484,12.25,12.25,12.25c6.765,0,12.25-5.484,12.25-12.25
-		S68.765,912.75,62,912.75z M68,926.5c0,0.276-0.225,0.5-0.5,0.5h-11c-0.276,0-0.5-0.224-0.5-0.5v-3c0-0.276,0.224-0.5,0.5-0.5h11
-		c0.275,0,0.5,0.224,0.5,0.5V926.5z"/>
-</g>
-<g id="circle_x5F_plus">
-	<path fill="#FFFFFF" d="M14,912.75c-6.766,0-12.25,5.483-12.25,12.25S7.235,937.25,14,937.25c6.765,0,12.25-5.483,12.25-12.25
-		S20.765,912.75,14,912.75z M21.086,926.519c0,0.278-0.229,0.507-0.506,0.507h-4.556v4.617c0,0.279-0.227,0.508-0.506,0.508h-3.037
-		c-0.278,0-0.506-0.229-0.506-0.508v-4.617H7.42c-0.279,0-0.506-0.229-0.506-0.507v-3.036c0-0.278,0.228-0.507,0.506-0.507h4.555
-		v-4.555c0-0.279,0.229-0.507,0.506-0.507h3.037c0.279,0,0.506,0.228,0.506,0.507v4.555h4.556c0.278,0,0.506,0.229,0.506,0.507
-		L21.086,926.519L21.086,926.519z"/>
-</g>
-<g id="brightness_x5F_increase">
-	<path fill="#FFFFFF" d="M446,871c-3.309,0-6,2.692-6,6s2.691,6,6,6c3.308,0,6-2.692,6-6S449.308,871,446,871z M446,880.913
-		c-2.158,0-3.913-1.755-3.913-3.913s1.755-3.913,3.913-3.913c2.157,0,3.912,1.755,3.912,3.913S448.157,880.913,446,880.913z
-		 M437.812,878h-3.745c-0.027-0.33-0.051-0.662-0.051-1s0.022-0.67,0.051-1h3.745c-0.04,0.328-0.066,0.661-0.066,1
-		S437.771,877.672,437.812,878z M440.921,883.493l-2.649,2.648c-0.51-0.432-0.982-0.903-1.414-1.414l2.649-2.648
-		C439.92,882.605,440.395,883.08,440.921,883.493z M439.507,871.921l-2.649-2.648c0.432-0.511,0.904-0.982,1.414-1.414l2.649,2.648
-		C440.395,870.92,439.92,871.395,439.507,871.921z M454.188,876h3.745c0.027,0.33,0.051,0.662,0.051,1s-0.022,0.67-0.051,1h-3.745
-		c0.04-0.328,0.066-0.661,0.066-1S454.229,876.328,454.188,876z M447,885.188v3.746c-0.33,0.027-0.662,0.052-1,0.052
-		c-0.339,0-0.671-0.023-1-0.052v-3.746c0.327,0.041,0.66,0.067,1,0.067C446.339,885.255,446.672,885.229,447,885.188z
-		 M455.143,869.271l-2.649,2.648c-0.413-0.526-0.888-1.001-1.414-1.414l2.649-2.648
-		C454.238,868.289,454.711,868.762,455.143,869.271z M452.492,882.079l2.649,2.648c-0.432,0.511-0.904,0.982-1.414,1.414
-		l-2.649-2.648C451.605,883.08,452.079,882.605,452.492,882.079z M447,865.066v3.745c-0.328-0.041-0.661-0.066-1-0.066
-		c-0.34,0-0.673,0.025-1,0.066v-3.745c0.329-0.027,0.661-0.052,1-0.052C446.338,865.015,446.67,865.039,447,865.066z"/>
-</g>
-<g id="brightness_x5F_reduce">
-	<path fill="#FFFFFF" d="M390.898,877c0-0.34,0.032-0.672,0.079-1h-2.903c-0.033,0.329-0.052,0.662-0.052,1s0.019,0.671,0.052,1
-		h2.903C390.931,877.672,390.898,877.34,390.898,877z"/>
-	<path fill="#FFFFFF" d="M399,886.927v-2.903c-0.328,0.047-0.66,0.078-1,0.078s-0.672-0.031-1-0.078v2.903
-		c0.329,0.033,0.662,0.052,1,0.052S398.671,886.96,399,886.927z"/>
-	<path fill="#FFFFFF" d="M403.671,872.743l2.052-2.052c-0.424-0.518-0.896-0.99-1.414-1.414l-2.052,2.052
-		C402.792,871.732,403.268,872.208,403.671,872.743z"/>
-	<path fill="#FFFFFF" d="M407.927,876h-2.904c0.047,0.328,0.079,0.66,0.079,1s-0.032,0.672-0.079,1h2.904
-		c0.033-0.329,0.051-0.662,0.051-1S407.96,876.329,407.927,876z"/>
-	<path fill="#FFFFFF" d="M398,869.898c0.34,0,0.672,0.031,1,0.078v-2.903c-0.329-0.033-0.662-0.052-1-0.052s-0.671,0.019-1,0.052
-		v2.903C397.328,869.931,397.66,869.898,398,869.898z"/>
-	<path fill="#FFFFFF" d="M403.671,881.257c-0.403,0.535-0.879,1.011-1.414,1.414l2.052,2.052c0.518-0.424,0.99-0.896,1.414-1.414
-		L403.671,881.257z"/>
-	<path fill="#FFFFFF" d="M392.329,881.257l-2.053,2.052c0.425,0.518,0.897,0.99,1.414,1.414l2.053-2.052
-		C393.208,882.268,392.732,881.792,392.329,881.257z"/>
-	<path fill="#FFFFFF" d="M392.329,872.743c0.402-0.535,0.879-1.011,1.414-1.414l-2.053-2.052c-0.517,0.424-0.989,0.896-1.414,1.414
-		L392.329,872.743z"/>
-	<path fill="#FFFFFF" d="M398,880.987c-2.199,0-3.987-1.788-3.987-3.987s1.788-3.987,3.987-3.987s3.986,1.788,3.986,3.987
-		S400.199,880.987,398,880.987z M398,875.045c-1.077,0-1.954,0.877-1.954,1.955c0,1.077,0.877,1.954,1.954,1.954
-		c1.078,0,1.954-0.877,1.954-1.954C399.954,875.922,399.078,875.045,398,875.045z"/>
-</g>
-<g id="more_1_">
-	<path fill="#FFFFFF" d="M344.874,877.114c0,1.593-1.292,2.886-2.886,2.886s-2.886-1.293-2.886-2.886s1.292-2.886,2.886-2.886
-		S344.874,875.521,344.874,877.114z M349.968,874.229c-1.593,0-2.885,1.294-2.885,2.887s1.292,2.886,2.885,2.886
-		c1.594,0,2.886-1.293,2.886-2.886S351.562,874.229,349.968,874.229z M357.947,874.229c-1.593,0-2.886,1.294-2.886,2.887
-		s1.293,2.886,2.886,2.886c1.595,0,2.887-1.293,2.887-2.886S359.541,874.229,357.947,874.229z"/>
-</g>
-<g id="move">
-	<path fill="#FFFFFF" d="M313.646,876.646l-4.293-4.294c-0.193-0.193-0.354-0.129-0.354,0.146v2.5h-5v-5l2.483-0.013
-		c0.275-0.002,0.342-0.162,0.146-0.356l-4.277-4.277c-0.193-0.193-0.513-0.193-0.707,0l-4.293,4.294
-		c-0.193,0.193-0.128,0.354,0.146,0.354h2.5v5h-5v-2.5c0-0.275-0.159-0.341-0.354-0.146l-4.293,4.294
-		c-0.194,0.193-0.194,0.513,0,0.706l4.293,4.294c0.194,0.193,0.354,0.129,0.354-0.146V879h5v5h-2.5
-		c-0.275,0-0.342,0.159-0.146,0.354l4.293,4.294c0.194,0.193,0.514,0.193,0.707,0l4.293-4.294c0.194-0.193,0.128-0.354-0.146-0.354
-		H304v-5h5v2.5c0,0.275,0.159,0.341,0.354,0.146l4.293-4.294C313.841,877.159,313.841,876.841,313.646,876.646z"/>
-</g>
-<g id="screenshot">
-	<g>
-		<path fill="#FFFFFF" d="M254.508,884.023c-4.136,0-7.5-3.364-7.5-7.5c0-4.137,3.364-7.5,7.5-7.5s7.5,3.363,7.5,7.5
-			C262.008,880.659,258.644,884.023,254.508,884.023z M254.508,870.023c-3.584,0-6.5,2.916-6.5,6.5s2.916,6.5,6.5,6.5
-			s6.5-2.916,6.5-6.5S258.092,870.023,254.508,870.023z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M244,877h-2.5c-0.275,0-0.5-0.225-0.5-0.5s0.225-0.5,0.5-0.5h2.5h3.024h1H253v1h-4.976h-1H244z
-			 M254,870.025V875h1v-4.975v-1V867v-3.5c0-0.275-0.226-0.5-0.5-0.5c-0.275,0-0.5,0.225-0.5,0.5v3.5v2.025V870.025z M267.5,876H265
-			h-3.025h-1H256v1h4.975h1H265h2.5c0.274,0,0.5-0.225,0.5-0.5S267.775,876,267.5,876z M255,882.975V878h-1v4.975v1V886v3.5
-			c0,0.275,0.225,0.5,0.5,0.5c0.274,0,0.5-0.225,0.5-0.5V886v-2.025V882.975z"/>
-	</g>
-	<g opacity="0.3">
-		<path fill="#FFFFFF" d="M260.975,877H256v-1h4.975h0.007c-0.255-3.177-2.801-5.711-5.98-5.951V875h-1v-4.951
-			c-3.174,0.248-5.711,2.779-5.966,5.951H253v1h-4.968c0.232,3.193,2.777,5.749,5.968,5.998v-0.023V878h1v4.975v0.023
-			c3.195-0.241,5.75-2.8,5.982-5.998H260.975z"/>
-	</g>
-</g>
-<g id="volume_x5F_up_1_">
-	<path fill="#FFFFFF" d="M217.75,877c0,4.558-1.597,8.748-4.253,12.049l-1.546-1.267c2.374-2.956,3.799-6.705,3.799-10.782
-		c0-4.089-1.434-7.848-3.819-10.808l1.581-1.224C216.16,868.268,217.75,872.451,217.75,877z M210.35,867.414l-1.582,1.223
-		c1.863,2.283,2.982,5.194,2.982,8.363c0,3.116-1.084,5.982-2.893,8.248l1.546,1.268c2.092-2.61,3.347-5.919,3.347-9.516
-		C213.75,873.371,212.474,870.035,210.35,867.414z M207.187,869.859l-1.583,1.225c1.338,1.605,2.146,3.668,2.146,5.916
-		c0,2.155-0.747,4.137-1.988,5.711l1.551,1.271c1.523-1.921,2.438-4.346,2.438-6.98C209.75,874.291,208.787,871.803,207.187,869.859
-		z M204,869.292c0-0.275-0.168-0.35-0.373-0.167l-4.854,4.562c-0.205,0.184-0.599,0.334-0.873,0.334H194.5
-		c-0.275,0-0.5,0.225-0.5,0.5v3.979c0,0.275,0.225,0.5,0.5,0.5h3.464c0.273,0,0.663,0.154,0.863,0.344l4.81,4.562
-		c0.2,0.188,0.363,0.118,0.363-0.156V869.292L204,869.292z"/>
-</g>
-<g id="volume_x5F_down">
-	<path fill="#FFFFFF" d="M159.187,869.859l-1.583,1.225c1.338,1.605,2.146,3.668,2.146,5.916c0,2.155-0.747,4.137-1.988,5.711
-		l1.551,1.271c1.523-1.921,2.438-4.346,2.438-6.98C161.75,874.291,160.787,871.803,159.187,869.859z M156,869.292
-		c0-0.275-0.168-0.35-0.373-0.167l-4.854,4.562c-0.205,0.184-0.599,0.334-0.873,0.334H146.5c-0.275,0-0.5,0.225-0.5,0.5v3.979
-		c0,0.275,0.225,0.5,0.5,0.5h3.464c0.273,0,0.663,0.154,0.863,0.344l4.81,4.562c0.2,0.188,0.363,0.118,0.363-0.156V869.292
-		L156,869.292z"/>
-</g>
-<g id="mute">
-	<path fill="#FFFFFF" d="M119.851,880.087c0.198,0.197,0.198,0.521,0,0.718l-1.075,1.076c-0.198,0.198-0.521,0.198-0.719,0
-		l-3.045-3.044l-3.047,3.046c-0.197,0.198-0.521,0.198-0.718,0l-1.075-1.076c-0.199-0.196-0.199-0.521,0-0.718l3.046-3.047
-		l-3.048-3.049c-0.199-0.196-0.199-0.521,0-0.718l1.075-1.076c0.197-0.197,0.521-0.197,0.718,0l3.049,3.048l3.047-3.046
-		c0.197-0.198,0.521-0.198,0.719,0l1.075,1.076c0.198,0.197,0.198,0.521,0,0.718l-3.046,3.047L119.851,880.087z M108,869.292
-		c0-0.275-0.168-0.35-0.373-0.167l-4.854,4.562c-0.205,0.184-0.599,0.334-0.873,0.334H98.5c-0.275,0-0.5,0.225-0.5,0.5v3.979
-		c0,0.275,0.225,0.5,0.5,0.5h3.464c0.273,0,0.663,0.154,0.863,0.344l4.81,4.562c0.2,0.188,0.363,0.118,0.363-0.156V869.292z"/>
-</g>
-<g id="download_x5F_alt">
-	<path fill="#FFFFFF" d="M73.461,884H62.573l7.37-8.588c0.159-0.205,0.078-0.412-0.182-0.412H65v-9.511
-		c0-0.261-0.196-0.489-0.455-0.489h-5.024c-0.26,0-0.521,0.229-0.521,0.489V875h-4.682c-0.26,0-0.343,0.208-0.184,0.413L61.507,884
-		H50.5c-0.275,0-0.5,0.225-0.5,0.5v4.5h2.5H74v-0.5v-4C74,884.225,73.736,884,73.461,884z M72,887h-2v-1h2V887z"/>
-</g>
-<g id="facetime_x5F_video_1_">
-	<path fill="#FFFFFF" d="M26,871v12c0,0.275-0.17,0.354-0.378,0.172L19,877.867v5.633c0,0.825-0.675,1.5-1.5,1.5h-14
-		c-0.825,0-1.5-0.675-1.5-1.5v-13c0-0.825,0.675-1.5,1.5-1.5h14c0.825,0,1.5,0.675,1.5,1.5v5.633l6.622-5.305
-		C25.83,870.646,26,870.725,26,871z"/>
-</g>
-<g id="eject">
-	<path fill="#FFFFFF" d="M437.296,832c-0.275,0-0.362-0.471-0.194-0.689l8.608-11.104c0.168-0.218,0.442-0.19,0.61,0.026
-		l8.592,11.096c0.168,0.218,0.08,0.671-0.193,0.671H437.296z M437.5,834c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h17
-		c0.274,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.226-0.5-0.5-0.5H437.5z"/>
-</g>
-<g id="step_x5F_forward">
-	<path fill="#FFFFFF" d="M405,820.5v17c0,0.275-0.226,0.5-0.5,0.5h-2c-0.275,0-0.5-0.225-0.5-0.5v-7.789l-10.453,8.188
-		c-0.218,0.168-0.547,0.08-0.547-0.194V820.28c0-0.275,0.329-0.362,0.547-0.194L402,828.242V820.5c0-0.275,0.225-0.5,0.5-0.5h2
-		C404.775,820,405,820.225,405,820.5z"/>
-</g>
-<g id="fast_x5F_forward_1_">
-	<path fill="#FFFFFF" d="M362,820.5v17c0,0.275-0.226,0.5-0.5,0.5h-2c-0.275,0-0.5-0.225-0.5-0.5v-7.789l-10.453,8.188
-		c-0.218,0.168-0.547,0.08-0.547-0.194v-7.971v-0.021l-10.453,8.188c-0.218,0.168-0.547,0.08-0.547-0.194V820.28
-		c0-0.275,0.329-0.362,0.547-0.194L348,828.242v-0.022v-7.938c0-0.275,0.329-0.362,0.547-0.194L359,828.242V820.5
-		c0-0.275,0.225-0.5,0.5-0.5h2C361.775,820,362,820.225,362,820.5z"/>
-</g>
-<g id="forward">
-	<path fill="#FFFFFF" d="M313.518,829.306l-10.971,8.593c-0.218,0.168-0.547,0.08-0.547-0.194v-7.971v-0.021l-10.453,8.188
-		c-0.218,0.168-0.547,0.08-0.547-0.194V820.28c0-0.275,0.329-0.362,0.547-0.194L302,828.242v-0.022v-7.938
-		c0-0.275,0.329-0.362,0.547-0.194l11.033,8.608C313.798,828.862,313.734,829.138,313.518,829.306z"/>
-</g>
-<g id="stop_1_">
-	<path fill="#FFFFFF" d="M261,835.5c0,0.275-0.226,0.5-0.5,0.5h-13c-0.275,0-0.5-0.225-0.5-0.5v-13c0-0.275,0.225-0.5,0.5-0.5h13
-		c0.274,0,0.5,0.225,0.5,0.5V835.5z"/>
-</g>
-<g id="pause">
-	<path fill="#FFFFFF" d="M205,836.5c0,0.275-0.226,0.5-0.5,0.5h-3c-0.275,0-0.5-0.225-0.5-0.5v-15c0-0.275,0.225-0.5,0.5-0.5h3
-		c0.274,0,0.5,0.225,0.5,0.5V836.5z M211,821.5c0-0.275-0.226-0.5-0.5-0.5h-3c-0.275,0-0.5,0.225-0.5,0.5v15
-		c0,0.275,0.225,0.5,0.5,0.5h3c0.274,0,0.5-0.225,0.5-0.5V821.5z"/>
-</g>
-<g id="play_1_">
-	<path fill="#FFFFFF" d="M166.854,829.306l-15.433,8.069c-0.217,0.168-0.422,0.08-0.422-0.194v-16.36
-		c0-0.275,0.203-0.362,0.42-0.194l15.446,8.069C167.084,828.862,167.072,829.138,166.854,829.306z"/>
-</g>
-<g id="rewind">
-	<path fill="#FFFFFF" d="M121,820.28v17.423c0,0.273-0.329,0.362-0.547,0.193L110,829.711v0.021v7.971
-		c0,0.273-0.329,0.362-0.547,0.193l-10.972-8.592c-0.217-0.168-0.279-0.442-0.062-0.61l11.033-8.608
-		c0.218-0.168,0.547-0.081,0.547,0.194v7.938v0.022l10.453-8.156C120.671,819.918,121,820.005,121,820.28z"/>
-</g>
-<g id="fast_x5F_backward_1_">
-	<path fill="#FFFFFF" d="M74.453,820.086L64,828.242v-0.022v-7.938c0-0.275-0.329-0.362-0.547-0.194L53,828.242V820.5
-		c0-0.275-0.226-0.5-0.5-0.5h-2c-0.275,0-0.5,0.225-0.5,0.5v17c0,0.275,0.225,0.5,0.5,0.5h2c0.274,0,0.5-0.225,0.5-0.5v-7.789
-		l10.453,8.188c0.218,0.168,0.547,0.08,0.547-0.194v-7.971v-0.021l10.453,8.188c0.218,0.168,0.547,0.08,0.547-0.194V820.28
-		C75,820.005,74.671,819.918,74.453,820.086z"/>
-</g>
-<g id="step_x5F_backward">
-	<path fill="#FFFFFF" d="M20.453,820.086L10,828.242V820.5c0-0.275-0.226-0.5-0.5-0.5h-2c-0.275,0-0.5,0.225-0.5,0.5v17
-		c0,0.275,0.225,0.5,0.5,0.5h2c0.274,0,0.5-0.225,0.5-0.5v-7.789l10.453,8.188c0.218,0.168,0.547,0.08,0.547-0.194V820.28
-		C21,820.005,20.671,819.918,20.453,820.086z"/>
-</g>
-<g id="phone">
-	<g>
-		<path fill="#FFFFFF" d="M445.547,768.062c-4.781,0-7.547,1.838-7.547,2.938v20c0,1.1,0.899,2,2,2h11c1.1,0,2-0.9,2-2v-20
-			C453,769.9,450.327,768.062,445.547,768.062z M443,791h-3v-2h3V791z M443,788h-3v-2h3V788z M443,785h-3v-2h3V785z M447,791h-3v-2
-			h3V791z M447,788h-3v-2h3V788z M447,785h-3v-2h3V785z M451,791h-3v-2h3V791z M451,788h-3v-2h3V788z M451,785h-3v-2h3V785z
-			 M451,781h-11v-10h11V781z"/>
-	</g>
-	<g opacity="0.3">
-		<rect x="440" y="771" fill="#FFFFFF" width="11" height="10"/>
-	</g>
-</g>
-<g id="ear_x5F_plugs_1_">
-	<path fill="#FFFFFF" d="M403.5,772c-2.484,0-4.5,2.017-4.5,4.5c0,1.941,1.239,3.578,2.965,4.209C401.778,778.91,400,778,400,778v-3
-		c0,0,3,3,3,6v3h2v-3.275c1.744-0.621,3-2.27,3-4.225C408,774.017,405.984,772,403.5,772z"/>
-	<polygon fill="#FFFFFF" points="402,790 403,790 403,793 404,793 404,790 405,790 405,785 402,785 	"/>
-	<polygon fill="#FFFFFF" points="391,787 392,787 392,793 393,793 393,787 394,787 394,782 391,782 	"/>
-	<path fill="#FFFFFF" d="M392.5,769c-2.484,0-4.5,2.017-4.5,4.5c0,1.941,1.239,3.578,2.965,4.209C390.778,775.91,389,775,389,775v-3
-		c0,0,3,3,3,6v3h2v-3.275c1.744-0.621,3-2.27,3-4.225C397,771.017,394.984,769,392.5,769z"/>
-</g>
-<g id="ipod_x5F_shuffle_1_">
-	<g id="ipod_x5F_shuffle">
-		<path fill="#FFFFFF" d="M343,775v13h15v-13H343z M350.5,786.402c-2.708,0-4.902-2.194-4.902-4.902s2.194-4.902,4.902-4.902
-			s4.901,2.194,4.901,4.902S353.208,786.402,350.5,786.402z M353.349,781.5c0,1.574-1.274,2.849-2.849,2.849s-2.85-1.273-2.85-2.849
-			c0-1.573,1.275-2.849,2.85-2.849S353.349,779.927,353.349,781.5z"/>
-	</g>
-</g>
-<g id="ipod">
-	<g id="body_4_">
-		<path fill="#FFFFFF" d="M307.634,770h-11.268c-0.756,0-1.366,0.611-1.366,1.366v19.268c0,0.755,0.61,1.366,1.366,1.366h11.268
-			c0.755,0,1.366-0.611,1.366-1.366v-19.268C309,770.611,308.389,770,307.634,770z M302,789.652c-2.265,0-4.099-1.836-4.099-4.1
-			s1.834-4.099,4.099-4.099c2.264,0,4.098,1.835,4.098,4.099S304.264,789.652,302,789.652z M303.594,785.554
-			c0,0.88-0.714,1.595-1.594,1.595s-1.595-0.715-1.595-1.595s0.715-1.594,1.595-1.594S303.594,784.674,303.594,785.554z M307,778
-			h-10v-6h10V778z"/>
-	</g>
-	<g opacity="0.3">
-		<rect x="297" y="772" fill="#FFFFFF" width="10" height="6"/>
-	</g>
-</g>
-<g id="iphone_x5F_exchange">
-	<g>
-		<path fill="#FFFFFF" d="M264.907,780.844l-5.608-4.656c-0.115-0.09-0.299-0.043-0.299,0.103V779h-9v-2.711
-			c0-0.146-0.185-0.191-0.299-0.104l-5.608,4.657c-0.114,0.088-0.089,0.233,0.026,0.322l5.569,4.686
-			c0.114,0.089,0.312,0.043,0.312-0.102V783h9v2.75c0,0.145,0.195,0.19,0.311,0.102l5.57-4.686
-			C264.996,781.077,265.021,780.932,264.907,780.844z"/>
-	</g>
-	<g opacity="0.3">
-		<path fill="#FFFFFF" d="M267,773v15h-10v-2.25c0,0.546,0.214,1.039,0.555,1.418c0.398,0.443,0.973,0.729,1.619,0.729l0,0
-			c0.493,0,0.978-0.165,1.424-0.516l5.504-4.632c0.561-0.432,0.88-1.075,0.879-1.767c0-0.68-0.311-1.309-0.795-1.68l-2.182-1.811
-			l-3.484-2.893c-0.385-0.297-0.866-0.461-1.354-0.461c-1.194,0-2.166,0.963-2.166,2.147V773H267z M242.873,779.259l5.551-4.61
-			c0.44-0.343,0.923-0.507,1.41-0.507c0.434,0,0.834,0.13,1.174,0.349c0.596,0.383,0.992,1.045,0.992,1.8V773h-10v15h10v-2.25
-			c0,1.184-0.976,2.146-2.174,2.146c-0.493,0-0.979-0.165-1.365-0.467l-3.896-3.276l-1.731-1.457
-			c-0.493-0.378-0.813-1.021-0.812-1.713C242.02,780.305,242.33,779.676,242.873,779.259z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M252,785v0.75V788h-10v-15h10v3.289V777h2v-5.5c0-1.375-1.125-2.5-2.5-2.5h-9c-1.375,0-2.5,1.125-2.5,2.5
-			v19c0,1.375,1.125,2.5,2.5,2.5h9c1.375,0,2.5-1.125,2.5-2.5V785H252z M247,792.271c-0.979,0-1.771-0.794-1.771-1.771
-			s0.793-1.771,1.771-1.771c0.978,0,1.771,0.794,1.771,1.771S247.979,792.271,247,792.271z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M266.502,769h-9c-1.375,0-2.502,1.125-2.502,2.5v5.5h2v-4h10v15h-10v-3h-2v5.5
-			c0,1.375,1.127,2.5,2.502,2.5h9c1.375,0,2.498-1.125,2.498-2.5v-19C269,770.125,267.877,769,266.502,769z M262.002,792.271
-			c-0.979,0-1.771-0.794-1.771-1.771s0.793-1.771,1.771-1.771c0.978,0,1.771,0.794,1.771,1.771S262.98,792.271,262.002,792.271z"/>
-	</g>
-</g>
-<g id="iphone_x5F_transfer">
-	<g>
-		<path fill="#FFFFFF" d="M211.891,781.166l-5.575,4.686c-0.113,0.09-0.314,0.043-0.314-0.102V783h-4.49
-			c-0.275,0-0.51-0.245-0.51-0.521V779.5c0-0.275,0.233-0.5,0.51-0.5H206v-2.711c0-0.146,0.188-0.191,0.304-0.104l5.61,4.657
-			C212.029,780.932,212.006,781.077,211.891,781.166z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M218.502,769h-9c-1.375,0-2.502,1.125-2.502,2.5v2.809c0,0.076,2,1.517,2,1.517V773h10v15h-10v-1.791
-			l-1.396,1.173c-0.194,0.153-0.604,0.265-0.604,0.349v2.771c0,1.375,1.127,2.5,2.502,2.5h9c1.375,0,2.498-1.125,2.498-2.5v-19
-			C221,770.125,219.877,769,218.502,769z M214.002,792.271c-0.979,0-1.771-0.794-1.771-1.771s0.793-1.771,1.771-1.771
-			c0.978,0,1.771,0.794,1.771,1.771S214.98,792.271,214.002,792.271z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M204,785.75V785l0,0v3h-10v-15h10v4l0,0v-0.711c0-1.125,0.889-2.039,2-2.13V771.5
-			c0-1.375-1.125-2.5-2.5-2.5h-9c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h9c1.375,0,2.5-1.125,2.5-2.5v-2.622
-			C204.889,787.784,204,786.871,204,785.75z M199,792.271c-0.979,0-1.771-0.794-1.771-1.771s0.793-1.771,1.771-1.771
-			c0.978,0,1.771,0.794,1.771,1.771S199.979,792.271,199,792.271z"/>
-	</g>
-	<g opacity="0.3">
-		<path fill="#FFFFFF" d="M199,782.479c0,1.38,1.131,2.521,2.51,2.521H204v3h-10v-15h10v4h-2.549c-0.046,0-0.089,0.008-0.132,0.014
-			l-0.004,0.006c-1.289,0.099-2.315,1.166-2.315,2.48V782.479L199,782.479z M209,773v2.824l4.192,3.479
-			c0.389,0.297,0.656,0.761,0.752,1.279l-0.001,0.001c0.024,0.13,0.046,0.263,0.046,0.398c0,0.69-0.318,1.335-0.879,1.767
-			l-4.11,3.475V788h10v-14.997l0.002-0.003H209z"/>
-	</g>
-</g>
-<g id="iphone">
-	<g opacity="0.3">
-		<rect x="153" y="773" fill="#FFFFFF" width="10" height="15"/>
-	</g>
-	<g id="body_5_">
-		<path fill="#FFFFFF" d="M162.5,769h-9c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h9c1.375,0,2.5-1.125,2.5-2.5v-19
-			C165,770.125,163.875,769,162.5,769z M158,792.271c-0.979,0-1.771-0.794-1.771-1.771s0.793-1.771,1.771-1.771
-			c0.978,0,1.771,0.794,1.771,1.771S158.979,792.271,158,792.271z M153,788v-15h10v15H153z"/>
-	</g>
-</g>
-<g id="ipad">
-	<path fill="#FFFFFF" d="M119,767h-18c-1.101,0-2,0.9-2,2v23c0,1.1,0.899,2,2,2h18c1.1,0,2-0.9,2-2v-23C121,767.9,120.1,767,119,767
-		z M110,793.675c-0.649,0-1.175-0.525-1.175-1.175s0.525-1.175,1.175-1.175c0.648,0,1.175,0.525,1.175,1.175
-		S110.649,793.675,110,793.675z M118,791h-15.974H102v-21h16V791z"/>
-	<polygon opacity="0.3" fill="#FFFFFF" enable-background="new    " points="118,791 102.027,791 102,791 102,770 118,770 	"/>
-</g>
-<g id="macbook">
-	<g opacity="0.3">
-		<rect x="53" y="776" fill="#FFFFFF" width="18" height="11"/>
-	</g>
-	<g id="macbook_1_">
-		<path fill="#FFFFFF" d="M75.5,787H73v-12c0-0.55-0.45-1-1-1H52c-0.55,0-1,0.45-1,1v12h-2.5c-0.275,0-0.5,0.225-0.5,0.5v0.5
-			c0,0.275,0.225,0.5,0.5,0.5L49,789h26l0.5-0.5c0.274,0,0.5-0.225,0.5-0.5v-0.5C76,787.225,75.775,787,75.5,787z M53,776h18v11H53
-			V776z"/>
-	</g>
-</g>
-<g id="imac">
-	<g opacity="0.3">
-		<rect x="3" y="773" fill="#FFFFFF" width="22" height="12"/>
-	</g>
-	<g>
-		<line fill="#FFFFFF" x1="1" y1="787" x2="27" y2="787"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M25.5,771h-23c-0.825,0-1.5,0.675-1.5,1.5V787h26v-14.5C27,771.675,26.325,771,25.5,771z M25,785H3v-12h22
-			V785z"/>
-	</g>
-	<g opacity="0.5">
-		<path fill="#FFFFFF" d="M1,787.25v1.375C1,789.533,1.675,790,2.5,790h23c0.825,0,1.5-0.467,1.5-1.375v-1.375H1z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M19.609,792.703c0.267,0,0.293,0.297-0.004,0.297H8.426c-0.297,0-0.285-0.297-0.004-0.297S11,793,11,791
-			c0-1,0-1,0-1h5.985c0,0-0.014,0,0,1C17,793,19.344,792.703,19.609,792.703z"/>
-	</g>
-</g>
-<g id="playlist_1_">
-	<path fill="#FFFFFF" d="M459.192,732.032c-0.847,0.339-0.179-0.339-0.179-0.339s1.422-2.093,0.406-3.786
-		c-0.793-1.321-3.339-1.075-4.421-1.669v14.153c0,0.037-0.016,0.07-0.021,0.106c-0.154,1.504-1.607,3.034-3.696,3.712
-		c-2.56,0.829-5.103,0.063-5.678-1.711c-0.574-1.774,1.034-3.887,3.595-4.717c0.66-0.189,2.207-0.439,2.801-0.193v-15.981
-		c0-0.336,0.271-0.607,0.607-0.607h1.785c0.336,0,0.606,0.271,0.606,0.607v0.549c1.542,1.004,6.181,1.455,6.852,4.139
-		C462.656,729.52,460.037,731.693,459.192,732.032z M434.5,729H450v-3h-15.5c-0.275,0-0.5,0.225-0.5,0.5v2
-		C434,728.775,434.225,729,434.5,729z M434.5,735H450v-3h-15.5c-0.275,0-0.5,0.225-0.5,0.5v2C434,734.775,434.225,735,434.5,735z
-		 M444.625,738H434.5c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h8.551C443.228,739.925,443.779,738.887,444.625,738z"
-		/>
-</g>
-<g id="show_x5F_lines_1_">
-	<path fill="#FFFFFF" d="M410,740.5c0,0.275-0.226,0.5-0.5,0.5h-23c-0.275,0-0.5-0.225-0.5-0.5v-2c0-0.275,0.225-0.5,0.5-0.5h23
-		c0.274,0,0.5,0.225,0.5,0.5V740.5z M410,732.5c0-0.275-0.226-0.5-0.5-0.5h-23c-0.275,0-0.5,0.225-0.5,0.5v2
-		c0,0.275,0.225,0.5,0.5,0.5h23c0.274,0,0.5-0.225,0.5-0.5V732.5z M410,726.5c0-0.275-0.226-0.5-0.5-0.5h-23
-		c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h23c0.274,0,0.5-0.225,0.5-0.5V726.5z"/>
-</g>
-<g id="show_x5F_thumbnails_x5F_with_x5F_lines_1_">
-	<path fill="#FFFFFF" d="M362,740.5c0,0.275-0.226,0.5-0.5,0.5h-18c-0.275,0-0.5-0.225-0.5-0.5v-2c0-0.275,0.225-0.5,0.5-0.5h18
-		c0.274,0,0.5,0.225,0.5,0.5V740.5z M341,740.5c0,0.275-0.226,0.5-0.5,0.5h-2c-0.275,0-0.5-0.225-0.5-0.5v-2
-		c0-0.275,0.225-0.5,0.5-0.5h2c0.274,0,0.5,0.225,0.5,0.5V740.5z M362,734.5c0,0.275-0.226,0.5-0.5,0.5h-18
-		c-0.275,0-0.5-0.225-0.5-0.5v-2c0-0.275,0.225-0.5,0.5-0.5h18c0.274,0,0.5,0.225,0.5,0.5V734.5z M341,734.5
-		c0,0.275-0.226,0.5-0.5,0.5h-2c-0.275,0-0.5-0.225-0.5-0.5v-2c0-0.275,0.225-0.5,0.5-0.5h2c0.274,0,0.5,0.225,0.5,0.5V734.5z
-		 M362,728.5c0,0.275-0.226,0.5-0.5,0.5h-18c-0.275,0-0.5-0.225-0.5-0.5v-2c0-0.275,0.225-0.5,0.5-0.5h18c0.274,0,0.5,0.225,0.5,0.5
-		V728.5z M341,728.5c0,0.275-0.226,0.5-0.5,0.5h-2c-0.275,0-0.5-0.225-0.5-0.5v-2c0-0.275,0.225-0.5,0.5-0.5h2
-		c0.274,0,0.5,0.225,0.5,0.5V728.5z"/>
-</g>
-<g id="show_x5F_thumbnails_1_">
-	<path fill="#FFFFFF" d="M307.5,744c-0.275,0-0.5-0.225-0.5-0.5v-5c0-0.275,0.225-0.5,0.5-0.5h5c0.274,0,0.5,0.225,0.5,0.5v5
-		c0,0.275-0.226,0.5-0.5,0.5H307.5z M299.5,744c-0.275,0-0.5-0.225-0.5-0.5v-5c0-0.275,0.225-0.5,0.5-0.5h5
-		c0.274,0,0.5,0.225,0.5,0.5v5c0,0.275-0.226,0.5-0.5,0.5H299.5z M291.5,744c-0.275,0-0.5-0.225-0.5-0.5v-5
-		c0-0.275,0.225-0.5,0.5-0.5h5c0.274,0,0.5,0.225,0.5,0.5v5c0,0.275-0.226,0.5-0.5,0.5H291.5z M307.5,736
-		c-0.275,0-0.5-0.225-0.5-0.5v-5c0-0.275,0.225-0.5,0.5-0.5h5c0.274,0,0.5,0.225,0.5,0.5v5c0,0.275-0.226,0.5-0.5,0.5H307.5z
-		 M299.5,736c-0.275,0-0.5-0.225-0.5-0.5v-5c0-0.275,0.225-0.5,0.5-0.5h5c0.274,0,0.5,0.225,0.5,0.5v5c0,0.275-0.226,0.5-0.5,0.5
-		H299.5z M291.5,736c-0.275,0-0.5-0.225-0.5-0.5v-5c0-0.275,0.225-0.5,0.5-0.5h5c0.274,0,0.5,0.225,0.5,0.5v5
-		c0,0.275-0.226,0.5-0.5,0.5H291.5z M307.5,728c-0.275,0-0.5-0.225-0.5-0.5v-5c0-0.275,0.225-0.5,0.5-0.5h5
-		c0.274,0,0.5,0.225,0.5,0.5v5c0,0.275-0.226,0.5-0.5,0.5H307.5z M299.5,728c-0.275,0-0.5-0.225-0.5-0.5v-5
-		c0-0.275,0.225-0.5,0.5-0.5h5c0.274,0,0.5,0.225,0.5,0.5v5c0,0.275-0.226,0.5-0.5,0.5H299.5z M291.5,728
-		c-0.275,0-0.5-0.225-0.5-0.5v-5c0-0.275,0.225-0.5,0.5-0.5h5c0.274,0,0.5,0.225,0.5,0.5v5c0,0.275-0.226,0.5-0.5,0.5H291.5z"/>
-</g>
-<g id="show_x5F_big_x5F_thumbnails_1_">
-	<path fill="#FFFFFF" d="M255.5,744c-0.275,0-0.5-0.225-0.5-0.5v-9c0-0.275,0.225-0.5,0.5-0.5h9c0.274,0,0.5,0.225,0.5,0.5v9
-		c0,0.275-0.226,0.5-0.5,0.5H255.5z M252.5,744c0.274,0,0.5-0.225,0.5-0.5v-9c0-0.275-0.226-0.5-0.5-0.5h-9
-		c-0.275,0-0.5,0.225-0.5,0.5v9c0,0.275,0.225,0.5,0.5,0.5H252.5z M264.5,732c0.274,0,0.5-0.225,0.5-0.5v-9
-		c0-0.275-0.226-0.5-0.5-0.5h-9c-0.275,0-0.5,0.225-0.5,0.5v9c0,0.275,0.225,0.5,0.5,0.5H264.5z M252.5,732
-		c0.274,0,0.5-0.225,0.5-0.5v-9c0-0.275-0.226-0.5-0.5-0.5h-9c-0.275,0-0.5,0.225-0.5,0.5v9c0,0.275,0.225,0.5,0.5,0.5H252.5z"/>
-</g>
-<g id="more_x5F_windows">
-	<path fill="#FFFFFF" d="M213,727h-10c-2.205,0-4,1.794-4,4v10c0,2.206,1.795,4,4,4h10c2.205,0,4-1.794,4-4v-10
-		C217,728.794,215.205,727,213,727z M215,742c0,0.55-0.45,1-1,1h-12c-0.55,0-1-0.45-1-1v-12c0-0.55,0.45-1,1-1h12c0.55,0,1,0.45,1,1
-		V742z M198,740c-2.205,0-4-1.794-4-4v-10c0-2.206,1.795-4,4-4h10c2.205,0,4,1.794,4,4h-2v-1c0-0.55-0.45-1-1-1h-12
-		c-0.55,0-1,0.45-1,1v12c0,0.55,0.45,1,1,1h1V740z"/>
-</g>
-<g id="unchecked">
-	<path fill="#FFFFFF" d="M161,727h-10c-2.205,0-4,1.794-4,4v10c0,2.206,1.795,4,4,4h10c2.205,0,4-1.794,4-4v-10
-		C165,728.794,163.205,727,161,727z M163,742c0,0.55-0.45,1-1,1h-12c-0.55,0-1-0.45-1-1v-12c0-0.55,0.45-1,1-1h12c0.55,0,1,0.45,1,1
-		V742z"/>
-</g>
-<g id="check">
-	<path fill="#FFFFFF" d="M115,739.307V742c0,0.55-0.45,1-1,1h-12c-0.55,0-1-0.45-1-1v-12c0-0.55,0.45-1,1-1h10.65l1.737-1.737
-		C113.955,727.101,113.49,727,113,727h-10c-2.205,0-4,1.794-4,4v10c0,2.206,1.795,4,4,4h10c2.205,0,4-1.794,4-4v-3.693L115,739.307z
-		"/>
-	<path fill="#FFFFFF" d="M120.92,729.454c0.199,0.196,0.2,0.52,0.002,0.718l-11.004,11.003c-0.197,0.198-0.521,0.198-0.719,0
-		l-5.896-5.896c-0.197-0.197-0.197-0.521,0-0.721l2.334-2.333c0.197-0.197,0.521-0.197,0.719,0l2.845,2.844
-		c0.196,0.196,0.521,0.196,0.72,0l7.93-7.93c0.198-0.197,0.522-0.198,0.722-0.002L120.92,729.454z"/>
-</g>
-<g id="new_x5F_window">
-	<path fill="#FFFFFF" d="M66,740.736V742c0,0.55-0.45,1-1,1H53c-0.55,0-1-0.45-1-1v-12c0-0.55,0.45-1,1-1h3.093
-		c1.007-0.834,2.146-1.493,3.356-2H54c-2.205,0-4,1.794-4,4v10c0,2.206,1.795,4,4,4h10c2.205,0,4-1.794,4-4v-1.766L66,740.736z"/>
-	<path fill="#FFFFFF" d="M75.277,730.697l-9.867-7.384c-0.221-0.165-0.4-0.075-0.4,0.199l0.004,3.72c0,0.021-0.01,0.043-0.013,0.064
-		v0.437c-2.129,0.169-10.839,1.399-10.969,10.327c1.819-4.329,8.121-4.262,10.969-4.238v0.403c0.006,0.031,0.02,0.062,0.02,0.097
-		l0.005,4.178c0,0.275,0.181,0.365,0.4,0.199l9.853-7.402C75.498,731.132,75.497,730.862,75.277,730.697z"/>
-</g>
-<g id="edit">
-	<path fill="#FFFFFF" d="M18,737.656V742c0,0.55-0.45,1-1,1H5c-0.55,0-1-0.45-1-1v-12c0-0.55,0.45-1,1-1h10.344l1.81-1.811
-		C16.785,727.078,16.404,727,16,727H6c-2.205,0-4,1.794-4,4v10c0,2.206,1.795,4,4,4h10c2.205,0,4-1.794,4-4v-5.343L18,737.656z"/>
-	<path fill="#FFFFFF" d="M25.717,726.451l-2.168-2.169c-0.199-0.198-0.524-0.198-0.725,0l-1.445,1.445l2.893,2.894l1.445-1.445
-		C25.916,726.976,25.916,726.65,25.717,726.451z"/>
-	<path fill="#FFFFFF" d="M13.333,739.459l-2.792-2.833l-1.632,4.172c-0.102,0.263,0.029,0.395,0.294,0.293L13.333,739.459z"/>
-	
-		<rect x="15.362" y="726.158" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -488.3049 1262.9231)" fill="#FFFFFF" width="4.091" height="12.869"/>
-</g>
-<g id="folder_x5F_new">
-	<path fill="#FFFFFF" d="M461.8,676h-1.86l1.206-1.097c0.078-0.079,0.078-0.153,0-0.231l-0.848-0.82
-		c-0.079-0.078-0.106-0.064-0.188,0.015l-1.11,1.225v-1.872c0-0.109-0.29-0.219-0.4-0.219h-1.2c-0.11,0-0.399,0.108-0.399,0.219
-		v1.865l-1.107-1.206c-0.078-0.079-0.158-0.079-0.236,0l-0.821,0.847c-0.08,0.078-0.067,0.1,0.013,0.179l1.219,1.098h-1.867
-		c-0.109,0-0.199,0.309-0.199,0.419v1.199c0,0.109,0.09,0.382,0.199,0.382h1.872l-1.213,1.121c-0.078,0.078-0.078,0.162,0,0.242
-		l0.848,0.822c0.079,0.078,0.109,0.067,0.188-0.011l1.105-1.218v1.86c0,0.109,0.289,0.182,0.399,0.182h1.199
-		c0.11,0,0.399-0.071,0.399-0.182v-1.865l1.109,1.209c0.08,0.079,0.158,0.079,0.237,0l0.821-0.848
-		c0.077-0.077,0.065-0.116-0.013-0.195L459.935,678h1.865c0.109,0,0.2-0.271,0.2-0.382v-1.199C462,676.309,461.909,676,461.8,676z
-		 M450,680h-15v-2c0-0.55,0.449-1,1-1h1.334l0.35-1.052c0.173-0.521,0.766-0.948,1.316-0.948h5c0.55,0,1.143,0.427,1.315,0.948
-		l0.351,1.052H450h1h1c0,1.094,0.299,2.116,0.812,3h-1.255H450z M458,683v1v2v10c0,0.55-0.45,1-1,1h-22c-0.551,0-1-0.45-1-1v-14
-		c0-0.55,0.449-1,1-1h16h1.081h1.458C454.64,682.225,456.229,683,458,683z"/>
-</g>
-<g id="folder_x5F_flag">
-	<path fill="#FFFFFF" d="M412.501,672H410h-1h-0.501H408h-0.499h-0.002H407v0.499V673v7.501c0,0.274,0.225,0.499,0.499,0.499h0.002
-		c0.273,0,0.499-0.225,0.499-0.499V678l1-0.396V677.6l3.537-1.414c0.255-0.103,0.463-0.409,0.463-0.685v-3.002
-		C413,672.225,412.775,672,412.501,672z M402,680h-15v-2c0-0.55,0.45-1,1-1h1.334l0.35-1.052C389.857,675.427,390.45,675,391,675h5
-		c0.55,0,1.143,0.427,1.315,0.948l0.351,1.052H402h1h2v3h-1.443H402z M409.949,681H410v3v2v10c0,0.55-0.45,1-1,1h-22
-		c-0.55,0-1-0.45-1-1v-14c0-0.55,0.45-1,1-1h16h1.082h0.969c0.23,1.14,1.242,2,2.45,2C408.708,683,409.718,682.14,409.949,681z"/>
-</g>
-<g id="folder_x5F_lock">
-	<path fill="#FFFFFF" d="M365.809,675H365v-2.551c0-0.744-0.715-1.449-1.453-1.449h-3.132c-0.739,0-1.415,0.705-1.415,1.449V675
-		h-0.828c-0.088,0-0.172,0.104-0.172,0.182v5.661c0,0.078,0.084,0.157,0.172,0.157h7.637c0.088,0,0.191-0.079,0.191-0.157v-5.661
-		C366,675.104,365.896,675,365.809,675z M360,672.449c0-0.338,0.096-0.449,0.428-0.449h3.106c0.33,0,0.466,0.111,0.466,0.449V675h-4
-		V672.449z M354,680h-15v-2c0-0.55,0.45-1,1-1h1.334l0.35-1.052C341.857,675.427,342.45,675,343,675h5
-		c0.55,0,1.143,0.427,1.315,0.948l0.351,1.052H354h1h1v3h-0.443H354z M362,683v1v2v10c0,0.55-0.45,1-1,1h-22c-0.55,0-1-0.45-1-1v-14
-		c0-0.55,0.45-1,1-1h16h1.016c0.083,1.115,1.014,2,2.156,2H362z"/>
-</g>
-<g id="folder_x5F_minus">
-	<path fill="#FFFFFF" d="M307.557,680H291v-2c0-0.55,0.45-1,1-1h1.334l0.35-1.052C293.857,675.427,294.45,675,295,675h5
-		c0.55,0,1.143,0.427,1.315,0.948l0.351,1.052H307C307,678.128,307.198,679.131,307.557,680z M308.082,681H291c-0.55,0-1,0.45-1,1
-		v14c0,0.55,0.45,1,1,1h22c0.55,0,1-0.45,1-1v-12C311.506,684,309.321,682.948,308.082,681z"/>
-	<path fill="#FFFFFF" d="M314,672c-2.762,0-5,1.711-5,5s2.238,5,5,5s5-2.04,5-4.802C319,674.436,316.762,672,314,672z M317,677.5
-		c0,0.275-0.226,0.5-0.5,0.5h-5c-0.275,0-0.5-0.225-0.5-0.5v-1c0-0.275,0.225-0.5,0.5-0.5h5c0.274,0,0.5,0.225,0.5,0.5V677.5z"/>
-</g>
-<g id="folder_x5F_plus">
-	<path fill="#FFFFFF" d="M259.557,680H243v-2c0-0.55,0.45-1,1-1h1.334l0.35-1.052C245.857,675.427,246.45,675,247,675h5
-		c0.55,0,1.143,0.427,1.315,0.948l0.351,1.052H259C259,678.128,259.198,679.131,259.557,680z M260.082,681H243c-0.55,0-1,0.45-1,1
-		v14c0,0.55,0.45,1,1,1h22c0.55,0,1-0.45,1-1v-12C263.506,684,261.321,682.948,260.082,681z"/>
-	<path fill="#FFFFFF" d="M266,672c-2.762,0-5,2.016-5,5c0,3.206,2.238,5,5,5s5-2.238,5-5S268.762,672,266,672z M269,677.5
-		c0,0.275-0.226,0.5-0.5,0.5H267v1.5c0,0.275-0.226,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5V678h-1.5c-0.275,0-0.5-0.225-0.5-0.5
-		v-1c0-0.275,0.225-0.5,0.5-0.5h1.5v-1.5c0-0.275,0.225-0.5,0.5-0.5h1c0.274,0,0.5,0.225,0.5,0.5v1.5h1.5c0.274,0,0.5,0.225,0.5,0.5
-		V677.5z"/>
-</g>
-<g id="folder_x5F_open">
-	<path fill="#FFFFFF" d="M198.516,681.688c-0.25,0.562-4.516,11.22-4.516,11.22V678c0-0.55,0.45-1,1-1h1.334l0.35-1.052
-		C196.857,675.427,197.45,675,198,675h5c0.55,0,1.143,0.427,1.315,0.948l0.351,1.052H214c0.55,0,1,0.45,1,1v3h-15.5
-		C199.225,681,198.766,681.125,198.516,681.688z M223,682h-22c-0.55,0-1.167,0.418-1.371,0.929l-5.258,13.144
-		C194.167,696.582,194.45,697,195,697h22c0.55,0,1.167-0.418,1.371-0.929l5.258-13.144C223.833,682.418,223.55,682,223,682z"/>
-</g>
-<g id="database_x5F_ban">
-	<path fill="#FFFFFF" d="M167.047,670c-2.73,0-4.953,2.223-4.953,4.953s2.223,4.953,4.953,4.953s4.953-2.223,4.953-4.953
-		S169.778,670,167.047,670z M167.047,671.238c0.729,0,1.408,0.215,1.98,0.579l-5.116,5.116c-0.364-0.573-0.579-1.253-0.579-1.98
-		C163.332,672.904,164.998,671.238,167.047,671.238z M167.047,678.668c-0.729,0-1.406-0.214-1.98-0.577l5.118-5.119
-		c0.363,0.575,0.577,1.253,0.577,1.981C170.762,677.002,169.096,678.668,167.047,678.668z M160.882,691.666
-		c0.069,0.109,0.118,0.22,0.118,0.334v3c0,1.104-3.357,2-7.5,2c-4.144,0-7.5-0.896-7.5-2v-3c0-0.114,0.049-0.225,0.118-0.334
-		c2.054,1.252,6.314,1.334,7.382,1.334C154.567,693,158.828,692.918,160.882,691.666z M153.5,688c-1.066,0-5.328-0.082-7.382-1.334
-		c-0.069,0.109-0.118,0.22-0.118,0.334v3c0,1.104,3.356,2,7.5,2c4.143,0,7.5-0.896,7.5-2v-3c0-0.114-0.049-0.225-0.118-0.334
-		C158.828,687.918,154.566,688,153.5,688z M153.5,683c-1.066,0-5.328-0.082-7.382-1.334c-0.069,0.109-0.118,0.22-0.118,0.334v3
-		c0,1.104,3.356,2,7.5,2c4.143,0,7.5-0.896,7.5-2v-3c0-0.114-0.049-0.225-0.118-0.334C158.828,682.918,154.566,683,153.5,683z
-		 M161,677v3c0,1.104-3.357,2-7.5,2c-4.144,0-7.5-0.896-7.5-2v-3c0-1.104,3.356-2,7.5-2C157.643,675,161,675.896,161,677z
-		 M156.729,676.5c0-0.356-1.444-0.646-3.229-0.646s-3.229,0.289-3.229,0.646s1.445,0.646,3.229,0.646S156.729,676.856,156.729,676.5
-		z"/>
-</g>
-<g id="database_x5F_minus">
-	<path fill="#FFFFFF" d="M112.882,691.666c0.069,0.109,0.118,0.22,0.118,0.334v3c0,1.104-3.357,2-7.5,2c-4.144,0-7.5-0.896-7.5-2v-3
-		c0-0.114,0.049-0.225,0.118-0.334c2.054,1.252,6.314,1.334,7.382,1.334C106.567,693,110.828,692.918,112.882,691.666z M105.5,688
-		c-1.066,0-5.328-0.082-7.382-1.334C98.049,686.775,98,686.886,98,687v3c0,1.104,3.356,2,7.5,2c4.143,0,7.5-0.896,7.5-2v-3
-		c0-0.114-0.049-0.225-0.118-0.334C110.828,687.918,106.566,688,105.5,688z M105.5,683c-1.066,0-5.328-0.082-7.382-1.334
-		C98.049,681.775,98,681.886,98,682v3c0,1.104,3.356,2,7.5,2c4.143,0,7.5-0.896,7.5-2v-3c0-0.114-0.049-0.225-0.118-0.334
-		C110.828,682.918,106.566,683,105.5,683z M113,677v3c0,1.104-3.357,2-7.5,2c-4.144,0-7.5-0.896-7.5-2v-3c0-1.104,3.356-2,7.5-2
-		C109.643,675,113,675.896,113,677z M108.729,676.5c0-0.356-1.444-0.646-3.229-0.646s-3.229,0.289-3.229,0.646
-		s1.445,0.646,3.229,0.646S108.729,676.856,108.729,676.5z M120,670c-2.762,0-5,1.711-5,5s2.238,5,5,5s5-2.04,5-4.802
-		C125,672.436,122.762,670,120,670z M123,675.5c0,0.275-0.226,0.5-0.5,0.5h-5c-0.275,0-0.5-0.225-0.5-0.5v-1
-		c0-0.275,0.225-0.5,0.5-0.5h5c0.274,0,0.5,0.225,0.5,0.5V675.5z"/>
-</g>
-<g id="database_x5F_plus">
-	<path fill="#FFFFFF" d="M64.882,691.666C64.951,691.775,65,691.886,65,692v3c0,1.104-3.357,2-7.5,2c-4.144,0-7.5-0.896-7.5-2v-3
-		c0-0.114,0.049-0.225,0.118-0.334C52.172,692.918,56.434,693,57.5,693C58.566,693,62.828,692.918,64.882,691.666z M57.5,688
-		c-1.066,0-5.328-0.082-7.382-1.334C50.049,686.775,50,686.886,50,687v3c0,1.104,3.356,2,7.5,2c4.143,0,7.5-0.896,7.5-2v-3
-		c0-0.114-0.049-0.225-0.118-0.334C62.828,687.918,58.566,688,57.5,688z M57.5,683c-1.066,0-5.328-0.082-7.382-1.334
-		C50.049,681.775,50,681.886,50,682v3c0,1.104,3.356,2,7.5,2c4.143,0,7.5-0.896,7.5-2v-3c0-0.114-0.049-0.225-0.118-0.334
-		C62.828,682.918,58.566,683,57.5,683z M65,677v3c0,1.104-3.357,2-7.5,2c-4.144,0-7.5-0.896-7.5-2v-3c0-1.104,3.356-2,7.5-2
-		C61.643,675,65,675.896,65,677z M60.729,676.5c0-0.356-1.444-0.646-3.229-0.646s-3.229,0.289-3.229,0.646s1.445,0.646,3.229,0.646
-		S60.729,676.856,60.729,676.5z M72,670c-2.762,0-5,2.016-5,5c0,3.206,2.238,5,5,5s5-2.238,5-5S74.762,670,72,670z M75,675.5
-		c0,0.275-0.226,0.5-0.5,0.5H73v1.5c0,0.275-0.226,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5V676h-1.5c-0.275,0-0.5-0.225-0.5-0.5
-		v-1c0-0.275,0.225-0.5,0.5-0.5H71v-1.5c0-0.275,0.225-0.5,0.5-0.5h1c0.274,0,0.5,0.225,0.5,0.5v1.5h1.5c0.274,0,0.5,0.225,0.5,0.5
-		V675.5z"/>
-</g>
-<g id="database_x5F_lock">
-	<path fill="#FFFFFF" d="M27.809,673H27v-2.551c0-0.744-0.715-1.449-1.453-1.449h-3.132c-0.739,0-1.415,0.705-1.415,1.449V673
-		h-0.828c-0.088,0-0.172,0.104-0.172,0.182v5.661c0,0.078,0.084,0.157,0.172,0.157h7.637c0.088,0,0.191-0.079,0.191-0.157v-5.661
-		C28,673.104,27.896,673,27.809,673z M22,670.449c0-0.338,0.096-0.449,0.428-0.449h3.106c0.33,0,0.466,0.111,0.466,0.449V673h-4
-		V670.449z M16.882,691.666C16.951,691.775,17,691.886,17,692v3c0,1.104-3.357,2-7.5,2c-4.144,0-7.5-0.896-7.5-2v-3
-		c0-0.114,0.049-0.225,0.118-0.334C4.172,692.918,8.434,693,9.5,693C10.566,693,14.828,692.918,16.882,691.666z M9.5,688
-		c-1.066,0-5.328-0.082-7.382-1.334C2.049,686.775,2,686.886,2,687v3c0,1.104,3.356,2,7.5,2c4.143,0,7.5-0.896,7.5-2v-3
-		c0-0.114-0.049-0.225-0.118-0.334C14.828,687.918,10.566,688,9.5,688z M9.5,683c-1.066,0-5.328-0.082-7.382-1.334
-		C2.049,681.775,2,681.886,2,682v3c0,1.104,3.356,2,7.5,2c4.143,0,7.5-0.896,7.5-2v-3c0-0.114-0.049-0.225-0.118-0.334
-		C14.828,682.918,10.566,683,9.5,683z M17,677v3c0,1.104-3.357,2-7.5,2c-4.144,0-7.5-0.896-7.5-2v-3c0-1.104,3.356-2,7.5-2
-		C13.643,675,17,675.896,17,677z M12.729,676.5c0-0.356-1.444-0.646-3.229-0.646s-3.229,0.289-3.229,0.646s1.445,0.646,3.229,0.646
-		S12.729,676.856,12.729,676.5z"/>
-</g>
-<g id="adjust_x5F_alt">
-	<path fill="#FFFFFF" d="M449,634h-1v-9h-3v9h-1c-0.551,0-1,0.45-1,1v3c0,0.55,0.449,1,1,1h1h3h1c0.55,0,1-0.45,1-1v-3
-		C450,634.45,449.55,634,449,634z M449,637h-5v-0.5h5V637z"/>
-	<path fill="#FFFFFF" d="M457,629h-1v-4h-3v4h-1c-0.551,0-1,0.45-1,1v3c0,0.55,0.449,1,1,1h1h3h1c0.55,0,1-0.45,1-1v-3
-		C458,629.45,457.55,629,457,629z M457,632h-5v-0.5h5V632z"/>
-	<rect x="445" y="640" fill="#FFFFFF" width="3" height="9"/>
-	<path fill="#FFFFFF" d="M441,639h-1v-14h-3v14h-1c-0.551,0-1,0.45-1,1v3c0,0.55,0.449,1,1,1h1h3h1c0.55,0,1-0.45,1-1v-3
-		C442,639.45,441.55,639,441,639z M441,642h-5v-0.5h5V642z"/>
-	<rect x="453" y="635" fill="#FFFFFF" width="3" height="14"/>
-	<rect x="437" y="645" fill="#FFFFFF" width="3" height="4"/>
-</g>
-<g id="picture_1_">
-	<path fill="#FFFFFF" d="M409.125,627h-22.25c-0.483,0-0.875,0.392-0.875,0.875v18.25c0,0.483,0.392,0.875,0.875,0.875h22.25
-		c0.482,0,0.875-0.392,0.875-0.875v-18.25C410,627.392,409.608,627,409.125,627z M408,638.578L404.474,635c0,0-0.974-1-1.941-1
-		c-0.969,0-1.91,1-1.91,1s-2.638,3.011-3.631,4.004c1.604,0.685,4.029,4.635,2.176,3.456c-1.854-1.179-5.104-2.459-5.104-2.459
-		L388,644v-15h20V638.578z M389.813,633c0-1.205,0.979-2.188,2.188-2.188s2.187,0.981,2.187,2.188s-0.979,2.188-2.187,2.188
-		S389.813,634.205,389.813,633z"/>
-</g>
-<g id="cogwheels_1_">
-	<g id="cogwheel_2_">
-		<path fill="#FFFFFF" d="M356.811,638.599c0.065-0.505,0.11-1.016,0.11-1.539c0-0.522-0.045-1.033-0.11-1.538l-3.157-0.79
-			c-0.204-0.769-0.507-1.494-0.896-2.167l1.673-2.787c-0.63-0.817-1.361-1.549-2.179-2.18l-2.787,1.674
-			c-0.673-0.39-1.399-0.69-2.167-0.896l-0.79-3.157c-0.505-0.064-1.016-0.109-1.539-0.109s-1.034,0.045-1.539,0.109l-0.79,3.157
-			c-0.767,0.205-1.493,0.507-2.165,0.896l-2.788-1.675c-0.816,0.63-1.549,1.361-2.179,2.18l1.673,2.786
-			c-0.39,0.674-0.69,1.399-0.896,2.169l-3.157,0.79c-0.065,0.505-0.11,1.016-0.11,1.538c0,0.523,0.045,1.034,0.11,1.539l3.157,0.79
-			c0.205,0.769,0.507,1.495,0.896,2.167l-1.674,2.787c0.63,0.817,1.361,1.549,2.179,2.179l2.787-1.673
-			c0.673,0.39,1.399,0.69,2.167,0.896l0.79,3.157c0.505,0.064,1.016,0.109,1.539,0.109s1.034-0.045,1.539-0.109l0.79-3.157
-			c0.769-0.206,1.495-0.507,2.168-0.896l2.788,1.673c0.815-0.63,1.548-1.36,2.178-2.179l-1.674-2.787
-			c0.389-0.673,0.689-1.397,0.896-2.166L356.811,638.599z M344.969,641.24c-2.309,0-4.181-1.872-4.181-4.182
-			c0-2.309,1.872-4.181,4.181-4.181s4.181,1.872,4.181,4.181C349.15,639.368,347.277,641.24,344.969,641.24z"/>
-	</g>
-	<path fill="#FFFFFF" d="M361,651.732c-0.25,0-0.496-0.021-0.738-0.054l-0.379-1.515l-0.056-0.016
-		c-0.326-0.094-0.642-0.225-0.936-0.388l-0.051-0.027l-1.337,0.803c-0.421-0.331-0.756-0.671-1.046-1.047l0.802-1.337l-0.028-0.052
-		c-0.165-0.297-0.295-0.61-0.385-0.934l-0.016-0.056l-1.517-0.38c-0.034-0.277-0.053-0.507-0.053-0.739
-		c0-0.25,0.021-0.496,0.053-0.738l1.517-0.379l0.016-0.057c0.09-0.32,0.22-0.636,0.386-0.935l0.028-0.051l-0.803-1.338
-		c0.328-0.417,0.667-0.752,1.047-1.045l1.337,0.802l0.051-0.028c0.297-0.165,0.611-0.295,0.935-0.385l0.056-0.016l0.379-1.517
-		c0.278-0.034,0.507-0.053,0.738-0.053c0.252,0,0.496,0.021,0.739,0.053l0.38,1.517l0.056,0.016c0.322,0.09,0.637,0.22,0.934,0.385
-		l0.052,0.028l1.336-0.802c0.421,0.331,0.757,0.669,1.048,1.045l-0.804,1.338l0.028,0.051c0.163,0.294,0.294,0.608,0.387,0.935
-		l0.017,0.057l1.515,0.379c0.034,0.278,0.053,0.507,0.053,0.738c0,0.252-0.021,0.498-0.053,0.739l-1.515,0.38l-0.017,0.056
-		c-0.094,0.326-0.224,0.641-0.387,0.934l-0.027,0.052l0.803,1.336c-0.331,0.421-0.669,0.757-1.045,1.048l-1.337-0.804l-0.052,0.027
-		c-0.293,0.163-0.606,0.294-0.936,0.389l-0.056,0.016l-0.38,1.515C361.461,651.714,361.233,651.732,361,651.732z M361,643.848
-		c-1.185,0-2.146,0.963-2.146,2.146c0,1.185,0.963,2.147,2.146,2.147c1.185,0,2.147-0.964,2.147-2.147S362.185,643.848,361,643.848z
-		"/>
-</g>
-<g id="cogwheel">
-	<path fill="#FFFFFF" d="M313.794,638.491c0.064-0.505,0.109-1.017,0.109-1.539c0-0.523-0.045-1.034-0.109-1.539l-3.157-0.79
-		c-0.205-0.768-0.507-1.494-0.896-2.167l1.673-2.787c-0.63-0.817-1.361-1.549-2.18-2.179l-2.786,1.673
-		c-0.674-0.389-1.399-0.69-2.167-0.896l-0.79-3.156c-0.506-0.065-1.017-0.11-1.539-0.11c-0.523,0-1.034,0.045-1.539,0.11
-		l-0.79,3.156c-0.768,0.205-1.493,0.508-2.165,0.896l-2.788-1.674c-0.817,0.63-1.549,1.36-2.179,2.179l1.673,2.787
-		c-0.391,0.673-0.691,1.398-0.896,2.168l-3.157,0.79c-0.064,0.505-0.109,1.016-0.109,1.539c0,0.522,0.045,1.034,0.109,1.539
-		l3.157,0.79c0.205,0.768,0.507,1.495,0.896,2.167l-1.674,2.787c0.63,0.816,1.36,1.549,2.179,2.179l2.787-1.673
-		c0.673,0.389,1.398,0.689,2.167,0.896l0.79,3.157c0.505,0.065,1.016,0.11,1.539,0.11c0.522,0,1.033-0.045,1.539-0.11l0.789-3.157
-		c0.77-0.206,1.495-0.507,2.169-0.896l2.787,1.673c0.816-0.63,1.549-1.361,2.179-2.179l-1.674-2.787
-		c0.389-0.673,0.689-1.398,0.896-2.166L313.794,638.491z M301.952,641.133c-2.31,0-4.182-1.872-4.182-4.181
-		c0-2.31,1.872-4.182,4.182-4.182c2.309,0,4.181,1.872,4.181,4.182C306.133,639.261,304.261,641.133,301.952,641.133z"/>
-</g>
-<g id="inbox_x5F_out">
-	<path fill="#FFFFFF" d="M265.98,638c-0.002,0,0-0.151-0.014-0.193l-3.723-11.371c-0.089-0.27-0.388-0.436-0.665-0.436h-2.833
-		l2.254,3h-1l3.095,9H259l-2,5h-6l-2-5h-4.096l3.096-9h-1l2.219-3h-2.798c-0.278,0-0.577,0.221-0.665,0.49l-3.723,11.315
-		c-0.015,0.042-0.013,0.193-0.015,0.193H242v8.5v1.5v0.5c0,0.275,0.225,0.5,0.5,0.5h23c0.274,0,0.5-0.225,0.5-0.5V648v-1.5v-7.594
-		V638H265.98z M258.849,629H256v6.736c0,0.274-0.226,0.264-0.5,0.264h-3c-0.275,0-0.5,0.012-0.5-0.264V629h-2.827
-		c-0.148,0-0.195-0.082-0.104-0.199l4.793-5.637c0.052-0.066,0.119-0.073,0.187-0.073c0.053,0,0.104,0.038,0.144,0.091l4.765,5.623
-		C259.045,628.923,258.997,629,258.849,629z"/>
-</g>
-<g id="inbox_x5F_in">
-	<path fill="#FFFFFF" d="M217.967,637.807l-3.723-11.371c-0.089-0.27-0.388-0.436-0.665-0.436H209v3h3.062l3.032,9H211l-2,5h-6l-2-5
-		h-4.096l3.032-9H203v-3h-4.579c-0.278,0-0.577,0.221-0.665,0.49l-3.723,11.315C194.02,637.849,194,648.5,194,648.5
-		c0,0.275,0.225,0.5,0.5,0.5h23c0.274,0,0.5-0.225,0.5-0.5C218,648.5,217.979,637.843,217.967,637.807z"/>
-	<path fill="#FFFFFF" d="M210.849,630H208v-6.5c0-0.275-0.226-0.5-0.5-0.5h-3c-0.275,0-0.5,0.225-0.5,0.5v6.5h-2.827
-		c-0.148,0-0.195,0.2-0.104,0.317l4.793,5.695c0.052,0.065,0.119,0.104,0.187,0.104c0.053,0,0.104-0.023,0.144-0.076l4.765-5.734
-		C211.045,630.188,210.997,630,210.849,630z"/>
-</g>
-<g id="inbox_x5F_lock">
-	<path fill="#FFFFFF" d="M172,625.182v5.661c0,0.078-0.104,0.157-0.191,0.157h-7.637c-0.088,0-0.172-0.079-0.172-0.157v-5.661
-		c0-0.078,0.084-0.182,0.172-0.182H165v-2.551c0-0.744,0.676-1.449,1.415-1.449h3.132c0.738,0,1.453,0.705,1.453,1.449V625h0.809
-		C171.896,625,172,625.104,172,625.182z M166,625h4v-2.551c0-0.338-0.135-0.449-0.466-0.449h-3.106
-		c-0.332,0-0.428,0.111-0.428,0.449V625z M169.967,637.807L168.721,634h-2.973l1.347,4H163l-2,5h-6l-2-5h-4.096l3.032-9H161v-3
-		h-10.579c-0.278,0-0.577,0.221-0.665,0.49l-3.723,11.315C146.02,637.849,146,648.5,146,648.5c0,0.275,0.225,0.5,0.5,0.5h23
-		c0.274,0,0.5-0.225,0.5-0.5C170,648.5,169.98,637.849,169.967,637.807z"/>
-</g>
-<g id="inbox_x5F_minus">
-	<path fill="#FFFFFF" d="M121.967,637.807L120.721,634h-2.973l1.347,4H115l-2,5h-6l-2-5h-4.096l3.032-9H113v-3h-10.579
-		c-0.278,0-0.577,0.221-0.665,0.49l-3.723,11.315C98.02,637.849,98,648.5,98,648.5c0,0.275,0.225,0.5,0.5,0.5h23
-		c0.274,0,0.5-0.225,0.5-0.5C122,648.5,121.98,637.849,121.967,637.807z M120,622c-2.762,0-5,1.711-5,5s2.238,5,5,5s5-2.04,5-4.802
-		C125,624.436,122.762,622,120,622z M123,627.5c0,0.275-0.226,0.5-0.5,0.5h-5c-0.275,0-0.5-0.225-0.5-0.5v-1
-		c0-0.275,0.225-0.5,0.5-0.5h5c0.274,0,0.5,0.225,0.5,0.5V627.5z"/>
-</g>
-<g id="inbox_x5F_plus">
-	<path fill="#FFFFFF" d="M74,648.5c0,0.275-0.226,0.5-0.5,0.5h-23c-0.275,0-0.5-0.225-0.5-0.5c0,0,0.02-10.651,0.033-10.693
-		l3.723-11.315c0.088-0.271,0.387-0.49,0.665-0.49H65v3h-9.062l-3.032,9H57l2,5h6l2-5h4.095l-1.347-4h2.973l1.246,3.807
-		C73.98,637.849,74,648.5,74,648.5z M72,622c-2.762,0-5,2.016-5,5c0,3.206,2.238,5,5,5s5-2.238,5-5S74.762,622,72,622z M75,627.5
-		c0,0.275-0.226,0.5-0.5,0.5H73v1.5c0,0.275-0.226,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5V628h-1.5c-0.275,0-0.5-0.225-0.5-0.5
-		v-1c0-0.275,0.225-0.5,0.5-0.5H71v-1.5c0-0.275,0.225-0.5,0.5-0.5h1c0.274,0,0.5,0.225,0.5,0.5v1.5h1.5c0.274,0,0.5,0.225,0.5,0.5
-		V627.5z"/>
-</g>
-<g id="inbox">
-	<path fill="#FFFFFF" d="M25.967,637.807l-3.723-11.371c-0.089-0.27-0.388-0.436-0.665-0.436H6.421c-0.278,0-0.577,0.221-0.665,0.49
-		l-3.723,11.315C2.02,637.849,2,648.5,2,648.5c0,0.275,0.225,0.5,0.5,0.5h23c0.274,0,0.5-0.225,0.5-0.5
-		C26,648.5,25.98,637.849,25.967,637.807z M7.938,629h12.125l3.032,9H19l-2,5h-6l-2-5H4.905L7.938,629z"/>
-</g>
-<g id="message_x5F_new">
-	<path fill="#FFFFFF" d="M461.8,582h-1.86l1.206-1.097c0.078-0.079,0.078-0.153,0-0.231l-0.848-0.82
-		c-0.079-0.078-0.106-0.064-0.188,0.015l-1.11,1.225v-1.872c0-0.109-0.29-0.219-0.4-0.219h-1.2c-0.11,0-0.399,0.108-0.399,0.219
-		v1.865l-1.107-1.206c-0.078-0.079-0.158-0.079-0.236,0l-0.821,0.847c-0.08,0.078-0.067,0.1,0.013,0.179l1.219,1.098h-1.867
-		c-0.109,0-0.199,0.309-0.199,0.419v1.199c0,0.109,0.09,0.382,0.199,0.382h1.872l-1.213,1.121c-0.078,0.078-0.078,0.162,0,0.242
-		l0.848,0.822c0.079,0.078,0.109,0.067,0.188-0.011l1.105-1.218v1.86c0,0.109,0.289,0.182,0.399,0.182h1.199
-		c0.11,0,0.399-0.071,0.399-0.182v-1.865l1.109,1.209c0.08,0.079,0.158,0.079,0.237,0l0.821-0.848
-		c0.078-0.077,0.065-0.116-0.013-0.195L459.935,584h1.865c0.109,0,0.2-0.271,0.2-0.382v-1.199C462,582.309,461.909,582,461.8,582z
-		 M440,593l-6,6v-12L440,593z M446,597l-12-12h18.35c0.465,1.307,1.367,2.404,2.533,3.117L446,597z M456.26,588.74
-		c0.551,0.168,1.135,0.26,1.74,0.26v10l-6-6L456.26,588.74z M451,594l7,7h-24l7-7l5,5L451,594z"/>
-</g>
-<g id="message_x5F_lock">
-	<path fill="#FFFFFF" d="M414,581.182v5.661c0,0.078-0.104,0.157-0.191,0.157h-7.637c-0.088,0-0.172-0.079-0.172-0.157v-5.661
-		c0-0.078,0.084-0.182,0.172-0.182H407v-2.551c0-0.744,0.676-1.449,1.415-1.449h3.132c0.738,0,1.453,0.705,1.453,1.449V581h0.809
-		C413.896,581,414,581.104,414,581.182z M408,581h4v-2.551c0-0.338-0.136-0.449-0.466-0.449h-3.106
-		c-0.332,0-0.428,0.111-0.428,0.449V581z M386,587v12l6-6L386,587z M406.016,588.984c-1.123-0.081-2.016-1.006-2.016-2.143V585h-18
-		l12,12L406.016,588.984z M398,599l-5-5l-7,7h24l-7-7L398,599z M408,589l-4,4l6,6v-10H408z"/>
-</g>
-<g id="message_x5F_flag">
-	<polygon fill="#FFFFFF" points="350.029,599 345.029,594 338.029,601 362.029,601 355.029,594 	"/>
-	<path fill="#FFFFFF" d="M350.029,597l-12-12H357v1.501c0,0.954,0.544,1.774,1.332,2.196L350.029,597z M360.072,588.928L356,593l6,6
-		v-12l-0.072,0.072C361.712,587.99,360.99,588.711,360.072,588.928z M365,578.499v3.002c0,0.274-0.208,0.582-0.463,0.685L360,584
-		v2.501c0,0.274-0.226,0.499-0.499,0.499h-0.002c-0.274,0-0.499-0.225-0.499-0.499V578h5.501C364.775,578,365,578.225,365,578.499z"
-		/>
-	<polygon fill="#FFFFFF" points="338,587 338,599 344,593 	"/>
-</g>
-<g id="message_x5F_ban">
-	<path fill="#FFFFFF" d="M302,597l-12-12h17.239c0.437,1.77,1.447,3.105,2.813,3.946L302,597z M290,587v12l6-6L290,587z M308,593
-		l6,6v-9c-0.912,0-1.782-0.145-2.582-0.418L308,593z M302,599l-5-5l-7,7h24l-7-7L302,599z M319,583.019
-		c0,2.731-2.223,4.953-4.953,4.953s-4.953-2.222-4.953-4.953c0-2.729,2.223-4.952,4.953-4.952
-		C316.778,578.065,319,580.288,319,583.019z M310.332,583.019c0,0.729,0.215,1.407,0.579,1.981l5.116-5.117
-		c-0.572-0.364-1.253-0.579-1.98-0.579C311.998,579.304,310.332,580.97,310.332,583.019z M317.762,583.019
-		c0-0.729-0.214-1.405-0.577-1.98l-5.118,5.119c0.574,0.362,1.252,0.577,1.98,0.577
-		C316.096,586.733,317.762,585.067,317.762,583.019z"/>
-</g>
-<g id="message_x5F_minus">
-	<polygon fill="#FFFFFF" points="242,587 242,599 248,593 	"/>
-	<path fill="#FFFFFF" d="M262.054,588.946c-1.366-0.841-2.378-2.178-2.812-3.946H242l12,12L262.054,588.946z"/>
-	<polygon fill="#FFFFFF" points="254,599 249,594 242,601 266,601 259,594 	"/>
-	<path fill="#FFFFFF" d="M260,593l6,6v-9c-0.912,0-1.782-0.145-2.582-0.418L260,593z"/>
-	<path fill="#FFFFFF" d="M266,578c-2.762,0-5,1.711-5,5s2.238,5,5,5s5-2.04,5-4.802C271,580.436,268.762,578,266,578z M269,583.5
-		c0,0.275-0.226,0.5-0.5,0.5h-5c-0.275,0-0.5-0.225-0.5-0.5v-1c0-0.275,0.225-0.5,0.5-0.5h5c0.274,0,0.5,0.225,0.5,0.5V583.5z"/>
-</g>
-<g id="message_x5F_plus">
-	<polygon fill="#FFFFFF" points="194,587 194,599 200,593 	"/>
-	<path fill="#FFFFFF" d="M214.054,588.946c-1.366-0.841-2.378-2.178-2.812-3.946H194l12,12L214.054,588.946z"/>
-	<polygon fill="#FFFFFF" points="206,599 201,594 194,601 218,601 211,594 	"/>
-	<path fill="#FFFFFF" d="M212,593l6,6v-9c-0.912,0-1.782-0.145-2.582-0.418L212,593z"/>
-	<path fill="#FFFFFF" d="M218,578c-2.762,0-5,2.016-5,5c0,3.206,2.238,5,5,5s5-2.238,5-5S220.762,578,218,578z M221,583.5
-		c0,0.275-0.226,0.5-0.5,0.5H219v1.5c0,0.275-0.226,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5V584h-1.5c-0.275,0-0.5-0.225-0.5-0.5
-		v-1c0-0.275,0.225-0.5,0.5-0.5h1.5v-1.5c0-0.275,0.225-0.5,0.5-0.5h1c0.274,0,0.5,0.225,0.5,0.5v1.5h1.5c0.274,0,0.5,0.225,0.5,0.5
-		V583.5z"/>
-</g>
-<g id="message_x5F_out">
-	<path fill="#FFFFFF" d="M170,599l-7-7l7-7V599z M153,592l-7-7v14L153,592z M162,593h-8l-8,8h24L162,593z M158,573l-12,12h2l7,7h6
-		l7-7h2L158,573z M162.839,584H160v4.604c0,0.282-0.16,0.396-0.441,0.396h-3.111c-0.281,0-0.446-0.114-0.446-0.396V584h-2.837
-		c-0.148,0-0.196-0.188-0.105-0.306l4.764-5.734c0.091-0.118,0.238-0.091,0.329,0.026l4.793,5.695
-		C163.034,583.8,162.987,584,162.839,584z"/>
-</g>
-<g id="message_x5F_in">
-	<path fill="#FFFFFF" d="M122,585v14l-7-7L122,585z M106,593l-8,8h24l-8-8H106z M105,592l-7-7v14L105,592z M110,573l12,12h-2l-7,7
-		h-6l-7-7h-2L110,573z M111.564,578h-3.11c-0.281,0-0.453,0.114-0.453,0.396V583h-2.827c-0.148,0-0.195,0.2-0.104,0.317l4.793,5.695
-		c0.092,0.117,0.239,0.146,0.329,0.026l4.765-5.734c0.091-0.117,0.043-0.306-0.105-0.306H112v-4.604
-		C112,578.114,111.847,578,111.564,578z"/>
-</g>
-<g id="message_x5F_empty">
-	<polygon fill="#FFFFFF" points="50,585 52,585 59,592 65,592 72,585 74,585 62,573 	"/>
-	<polygon fill="#FFFFFF" points="57,592 50,585 50,599 	"/>
-	<polygon fill="#FFFFFF" points="67,592 74,599 74,585 	"/>
-	<polygon fill="#FFFFFF" points="58,593 50,601 74,601 66,593 	"/>
-</g>
-<g id="message_x5F_full">
-	<path fill="#FFFFFF" d="M26,599l-7-7l7-7V599z M9,592l-7-7v14L9,592z M18,593h-8l-8,8h24L18,593z"/>
-	<polygon fill="#FFFFFF" points="6.016,587.016 16,580 22.5,586.5 24,585 26,585 14,573 2,585 4,585 	"/>
-</g>
-<g id="table">
-	<g opacity="0.3">
-		<g>
-			<path fill="#FFFFFF" d="M456,540v-1h-6v-3h-1v3h-6v-3h-1v3h-6v1h6v3h-6v1h6v3h-6v1h6v3h1v-3h6v3h1v-3h6v-1h-6v-3h6v-1h-6v-3H456z
-				 M449,547h-6v-3h6V547z M449,543h-6v-3h6V543z"/>
-		</g>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M456,551h-20v-15h20V551z M456,534h-20v-3h20V534z M437,529c-1.65,0-3,1.35-3,3v18c0,1.65,1.35,3,3,3h18
-			c1.649,0,3-1.35,3-3v-18c0-1.65-1.351-3-3-3H437z"/>
-	</g>
-	<g opacity="0.3">
-		<g>
-			<rect x="436" y="531" fill="#FFFFFF" width="20" height="3"/>
-		</g>
-	</g>
-</g>
-<g id="embed_x5F_close">
-	<path fill="#FFFFFF" d="M394.246,553l9.414-24h2.485l-9.386,24H394.246z M383,542.63l11,6.359v-2.663l-7.888-4.445l7.888-4.208
-		v-2.657l-11,6.118V542.63z M405.938,537.205l-0.831,2.125l4.78,2.551l-7.411,4.178L402,547.273v1.716l11-6.359v-1.496
-		L405.938,537.205z"/>
-</g>
-<g id="embed">
-	<path fill="#FFFFFF" d="M365,541.134v1.496l-11,6.359v-2.663l7.887-4.445L354,537.673v-2.657L365,541.134z M335,541.134v1.496
-		l11,6.359v-2.663l-7.888-4.445l7.888-4.208v-2.657L335,541.134z"/>
-</g>
-<g id="text_x5F_bigger">
-	<path fill="#FFFFFF" d="M310,530v5c0,0,0,0-0.996,0c-0.004-2-1.233-3-3.004-3h-4v18c0,1,2,1,3,1c0,1,0,1,0,1h-10c0,0,0,0,0-1
-		c1,0,3,0,3-1v-18h-4c-1.771,0-3,1-3.004,3C290,535,290,535,290,535v-5c0,0,1.864,0,3,0h14C308.135,530,310,530,310,530z M314,541
-		h-3v-3h-2v3h-3v2h3v3h2v-3h3V541z"/>
-</g>
-<g id="text_x5F_smaller">
-	<path fill="#FFFFFF" d="M247,533h7c1.135,0,3,0,3,0v5c0,0,0,0-0.996,0c-0.004-2-1.233-3-3.004-3h-1v12c0,1,2,1,3,1c0,1,0,1,0,1h-9
-		c0,0,0,0,0-1c1,0,3,0,3-1v-12h-1c-1.771,0-3,1-3.004,3C244,538,244,538,244,538v-5C244,533,245.865,533,247,533z M258,543h8v-2h-8
-		V543z"/>
-</g>
-<g id="list">
-	<path fill="#FFFFFF" d="M218,545.5c0,0.275-0.226,0.5-0.5,0.5h-18c-0.275,0-0.5-0.225-0.5-0.5v-2c0-0.275,0.225-0.5,0.5-0.5h18
-		c0.274,0,0.5,0.225,0.5,0.5V545.5z M197,543.5c0-0.275-0.226-0.5-0.5-0.5h-2c-0.275,0-0.5,0.225-0.5,0.5v2
-		c0,0.275,0.225,0.5,0.5,0.5h2c0.274,0,0.5-0.225,0.5-0.5V543.5z M218,549.5c0-0.275-0.226-0.5-0.5-0.5h-18
-		c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h18c0.274,0,0.5-0.225,0.5-0.5V549.5z M197,549.5
-		c0-0.275-0.226-0.5-0.5-0.5h-2c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h2c0.274,0,0.5-0.225,0.5-0.5V549.5z
-		 M218,537.5c0-0.275-0.226-0.5-0.5-0.5h-18c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h18c0.274,0,0.5-0.225,0.5-0.5
-		V537.5z M197,537.5c0-0.275-0.226-0.5-0.5-0.5h-2c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h2
-		c0.274,0,0.5-0.225,0.5-0.5V537.5z M218,531.5c0-0.275-0.226-0.5-0.5-0.5h-18c-0.275,0-0.5,0.225-0.5,0.5v2
-		c0,0.275,0.225,0.5,0.5,0.5h18c0.274,0,0.5-0.225,0.5-0.5V531.5z M197,531.5c0-0.275-0.226-0.5-0.5-0.5h-2
-		c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h2c0.274,0,0.5-0.225,0.5-0.5V531.5z"/>
-</g>
-<g id="justify">
-	<path fill="#FFFFFF" d="M146,543.5c0-0.275,0.225-0.5,0.5-0.5h23c0.274,0,0.5,0.225,0.5,0.5v2c0,0.275-0.226,0.5-0.5,0.5h-23
-		c-0.275,0-0.5-0.225-0.5-0.5V543.5z M146,539.5c0,0.275,0.225,0.5,0.5,0.5h23c0.274,0,0.5-0.225,0.5-0.5v-2
-		c0-0.275-0.226-0.5-0.5-0.5h-23c-0.275,0-0.5,0.225-0.5,0.5V539.5z M146,533.5c0,0.275,0.225,0.5,0.5,0.5h23
-		c0.274,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.226-0.5-0.5-0.5h-23c-0.275,0-0.5,0.225-0.5,0.5V533.5z M146,551.5
-		c0,0.275,0.225,0.5,0.5,0.5h23c0.274,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.226-0.5-0.5-0.5h-23c-0.275,0-0.5,0.225-0.5,0.5V551.5z"/>
-</g>
-<g id="align_x5F_right">
-	<path fill="#FFFFFF" d="M104.013,543.5c0-0.275,0.225-0.5,0.5-0.5H121.5c0.274,0,0.5,0.225,0.5,0.5v2c0,0.275-0.226,0.5-0.5,0.5
-		h-16.987c-0.275,0-0.5-0.225-0.5-0.5V543.5z M100.013,539.5c0,0.275,0.225,0.5,0.5,0.5H121.5c0.274,0,0.5-0.225,0.5-0.5v-2
-		c0-0.275-0.226-0.5-0.5-0.5h-20.987c-0.275,0-0.5,0.225-0.5,0.5V539.5z M108.013,533.5c0,0.275,0.225,0.5,0.5,0.5H121.5
-		c0.274,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.226-0.5-0.5-0.5h-12.987c-0.275,0-0.5,0.225-0.5,0.5V533.5z M98,551.5
-		c0,0.275,0.225,0.5,0.5,0.5h23c0.274,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.226-0.5-0.5-0.5h-23c-0.275,0-0.5,0.225-0.5,0.5V551.5z"/>
-</g>
-<g id="align_x5F_center">
-	<path fill="#FFFFFF" d="M54,543.5c0-0.275,0.225-0.5,0.5-0.5h15c0.274,0,0.5,0.225,0.5,0.5v2c0,0.275-0.226,0.5-0.5,0.5h-15
-		c-0.275,0-0.5-0.225-0.5-0.5V543.5z M50,539.5c0,0.275,0.225,0.5,0.5,0.5h23c0.274,0,0.5-0.225,0.5-0.5v-2
-		c0-0.275-0.226-0.5-0.5-0.5h-23c-0.275,0-0.5,0.225-0.5,0.5V539.5z M54,533.5c0,0.275,0.225,0.5,0.5,0.5h15
-		c0.274,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.226-0.5-0.5-0.5h-15c-0.275,0-0.5,0.225-0.5,0.5V533.5z M50,551.5
-		c0,0.275,0.225,0.5,0.5,0.5h23c0.274,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.226-0.5-0.5-0.5h-23c-0.275,0-0.5,0.225-0.5,0.5V551.5z"/>
-</g>
-<g id="align_x5F_left">
-	<path fill="#FFFFFF" d="M19.987,545.5c0,0.275-0.225,0.5-0.5,0.5H2.5c-0.275,0-0.5-0.225-0.5-0.5v-2c0-0.275,0.225-0.5,0.5-0.5
-		h16.986c0.275,0,0.5,0.225,0.5,0.5V545.5z M23.987,537.5c0-0.275-0.225-0.5-0.5-0.5H2.5c-0.275,0-0.5,0.225-0.5,0.5v2
-		c0,0.275,0.225,0.5,0.5,0.5h20.986c0.275,0,0.5-0.225,0.5-0.5V537.5z M15.987,531.5c0-0.275-0.225-0.5-0.5-0.5H2.5
-		c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h12.986c0.275,0,0.5-0.225,0.5-0.5V531.5z M26,549.5
-		c0-0.275-0.226-0.5-0.5-0.5h-23c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h23c0.274,0,0.5-0.225,0.5-0.5V549.5z"/>
-</g>
-<g id="right_x5F_indent">
-	<path fill="#FFFFFF" d="M446,491.5c0,0.276-0.225,0.5-0.5,0.5h-11c-0.276,0-0.5-0.224-0.5-0.5v-2c0-0.276,0.224-0.5,0.5-0.5h11
-		c0.275,0,0.5,0.224,0.5,0.5V491.5z M434.5,487h6c0.274,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.226-0.5-0.5-0.5h-6
-		c-0.275,0-0.5,0.225-0.5,0.5v2C434,486.775,434.225,487,434.5,487z M434.5,497h8c0.274,0,0.5-0.225,0.5-0.5v-2
-		c0-0.275-0.226-0.5-0.5-0.5h-8c-0.275,0-0.5,0.225-0.5,0.5v2C434,496.775,434.225,497,434.5,497z M447.5,499h-13
-		c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h13c0.274,0,0.5-0.225,0.5-0.5v-2C448,499.225,447.775,499,447.5,499z
-		 M455,491l-3.334,2.5L455,496v-2h3v-1h-3V491z M449,504h2v-22h-2V504z"/>
-</g>
-<g id="left_x5F_indent">
-	<path fill="#FFFFFF" d="M408,491.5c0,0.276-0.225,0.5-0.5,0.5h-11c-0.276,0-0.5-0.224-0.5-0.5v-2c0-0.276,0.224-0.5,0.5-0.5h11
-		c0.275,0,0.5,0.224,0.5,0.5V491.5z M396.5,487h6c0.274,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.226-0.5-0.5-0.5h-6
-		c-0.275,0-0.5,0.225-0.5,0.5v2C396,486.775,396.225,487,396.5,487z M396.5,497h8c0.274,0,0.5-0.225,0.5-0.5v-2
-		c0-0.275-0.226-0.5-0.5-0.5h-8c-0.275,0-0.5,0.225-0.5,0.5v2C396,496.775,396.225,497,396.5,497z M409.5,499h-13
-		c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h13c0.274,0,0.5-0.225,0.5-0.5v-2C410,499.225,409.775,499,409.5,499z
-		 M389,493h-3v1h3v2l3.333-2.5L389,491V493z M393,504h2v-22h-2V504z"/>
-</g>
-<g id="text_x5F_resize">
-	<path fill="#FFFFFF" d="M343,484c-1.136,0-3,0-3,0v5c0,0,0,0,0.996,0c0.004-2,1.232-3,3.004-3h4v14c0,1-2,1-3,1c0,1,0,1,0,1h10
-		c0,0,0,0,0-1c-1,0-3,0-3-1v-14h4c1.771,0,3,1,3.004,3c0.996,0,0.996,0,0.996,0v-5c0,0-1.865,0-3,0H343z"/>
-	<path fill="#FFFFFF" d="M363,483v-3h-3v1h-20v-1h-3v3h1v20h-1v3h3v-1h20v1h3v-3h-1v-20H363z M338,481h1v1h-1V481z M339,505h-1v-1h1
-		V505z M360,504h-20v-1h-1v-20h1v-1h20v1h1v20h-1V504z M362,505h-1v-1h1V505z M361,482v-1h1v1H361z"/>
-</g>
-<g id="text_x5F_width">
-	<path fill="#FFFFFF" d="M296,483h4v15c0,1-2,1-3,1c0,1,0,1,0,1h10c0,0,0,0,0-1c-1,0-3,0-3-1v-15h4c1.771,0,3,1,3.004,3
-		c0.996,0,0.996,0,0.996,0v-5c0,0-1.865,0-3,0h-14c-1.136,0-3,0-3,0v5c0,0,0,0,0.996,0C293,484,294.229,483,296,483z"/>
-	<polygon fill="#FFFFFF" points="312.333,502.5 309,500 309,502 295,502 295,500 291.667,502.5 295,505 295,503 309,503 309,505 	
-		"/>
-</g>
-<g id="text_x5F_height">
-	<polygon fill="#FFFFFF" points="246,484 243.5,480.667 241,484 243,484 243,500 241,500 243.5,503.333 246,500 244,500 244,484 	
-		"/>
-	<path fill="#FFFFFF" d="M264,481h-14c-1.135,0-3,0-3,0v5c0,0,0,0,0.996,0c0.004-2,1.232-3,3.004-3h4v18c0,1-2,1-3,1c0,1,0,1,0,1h10
-		c0,0,0,0,0-1c-1,0-3,0-3-1v-18h4c1.771,0,3,1,3.004,3c0.996,0,0.996,0,0.996,0v-5C267,481,265.135,481,264,481z"/>
-</g>
-<g id="text_x5F_strike">
-	<path fill="#FFFFFF" d="M208,483v8h8v2h-8v8c0,1,2,1,3,1c0,1,0,1,0,1h-10c0,0,0,0,0-1c1,0,3,0,3-1v-8h-8v-2h8v-8h-4
-		c-1.771,0-3,1-3.004,3C196,486,196,486,196,486v-5h20v5c0,0,0,0-0.996,0c-0.004-2-1.233-3-3.004-3H208z"/>
-</g>
-<g id="text_x5F_underline">
-	<polygon fill="#FFFFFF" points="148,504 148,505 168,505 168,504 168,503 148,503 	"/>
-	<path fill="#FFFFFF" d="M148,481v5c0,0,0,0,0.996,0c0.004-2,1.232-3,3.004-3h4v16c0,1-2,1-3,1c0,1,0,1,0,1h10c0,0,0,0,0-1
-		c-1,0-3,0-3-1v-16h4c1.771,0,3,1,3.004,3c0.996,0,0.996,0,0.996,0v-5H148z"/>
-</g>
-<g id="bold">
-	<path fill="#FFFFFF" d="M113.04,492.5c0,0,4.46-1.26,4.46-5.16c0-3.91-3.54-6.34-6.54-6.34H100v1.43c2,0.472,2,0.78,2,2.29v16.55
-		c0,1.132-1,1.79-2,1.95V505h10.92c3.1,0,7.852-1.811,7.852-6.12C118.771,493.88,113.04,492.5,113.04,492.5z M107,484
-		c0,0,0.96,0,2.96,0s2.601,1.76,2.601,3.5c0,1.729-0.601,3.5-2.601,3.5s-2.96,0-2.96,0V484z M109.99,502H107v-8c0,0,0.43,0,2.96,0
-		c2.529,0,3.67,1.995,3.67,4.345C113.63,500.685,112.21,502,109.99,502z"/>
-</g>
-<g id="italic">
-	<path fill="#FFFFFF" d="M68.048,482.144L68.024,481h-4.718H60v1.144c2,0.538,1.807,0.743,1.503,2.469l-3.192,16.821
-		c-0.229,1.293-1.311,2.244-3.311,2.424V505h9v-1.144c-1-0.18-1.979-1.131-1.749-2.424l2.835-16.821
-		C65.391,482.887,65.667,482.682,68.048,482.144z"/>
-</g>
-<g id="font">
-	<g id="XMLID_1_">
-		<path fill="#FFFFFF" d="M24,502.729V504h-8c0,0,0-0.682,0-1.271c1.438,0,1.922-1.479,1.533-2.533
-			c-0.283-0.773-1.58-4.258-1.58-4.258h-7.5c0,0-1.103,2.79-1.763,4.505c-0.66,1.714,0.888,2.286,2.31,2.286C9,503.531,9,504,9,504
-			H2v-1.271c0,0,1.078-0.46,1.607-0.987c0.53-0.528,0.991-1.438,0.991-1.438L12.263,481h1.785l7.384,19.139
-			c0,0,0.385,0.968,1.151,1.773C23.351,502.719,24,502.729,24,502.729z M15.482,494l-2.224-6.073l-0.876-2.687L8.955,494H15.482z"/>
-	</g>
-	<g id="XMLID_2_" opacity="0.5">
-		<path fill="#FFFFFF" d="M29,490.42V491h-4v-0.58l1.095-0.5l-0.76-2l-3.524,0.005l-0.91,2.01L22,490.4v0.6h-3v-0.6l0.93-0.46
-			l3.756-8.94H24.5l3.64,8.96L29,490.42z M25.154,487l-1.014-2.805l-0.4-1.21L22.175,487H25.154z"/>
-	</g>
-</g>
-<g id="vector_x5F_path_x5F_all">
-	<path fill="#FFFFFF" d="M458,437v-4h-4v1h-6v-1h-4v1h-6v-1h-4v4h1v6h-1v4h1v6h-1v4h4v-1h6v1h4v-1h6v1h4v-4h-1v-6h1v-4h-1v-6H458z
-		 M445,434h2v2h-2V434z M435,434h2v2h-2V434z M435,444h2v2h-2V444z M437,456h-2v-2h2V456z M447,456h-2v-2h2V456z M454,454h-6v-1h-4
-		v1h-6v-1h-1v-6h1v-4h-1v-6h1v-1h6v1h4v-1h6v1h1v6h-1v4h1v6h-1V454z M457,456h-2v-2h2V456z M457,446h-2v-2h2V446z M455,436v-2h2v2
-		H455z"/>
-</g>
-<g id="vector_x5F_path_x5F_curve">
-	<path fill="#FFFFFF" d="M406,433v1.356c-9.517,1.663-16.979,9.128-18.644,18.644H386v4h4v-4h-0.605
-		c1.615-8.406,8.199-14.991,16.605-16.606V437h4v-4H406z M389,456h-2v-2h2V456z M409,436h-2v-2h2V436z"/>
-</g>
-<g id="vector_x5F_path_x5F_line">
-	<path fill="#FFFFFF" d="M358,433v2.586L340.586,453H338v4h4v-2.586L359.414,437H362v-4H358z M341,456h-2v-2h2V456z M361,436h-2v-2
-		h2V436z"/>
-</g>
-<g id="vector_x5F_path_x5F_polygon">
-	<g>
-		<path fill="#FFFFFF" d="M311.98,440L304,434.256V432h-4v2.259L292.049,440H289v4h1.488l2.946,9H293v4h4v-1h10v1h4v-4h-0.438
-			l2.94-9H315v-4H311.98z M292,443h-2v-2h2V443z M301,433h2v2h-2V433z M296,456h-2v-2h2V456z M310,456h-2v-2h2V456z M308.459,453
-			H307v1h-10v-1h-1.459l-2.947-9H293v-2.22l8.004-5.78h1.997l7.999,5.759V444h0.398L308.459,453z M314,443h-2v-2h2V443z"/>
-	</g>
-	<polygon opacity="0.3" fill="#FFFFFF" enable-background="new    " points="307,454 307,453 308.459,453 310.656,446.274 
-		311.399,444 311,444 311,441.759 306.137,438.258 303.001,436 301.004,436 297.43,438.581 293,441.78 293,444 292.594,444 
-		293.322,446.224 295.541,453 297,453 297,454 	"/>
-</g>
-<g id="vector_x5F_path_x5F_circle">
-	<g>
-		<path fill="#FFFFFF" d="M264.809,443c-0.824-4.463-4.346-7.984-8.809-8.809V433h-4v1.191c-4.463,0.823-7.984,4.346-8.81,8.809H242
-			v4h1.19c0.824,4.463,4.347,7.984,8.81,8.809V457h4v-1.191c4.463-0.823,7.983-4.346,8.809-8.809H266v-4H264.809z M253,434h2v2h-2
-			V434z M245,446h-2v-2h2V446z M255,456h-2v-2h2V456z M262.768,447c-0.766,3.357-3.41,6.002-6.768,6.769V453h-4v0.769
-			c-3.357-0.767-6.002-3.41-6.769-6.769H246v-4h-0.769c0.767-3.357,3.41-6.002,6.769-6.769V437h4v-0.769
-			c3.356,0.767,6.002,3.41,6.768,6.769H262v4H262.768z M265,446h-2v-2h2V446z"/>
-	</g>
-	<path opacity="0.3" fill="#FFFFFF" enable-background="new    " d="M262,447v-4h0.768c-0.094-0.411-0.217-0.811-0.365-1.198
-		c-0.005-0.014-0.01-0.025-0.015-0.04c-0.299-0.771-0.703-1.492-1.191-2.144c-0.015-0.021-0.028-0.039-0.043-0.06
-		c-0.49-0.645-1.066-1.22-1.711-1.711c-0.021-0.016-0.042-0.03-0.062-0.047c-0.649-0.485-1.366-0.889-2.135-1.187
-		c-0.02-0.008-0.039-0.016-0.059-0.021c-0.382-0.146-0.775-0.268-1.182-0.359c-0.002-0.001-0.004-0.001-0.006-0.002V437h-4v-0.769
-		c-0.002,0.001-0.004,0.001-0.006,0.002c-0.405,0.093-0.8,0.215-1.183,0.359c-0.019,0.008-0.039,0.015-0.058,0.021
-		c-0.77,0.298-1.485,0.7-2.135,1.187c-0.021,0.017-0.042,0.031-0.062,0.047c-0.644,0.491-1.22,1.066-1.711,1.711
-		c-0.015,0.021-0.029,0.039-0.043,0.06c-0.489,0.65-0.892,1.371-1.191,2.144c-0.005,0.014-0.01,0.027-0.015,0.04
-		c-0.148,0.389-0.271,0.787-0.365,1.198H246v4h-0.769c0.095,0.411,0.218,0.811,0.365,1.197c0.005,0.014,0.01,0.027,0.015,0.042
-		c0.3,0.771,0.702,1.491,1.191,2.143c0.015,0.021,0.029,0.039,0.043,0.06c0.491,0.645,1.067,1.22,1.711,1.711
-		c0.021,0.016,0.042,0.03,0.062,0.047c0.648,0.485,1.365,0.888,2.134,1.187c0.02,0.008,0.04,0.016,0.059,0.021
-		c0.382,0.146,0.776,0.268,1.182,0.359c0.002,0.001,0.004,0.001,0.006,0.002V453h4v0.769c0.002-0.001,0.004-0.001,0.006-0.002
-		c0.405-0.093,0.799-0.215,1.181-0.359c0.02-0.007,0.039-0.015,0.059-0.021c0.769-0.298,1.484-0.7,2.135-1.187
-		c0.021-0.017,0.042-0.031,0.062-0.047c0.645-0.491,1.221-1.066,1.711-1.711c0.016-0.021,0.029-0.039,0.043-0.06
-		c0.489-0.65,0.894-1.371,1.191-2.144c0.005-0.014,0.01-0.026,0.015-0.04c0.148-0.389,0.271-0.787,0.365-1.198H262z"/>
-</g>
-<g id="vector_x5F_path_x5F_square">
-	<g>
-		<path fill="#FFFFFF" d="M218,437v-4h-4v1h-16v-1h-4v4h1v16h-1v4h4v-1h16v1h4v-4h-1v-16H218z M215,434h2v2h-2V434z M195,434h2v2h-2
-			V434z M197,456h-2v-2h2V456z M217,456h-2v-2h2V456z M215,453h-1v1h-16v-1h-1v-16h1v-1h16v1h1V453z"/>
-	</g>
-	<polygon opacity="0.3" fill="#FFFFFF" enable-background="new    " points="214,454 214,453 215,453 215,437 214,437 214,436 
-		198,436 198,437 197,437 197,453 198,453 198,454 	"/>
-</g>
-<g id="crop">
-	<path fill="#FFFFFF" d="M167,450v-10v-2.586l3.707-3.707l-1.414-1.414L165.586,436H163h-10v-3h-4v3v4v10v4h4h10h4h4v-4H167z
-		 M161.586,440L153,448.586V440H161.586z M154.414,450l8.586-8.586V450H154.414z M145,436h3v4h-3V436z M163,455h4v3h-4V455z"/>
-</g>
-<g id="tint">
-	<path fill="#FFFFFF" d="M98.893,449.092c0,4.35,4.128,6.972,7.68,6.972c3.553,0,7.681-2.674,7.681-7.021
-		c0-5.933-5.813-9.327-7.681-15.569C104.626,439.715,98.893,443.16,98.893,449.092z M104.573,452.511
-		c-2.183-0.104-3.613-1.767-3.625-3.42c-0.011-1.653,0.886-3.771,1.648-5.08c0.498-0.917,1.482-0.714,1.261,0
-		c-0.436,1.317-0.67,3.324-0.67,4.864c0,1.123,0.554,2.209,1.386,2.581C105.406,451.828,105.615,452.459,104.573,452.511z"/>
-	<path fill="#FFFFFF" d="M113.664,439.81c0,2.175,2.063,3.485,3.84,3.485c1.775,0,3.84-1.337,3.84-3.511
-		c0-2.966-2.906-4.663-3.84-7.784C116.53,435.121,113.664,436.844,113.664,439.81z M116.504,441.519
-		c-1.091-0.052-1.808-0.883-1.812-1.709s0.442-1.887,0.824-2.541c0.249-0.458,0.741-0.355,0.63,0
-		c-0.218,0.659-0.335,1.662-0.335,2.434c0,0.562,0.276,1.104,0.693,1.29C116.92,441.178,117.025,441.493,116.504,441.519z"/>
-</g>
-<g id="adjust_2_">
-	<path fill="#FFFFFF" d="M62,432.75c-6.755,0-12.25,5.495-12.25,12.25s5.495,12.25,12.25,12.25s12.25-5.495,12.25-12.25
-		S68.755,432.75,62,432.75z M52.289,445c0-5.036,3.711-9.191,8.711-9.736v19.474C56,454.191,52.289,450.036,52.289,445z"/>
-</g>
-<g id="eyedropper">
-	<path fill="#FFFFFF" d="M24.031,439.378c1.252-1.252,2.462-2.912,0.707-4.667l-0.707-0.707c-1.774-1.773-3.514-0.446-4.667,0.707
-		l-3.188,3.188c-0.048,0.049-0.085,0.104-0.127,0.155l-1.553-1.554c-0.321-0.321-0.836-0.329-1.148-0.017l-1.414,1.414
-		c-0.312,0.312-0.305,0.826,0.018,1.147l1.114,1.114l-8.979,8.979c-0.725,0.724-1.098,1.943-0.887,2.902
-		c0,0.059-0.071,0.259-0.133,0.325l-0.352,0.352c-0.937,0.937-0.956,2.439-0.045,3.352c0.912,0.912,2.415,0.892,3.351-0.044
-		l0.354-0.354c0.063-0.059,0.266-0.13,0.355-0.126c0.927,0.205,2.147-0.168,2.87-0.891l8.98-8.98l1.113,1.114
-		c0.321,0.321,0.836,0.329,1.147,0.017l1.414-1.414c0.312-0.312,0.305-0.825-0.018-1.146l-1.553-1.554
-		c0.052-0.042,0.107-0.078,0.156-0.127L24.031,439.378z M8.61,453.667c-0.389,0.389-1.113,0.617-1.612,0.509
-		c-0.498-0.108-1.226,0.119-1.613,0.508l-0.354,0.354c-0.389,0.389-1.005,0.408-1.369,0.044s-0.345-0.981,0.045-1.37l0.354-0.354
-		c0.389-0.39,0.617-1.114,0.508-1.613c-0.108-0.498,0.119-1.224,0.509-1.612l8.98-8.979l3.536,3.534L8.61,453.667z"/>
-	<path opacity="0.3" fill="#FFFFFF" enable-background="new    " d="M5.206,450l-0.132,0.132c-0.39,0.39-0.617,1.114-0.509,1.612
-		c0.109,0.499-0.119,1.225-0.508,1.613l-0.354,0.354c-0.39,0.389-0.409,1.006-0.045,1.37s0.98,0.345,1.369-0.044l0.354-0.354
-		c0.389-0.389,1.115-0.616,1.613-0.508c0.499,0.108,1.225-0.12,1.612-0.509L12.277,450H5.206z"/>
-</g>
-<g id="building">
-	<path fill="#FFFFFF" d="M456,386h-20l2-2h5l1-1h4l1,1h5L456,386z M458,408v1h-10v-3h-4v3h-10v-1h1v-1h1v-20h20v20h1v1H458z
-		 M443,402h-4v2h4V402z M443,398h-4v2h4V398z M443,394h-4v2h4V394z M443,390h-4v2h4V390z M448,402h-4v2h4V402z M448,398h-4v2h4V398z
-		 M448,394h-4v2h4V394z M448,390h-4v2h4V390z M453,402h-4v2h4V402z M453,398h-4v2h4V398z M453,394h-4v2h4V394z M453,390h-4v2h4V390z
-		"/>
-</g>
-<g id="adress_x5F_book">
-	<path fill="#FFFFFF" d="M405,385h-14.5l-3.5,3.75V409h15c1.649,0,3-1.35,3-3v-14c0-1.65-1.351-3-3-3h-12.267l2-2
-		c0,0,11.267,0,12.267,0c2,0,3,1,3,3c0,1,0,16,0,16l2-2v-15C409,387,407,385,405,385z M391,401.756c0-0.458,0.086-0.646,0.436-0.846
-		c0.28-0.16,2.677-0.938,3.564-1.316v-0.906c-0.47-0.125-1-0.857-1-1.327c0-1.091,0-1.99,0-1.99c0-1.076,0.702-1.955,2-1.962
-		c1.298,0.007,2,0.886,2,1.962c0,0,0,0.899,0,1.99c0,0.47-0.531,1.202-1,1.327v0.906c0.888,0.38,3.284,1.156,3.563,1.316
-		c0.351,0.2,0.437,0.388,0.437,0.846c0,0.188,0,1.026,0,1.026c0,0.119-0.1,0.218-0.218,0.218H396h-4.782
-		c-0.119,0-0.218-0.099-0.218-0.218C391,402.782,391,401.943,391,401.756z"/>
-</g>
-<g id="log_x5F_book">
-	<g id="book_1_">
-		<path fill="#FFFFFF" d="M342.425,399.029l1.546-1.547c0.093-0.093,0.246-0.093,0.338,0l1.86,1.858
-			c0.092,0.094,0.244,0.094,0.336,0l4.998-4.996c0.093-0.093,0.244-0.094,0.338-0.001l1.558,1.535
-			c0.095,0.092,0.095,0.242,0.001,0.335l-6.896,6.895c-0.092,0.093-0.243,0.093-0.335,0l-3.744-3.743
-			C342.332,399.273,342.332,399.121,342.425,399.029z M356,385h-14.5l-3.5,3.75V409h15c1.649,0,3-1.35,3-3v-14c0-1.65-1.351-3-3-3
-			h-12.267l2-2c0,0,11.267,0,12.267,0c2,0,3,1,3,3c0,1,0,16,0,16l2-2v-15C360,387,358,385,356,385z"/>
-	</g>
-</g>
-<g id="display">
-	<g opacity="0.3">
-		<rect x="290" y="387" fill="#FFFFFF" width="24" height="14"/>
-	</g>
-	<path fill="#FFFFFF" d="M315,385h-26c-0.55,0-1,0.45-1,1v17c0,0.55,0.45,1,1,1h11c0,0.188,0,0.5,0,1c0,2-1.953,2-1.953,2h-3.692
-		c-0.193,0-0.354,0.16-0.354,0.354V409h16v-1.646c0-0.193-0.16-0.354-0.354-0.354H306c0,0-2,0-2-2c0-0.5,0-0.812,0-1h11
-		c0.55,0,1-0.45,1-1v-17C316,385.45,315.55,385,315,385z M314,403h-1v-1h1V403z M314,401h-24v-14h24V401z"/>
-</g>
-<g id="repeat">
-	<path fill="#FFFFFF" d="M264.09,401.916l-0.829-0.561c-0.455-0.309-1.017-0.281-1.248,0.061c-0.23,0.342-0.927,1.295-1.132,1.532
-		c-2.01,2.323-4.542,3.073-6.843,3.05c-2.272-0.022-4.558-0.918-6.268-2.629s-2.632-4.065-2.632-6.369l0,0
-		c-0.005-1.832,0.535-3.68,1.689-5.274c2.801-3.875,8.123-4.869,12.143-2.285l-1.447,2.002c-0.16,0.221-0.067,0.398,0.208,0.395
-		l6.498-0.112c0.274-0.005,0.434-0.224,0.352-0.485l-1.927-6.208c-0.081-0.263-0.28-0.295-0.441-0.071l-1.479,2.045l-0.06-0.04
-		c-5.371-3.51-12.521-2.189-16.277,3.005c-1.538,2.127-2.256,4.659-2.256,7.032s0.75,5.748,3.51,8.507
-		c2.314,2.313,5.347,3.481,8.388,3.504c2.928,0.022,6.755-1.264,9.094-4.083c0.267-0.32,1.136-1.488,1.367-1.831
-		C264.73,402.757,264.545,402.224,264.09,401.916z"/>
-</g>
-<g id="heat">
-	<path fill="#FFFFFF" d="M201.867,389.604c0.168,0.22,0.079,0.396-0.195,0.396h-2.622c0,2.691-0.626,4.107-1.178,5.356
-		c-0.495,1.118-0.922,2.085-0.922,4.144s0.427,3.024,0.922,4.144c0.552,1.249,1.178,2.665,1.178,5.356h-3
-		c0-2.059-0.427-3.024-0.922-4.144c-0.552-1.249-1.178-2.665-1.178-5.356s0.626-4.107,1.178-5.356
-		c0.495-1.118,0.922-2.085,0.922-4.144h-2.362c-0.274,0-0.367-0.182-0.204-0.403l3.796-5.168c0.162-0.222,0.435-0.226,0.602-0.007
-		L201.867,389.604z M211.867,389.604c0.168,0.22,0.079,0.396-0.195,0.396h-2.622c0,2.691-0.626,4.107-1.178,5.356
-		c-0.495,1.118-0.922,2.085-0.922,4.144s0.427,3.024,0.922,4.144c0.552,1.249,1.178,2.665,1.178,5.356h-3
-		c0-2.059-0.427-3.024-0.922-4.144c-0.552-1.249-1.178-2.665-1.178-5.356s0.626-4.107,1.178-5.356
-		c0.495-1.118,0.922-2.085,0.922-4.144h-2.362c-0.274,0-0.367-0.182-0.204-0.403l3.796-5.168c0.162-0.222,0.435-0.226,0.602-0.007
-		L211.867,389.604z M221.867,389.604c0.168,0.22,0.079,0.396-0.195,0.396h-2.622c0,2.691-0.626,4.107-1.178,5.356
-		c-0.495,1.118-0.922,2.085-0.922,4.144s0.427,3.024,0.922,4.144c0.552,1.249,1.178,2.665,1.178,5.356h-3
-		c0-2.059-0.427-3.024-0.922-4.144c-0.552-1.249-1.178-2.665-1.178-5.356s0.626-4.107,1.178-5.356
-		c0.495-1.118,0.922-2.085,0.922-4.144h-2.362c-0.274,0-0.367-0.182-0.204-0.403l3.796-5.168c0.162-0.222,0.435-0.226,0.602-0.007
-		L221.867,389.604z"/>
-</g>
-<g id="random_1_">
-	<path fill="#FFFFFF" d="M171.647,402.202c0.221,0.165,0.221,0.435,0,0.6l-5.224,3.9c-0.221,0.165-0.424,0.075-0.424-0.2V404h-3.536
-		l-4.308-3.946l2.221-2.036L163.63,401H166v-2.498c0-0.275,0.203-0.365,0.424-0.2L171.647,402.202z M166,393v2.502
-		c0,0.275,0.203,0.365,0.424,0.2l5.212-3.9c0.22-0.165,0.226-0.435,0.006-0.6l-5.221-3.9c-0.221-0.165-0.421-0.075-0.421,0.2V390
-		h-3.536l-12,11h-5.917c-0.274,0-0.547,0.227-0.547,0.502v2c0,0.275,0.271,0.498,0.547,0.498h7.084l12-11H166z M144.547,393h5.917
-		l3.253,2.983l2.221-2.036L151.631,390h-7.084c-0.274,0-0.547,0.227-0.547,0.502v2C144,392.777,144.272,393,144.547,393z"/>
-</g>
-<g id="roundabout">
-	<path fill="#FFFFFF" d="M106.708,391.565c-0.38,0.105-5.095,1.28-5.771,1.435s-0.819,0.143-0.797-0.5
-		c0.023-0.643,0.189-5.672,0.229-6.094c0.038-0.422,0.231-0.564,0.627-0.229c0.395,0.336,1.643,1.362,1.643,1.362
-		c1.208-0.945,2.61-1.68,4.182-2.111c4.285-1.177,8.66,0.136,11.609,3.048l-2.713,1.589c-2.186-1.796-5.174-2.546-8.104-1.742
-		c-0.938,0.258-1.806,0.667-2.593,1.191c0,0,1.433,1.173,1.729,1.423S107.088,391.459,106.708,391.565z M106.015,405.061
-		c-2.224-1.1-3.989-3.101-4.696-5.676c-0.36-1.315-0.408-2.666-0.174-3.97l-2.719-1.548c-0.545,2.002-0.59,4.166,0,6.312
-		c1.033,3.766,3.752,6.605,7.117,7.952c0,0-0.312,1.994-0.371,2.447c-0.06,0.453,0.109,0.469,0.547,0.25
-		c0.437-0.219,5.13-2.803,5.469-3s0.398-0.334,0.031-0.719c-0.367-0.386-3.962-3.979-4.281-4.281
-		c-0.318-0.302-0.531-0.25-0.604,0.157C106.234,403.547,106.015,405.061,106.015,405.061z M123.953,393.703
-		c-1.402-0.789-5.396-3.045-5.613-3.166c-0.262-0.146-0.423-0.07-0.483,0.187c-0.048,0.207-1.053,4.486-1.444,6.153
-		c-0.096,0.406,0.024,0.568,0.393,0.424c0.368-0.144,2.156-0.918,2.156-0.918c0.127,1.755-0.252,3.508-1.144,5.071
-		c-1.084,1.905-2.791,3.313-4.842,4.03l-0.003,3.134c0.067-0.019,0.134-0.026,0.2-0.045c3.195-0.877,5.731-2.966,7.252-5.636
-		c1.309-2.301,1.854-5.03,1.424-7.785c0,0,1.943-0.828,2.15-0.918S124.244,393.866,123.953,393.703z"/>
-</g>
-<g id="refresh_1_">
-	<path fill="#FFFFFF" d="M53.269,399.919l-2.896,0.05c-0.851-3.333-0.285-7.002,1.883-10.001c3.756-5.194,10.906-6.515,16.277-3.005
-		l0.06,0.04l1.479-2.045c0.161-0.224,0.36-0.19,0.442,0.071l1.926,6.208c0.082,0.263-0.076,0.48-0.351,0.485l-6.498,0.112
-		c-0.276,0.005-0.368-0.174-0.208-0.395l1.447-2.003c-4.021-2.584-9.343-1.589-12.144,2.286c-1.771,2.449-2.121,5.494-1.221,8.161
-		L53.269,399.919z M73.604,394.102l-3.098,0.055c0.881,2.655,0.528,5.683-1.234,8.119c-2.801,3.875-8.123,4.869-12.143,2.286
-		l1.447-2.003c0.159-0.221,0.067-0.399-0.208-0.395l-6.498,0.112c-0.274,0.005-0.434,0.224-0.353,0.484l1.927,6.209
-		c0.082,0.263,0.281,0.295,0.442,0.072l1.479-2.046l0.06,0.04c5.371,3.51,12.521,2.189,16.277-3.005
-		C73.857,401.054,74.428,397.415,73.604,394.102z"/>
-</g>
-<g id="retweet">
-	<path fill="#FFFFFF" d="M17.719,402H6v-6h0.013h2.498c0.275,0,0.365-0.294,0.2-0.515l-3.9-5.314c-0.165-0.22-0.435-0.167-0.6,0.053
-		l-3.9,5.26c-0.165,0.22-0.075,0.517,0.2,0.517H3v8.5c0,0.275,0.225,0.5,0.5,0.5h16.526L17.719,402z"/>
-	<path fill="#FFFFFF" d="M27.511,399h-2.498H25v-8.5c0-0.275-0.226-0.5-0.5-0.5H8.062l2.31,3H22v6h-2.489
-		c-0.275,0-0.365,0.17-0.2,0.391l3.9,5.195c0.165,0.22,0.435,0.209,0.6-0.011l3.9-5.188C27.876,399.167,27.787,399,27.511,399z"/>
-</g>
-<g id="signal_1_">
-	<path fill="#FFFFFF" d="M437.5,354h-3c-0.275,0-0.5,0.225-0.5,0.5c0,2.167,0,4.333,0,6.5h4c0-2.167,0-4.333,0-6.5
-		C438,354.225,437.775,354,437.5,354z"/>
-	<path fill="#FFFFFF" d="M442.5,351h-3c-0.275,0-0.5,0.225-0.5,0.5c0,3.167,0,6.333,0,9.5h4c0-3.167,0-6.333,0-9.5
-		C443,351.225,442.775,351,442.5,351z"/>
-	<path fill="#FFFFFF" d="M447.5,348h-3c-0.275,0-0.5,0.225-0.5,0.5c0,4.167,0,8.333,0,12.5h4c0-4.167,0-8.333,0-12.5
-		C448,348.225,447.775,348,447.5,348z"/>
-	<path fill="#FFFFFF" d="M452.5,343h-3c-0.275,0-0.5,0.225-0.5,0.5c0,5.833,0,11.667,0,17.5h4c0-5.833,0-11.667,0-17.5
-		C453,343.225,452.775,343,452.5,343z"/>
-	<path fill="#FFFFFF" d="M457.5,337h-3c-0.275,0-0.5,0.225-0.5,0.5c0,7.833,0,15.667,0,23.5h4c0-7.833,0-15.667,0-23.5
-		C458,337.225,457.775,337,457.5,337z"/>
-</g>
-<g id="warning_x5F_sign_1_">
-	<path fill="#FFFFFF" d="M412.179,358.754l-12.378-20.953c-0.268-0.467-0.764-0.754-1.301-0.754s-1.033,0.287-1.301,0.754
-		l-12.379,20.953c-0.267,0.464-0.265,1.035,0.004,1.498s0.764,0.748,1.299,0.748h24.754c0.535,0,1.03-0.285,1.299-0.748
-		C412.443,359.789,412.445,359.218,412.179,358.754z M388.711,358l9.789-16.797L408.289,358H388.711z M400,354.375v2.25
-		c0,0.207-0.168,0.375-0.375,0.375h-2.25c-0.207,0-0.375-0.168-0.375-0.375v-2.25c0-0.207,0.168-0.375,0.375-0.375h2.25
-		C399.832,354,400,354.168,400,354.375z M397.499,346h2.002c0.273,0,0.499,0.225,0.499,0.499v1.876c0,0.207-0.033,0.541-0.073,0.742
-		l-0.675,3.453c-0.04,0.201-0.242,0.43-0.449,0.43h-0.588c-0.207,0-0.409-0.229-0.45-0.43l-0.689-3.422
-		c-0.041-0.201-0.074-0.566-0.074-0.773v-1.876C397,346.225,397.225,346,397.499,346z"/>
-</g>
-<g id="headset">
-	<path fill="#FFFFFF" d="M362,349.5l-0.021,8.696c-0.042,0.214-1.081,4.769-9.172,5.646C352.49,364.524,351.803,365,351,365h-1
-		c-1.104,0-2-0.896-2-2s0.896-2,2-2h1c0.68,0,1.277,0.341,1.64,0.859c5.999-0.664,7.204-3.521,7.36-3.99V349.5c0-5.238-4.763-9-10-9
-		c-5.238,0-10,3.762-10,9v6c0,0.275-0.226,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5v-6c0-6.341,5.659-12,12-12
-		S362,343.159,362,349.5z M343.873,352h-2.529c-0.275,0-0.344,0.24-0.344,0.516v7.984c0,0.275,0.067,0.5,0.344,0.5h2.529
-		c0.274,0,0.5-0.225,0.5-0.5c0,0,0.5-1.5,0.5-4s-0.5-3.992-0.5-3.992C344.373,352.232,344.148,352,343.873,352z M359,357.094v-4.578
-		c0-0.274-0.068-0.516-0.345-0.516h-2.528c-0.275,0-0.5,0.232-0.5,0.508c0,0-0.5,1.488-0.5,3.988c0,0.871,0.164,2.069,0.271,2.927
-		C357.203,358.922,358.234,358.016,359,357.094z"/>
-</g>
-<g id="headphones_1_">
-	<path fill="#FFFFFF" d="M296.373,352.508c0,0,0.5,1.492,0.5,3.992s-0.5,4-0.5,4c0,0.275-0.226,0.5-0.5,0.5h-2.529
-		c-0.275,0-0.344-0.225-0.344-0.5v-7.984c0-0.274,0.067-0.516,0.344-0.516h2.529C296.148,352,296.373,352.232,296.373,352.508z
-		 M310.656,352h-2.528c-0.275,0-0.5,0.232-0.5,0.508c0,0-0.5,1.488-0.5,3.988s0.5,4.002,0.5,4.002c0,0.275,0.225,0.502,0.5,0.502
-		h2.528c0.275,0,0.345-0.225,0.345-0.5v-7.984C311,352.24,310.932,352,310.656,352z M302,337.5c-6.341,0-12,5.659-12,12v6
-		c0,0.275,0.225,0.5,0.5,0.5h1c0.274,0,0.5-0.225,0.5-0.5v-6c0-5.238,4.762-9,10-9c5.237,0,10,3.762,10,9v6
-		c0,0.275,0.225,0.5,0.5,0.5h1c0.274,0,0.5-0.225,0.5-0.5v-6C314,343.159,308.341,337.5,302,337.5z"/>
-</g>
-<g id="stroller">
-	<path fill="#FFFFFF" d="M260.504,356.007c-0.111,0-0.456-0.007-0.527-0.007h-2.981l-6.67-7h11.241l3.435-7l-3.435-4L256,336h-4
-		l1.874,8h-8.315L245,343l-3.699-0.954c-0.527-0.163-1.041,0.036-1.207,0.563c-0.166,0.524,0.129,1.053,0.656,1.219l3.188,0.844
-		L245,349h2.561l3.339,3.502l-2.603,2.052c-0.524-0.314-1.133-0.509-1.789-0.509c-1.929,0-3.492,1.563-3.492,3.493
-		s1.563,3.491,3.492,3.491s3.492-1.563,3.492-3.493c0-0.541-0.134-1.048-0.354-1.505l2.633-2.08l3.859,4.049h1.92
-		c-0.033,0-0.051,0.33-0.051,0.502c0,1.379,1.117,2.498,2.496,2.498c1.377,0,2.496-1.118,2.496-2.497
-		S261.881,356.007,260.504,356.007z M246.508,359.029c-0.824,0-1.492-0.67-1.492-1.492c0-0.823,0.668-1.492,1.492-1.492
-		s1.492,0.669,1.492,1.492C248,358.359,247.332,359.029,246.508,359.029z M260.504,359.144c-0.354,0-0.643-0.286-0.643-0.641
-		c0-0.354,0.287-0.642,0.643-0.642c0.354,0,0.641,0.287,0.641,0.642C261.145,358.856,260.857,359.144,260.504,359.144z"/>
-</g>
-<g id="cup">
-	<path fill="#FFFFFF" d="M216,339h-3c0-0.499,0-1.862,0-2h-14c0,0.138,0,1.501,0,2h-3c-0.55,0-1,0.45-1,1c0,2.955,0,6,1.203,8.031
-		c1.646,2.777,4.726,4.106,7.874,3.957c0.431,0.681,0.758,1.36,0.923,2.062V355c0,0.852-0.366,1.511-0.782,2H203v1h-1v3h8v-3h-1v-1
-		h-1.218c-0.416-0.489-0.782-1.148-0.782-2v-1.148c0.136-0.683,0.384-1.312,0.708-1.909c1.27,0.393,3.263-0.179,4.454-0.662
-		c1.394-0.566,2.304-1.395,3.378-2.804c1.08-1.417,1.46-1.965,1.46-8.477C217,339.45,216.55,339,216,339z M198.912,348.312
-		c-2.164-2.201-1.984-4.457-1.943-7.312H199c0,1.761-0.048,2.473,0.589,4.148c0.672,1.771,1.836,3.281,2.986,4.766
-		C200.99,349.723,199.78,349.197,198.912,348.312C199.78,349.197,196.899,346.266,198.912,348.312z M213.111,348.311
-		c-1.024,1.025-2.271,1.49-4.044,1.642c1.127-1.422,2.235-2.648,3.152-4.438S213,342.908,213,341h2.01c0,0.551,0.018,1.496,0.018,2
-		C215.028,345.91,214.137,347.285,213.111,348.311z"/>
-</g>
-<g id="wifi">
-	<path fill="#FFFFFF" d="M165.848,352.984l-1.939,1.938c-1.383-1.391-3.295-2.254-5.405-2.254c-2.093,0-3.992,0.85-5.371,2.22
-		l-1.94-1.938c1.876-1.867,4.46-3.025,7.312-3.025C161.371,349.925,163.969,351.096,165.848,352.984z M158.502,355.436
-		c-1.331,0-2.538,0.538-3.416,1.409l3.45,3.45l3.416-3.416C161.071,355.988,159.851,355.436,158.502,355.436z M143.131,344.891
-		l2.017,2.017c3.424-3.416,8.147-5.531,13.354-5.531c5.225,0,9.961,2.129,13.389,5.564l2.017-2.017
-		c-3.943-3.953-9.395-6.402-15.405-6.402C152.508,338.521,147.072,340.956,143.131,344.891z M158.502,344.14
-		c-4.445,0-8.477,1.807-11.4,4.723l2.134,2.134c2.377-2.368,5.653-3.835,9.267-3.835c3.63,0,6.92,1.479,9.3,3.869l2.133-2.136
-		C167.01,345.959,162.965,344.14,158.502,344.14z"/>
-</g>
-<g id="bookmark">
-	<path fill="#FFFFFF" d="M117.5,337h-14c-0.275,0-0.5,0.225-0.5,0.5v22.875c0,0.274,0.279,0.353,0.475,0.158l7.086-6.283
-		l6.908,6.172c0.194,0.194,0.531,0.156,0.531-0.297V337.5C118,337.225,117.775,337,117.5,337z"/>
-</g>
-<g id="book">
-	<path fill="#FFFFFF" d="M69,337H54.5l-3.5,3.75V361h15c1.649,0,3-1.35,3-3v-14c0-1.65-1.351-3-3-3H53.734l2-2
-		c0,0,11.267,0,12.267,0c2,0,3,1,3,3c0,1,0,16,0,16l2-2v-15C73,339,71,337,69,337z"/>
-</g>
-<g id="umbrella">
-	<path fill="#FFFFFF" d="M13,350.211v8.799c0,0.342-0.012,1.99-2,1.99c-1.579,0-2-1.055-2-1.99v-0.49c0-0.274-0.226-0.504-0.5-0.507
-		h-1c-0.275,0.003-0.5,0.231-0.5,0.507v0.49c0,2.46,1.535,3.99,3.91,3.99c2.811,0,4.09-2.04,4.09-3.99v-8.799
-		c0-0.047-0.492-0.201-1-0.201S13,350.164,13,350.211z"/>
-	<path fill="#FFFFFF" d="M15,337.062v-1.054c0-0.553-0.447-1-1-1c-0.554,0-1,0.447-1,1v1.054c-6.711,0.485-12,6.51-12,13.655h0.046
-		c1.013-2,2.612-2.709,4.418-2.709c1.717,0,3.251,0.813,4.269,2.116c1.019-1.303,2.552-2.308,4.269-2.308s3.25,0.908,4.268,2.213
-		c1.019-1.305,2.552-2.006,4.27-2.006c1.806,0,3.404,0.692,4.418,2.692H27C27,343.572,21.71,337.549,15,337.062z"/>
-</g>
-<g id="gift">
-	<g>
-		<path fill="#FFFFFF" d="M436,305h8v8h-8V305z M448,313h8v-8h-8V313z M458,294.625v2.958c0,0.275-0.226,0.417-0.5,0.417
-			c-0.5,0-1,0-1.5,0v3h-8v-7h-4v7h-8v-3c-0.5,0-1,0-1.5,0c-0.275,0-0.5-0.142-0.5-0.417v-2.958c0-0.275,0.225-0.625,0.5-0.625
-			c0.531,0,1.062,0,1.596,0c-0.094,0,0.712-3.795,0.769-4.037c0.343-1.227,1.591-1.994,2.836-1.644
-			c0.548,0.154,1.113,0.489,1.632,0.726c1.247,0.568,2.495,1.138,3.742,1.707c0.316,0.183,0.584,0.425,0.796,0.708
-			c0.212-0.283,0.479-0.523,0.794-0.705c1.198-0.548,2.397-1.096,3.597-1.644c0.494-0.226,0.982-0.479,1.481-0.689
-			c1.313-0.555,2.765,0.183,3.143,1.543c0.056,0.242,0.859,4.035,0.762,4.035c0.618,0,1.236,0,1.854,0
-			C457.775,294,458,294.35,458,294.625z M443.825,293.597l-4.604-2.765l-0.632,2.887c-0.034,0.121,0.05,0.281,0.164,0.281
-			c1.646,0,4.938,0,4.938,0L443.825,293.597z M453.388,293.705l-0.63-2.907l-4.608,2.788l0.132,0.414c0,0,3.284,0,4.928,0
-			C453.329,294,453.423,293.83,453.388,293.705z"/>
-	</g>
-	<g opacity="0.3">
-		<path fill="#FFFFFF" d="M456,305h-8v8h-4v-8h-8v-4h8v-7h4v7h8V305z"/>
-	</g>
-</g>
-<g id="ruller">
-	<g>
-		<path fill="#FFFFFF" d="M412,295h-1v6h-1v-6h-1v6h-1v-6h-1v10h-1v-10h-1v6h-1v-6h-1v6h-1v-6h-1v6h-1v-6h-1v6h-1v-6h-1v10h-1v-10
-			h-1v6h-1v-6h-1v6h-1v-6h-1v6h-1v-6h-1v6h-1v-6h-1v10h-1v-10h-0.5H385v0.5V306v2.5c0,0.275,0.225,0.5,0.5,0.5h26
-			c0.274,0,0.5-0.225,0.5-0.5V308V295z"/>
-	</g>
-	<g opacity="0.3">
-		<path fill="#FFFFFF" d="M387,305h-1v-10h1V305z M389,295h-1v6h1V295z M391,295h-1v6h1V295z M393,295h-1v6h1V295z M395,295h-1v6h1
-			V295z M397,295h-1v10h1V295z M399,295h-1v6h1V295z M401,295h-1v6h1V295z M403,295h-1v6h1V295z M405,295h-1v6h1V295z M407,295h-1
-			v10h1V295z M409,295h-1v6h1V295z M411,295h-1v6h1V295z"/>
-	</g>
-</g>
-<g id="cleaning">
-	<path fill="#FFFFFF" d="M351,304v-1.938c0,0-1.172-5.062-5.984-5.062c-4.812,0-5.943,4.992-6.016,4.91V304h1v8l1.021,1h7.938
-		l1.042-1v-8H351z M345.016,298.328c3.406,0,4.508,3.672,4.508,3.672h-0.844h-7.357h-0.846
-		C340.477,302,341.609,298.328,345.016,298.328z M352,309h10l1,4h-12L352,309z M362,306.75v1.75h-10v-1.75
-		c0-0.55,0.201-0.75,0.751-0.75H356v-16.25c0-0.553,0.447-1,1-1c0.552,0,1,0.447,1,1V306h2.751C361.301,306,362,306.2,362,306.75z"
-		/>
-</g>
-<g id="tags">
-	<path fill="#FFFFFF" d="M316.289,303.803l-8.878,8.878c-0.193,0.193-0.519,0.111-0.714-0.082l-1.595-1.604l7.19-7.191
-		c0.527-0.526,0.486-0.928,0-1.414L298.894,289h3.005c0.275,0,0.905,0.08,1.064,0.177c0.158,0.097,0.448,0.336,0.643,0.53
-		l12.685,12.682C316.648,302.748,316.71,303.382,316.289,303.803z"/>
-	<path fill="#FFFFFF" d="M297.252,289.354c-0.194-0.194-0.578-0.354-0.854-0.354H287.5c-0.275,0-0.5,0.225-0.5,0.5v8.899
-		c0,0.273,0.159,0.658,0.354,0.854l13.39,13.39c0.194,0.193,0.514,0.193,0.707,0l9.192-9.192c0.193-0.193,0.193-0.512,0-0.707
-		L297.252,289.354z M293.414,295.414c-0.781,0.781-2.047,0.781-2.828,0c-0.781-0.781-0.781-2.047,0-2.828
-		c0.781-0.781,2.047-0.781,2.828,0C294.195,293.367,294.195,294.633,293.414,295.414z"/>
-</g>
-<g id="tag_2_">
-	<path fill="#FFFFFF" d="M252.256,289.354c-0.193-0.194-0.578-0.354-0.854-0.354h-8.897c-0.274,0-0.504,0.225-0.504,0.5v8.899
-		c0,0.273,0.161,0.658,0.354,0.854l13.392,13.39c0.193,0.193,0.514,0.193,0.707,0l9.192-9.192c0.193-0.193,0.194-0.512,0-0.707
-		L252.256,289.354z M248.414,295.414c-0.781,0.781-2.047,0.781-2.828,0c-0.781-0.781-0.781-2.047,0-2.828
-		c0.781-0.781,2.047-0.781,2.828,0C249.195,293.367,249.195,294.633,248.414,295.414z"/>
-</g>
-<g id="lightbulb">
-	<g>
-		<path fill="#FFFFFF" d="M206,287.826c-0.029,0,0,0.005,0,0.005c-0.029,0-0.059-0.005-0.087-0.005
-			c-5.315,0-9.086,3.858-9.086,9.174c0,2.823,1.304,4.528,2.455,6.033c1.118,1.463,2.085,2.727,2.085,4.967
-			c0,0.771,0.227,1.396,0.633,1.836V311c0,0.275,1,1,1,1v0.5c0,0.275,0.214,0.5,0.488,0.5h5c0.275,0,0.512-0.225,0.512-0.5V312
-			c0,0,1-0.725,1-1v-1.335c0.302-0.427,0.47-0.986,0.47-1.665c0-2.24,0.978-3.504,2.097-4.967c1.15-1.505,2.478-3.21,2.478-6.033
-			C215.043,291.685,211.315,287.826,206,287.826z M210.978,301.818c-1.17,1.529-2.475,3.265-2.475,6.182h-2.254h-0.476h-2.405
-			c0-2.917-1.327-4.651-2.497-6.182c-1.098-1.435-2.043-2.672-2.043-4.818c0-4.224,2.949-7.174,7.173-7.174
-			c4,0,7.097,2.95,7.097,7.174C213.097,299.146,212.074,300.385,210.978,301.818z"/>
-	</g>
-	<g opacity="0.3">
-		<path fill="#FFFFFF" d="M206,289.826c-0.417,0-0.818,0.037-1.209,0.093c0.13,0.336,0.209,0.698,0.209,1.081c0,1.656-1.343,3-3,3
-			c-0.841,0-1.601-0.349-2.146-0.907c-0.657,1.098-1.028,2.421-1.028,3.907c0,2.146,0.946,3.385,2.043,4.818
-			c1.17,1.529,2.497,3.265,2.497,6.182h5.135c0-2.917,1.305-4.651,2.475-6.182c1.097-1.435,2.12-2.673,2.12-4.818
-			C213.097,292.776,210,289.826,206,289.826z"/>
-	</g>
-</g>
-<g id="power">
-	<g>
-		<path fill="#FFFFFF" d="M160,297.999c0,0.551-0.45,1.001-1,1.001h-2c-0.55,0-1-0.45-1-1.001v-7.998c0-0.551,0.45-1.001,1-1.001h2
-			c0.55,0,1,0.45,1,1.001V297.999z M163.291,292.938c-0.588-0.344-1.291-0.484-1.291,0.328c0,0.453,0,1.309,0,1.834
-			c0,0.715,0.475,0.888,0.696,1.066c1.706,1.375,2.804,3.477,2.804,5.834c0,4.136-3.364,7.5-7.5,7.5c-4.137,0-7.5-3.364-7.5-7.5
-			c0-2.37,1.106-4.48,2.831-5.856c0.214-0.171,0.669-0.237,0.669-1.053c0-0.512,0-1.255,0-1.763c0-0.844-0.609-0.828-1.373-0.342
-			c-3.067,1.835-5.127,5.187-5.127,9.014c0,5.79,4.711,10.5,10.5,10.5s10.5-4.71,10.5-10.5
-			C168.5,298.139,166.404,294.761,163.291,292.938z"/>
-	</g>
-</g>
-<g id="paperclip">
-	<path fill="#FFFFFF" d="M110.083,312.068c-0.391,0-0.982-0.877-1.238-1.134c-0.096-0.096-0.096-0.258,0-0.354
-		c3.388-3.389,6.776-6.777,10.164-10.166c1.076-1.076,1.859-2.324,1.978-3.884c0.195-2.589-1.561-4.985-4.142-5.451
-		c-3.022-0.545-4.897,1.549-6.798,3.449c-2.209,2.21-4.419,4.42-6.629,6.63c-1.523,1.522-4.203,3.412-3.85,5.844
-		c0.401,2.756,3.819,3.379,5.64,1.56c0.454-0.453,0.907-0.906,1.36-1.36c2.167-2.168,4.334-4.335,6.502-6.503
-		c1.138-1.139,2.273-2.274,3.411-3.411c1.363-1.364-0.385-3.155-1.73-1.805c-0.419,0.36-0.792,0.792-1.184,1.183
-		c-1.712,1.713-5.908,5.924-6.307,6.303c-0.202,0.191-0.662,0.876-0.969,0.569c-0.348-0.347-0.693-0.693-1.04-1.04
-		c-0.097-0.096-0.097-0.258,0-0.354c1.583-1.578,6.725-6.854,8.04-8.06c0.917-0.84,2.062-1.255,3.221-1.036
-		c2.68,0.506,3.185,3.85,1.417,5.618c-0.454,0.454-0.907,0.907-1.361,1.361c-2.167,2.168-4.334,4.335-6.502,6.503
-		c-1.473,1.473-3.074,3.619-4.99,4.552c-2.382,1.159-5.39,0.438-6.794-1.86c-1.303-2.129-0.817-4.937,0.917-6.67
-		c3.516-3.518,7.032-7.034,10.549-10.551c0.694-0.694,1.368-1.39,2.218-1.905c2.078-1.261,4.733-1.461,6.95-0.44
-		c4.665,2.146,5.298,8.385,1.806,11.877c-3.436,3.437-6.872,6.873-10.308,10.31C110.325,311.93,110.222,312.068,110.083,312.068z"/>
-</g>
-<g id="keynote">
-	<g>
-		<path fill="#FFFFFF" d="M72,301v2h-9v8c0,0.553-0.672,1-1.5,1s-1.5-0.447-1.5-1v-8h-8v-2H72z M70,291H55.5
-			c0-2.23,0.437-3.64,1.229-3.968c0.537-0.222,1.324,0.031,2.162,0.663L58.586,288l1.914,1.914l1.414-1.414L60,286.586l-0.399,0.398
-			c-1.184-0.93-2.339-1.257-3.255-0.876c-1.225,0.507-1.846,2.153-1.846,4.892H54l-1.5,9h19L70,291z"/>
-	</g>
-	<g opacity="0.5">
-		<path fill="#FFFFFF" d="M63,307.154V311c0,0.553-0.672,1-1.5,1s-1.5-0.447-1.5-1v-3.846c-2.309,0.476-4,2.016-4,3.846
-			c0,2.209,2.463,4,5.5,4s5.5-1.791,5.5-4C67,309.17,65.308,307.63,63,307.154z"/>
-	</g>
-</g>
-<g id="compass">
-	<path fill="#FFFFFF" d="M16.328,302.666l3.122-6.867c0.113-0.251,0.002-0.363-0.249-0.248l-6.867,3.121
-		c-0.25,0.114-0.548,0.412-0.662,0.662l-3.122,6.867c-0.114,0.251-0.002,0.363,0.249,0.248l6.867-3.121
-		C15.916,303.214,16.214,302.916,16.328,302.666z M13.169,301.831c-0.46-0.459-0.46-1.204,0-1.662
-		c0.458-0.46,1.204-0.46,1.663-0.001s0.459,1.205,0,1.663C14.373,302.291,13.629,302.291,13.169,301.831z M14,313
-		c-6.617,0-12-5.383-12-12s5.383-12,12-12s12,5.383,12,12S20.617,313,14,313z M14,292c-4.963,0-9,4.037-9,9s4.037,9,9,9s9-4.037,9-9
-		S18.963,292,14,292z"/>
-</g>
-<g id="cargo_1_">
-	<g>
-		<rect x="433" y="261" fill="#FFFFFF" width="19" height="3"/>
-	</g>
-	<g>
-		<polygon fill="#FFFFFF" points="452,264 458,258 458,255 452,261 		"/>
-	</g>
-	<g>
-		<rect x="433" y="263" fill="#FFFFFF" width="5" height="2"/>
-	</g>
-	<g>
-		<rect x="441" y="263" fill="#FFFFFF" width="4" height="2"/>
-	</g>
-	<g>
-		<rect x="448" y="263" fill="#FFFFFF" width="4" height="2"/>
-	</g>
-	<g>
-		<g>
-			<polygon fill="#FFFFFF" points="453,262 452,263 452,265 453,264 			"/>
-		</g>
-		<g>
-			<polygon fill="#FFFFFF" points="454,263 456,261 456,259 454,261 			"/>
-		</g>
-		<g>
-			<polygon fill="#FFFFFF" points="457,258 457,260 458,259 458,257 			"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<path fill="#FFFFFF" d="M442.452,243.547C442.922,243.094,444,242,444,242h-7c0,0-1.188,1.188-1.578,1.578
-				c-0.391,0.39-0.422,0.672-0.422,1.125s0,1.297,0,1.297h7c0,0,0-0.703,0-1.312C442,244.234,441.984,244,442.452,243.547z"/>
-		</g>
-		<g>
-			<path fill="#FFFFFF" d="M444,244.688c0,0.438,0,1.312,0,1.312h7l2-2c0,0,0-1.109,0-1.469c0-0.36-0.188-0.531-0.548-0.531
-				c-0.358,0-6.452,0-6.452,0s-1.078,1.078-1.548,1.547C443.984,244.016,444,244.25,444,244.688z"/>
-		</g>
-		<g>
-			<rect x="435" y="247" fill="#FFFFFF" width="7" height="4"/>
-		</g>
-		<g>
-			<polygon fill="#FFFFFF" points="453,249 453,245 451,247 444,247 444,251 451,251 			"/>
-		</g>
-		<g>
-			<path fill="#FFFFFF" d="M447,239c0,0-5.431,0-6.142,0s-0.812-0.047-1.203,0.344C439.265,239.735,438,241,438,241h7L447,239z"/>
-		</g>
-		<g>
-			<polygon fill="#FFFFFF" points="444,256 451,256 453,254 453,250 451,252 444,252 			"/>
-		</g>
-		<g>
-			<rect x="435" y="252" fill="#FFFFFF" width="7" height="4"/>
-		</g>
-		<g>
-			<polygon fill="#FFFFFF" points="454,248 456,246 456,242 454,244 			"/>
-		</g>
-		<g>
-			<path fill="#FFFFFF" d="M449,239l-2,2c0,0,5.25,0,6,0s1,0.333,1,0.979s0,1.021,0,1.021l2-2c0,0,0-0.626,0-1.001
-				c0-0.718-0.25-0.999-1-0.999C454.562,239,449,239,449,239z"/>
-		</g>
-		<g>
-			<polygon fill="#FFFFFF" points="454,253 456,251 456,247 454,249 			"/>
-		</g>
-		<g>
-			<polygon fill="#FFFFFF" points="454,257 456,255 456,252 454,254 			"/>
-		</g>
-		<g>
-			<polygon fill="#FFFFFF" points="451,257 444,257 444,260 451,260 453,258 453,255 			"/>
-		</g>
-		<g>
-			<rect x="435" y="257" fill="#FFFFFF" width="7" height="3"/>
-		</g>
-	</g>
-	<path opacity="0.3" fill="#FFFFFF" enable-background="new    " d="M442,260h2v-3h7l2-2v3l1-1v-3l2-2v-1l-2,2v-4l2-2v-1l-2,2v-4
-		l2-2v-1l-2,2v-1.021c0-0.646-0.25-0.979-1-0.979h-6l2-2h-2l-2,2h-7l-1,1h7c0,0-1.078,1.094-1.548,1.547
-		C441.984,244,442,244.234,442,244.688V246h-7v1h7v4h-7v1h7v4h-7v1h7V260z M444,244.688c0-0.438-0.017-0.672,0.452-1.141
-		c0.066-0.066,0.147-0.147,0.234-0.234L446,242h5.983c0.245,0,0.418,0,0.469,0c0.359,0,0.548,0.172,0.548,0.531
-		c0,0.106,0,0.279,0,0.469v1l-2,2h-7V244.688z M444,247h7l2-2v4l-2,2h-7V247z M444,252h7l2-2v4l-2,2h-7V252z"/>
-</g>
-<g id="truck">
-	<g>
-		<line fill="#FFFFFF" x1="410" y1="245.008" x2="410" y2="246.008"/>
-	</g>
-	<g>
-		<polyline fill="#FFFFFF" points="410,246.008 410,255.007 410,256.008 		"/>
-	</g>
-	<g opacity="0.3">
-		<path fill="#FFFFFF" d="M388,251.219c0,0.275,0.212,0.575,0.472,0.667c0,0,3.165,1.227,9.528,1.227
-			c6.362,0,9.527-1.227,9.527-1.227c0.261-0.092,0.473-0.392,0.473-0.667v-4.711c0-0.275-0.226-0.5-0.5-0.5h-19
-			c-0.275,0-0.5,0.225-0.5,0.5V251.219z M403,257.008h-10v1h10V257.008z M403,255.008h-10v1h10V255.008z"/>
-	</g>
-	<path fill="#FFFFFF" d="M413,246v-0.5c0-0.275-0.226-0.5-0.5-0.5c-0.275,0-2.5,0-2.5,0v-0.575c0-0.633-0.424-1.167-1-1.347V239h-22
-		v4.078c-0.576,0.18-1,0.714-1,1.347V245c0,0-2.226,0-2.5,0c-0.275,0-0.5,0.225-0.5,0.5v0.5c-0.55,0-1,0.458-1,1.008v5
-		c0,0.55,0.45,0.992,1,0.992v0.5c0,0.275,0.225,0.5,0.5,0.5c0.274,0,2.5,0,2.5,0v11.5c0,0.275,0.225,0.5,0.5,0.5h2
-		c0.274,0,0.5-0.225,0.5-0.5V264h18v1.5c0,0.275,0.225,0.5,0.5,0.5h2c0.274,0,0.5-0.225,0.5-0.5V254c0,0,2.225,0,2.5,0
-		c0.274,0,0.5-0.225,0.5-0.5V253c0.55,0,1-0.442,1-0.992v-5C414,246.458,413.55,246,413,246z M409,258.107L408,259h-4v-1.992l5-1
-		V258.107z M388,246.508c0-0.275,0.225-0.508,0.5-0.508h19c0.274,0,0.5,0.232,0.5,0.508v4.711c0,0.275-0.212,0.575-0.473,0.667
-		c0,0-3.165,1.227-9.527,1.227c-6.363,0-9.528-1.227-9.528-1.227c-0.26-0.092-0.472-0.392-0.472-0.667V246.508z M384,253
-		c0.55,0,1-0.442,1-0.992v-5c0-0.55-0.45-1.008-1-1.008c0.235,0,1.764,0,2,0v0.145V253C385.764,253,384.236,253,384,253z M392,261
-		h-3v-1h3V261z M392,259h-4l-1-0.893v-2.1l5,1V259z M401,263h-6v-2h6V263z M403,258h-10v-1h10V258z M403,256h-10v-1h10V256z
-		 M404,261v-1h3v1H404z M412,253c-0.236,0-1.765,0-2,0v-7c0.235,0,1.764,0,2,0c-0.55,0-1,0.458-1,1.008v5
-		C411,252.558,411.45,253,412,253z"/>
-</g>
-<g id="history_1_">
-	<path fill="#FFFFFF" d="M355.205,249.258l-3.269,3.27c0.037,0.153,0.062,0.314,0.062,0.479c0,1.104-0.896,2.006-2,2.006
-		c-0.748,0-1.394-0.512-1.736-1.012H345.5c-0.275,0-0.5-0.249-0.5-0.523v-0.953c0-0.274,0.225-0.523,0.5-0.523h2.764
-		c0.344-0.5,0.988-1.012,1.736-1.012c0.196,0,0.385,0.049,0.564,0.103l3.238-3.237c0.194-0.194,0.513-0.194,0.707,0l0.694,0.696
-		C355.4,248.744,355.4,249.062,355.205,249.258z M361.791,255c0.114-1,0.196-1.334,0.196-2.018c0-6.618-5.383-12.01-12-12.01
-		c-6.616,0-11.993,5.377-11.993,11.996c0,6.615,5.006,11.994,12.006,11.994v-0.002c2-0.006,4.509-0.643,6.526-1.961l0.058-0.039
-		l1.477,2.046c0.162,0.224,0.361,0.188,0.442-0.073l2.205-6.439c0.082-0.263-0.077-0.48-0.354-0.486l-6.835,0.002
-		c-0.275-0.006-0.37,0.174-0.21,0.396l1.516,2.12c-1.495,0.961-2.825,1.424-4.825,1.431v0.008c-5-0.001-9.008-4.03-9.006-9.001
-		c0-4.971,4.026-9,8.998-9c4.97,0,8.997,4.048,8.997,9.02c0,0.688-0.092,1.018-0.239,2.018h3.041V255z"/>
-</g>
-<g id="projector">
-	<g opacity="0.3">
-		<path fill="#FFFFFF" d="M291.279,251c0.35-0.594,0.986-1,1.722-1h9v1H291.279z M302,252h-11v1h11V252z M302,254h-11v1h11V254z
-			 M291.279,256c0.35,0.594,0.986,1,1.722,1h9v-1H291.279z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M313.203,246.021c-1.185-1.242-2.852-2.021-4.703-2.021c-1.842,0-3.502,0.77-4.686,2H291
-			c-1.101,0-2,0.9-2,2v11c0,1.1,0.899,2,2,2v1l1.501,1l1.499-1v-1h16v1l1.501,1l1.499-1v-1c1.1,0,2-0.9,2-2v-11
-			C315,246.97,314.207,246.125,313.203,246.021z M302,257h-9c-0.734,0-1.372-0.406-1.722-1H302V257z M302,255h-11v-1h11V255z
-			 M302,253h-11v-1h11V253z M302,251h-10.722c0.35-0.594,0.986-1,1.722-1h9V251z M308.5,254.9c-2.431,0-4.4-1.971-4.4-4.4
-			s1.971-4.4,4.4-4.4c2.429,0,4.399,1.971,4.399,4.4S310.93,254.9,308.5,254.9z"/>
-	</g>
-	<g opacity="0.5">
-		<g>
-			<path fill="#FFFFFF" d="M308.5,247.1c-0.434,0-0.842,0.089-1.224,0.236c0.375,0.251,0.623,0.678,0.623,1.164
-				c0,0.773-0.627,1.4-1.399,1.4c-0.485,0-0.913-0.248-1.164-0.623c-0.147,0.381-0.236,0.79-0.236,1.223c0,1.877,1.522,3.4,3.4,3.4
-				s3.399-1.523,3.399-3.4S310.378,247.1,308.5,247.1z"/>
-		</g>
-	</g>
-	<g opacity="0.5">
-		<path fill="#FFFFFF" d="M305.108,242.816l-2.729-2.73l0.707-0.707l3.02,3.019C305.761,242.514,305.429,242.654,305.108,242.816z
-			 M311.892,242.816l2.73-2.73l-0.707-0.707l-3.021,3.019C311.239,242.514,311.571,242.654,311.892,242.816z M309,242.025V238h-1
-			v4.025C308.166,242.014,308.834,242.014,309,242.025z M303.412,244H300v1h2.51C302.78,244.64,303.082,244.306,303.412,244z
-			 M313.588,244c0.33,0.306,0.632,0.64,0.902,1H317v-1H313.588z"/>
-	</g>
-</g>
-<g id="stopwatch_1_">
-	<path fill="#FFFFFF" d="M254,242.865c-6.065,0-11,4.935-11,11c0,6.065,4.935,11,11,11c6.064,0,11-4.935,11-11
-		C265,247.8,260.065,242.865,254,242.865z M254,261.865c-4.411,0-8-3.589-8-8c0-4.411,3.589-8,8-8s8,3.589,8,8
-		C262,258.276,258.411,261.865,254,261.865z M256,253.865c0,0.738-0.404,1.376-1,1.723v0.891c0,0.275-0.226,0.521-0.5,0.521h-1
-		c-0.275,0-0.5-0.246-0.5-0.521v-0.891c-0.597-0.347-1-0.984-1-1.723c0-0.739,0.403-1.376,1-1.723V248.5c0-0.275,0.225-0.5,0.5-0.5
-		h1c0.274,0,0.5,0.225,0.5,0.5v3.643C255.596,252.489,256,253.127,256,253.865z M254,240.906c-0.508,0-1.508,0.035-2,0.094v-2.469
-		c0-0.275,0.225-0.531,0.5-0.531h3c0.274,0,0.5,0.256,0.5,0.531V241C255.508,240.941,254.508,240.906,254,240.906z M265.624,244.659
-		l-1.48,1.479c-0.306-0.389-0.636-0.767-0.995-1.126c-0.357-0.358-0.735-0.688-1.126-0.995l1.479-1.479
-		c0.194-0.194,0.514-0.194,0.708,0l1.414,1.414C265.818,244.146,265.818,244.465,265.624,244.659z"/>
-</g>
-<g id="clock_1_">
-	<g id="clock">
-		<path fill="#FFFFFF" d="M206,241c-6.617,0-12,5.383-12,12s5.383,12,12,12s12-5.383,12-12S212.617,241,206,241z M211.205,248.55
-			c0.194,0.194,0.194,0.513,0,0.708l-3.269,3.27c0.037,0.153,0.062,0.314,0.062,0.479c0,1.104-0.896,2.006-2,2.006
-			c-0.748,0-1.394-0.512-1.736-1.012H201.5c-0.275,0-0.5-0.249-0.5-0.523v-0.953c0-0.274,0.225-0.523,0.5-0.523h2.764
-			c0.344-0.5,0.988-1.012,1.736-1.012c0.196,0,0.385,0.049,0.564,0.103l3.238-3.237c0.194-0.194,0.513-0.194,0.707,0L211.205,248.55
-			z M206,262c-4.972,0-9-4.029-9-9s4.028-9,9-9c4.971,0,9,4.029,9,9S210.971,262,206,262z"/>
-	</g>
-</g>
-<g id="alarm">
-	<path fill="#FFFFFF" d="M158,243c-6.065,0-11,4.935-11,11s4.935,11,11,11c6.064,0,11-4.935,11-11S164.065,243,158,243z M158,262
-		c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S162.411,262,158,262z M146.277,247.492l-1.243-1.462
-		c-0.537-0.642-0.452-1.606,0.19-2.145l4.196-3.585c0.642-0.536,1.675-0.41,2.214,0.233l1.462,1.719
-		c-2.745,1.08-5.054,3.039-6.571,5.53L146.277,247.492z M171.074,245.992l-1.562,1.867c-1.502-2.503-3.797-4.477-6.535-5.574
-		l1.45-1.732c0.532-0.646,1.564-0.782,2.21-0.25l4.229,3.546C171.512,244.382,171.605,245.346,171.074,245.992z M160.008,254
-		c0,1.104-0.902,2-2.008,2c-0.738,0-1.376-0.404-1.724-1H154.5c-0.275,0-0.5-0.225-0.5-0.5v-0.952c0-0.274,0.225-0.548,0.5-0.548
-		h1.752c0.175-0.5,0.433-0.562,0.748-0.746l0.001-3.738c0-0.275,0.226-0.516,0.5-0.516h0.981c0.274,0,0.518,0.24,0.518,0.516v3.753
-		C159.5,252.613,160.008,253.256,160.008,254z"/>
-</g>
-<g id="eye_x5F_close">
-	<path fill="#FFFFFF" d="M116.136,250.802c0.063,0.342,0.104,0.691,0.104,1.053c0,1.951-0.937,3.681-2.383,4.772l-1.544,3.949
-		c6.945-1.102,12.814-7.284,12.814-7.284s-2.456-4.301-7.258-6.923L116.136,250.802z M115.909,257.562
-		c1.469-1.455,2.381-3.474,2.381-5.707c0-0.517-0.055-1.021-0.146-1.511c2.108,1.006,3.771,2.176,4.615,2.949
-		C121.635,254.325,119.068,256.289,115.909,257.562z"/>
-	<path fill="#FFFFFF" d="M116.051,241l-1.621,4.044c-1.279-0.354-2.665-0.614-4.171-0.614c-9.844,0-14.868,8.884-14.868,8.884
-		s5.924,6.306,12.911,7.364L106.637,265h2.515l9.387-24H116.051z M109.39,253.657l-0.734,0.734c-0.537-0.342-0.94-0.859-1.178-1.459
-		l0.813-0.812C108.383,252.796,108.797,253.37,109.39,253.657z M98.195,253.291c0.81-0.743,2.275-1.852,4.161-2.83
-		c-0.08,0.453-0.129,0.917-0.129,1.394c0,2.181,0.871,4.154,2.28,5.602C101.59,256.183,99.292,254.296,98.195,253.291z
-		 M109.404,257.768c-2.897-0.415-5.127-2.9-5.127-5.913c0-0.881,0.195-1.714,0.537-2.466c0.998-0.36,2.06-0.656,3.175-0.832
-		c-1.048,0.723-1.736,1.93-1.736,3.298c0,2.177,1.74,3.942,3.902,3.998L109.404,257.768z"/>
-</g>
-<g id="eye_x5F_open">
-	<path fill="#FFFFFF" d="M62.347,244.583c-9.844,0-14.868,8.906-14.868,8.906s7.064,7.469,14.868,7.469s14.868-7.469,14.868-7.469
-		S72.19,244.583,62.347,244.583z M61.478,253.854l-0.733,0.734c-0.538-0.342-0.941-0.859-1.179-1.459l0.813-0.812
-		C60.471,252.993,60.885,253.567,61.478,253.854z M58.34,252.052c0,2.212,1.794,4.009,4.007,4.009s4.007-1.797,4.007-4.009
-		c0-1.37-0.69-2.579-1.742-3.302c1.093,0.167,2.15,0.441,3.154,0.782c0.357,0.767,0.562,1.618,0.562,2.52
-		c0,3.304-2.679,5.981-5.981,5.981s-5.98-2.678-5.98-5.981c0-0.88,0.194-1.714,0.536-2.466c0.998-0.36,2.06-0.656,3.176-0.832
-		C59.029,249.477,58.34,250.684,58.34,252.052z M54.444,250.658c-0.078,0.453-0.129,0.917-0.129,1.394
-		c0,2.181,0.871,4.154,2.28,5.601c-2.918-1.272-5.216-3.159-6.312-4.164C51.092,252.745,52.559,251.637,54.444,250.658z
-		 M67.997,257.759c1.47-1.455,2.381-3.474,2.381-5.707c0-0.517-0.054-1.021-0.146-1.511c2.108,1.006,3.771,2.176,4.615,2.949
-		C73.723,254.522,71.156,256.486,67.997,257.759z"/>
-</g>
-<g id="link_1_">
-	<path fill="#FFFFFF" d="M22.799,250.854l-2.133,2.132c-0.277-0.961-0.798-1.885-1.56-2.683l1.57-1.571
-		c0.562-0.561,0.299-1.52-0.266-2.084l-1.642-1.64c-0.518-0.518-1.357-0.79-1.982-0.165l-5.245,5.244
-		c-0.598,0.598-0.379,1.443,0.146,1.978v-0.001c0.009,0.009,0.017,0.019,0.022,0.025l2.805,2.805l-2.121,2.121l-2.805-2.804
-		l-0.01-0.011c-0.003-0.004-0.005-0.006-0.009-0.01c-0.002-0.001-0.003-0.003-0.005-0.004l0,0c-1.777-1.793-1.844-4.521-0.145-6.221
-		l5.245-5.244c1.698-1.699,4.435-1.627,6.226,0.164l1.642,1.641C24.381,246.374,24.498,249.153,22.799,250.854z M15.236,248.543
-		c-0.004-0.005-0.01-0.009-0.014-0.013l-2.122,2.121c0.005,0.006,0.01,0.009,0.015,0.014l2.7,2.699
-		c0.565,0.566,0.827,1.523,0.267,2.086l-5.244,5.244c-0.566,0.566-1.528,0.307-2.093-0.26l-1.642-1.639
-		c-0.533-0.533-0.758-1.389-0.156-1.99l1.56-1.559c-0.777-0.781-1.302-1.699-1.582-2.661l-2.098,2.098
-		c-1.704,1.704-1.636,4.442,0.155,6.233l1.641,1.64c1.817,1.817,4.661,1.935,6.336,0.259l5.245-5.244
-		c1.698-1.699,1.582-4.479-0.268-6.328L15.236,248.543z"/>
-</g>
-<g id="star">
-	<path fill="#FFFFFF" d="M458.906,202h-9.438l-2.922-9h-0.031l-2.939,9H434l7.757,5.455l-2.913,8.862l-0.031,0.002l7.68-5.565
-		l7.68,5.508l-2.909-8.85L458.906,202z"/>
-</g>
-<g id="dislikes_1_">
-	<path fill="#FFFFFF" d="M410.906,202h-9.438l-2.922-9h-0.031l-2.938,9H386l7.757,5.455l-2.913,8.862l-0.031,0.002l7.681-5.565
-		l7.679,5.508l-2.909-8.85L410.906,202z M398.488,208.278l-3.829,2.77l1.455-4.368l-3.871-2.68h4.784l1.498-4.588l1.489,4.588h4.683
-		l-3.789,2.639l1.472,4.476L398.488,208.278z"/>
-</g>
-<g id="camera_x5F_small_1_">
-	<g>
-		<path fill="#FFFFFF" d="M355.5,193c-3.037,0-5.5,2.461-5.5,5.5c0,1.176,0.372,2.264,1,3.156V203h-1c0-0.55-0.45-1-1-1h-9
-			c-0.55,0-1,0.45-1,1v7c0,0.55,0.45,1,1,1h9c0.55,0,1-0.45,1-1h1v4.165c0,1.56,1.274,2.835,2.834,2.835h3.332
-			c1.559,0,2.834-1.275,2.834-2.835V206v-2.165v-2.179c0.628-0.893,1-1.98,1-3.156C361,195.461,358.537,193,355.5,193z M353,213v-1
-			h1v1H353z M355,215h-1v-1h1V215z M357,215h-1v-1h1V215z M355,213v-1h1v1H355z M358,213h-1v-1h1V213z M355.5,202
-			c-1.935,0-3.5-1.566-3.5-3.5s1.565-3.5,3.5-3.5c1.934,0,3.5,1.566,3.5,3.5S357.434,202,355.5,202z"/>
-	</g>
-	<g opacity="0.5">
-		<path fill="#FFFFFF" d="M358.001,198.5c0,1.38-1.12,2.501-2.501,2.501c-1.304,0-2.359-1.001-2.479-2.271
-			c0.291,0.167,0.622,0.269,0.983,0.269c1.102,0,1.992-0.892,1.992-1.993c0-0.359-0.103-0.691-0.27-0.982
-			C357.002,196.141,358.001,197.199,358.001,198.5z"/>
-	</g>
-</g>
-<g id="router_1_">
-	<g>
-		<path fill="#FFFFFF" d="M313,210h-1h-15v-5l-1-4v-3v-1h-0.003c-0.01,0,0.033-0.484-0.497-0.484c-0.531,0-0.488,0.484-0.497,0.484
-			H295v1v3l-1,4v5h-2h-1c-0.55,0-1,0.45-1,1v1v2c0,1.1,0.899,2,2,2v1h20v-1c1.1,0,2-0.9,2-2v-2v-1C314,210.45,313.55,210,313,210z
-			 M301,213h-1v-1h1V213z M303,213h-1v-1h1V213z M305,213h-1v-1h1V213z M307,213h-1v-1h1V213z M311,214h-2v-2h2V214z"/>
-	</g>
-	<g opacity="0.5">
-		<path fill="#FFFFFF" d="M300.301,193.135l1.414-1.414c1.413,1.519,2.285,3.547,2.285,5.779c0,2.486-1.08,4.721-2.788,6.276
-			l-1.413-1.413c1.346-1.192,2.201-2.928,2.201-4.863C302,195.818,301.353,194.289,300.301,193.135z M289,197.5
-			c0-1.682,0.646-3.211,1.699-4.365l-1.414-1.414c-1.413,1.519-2.285,3.547-2.285,5.779c0,2.486,1.08,4.721,2.788,6.276l1.413-1.413
-			C289.855,201.171,289,199.436,289,197.5z M297.385,197.5c0,0.664-0.348,1.246-0.867,1.582l1.419,1.419
-			c0.876-0.713,1.448-1.786,1.448-3.001c0-0.96-0.363-1.828-0.942-2.507l-1.413,1.413
-			C297.251,196.716,297.385,197.092,297.385,197.5z M293.615,197.5c0-0.408,0.135-0.784,0.355-1.094l-1.413-1.413
-			c-0.579,0.679-0.941,1.547-0.941,2.507c0,1.215,0.571,2.288,1.447,3.001l1.419-1.419
-			C293.963,198.746,293.615,198.164,293.615,197.5z M307,212h-1v1h1V212z M305,212h-1v1h1V212z M303,212h-1v1h1V212z M301,212h-1v1
-			h1V212z"/>
-	</g>
-</g>
-<g id="calendar">
-	<path fill="#FFFFFF" d="M242,200v16c0,0.55,0.45,1,1,1h21c0.55,0,1-0.45,1-1v-16H242z M247,215h-3v-3h3V215z M247,211h-3v-3h3V211z
-		 M247,207h-3v-3h3V207z M251,215h-3v-3h3V215z M251,211h-3v-3h3V211z M251,207h-3v-3h3V207z M255,215h-3v-3h3V215z M255,211h-3v-3
-		h3V211z M255,207h-3v-3h3V207z M259,215h-3v-3h3V215z M259,211h-3v-3h3V211z M259,207h-3v-3h3V207z M263,215h-3v-3h3V215z M263,211
-		h-3v-3h3V211z M263,207h-3v-3h3V207z M265,196v3h-23v-3c0-0.55,0.45-1,1-1h2v-1c0-0.55,0.45-1,1-1h1c0.55,0,1,0.45,1,1v1h11v-1
-		c0-0.55,0.45-1,1-1h1c0.55,0,1,0.45,1,1v1h2C264.55,195,265,195.45,265,196z"/>
-</g>
-<g id="keys">
-	<g>
-		<path fill="#FFFFFF" d="M208.487,192.93l-5.992-0.859c-0.272-0.039-0.721-0.07-0.994-0.07c-0.275,0-0.724,0.031-0.995,0.07
-			l-5.992,0.859c-0.271,0.039-0.44,0.289-0.374,0.556l2.753,11.029c0.066,0.267,0.346,0.485,0.621,0.485H199v11l1.876,2h1.094
-			l0.03-0.029V217h-1v-1h1v-1h-1v-1h1v-1h-1v-1h1v-1h-1v-1h1v-1h-1v-1h1v-1l0.333-2h0.334l0.333,2v9.985l1-0.985v-11h1.486
-			c0.275,0,0.556-0.219,0.621-0.485l2.753-11.029C208.928,193.219,208.76,192.969,208.487,192.93z M201.5,197.938
-			c-1.07,0-1.938-0.867-1.938-1.938s0.867-1.938,1.938-1.938c1.07,0,1.938,0.867,1.938,1.938S202.57,197.938,201.5,197.938z"/>
-	</g>
-	<g opacity="0.5">
-		<polygon fill="#FFFFFF" points="202,207 202,208 201,208 201,209 202,209 202,210 201,210 201,211 202,211 202,212 201,212 
-			201,213 202,213 202,214 201,214 201,215 202,215 202,216 201,216 201,217 202,217 202,218 203,216.985 203,207 202.672,205 
-			202.328,205 		"/>
-	</g>
-	<path fill="#FFFFFF" d="M211.799,204.264l1.34-0.896c0.229-0.153,0.339-0.49,0.246-0.749l-3.043-8.462l-2.481,10.746
-		c-0.233,0.945-0.859,1.645-1.859,1.694v1.034v0.164c0.188,0.131,0.41,0.143,0.61,0.008l1.082-0.759l6.073,9.278l2.762,0.55
-		l0.902-0.608l0.469-2.722L211.799,204.264z"/>
-</g>
-<g id="group">
-	<path fill="#FFFFFF" d="M169,214.148c0,1.054,0,2.5,0,2.5c0,0.146-0.121,0.336-0.269,0.336h-22.465
-		c-0.146,0-0.268-0.19-0.268-0.336c0,0,0-1.446,0-2.5c0-1.053,0.198-1.485,1-1.94c0.644-0.366,4.968-2.851,7-3.724v-3.767
-		c-0.624-0.454-1-1.158-1-2.233c0-2.5,0-2.984,0-2.984c0-2.475,1.5-4.5,4.5-4.5s4.5,2.025,4.5,4.5v2.984
-		c0,1.064-0.376,1.767-1,2.223v3.777c2.156,0.873,6.355,3.357,7,3.724C168.801,212.663,169,213.096,169,214.148z M146.259,210.904
-		l0.139-0.08c2.281-1.301,4.103-2.295,5.451-2.977c-0.624-0.305-1.263-0.583-1.849-0.761v-2.628c1-0.316,1-0.806,1-1.546v-1.783
-		c0-1.722-0.913-3.13-3-3.13s-3,1.408-3,3.13c0,0,0,0.044,0,1.783c0,0.748,0,1.237,1,1.554v2.62c-2,0.607-4.64,2.336-5.088,2.591
-		c-0.558,0.316-0.912,0.617-0.912,1.35s0,1.739,0,1.739c0,0.101,0.084,0.233,0.187,0.233h4.427
-		C144.795,212.178,145.242,211.481,146.259,210.904z M174.088,209.678c-0.449-0.255-3.088-1.983-5.088-2.591v-2.628
-		c1-0.316,1-0.806,1-1.546v-1.783c0-1.722-0.913-3.13-3-3.13s-3,1.408-3,3.13c0,0,0,0.044,0,1.783c0,0.748,0,1.237,1,1.554v2.62
-		c-0.579,0.176-1.209,0.448-1.826,0.749c1.915,0.953,4.201,2.277,5.21,2.861l0.358,0.207c1.016,0.577,1.463,1.273,1.645,2.096h4.427
-		c0.104,0,0.188-0.133,0.188-0.233c0,0,0-1.007,0-1.739S174.645,209.994,174.088,209.678z"/>
-</g>
-<g id="pie_x5F_chart">
-	<g>
-		<path fill="#FFFFFF" d="M98.871,205.035c0-6.162,5.022-11.157,11.185-11.157c3.081,0,5.853,1.249,7.871,3.268l-7.927,7.89v11.157
-			C104,216.192,98.871,211.196,98.871,205.035z"/>
-	</g>
-	<path opacity="0.3" fill="#FFFFFF" enable-background="new    " d="M112.044,205.035l7.888-7.89c4.357,4.357,4.357,11.422,0,15.778
-		L112.044,205.035z"/>
-	<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M111,205.965v11.156c3,0,5.711-1.09,7.89-3.268L111,205.965z"/>
-</g>
-<g id="charts">
-	<path fill="#FFFFFF" d="M73,215v-14.5c0-0.275-0.226-0.5-0.5-0.5h-4c-0.275,0-0.5,0.225-0.5,0.5V215h-1v-21.5
-		c0-0.275-0.226-0.5-0.5-0.5h-4c-0.275,0-0.5,0.225-0.5,0.5V215h-1v-10.5c0-0.275-0.226-0.5-0.5-0.5h-4c-0.275,0-0.5,0.225-0.5,0.5
-		V215h-1v-4.5c0-0.275-0.226-0.5-0.5-0.5h-4c-0.275,0-0.5,0.225-0.5,0.5v0.5v4h-2v2h27v-1v-1H73z"/>
-</g>
-<g id="stats">
-	<g>
-		<path fill="#FFFFFF" d="M25.5,197.021c1.381,0,2.5-1.117,2.5-2.5s-1.119-2.5-2.5-2.5s-2.5,1.117-2.5,2.5
-			c0,0.613,0.229,1.166,0.594,1.601l-3.32,5.033c-0.244-0.08-0.502-0.134-0.772-0.134c-1.381,0-2.5,1.117-2.5,2.5
-			c0,0.105,0.019,0.205,0.031,0.307l-4.654,2.058c-0.458-0.525-1.125-0.864-1.877-0.864c-1.381,0-2.5,1.117-2.5,2.5
-			c0,0.474,0.139,0.911,0.367,1.288L4,213.854V192H3H2v25h1h24v-1v-1H4.992l4.496-5.196c0.311,0.138,0.65,0.217,1.012,0.217
-			c1.381,0,2.5-1.117,2.5-2.5c0-0.089-0.019-0.173-0.026-0.26l4.679-2.068c0.457,0.505,1.112,0.828,1.849,0.828
-			c1.381,0,2.5-1.117,2.5-2.5c0-0.562-0.191-1.076-0.505-1.493l3.363-5.1C25.064,196.982,25.277,197.021,25.5,197.021z"/>
-	</g>
-	<g opacity="0.3">
-		<path fill="#FFFFFF" d="M5.604,212H4v-1h2.471L5.604,212z M7,208H4v-1h3v-3H4v-1h3v-3H4v-1h3v-3H4v-1h3v-3h1v3h3v-3h1v3h3v-3h1v3
-			h3v-3h1v3h3v-0.479c0,0.613,0.229,1.166,0.594,1.601l-0.594,0.9V196h-3v3h1.693l-0.658,1H20v1.084
-			c-0.162-0.036-0.326-0.063-0.5-0.063c-0.172,0-0.338,0.018-0.5,0.051V200h-3v3h1.056C17.02,203.168,17,203.342,17,203.521
-			c0,0.105,0.019,0.205,0.03,0.307L16.64,204H16v0.283l-1,0.441V204h-3v1.531c-0.29-0.222-0.63-0.378-1-0.455V204H8v3h0.056
-			C8.02,207.168,8,207.342,8,207.521c0,0.167,0.037,0.322,0.067,0.479H8v1.232l-1,1.155V208z M16,199h3v-3h-3V199z M12,199h3v-3h-3
-			V199z M12,203h3v-3h-3V203z M8,199h3v-3H8V199z M8,203h3v-3H8V203z M24,192.531V192h-1v2.521
-			C23,193.704,23.396,192.987,24,192.531z M24,199h3v1h-3v3h3v1h-3v3h3v1h-3v3h3v1h-3v3h-1v-3h-3v3h-1v-3h-3v3h-1v-3h-3v3h-1v-3H8v3
-			H7v-2.32L8.454,211H11v-1.03c0.372-0.075,0.708-0.239,1-0.46V211h3v-3h-2.049c0.03-0.155,0.049-0.315,0.049-0.479
-			c0-0.089-0.019-0.173-0.026-0.26l0.59-0.261H15v-0.635l1-0.442V207h3v-1.034c0.162,0.033,0.328,0.055,0.5,0.055
-			s0.338-0.018,0.5-0.051V207h3v-3h-1.049c0.03-0.155,0.049-0.315,0.049-0.479c0-0.18-0.025-0.353-0.062-0.521H23v-3h-0.168
-			L24,198.23V199z M19,208h-3v3h3V208z M23,208h-3v3h3V208z"/>
-	</g>
-</g>
-<g id="notes">
-	<g>
-		<path fill="#FFFFFF" d="M436,168.5c0,0.275,0.225,0.5,0.5,0.5h19c0.274,0,0.5-0.225,0.5-0.5V150h-20V168.5z M453,158h-13v-1h13
-			V158z M440,153h13v1h-13V153z M439,155h10v1h-10V155z M439,159h14v1h-14V159z M439,161h14v1h-14V161z M439,163h14v1h-14V163z
-			 M439,165h5v1h-5V165z"/>
-		<path fill="#FFFFFF" d="M455,144c-0.554,0-1,0.447-1,1h-1c0-0.553-0.447-1-1-1c-0.554,0-1,0.447-1,1h-1c0-0.553-0.447-1-1-1
-			c-0.554,0-1,0.447-1,1h-1c0-0.553-0.447-1-1-1c-0.554,0-1,0.447-1,1h-1c0-0.553-0.447-1-1-1c-0.554,0-1,0.447-1,1h-1
-			c0-0.553-0.447-1-1-1c-0.554,0-1,0.447-1,1h-1c0-0.553-0.447-1-1-1c-0.554,0-1,0.447-1,1v4h20v-4C456,144.447,455.553,144,455,144
-			z"/>
-	</g>
-</g>
-<g id="airplane">
-	<path fill="#FFFFFF" d="M409.619,162.115L401,154.918v-6.979c0-1.451-1-2.938-2.966-2.938c-1.967,0-3.034,1.486-3.034,2.937v6.979
-		l-8.619,7.197c-0.21,0.178-0.381,0.549-0.381,0.823v1.709c0,0.275,0.199,0.396,0.441,0.268l9.559-4.977v6l-2.605,2.11
-		c-0.217,0.168-0.395,0.531-0.395,0.806v0.755c0,0.274,0.216,0.437,0.479,0.359l3.521-1.03c0.265-0.077,1.734-0.077,2,0l3.52,1.03
-		c0.266,0.077,0.48-0.085,0.48-0.359v-0.755c0-0.274-0.179-0.638-0.396-0.807L400,165.938v-6l9.557,4.967
-		c0.244,0.127,0.443,0.007,0.443-0.269v-1.698C410,162.664,409.828,162.293,409.619,162.115z"/>
-</g>
-<g id="coins">
-	<g>
-		<path fill="#FFFFFF" d="M353.971,168.974c-1.061,0-2.116-0.197-3.109-0.566c-1.148,0.294-2.327,0.474-3.512,0.55
-			c-2.146,0.139-4.325-0.055-6.407-0.601c-1.266-0.332-2.894-0.837-3.604-2.037c-0.482-0.812-0.271-2.029-0.271-2.932
-			c0-0.515,0.223-1.008,0.725-1.469c-0.502-0.464-0.791-0.957-0.791-1.471v-1.959c0-0.689,0.471-1.352,1.344-1.921
-			c-0.234-0.33-0.344-0.673-0.344-1.02v-1.96c0-0.689,0.471-1.35,1.345-1.92c-0.235-0.331-0.345-0.673-0.345-1.021v-1.959
-			c0-1.978,3.018-2.817,4.503-3.164c2.379-0.556,4.952-0.601,7.37-0.296c1.851,0.233,4.354,0.712,5.664,2.199
-			c0.754,0.856,0.519,2.163,0.519,3.22c0,0.27-0.105,0.515-0.242,0.746c4.096,1.339,6.736,5.683,6.089,9.934
-			C362.245,165.642,358.327,168.974,353.971,168.974z M353.957,152.902c-0.879,0-1.753,0.182-2.574,0.49
-			c-3.83,1.535-5.543,6.074-3.714,9.754c1.009,2.009,3.044,3.499,5.282,3.788c4.041,0.686,7.926-2.677,8.055-6.722
-			C361.13,156.315,357.864,152.902,353.957,152.902z M338.433,163.422c0.303,1.075,2.475,1.479,3.375,1.692
-			c1.843,0.438,3.635,0.339,5.503,0.411c-0.381-0.447-0.748-0.923-1.021-1.443c-2.381-0.117-6.394-0.655-6.863-1.359l-0.109-0.169
-			C338.46,162.833,338.433,163.422,338.433,163.422z M338.433,158.521c0.243,0.854,1.955,1.297,2.651,1.499
-			c1.394,0.405,2.837,0.557,4.282,0.615c-0.041-0.643-0.021-1.271,0.06-1.909c-1.868-0.137-3.873-0.441-5.538-1.353
-			c-0.442,0.191-1.293,0.512-1.453,1.038l-0.018,0.056L338.433,158.521z M339.412,153.622c0.292,1.026,2.4,1.444,3.252,1.649
-			c1.243,0.299,2.51,0.417,3.782,0.464c0.383-0.681,0.867-1.281,1.393-1.854c-2.343-0.038-5.879-0.892-6.972-1.407
-			C339.788,152.896,339.412,153.622,339.412,153.622z M340.394,148.722c0.287,1.026,2.402,1.445,3.25,1.65
-			c1.406,0.339,2.86,0.466,4.306,0.469c1.684,0.004,3.327-0.218,4.955-0.643c0.825-0.216,2.319-0.52,2.585-1.486l-0.016-0.055
-			c-0.245-0.878-1.837-1.255-2.583-1.482c-1.602-0.489-3.289-0.642-4.957-0.642c-1.709,0-3.437,0.161-5.075,0.669
-			c-0.79,0.245-2.209,0.558-2.479,1.465L340.394,148.722z"/>
-	</g>
-</g>
-<g id="file_1_">
-	<path fill="#FFFFFF" d="M312,152v16.5c0,0.275-0.226,0.5-0.5,0.5h-18c-0.275,0-0.5-0.225-0.5-0.5v-23c0-0.275,0.225-0.5,0.5-0.5
-		H305v6.5c0,0.275,0.225,0.5,0.5,0.5H312z M306,145v5.5c0,0.275,0.225,0.5,0.5,0.5h5.5L306,145z"/>
-</g>
-<g id="woman_1_">
-	<path id="woman" fill="#FFFFFF" d="M263.875,164.618c-0.74-0.421-4.875-1.719-6.875-2.724c0,0,0-1.677,0-2.301
-		c2-0.144,3.715-1.307,4.382-2.031s-0.634-1.418-1.62-2.568c-0.985-1.15-1.174-2.129-1.174-4.43c0-2.15-1.774-4.522-4.587-4.558
-		c-2.813,0.035-4.587,2.407-4.587,4.558c0,2.301-0.189,3.279-1.175,4.43c-0.985,1.15-2.286,1.845-1.619,2.568
-		c0.667,0.725,2.382,1.888,4.382,2.031c0,0.624,0,2.301,0,2.301c-2,1.005-6.135,2.303-6.875,2.724
-		c-0.683,0.386-1.125,0.866-1.125,1.656v1.226c0,0.275,0.225,0.5,0.5,0.5h21c0.274,0,0.5-0.225,0.5-0.5v-1.226
-		C265,165.484,264.557,165.004,263.875,164.618z"/>
-</g>
-<g id="old_x5F_man">
-	<path fill="#FFFFFF" d="M217,163.169c-0.645-0.366-4.843-2.851-7-3.724v-2.503c0.624-0.456,1-1.158,1-2.223v-1.648
-		c1.189-0.456,1.979-0.989,1.979-1.193c0-0.41-0.242-0.878-0.539-0.878h-1.126l-1.462-6.676c0.035-0.323-0.166-0.404-0.447-0.301
-		l-2.393,0.755c-0.281,0.104-0.742,0.099-1.023-0.006l-2.393-0.681c-0.281-0.104-0.484,0.003-0.449,0.328l-1.458,6.58h-1.128
-		c-0.297,0-0.539,0.468-0.539,0.878c0,0.204,0.789,0.737,1.979,1.193c0,0.418,0,0.947,0,1.648c0,1.075,0.376,1.779,1,2.233v2.492
-		c-2.032,0.873-6.356,3.357-7,3.724c-0.801,0.455-1,0.888-1,1.94c0,0.621,0,2.391,0,2.391c0,0.275,0.225,0.5,0.5,0.5h22
-		c0.274,0,0.5-0.225,0.5-0.5c0,0,0-1.77,0-2.391C218,164.057,217.801,163.624,217,163.169z"/>
-</g>
-<g id="luggage">
-	<g opacity="0.5">
-		<path fill="#FFFFFF" d="M151,155c-0.542,0-1-0.458-1-1v-2c0-0.542,0.458-1,1-1h14c0.542,0,1,0.458,1,1v2c0,0.542-0.458,1-1,1H151z
-			 M165,167c0.542,0,1-0.458,1-1v-8c0-0.542-0.458-1-1-1h-14c-0.542,0-1,0.458-1,1v8c0,0.542,0.458,1,1,1H165z"/>
-	</g>
-	<path fill="#FFFFFF" d="M165,149h-4v-4h0.5c0.275,0,0.5-0.224,0.5-0.5v-1c0-0.276-0.225-0.5-0.5-0.5h-7c-0.276,0-0.5,0.224-0.5,0.5
-		v1c0,0.276,0.224,0.5,0.5,0.5h0.5v4h-4c-1.65,0-3,1.35-3,3v14c0,1.65,1.35,3,3,3h1c0,0.553,0.446,1,1,1c0.553,0,1-0.447,1-1h8
-		c0,0.553,0.446,1,1,1c0.553,0,1-0.447,1-1h1c1.649,0,3-1.35,3-3v-14C168,150.35,166.65,149,165,149z M159,145v4h-2v-4H159z
-		 M166,166c0,0.542-0.458,1-1,1h-14c-0.542,0-1-0.458-1-1v-8c0-0.542,0.458-1,1-1h14c0.542,0,1,0.458,1,1V166z M166,154
-		c0,0.542-0.458,1-1,1h-14c-0.542,0-1-0.458-1-1v-2c0-0.542,0.458-1,1-1h14c0.542,0,1,0.458,1,1V154z"/>
-</g>
-<g id="wifi_x5F_alt">
-	<path fill="#FFFFFF" d="M112.508,153.023c0-1.385-1.123-2.508-2.508-2.508c-1.386,0-2.508,1.123-2.508,2.508
-		c0,1.107,0.723,2.036,1.718,2.368L108,169h4l-1.21-13.608C111.786,155.06,112.508,154.131,112.508,153.023z"/>
-	<path fill="#FFFFFF" d="M102.331,145.152l-1.414-1.412c-2.413,2.361-3.917,5.648-3.917,9.283c0,3.635,1.504,6.922,3.917,9.283
-		l1.414-1.412c-2.053-2-3.331-4.787-3.331-7.871S100.279,147.152,102.331,145.152z"/>
-	<path fill="#FFFFFF" d="M104.558,147.379c-1.482,1.43-2.415,3.426-2.415,5.645c0,2.217,0.933,4.215,2.414,5.645l1.414-1.414
-		c-1.121-1.066-1.828-2.564-1.828-4.23s0.708-3.162,1.828-4.23L104.558,147.379z"/>
-	<path fill="#FFFFFF" d="M119.083,143.74l-1.414,1.412c2.052,2,3.331,4.787,3.331,7.871s-1.279,5.871-3.331,7.871l1.414,1.412
-		c2.413-2.361,3.917-5.648,3.917-9.283C123,149.388,121.496,146.102,119.083,143.74z"/>
-	<path fill="#FFFFFF" d="M115.442,147.379l-1.413,1.414c1.12,1.068,1.828,2.564,1.828,4.23s-0.707,3.164-1.828,4.23l1.414,1.414
-		c1.482-1.43,2.414-3.428,2.414-5.645S116.926,148.809,115.442,147.379z"/>
-</g>
-<g id="bus">
-	<g opacity="0.3">
-		<path fill="#FFFFFF" d="M52,148.5c0-0.275,0.225-0.5,0.5-0.5h19c0.274,0,0.5,0.225,0.5,0.5v9.711c0,0.275-0.212,0.575-0.473,0.667
-			c0,0-3.165,1.227-9.527,1.227c-6.363,0-9.528-1.227-9.528-1.227c-0.26-0.092-0.472-0.392-0.472-0.667V148.5z"/>
-	</g>
-	<path fill="#FFFFFF" d="M73.106,146.212l-0.659-1.317C72.201,144.402,71.55,144,71,144H53c-0.55,0-1.201,0.402-1.447,0.895
-		l-0.664,1.329C48.977,146.915,46,148.13,46,149c0,1.281,0,4,0,4c0,0.55,0.517,1,1.065,1h1c0.551,0,0.935-0.45,0.935-1
-		c0,0,0-3.266,0-4c0-0.241,0.429-0.553,1-0.863v9.862V168.5c0,0.275,0.225,0.5,0.5,0.5h2c0.274,0,0.5-0.225,0.5-0.5V167h18v1.5
-		c0,0.275,0.225,0.5,0.5,0.5h2c0.274,0,0.5-0.225,0.5-0.5v-10.501v-9.864c0.57,0.311,1,0.624,1,0.865c0,0.734,0,4,0,4
-		c0,0.55,0.45,1,1,1h1c0.55,0,1-0.45,1-1c0,0,0-2.719,0-4C78,148.125,75.007,146.901,73.106,146.212z M52,148.5
-		c0-0.275,0.225-0.5,0.5-0.5h19c0.274,0,0.5,0.225,0.5,0.5v9.711c0,0.275-0.212,0.575-0.473,0.667c0,0-3.165,1.227-9.527,1.227
-		c-6.363,0-9.528-1.227-9.528-1.227c-0.26-0.092-0.472-0.392-0.472-0.667V148.5z M55,164h-3l-1-0.9V161l4,1V164z M66,166h-7v-2h7
-		V166z M69,164v-2l4-1v2.1l-1,0.9H69z"/>
-</g>
-<g id="pencil">
-	<path fill="#FFFFFF" d="M19.687,147.232l0.51,0.511l3.061,3.061l0.511,0.51l0.51-0.51l1.021-1.02l0.509-0.512
-		c0.281-0.279,0.282-0.738,0-1.021l-3.059-3.059c-0.282-0.282-0.741-0.281-1.021-0.001l-0.511,0.51l-1.021,1.021L19.687,147.232z"/>
-	
-		<rect x="4.995" y="154.039" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 134.9882 257.9352)" fill="#FFFFFF" width="18.158" height="5.771"/>
-	<path fill="#FFFFFF" d="M4.379,162.54l-2.364,6.152c-0.101,0.262,0.03,0.393,0.292,0.292l6.152-2.363L4.379,162.54z"/>
-</g>
-<g id="notes_x5F_2">
-	<g>
-		<path fill="#FFFFFF" d="M440,99v-1.979c0-0.55,0.471-1.021,1.021-1.021H443v-0.916c0-0.55,0.449-1.084,1-1.084h4
-			c0.55,0,1,0.534,1,1.084V96h1.979c0.551,0,1.021,0.472,1.021,1.021V99c0,0.55-0.472,1-1.021,1h-9.957
-			C440.471,100,440,99.55,440,99z M456,97.5v23c0,0.275-0.226,0.5-0.5,0.5h-19c-0.275,0-0.5-0.225-0.5-0.5v-23
-			c0-0.275,0.225-0.5,0.5-0.5h2.5v3c0,0.55,0.449,1,1,1h12c0.55,0,1-0.45,1-1v-3h2.5C455.775,97,456,97.225,456,97.5z M439,108h10
-			v-1h-10V108z M444,117h-5v1h5V117z M453,115h-14v1h14V115z M453,113h-14v1h14V113z M453,111h-14v1h14V111z M453,109h-13v1h13V109z
-			 M453,105h-14v1h14V105z M453,103h-13v1h13V103z"/>
-	</g>
-</g>
-<g id="cars_1_">
-	<path fill="#FFFFFF" d="M416.5,102h-1.9c0,0-0.826-1.809-1.143-2.475c-0.521-1.057-0.816-1.525-2.316-1.525H408h-5.642
-		c-1.312,0-1.799,0.484-2.315,1.525l-0.455,0.896c0.779,0.224,1.6,0.797,1.6,0.797s0.323-0.559,0.439-0.814
-		c0.125-0.22,0.295-0.404,0.606-0.404h9.031c0.312,0,0.482,0.185,0.607,0.404c0.168,0.368,0.688,2.596,0.688,2.596h-10.31l1.5,4
-		h0.938c0.992,0,1.312,0.277,1.312,1.27V111h4v2h-5v1h8v1.5c0,0.275,0.225,0.5,0.5,0.5h2c0.274,0,0.5-0.225,0.5-0.5V105l-0.417-1
-		h0.917c0.275,0,0.5-0.224,0.5-0.5v-1C417,102.224,416.776,102,416.5,102z M415,108l-1,1h-2v-2l3-1.1V108z"/>
-	<g id="cars">
-		<g id="car_1_">
-			<path fill="#FFFFFF" d="M404.5,108h-1.9l-1.643-4.475c-0.566-1.135-1.004-1.525-2.316-1.525H387.36
-				c-1.312,0-1.75,0.391-2.315,1.525L383.4,108H381.5c-0.276,0-0.5,0.224-0.5,0.5v1c0,0.276,0.224,0.5,0.5,0.5h0.917L382,111v11.5
-				c0,0.275,0.225,0.5,0.5,0.5h2c0.274,0,0.5-0.225,0.5-0.5V121h8h8v1.5c0,0.275,0.225,0.5,0.5,0.5h2c0.274,0,0.5-0.225,0.5-0.5V111
-				l-0.417-1h0.917c0.275,0,0.5-0.224,0.5-0.5v-1C405,108.224,404.776,108,404.5,108z M386.627,104.404
-				c0.125-0.22,0.295-0.404,0.606-0.404h11.531c0.312,0,0.482,0.185,0.607,0.404c0.168,0.368,1.188,4.596,1.188,4.596h-15.121
-				C385.439,109,386.459,104.772,386.627,104.404z M387,115h-3l-1-1v-2.1l4,1.1V115z M397,119h-8v-2h8V119z M403,114l-1,1h-3v-2
-				l4-1.1V114z"/>
-			<path opacity="0.3" fill="#FFFFFF" enable-background="new    " d="M386.627,104.404c0.125-0.22,0.295-0.404,0.606-0.404h11.531
-				c0.312,0,0.482,0.185,0.607,0.404c0.168,0.368,1.188,4.596,1.188,4.596h-15.121C385.439,109,386.459,104.772,386.627,104.404z"/>
-		</g>
-	</g>
-	<path opacity="0.3" fill="#FFFFFF" enable-background="new    " d="M402.25,103h10.311c0,0-0.52-2.228-0.688-2.596
-		c-0.125-0.22-0.295-0.404-0.607-0.404H407h-4.767c-0.312,0-0.481,0.185-0.606,0.404c-0.116,0.256-0.439,0.814-0.439,0.814
-		L402.25,103z"/>
-</g>
-<g id="search_1_">
-	<path fill="#FFFFFF" d="M361.602,117.755l-5.878-5.879c0.956-1.481,1.521-3.24,1.521-5.132c0-5.235-4.263-9.494-9.496-9.494
-		c-5.236,0-9.494,4.259-9.494,9.494c0,5.236,4.258,9.495,9.494,9.495c1.891,0,3.648-0.562,5.132-1.519l5.878,5.878
-		c0.195,0.196,0.518,0.196,0.712,0l2.132-2.132C361.799,118.271,361.799,117.951,361.602,117.755z M341.27,106.744
-		c0-3.571,2.906-6.479,6.479-6.479c3.572,0,6.479,2.907,6.479,6.479c0,3.573-2.905,6.479-6.479,6.479
-		C344.176,113.224,341.27,110.317,341.27,106.744z"/>
-</g>
-<g id="road">
-	<path fill="#FFFFFF" d="M305.23,121H316l-8.615-24h-4.166l0.396,6h-3.23l0.407-6h-4.176L288,121h10.77l0.808-9h4.848L305.23,121z
-		 M299.756,110l0.539-6h3.41l0.539,6H299.756z"/>
-</g>
-<g id="binoculars_1_">
-	<g>
-		<g>
-			<rect x="257" y="120" fill="#FFFFFF" width="9" height="1"/>
-		</g>
-		<g>
-			<rect x="242" y="120" fill="#FFFFFF" width="9" height="1"/>
-		</g>
-		<g>
-			<path fill="#FFFFFF" d="M264,109l-3-9h-1v-3l-4,1v2h-1v-1h-2v1h-1v-2l-4-1v3h-1l-3,9l-2,7v3h9v-3l-1-7h8l-1,7v3h9v-3L264,109z
-				 M252,107h-1v-5h1V107z M257,107h-1v-5h1V107z"/>
-		</g>
-	</g>
-	<g opacity="0.5">
-		<path fill="#FFFFFF" d="M257,102v5h-1v-5H257z M251,102v5h1v-5H251z"/>
-	</g>
-</g>
-<g id="parents">
-	<path fill="#FFFFFF" d="M211,115.208c-0.645-0.366-4.843-2.851-7-3.724v-3.777c0.624-0.456,1-1.158,1-2.223V102.5
-		c0-2.475-1.5-4.5-4.5-4.5s-4.5,2.025-4.5,4.5c0,0,0,0.484,0,2.984c0,1.075,0.376,1.779,1,2.233v3.767
-		c-2.032,0.873-6.356,3.357-7,3.724c-0.801,0.455-1,0.888-1,1.94c0,0.43,0,2.352,0,2.352c0,0.275,0.225,0.5,0.5,0.5h22
-		c0.274,0,0.5-0.225,0.5-0.5c0,0,0-1.922,0-2.352C212,116.096,211.801,115.663,211,115.208z M219.982,117.072
-		c-0.639-0.363-2.981-1.483-4.981-2.352c0,0,0-1.448,0-1.987c2-0.124,3.336-1.128,3.912-1.754c0.575-0.625-0.482-1.225-1.334-2.218
-		c-0.852-0.994-0.983-1.839-0.983-3.826c0-1.856-1.516-3.905-3.945-3.936c-2.43,0.03-3.954,2.079-3.954,3.936
-		c0,1.987-0.158,2.832-1.01,3.826c-0.852,0.993-2.011,1.593-1.435,2.218c0.179,0.194,0.424,0.426,0.725,0.655
-		c0.469,0.248,0.941,0.504,1.407,0.763c0.467,0.169,0.998,0.298,1.616,0.336c0,0.143,0,0.124,0,0.35
-		c0.476,0.272,0.921,0.528,1.306,0.747c1.413,0.803,1.694,1.61,1.694,2.888V120h7.542c0.272,0,0.458-0.229,0.458-0.504v-0.993
-		C221,117.82,220.571,117.405,219.982,117.072z"/>
-</g>
-<g id="magnet">
-	<g>
-		<path fill="#FFFFFF" d="M162,105v4.979c0,2.418-1.415,5.021-4.441,5.021c-0.021,0-0.038-0.002-0.059-0.003
-			c-0.021,0.001-0.038,0.003-0.06,0.003c-3.025,0-4.44-2.604-4.44-5.021V105h-6v5c0,6.28,4.534,11,10.44,11
-			c0.021,0,0.039-0.003,0.06-0.003c0.02,0,0.039,0.003,0.059,0.003c5.907,0,10.441-4.72,10.441-11v-5H162z"/>
-	</g>
-	<g opacity="0.5">
-		<path fill="#FFFFFF" d="M167,98h-4c-0.55,0-1,0.45-1,1v4h6v-4C168,98.45,167.55,98,167,98z"/>
-		<path fill="#FFFFFF" d="M152,98h-4c-0.55,0-1,0.45-1,1v4h6v-4C153,98.45,152.55,98,152,98z"/>
-	</g>
-</g>
-<g id="fire">
-	<path fill="#FFFFFF" d="M113.7,101.438c0.246,0.535,2.762,5.678,0.609,5.267s-5.343-6.679-4.939-10.458c0,0-4.072,3.04-3.321,7.51
-		c0.749,4.471,1.814,7.771-1.007,7.661c-2.822-0.11-1.213-3.558-0.625-5.208c-4.708,2.791-4.003,7.464-3.774,9.005
-		c0.191,1.285,0.786,4.286,4,5.5c4.9,1.075,6.821-7.039,6.654-9.761c1.333,1.576,2.2,3.788,2.02,5.246
-		c-0.353,2.857-2.752,5.119-0.449,4.867c3.477-0.381,6.035-2.062,6.99-6.352C120.899,110.037,119.715,104.286,113.7,101.438z"/>
-</g>
-<g id="snowflake_2_">
-	<path fill="#FFFFFF" d="M75,108h-1.586l0.942-0.944c0.912-0.912-0.501-2.327-1.414-1.414L70.586,108h-2.997l-1.06-2.116L68.414,104
-		H72c1.29,0,1.29-2,0-2h-1.586l1.485-1.485c0.912-0.912-0.501-2.327-1.414-1.414L69,100.586V99c0-1.29-2-1.29-2,0v3.586
-		l-1.884,1.884L63,103.411v-2.997l2.356-2.358c0.912-0.912-0.502-2.326-1.414-1.414L63,97.586V96c0-1.29-2-1.29-2,0v1.586
-		l-0.943-0.944c-0.912-0.912-2.326,0.502-1.414,1.414L61,100.414v2.997l-2.115,1.06L57,102.586V99c0-1.29-2-1.29-2,0v1.586
-		l-1.485-1.485c-0.912-0.912-2.326,0.502-1.414,1.414L53.586,102H52c-1.29,0-1.29,2,0,2h3.586l1.885,1.884L56.412,108h-2.998
-		l-2.357-2.358c-0.913-0.913-2.326,0.502-1.414,1.414L50.586,108H49c-1.29,0-1.29,2,0,2h1.586l-0.943,0.944
-		c-0.912,0.911,0.502,2.325,1.414,1.414L53.414,110h2.998l1.059,2.116L55.586,114H52c-1.29,0-1.29,2,0,2h1.586l-1.484,1.485
-		c-0.912,0.911,0.502,2.325,1.414,1.414L55,117.414V119c0,1.29,2,1.29,2,0v-3.586l1.885-1.885L61,114.588v2.998l-2.357,2.358
-		c-0.912,0.912,0.502,2.326,1.414,1.414L61,120.414V122c0,1.29,2,1.29,2,0v-1.586l0.942,0.944c0.912,0.912,2.326-0.502,1.414-1.414
-		L63,117.586v-2.998l2.114-1.059L67,115.414V119c0,1.29,2,1.29,2,0v-1.586l1.484,1.485c0.912,0.912,2.326-0.502,1.414-1.414
-		L70.414,116H72c1.29,0,1.29-2,0-2h-3.586l-1.886-1.885l1.06-2.115h2.998l2.356,2.358c0.911,0.911,2.326-0.502,1.414-1.414
-		L73.414,110H75C76.29,110,76.29,108,75,108z M64.568,111.567L62,112.853l-2.568-1.285L58.147,109l1.284-2.567L62,105.147
-		l2.567,1.283l1.284,2.568L64.568,111.567z"/>
-</g>
-<g id="home">
-	<polygon fill="#FFFFFF" points="22,103.05 22,96 18,96 18,99.082 14.517,95.628 14.515,95.58 1.033,109 5,109 5,121 12,121 12,113 
-		17,113 17,121 24,121 24,109 28,109 	"/>
-</g>
-<g id="heart_x5F_empty_1_">
-	<path id="heart_x5F_empty" fill="#FFFFFF" d="M446.062,53.402c-3.982-6.1-11.781-2.102-11.781,3.523
-		c0,4.338,6.781,8.074,11.781,14.91c5-6.836,11.781-10.572,11.781-14.91C457.844,51.301,450.293,47.303,446.062,53.402z
-		 M446.062,67.833c-1.537-1.776-3.135-3.342-4.55-4.728c-2.55-2.495-4.731-4.632-4.731-6.18c0-2.336,2.174-4.081,4.119-4.081
-		c1.201,0,2.234,0.647,3.068,1.925L446,57.88l2.116-3.053c0.898-1.297,2.013-1.982,3.218-1.982c1.893,0,4.01,1.745,4.01,4.081
-		c0,1.548-2.185,3.685-4.711,6.158C449.197,64.491,447.598,66.057,446.062,67.833z"/>
-</g>
-<g id="note_1_">
-	<path fill="#FFFFFF" d="M403.19,60.532c-0.848,0.339-0.18-0.339-0.18-0.339s1.423-2.092,0.407-3.786
-		c-0.793-1.321-3.418-1.075-4.418-1.669v14.154c0,0.037-0.019,0.07-0.023,0.106c-0.154,1.504-1.606,3.034-3.695,3.712
-		c-2.561,0.829-5.104,0.063-5.679-1.711s1.033-3.887,3.594-4.717c1.166-0.378,2.051-0.32,2.832-0.205
-		c0-0.586,0.012-16.471,0.012-16.471c0-0.335,0.271-0.607,0.606-0.607h1.743c0.336,0,0.61,0.272,0.61,0.607v0.549
-		c2,1.004,6.178,1.955,6.85,4.639C406.654,58.02,404.036,60.193,403.19,60.532z"/>
-</g>
-<g id="music_1_">
-	<path fill="#FFFFFF" d="M360,49.385v0.5v3.384V67h-0.008c-0.058,1-1.271,2.294-3.048,2.87c-2.104,0.682-4.195-0.101-4.67-1.562
-		c-0.473-1.459,0.851-3.274,2.957-3.958c0.98-0.316,1.955-0.424,2.769-0.222v-9.802l-11,2.935V70h-0.008
-		c-0.058,1-1.271,2.292-3.048,2.868c-2.104,0.682-4.195-0.103-4.67-1.563c-0.473-1.459,0.851-3.273,2.957-3.957
-		c0.98-0.317,1.955-0.425,2.769-0.223V57.32v-3.936v-0.04c0-0.275,0.217-0.56,0.481-0.632l14.035-3.696
-		C359.783,48.944,360,49.109,360,49.385z"/>
-</g>
-<g id="bin">
-	<path fill="#FFFFFF" d="M311.5,49H306v-2c0-1.1-0.9-2-2-2h-4c-1.101,0-2,0.9-2,2v2h-5.5c-0.275,0-0.5,0.225-0.5,0.5v1
-		c0,0.275,0.225,0.5,0.5,0.5h19c0.274,0,0.5-0.225,0.5-0.5v-1C312,49.225,311.775,49,311.5,49z M300.042,49H300v-2h4v2H300.042z"/>
-	<path fill="#FFFFFF" d="M310.294,52H293.5c-0.391,0-0.5,0.176-0.5,0.5v20.174c0,0,0.109,0.326,0.5,0.326h16.794
-		c0.39,0,0.706-0.176,0.706-0.5V52.413C311,52.089,310.684,52,310.294,52z M298,69.5c0,0.276-0.225,0.5-0.5,0.5h-1
-		c-0.276,0-0.5-0.224-0.5-0.5v-14c0-0.276,0.224-0.5,0.5-0.5h1c0.275,0,0.5,0.224,0.5,0.5V69.5z M303,69.5
-		c0,0.275-0.226,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5v-14c0-0.275,0.225-0.5,0.5-0.5h1c0.274,0,0.5,0.225,0.5,0.5V69.5z
-		 M308,69.5c0,0.276-0.225,0.5-0.5,0.5h-1c-0.276,0-0.5-0.224-0.5-0.5v-14c0-0.276,0.224-0.5,0.5-0.5h1c0.275,0,0.5,0.224,0.5,0.5
-		V69.5z"/>
-	<path opacity="0.3" fill="#FFFFFF" enable-background="new    " d="M298,69.5c0,0.275-0.226,0.5-0.5,0.5h-1
-		c-0.275,0-0.5-0.225-0.5-0.5v-14c0-0.275,0.225-0.5,0.5-0.5h1c0.274,0,0.5,0.225,0.5,0.5V69.5z M303,69.5
-		c0,0.275-0.226,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5v-14c0-0.275,0.225-0.5,0.5-0.5h1c0.274,0,0.5,0.225,0.5,0.5V69.5z
-		 M308,69.5c0,0.275-0.226,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5v-14c0-0.275,0.225-0.5,0.5-0.5h1c0.274,0,0.5,0.225,0.5,0.5
-		V69.5z"/>
-</g>
-<g id="print">
-	<path fill="#FFFFFF" d="M265.5,56h-3c-0.275,0-0.5,0.225-0.5,0.5v3c0,0.275-0.226,0.5-0.5,0.5h-15.031
-		c-0.275,0-0.469-0.225-0.469-0.5v-3c0-0.275-0.256-0.5-0.531-0.5H242.5c-0.275,0-0.5,0.225-0.5,0.5v13.969
-		c0,0.275,0.225,0.531,0.5,0.531h3.703c0.274,0,0.555-0.234,0.621-0.5l0.383-2.008c0.065-0.266,0.347-0.492,0.621-0.492h12.344
-		c0.273,0,0.555,0.219,0.621,0.484l0.383,2.016c0.066,0.266,0.346,0.5,0.621,0.5h3.703c0.274,0,0.5-0.256,0.5-0.531V56.5
-		C266,56.225,265.775,56,265.5,56z M244,59.021c-0.554,0-1-0.446-1-1c0-0.552,0.446-1,1-1c0.553,0,1,0.448,1,1
-		C245,58.575,244.553,59.021,244,59.021z"/>
-	<path fill="#FFFFFF" d="M259.621,69.484C259.555,69.219,259.275,69,259,69h-10c-0.275,0-0.556,0.219-0.621,0.484l-0.758,3.031
-		C247.555,72.781,247.725,73,248,73h12c0.274,0,0.444-0.219,0.379-0.484L259.621,69.484z"/>
-	<path fill="#FFFFFF" d="M260.947,58.44c0.029,0.273-0.172,0.497-0.446,0.497h-13c-0.275,0-0.478-0.224-0.447-0.497l1.895-8.943
-		C248.977,49.224,249.225,49,249.5,49h9c0.274,0,0.522,0.224,0.553,0.497L260.947,58.44z"/>
-</g>
-<g id="train">
-	<g>
-		<path fill="#FFFFFF" d="M216,65v-4l-1.696-10.033C214.137,49.879,213.1,49,211.999,49h-11.997c-1.102,0-2.139,0.879-2.307,1.967
-			L196,61v4c0,0,1,4,4,4c1,0,1.356,0,1.356,0L196,75h4l3.188-6h5.54L212,75h4l-5.438-6c0,0,0.438,0,1.438,0C215,69,216,65,216,65z
-			 M202,66l-4-1v-3l4,2V66z M206,62.312c-4,0-8-2.312-8-2.312l1.546-8.719c0.018-0.112,0.214-0.281,0.329-0.281h12.296
-			c0.115,0,0.312,0.169,0.329,0.282L214,60C214,60,210,62.312,206,62.312z M210,66v-2l4-2v3L210,66z"/>
-	</g>
-	<g opacity="0.3">
-		<path fill="#FFFFFF" d="M206,62.312c-4,0-8-2.312-8-2.312l1.546-8.719c0.018-0.112,0.214-0.281,0.329-0.281h12.296
-			c0.115,0,0.312,0.169,0.329,0.282L214,60C214,60,210,62.312,206,62.312z"/>
-	</g>
-</g>
-<g id="beach_x5F_umbrella">
-	<path fill="#FFFFFF" d="M157.195,61.602c0.31,0.179,0.569,0.4,0.798,0.641l-6.101,10.565h-2.363l6.687-11.582
-		C156.549,61.3,156.879,61.418,157.195,61.602z M167.85,67.69c-0.197,0.341-0.411,0.666-0.635,0.98
-		c0.1-1.759-0.752-3.507-2.381-4.447c-1.301-0.752-2.801-0.805-4.107-0.311c-0.098-1.644-0.986-3.207-2.519-4.091
-		c-1.519-0.878-3.3-0.878-4.764-0.16c-0.235-1.357-1.028-2.609-2.315-3.352c-1.66-0.959-3.646-0.801-5.129,0.218
-		c0.17-0.38,0.36-0.754,0.573-1.122c3.22-5.576,10.146-7.663,15.866-4.963l0.538-0.932c0.281-0.487,0.91-0.656,1.398-0.376
-		c0.486,0.283,0.656,0.911,0.374,1.4l-0.538,0.932C169.412,55.069,171.068,62.114,167.85,67.69z M161.495,52.043
-		c-1.353-0.611-2.79-0.921-4.274-0.921c-2.53,0-4.969,0.91-6.867,2.562l-0.264,0.229l0.334,0.105
-		c2.174,0.688,3.021,1.224,4.087,3.24l0.159,0.301l0.181-0.288c2.984-4.762,6.53-4.855,6.565-4.855L161.495,52.043z M163.303,53.085
-		l-0.285,0.256c0.019,0.03,1.709,3.148-0.923,8.113l-0.159,0.301l0.34-0.013c0.169-0.007,0.33-0.01,0.485-0.01
-		c1.913,0,2.807,0.506,4.364,1.931l0.258,0.235l0.065-0.343C168.229,59.565,166.6,55.455,163.303,53.085z"/>
-	<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M161.495,52.043c-1.353-0.611-2.79-0.921-4.274-0.921
-		c-2.53,0-4.969,0.91-6.867,2.562l-0.264,0.229l0.334,0.105c2.174,0.688,3.021,1.224,4.087,3.24l0.159,0.301l0.181-0.288
-		c2.984-4.762,6.53-4.855,6.565-4.855L161.495,52.043z"/>
-	<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M163.303,53.085l-0.285,0.256
-		c0.019,0.03,1.709,3.148-0.923,8.113l-0.159,0.301l0.34-0.013c0.169-0.007,0.33-0.01,0.485-0.01c1.913,0,2.807,0.506,4.364,1.931
-		l0.258,0.235l0.065-0.343C168.229,59.565,166.6,55.455,163.303,53.085z"/>
-</g>
-<g id="heart">
-	<path fill="#FFFFFF" d="M110,53.402c-3.982-6.1-11.781-2.102-11.781,3.523C98.219,61.264,105,65,110,71.836
-		c5-6.836,11.78-10.572,11.78-14.91C121.781,51.301,114.23,47.303,110,53.402z"/>
-</g>
-<g id="camera">
-	<g>
-		<circle fill="#FFFFFF" cx="62" cy="63" r="2.75"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M71.599,54h-3.41c-0.013-0.035-0.016-0.069-0.03-0.105l-0.315-0.789C67.379,51.947,65.979,51,64.732,51
-			h-5.465c-1.247,0-2.646,0.947-3.109,2.105l-0.315,0.789c-0.015,0.036-0.018,0.07-0.031,0.105h-3.41C50.531,54,49,55.531,49,57.401
-			v10.197c0,1.871,1.53,3.402,3.4,3.402h19.197C73.469,71,75,69.469,75,67.599V57.401C75,55.531,73.469,54,71.599,54z M62,68.25
-			c-2.896,0-5.25-2.355-5.25-5.25s2.354-5.25,5.25-5.25c2.895,0,5.25,2.355,5.25,5.25S64.895,68.25,62,68.25z M72,58h-2v-1h2V58z"/>
-	</g>
-	<g opacity="0.3">
-		<rect x="70" y="57" fill="#FFFFFF" width="2" height="1"/>
-	</g>
-</g>
-<g id="envelope">
-	<path fill="#FFFFFF" d="M14,65L2,53h24L14,65z M14,67l-5-5l-7,7h24l-7-7L14,67z M20,61l6,6V55L20,61z M2,55v12l6-6L2,55z"/>
-</g>
-<g id="magic">
-	<polygon fill="#FFFFFF" points="454.551,10 453.768,12.666 451.102,13.449 453.768,14.232 454.551,16.898 455.334,14.232 
-		458,13.449 455.334,12.666 	"/>
-	<polygon fill="#FFFFFF" points="449.551,15.102 448.54,18.541 445.102,19.551 448.54,20.561 449.551,24 450.561,20.561 454,19.551 
-		450.561,18.541 	"/>
-	<path fill="#FFFFFF" d="M450.034,6.89l-15.717,15.717c-0.194,0.194-0.194,0.513,0,0.707l1.414,1.414
-		c0.194,0.194,0.513,0.194,0.707,0l15.717-15.717L450.034,6.89z"/>
-	<path fill="#FFFFFF" d="M457.771,3.396c0.194-0.194,0.194-0.513,0-0.707l-1.414-1.414c-0.194-0.194-0.513-0.194-0.707,0
-		l-4.021,4.021l2.121,2.121L457.771,3.396z"/>
-	<polygon fill="#FFFFFF" points="439,9 434.051,7.562 439,6 440.5,1 442,6 446.922,7.516 442,9 440.531,13.984 	"/>
-</g>
-<g id="film">
-	<path fill="#FFFFFF" d="M408,0h-20c-0.55,0-1,0.45-1,1v24c0,0.55,0.45,1,1,1h20c0.55,0,1-0.45,1-1V1C409,0.45,408.55,0,408,0z
-		 M405,20v-2h3v2H405z M408,22v2h-3v-2H408z M405,16v-2h3v2H405z M405,12v-2h3v2H405z M405,8V6h3v2H405z M405,4V2h3v2H405z M392,12
-		V2h12v10H392z M404,14v10h-12V14H404z M388,20v-2h3v2H388z M391,22v2h-3v-2H391z M388,16v-2h3v2H388z M388,12v-2h3v2H388z M388,8V6
-		h3v2H388z M388,4V2h3v2H388z"/>
-	<path opacity="0.3" fill="#FFFFFF" enable-background="new    " d="M404,2h-12v10h12V2z M404,14h-12v10h12V14z"/>
-</g>
-<g id="user_x5F_remove">
-	<path fill="#FFFFFF" d="M336.5,13c-0.275,0-0.5-0.225-0.5-0.5v-1c0-0.275,0.225-0.5,0.5-0.5h7c0.274,0,0.5,0.225,0.5,0.5v1
-		c0,0.275-0.226,0.5-0.5,0.5H336.5z"/>
-	<g id="user_5_">
-		<path id="user_8_" fill="#FFFFFF" d="M361,19.208c-0.645-0.366-4.843-2.851-7-3.724v-3.777c0.624-0.456,1-1.158,1-2.223V6.5
-			c0-2.475-1.5-4.5-4.5-4.5S346,4.025,346,6.5c0,0,0,0.484,0,2.984c0,1.075,0.376,1.779,1,2.233v3.767
-			c-2.032,0.873-6.356,3.357-7,3.724c-0.801,0.455-1,0.888-1,1.94c0,0.43,0,2.352,0,2.352c0,0.275,0.225,0.5,0.5,0.5h22
-			c0.274,0,0.5-0.225,0.5-0.5c0,0,0-1.922,0-2.352C362,20.096,361.801,19.663,361,19.208z"/>
-	</g>
-</g>
-<g id="user_x5F_add">
-	<path fill="#FFFFFF" d="M295.5,11H292V7.5c0-0.275-0.226-0.5-0.5-0.5h-1c-0.275,0-0.5,0.225-0.5,0.5V11h-3.5
-		c-0.275,0-0.5,0.225-0.5,0.5v1c0,0.275,0.225,0.5,0.5,0.5h3.5v3.5c0,0.275,0.225,0.5,0.5,0.5h1c0.274,0,0.5-0.225,0.5-0.5V13h3.5
-		c0.274,0,0.5-0.225,0.5-0.5v-1C296,11.225,295.775,11,295.5,11z"/>
-	<g id="user_3_">
-		<path id="user_4_" fill="#FFFFFF" d="M313,19.208c-0.645-0.366-4.843-2.851-7-3.724v-3.777c0.624-0.456,1-1.158,1-2.223V6.5
-			c0-2.475-1.5-4.5-4.5-4.5S298,4.025,298,6.5c0,0,0,0.484,0,2.984c0,1.075,0.376,1.779,1,2.233v3.767
-			c-2.032,0.873-6.356,3.357-7,3.724c-0.801,0.455-1,0.888-1,1.94c0,0.43,0,2.352,0,2.352c0,0.275,0.225,0.5,0.5,0.5h22
-			c0.274,0,0.5-0.225,0.5-0.5c0,0,0-1.922,0-2.352C314,20.096,313.801,19.663,313,19.208z"/>
-	</g>
-</g>
-<g id="car">
-	<path fill="#FFFFFF" d="M266.5,9h-1.9l-1.643-5.475C262.391,2.391,261.953,2,260.641,2H254h-6.642c-1.312,0-1.75,0.391-2.315,1.525
-		L243.4,9H241.5c-0.276,0-0.5,0.224-0.5,0.5v1c0,0.276,0.224,0.5,0.5,0.5h0.917L242,12v11.5c0,0.275,0.225,0.5,0.5,0.5h2
-		c0.274,0,0.5-0.225,0.5-0.5V22h9h9v1.5c0,0.275,0.225,0.5,0.5,0.5h2c0.274,0,0.5-0.225,0.5-0.5V12l-0.417-1h0.917
-		c0.275,0,0.5-0.224,0.5-0.5v-1C267,9.224,266.776,9,266.5,9z M246.627,4.404C246.752,4.185,246.922,4,247.234,4H254h6.766
-		c0.312,0,0.482,0.185,0.607,0.404C261.542,4.772,262.561,9,262.561,9H254h-8.562C245.439,9,246.458,4.772,246.627,4.404z M247,16
-		h-3l-1-1v-2.1l4,1.1V16z M258,20h-8v-2h8V20z M265,15l-1,1h-3v-2l4-1.1V15z"/>
-	<path opacity="0.3" fill="#FFFFFF" enable-background="new    " d="M246.627,4.404C246.752,4.185,246.922,4,247.234,4h13.531
-		c0.312,0,0.482,0.185,0.607,0.404C261.542,4.772,262.561,9,262.561,9H245.44C245.439,9,246.458,4.772,246.627,4.404z"/>
-</g>
-<g id="girl">
-	<path fill="#FFFFFF" d="M214.464,20.352c-0.735-0.442-3.464-2.479-5.464-3.49v-2.021l2.488-0.924l2.063,3.135l2.303-2.316
-		l-3.479-1.157L211,11V7c-0.292-2.604-2.32-5-5-5c-3,0-5,2.396-5,5v4l-1.371,2.579l-3.478,1.157l2.303,2.316l2.061-3.135L203,14.842
-		v2.021c-2,1.011-4.726,3.048-5.46,3.489c-1.754,1.055-1.531,2.648-1.531,2.648H196v0.5c0,0.275,0.225,0.5,0.5,0.5h19
-		c0.274,0,0.5-0.225,0.5-0.5V23C216,23,216.219,21.406,214.464,20.352z"/>
-</g>
-<g id="user_2_">
-	<path id="user" fill="#FFFFFF" d="M169,19.208c-0.645-0.366-4.843-2.851-7-3.724v-3.777c0.624-0.456,1-1.158,1-2.223V6.5
-		c0-2.475-1.5-4.5-4.5-4.5S154,4.025,154,6.5c0,0,0,0.484,0,2.984c0,1.075,0.376,1.779,1,2.233v3.767
-		c-2.032,0.873-6.356,3.357-7,3.724c-0.801,0.455-1,0.888-1,1.94c0,0.43,0,2.352,0,2.352c0,0.275,0.225,0.5,0.5,0.5h22
-		c0.274,0,0.5-0.225,0.5-0.5c0,0,0-1.922,0-2.352C170,20.096,169.801,19.663,169,19.208z"/>
-</g>
-<g id="dog_1_">
-	<path id="dog" fill="#FFFFFF" d="M123.766,7.922l-3.153,2.098c-0.222,0.161-0.576,0.149-0.788-0.025l-0.68-0.563
-		c-0.211-0.176-0.543-0.16-0.737,0.034l-1.07,1.07c-0.194,0.195-0.513,0.195-0.707,0l-3.79-4.105c-0.194-0.193-0.194-0.512,0-0.707
-		l5.239-5.242C118.548-0.017,119-0.085,119,0.497V2c0.008,0.275,0.013,0.543,0.21,0.735l4.648,4.577
-		C124.056,7.504,123.987,7.761,123.766,7.922z M115.595,11.621l-3.843-4.105c-0.194-0.193-0.514-0.193-0.707,0
-		c0,0-0.312,0.484-1.233,0.484h-7.399c0,0-0.742,0.023-1.351-0.363c-0.607-0.386-2.246-1.584-2.246-1.584
-		c-0.25-0.113-0.456-0.225-0.675-0.006c-0.219,0.219-0.157,0.539,0.047,0.723l1.944,2.483c0.204,0.185,0.24,0.522,0.08,0.747
-		l-1.915,2.654C98.137,12.878,98,13.287,98,13.562V24c0,0.55,0.45,1,1,1h1c0.55,0,1-0.45,1-1c0,0,0-4.155,0-5.029l2.104-3.69
-		c0.204-0.184,0.623-0.308,0.896-0.275l8.578,1.8c0.272,0.033,0.422,0.285,0.422,0.561V24c0,0.55,0.45,1,1,1h1c0.55,0,1-0.45,1-1
-		V12.477C116,12.201,115.789,11.816,115.595,11.621z"/>
-</g>
-<g id="leaf_2_">
-	<path id="leaf_1_" fill="#FFFFFF" d="M55.796,8.48c-3.829,4.913-2.21,9.577-1.983,11.706L50,24.021v1.414l4.377-4.4
-		C57,21,73.985,27.057,73.985,1C64.201,3.838,59.625,3.567,55.796,8.48z M63.062,13.216c-2.311,1.242-5.834,3.43-6.967,4.972
-		c-1.135,1.542-1.963,3.217-0.463-0.334c1.502-3.551,5.756-6.145,8.979-7.863c2.478-1.321,4.736-2.46,6.41-4.925
-		c1.676-2.465,0.496,0.286,0.496,0.286C69.32,9.857,66.281,11.489,63.062,13.216z"/>
-</g>
-<g id="glass_2_">
-	<path id="glass_1_" fill="#FFFFFF" d="M15,13.888l10.5-12.88H2.656L13,13.813v8.347l-7,2.332v0.5h16v-0.5l-7-2.332V13.888z
-		 M8.959,3.007L13,12.001L5.959,3.007H8.959z"/>
-</g>
-</svg>
diff --git a/openQRM-5.3.50-CE/src/web/base/img/glyphicons/glyphicons.png b/openQRM-5.3.50-CE/src/web/base/img/glyphicons/glyphicons.png
deleted file mode 100644
index 68fe6a5..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/glyphicons/glyphicons.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/glyphicons/glyphicons.svg b/openQRM-5.3.50-CE/src/web/base/img/glyphicons/glyphicons.svg
deleted file mode 100644
index a05dbd2..0000000
--- a/openQRM-5.3.50-CE/src/web/base/img/glyphicons/glyphicons.svg
+++ /dev/null
@@ -1,4157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="glyphicons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="463px" height="1993px" viewBox="0 0 463 1993" enable-background="new 0 0 463 1993" xml:space="preserve">
-<g id="e-mail_2_">
-	<path d="M446.195,1978.243c-0.541,0-1.002,0.342-1.41,1.046c-0.422,0.727-0.636,1.438-0.636,2.115c0,0.385,0.086,0.695,0.255,0.924
-		c0.159,0.214,0.38,0.317,0.676,0.317c0.54,0,1-0.442,1.368-1.314c0.392-0.928,0.59-1.662,0.59-2.183
-		c0-0.265-0.075-0.479-0.231-0.654C446.656,1978.325,446.456,1978.243,446.195,1978.243z"/>
-	<path d="M455.5,1969h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C458,1970.125,456.875,1969,455.5,1969z M448.688,1982.438c0.082,0.108,0.215,0.16,0.407,0.16c0.44,0,0.9-0.308,1.368-0.915
-		c0.48-0.625,0.724-1.473,0.724-2.519c0-1.554-0.647-2.638-1.979-3.314c-0.841-0.432-1.802-0.649-2.855-0.649
-		c-1.938,0-3.516,0.599-4.688,1.78c-1.053,1.065-1.587,2.36-1.587,3.848c0,1.65,0.623,2.976,1.853,3.938
-		c1.097,0.858,2.457,1.293,4.043,1.293c1.087,0,2.117-0.202,3.062-0.603c0.515-0.212,1.055-0.517,1.608-0.907l0.381-0.272l0.86,1.32
-		l-0.146,0.113c-0.851,0.659-1.785,1.168-2.777,1.512c-0.993,0.346-2.037,0.521-3.104,0.521c-2.496,0-4.459-0.791-5.837-2.35
-		c-1.143-1.293-1.722-2.847-1.722-4.617c0-1.981,0.724-3.685,2.149-5.062c1.494-1.451,3.431-2.188,5.756-2.188
-		c1.896,0,3.49,0.506,4.74,1.503c1.33,1.062,2.005,2.49,2.005,4.243c0,1.38-0.427,2.582-1.269,3.574
-		c-0.85,1.001-1.839,1.508-2.939,1.508c-0.597,0-1.066-0.176-1.396-0.521c-0.225-0.235-0.373-0.48-0.444-0.732
-		c-0.142,0.196-0.292,0.368-0.449,0.512c-0.535,0.487-1.188,0.734-1.938,0.734c-0.77,0-1.418-0.281-1.93-0.835
-		c-0.508-0.547-0.766-1.315-0.766-2.284c0-1.107,0.381-2.158,1.13-3.122c0.763-0.979,1.715-1.475,2.83-1.475
-		c0.672,0,1.205,0.192,1.584,0.571c0.127,0.13,0.238,0.356,0.331,0.495l0.215-0.697h2.089l-1.205,4.066
-		c-0.068,0.24-0.121,0.405-0.159,0.559c0,0-0.08,0.338-0.08,0.438C448.554,1982.202,448.599,1982.319,448.688,1982.438z"/>
-</g>
-<g id="skype_1_">
-	<path d="M410,1971.5v19c0,1.375-1.125,2.5-2.5,2.5h-19c-1.375,0-2.5-1.125-2.5-2.5v-19c0-1.375,1.125-2.5,2.5-2.5h19
-		C408.875,1969,410,1970.125,410,1971.5z M407.221,1984.488c0.002-1.017-0.297-1.962-0.811-2.757
-		c0.029-0.282,0.045-0.568,0.045-0.858c0.012-4.656-3.755-8.44-8.412-8.451c-0.431-0.001-0.851,0.04-1.264,0.102
-		c-0.777-0.502-1.699-0.797-2.691-0.8c-2.756-0.007-4.996,2.223-5.002,4.979c-0.002,0.912,0.244,1.766,0.67,2.503
-		c-0.104,0.527-0.162,1.07-0.164,1.628c-0.012,4.656,3.755,8.44,8.411,8.452c0.674,0.002,1.327-0.085,1.956-0.232
-		c0.659,0.315,1.395,0.498,2.174,0.5C404.936,1989.559,407.213,1987.292,407.221,1984.488z M402.146,1981.391
-		c-0.576-1.113-1.856-1.521-2.983-1.829c-0.874-0.239-3.352-0.492-2.97-1.916c0.296-1.104,2.124-1.233,2.958-0.786
-		c0.77,0.412,1.159,2.49,2.347,1.72c1.097-0.712,0.105-2.204-0.639-2.735c-1.043-0.744-2.452-0.847-3.684-0.669
-		c-1.146,0.166-2.321,0.707-2.801,1.829c-0.502,1.175-0.13,2.543,0.902,3.285c0.985,0.709,2.26,0.866,3.398,1.188
-		c0.972,0.273,2.189,1.072,1.41,2.234c-0.603,0.897-2.159,1.088-3.073,0.618c-0.941-0.486-1.087-2.565-2.353-2.249
-		c-1.339,0.334-0.463,2.136,0.086,2.761c0.868,0.987,2.186,1.296,3.453,1.296C400.618,1986.137,403.565,1984.158,402.146,1981.391
-		C401.953,1981.019,402.336,1981.762,402.146,1981.391z"/>
-</g>
-<g id="rss_1_">
-	<path d="M359.5,1969h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C362,1970.125,360.875,1969,359.5,1969z M344.182,1988.98c-1.205,0-2.182-0.976-2.182-2.181c0-1.204,0.977-2.181,2.182-2.181
-		c1.203,0,2.182,0.977,2.182,2.181C346.363,1988.005,345.385,1988.98,344.182,1988.98z M349.653,1989
-		c0-2.057-0.798-3.994-2.243-5.447c-1.443-1.451-3.354-2.251-5.41-2.251v-3.149c5.826,0,10.803,5.021,10.803,10.848H349.653z
-		 M355.217,1989c0-7.323-6.02-13.281-13.217-13.281v-3.148c8.91,0,16.365,7.37,16.365,16.43H355.217z"/>
-</g>
-<g id="last_x5F_fm_2_">
-	<path d="M311.5,1969h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C314,1970.125,312.875,1969,311.5,1969z M307.354,1986.256c-1.807-0.008-2.957-0.823-3.739-2.646l-0.196-0.436l-1.702-3.88
-		c-0.536-1.305-1.885-2.179-3.36-2.179c-2.024,0-3.671,1.646-3.671,3.671c0,2.025,1.646,3.673,3.671,3.673
-		c1.372,0,2.62-0.756,3.256-1.972l0.194-0.371l0.902,2.083l-0.077,0.095c-1.055,1.285-2.613,2.022-4.276,2.022
-		c-3.049,0-5.53-2.481-5.53-5.53s2.481-5.53,5.53-5.53c2.307,0,4.169,1.242,5.109,3.408l0.073,0.172
-		c0.24,0.561,0.997,2.328,1.671,3.863c0.469,1.066,0.84,1.717,2.056,1.758c0.001,0,0.003,0,0.005,0c1.2,0,2.002-0.658,2.002-1.564
-		c0-0.819-0.493-1.016-1.709-1.421c-2.09-0.688-3.3-1.437-3.3-3.221c0-1.755,1.21-2.889,3.081-2.889c1.229,0,2.129,0.54,2.754,1.65
-		l0.103,0.181l-1.479,0.756l-0.101-0.141c-0.377-0.528-0.778-0.754-1.342-0.754c-0.716,0-1.235,0.486-1.235,1.157
-		c0,0.79,0.571,1.005,1.761,1.378l0.461,0.146c1.804,0.589,2.849,1.301,2.849,3.2
-		C311.116,1984.829,309.499,1986.256,307.354,1986.256z"/>
-</g>
-<g id="flickr_2_">
-	<g>
-		<path d="M263.5,1969h-19c-1.381,0-2.5,1.119-2.5,2.5v19c0,1.381,1.119,2.5,2.5,2.5h19c1.381,0,2.5-1.119,2.5-2.5v-19
-			C266,1970.119,264.881,1969,263.5,1969z M249.5,1984.25c-1.934,0-3.5-1.566-3.5-3.5s1.566-3.5,3.5-3.5s3.5,1.566,3.5,3.5
-			S251.434,1984.25,249.5,1984.25z M258.5,1984.25c-1.934,0-3.5-1.566-3.5-3.5s1.566-3.5,3.5-3.5s3.5,1.566,3.5,3.5
-			S260.434,1984.25,258.5,1984.25z"/>
-	</g>
-	<g opacity="0.3">
-		<circle cx="249.5" cy="1980.75" r="3.5"/>
-	</g>
-</g>
-<g id="vimeo_1_">
-	<path d="M215.5,1969h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C218,1970.125,216.875,1969,215.5,1969z M210.372,1983.898c-2.187,2.835-4.036,4.252-5.55,4.252c-0.937,0-1.729-0.865-2.377-2.594
-		c-0.434-1.586-0.865-3.172-1.299-4.758c-0.48-1.729-0.997-2.594-1.549-2.594c-0.12,0-0.541,0.252-1.262,0.757l-0.756-0.973
-		c0.793-0.696,1.572-1.394,2.341-2.091c1.058-0.913,1.851-1.393,2.38-1.441c1.248-0.119,2.017,0.733,2.306,2.56
-		c0.312,1.97,0.527,3.194,0.649,3.675c0.359,1.634,0.756,2.45,1.188,2.45c0.337,0,0.84-0.528,1.513-1.585
-		c0.674-1.058,1.033-1.861,1.082-2.414c0.096-0.913-0.266-1.37-1.082-1.37c-0.384,0-0.781,0.085-1.189,0.253
-		c0.793-2.57,2.307-3.82,4.541-3.748c1.658,0.048,2.438,1.117,2.342,3.207C213.579,1979.046,212.486,1981.184,210.372,1983.898z"/>
-</g>
-<g id="posterous_x5F_spaces">
-	<path d="M167.5,1969h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C170,1970.125,168.875,1969,167.5,1969z M157,1989c0,0.553-0.448,1-1,1h-6c-0.552,0-1-0.447-1-1v-6c0-0.553,0.448-1,1-1h6
-		c0.552,0,1,0.447,1,1V1989z M157,1979c0,0.553-0.448,1-1,1h-6c-0.552,0-1-0.447-1-1v-6c0-0.553,0.448-1,1-1h6c0.552,0,1,0.447,1,1
-		V1979z M167,1989c0,0.553-0.448,1-1,1h-6c-0.552,0-1-0.447-1-1v-6c0-0.553,0.448-1,1-1h6c0.552,0,1,0.447,1,1V1989z M167,1979
-		c0,0.553-0.448,1-1,1h-6c-0.552,0-1-0.447-1-1v-6c0-0.553,0.448-1,1-1h6c0.552,0,1,0.447,1,1V1979z M153,1978.156
-		c-1.191,0-2.156-0.966-2.156-2.156s0.965-2.156,2.156-2.156s2.156,0.966,2.156,2.156S154.191,1978.156,153,1978.156z M165.156,1976
-		c0-1.19-0.965-2.156-2.156-2.156s-2.156,0.966-2.156,2.156s0.965,2.156,2.156,2.156S165.156,1977.19,165.156,1976z M155.156,1986
-		c0-1.19-0.965-2.156-2.156-2.156s-2.156,0.966-2.156,2.156s0.965,2.156,2.156,2.156S155.156,1987.19,155.156,1986z M165.156,1986
-		c0-1.19-0.965-2.156-2.156-2.156s-2.156,0.966-2.156,2.156s0.965,2.156,2.156,2.156S165.156,1987.19,165.156,1986z"/>
-</g>
-<g id="instagram">
-	<g>
-		<path d="M104.888,1975H104v-6h-1v6h-1v-6h-1v6h-1v-5.949c-1.138,0.233-2,1.245-2,2.449v4.5h6.068
-			C104.31,1975.642,104.586,1975.309,104.888,1975z"/>
-		<path d="M117.155,1980c0,3.949-3.205,7.154-7.155,7.154s-7.155-3.205-7.155-7.154c0-1.072,0.243-2.087,0.667-3H98v13.5
-			c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5V1977h-5.512C116.912,1977.913,117.155,1978.928,117.155,1980z"/>
-		<path d="M119.5,1969H105v5.889c1.29-1.263,3.053-2.043,5-2.043c2.469,0,4.646,1.252,5.932,3.154H122v-4.5
-			C122,1970.125,120.875,1969,119.5,1969z M120,1974c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h2
-			c0.55,0,1,0.45,1,1V1974z"/>
-	</g>
-	<path opacity="0.3" d="M120,1974c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h2c0.55,0,1,0.45,1,1V1974z"/>
-	<rect x="104" y="1969" opacity="0.5" width="1" height="6"/>
-	<rect x="102" y="1969" opacity="0.5" width="1" height="6"/>
-	<rect x="100" y="1969" opacity="0.5" width="1" height="6"/>
-	<g opacity="0.3">
-		<g>
-			<path d="M110,1975.656c-0.458,0-0.891,0.09-1.305,0.222c0.499,0.368,0.826,0.954,0.826,1.622c0,1.115-0.904,2.021-2.021,2.021
-				c-0.667,0-1.254-0.328-1.623-0.827c-0.131,0.415-0.222,0.849-0.222,1.307c0,2.397,1.946,4.344,4.345,4.344
-				s4.344-1.946,4.344-4.344S112.399,1975.656,110,1975.656z"/>
-		</g>
-		<g>
-			<path opacity="0.5" d="M110,1975.656c-0.458,0-0.891,0.09-1.305,0.222c0.499,0.368,0.826,0.954,0.826,1.622
-				c0,1.115-0.904,2.021-2.021,2.021c-0.667,0-1.254-0.328-1.623-0.827c-0.131,0.415-0.222,0.849-0.222,1.307
-				c0,2.397,1.946,4.344,4.345,4.344s4.344-1.946,4.344-4.344S112.399,1975.656,110,1975.656z"/>
-		</g>
-	</g>
-	<path d="M110,1974.479c-3.049,0-5.521,2.474-5.521,5.521c0,3.048,2.472,5.521,5.521,5.521s5.521-2.473,5.521-5.521
-		C115.521,1976.953,113.049,1974.479,110,1974.479z M110,1984.344c-2.399,0-4.345-1.946-4.345-4.344s1.946-4.344,4.345-4.344
-		s4.344,1.946,4.344,4.344S112.399,1984.344,110,1984.344z"/>
-</g>
-<g id="twitter">
-	<path d="M71.5,1969h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C74,1970.125,72.875,1969,71.5,1969z M69.143,1977.908c0.006,0.153,0.01,0.309,0.01,0.464c0,4.738-3.606,10.2-10.2,10.2
-		c-2.025,0-3.909-0.593-5.495-1.611c0.281,0.033,0.566,0.051,0.855,0.051c1.679,0,3.225-0.573,4.452-1.534
-		c-1.569-0.028-2.892-1.065-3.349-2.489c0.219,0.043,0.444,0.062,0.675,0.062c0.327,0,0.643-0.045,0.944-0.125
-		c-1.641-0.328-2.876-1.777-2.876-3.516c0-0.016,0-0.028,0-0.044c0.483,0.268,1.036,0.431,1.624,0.446
-		c-0.961-0.642-1.595-1.739-1.595-2.982c0-0.657,0.177-1.273,0.485-1.802c1.768,2.168,4.409,3.596,7.39,3.745
-		c-0.062-0.263-0.093-0.536-0.093-0.818c0-1.978,1.605-3.583,3.585-3.583c1.031,0,1.963,0.435,2.617,1.132
-		c0.816-0.161,1.583-0.459,2.276-0.871c-0.268,0.839-0.836,1.54-1.576,1.983c0.726-0.084,1.416-0.277,2.059-0.563
-		C70.45,1976.771,69.843,1977.401,69.143,1977.908z"/>
-</g>
-<g id="facebook_1_">
-	<path d="M26,1971.5v19c0,1.375-1.125,2.5-2.5,2.5H18v-10h3v-3h-3l0.005-1.673c0-0.9,0.302-1.327,1.596-1.327H21v-4c0,0-1,0-4,0
-		s-3,3-3,4s0,3,0,3h-2v3h2v10H4.5c-1.375,0-2.5-1.125-2.5-2.5v-19c0-1.375,1.125-2.5,2.5-2.5h19C24.875,1969,26,1970.125,26,1971.5z
-		"/>
-</g>
-<g id="readability">
-	<path d="M455.5,1921h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C458,1922.125,456.875,1921,455.5,1921z M441,1938.501c0,0.33-0.169,0.499-0.499,0.499h-1.002c-0.33,0-0.499-0.169-0.499-0.499
-		V1937l-1.395-2.491c-0.415-0.378-0.681-0.923-0.681-1.509c0-1.158,0.88-2.1,2.038-2.1c1.157,0,2.037,0.941,2.037,2.1V1938.501z
-		 M450,1935v3h-8v-3.451c1-1.09,2.549-1.648,4.05-1.648s2.87,0.559,3.992,1.574L450,1935z M450,1933v0.773l-0.117-0.15
-		c-1.089-0.982-2.461-1.523-3.908-1.523c-1.446,0-2.781,0.541-3.87,1.523l-0.104,0.15V1933c0-1.121-0.713-2.151-1.74-2.626
-		l-0.104-0.036l0.013-0.083c0.765-2.564,3.162-4.354,5.837-4.354c2.676,0,5.076,1.79,5.841,4.354l0.023,0.083l-0.13,0.036
-		C450.714,1930.849,450,1931.879,450,1933z M454.438,1934.535l-1.393,2.512l-0.045,0.578v0.876c0,0.33-0.169,0.499-0.499,0.499
-		h-1.002c-0.33,0-0.499-0.169-0.499-0.499V1933c0-1.158,0.893-2.1,2.05-2.1c1.158,0,2.075,0.941,2.075,2.1
-		C455.125,1933.586,454.873,1934.131,454.438,1934.535z"/>
-</g>
-<g id="stumbleupon">
-	<path d="M407.5,1921h-19c-1.381,0-2.5,1.119-2.5,2.5v19c0,1.381,1.119,2.5,2.5,2.5h19c1.381,0,2.5-1.119,2.5-2.5v-19
-		C410,1922.119,408.881,1921,407.5,1921z M398.756,1929.14c-0.145-0.117-0.547-0.189-0.806-0.189c-0.24,0-0.95,0.054-0.95,0.55v7
-		c0,2.81-1.928,3.854-3.963,3.854c-1.088,0-2.097,0.075-2.866-0.643c-0.852-0.795-1.171-1.936-1.171-3.212v-2.5h3v2.5
-		c0,0.765,0.635,0.925,1,0.925s1-0.16,1-0.925v-7c0-2.252,1.605-3.95,4-3.95s4,1.698,4,3.95v1.318l-1.5,0.647l-1.5-0.647v-1.318
-		C399,1929.273,398.828,1929.198,398.756,1929.14z M407,1936.5c0,2.252-1.705,3.95-4.1,3.95c-1.041,0-1.878-0.332-2.632-0.936
-		c-0.915-0.732-1.269-1.803-1.269-3.015v-2.899l1.5,0.648l1.5-0.648v2.899c0,0.496,0.76,0.55,1,0.55s1-0.054,1-0.55v-2.658l3-0.039
-		V1936.5z"/>
-</g>
-<g id="spotify">
-	<path d="M359.5,1921h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C362,1922.125,360.875,1921,359.5,1921z M349.625,1941.562c-3.048-0.299-5.15-2.739-5.035-6.253c0.106-3.312,3.21-5.856,5.91-5.56
-		c2.984,0.328,4.811,2.312,4.811,5.947C355.199,1939.141,352.812,1941.875,349.625,1941.562z M353.808,1928.271
-		c-1.028-0.685-2.509-1.093-3.96-1.093c-0.625,0-1.217,0.072-1.76,0.217c-0.055,0.015-0.113,0.022-0.17,0.022
-		c-0.3,0-0.562-0.203-0.64-0.494c-0.046-0.169-0.022-0.348,0.066-0.501c0.089-0.152,0.232-0.262,0.403-0.307
-		c0.662-0.176,1.374-0.265,2.115-0.265c1.716,0,3.42,0.48,4.677,1.317c0.147,0.097,0.247,0.246,0.282,0.42
-		c0.035,0.173,0,0.35-0.098,0.497c-0.122,0.185-0.328,0.295-0.551,0.295C354.043,1928.38,353.916,1928.343,353.808,1928.271z
-		 M353.944,1929.671c-0.106,0.161-0.285,0.257-0.478,0.257c-0.112,0-0.221-0.032-0.312-0.094c-0.911-0.603-2.012-0.908-3.271-0.908
-		c-0.556,0-1.151,0.06-1.769,0.178l-0.111,0.011c-0.271,0-0.505-0.194-0.555-0.462c-0.029-0.152,0.004-0.305,0.091-0.431
-		c0.086-0.124,0.215-0.207,0.362-0.234c0.691-0.133,1.362-0.2,1.993-0.2c1.479,0,2.786,0.368,3.886,1.094
-		C354.041,1929.055,354.115,1929.409,353.944,1929.671z M355.615,1926.213c-0.139,0.217-0.375,0.347-0.633,0.347
-		c-0.146,0-0.287-0.042-0.41-0.121c-1.111-0.715-2.842-1.143-4.627-1.143c-0.773,0-1.49,0.082-2.073,0.237
-		c-0.063,0.017-0.128,0.025-0.194,0.025c-0.342,0-0.641-0.231-0.728-0.562c-0.052-0.195-0.024-0.399,0.077-0.574
-		c0.102-0.174,0.266-0.297,0.46-0.348c0.706-0.188,1.557-0.287,2.459-0.287c2.095,0,4.079,0.504,5.443,1.381
-		C355.739,1925.396,355.84,1925.865,355.615,1926.213z"/>
-	<path d="M350.059,1932.349l-0.059-0.001c-1,0-2.214,1.232-2.278,3.217c-0.032,0.976,0.155,1.798,0.557,2.375
-		c0.372,0.536,0.907,0.83,1.56,0.852c1.41,0,2.289-1.165,2.352-3.117c0.034-1.063-0.145-1.925-0.529-2.492
-		C351.299,1932.652,350.765,1932.371,350.059,1932.349z"/>
-</g>
-<g id="badoo">
-	<path d="M311.5,1921h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C314,1922.125,312.875,1921,311.5,1921z M307.105,1939.854c-1.348,1.349-3.139,2.091-5.044,2.091c-1.906,0-3.697-0.742-5.044-2.091
-		c-1.348-1.347-2.09-3.139-2.09-5.044v-9.547c0-0.584,0.476-1.06,1.06-1.06c0.584,0,1.059,0.476,1.059,1.06v4.475
-		c1.344-1.331,3.124-2.062,5.016-2.062c1.906,0,3.697,0.742,5.044,2.089c1.347,1.349,2.089,3.14,2.089,5.046
-		C309.194,1936.718,308.452,1938.508,307.105,1939.854z"/>
-	<path d="M302.061,1929.795c-1.341,0-2.6,0.521-3.546,1.469c-0.948,0.947-1.47,2.208-1.47,3.547c0,1.34,0.522,2.6,1.469,3.546
-		c0.946,0.947,2.205,1.47,3.546,1.47c1.34,0,2.599-0.522,3.546-1.47c0.948-0.946,1.47-2.206,1.47-3.546
-		c0-1.339-0.522-2.6-1.47-3.547C304.659,1930.315,303.4,1929.795,302.061,1929.795z M300.295,1937.032
-		c-0.954,0-1.731-0.776-1.731-1.73s0.777-1.731,1.731-1.731s1.731,0.777,1.731,1.731S301.25,1937.032,300.295,1937.032z"/>
-</g>
-<g id="quora">
-	<path d="M263.5,1921h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C266,1922.125,264.875,1921,263.5,1921z M258.671,1938.875l0.098,0.025c0.419,0.109,0.549,0.935,0.498,1.328
-		c-0.058,0.454-0.315,0.503-0.423,0.503c-0.185,0-1.144-0.017-1.878-0.346c-0.453-0.202-0.893-0.452-1.286-1.238
-		c-0.381,0.112-0.646,0.153-0.646,0.153c-0.523,0.091-1.042,0.137-1.541,0.137c-2.258,0-4.188-0.944-5.435-2.658
-		c-1.414-1.942-1.771-4.604-0.958-7.118c0.689-2.131,2.748-4.7,6.284-4.929c0.21-0.014,0.415-0.021,0.616-0.021
-		c3.855,0,6.526,2.53,6.803,6.447c0.215,3.052-0.99,5.705-3.232,7.144C257.979,1938.701,258.346,1938.794,258.671,1938.875z"/>
-	<path d="M253.727,1926.939c-0.164,0-0.334,0.011-0.51,0.032c-0.564,0.071-1.026,0.287-1.271,0.466
-		c-0.867,0.635-1.45,2.247-1.522,4.209c-0.079,2.165,0.484,4.146,1.403,4.928c0.482,0.412,1.211,0.647,2,0.647
-		c0.377,0,0.744-0.054,1.074-0.158c-0.533-0.903-1.421-0.961-1.769-0.983c-0.23-0.02-0.391-0.135-0.377-0.415
-		c0.019-0.397,0.408-1.193,0.87-1.193c0,0,1.575-0.172,2.81,0.899c0.033,0.028,0.062,0.063,0.092,0.099
-		c0.919-2.065,0.863-5.478-0.161-7.124C256.039,1927.821,255.261,1926.939,253.727,1926.939z"/>
-</g>
-<g id="_x34_square_2_">
-	<g opacity="0.3">
-		<circle cx="201.129" cy="1931.486" r="4.805"/>
-	</g>
-	<g>
-		<path d="M218,1923.5c0-1.375-1.125-2.5-2.5-2.5h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19
-			c1.375,0,2.5-1.125,2.5-2.5v-11.842l-4.646,4.105l0.99,0.989l-6.836,6.835l-6.305-6.305c-0.025,0.001-0.049,0.008-0.074,0.008
-			c-2.653,0-4.805-2.148-4.805-4.805c0-2.654,2.151-4.805,4.805-4.805c2.344,0,4.291,1.68,4.715,3.901l1.664-1.664l3.285,3.284
-			l7.207-8.172V1923.5z"/>
-	</g>
-	<g opacity="0.5">
-		<g>
-			<g>
-				<path d="M205.652,1933.051l1.861,2.869l3.279-3.717l-3.285-3.284l-1.664,1.664c0.056,0.293,0.091,0.594,0.091,0.903
-					C205.935,1932.037,205.823,1932.559,205.652,1933.051z"/>
-			</g>
-			<g>
-				<path d="M207.504,1939.932l-4.767-3.937c0.019-0.007,0.034-0.019,0.052-0.025c-0.498,0.184-1.026,0.305-1.586,0.313l6.305,6.305
-					l6.836-6.835l-0.99-0.989L207.504,1939.932z"/>
-			</g>
-		</g>
-		<g>
-			<g opacity="0.3">
-				<path d="M205.652,1933.051l1.861,2.869l3.279-3.717l-3.285-3.284l-1.664,1.664c0.056,0.293,0.091,0.594,0.091,0.903
-					C205.935,1932.037,205.823,1932.559,205.652,1933.051z"/>
-			</g>
-			<g opacity="0.3">
-				<path d="M207.504,1939.932l-4.767-3.937c0.019-0.007,0.034-0.019,0.052-0.025c-0.498,0.184-1.026,0.305-1.586,0.313l6.305,6.305
-					l6.836-6.835l-0.99-0.989L207.504,1939.932z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g id="skitch_2_">
-	<path d="M167.5,1921h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C170,1922.125,168.875,1921,167.5,1921z M162.289,1935.718c-1.854,2.161-1.057,3.601-1.257,4.276
-		c-0.2,0.674-0.351,0.748-1.349,0.524c-0.998-0.226-4.021-1.224-6.043-2.872c-2.021-1.648-3.495-3.072-3.495-6.143
-		c0-3.072,2.247-3.797,3.046-3.97c0.798-0.177,1.999,0.174,1.922,0.998c-0.073,0.822-0.799,0.899-1.146,1.023
-		c0.748,0.049,0.947,0.041,2.346-1.603c1.397-1.645,5.573-3.919,8.035-1.457C167.525,1929.673,164.142,1933.555,162.289,1935.718z"
-		/>
-</g>
-<g id="youtube_1_">
-	<g>
-		<path d="M109.431,1930.793c0.118,0,0.32-0.04,0.348-0.068c0.048-0.051,0.221-0.124,0.221-0.224v-3.106
-			c0-0.069-0.168-0.114-0.213-0.155c-0.047-0.041-0.189-0.061-0.281-0.061c-0.105,0-0.288,0.033-0.309,0.053
-			c-0.044,0.044-0.197,0.093-0.197,0.163v3.106c0,0.107,0.118,0.184,0.157,0.229
-			C109.182,1930.757,109.324,1930.793,109.431,1930.793z"/>
-		<path d="M119.5,1921h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-			C122,1922.125,120.875,1921,119.5,1921z M112,1926h1v4.506c0,0.135,0.097,0.174,0.153,0.184c0.009,0,0.275-0.004,0.396-0.087
-			c0.083-0.055,0.451-0.126,0.451-0.212V1926h1v6h-1v-0.308c0,0.086-0.381,0.159-0.486,0.22c-0.242,0.138-0.57,0.207-0.803,0.207
-			c-0.308,0-0.44-0.116-0.601-0.336c-0.151-0.208-0.11-0.496-0.11-0.882V1926z M110.611,1926.261
-			c0.318,0.312,0.389,0.719,0.389,1.208v2.947c0,0.54-0.067,0.974-0.379,1.289c-0.314,0.316-0.698,0.477-1.232,0.477
-			c-0.519,0-0.77-0.166-1.085-0.491c-0.314-0.322-0.303-0.758-0.303-1.296v-2.957c0-0.498,0.017-0.903,0.344-1.203
-			c0.323-0.296,0.636-0.446,1.168-0.446C110.004,1925.788,110.295,1925.947,110.611,1926.261z M105.311,1924l0.653,2.604
-			l0.621-2.604h1.643l-1.228,4.629V1932h-1.827l0.009-3.139l-1.5-4.861H105.311z M117,1938c0,1.656-1.343,3-3,3h-8
-			c-1.657,0-3-1.344-3-3v-2c0-1.656,1.343-3,3-3h8c1.657,0,3,1.344,3,3V1938z"/>
-	</g>
-	<g>
-		<path d="M114.027,1939.969c-0.314,0-0.564-0.104-0.743-0.309c-0.182-0.21-0.274-0.506-0.274-0.88v-1.87
-			c0-0.333,0.101-0.607,0.3-0.814c0.201-0.209,0.455-0.312,0.775-0.312c0.324,0,0.573,0.096,0.742,0.284
-			c0.173,0.189,0.26,0.473,0.26,0.842v0.961h-1.48v0.885c0,0.239,0.03,0.405,0.09,0.508c0.073,0.116,0.189,0.175,0.348,0.175
-			c0.162,0,0.28-0.05,0.351-0.149c0.064-0.09,0.095-0.26,0.095-0.533v-0.189h0.597v0.214c0,0.4-0.089,0.702-0.265,0.896
-			C114.647,1939.873,114.388,1939.969,114.027,1939.969z M114.053,1936.314c-0.195,0-0.296,0.085-0.347,0.155
-			c-0.066,0.094-0.099,0.234-0.099,0.433v0.521h0.884v-0.521c0-0.196-0.032-0.337-0.098-0.432
-			C114.341,1936.399,114.241,1936.314,114.053,1936.314z M107.676,1939.916c-0.146,0-0.253-0.048-0.325-0.146
-			c-0.077-0.106-0.116-0.273-0.116-0.499v-3.382h0.573v3.094c0,0.122,0.022,0.212,0.069,0.273c0.037,0.049,0.108,0.106,0.238,0.106
-			c0.078,0,0.167-0.034,0.272-0.104c0.096-0.065,0.184-0.147,0.261-0.244l0.021-3.125h0.575v3.966h-0.574v-0.633l-0.177,0.209
-			c-0.136,0.161-0.276,0.283-0.418,0.364C107.938,1939.875,107.803,1939.916,107.676,1939.916z M111.617,1939.909
-			c-0.134,0-0.252-0.027-0.36-0.081c-0.105-0.054-0.202-0.138-0.297-0.255l-0.178-0.221v0.503H110.2v-5.447h0.582v1.998l0.177-0.216
-			c0.096-0.116,0.199-0.206,0.305-0.267c0.1-0.057,0.204-0.086,0.307-0.086c0.212,0,0.37,0.074,0.48,0.225
-			c0.116,0.16,0.175,0.402,0.175,0.719v2.312c0,0.272-0.054,0.48-0.162,0.618C111.962,1939.844,111.816,1939.909,111.617,1939.909z
-			 M111.205,1936.3c-0.069,0-0.139,0.017-0.207,0.05c-0.065,0.033-0.128,0.083-0.189,0.148l-0.027,2.665
-			c0.101,0.147,0.171,0.202,0.241,0.235c0.068,0.037,0.146,0.056,0.229,0.056c0.129,0,0.226-0.043,0.29-0.129
-			c0.059-0.077,0.088-0.19,0.088-0.346v-2.151c0-0.16-0.035-0.288-0.104-0.38C111.452,1936.352,111.342,1936.3,111.205,1936.3z
-			 M105.47,1939.855v-4.826h-0.901v-0.621h2.476v0.621h-0.902v4.826H105.47z"/>
-	</g>
-</g>
-<g id="github_2_">
-	<path d="M71.5,1921h-19c-1.381,0-2.5,1.119-2.5,2.5v19c0,1.381,1.119,2.5,2.5,2.5h19c1.381,0,2.5-1.119,2.5-2.5v-19
-		C74,1922.119,72.881,1921,71.5,1921z M60,1937h-2v-3h2V1937z M63,1938h-2v-1h2V1938z M66,1937h-2v-3h2V1937z M65,1928L65,1928l4-2
-		l0.062,4c0.723,0.867,0.938,1.782,0.938,3v1c0,1.844-1.01,3.437-2.494,4.304C67.81,1937.953,68,1937.501,68,1937v-2
-		c0-1.104-0.896-2-2-2h-8c-1.104,0-2,0.896-2,2v2c0,0.501,0.19,0.953,0.494,1.304C55.01,1937.437,54,1935.844,54,1934v-1
-		c0-1.143,0.355-2.158,1-3v-4l4,1.998L65,1928z"/>
-</g>
-<g id="behance">
-	<path id="behance_2_" d="M20.022,1934h-3.167c0.027-0.55,0.145-1.908,1.618-1.908C20.25,1932.092,20.022,1934,20.022,1934z
-		 M10.508,1934H8v2l2.578-0.016c0.85,0,1.447-0.107,1.447-0.896C12.025,1934.086,11.428,1934,10.508,1934z M11.66,1930.979
-		c0-0.934-0.713-0.979-1.48-0.979H8v2h2.344C11.098,1932,11.66,1931.802,11.66,1930.979z M26,1923.5v19c0,1.375-1.125,2.5-2.5,2.5
-		h-19c-1.375,0-2.5-1.125-2.5-2.5v-19c0-1.375,1.125-2.5,2.5-2.5h19C24.875,1921,26,1922.125,26,1923.5z M16,1930h5v-1h-5V1930z
-		 M14.209,1935.1c0-1.22-0.357-2.202-1.55-2.544c0.85-0.41,1.085-1.11,1.085-2.071c0-1.822-0.807-2.484-2.744-2.484s-5,0-5,0v10h5
-		C12.768,1938,14.209,1937.089,14.209,1935.1z M16.855,1935H22c0-3-1.06-4.256-3.472-4.256c-2.151,0-3.619,1.569-3.619,3.695
-		c0,2.193,1.351,3.801,3.619,3.801s3.455-1.594,3.472-2.239c0,0-1.531-0.001-1.969-0.001c-0.312,0.344-0.812,0.625-1.469,0.625
-		C17.48,1936.625,16.91,1936,16.855,1935z"/>
-</g>
-<g id="pinboard_2_">
-	<path d="M458,1875.5c0-1.381-1.119-2.5-2.5-2.5h-19c-1.381,0-2.5,1.119-2.5,2.5v19c0,1.381,1.119,2.5,2.5,2.5h19
-		c1.381,0,2.5-1.119,2.5-2.5V1875.5z M445.307,1885.994l-2.307,2.316v-2.828l-0.026,0.018L440,1882h-2l5-5v2l3.499,2.974
-		l-0.017,0.026h2.828l-2.377,2.371l5.58,7.139L445.307,1885.994z"/>
-</g>
-<g id="forrst_1_">
-	<path d="M407.5,1873h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C410,1874.125,408.875,1873,407.5,1873z M398,1894v-2.874l4.104-2.229l-0.368-0.676L398,1890.25v-1.474l2.501-1.358l-0.367-0.678
-		L398,1887.9v-1.9h-2v2.518l-1.16-0.884l-0.409,0.616l1.569,1.215V1894h-6.312l8.135-19.229l8.259,19.229H398z"/>
-</g>
-<g id="linked_x5F_in_2_">
-	<path d="M359.5,1873h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C362,1874.125,360.875,1873,359.5,1873z M346,1892h-0.13H343v-10h3V1892z M344.5,1880.641c-1.01,0-1.828-0.818-1.828-1.828
-		s0.818-1.828,1.828-1.828s1.828,0.818,1.828,1.828S345.51,1880.641,344.5,1880.641z M357,1892h-3v-5.293
-		c0-1.249-0.532-2.101-1.649-2.101c-0.854,0-1.026,0.575-1.249,1.129c-0.082,0.199-0.102,0.476-0.102,0.753V1892h-3
-		c0,0,0.041-9.128,0-10h3v1.703c0-0.632,0.708-1.734,3.062-1.734s2.938,0.074,2.938,3.381S357,1892,357,1892z"/>
-</g>
-<g id="read_x5F_it_x5F_later_1_">
-	<path d="M311.5,1873H306v18.667c0,0.184-0.106,0.228-0.235,0.098l-3.765-3.426l-3.765,3.426c-0.129,0.13-0.235,0.086-0.235-0.098
-		V1873h-5.5c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C314,1874.125,312.875,1873,311.5,1873z"/>
-</g>
-<g id="deviantart_2_">
-	<path d="M263.5,1873h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C266,1874.125,264.875,1873,263.5,1873z M254,1887v1h-9c-0.018-0.134,0-0.488,0-0.626c0-1.42,0.729-3.148,2.459-4.207
-		c1.046-0.641,2.332-1.084,4.062-1.25l-0.043,0.688c-2.666,0.562-3.66,2.051-3.966,3.679l-0.134,0.714L252,1887v-7h2V1887z
-		 M264,1888h-9v-4h2v3c0,0,3.457-0.016,4.646-0.016c0.182-1.821-1.459-3.984-6.303-3.984c-0.103,0-0.233,0-0.333,0l0.011-0.896
-		c0.1-0.001,0.221-0.007,0.322-0.007c2.699,0,4.395,0.203,6.115,1.257c1.73,1.059,2.541,2.248,2.541,3.668
-		C264,1887.159,264,1888,264,1888z"/>
-</g>
-<g id="dribbble">
-	<path id="dribbble_2_" d="M200.944,1889.446c-1.007-1.212-1.558-2.73-1.558-4.306l0.034-0.011c0.837,0,3.767-0.069,6.804-0.95
-		c0.135,0.268,0.265,0.54,0.389,0.812c-0.02,0.006-0.039,0.012-0.058,0.018C203.354,1886.045,201.484,1888.609,200.944,1889.446z
-		 M203.114,1879.108c-1.758,0.883-3.059,2.509-3.531,4.41c0.834-0.008,3.183-0.095,5.866-0.775
-		C204.474,1881.038,203.472,1879.607,203.114,1879.108z M202.125,1890.562c1.167,0.866,2.548,1.322,4.004,1.322
-		c0.859,0,1.695-0.16,2.488-0.476c-0.131-0.729-0.523-2.628-1.374-4.889C203.893,1887.743,202.457,1889.971,202.125,1890.562z
-		 M210.459,1879.975c-1.214-1.02-2.745-1.578-4.33-1.578c-0.436,0-0.866,0.041-1.284,0.122c0.404,0.56,1.405,1.991,2.34,3.686
-		C209.138,1881.438,210.137,1880.372,210.459,1879.975z M208.931,1886.108c0.71,2.001,1.073,3.669,1.219,4.443
-		c1.359-1.015,2.296-2.511,2.606-4.168c-0.412-0.114-1.413-0.351-2.651-0.351C209.705,1886.033,209.311,1886.059,208.931,1886.108z
-		 M218,1875.5v19c0,1.375-1.125,2.5-2.5,2.5h-19c-1.375,0-2.5-1.125-2.5-2.5v-19c0-1.375,1.125-2.5,2.5-2.5h19
-		C216.875,1873,218,1874.125,218,1875.5z M214.459,1885.129c0-4.593-3.737-8.329-8.33-8.329c-4.593,0-8.329,3.736-8.329,8.329
-		s3.736,8.33,8.329,8.33C210.722,1893.459,214.459,1889.722,214.459,1885.129z M207.899,1883.59c0.13,0.272,0.466,1.045,0.466,1.045
-		c0.465-0.052,0.961-0.078,1.476-0.078c1.361,0,2.524,0.182,3.025,0.273c-0.062-1.374-0.53-2.665-1.363-3.761
-		C211.095,1881.546,209.955,1882.708,207.899,1883.59z"/>
-</g>
-<g id="zootool_2_">
-	<path d="M167.5,1873h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C170,1874.125,168.875,1873,167.5,1873z M158.819,1892.907c-2.104-0.609-2.745-3.9-3.899-5.391
-		c-0.744,0.175-1.002,0.833-2.065,0.688c-1.386-2.174,1.028-5.653,3.097-3.671c1.469-1.247,2.914-2.517,4.016-4.13
-		c-1.309-0.604-3.623-1.049-4.818-0.459c-0.631-0.166-0.722-1.034-0.573-1.721c0.546-2.53,5.021-1.299,6.769-0.344
-		c2.131-2.683,3.037,2.46,0.344,2.867c-1.172,2.041-2.894,3.53-4.589,5.048c1.054,1.005,1.863,3.909,3.556,4.244
-		c0.957,0.189,1.805-0.536,2.639-0.573C164.179,1891.767,161.115,1893.573,158.819,1892.907z"/>
-</g>
-<g id="xing">
-	<path d="M119.5,1873h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C122,1874.125,120.875,1873,119.5,1873z M100.47,1888l3.202-5.036l-1.088-2.964h4.632l1.112,3.036L105.17,1888H100.47z
-		 M116.517,1894h-4.69l-4.17-6.997l6.166-11.003h4.683l-6.161,10.997L116.517,1894z"/>
-</g>
-<g id="evernote_1_">
-	<path d="M67,1886c-0.46,0.05-1.137-0.596-1.647-0.596c-0.389,0-1.254,0.717-1.353,0.596c-0.1-0.12,0.268-3,1-3
-		C65.733,1883,67.773,1885.916,67,1886z M74,1875.5v19c0,1.375-1.125,2.5-2.5,2.5h-19c-1.375,0-2.5-1.125-2.5-2.5v-19
-		c0-1.375,1.125-2.5,2.5-2.5h19C72.875,1873,74,1874.125,74,1875.5z M54,1881c0,0,2.346,0,2.812,0c0.937,0,1.188-0.766,1.188-0.991
-		s0-2.812,0-2.812L54,1881z M69,1880c0-0.571-1.048-1-2-1s-4,0-4,0s-0.566-1.803-1.503-1.803c-0.938,0-1.239-0.005-1.874,0
-		C58.989,1877.205,59,1877.225,59,1878s0,1.438,0,2c0,2-0.546,2-1,2h-3c-0.631-0.042-1,0.301-1,0.818c0,0.52,0.741,5.466,1.76,6.485
-		c0.591,0.592,4.205,1.003,4.967,1.003c0.761,0,0.508-2.818,0.72-2.818c0.211,0,0.444,1.275,1.643,1.579
-		c1.199,0.303,2.828,0.065,2.911,0.933c0.112,1.143-0.015,3-0.755,3H64c-0.714,0-0.762-1,0-1c0.508,0,1,0,1,0v-1
-		c0,0-2.889-0.804-3,1c-0.102,1.65-0.381,2.619,0,3s0.333,0,3.245,0C69.786,1895,69,1880.571,69,1880z"/>
-</g>
-<g id="instapaper_2_">
-	<path d="M23.5,1873h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C26,1874.125,24.875,1873,23.5,1873z M17,1878h-2v14h2v1h-7v-1h2v-14h-2v-1h7V1878z"/>
-</g>
-<g id="wordpress">
-	<path d="M455.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C458,1826.125,456.875,1825,455.5,1825z M445.547,1827.818c3.865,0,6.389,2.701,6.389,2.701s-0.263-0.028-0.694-0.028
-		c-0.955,0-1.354,0.687-1.354,1.329c0,0.599,0.36,1.043,0.784,1.754s0.9,1.56,0.9,2.66c0,0.728-0.243,1.53-0.591,2.643l-1.106,3.699
-		l-3.409-10.146c0,0,1.24-0.095,1.242-0.095c0.145-0.018,0.148-0.134,0.146-0.169c-0.002-0.034-0.019-0.146-0.151-0.146
-		c-0.025,0.001-1.431,0.11-2.333,0.11c-0.848,0-2.236-0.105-2.295-0.11l0,0c-0.15,0-0.162,0.134-0.162,0.16
-		c-0.002,0.055,0.014,0.146,0.136,0.154c0.015,0.001,1.038,0.089,1.038,0.089l1.416,3.884l-2.104,6.312l-3.426-10.188
-		c0,0,1.238-0.095,1.24-0.095c0.144-0.018,0.148-0.134,0.146-0.169c-0.002-0.034-0.02-0.146-0.152-0.146
-		c-0.025,0.001-2.851,0.09-3.254,0.09C439.068,1830.158,442.147,1827.818,445.547,1827.818z M436.694,1836.672
-		c0-1.25,0.448-2.958,0.969-4.054c0.337,1.096,4.118,11.429,4.466,12.238C439.619,1843.762,436.694,1840.994,436.694,1836.672z
-		 M445.547,1845.525c-0.846,0-1.928-0.097-2.701-0.419c0.438-1.201,2.848-8.276,2.848-8.276s2.842,7.628,3.026,8.113
-		C447.619,1845.429,446.553,1845.525,445.547,1845.525z M449.999,1844.325l-0.466,0.271l2.818-8.152
-		c0.443-1.106,0.647-2.067,0.647-3.034c0-0.308-0.021-0.595-0.057-0.862l0.374-0.123c0.709,1.293,1.084,2.762,1.084,4.247
-		C454.4,1839.809,452.714,1842.741,449.999,1844.325z"/>
-</g>
-<g id="tumblr">
-	<path d="M407.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C410,1826.125,408.875,1825,407.5,1825z M397.647,1845.25c-0.343,0-0.583-0.002-0.935,0c-1.545,0.012-3.713-0.436-3.713-2.935V1836
-		h-2v-3c0,0,1.554-0.022,2.477-1.096s0.902-1.881,0.957-2.904H397v4h4v3h-4v5.816c0,0.342,0.979,0.853,1.819,0.853
-		c0.811,0,1.522-0.322,2.181-0.735v2.811C400.458,1845.033,400.006,1845.25,397.647,1845.25z M404.5,1845.581
-		c-1.146,0-2.081-0.935-2.081-2.081s0.935-2.081,2.081-2.081s2.081,0.935,2.081,2.081S405.646,1845.581,404.5,1845.581z"/>
-</g>
-<g id="amazon">
-	<path d="M350.281,1837.688c-0.265,0.479-0.631,0.818-1.06,0.818c-0.821,0-0.966-0.869-0.966-1.136c0-1.11,1.076-1.643,2.146-1.703
-		C350.401,1835.667,350.612,1837.094,350.281,1837.688z M362,1827.5v19c0,1.375-1.125,2.5-2.5,2.5h-19c-1.375,0-2.5-1.125-2.5-2.5
-		v-19c0-1.375,1.125-2.5,2.5-2.5h19C360.875,1825,362,1826.125,362,1827.5z M350.401,1833.424c0,0-2.258,0.268-3.211,0.694
-		c-1.468,0.643-2.308,1.955-2.308,3.601c0,2.109,1.29,3.473,3.286,3.473c1.382,0,2.212-0.318,3.22-1.286
-		c0.225,0.337,1.008,1.637,1.377,1.423s1.759-1.079,2.156-1.422c0.266-0.22,0.644-0.403,0.016-1.25
-		c-0.31-0.403-0.791-0.97-0.791-1.704l0.003-3.465c0.006-1.262-0.392-4.543-3.907-4.543c-3.053,0-4.463,0.382-5.027,3.412
-		c-0.07,0.386,0.148,0.716,0.572,0.808l1.963,0.215c0.311-0.018,0.556-0.279,0.622-0.634c0.119-0.596,0.558-0.95,1.238-0.95
-		c0.289,0,0.583,0.1,0.767,0.383C350.552,1832.439,350.401,1833.424,350.401,1833.424z M349.695,1845c2.778,0,5.607-1.215,7.58-2.67
-		c0.229-0.169,0.322-0.421,0.244-0.658c-0.076-0.234-0.303-0.391-0.563-0.391c-0.093,0-0.185,0.019-0.272,0.057
-		c-2.146,0.91-4.594,1.428-6.895,1.428c-3.174,0-6.158-1.047-8.414-2.141c-0.094-0.045-0.188-0.079-0.281-0.079
-		c-0.193,0-0.361,0.112-0.43,0.287c-0.072,0.188-0.016,0.398,0.15,0.55C343.375,1843.692,346.199,1845,349.695,1845z
-		 M359.045,1840.329c-0.282-0.35-1.267-0.444-1.461-0.444c-0.508,0-1.473,0.064-2.239,0.604c-0.198,0.139-0.286,0.317-0.227,0.507
-		c0.053,0.167,0.21,0.208,0.47,0.208c0.005,0,0.01,0,0.016,0c0.355,0,1.051-0.203,1.548-0.203c0.502,0,0.667,0,0.758,0.212
-		s-0.084,0.673-0.688,2.185c-0.062,0.156-0.245,1.057,0.067,1.135s0.561-0.235,0.672-0.328
-		C359.135,1843.221,359.418,1840.791,359.045,1840.329z"/>
-</g>
-<g id="picasa">
-	<path d="M311.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C314,1826.125,312.875,1825,311.5,1825z M301.871,1829.146c1.125,0,2.129,0.098,3.129,0.563c0,0.111,0,5.018,0,5.377
-		c0-0.243-5.719-5.24-5.927-5.429C299.959,1829.326,300.935,1829.146,301.871,1829.146z M294.127,1837
-		c0-2.962,1.638-5.63,4.275-6.984c0.09,0.082,2.84,2.578,2.973,2.699c-0.137,0.123-6.749,6.131-6.962,6.325
-		C294.229,1838.359,294.127,1837.675,294.127,1837z M298,1843.813c-1.25-0.729-2.521-1.896-3.245-3.909
-		c0.091-0.082,3.245-2.711,3.245-2.949C298,1837.316,298,1843.605,298,1843.813z M299,1844.313c0-0.334,0-2.071,0-3.36h9.854
-		c-0.999,1.674-2.604,2.798-4.167,3.423S300.438,1845.042,299,1844.313z M309.312,1840c-0.125,0-3.312,0-3.312,0
-		c0-1,0-9.374,0-9.812c1.259,0.684,3.188,2.708,3.583,4.541S309.938,1838.063,309.312,1840z"/>
-</g>
-<g id="blogger">
-	<path d="M256.616,1839.128h-5.167c-0.51,0-0.924,0.416-0.924,0.927s0.414,0.926,0.924,0.926h5.167c0.511,0,0.926-0.415,0.926-0.926
-		S257.127,1839.128,256.616,1839.128z"/>
-	<path d="M251.455,1835.959h2.574c0.536,0,0.972-0.437,0.972-0.973s-0.436-0.973-0.972-0.973h-2.574
-		c-0.536,0-0.972,0.437-0.972,0.973S250.919,1835.959,251.455,1835.959z"/>
-	<path d="M263.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C266,1826.125,264.875,1825,263.5,1825z M261,1840c0,2.45-2.549,4-5,4h-4c-2.451,0-5-1.55-5-4v-5c0-2.45,1.549-4,4-4h3
-		c2.45,0,4.306,1.521,4.306,3.972c0.039,0.544,0.481,0.954,1.009,0.954l0.875,0.074c0.446,0,0.811,0.364,0.811,0.811V1840z"/>
-</g>
-<g id="yahoo">
-	<path d="M215.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C218,1826.125,216.875,1825,215.5,1825z M214.412,1833.372l-2.05,0.416L208,1838v3h2.438l-0.157,1.438l-8.819,0.012l0.236-1.354
-		l2.287-0.325L204,1838l-4.523-5.599l-2.561-0.375l-0.037-1.265l8.995-0.002l-0.171,1.196l-2.293,0.219l3.164,4.239l2.687-2.791
-		l-1.82-0.253L207,1832h8L214.412,1833.372z"/>
-</g>
-<g id="jolicloud">
-	<path d="M167.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C170,1826.125,168.875,1825,167.5,1825z M166.981,1841c-0.418,0-12.64,0-12.64,0c-2.997,0-4.56-1.217-4.56-3.374
-		s1.297-3.095,4.026-3.09c0.583-1.458,2.243-3.653,4.991-3.653s4.951,1.977,5.258,4.238c0.368,2.717,0.896,3.832,3.062,5.453
-		C167.389,1840.776,167.399,1841,166.981,1841z"/>
-</g>
-<g id="google_x5F_plus">
-	<path d="M103.424,1841.49c-0.157-0.12-0.424-0.256-0.424-0.571c0,0,0-0.646,0-1.063c-1.375,0.02-4.436-0.202-5-3.506v7.374
-		c1.723-1.48,4.686-1.643,5.898-1.647C103.825,1841.729,103.586,1841.615,103.424,1841.49z"/>
-	<path d="M103.988,1838.301c0.159,0,0.315-0.021,0.467-0.062c1.336-0.363,2-2.217,1.479-4.131c-0.454-1.665-1.673-2.873-2.9-2.873
-		c-0.159,0-0.316,0.021-0.468,0.062c-0.635,0.172-1.141,0.688-1.424,1.452c-0.292,0.787-0.312,1.738-0.056,2.677
-		C101.541,1837.092,102.76,1838.301,103.988,1838.301z"/>
-	<path d="M119.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v6.764c0.75-4.163,6.031-4.264,6.088-4.264H110v0.002
-		c0,0.692-0.927,0.82-1.74,0.924c-0.207,0.026-0.441,0.061-0.629,0.104c1.398,0.782,1.534,2.086,1.534,3.81
-		c0,2.041-1.172,3.021-2.036,3.737c-0.54,0.447-0.96,0.8-0.96,1.247c0,0.437,0.59,0.914,1.27,1.467
-		c1.152,0.938,2.732,2.221,2.732,4.394c0,1.358-0.407,2.457-1.187,3.315H119.5c1.375,0,2.5-1.125,2.5-2.5v-19
-		C122,1826.125,120.875,1825,119.5,1825z M121,1835h-4v4h-1v-4h-4v-1h4v-4h1v4h4V1835z"/>
-	<path d="M103.885,1843.354c-0.132,0-0.266,0.005-0.4,0.014c-1.132,0.076-2.172,0.468-2.928,1.103
-		c-0.738,0.619-1.115,1.396-1.062,2.187c0.068,1.013,0.865,1.871,2.01,2.344h4.064c1.438-0.568,2.396-1.688,2.313-2.912
-		C107.779,1844.555,106.022,1843.354,103.885,1843.354z"/>
-</g>
-<g id="dropbox">
-	<polygon points="57.516,1835.5 61.997,1838.302 66.477,1835.493 62.02,1832.687 	"/>
-	<path d="M71.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C74,1826.125,72.875,1825,71.5,1825z M62.176,1845.263c-0.082,0.052-0.172,0.077-0.268,0.077c-0.095,0-0.185-0.026-0.267-0.079
-		l-3.702-2.346l4.061-3.337l3.922,3.297L62.176,1845.263z M70.969,1833.084c-0.03,0.013-2.324,1.746-3.194,2.413
-		c0,0,2.639,2.106,3.018,2.398s0.707,0.308,0.207,0.651s-5.481,3.576-5.481,3.576l-3.479-3.023l-3.524,2.932
-		c0,0-5.74-3.474-5.74-3.734c0-0.216,0.122-0.338,0.199-0.397c0.007-0.005,2.187-1.735,3.035-2.406
-		c-0.846-0.672-3.038-2.4-3.038-2.4c-0.098-0.07-0.267-0.188-0.267-0.396c0-0.229,0.185-0.346,0.275-0.402l5.147-3.314
-		c0.08-0.053,0.175-0.081,0.273-0.081c0.119,0,0.235,0.042,0.326,0.118l3.188,2.662l3.196-2.661
-		c0.106-0.087,0.247-0.117,0.343-0.117c0.032,0,0.197,0.004,0.316,0.082l5.132,3.296c0.17,0.07,0.332,0.195,0.332,0.439
-		C71.234,1832.962,71.084,1833.031,70.969,1833.084z"/>
-</g>
-<g id="pinterest">
-	<path d="M23.5,1825h-19c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h19c1.375,0,2.5-1.125,2.5-2.5v-19
-		C26,1826.125,24.875,1825,23.5,1825z M15.203,1841.402c-0.77,0-1.561-0.317-2.06-0.789c-0.333,0.958-0.784,2.267-0.854,2.521
-		c-0.346,1.252-1.259,2.503-1.635,2.982c-0.098,0.124-0.219,0.184-0.35,0.184c-0.21,0-0.383-0.149-0.412-0.356
-		c-0.196-1.349-0.182-2.567,0.032-3.476c0.158-0.669,1.32-4.642,1.53-5.358c-0.089-0.22-0.265-0.738-0.265-1.422
-		c0-1.454,0.882-2.593,2.008-2.593c0.894,0,1.494,0.655,1.494,1.63c0,0.562-0.216,1.263-0.445,2.004
-		c-0.123,0.399-0.25,0.81-0.344,1.208c-0.081,0.34-0.015,0.665,0.184,0.917c0.211,0.268,0.548,0.421,0.922,0.421
-		c1.43,0,2.508-1.896,2.508-4.411c0-1.908-1.297-3.094-3.385-3.094c-2.638,0-4.062,2.031-4.062,3.942c0,0.64,0.164,1.13,0.514,1.543
-		c0.202,0.239,0.282,0.415,0.188,0.765l-0.181,0.711c-0.077,0.294-0.3,0.477-0.582,0.477c-0.088,0-0.178-0.019-0.267-0.055
-		c-1.251-0.512-1.999-1.881-1.999-3.661c0-2.867,2.48-5.833,6.63-5.833c3.698,0,5.907,2.732,5.907,5.374
-		C20.283,1838.724,18.146,1841.402,15.203,1841.402z"/>
-</g>
-<g id="electrical_x5F_socket_x5F_us">
-	<path d="M454,1777h-17c-1.65,0-3,1.35-3,3v17c0,1.65,1.35,3,3,3h17c1.65,0,3-1.35,3-3v-17C457,1778.35,455.65,1777,454,1777z
-		 M450.377,1796.047l-9.791-0.01c-4.969-5.225-5.065-10.072-0.297-15.125l10.383-0.021
-		C455.44,1785.943,455.347,1790.822,450.377,1796.047z"/>
-	<path d="M440.961,1782c-3.762,4-3.669,8,0.293,13h8.455c3.963-5,4.056-9,0.295-13H440.961z M443,1788h-2v-4h2V1788z M447,1794h-3
-		v-1c0-1.172,0.595-2.2,1.5-2.2s1.5,1.028,1.5,2.2V1794z M450,1788h-2v-4h2V1788z"/>
-</g>
-<g id="electrical_x5F_socket_x5F_eu">
-	<circle cx="397.5" cy="1784.5" r="0.675"/>
-	<path d="M397.5,1795.453c-3.833,0-6.952-3.12-6.952-6.953s3.119-6.953,6.952-6.953s6.952,3.12,6.952,6.953
-		S401.333,1795.453,397.5,1795.453z M401.5,1786.651c-1.02,0-1.85,0.829-1.85,1.849s0.83,1.849,1.85,1.849s1.85-0.829,1.85-1.849
-		S402.52,1786.651,401.5,1786.651z M393.5,1786.651c-1.02,0-1.85,0.829-1.85,1.849s0.83,1.849,1.85,1.849s1.85-0.829,1.85-1.849
-		S394.52,1786.651,393.5,1786.651z M397.5,1782.622c-1.035,0-1.879,0.842-1.879,1.878s0.844,1.878,1.879,1.878
-		s1.879-0.842,1.879-1.878S398.535,1782.622,397.5,1782.622z"/>
-	<path d="M406,1777h-17c-1.65,0-3,1.35-3,3v17c0,1.65,1.35,3,3,3h17c1.65,0,3-1.35,3-3v-17C409,1778.35,407.65,1777,406,1777z
-		 M397.5,1797.106c-4.746,0-8.606-3.861-8.606-8.606c0-4.746,3.86-8.606,8.606-8.606s8.606,3.86,8.606,8.606
-		C406.106,1793.245,402.246,1797.106,397.5,1797.106z"/>
-</g>
-<g id="riflescope_1_">
-	<g id="riflescope">
-		<path d="M350.602,1777c-6.837,0-12.398,5.562-12.398,12.398s5.562,12.398,12.398,12.398S363,1796.235,363,1789.398
-			S357.438,1777,350.602,1777z M351,1798.771V1793h-1v5.771c-5-0.253-8.519-3.771-8.771-8.771H347v-1h-5.771
-			c0.253-5,3.771-8.722,8.771-8.975V1786h1v-5.975c5,0.253,8.722,3.975,8.975,8.975H354v1l5.969-0.016
-			C359.716,1794.984,356,1798.519,351,1798.771z"/>
-	</g>
-	<g opacity="0.5">
-		<rect x="350" y="1789" width="1" height="1"/>
-	</g>
-</g>
-<g id="hand_x5F_saw">
-	<path d="M312.697,1778.264c-1.514-0.273-3.241-0.963-4.749-1.264c-1.507-0.301-0.88-1.342-1.761-1.951
-		c-0.452-0.312-1.153-0.217-1.466,0.235l-16.342,23.81l2.614,1.906h2v-2h2v-2h2v-2h2v-2h2v-2h2v-2h2v-2h2v-2c0,0,3.1,0,4,0
-		s1.555-0.167,1.75-0.758c0.196-0.591,0.873-2.59,1.07-3.165C314.094,1780.071,314.273,1778.658,312.697,1778.264z
-		 M291.139,1797.614c0.425-0.079,0.831,0.202,0.909,0.628c0.078,0.425-0.203,0.831-0.628,0.908
-		c-0.425,0.078-0.831-0.203-0.908-0.628C290.433,1798.098,290.714,1797.69,291.139,1797.614z M311.662,1781
-		c-0.117,0.337-0.852,1.904-0.852,1.904l-7.987-1.229l1.748-2.559c0.312-0.451,0.635-0.702,1.174-0.592l5.35,1.453
-		C311.632,1780.087,311.779,1780.66,311.662,1781z"/>
-</g>
-<g id="classic_x5F_hammer">
-	<path d="M260.08,1784.518l-5.914,5.912l0.727,0.728l-9.234,10.565l-4.2-4.2l10.565-9.234l0.727,0.728l5.913-5.913L260.08,1784.518z
-		 M259.062,1776.641l-3.009,2.829l8.984,9.184l0.947-0.707v-4.243L259.062,1776.641z"/>
-</g>
-<g id="claw_x5F_hammer">
-	<path d="M211.157,1784.43l-6.01,6.01l0.727,0.727l-9.234,10.566l-4.2-4.2l10.565-9.234l0.727,0.728l6.011-6.011L211.157,1784.43z
-		 M216.106,1783.015c-2.137-2.137-4.243-4.242-4.243-4.242h-1.414l-1.415,1.414v1.414l3.182,3.183c0,0,1.125,0.996,2.475-0.354
-		c3.536,3.536,3.889,6.718,3.889,6.718l0.354,0.354C218.935,1791.5,219.642,1786.551,216.106,1783.015z M208.682,1779.833
-		l1.415-1.414v-1.415L209,1776l-2.828,2.829l1.096,1.004H208.682z"/>
-</g>
-<g id="nails">
-	<path d="M169.96,1789.078l-0.707,0.707l-2.828-1.415l-12.228,12.228l-2.842,1.402l1.427-2.816l12.228-12.228l-1.414-2.828
-		l0.707-0.707L169.96,1789.078z M155.847,1776.85l-0.5,0.865l2.098,2.366l-8.792,14.864l-0.649,3.09l2.382-2.09l8.792-14.864
-		l3.098,0.634l0.5-0.865L155.847,1776.85z"/>
-</g>
-<g id="spray">
-	<path d="M112,1784h-11l3-2h5L112,1784z M121.5,1784.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S121.5,1785.092,121.5,1784.706z M119.5,1783.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S119.5,1784.092,119.5,1783.706z M121.5,1782.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S121.5,1783.092,121.5,1782.706z M117.5,1782.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S117.5,1783.092,117.5,1782.706z M119.5,1781.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S119.5,1782.092,119.5,1781.706z M115.5,1781.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S115.5,1782.092,115.5,1781.706z M121.5,1780.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S121.5,1781.092,121.5,1780.706z M117.5,1780.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S117.5,1781.092,117.5,1780.706z M113.5,1780.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S113.5,1781.092,113.5,1780.706z M119.5,1779.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S119.5,1780.092,119.5,1779.706z M115.5,1779.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S115.5,1780.092,115.5,1779.706z M111.5,1779.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S111.5,1780.092,111.5,1779.706z M121.5,1778.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S121.5,1779.092,121.5,1778.706z M117.5,1778.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S117.5,1779.092,117.5,1778.706z M113.5,1778.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S113.5,1779.092,113.5,1778.706z M119.5,1777.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S119.5,1778.092,119.5,1777.706z M115.5,1777.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S115.5,1778.092,115.5,1777.706z M121.5,1776.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S121.5,1777.092,121.5,1776.706z M117.5,1776.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S117.5,1777.092,117.5,1776.706z M119.5,1775.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S119.5,1776.092,119.5,1775.706z M121.5,1774.706c0-0.386-0.314-0.7-0.7-0.7s-0.7,0.314-0.7,0.7s0.314,0.7,0.7,0.7
-		S121.5,1775.092,121.5,1774.706z M108,1779.949c0-0.549-0.45-0.949-1-0.949h-1c-0.55,0-1,0.4-1,0.949c0,0.035,0,1.051,0,1.051h3
-		C108,1781,108,1779.984,108,1779.949z M113,1785v15c0,0.55-0.45,1-1,1h-11c-0.55,0-1-0.45-1-1v-15H113z M101.5,1786H101v13.5h0.5
-		V1786z"/>
-</g>
-<g id="global">
-	<path d="M62,1777c-6.627,0-12,5.373-12,12s5.373,12,12,12s12-5.373,12-12S68.627,1777,62,1777z M58.129,1780.116
-		c-0.665,0.732-1.359,1.699-1.925,2.94h-1.833C55.355,1781.79,56.643,1780.771,58.129,1780.116z M53.217,1784.957h2.304
-		c-0.251,0.918-0.417,1.954-0.481,3.1h-2.664C52.48,1786.959,52.775,1785.918,53.217,1784.957z M53.236,1793.057
-		c-0.447-0.96-0.749-2.001-0.859-3.1h2.662c0.064,1.146,0.23,2.182,0.481,3.1H53.236z M54.401,1794.957h1.803
-		c0.549,1.204,1.218,2.146,1.865,2.87C56.624,1797.179,55.369,1796.188,54.401,1794.957z M61.05,1798.054
-		c-0.541-0.34-1.814-1.283-2.828-3.097h2.828V1798.054z M61.05,1793.057h-3.645c-0.288-0.893-0.493-1.921-0.566-3.1h4.211V1793.057z
-		 M61.05,1788.057h-4.211c0.073-1.179,0.278-2.207,0.566-3.1h3.645V1788.057z M61.05,1783.057h-2.828
-		c1.014-1.813,2.287-2.757,2.828-3.097V1783.057z M70.823,1784.957c0.441,0.961,0.736,2.002,0.842,3.1h-2.704
-		c-0.064-1.146-0.23-2.182-0.481-3.1H70.823z M69.669,1783.057h-1.873c-0.574-1.259-1.279-2.237-1.953-2.974
-		C67.358,1780.736,68.669,1781.77,69.669,1783.057z M62.95,1779.96c0.541,0.34,1.814,1.283,2.828,3.097H62.95V1779.96z
-		 M62.95,1784.957h3.645c0.288,0.893,0.493,1.921,0.566,3.1H62.95V1784.957z M62.95,1789.957h4.211
-		c-0.073,1.179-0.278,2.207-0.566,3.1H62.95V1789.957z M62.95,1798.055v-3.098h2.828
-		C64.764,1796.772,63.488,1797.716,62.95,1798.055z M65.902,1797.86c0.656-0.729,1.337-1.682,1.894-2.903h1.843
-		C68.656,1796.208,67.376,1797.213,65.902,1797.86z M70.804,1793.057h-2.324c0.251-0.918,0.417-1.954,0.481-3.1h2.702
-		C71.553,1791.056,71.251,1792.097,70.804,1793.057z"/>
-</g>
-<g id="globe_x5F_af">
-	<path d="M14,1777.417c-4.514,0-8.713,2.715-10.567,6.831c-1.877,4.17-1.068,9.191,2.015,12.564c3.081,3.37,7.993,4.63,12.315,3.146
-		c4.246-1.457,7.34-5.373,7.767-9.843C26.171,1783.404,20.747,1777.417,14,1777.417z M9.809,1782.441
-		c0.319-0.93,2.039,0.542,1.117,1.35c-0.221,0.194-1.419,0.162-1.165-0.117c0.102-0.111,0.258-0.112,0.359-0.252
-		C10.383,1783.058,9.973,1782.728,9.809,1782.441z M17.977,1795.363c-0.031,0.369-0.289,1.285-0.792,1.285
-		c-0.365,0-0.361-0.514-0.324-0.764c0.134-0.894,0.514-1.061,1-1.731C18.197,1794.437,18.008,1794.989,17.977,1795.363z
-		 M19.123,1788.993c-0.439,0.469-1.095,1.211-1.814,1.208c-0.489-0.002-0.536-1.513-1.126-1.793c-0.3-0.143-0.718,0.196-0.477,0.49
-		c0.264,0.319,0.261,0.751,0.598,1.027c0.583,0.478,1.105,1.027,1.867,0.441c-0.077,0.894-0.754,1.4-1.279,2.045
-		c-0.295,0.363-0.531,0.77-0.436,1.255c0.08,0.408,0.374,0.961,0.045,1.334c-0.217,0.247-0.706,0.385-0.724,0.773
-		c0.055,0.146,0.077,0.296,0.065,0.45c-0.103,0.215-0.327,0.356-0.442,0.577c-0.219,0.422-0.675,1.242-1.165,1.401
-		c-0.24,0.078-0.857,0.282-1.045,0.045c-0.499-0.628-0.325-2.09-0.617-2.824c-0.193-0.485,0.17-0.724,0.177-1.176
-		c0.005-0.346-0.233-0.637-0.395-0.922c-0.208-0.365-0.165-0.61-0.15-1.007c0.013-0.376-0.35-0.189-0.554-0.308
-		c-0.229-0.133-0.254-0.431-0.579-0.228c-0.28,0.172-1.142,0.317-1.462,0.262c-0.464-0.08-1.028-1.08-1.146-1.495
-		c-0.109-0.389,0.187-0.762,0.078-1.088c-0.115-0.343-0.015-0.658,0.211-0.927c0.345-0.408,0.759-1.094,1.203-1.36
-		c0.316-0.189,0.728-0.006,1.103-0.108c0.335-0.091,0.834-0.211,1.189-0.13c0.372,0.084-0.047,0.452,0.199,0.588
-		c0.287,0.158,0.494,0.299,0.764,0.471c0.278,0.176,0.381-0.319,0.582-0.368c0.243-0.059,0.576-0.094,0.823-0.044
-		c0.479,0.102,1.458-0.229,0.978-0.94c-0.169-0.249-0.624-0.322-0.88-0.429c-0.317-0.132-0.127-0.671-0.554-0.65
-		c-0.319,0.079,0.118,0.412,0.01,0.598c-0.197,0.339-0.569-0.376-0.62-0.468c-0.06-0.107-0.757-1.071-0.978-0.862
-		c-0.075,0.071,1.173,1.492,0.225,1.215c-0.003-0.375-0.39-0.413-0.594-0.662c-0.284-0.347-0.512-0.192-0.828,0.084
-		c-0.31,0.271-0.758,0.647-1.131,0.826c-0.814,0.391-0.687-0.448-0.664-0.936c0.015-0.326,0.498-0.174,0.672-0.25
-		c0.529-0.233,0.011-0.48-0.125-0.703c0.155-0.232,1.094-0.509,1.359-0.578c0.594-0.158,1.093-0.646,1.82-0.285
-		c0.095,0.045,1.007-0.524,0.356-0.687c-0.722-0.43-0.754,0.194-1.301,0.362c-0.005-0.604-1.482-0.658-0.928-1.467
-		c0.453-0.66,0.82-0.752,2.101-0.846c0.937-0.062,1.39-0.031,1.593,0.141s0.265,0.79-0.223,0.852
-		c0.091,0.807,0.936,0.062,1.258-0.146c0.532-0.341,1.657-0.131,1.808-0.253s-0.101-0.469,0.032-0.688
-		c0.125-0.207,0.441-0.102,0.483,0.109c0.574,0.092,0.845-0.334,1.454,0.071c1.841,1.226,3.267,2.99,3.994,5.846
-		c0.326,1.281,0.387,2.713,0.013,2.609c-0.251-0.069-0.13-0.629-0.297-0.789c-0.433,0.102-1.163,0.822-1.352,1.221
-		c-0.118,0.249,0.115,1.214-0.402,1.214c-0.209,0-0.312-0.771-0.343-0.901c-0.089-0.379-0.158-0.782-0.324-1.138
-		c-0.189-0.407-0.361-0.15-0.659-0.209c-0.384-0.076-0.295-0.591-0.837-0.637C19.232,1788.166,19.058,1788.562,19.123,1788.993z"/>
-</g>
-<g id="collapse_x5F_top">
-	<path d="M440,1751h11c2.205,0,4-1.794,4-4v-11c0-2.206-1.795-4-4-4h-11c-2.205,0-4,1.794-4,4v11
-		C436,1749.206,437.795,1751,440,1751z M438,1735c0-0.55,0.45-1,1-1h13c0.55,0,1,0.45,1,1v13c0,0.55-0.45,1-1,1h-13
-		c-0.55,0-1-0.45-1-1V1735z M441.5,1744c-0.55,0-0.733-0.576-0.408-1.019l3.816-5.3c0.325-0.442,0.858-0.496,1.184-0.053
-		l3.816,5.379c0.325,0.442,0.142,0.992-0.408,0.992H441.5z"/>
-</g>
-<g id="collapse">
-	<path d="M388,1736v11c0,2.205,1.794,4,4,4h11c2.206,0,4-1.795,4-4v-11c0-2.205-1.794-4-4-4h-11C389.794,1732,388,1733.795,388,1736
-		z M404,1734c0.55,0,1,0.45,1,1v13c0,0.55-0.45,1-1,1h-13c-0.55,0-1-0.45-1-1v-13c0-0.55,0.45-1,1-1H404z M395,1737.5
-		c0-0.55,0.576-0.733,1.019-0.408l5.3,3.816c0.442,0.325,0.496,0.858,0.053,1.184l-5.379,3.816
-		c-0.442,0.325-0.992,0.142-0.992-0.408V1737.5z"/>
-</g>
-<g id="expand">
-	<path d="M355,1732h-11c-2.205,0-4,1.794-4,4v11c0,2.206,1.795,4,4,4h11c2.205,0,4-1.794,4-4v-11
-		C359,1733.794,357.205,1732,355,1732z M357,1748c0,0.55-0.45,1-1,1h-13c-0.55,0-1-0.45-1-1v-13c0-0.55,0.45-1,1-1h13
-		c0.55,0,1,0.45,1,1V1748z M353.5,1739c0.55,0,0.733,0.576,0.408,1.019l-3.816,5.3c-0.325,0.442-0.858,0.496-1.184,0.053
-		l-3.816-5.379c-0.325-0.442-0.142-0.992,0.408-0.992H353.5z"/>
-</g>
-<g id="security_x5F_camera_1_">
-	<path id="security_x5F_camera" d="M299,1729h8c0,1.861-1.278,3.412-3,3.858v4.487l-2,1.061v-5.548
-		C300.278,1732.412,299,1730.861,299,1729z M309.856,1735.471l-18.747,10.402l0.402,0.733l8.112,3.437l13.983-8.073
-		L309.856,1735.471z M313.981,1742.633l-13.93,8.107l0.698,1.188l13.929-8.107L313.981,1742.633z M291.172,1749.208l2,3.464
-		l4.219-2.188l-4.675-2.091L291.172,1749.208z"/>
-</g>
-<g id="restart">
-	<path d="M259.63,1730.414c0.665,0.355,1.291,0.773,1.874,1.244l-2.133,2.132c-0.286-0.215-0.583-0.413-0.894-0.593L259.63,1730.414
-		z M246.035,1732.043l2.114,2.115c0.501-0.43,1.047-0.806,1.634-1.118l-1.145-2.764
-		C247.692,1730.751,246.819,1731.346,246.035,1732.043z M263.34,1733.496l-2.134,2.135c0.152,0.205,0.297,0.416,0.432,0.635
-		l2.795-1.157C264.11,1734.541,263.746,1734.002,263.34,1733.496z M255,1732.05c0.464,0.052,0.914,0.145,1.354,0.264l1.153-2.786
-		c-0.803-0.246-1.643-0.404-2.507-0.477V1732.05z M251.354,1732.387c0.529-0.162,1.08-0.275,1.646-0.338v-2.998
-		c-0.968,0.079-1.902,0.273-2.792,0.57L251.354,1732.387z M264.361,1746.035l-6.835,0.002c-0.276-0.006-0.37,0.174-0.21,0.396
-		l1.512,2.12c-1.495,0.961-2.828,1.424-4.828,1.431v0.008c-5-0.001-9.005-4.03-9.003-9.001c0-2.231,0.818-4.27,2.162-5.842
-		l-2.115-2.115c-1.888,2.12-3.047,4.904-3.047,7.963c0,6.615,5.003,11.994,12.003,11.994v-0.002c2-0.006,4.512-0.643,6.53-1.961
-		l0.058-0.039l1.477,2.046c0.162,0.224,0.362,0.188,0.443-0.073l2.206-6.439C264.796,1746.259,264.637,1746.041,264.361,1746.035z
-		 M262.749,1738.729c0.038,0.161,0.071,0.271,0.101,0.271h3.028c-0.074,0-0.187-1.001-0.336-1.535L262.749,1738.729z"/>
-</g>
-<g id="cloud_x5F_download">
-	<g>
-		<path d="M201.173,1746.001L204,1746v-6.616c0-0.275,0.132-0.384,0.407-0.384l3.203,0.001c0.275,0,0.39,0.108,0.39,0.384v6.616
-			h2.85c0.148,0,0.195,0.143,0.104,0.26l-4.793,5.667c-0.051,0.065-0.119,0.088-0.186,0.088c-0.053,0-0.104-0.03-0.144-0.083
-			l-4.764-5.681C200.977,1746.134,201.025,1746.001,201.173,1746.001z M214.339,1737.969c0-0.011,0.002-0.02,0.002-0.029
-			c0-3.805-3.009-6.889-6.719-6.889c-3.001,0-5.543,2.019-6.404,4.804c-0.332-0.071-0.676-0.109-1.028-0.109
-			c-2.774,0-5.024,2.593-5.024,5.438c0,0.179,0.009-0.184,0.026,0.816c-0.007,0-0.015,0-0.021,0c-1.64,0-2.968,1.346-2.968,3.025
-			c0,1.494,0.95,2.975,2.432,2.975c0.479,0,2.896,0,5.942,0l-0.658-0.784l-0.021-0.024l-0.02-0.025
-			c-0.396-0.516-0.469-1.188-0.189-1.755c0.276-0.562,0.845-0.91,1.484-0.91h1.376v-5.116c0-1.074,0.819-1.884,1.972-1.884h3
-			c1.146,0,1.978,0.792,1.978,1.884v5.116h1.35c0.639,0,1.208,0.351,1.484,0.914c0.28,0.572,0.206,1.248-0.194,1.765l-0.02,0.025
-			l-0.021,0.024l-0.652,0.771c2.7,0,4.628,0,4.628,0c1.719-1,2.925-2.777,2.925-4.818
-			C219,1740.506,216.927,1738.062,214.339,1737.969z"/>
-	</g>
-</g>
-<g id="cloud_x5F_upload">
-	<g>
-		<path d="M154.098,1743.733l4.734-5.701c0.04-0.053,0.091-0.083,0.144-0.083c0.066,0,0.135,0.022,0.186,0.088l4.793,5.667
-			c0.091,0.117,0.044,0.26-0.104,0.26H161v6.616c0,0.275-0.115,0.384-0.39,0.384l-3.203,0.036c-0.275,0-0.407-0.108-0.407-0.384
-			V1744l-2.797-0.016C154.055,1743.984,154.007,1743.852,154.098,1743.733z M167.339,1737.918c0-0.011,0.002-0.02,0.002-0.029
-			c0-3.805-3.009-6.889-6.719-6.889c-3.001,0-5.543,2.019-6.404,4.804c-0.332-0.071-0.676-0.109-1.028-0.109
-			c-2.774,0-5.024,2.593-5.024,5.438c0,0.179,0.009-0.184,0.026,0.816c-0.007,0-0.015,0-0.021,0c-1.64,0-2.968,1.346-2.968,3.025
-			c0,1.494,0.95,2.975,2.432,2.975c0.572,0,4.499,0,8.366,0v-2.386h-1.827c-0.677,0-1.281-0.37-1.574-0.965
-			c-0.296-0.602-0.22-1.314,0.2-1.86l0.021-0.027l0.022-0.026l4.75-5.663c0.345-0.428,0.846-0.672,1.384-0.672
-			c0.556,0,1.07,0.242,1.419,0.668l4.781,5.653l0.022,0.026l0.021,0.026c0.423,0.547,0.502,1.263,0.205,1.87
-			c-0.293,0.599-0.896,0.97-1.574,0.97H162v2.386c3.625,0,7.075,0,7.075,0c1.719-1,2.925-2.777,2.925-4.818
-			C172,1740.455,169.927,1738.011,167.339,1737.918z"/>
-	</g>
-</g>
-<g id="smoking">
-	<path d="M119.05,1738.984l-3.535-3.535l4.45-4.449l3.536,3.535L119.05,1738.984z M100.986,1749.979
-		c-1.755,2.028,1.506,5.29,3.535,3.535L100.986,1749.979z M118.1,1739.935l-3.536-3.535l-12.582,12.583l3.535,3.535L118.1,1739.935z
-		 M100.282,1747.662c0.444-0.074-0.516-1.625-1.047-3.016c-1.161-3.039,1.144-4.252-0.597-7.641
-		c-0.636-1.237-1.323-2.305-1.767-2.188c-0.337,0.088,0.621,2.376,0.174,4.043c-1.111,4.146-0.629,5.59,1.66,7.904
-		C98.907,1746.969,99.837,1747.736,100.282,1747.662z M97.821,1732.359c0.482,2.216,1.718,2.531,2.296,4.526
-		c0.579,1.995-0.017,4.345,0.279,4.353c0.51,0.014,1.646-1.894,1.393-4.957c-0.168-2.041-1.134-2.896-1.851-4.792
-		c-0.716-1.895-0.511-4.454-0.896-4.139C98.657,1727.664,97.338,1730.145,97.821,1732.359z"/>
-</g>
-<g id="crown">
-	<path d="M69.5,1749h-15c-0.275,0-0.5,0.225-0.5,0.5v3.5h16v-3.5C70,1749.225,69.775,1749,69.5,1749z M55.808,1752H55v-2h0.808V1752
-		z"/>
-	<path d="M73,1733.066c-1.067,0-1.934,0.867-1.934,1.934c0,0.478,0.18,0.909,0.467,1.246L65.5,1741.5l-2.958-9.652
-		c0.802-0.236,1.392-0.969,1.392-1.848c0-1.066-0.866-1.934-1.934-1.934s-1.934,0.867-1.934,1.934c0,0.869,0.577,1.596,1.366,1.839
-		l-2.855,9.661l-6.134-5.226c0.302-0.341,0.49-0.783,0.49-1.274c0-1.066-0.866-1.934-1.934-1.934s-1.934,0.867-1.934,1.934
-		c0,1.068,0.866,1.934,1.934,1.934c0.154,0,0.302-0.022,0.445-0.057L54,1746.5v1c0,0.275,0.225,0.5,0.5,0.5h15
-		c0.275,0,0.5-0.225,0.5-0.5v-1l2.486-9.645c0.165,0.046,0.334,0.078,0.514,0.078c1.067,0,1.934-0.865,1.934-1.934
-		C74.934,1733.934,74.067,1733.066,73,1733.066z M55.808,1747H55v-0.631l-2.265-8.532l1.043,0.889l2.029,7.644V1747z
-		 M59.908,1743.259l-0.645-0.55l2.73-9.239l0.411,1.342L59.908,1743.259z M70.958,1738.928l-5.156,4.489l-0.17-0.706l5.56-4.842
-		L70.958,1738.928z"/>
-</g>
-<g id="bug">
-	<path d="M25,1751c0,0.553-0.448,1-1,1h-2.414l-2-2H18.51c-0.883,1.695-2.284,3-4.51,3s-3.627-1.305-4.51-3H8.414l-2,2H4
-		c-0.552,0-1-0.447-1-1s0.448-1,1-1h1.586l2-2h1.12c-0.301-1.037-0.476-2.088-0.576-3H5.518l-2.199-2.235
-		c-0.387-0.394-0.382-1.026,0.012-1.414c0.394-0.386,1.027-0.382,1.414,0.012L6.355,1743H8c-0.008-0.402,0-0.643,0-0.643
-		c0-0.756,0.107-1.463,0.299-2.115c-0.054-0.035-0.113-0.058-0.161-0.104L6,1738.097v-3.52l-0.844-0.874
-		c-0.383-0.397-0.372-1.03,0.025-1.414c0.397-0.383,1.031-0.372,1.414,0.025L8,1733.771v3.471l1.19,1.137
-		c1.096-1.574,2.844-2.521,4.81-2.521c1.941,0,3.67,0.923,4.769,2.462l1.231-1.099v-3.434l1.32-1.451
-		c0.372-0.407,1.005-0.438,1.413-0.067c0.409,0.372,0.438,1.005,0.067,1.413L22,1734.561v3.557l-2.292,2.045
-		c-0.008,0.008-0.019,0.01-0.028,0.017c0.205,0.67,0.32,1.398,0.32,2.179c0,0,0.008,0.24,0,0.643h1.586l1.644-1.644
-		c0.391-0.391,1.023-0.391,1.414,0s0.391,1.023,0,1.414L22.414,1745H19.87c-0.101,0.912-0.275,1.963-0.576,3h1.12l2,2H24
-		C24.552,1750,25,1750.447,25,1751z M17,1735.248v-0.239c0-0.899-0.416-1.701-1.051-2.252l0.921-1.011
-		c0.084-0.092,0.13-0.212,0.13-0.337V1730c0-0.276-0.224-0.5-0.5-0.5s-0.5,0.224-0.5,0.5v1.216l-0.917,1.007
-		c-0.338-0.134-0.702-0.214-1.083-0.214s-0.744,0.08-1.083,0.214L12,1731.216V1730c0-0.276-0.224-0.5-0.5-0.5s-0.5,0.224-0.5,0.5
-		v1.409c0,0.125,0.046,0.245,0.13,0.337l0.921,1.011c-0.635,0.551-1.051,1.353-1.051,2.252v0.239c0.917-0.439,1.93-0.69,3-0.69
-		S16.083,1734.809,17,1735.248z"/>
-</g>
-<g id="file_x5F_export">
-	<path d="M452,1698h-7.65c-0.282,0-0.35-0.103-0.35-0.384c0,0,0-2.716,0-3.111s0.125-0.505,0.35-0.505H452v-2.779
-		c0-0.148,0.166-0.196,0.283-0.105l5.713,4.764c0.053,0.04,0.079,0.091,0.079,0.144c0,0.066-0.031,0.135-0.097,0.186l-5.685,4.793
-		c-0.117,0.091-0.294,0.044-0.294-0.104V1698z M453.196,1702.071c-0.327,0.255-0.479,0.376-0.835,0.376
-		c-0.861,0-1.361-0.695-1.361-1.551V1699h-6.65c-1.047,0-1.35-0.316-1.35-1.384v-3.329c0-1.051,0.605-1.287,1.35-1.287
-		s6.65,0,6.65,0v-1.779c0-0.855,0.497-1.552,1.354-1.552c0.354,0,0.605,0.121,0.887,0.34l1.76,1.55V1688h-6.5
-		c-0.275,0-0.5-0.225-0.5-0.5v-6.5h-11.5c-0.275,0-0.5,0.225-0.5,0.5v23c0,0.275,0.225,0.5,0.5,0.5h18c0.275,0,0.5-0.225,0.5-0.5
-		v-3.949L453.196,1702.071z M449.5,1687h5.5l-6-6v5.5C449,1686.775,449.225,1687,449.5,1687z"/>
-</g>
-<g id="file_x5F_import">
-	<path d="M403,1686.5v-5.5l6,6h-5.5C403.225,1687,403,1686.775,403,1686.5z M402.5,1688c-0.275,0-0.5-0.225-0.5-0.5v-6.5h-11.5
-		c-0.275,0-0.5,0.225-0.5,0.5v11.5h4v-1.779c0-0.973,0.516-1.651,1.396-1.651c0.352,0,0.589,0.107,0.913,0.357l5.711,4.799
-		c0.37,0.278,0.583,0.766,0.583,1.297c0,0.529-0.26,1.028-0.7,1.371l-5.521,4.755c-0.366,0.285-0.612,0.399-0.978,0.399
-		c-0.885,0-1.404-0.679-1.404-1.651V1699h-4v5.5c0,0.275,0.225,0.5,0.5,0.5h18c0.275,0,0.5-0.225,0.5-0.5V1688H402.5z M395,1700.896
-		c0,0.148,0.177,0.195,0.294,0.104l5.685-4.793c0.065-0.051,0.097-0.119,0.097-0.186c0-0.053-0.026-0.104-0.079-0.144l-5.713-4.764
-		c-0.117-0.091-0.283-0.043-0.283,0.105V1694h-7.65c-0.35,0-0.35,0.244-0.35,0.505s0,3.111,0,3.111c0,0.281,0.067,0.384,0.35,0.384
-		H395V1700.896z"/>
-</g>
-<g id="suitcase">
-	<path d="M359,1686h-4v-1c0-1.654-1.346-3-3-3h-4c-1.654,0-3,1.346-3,3v1h-4c-1.65,0-3,1.35-3,3v12c0,1.65,1.35,3,3,3h18
-		c1.65,0,3-1.35,3-3v-12C362,1687.35,360.65,1686,359,1686z M342.5,1702h-2c-0.275,0-0.5-0.225-0.5-0.5v-2
-		c0-0.275,0.159-0.341,0.354-0.146l2.293,2.293C342.841,1701.841,342.775,1702,342.5,1702z M342.646,1688.354l-2.293,2.293
-		c-0.194,0.194-0.354,0.129-0.354-0.146v-2c0-0.275,0.225-0.5,0.5-0.5h2C342.775,1688,342.841,1688.159,342.646,1688.354z M353,1686
-		h-6v-1c0-0.552,0.449-1,1-1h4c0.551,0,1,0.448,1,1V1686z M360,1701.5c0,0.275-0.225,0.5-0.5,0.5h-2
-		c-0.275,0-0.341-0.159-0.146-0.354l2.293-2.293c0.194-0.194,0.354-0.129,0.354,0.146V1701.5z M360,1690.5
-		c0,0.275-0.159,0.341-0.354,0.146l-2.293-2.293c-0.194-0.194-0.129-0.354,0.146-0.354h2c0.275,0,0.5,0.225,0.5,0.5V1690.5z"/>
-	<path opacity="0.3" d="M340.354,1690.646c-0.194,0.194-0.354,0.129-0.354-0.146v-2c0-0.275,0.225-0.5,0.5-0.5h2
-		c0.275,0,0.341,0.159,0.146,0.354L340.354,1690.646z M340.354,1699.354c-0.194-0.194-0.354-0.129-0.354,0.146v2
-		c0,0.275,0.225,0.5,0.5,0.5h2c0.275,0,0.341-0.159,0.146-0.354L340.354,1699.354z M359.646,1690.646
-		c0.194,0.194,0.354,0.129,0.354-0.146v-2c0-0.275-0.225-0.5-0.5-0.5h-2c-0.275,0-0.341,0.159-0.146,0.354L359.646,1690.646z
-		 M357.354,1701.646c-0.194,0.194-0.129,0.354,0.146,0.354h2c0.275,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.159-0.341-0.354-0.146
-		L357.354,1701.646z"/>
-</g>
-<g id="dumbbell">
-	<path d="M315,1693v-1h-2v-3c0-0.553-0.448-1-1-1h-1c-0.552,0-1,0.447-1,1v-2c0-0.55-0.45-1-1-1h-1c-0.55,0-1,0.45-1,1v5h-10v-5
-		c0-0.55-0.45-1-1-1h-1c-0.55,0-1,0.45-1,1v2c0-0.553-0.448-1-1-1h-1c-0.552,0-1,0.447-1,1v3h-2v1h2v0.5h-2v2.5h2v3
-		c0,0.553,0.448,1,1,1h1c0.552,0,1-0.447,1-1v2c0,0.55,0.45,1,1,1h1c0.55,0,1-0.45,1-1v-5h10v5c0,0.55,0.45,1,1,1h1
-		c0.55,0,1-0.45,1-1v-2c0,0.553,0.448,1,1,1h1c0.552,0,1-0.447,1-1v-3h2v-2.5h-2v-0.5H315z M293,1689.5h-1v-0.5h1V1689.5z
-		 M296,1687.5h-1v-0.5h1V1687.5z M309,1687.5h-1v-0.5h1V1687.5z M312,1689.5h-1v-0.5h1V1689.5z"/>
-</g>
-<g id="bullhorn">
-	<path d="M265,1682c-0.55,0-1,0.45-1,1v17c0,0.55,0.45,1,1,1s1-0.45,1-1v-17C266,1682.45,265.55,1682,265,1682z"/>
-	<path d="M241,1691v1c0,1.104,0.896,2,2,2v-5C241.896,1689,241,1689.896,241,1691z"/>
-	<path d="M245,1688c-0.55,0-1,0.45-1,1v5c0,0.286,0.125,0.541,0.319,0.723l1.165,6.294c0.1,0.541,0.632,0.983,1.182,0.983h1.668
-		c0.55,0,0.931-0.444,0.847-0.988l-0.935-6.012H249l14,5v-17l-14,5H245z M262,1684.419v0.784l-12.826,4.581V1689L262,1684.419z"/>
-</g>
-<g id="vases">
-	<path d="M217.929,1699.928C217.929,1696,214,1695,214,1694s1-2,1-2h-6c0,0,1,1,1,2s-4,1.855-4,5.928s3.538,4.072,3.538,4.072H208
-		v0.542V1705h8v-0.458V1704h-1.472C214.528,1704,217.929,1703.855,217.929,1699.928z M210.099,1696.287
-		c-1.101,0.791-2.349,1.688-2.349,3.641c0,1.092,0.338,1.711,0.747,2.072h-0.918c-0.333-0.453-0.578-1.104-0.578-2.072
-		c0-2.21,1.418-3.229,2.557-4.047c0.394-0.283,0.772-0.559,1.044-0.881h0.862C211.143,1695.531,210.602,1695.926,210.099,1696.287z"
-		/>
-	<path d="M202,1703c0-2,3.929-7,3.929-12s-2.929-5-2.929-7c0-1.697,1-3,1-3h-8c0,0,1,1.303,1,3c0,2-3,2-3,7s4,10,4,12
-		c0,0.5-0.125,0.812-0.312,1H196v1h8v-1h-1.688C202.125,1703.812,202,1703.5,202,1703z M197.562,1699.059
-		c-1.142-2.329-2.562-5.228-2.562-8.059c0-2.664,0.916-3.59,1.724-4.441c0.178-0.188,0.361-0.559,0.533-0.559h0.874
-		c-0.247,0-0.532,0.627-0.793,0.902c-0.78,0.822-1.586,1.652-1.586,4.117c0,2.716,1.392,5.546,2.512,7.83
-		c0.4,0.816,0.738,1.511,0.996,2.15h-0.794C198.226,1700.427,197.92,1699.789,197.562,1699.059z"/>
-</g>
-<g id="nameplate_x5F_alt">
-	<g>
-		<path d="M170,1697v-1v-12c0-1.1-0.9-2-2-2h-20c-1.1,0-2,0.9-2,2v12v1H170z M160,1686h7v1h-7V1686z M160,1688h7v1h-7V1688z
-			 M160,1690h7v1h-7V1690z M160,1692h7v1h-7V1692z M160,1694h5v1h-5V1694z M149,1686.9c0-0.498,0.447-0.9,1-0.9h7
-			c0.553,0,1,0.402,1,0.9v7.199c0,0.498-0.447,0.9-1,0.9h-7c-0.553,0-1-0.402-1-0.9V1686.9z"/>
-		<path d="M146,1698v4c0,1.1,0.9,2,2,2h4v-2h-1.5c-0.275,0-0.5-0.225-0.5-0.5v-1c0-0.275,0.225-0.5,0.5-0.5h4
-			c0.275,0,0.5,0.225,0.5,0.5v1c0,0.275-0.225,0.5-0.5,0.5H153v2h10v-2h-1.5c-0.275,0-0.5-0.225-0.5-0.5v-1
-			c0-0.275,0.225-0.5,0.5-0.5h4c0.275,0,0.5,0.225,0.5,0.5v1c0,0.275-0.225,0.5-0.5,0.5H164v2h4c1.1,0,2-0.9,2-2v-4H146z"/>
-		<path d="M150.465,1692.143c0-0.282,0.053-0.397,0.269-0.521c0.173-0.1,1.649-0.577,2.196-0.812v-0.558
-			c-0.289-0.077-0.616-0.529-0.616-0.818c0-0.671,0-1.226,0-1.226c0-0.663,0.432-1.205,1.231-1.209
-			c0.8,0.004,1.232,0.546,1.232,1.209c0,0,0,0.555,0,1.226c0,0.289-0.327,0.741-0.616,0.818v0.558
-			c0.547,0.234,2.023,0.712,2.196,0.812c0.215,0.123,0.268,0.238,0.268,0.521c0,0.115,0,0.633,0,0.633
-			c0,0.073-0.061,0.134-0.134,0.134h-2.946H150.6c-0.074,0-0.135-0.061-0.135-0.134
-			C150.465,1692.775,150.465,1692.258,150.465,1692.143z"/>
-	</g>
-	<path opacity="0.5" d="M170,1698h-24v-1h24V1698z"/>
-</g>
-<g id="nameplate">
-	<path d="M120,1685h-4.002c0,0.008,0.002,0.014,0.002,0.021V1686c0,1.269-0.741,2-2.021,2h-7.957c-1.28,0-2.021-0.731-2.021-2
-		v-0.979c0-0.008,0.001-0.014,0.002-0.021H100c-1.104,0-2,0.896-2,2v14c0,1.104,0.896,2,2,2h20c1.104,0,2-0.896,2-2v-14
-		C122,1685.896,121.104,1685,120,1685z M110,1699.1c0,0.498-0.447,0.9-1,0.9h-7c-0.553,0-1-0.402-1-0.9v-7.199
-		c0-0.498,0.447-0.9,1-0.9h7c0.553,0,1,0.402,1,0.9V1699.1z M117,1700h-5v-1h5V1700z M119,1698h-7v-1h7V1698z M119,1696h-7v-1h7
-		V1696z M119,1694h-7v-1h7V1694z M119,1692h-7v-1h7V1692z"/>
-	<path d="M106.021,1687h7.957c0.551,0,1.021-0.45,1.021-1v-0.979c0-0.55-0.471-1.021-1.021-1.021H112v-0.916
-		c0-0.55-0.45-1.084-1-1.084h-2c-0.55,0-1,0.534-1,1.084V1684h-1.979c-0.551,0-1.021,0.472-1.021,1.021V1686
-		C105,1686.55,105.471,1687,106.021,1687z"/>
-	<path d="M102.412,1697.138c0-0.282,0.053-0.397,0.269-0.521c0.173-0.1,1.649-0.577,2.196-0.812v-0.558
-		c-0.289-0.077-0.616-0.529-0.616-0.818c0-0.671,0-1.226,0-1.226c0-0.663,0.432-1.205,1.231-1.209
-		c0.8,0.004,1.232,0.546,1.232,1.209c0,0,0,0.555,0,1.226c0,0.289-0.327,0.741-0.616,0.818v0.558
-		c0.547,0.234,2.023,0.712,2.196,0.812c0.215,0.123,0.268,0.238,0.268,0.521c0,0.115,0,0.633,0,0.633
-		c0,0.073-0.061,0.134-0.134,0.134h-2.946h-2.945c-0.074,0-0.135-0.061-0.135-0.134
-		C102.412,1697.771,102.412,1697.253,102.412,1697.138z"/>
-</g>
-<g id="book_x5F_open">
-	<path d="M73,1685.8v-1.323c0,0-2.292-1.328-5.74-1.328s-5.26,1.25-5.26,1.25s-1.812-1.25-5.26-1.25s-5.74,1.328-5.74,1.328v1.323
-		l-1,0.531v0.021v15.687c0,0,4.531-1.578,7-1.578s5,0.885,5,0.885s2.532-0.885,5-0.885c0.306,0,0.643,0.024,1,0.066v4.325
-		l1.531-2.016l1.469,2.016v-3.72c2,0.43,3,0.906,3,0.906v-15.687v-0.021L73,1685.8z M61,1698.03c-1-0.292-2.584-0.679-3.98-0.679
-		c-2.246,0-3.02,0.404-4.02,0.699v-12.417c0,0,1.125-0.699,4.02-0.699c1.694,0,2.98,0.417,3.98,1.126V1698.03z M71,1698.051
-		c-1-0.295-1.773-0.699-4.02-0.699c-1.396,0-2.981,0.387-3.98,0.679v-11.97c1-0.709,2.286-1.126,3.98-1.126
-		c2.895,0,4.02,0.699,4.02,0.699V1698.051z"/>
-</g>
-<g id="shopping_x5F_bag_1_">
-	<path id="shopping_x5F_bag" d="M21.6,1684v-1c0-1.985-1.615-3.601-3.6-3.601h-3c-0.961,0-1.831,0.384-2.477,1H11
-		c-1.985,0-3.6,1.615-3.6,3.601H6l-4,4v17h19l4-4v-17H21.6z M20.4,1683v1H17.6c0-1.586-1.038-2.921-2.464-3.399H18
-		C19.324,1680.601,20.4,1681.677,20.4,1683z M8.6,1688v-2H16.4v2H8.6z M12.6,1684v-1c0-0.523,0.173-1.005,0.459-1.399H14
-		c1.324,0,2.4,1.076,2.4,2.399H12.6z M11,1681.601h0.684c-0.182,0.431-0.283,0.903-0.283,1.399v1H8.6
-		C8.6,1682.677,9.676,1681.601,11,1681.601z M5,1687.999L7,1686h0.4v2L5,1687.999L5,1687.999z M20.5,1688h-2.9v-2h4.9L20.5,1688z"/>
-</g>
-<g id="fullscreen">
-	<path d="M458,1633v7h-2v-5h-5v-2H458z M436,1640v-5h5v-2h-7v7H436z M456,1650v5h-5v2h7v-1v-6H456z M436,1650h-2v7h7v-2h-5V1650z"/>
-	<path d="M451.561,1641.561l2.086,2.086c0.194,0.194,0.354,0.129,0.354-0.146v-6c0-0.275-0.225-0.5-0.5-0.5h-6
-		c-0.275,0-0.341,0.159-0.146,0.354l2.086,2.086l-3.438,3.438l-3.439-3.439l2.085-2.085c0.194-0.194,0.129-0.354-0.146-0.354h-6
-		c-0.275,0-0.5,0.225-0.5,0.5v6c0,0.275,0.159,0.341,0.354,0.146l2.087-2.087l3.439,3.439l-3.44,3.44l-2.086-2.086
-		c-0.194-0.194-0.354-0.129-0.354,0.146v6c0,0.275,0.225,0.5,0.5,0.5h6c0.275,0,0.341-0.159,0.146-0.354l-2.086-2.086l3.44-3.44
-		l3.439,3.439l-2.087,2.087c-0.194,0.194-0.129,0.354,0.146,0.354h6c0.275,0,0.5-0.225,0.5-0.5v-6c0-0.275-0.159-0.341-0.354-0.146
-		l-2.085,2.085l-3.439-3.439L451.561,1641.561z"/>
-</g>
-<g id="hand_x5F_down">
-	<path opacity="0.3" d="M398.726,1650.692L405,1648.9v-5.727l-1.618-3.174H403v7.328c0,0-5,0.766-5,3.297c0,0.494,0,0.817,0,1.029
-		C398,1651.208,398.296,1650.815,398.726,1650.692z"/>
-	<path d="M397,1659.021c-1.491,0-3-1.116-3-3.25c0-1.877,0.009-4.904,0.015-6.908l-2.292,1.754
-		c-0.397,0.306-0.961,0.267-1.315-0.088l-1.66-1.663c-0.302-0.303-0.378-0.765-0.189-1.148l4.545-9.19
-		c0.169-0.341,0.517-0.526,0.897-0.526h10c0.379,0,0.725,0.183,0.895,0.521l2,3.984c0.069,0.139,0.105,0.276,0.105,0.432v6.717
-		c0,0.446-0.296,0.839-0.726,0.962l-6.274,1.792v3.362C400,1657.904,398.491,1659.021,397,1659.021z M395.021,1645.833
-		c0.151,0,0.304,0.034,0.444,0.104c0.342,0.169,0.535,0.681,0.534,1.062c0,0,0,6.771,0,9.771c0,0.922,0.517,0.745,1,0.745
-		s1,0.177,1-0.745v-5.116c0-0.446,0.296-0.839,0.726-0.962L405,1648.9v-5.727l-1.618-3.174h-8.76l-3.953,7.99l0.535,0.521
-		l3.21-2.464C394.592,1645.91,394.806,1645.833,395.021,1645.833z M393,1633v1.188v1.75V1636h0.013c0.034,0.52,0.46,1,0.987,1h11
-		c0.527,0,0.953-0.48,0.987-1H406v-0.062V1633H393z"/>
-</g>
-<g id="hand_x5F_up">
-	<path opacity="0.3" d="M357,1641.037l-6.274-1.792c-0.43-0.123-0.726-0.516-0.726-0.962c0,0.212,0,0.535,0,1.029
-		c0,2.531,5,3.297,5,3.297V1650h0.342l0.121-0.162l1.537-3.074V1641.037z"/>
-	<path d="M356,1652h-10c-0.381,0-0.729-0.217-0.897-0.558l-4.545-9.222c-0.188-0.384-0.112-0.846,0.189-1.148l1.66-1.663
-		c0.356-0.354,0.92-0.394,1.315-0.088l2.292,1.754c-0.006-2.004-0.015-5.031-0.015-6.908c0-2.134,1.509-3.146,3-3.146
-		s3,1.013,3,3.146v3.362l6.274,1.792c0.43,0.123,0.726,0.516,0.726,0.962V1647c0,0.155-0.036,0.309-0.105,0.447l-2,4
-		C356.725,1651.786,356.379,1652,356,1652z M346.622,1650h8.76l1.618-3.236v-5.727l-6.274-1.792
-		c-0.43-0.123-0.726-0.516-0.726-0.962v-5.116c0-0.922-0.517-0.698-1-0.698s-1-0.224-1,0.698c0,2.999,0,9.833,0,9.833
-		c0.001,0.382-0.192,0.831-0.534,1c-0.341,0.171-0.749,0.132-1.052-0.102l-3.21-2.456l-0.535,0.536L346.622,1650z M357,1653h-11
-		c-0.549,0-1,0.45-1,1v3h13v-3C358,1653.45,357.551,1653,357,1653z"/>
-</g>
-<g id="hand_x5F_left">
-	<path d="M304,1654h-6.717c-0.446,0-0.839-0.296-0.961-0.726l-1.793-6.274h-3.362c-2.134,0-3.167-1.509-3.167-3
-		c0-0.791,0.221-1.53,0.772-2.082c0.418-0.419,1.174-0.918,2.395-0.918c1.877,0,4.904,0.009,6.908,0.015l-1.753-2.292
-		c-0.305-0.398-0.268-0.961,0.087-1.315l1.663-1.66c0.303-0.302,0.765-0.379,1.148-0.189l9.222,4.545
-		c0.342,0.169,0.558,0.517,0.558,0.897v10c0,0.379-0.214,0.725-0.553,0.895l-4,2C304.309,1653.964,304.155,1654,304,1654z
-		 M298.038,1652h5.727l3.236-1.618v-8.76l-8.022-3.953l-0.536,0.535l2.457,3.21c0.232,0.303,0.271,0.7,0.102,1.041
-		c-0.169,0.341-0.516,0.545-0.896,0.545c-0.001,0-0.002,0-0.003,0c0,0-6.853-0.011-9.851-0.011c-0.424,0-0.688,0.37-0.688,1.011
-		s0.234,1,0.688,1h5.033c0.446,0,0.839,0.296,0.961,0.726L298.038,1652z M311,1640c-0.55,0-1,0.451-1,1v11c0,0.551,0.45,1,1,1h3v-13
-		H311z"/>
-	<path opacity="0.3" d="M299.906,1652h-1.832l-1.793-6.274c-0.123-0.43-0.515-0.726-0.961-0.726c0.212,0,0.536,0,1.029,0
-		C299.077,1645,299.747,1650,299.906,1652z"/>
-</g>
-<g id="hand_x5F_right">
-	<path opacity="0.3" d="M256.131,1652h1.832l1.793-6.274c0.123-0.43,0.515-0.726,0.961-0.726c-0.212,0-0.536,0-1.029,0
-		C256.96,1645,256.29,1650.022,256.131,1652z"/>
-	<path d="M258.717,1654H252c-0.155,0-0.309-0.036-0.447-0.105l-4-2c-0.339-0.17-0.553-0.516-0.553-0.895v-10
-		c0-0.381,0.216-0.729,0.558-0.897l9.222-4.545c0.384-0.189,0.845-0.112,1.148,0.189l1.663,1.66
-		c0.355,0.354,0.393,0.917,0.087,1.315l-1.753,2.292c2.004-0.006,5.03-0.015,6.908-0.015c2.134,0,3.167,1.509,3.167,3
-		s-1.033,3-3.167,3h-3.362l-1.793,6.274C259.556,1653.704,259.163,1654,258.717,1654z M252.236,1652h5.727l1.793-6.274
-		c0.123-0.43,0.515-0.726,0.961-0.726h5.033c0.921,0,0.656-0.517,0.656-1s0.265-1.011-0.656-1.011c-2.999,0-9.851,0.011-9.851,0.011
-		c-0.001,0-0.002,0-0.003,0c-0.38,0-0.727-0.204-0.896-0.545c-0.169-0.341-0.13-0.744,0.102-1.047l2.457-3.207l-0.536-0.533
-		l-8.022,3.954v8.76L252.236,1652z M245,1640h-3v13h3c0.55,0,1-0.449,1-1v-11C246,1640.451,245.55,1640,245,1640z"/>
-</g>
-<g id="thumbs_x5F_down">
-	<polygon opacity="0.3" points="211,1637 209,1637 209,1639 214,1646 216,1646 216,1644 215,1643 	"/>
-	<path d="M211,1637l4,6l1,1v2h-9l1,5v3h-1l-2-4l-3-4v-8h2l2-1H211 M211,1635h-5c-0.311,0-0.617,0.072-0.895,0.211l-1.578,0.789H202
-		c-1.104,0-2,0.896-2,2v8c0,0.433,0.14,0.854,0.4,1.2l2.892,3.855l1.919,3.839c0.339,0.678,1.032,1.105,1.789,1.105h1
-		c1.104,0,2-0.896,2-2v-3c0-0.132-0.013-0.264-0.039-0.393l-0.521-2.607H216c1.104,0,2-0.896,2-2v-2c0-0.53-0.211-1.039-0.586-1.414
-		l-0.86-0.86l-3.89-5.835C212.293,1635.334,211.669,1635,211,1635L211,1635z M198,1636h-4v13h4c0.55,0,1-0.45,1-1v-11
-		C199,1636.45,198.55,1636,198,1636z"/>
-</g>
-<g id="thumbs_x5F_up">
-	<polygon opacity="0.3" points="167,1646 168,1645 168,1643 166,1643 160,1652 163,1652 	"/>
-	<path d="M160,1635v3l-1,5h9v2l-1,1l-4,6h-5l-2-1h-2v-8l3-4l2-4H160 M160,1633h-1c-0.757,0-1.45,0.428-1.789,1.105l-1.919,3.839
-		l-2.892,3.855c-0.26,0.347-0.4,0.768-0.4,1.2v8c0,1.104,0.896,2,2,2h1.528l1.578,0.789c0.278,0.139,0.584,0.211,0.895,0.211h5
-		c0.669,0,1.293-0.334,1.664-0.891l3.89-5.835l0.86-0.86c0.375-0.375,0.586-0.884,0.586-1.414v-2c0-1.104-0.896-2-2-2h-6.561
-		c0,0,0.561-2.868,0.561-3v-3C162,1633.896,161.104,1633,160,1633L160,1633z M150,1641h-4v13h4c0.55,0,1-0.45,1-1v-11
-		C151,1641.45,150.55,1641,150,1641z"/>
-</g>
-<g id="hdd">
-	<path opacity="0.5" d="M120,1653h-1v1h1V1653z"/>
-	<g>
-		<path d="M120,1650c0.512,0,0.986,0.141,1.408,0.367l-3.462-14.392c-0.121-0.536-0.669-0.976-1.219-0.976h-13.455
-			c-0.55,0-1.099,0.439-1.219,0.976l-3.461,14.392c0.422-0.227,0.896-0.367,1.408-0.367H120z M103.025,1636.209
-			c0.021-0.094,0.165-0.209,0.247-0.209h0.897c-0.082,0-0.226,0.115-0.247,0.209L100.846,1649c-0.626,0-0.895,0-0.897,0
-			L103.025,1636.209z"/>
-		<path d="M120,1651h-20c-1.1,0-2,0.9-2,2v1c0,1.1,0.9,2,2,2h20c1.1,0,2-0.9,2-2v-1C122,1651.9,121.1,1651,120,1651z M118,1654h-1
-			v-1h1V1654z M120,1654h-1v-1h1V1654z"/>
-	</g>
-</g>
-<g id="briefcase">
-	<g>
-		<path d="M72,1638h-3v-1h-2c0-1.654-1.346-3-3-3h-4c-1.654,0-3,1.346-3,3h-2v1h-3c-1.1,0-2,0.9-2,2v4.5l3.5,2.5H60v-1.48h4v1.48
-			h6.5l3.5-2.5v-4.5C74,1638.9,73.1,1638,72,1638z M60,1636h4c0.551,0,1,0.448,1,1v1h-6v-1C59,1636.448,59.449,1636,60,1636z"/>
-		<path d="M64,1648v1h-4v-1h-6.938L50,1646v7c0,1.1,0.9,2,2,2h20c1.1,0,2-0.9,2-2v-7l-3,2H64z"/>
-	</g>
-</g>
-<g id="globe">
-	<path d="M14.253,1637.074c-0.281,0.143-0.464,0.462-0.688,0.673c-0.217,0.046-0.426-0.029-0.565-0.202
-		c0.022,0.418-0.536,0.677-0.645,1.109c0.7,0.469,1.792,0.47,2.595,0.644C14.906,1638.547,14.262,1637.87,14.253,1637.074z"/>
-	<path d="M14,1633.417c-6.397,0-11.583,5.187-11.583,11.583s5.186,11.583,11.583,11.583s11.583-5.187,11.583-11.583
-		S20.397,1633.417,14,1633.417z M20.33,1652.812c-1.025,1.122-2.896,2.225-4.438,2.188c-0.307-0.389,0.022-0.541,0.035-0.895
-		c-0.833-0.174-1.319-0.93-1.745-1.598c-0.134-0.843,1.017-1.558,0.708-2.255c-0.547,0.073-1.102-0.064-1.535-0.412
-		c-0.219-0.175-0.399-0.396-0.539-0.638c-0.328-0.166-0.668-0.307-1.01-0.441c-1.07-0.423-2.235-0.802-3.042-1.667
-		c0.066-0.804-0.399-1.24-0.92-1.763c-0.547-0.548-0.29-0.974-0.535-1.693c-0.166-0.484-0.429-0.883-0.394-1.41
-		c0.035-0.517,0.154-1.021,0.338-1.505c0.35-0.923,0.854-1.767,0.944-2.771c0.071-0.42-0.607-0.539-0.089-1.027
-		c0.547-0.516,1.23-1.092,2.027-1.092c0.406,0,0.625,0.208,1.022,0.11c0.382-0.094,0.773-0.157,1.162-0.218
-		c0.797-0.123,1.578-0.272,2.229-0.783l0.055,0.057h0.627l0.056-0.055c0.883,0.731,3.048,0.447,2.754,2.104l-0.026,0.136
-		c-0.75,0.059-1.448-0.047-2.159-0.294c-0.011,0.286,0.042,0.604-0.029,0.886c1.152,0.66,2.66,1.155,3.244,2.46
-		c-0.495,0.621-1.124,0.341-1.791,0.341c-0.215,0.236-0.293,0.414-0.209,0.731c-0.54,0.273-1.041,0.562-1.21,1.18
-		c-0.089,0.322-0.024,0.756-0.145,1.052c-0.166,0.406-0.611,0.653-0.781,1.072c-0.048,0.554,0.255,1.025-0.264,1.466
-		c-0.801-0.002-0.87-0.648-1.479-0.85c-0.543-0.178-1.171-0.025-1.733-0.135c-0.758,0.292-0.681,2.246,0.384,1.878
-		c0.491-0.17,0.531-0.538,1.16-0.416c0.514,0.261,0.21,0.859,0.166,1.271c0.334,0.201,0.831,0.065,1.034,0.489
-		c0.044,0.272-0.103,0.8,0.064,1.024c0.368,0.59,1.529-0.381,1.833-0.486c0.882-0.305,1.877-0.21,2.794-0.248
-		c0.691,0.545,1.792,0.268,2.392,0.973c0.406-0.068,0.734-0.298,1.098,0.037C22.246,1650.955,21.25,1651.928,20.33,1652.812z"/>
-</g>
-<g id="rabbit">
-	<path d="M457.33,1593.678c-1.809-1.413-2.822-1.543-3.287-1.823c0,0-3.638-4.533-7.508-4.771c-2.857-0.176-1.991,1.208-1.395,1.771
-		c3.817-0.532,7.355,2.749,8.094,3.485l-0.041,0.024c-0.912-0.56-5.012-2.913-8.345-2.126c-3.774,0.888-0.771,2.168-0.771,2.168
-		s3.368,1.723,6.682,1.59c-0.321,0.625-0.349,1.485-1.471,1.688c-0.924,0.166-2.841-0.799-3.908-1.304
-		c-2.686-1.264-5.717-1.451-7.98,0.213c-0.469-0.656-1.78-0.867-3.113-0.59c-1.334,0.277-1.564,2.182-0.889,2.629
-		c0.574,0.381,1.617-0.401,1.814,0.211c-0.378,1.877-0.344,1.876,0.084,3.594s1.903,1.89,2.781,2.438
-		c1.105,0.691,1.564,2.652,2.996,3.41c1.232,0.652,3.826,0.34,5.357,0.496c-1.896,1.406-1.541,2.906,2.143,0
-		c0.815,0.056,2.285,0.271,2.41-0.562c0.068-0.46-1.171-0.607-1.781-0.844c1.771-2.062,2.469-4.656,3.896-6.229
-		c0.904-0.997,3.541,0.062,4.77-0.915c0.393-0.312,0.045-0.704-0.043-0.793c0.084,0.073,0.432,0.282,0.908-0.805
-		C459.281,1595.382,459.062,1595.031,457.33,1593.678z M447.455,1605.017c-1.607-0.449-2.768-0.603-3.84-0.891
-		c-0.107-3.024-1.777-3.541-1.887-3.573s0.691-0.242,1.996,0.656c1.812,1.249,4.041,0.187,4.041,0.187
-		S448.352,1603.392,447.455,1605.017z M456.357,1594.839c-0.128,0.347-0.591,0.492-1.031,0.329
-		c-0.443-0.165-0.697-0.577-0.569-0.924c0.128-0.345,0.59-0.491,1.033-0.326C456.23,1594.082,456.486,1594.494,456.357,1594.839z"/>
-</g>
-<g id="turtle">
-	<path d="M408.806,1593.098c-1.526-0.172-2.174,0.021-2.535,2.088l-0.012,0.067c-0.48,0.935-1.286,0.69-1.768,0.158
-		c-1.103-2.945-3.741-5.411-7.992-5.411c-5.184,0-8.499,3.373-8.499,7.396v0.279c-2,0.812-4.164,2.324-2.348,2.324
-		c1.066,0,1.348,0,2.348,0h0.005c0.152,1,0.57,1.091,1.183,1.464l-0.491,2.506c-0.108,0.54-0.421,1.23-0.696,1.506
-		s-0.05,0.524,0.5,0.524h2c0.55,0,0.775-0.225,0.5-0.5s-0.412-0.941-0.304-1.481l0.342-1.71c0.43,0.116,0.894,0.215,1.388,0.295
-		l0.083,0.415c0.108,0.54-0.028,1.206-0.304,1.481s-0.05,0.5,0.5,0.5h2c0.55,0,0.775-0.225,0.5-0.5s-0.588-0.941-0.696-1.481
-		l-0.037-0.185c0.648,0.043,1.323,0.067,2.021,0.067c0.489,0,0.968-0.013,1.435-0.034l-0.23,1.151
-		c-0.108,0.54-0.421,1.206-0.696,1.481s-0.05,0.5,0.5,0.5h2c0.55,0,0.775-0.225,0.5-0.5s-0.412-0.941-0.304-1.481l0.266-1.327
-		c0.883-0.115,1.687-0.281,2.382-0.499l0.165,0.826c0.108,0.54-0.028,1.206-0.304,1.481s-0.05,0.5,0.5,0.5h2
-		c0.55,0,0.775-0.225,0.5-0.5s-0.588-0.941-0.696-1.481l-0.343-1.713c0.667-1.306,3.28-3.51,5.197-3.907l1.35-0.104
-		c0.564-0.001,0.846-0.091,0.981-0.709c0.16-0.731,0.265-0.96,0.306-2.085C412.031,1593.665,408.806,1593.098,408.806,1593.098z"/>
-</g>
-<g id="pin_x5F_flag">
-	<path d="M357.506,1587.564l-1.768-1.768c-0.194-0.194-0.547-0.159-0.785,0.079l-6.914,6.913c-0.238,0.238-0.273,0.592-0.078,0.786
-		l0.354,0.354l-10.607,10.606l-0.707,2.121l2.121-0.707l10.607-10.605l9.192,9.191l0.354-7.424l7.42-0.358L357.506,1587.564z
-		 M349.68,1593.883l-0.447-0.447l6.376-6.377l0.447,0.447L349.68,1593.883z"/>
-</g>
-<g id="iphone_x5F_shake_1_">
-	<g id="iphone_1_">
-		<g opacity="0.3">
-			<g>
-				<rect x="297" y="1589" width="10" height="15"/>
-			</g>
-		</g>
-		<g id="body_1_">
-			<g>
-				<path d="M306.5,1585h-9c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h9c1.375,0,2.5-1.125,2.5-2.5v-19
-					C309,1586.125,307.875,1585,306.5,1585z M302,1608.271c-0.979,0-1.771-0.793-1.771-1.771s0.793-1.771,1.771-1.771
-					s1.771,0.793,1.771,1.771S302.979,1608.271,302,1608.271z M297,1604v-15h10v15H297z"/>
-			</g>
-		</g>
-	</g>
-	<path opacity="0.5" d="M294,1602.654l-3.221-12.02c-0.355-1.328,0.439-2.705,1.768-3.061l1.793-0.48
-		c-0.213,0.459-0.34,0.967-0.34,1.506v2.726l-0.9,0.241l0.9,3.36V1602.654z M310,1602.654l3.233-12.02
-		c0.355-1.328-0.427-2.705-1.755-3.061l-1.801-0.48c0.213,0.459,0.322,0.967,0.322,1.506v2.726l0.9,0.241l-0.9,3.36V1602.654z"/>
-</g>
-<g id="pushpin">
-	<path d="M264.728,1590.929l-5.657-5.657c-0.39-0.39-1.023-0.391-1.414,0c-0.391,0.392-0.391,1.024,0,1.415l0.707,0.707l-4.949,4.95
-		c-1.562-1.562-4.242-1.415-6.363,0.707l4.242,4.242l-8.485,8.485l-0.707,2.121l2.121-0.707l8.485-8.485l4.242,4.242
-		c2.122-2.121,2.27-4.802,0.707-6.363l4.95-4.949l0.707,0.707c0.391,0.39,1.023,0.391,1.415,0
-		C265.119,1591.952,265.118,1591.319,264.728,1590.929z M254.641,1593.594l-0.476-0.476l5.133-5.022l0.438,0.449L254.641,1593.594z"
-		/>
-</g>
-<g id="candle">
-	<path d="M206.083,1584.042c0.709,2.979-7.333,7.812-0.619,9.942c-1.922-1.901,0.474-2.714,0.786-4.297
-		c1.201,0.5,2.979,3.25,1.016,4.312C212.729,1593.667,209.562,1586.312,206.083,1584.042z"/>
-	<path d="M215.5,1605h-19c-0.275,0-0.5,0.225-0.5,0.5v1c0,0.275,0.225,0.5,0.5,0.5h1.5l2,2h12l2-2h1.5c0.275,0,0.5-0.225,0.5-0.5v-1
-		C216,1605.225,215.775,1605,215.5,1605z"/>
-	<path d="M209,1595h-5c-1.1,0-2,0.9-2,2v2.265c-0.56,0.284-1,1.013-1,1.868v3.352h10V1597C211,1595.9,210.1,1595,209,1595z"/>
-</g>
-<g id="bell">
-	<path d="M155.356,1606.995c0.403,1.071,1.431,1.838,2.644,1.838s2.238-0.767,2.643-1.837c-0.836,0.063-1.717,0.104-2.643,0.104
-		C157.073,1607.1,156.193,1607.059,155.356,1606.995z"/>
-	<path d="M168.209,1602h-0.375l-2.5-3l-1.334-7h-0.013c-0.406-2.45-2.28-4.393-4.687-4.921c0.004-0.01,0.013-0.019,0.016-0.028
-		l0.367-1.102c0.174-0.522-0.134-0.949-0.684-0.949h-2c-0.55,0-0.857,0.427-0.684,0.949l0.367,1.102
-		c0.003,0.01,0.012,0.019,0.016,0.028c-2.406,0.528-4.28,2.471-4.687,4.921H152l-1.334,7l-2.5,3h-0.375c-0.55,0-1,0.45-1,1
-		s0.42,1.161,0.934,1.358c0,0,4.275,1.642,10.275,1.642s10.275-1.642,10.275-1.642c0.514-0.197,0.934-0.809,0.934-1.358
-		S168.759,1602,168.209,1602z M153.639,1592.384l-1.316,7.307l-2.905,3.31h-0.783l2.966-3.559l1.399-7.252
-		c0.19-1.146,0.79-2.154,1.632-2.902l0.382,0.475C154.313,1590.37,153.796,1591.438,153.639,1592.384z"/>
-</g>
-<g id="certificate">
-	<g>
-		<polygon points="114.88,1601.088 113.296,1603.937 110.5,1602.26 107.704,1603.937 106.12,1601.088 105,1601.105 105,1610 
-			110.5,1605 116,1609.993 116,1601.105 		"/>
-		<path d="M117.512,1593.5l1.342-2.238l-2.281-1.268l0.043-2.609l-2.609,0.042l-1.268-2.28l-2.238,1.343l-2.238-1.343l-1.268,2.28
-			l-2.609-0.042l0.043,2.609l-2.281,1.268l1.342,2.238l-1.342,2.238l2.281,1.268l-0.043,2.609l2.609-0.042l1.268,2.28l2.238-1.343
-			l2.238,1.343l1.268-2.28l2.609,0.042l-0.043-2.609l2.281-1.268L117.512,1593.5z M109.698,1589.451l-1.01-0.65l-0.576,1.103
-			l-1.246-0.021l0.029,1.267l-1.099,0.613l0.653,0.935l-1.693,1.303l0.481-0.65l-1.008-1.604l1.712-0.913l-0.031-1.941l1.959,0.041
-			l0.951-1.706l1.53,1.011l0.65-0.478L109.698,1589.451z"/>
-	</g>
-</g>
-<g id="dashboard">
-	<path d="M60.041,1591c0,0.55-0.45,1-1,1s-1-0.45-1-1s0.45-1,1-1S60.041,1590.45,60.041,1591z M56.041,1592c-0.55,0-1,0.45-1,1
-		s0.45,1,1,1s1-0.45,1-1S56.591,1592,56.041,1592z M62.041,1591c0.55,0,1-0.45,1-1s-0.45-1-1-1s-1,0.45-1,1S61.491,1591,62.041,1591
-		z M64.779,1593.227c-0.102-0.049-0.249,0.004-0.326,0.117l-2.744,4.008c-0.868,0.146-1.531,0.898-1.531,1.809
-		c0,1.016,0.824,1.84,1.839,1.84s1.839-0.824,1.839-1.84c0-0.4-0.132-0.769-0.35-1.071l1.385-4.534
-		C64.931,1593.423,64.881,1593.275,64.779,1593.227z M55.041,1595c-0.55,0-1,0.45-1,1s0.45,1,1,1s1-0.45,1-1
-		S55.591,1595,55.041,1595z M73.82,1596.979c0,6.506-5.293,11.799-11.799,11.799s-11.8-5.293-11.8-11.799s5.293-11.799,11.8-11.799
-		S73.82,1590.474,73.82,1596.979z M71.261,1596.979c0-5.095-4.146-9.24-9.24-9.24c-5.095,0-9.241,4.146-9.241,9.24
-		s4.146,9.239,9.241,9.239C67.115,1606.219,71.261,1602.074,71.261,1596.979z M69.041,1595c-0.55,0-1,0.45-1,1s0.45,1,1,1
-		s1-0.45,1-1S69.591,1595,69.041,1595z M69.041,1593c0-0.55-0.45-1-1-1s-1,0.45-1,1s0.45,1,1,1S69.041,1593.55,69.041,1593z
-		 M65.041,1590c-0.55,0-1,0.45-1,1s0.45,1,1,1s1-0.45,1-1S65.591,1590,65.041,1590z"/>
-	<path opacity="0.5" d="M64.771,1602c-0.713,0.692-1.683,1.123-2.754,1.123s-2.041-0.431-2.754-1.123h-3.945
-		c1.532,2.039,3.962,3.366,6.703,3.366c2.74,0,5.171-1.327,6.702-3.366H64.771z"/>
-</g>
-<g id="blog">
-	<path d="M20,1586H6.5l-2.5,1.75v0.25v2H3.5c-0.275,0-0.5,0.225-0.5,0.5s0.225,0.5,0.5,0.5H4v1H3.5c-0.275,0-0.5,0.225-0.5,0.5
-		s0.225,0.5,0.5,0.5H4v1H3.5c-0.275,0-0.5,0.225-0.5,0.5s0.225,0.5,0.5,0.5H4v1H3.5c-0.275,0-0.5,0.225-0.5,0.5s0.225,0.5,0.5,0.5H4
-		v1H3.5c-0.275,0-0.5,0.225-0.5,0.5s0.225,0.5,0.5,0.5H4v1H3.5c-0.275,0-0.5,0.225-0.5,0.5s0.225,0.5,0.5,0.5H4v1H3.5
-		c-0.275,0-0.5,0.225-0.5,0.5s0.225,0.5,0.5,0.5H4v1H3.5c-0.275,0-0.5,0.225-0.5,0.5s0.225,0.5,0.5,0.5H4v1H3.5
-		c-0.275,0-0.5,0.225-0.5,0.5s0.225,0.5,0.5,0.5H4v2h15c1.65,0,3-1.35,3-3v-15c0-1.65-1.35-3-3-3H5.734l1.391-1
-		c0,0,12.573,0,12.875,0c1.781,0,3,1.219,3,3c0,1,0,15,0,15l1-2c0,0,0-11,0-13C24,1587.562,22.5,1586,20,1586z M10,1589v19H5v-1h0.5
-		c0.275,0,0.5-0.225,0.5-0.5s-0.225-0.5-0.5-0.5H5v-1h0.5c0.275,0,0.5-0.225,0.5-0.5s-0.225-0.5-0.5-0.5H5v-1h0.5
-		c0.275,0,0.5-0.225,0.5-0.5s-0.225-0.5-0.5-0.5H5v-1h0.5c0.275,0,0.5-0.225,0.5-0.5s-0.225-0.5-0.5-0.5H5v-1h0.5
-		c0.275,0,0.5-0.225,0.5-0.5s-0.225-0.5-0.5-0.5H5v-1h0.5c0.275,0,0.5-0.225,0.5-0.5s-0.225-0.5-0.5-0.5H5v-1h0.5
-		c0.275,0,0.5-0.225,0.5-0.5s-0.225-0.5-0.5-0.5H5v-1h0.5c0.275,0,0.5-0.225,0.5-0.5s-0.225-0.5-0.5-0.5H5v-1h0.5
-		c0.275,0,0.5-0.225,0.5-0.5s-0.225-0.5-0.5-0.5H5v-1H10z"/>
-	<path opacity="0.5" d="M5,1589v1h0.5c0.275,0,0.5,0.225,0.5,0.5s-0.225,0.5-0.5,0.5H5v1h0.5c0.275,0,0.5,0.225,0.5,0.5
-		s-0.225,0.5-0.5,0.5H5v1h0.5c0.275,0,0.5,0.225,0.5,0.5s-0.225,0.5-0.5,0.5H5v1h0.5c0.275,0,0.5,0.225,0.5,0.5s-0.225,0.5-0.5,0.5
-		H5v1h0.5c0.275,0,0.5,0.225,0.5,0.5s-0.225,0.5-0.5,0.5H5v1h0.5c0.275,0,0.5,0.225,0.5,0.5s-0.225,0.5-0.5,0.5H5v1h0.5
-		c0.275,0,0.5,0.225,0.5,0.5s-0.225,0.5-0.5,0.5H5v1h0.5c0.275,0,0.5,0.225,0.5,0.5s-0.225,0.5-0.5,0.5H5v1h0.5
-		c0.275,0,0.5,0.225,0.5,0.5s-0.225,0.5-0.5,0.5H5v1h5v-19H5z"/>
-</g>
-<g id="soccer_x5F_ball">
-	<path d="M446.056,1536.889c-6.647,0-12.056,5.408-12.056,12.056S439.408,1561,446.056,1561s12.056-5.408,12.056-12.056
-		S452.703,1536.889,446.056,1536.889z M454.075,1554.985l-0.908-1.887l-2.944,0.985l-1.079,2.916l1.592,0.838
-		c-1.399,0.739-2.99,1.162-4.68,1.162c-1.792,0-3.472-0.477-4.93-1.301l1.328-0.699l-1.079-2.916l-2.944-0.985l-0.707,1.469
-		c-1.088-1.606-1.724-3.542-1.724-5.623c0-0.585,0.061-1.155,0.157-1.714l1.112,1.301l2.73-2.076l-0.128-3.41l-1.919-0.03
-		c1.209-1.649,2.904-2.915,4.878-3.586l-0.636,1.111l3.805,1.579l3.805-1.558l-0.674-1.188c2.037,0.656,3.786,1.948,5.026,3.639
-		l-2.029,0.032l-0.128,3.41l2.73,2.076l1.207-1.411c0.109,0.593,0.174,1.2,0.174,1.824
-		C456.111,1551.213,455.348,1553.301,454.075,1554.985z"/>
-	<polygon points="442.195,1547.646 443.648,1552 448.352,1552 449.805,1547.616 446,1544.941 	"/>
-</g>
-<g id="podium">
-	<polygon points="405,1545 405,1538 396.5,1538 393,1541.5 401.5,1541.5 401.5,1548.5 409.5,1548.5 409.5,1559 413,1555.5 413,1545 
-			"/>
-	<path d="M401,1542h-8v1h-4l-4,3.5h8v0.5h-8v12h8h8h8v-10h-8V1542z M392,1552h-1v1h-1v1h-1v1h3v1h-4v-1v-1h1v-1h1v-1h1v-1h-3v-1h3v1
-		h1V1552z M398,1545v5h-1v-5h-1v-1h2V1545z M403,1556h3v-1v-1h-3v-1h3v-1h-3v-1h3v1h1v1h-1v1h1v1v1h-1v1h-3V1556z"/>
-</g>
-<g id="sampler">
-	<g>
-		<path d="M342.296,1552h2.224l2.832-3.809l1.604,1.193l-1.943,2.615h1.247l1.5-2.019l1.604,1.193L350.75,1552h1.245l0.17-0.229
-			l0.308,0.229h1.767l-11.19-8.244c-0.446-0.322-1.074-0.297-1.396,0.149l-2.93,4.013c-0.322,0.447-0.222,1.206,0.225,1.528
-			L342.296,1552z M346.549,1547.595l-2.984,4.013l-1.604-1.192l2.982-4.014L346.549,1547.595z M342.535,1544.611l1.606,1.194
-			l-2.983,4.012l-1.605-1.192L342.535,1544.611z"/>
-		<path d="M347.645,1545.33l1.757,1.277l4.438-1.498l0.639,1.896l-3.094,1.044l0.991,0.721l2.424-0.817l0.639,1.895l-1.079,0.364
-			l-0.411-0.299l1.402,1.02l0.406-0.138l0.194,0.574l-0.085-0.062l1.47,1.068l-4.394-13.332c-0.172-0.521-0.74-0.809-1.262-0.636
-			l-4.748,1.564c-0.521,0.173-0.809,0.741-0.637,1.263L347.645,1545.33z M352.88,1542.267l0.64,1.896l-4.738,1.598l-0.64-1.894
-			L352.88,1542.267z M351.92,1539.424l0.641,1.896l-4.737,1.597l-0.641-1.895L351.92,1539.424z"/>
-		<path d="M358,1553h-20c-0.553,0-1,0.447-1,1v5c0,0.553,0.447,1,1,1h20c0.553,0,1-0.447,1-1v-5C359,1553.447,358.553,1553,358,1553
-			z M340,1559h-2v-5h2V1559z M343,1559h-2v-5h2V1559z M346,1559h-2v-5h2V1559z M349,1559h-2v-5h2V1559z M352,1559h-2v-5h2V1559z
-			 M355.5,1558c-0.828,0-1.5-0.672-1.5-1.5s0.672-1.5,1.5-1.5s1.5,0.672,1.5,1.5S356.328,1558,355.5,1558z"/>
-		<path d="M362.982,1539.889l-4.764-1.514c-0.524-0.166-1.09,0.126-1.256,0.65l-1.306,4.104l0.694,2.108l4.409,1.451l-0.627,1.897
-			l-3.004-0.989l-0.406-1.23l0.795,2.412l2.303,0.759l-0.625,1.898l-0.899-0.296l0.389,1.181l0.196,0.064l-0.087,0.266l-0.038-0.115
-			l0.638,1.936l4.238-13.327C363.799,1540.62,363.507,1540.055,362.982,1539.889z M361.073,1545.738l-4.749-1.564l0.625-1.899
-			l4.749,1.564L361.073,1545.738z M362.012,1542.89l-4.749-1.564l0.625-1.9l4.75,1.564L362.012,1542.89z"/>
-	</g>
-	<path opacity="0.5" d="M340,1554h-2v5h2V1554z M343,1554h-2v5h2V1554z M346,1554h-2v5h2V1554z M349,1554h-2v5h2V1554z M352,1554h-2
-		v5h2V1554z M355.349,1550.932l0.407-0.138l0.194,0.574L355.349,1550.932z M352.375,1548.77l2.424-0.817l0.639,1.895l-1.079,0.364
-		L352.375,1548.77z M349.401,1546.607l4.438-1.498l0.639,1.896l-3.094,1.044L349.401,1546.607z M347.823,1542.917l-0.641-1.895
-		l4.737-1.599l0.641,1.896L347.823,1542.917z M348.142,1543.866l4.738-1.6l0.64,1.896l-4.738,1.598L348.142,1543.866z
-		 M360.134,1548.587l-3.004-0.989l-0.778-2.359l4.409,1.451L360.134,1548.587z M362.012,1542.89l-4.749-1.564l0.625-1.9l4.75,1.564
-		L362.012,1542.89z M361.073,1545.738l-4.749-1.564l0.625-1.899l4.749,1.564L361.073,1545.738z M358.686,1552.321l0.196,0.064
-		l-0.087,0.266L358.686,1552.321z M359.821,1549.538l-0.625,1.898l-0.899-0.296l-0.778-2.361L359.821,1549.538z M343.564,1551.607
-		l-1.604-1.192l2.982-4.014l1.605,1.193L343.564,1551.607z M342.535,1544.611l1.606,1.194l-2.983,4.012l-1.605-1.192
-		L342.535,1544.611z M348.955,1549.385l-1.943,2.615h-2.492l2.832-3.809L348.955,1549.385z M350.75,1552h-2.491l1.5-2.019
-		l1.604,1.193L350.75,1552z M352.473,1552h-0.478l0.17-0.229L352.473,1552z"/>
-</g>
-<g id="piano">
-	<path d="M311,1537h-17c-1.65,0-3,1.35-3,3v18c0,1.65,1.35,3,3,3h17c1.65,0,3-1.35,3-3v-18C314,1538.35,312.65,1537,311,1537z
-		 M312,1544v15h-4v-6h1v-9h-3v9h1v6h-4v-6h1v-9h-3v9h1v6h-4v-6h1v-9h-3v9h1v6h-4v-15v-1h19V1544z"/>
-	<path opacity="0.5" d="M312,1544h-19v-1h19V1544z"/>
-</g>
-<g id="wallet">
-	<path d="M264.516,1540H258c0-0.553-0.447-1-1-1h-3h-0.469c0,0-0.594,0-1.031,0.5c-0.072,0.09-2.5,2.5-2.5,2.5h0.006
-		c0,0.011-0.006,0.021-0.006,0.031V1547c0,0.55,0.45,1,1,1h3c0.55,0,1-0.45,1-1v-4.969c0-0.011,2-2.031,2-2.031h0.5l-1,1h7.5
-		c0.55,0,1,0.45,1,1v14.5l1-1v-14C266,1540.547,265.266,1540,264.516,1540z M252.5,1546.545c-0.576,0-1.045-0.467-1.045-1.045
-		s0.469-1.045,1.045-1.045s1.045,0.467,1.045,1.045S253.076,1546.545,252.5,1546.545z"/>
-	<polygon points="251.5,1540 244.5,1540 243.5,1541 250.5,1541 	"/>
-	<path d="M263,1542h-7.5h-0.003c0,0.011,0.003,0.021,0.003,0.031V1547c0,1.103-0.397,1.5-1.5,1.5h-3c-1.103,0-1.5-0.397-1.5-1.5
-		v-4.969c0-0.011,0.003-0.021,0.003-0.031H249.5c0,0-5.5,0-6.5,0s-2,1-2,2c0,2,0,14,0,14c0,0.55,0.45,1,1,1c0,0,19,0,20,0s2-1,2-2
-		s0-14,0-14C264,1542.45,263.55,1542,263,1542z"/>
-</g>
-<g id="tie">
-	<path d="M207.7,1542.984l2.2-3.809l-4.4-2.191l-4.4,2.191l2.2,3.809l-3.3,14l5.5,5.016l5.5-5L207.7,1542.984z"/>
-</g>
-<g id="calculator">
-	<g opacity="0.5">
-		<path d="M152,1545c-0.551,0-1-0.449-1-1v-3c0-0.551,0.449-1,1-1h13c0.551,0,1,0.449,1,1v3c0,0.551-0.449,1-1,1H152z"/>
-	</g>
-	<path d="M166,1537h-15c-1.657,0-3,1.344-3,3v18c0,1.656,1.343,3,3,3h15c1.657,0,3-1.344,3-3v-18
-		C169,1538.344,167.657,1537,166,1537z M154,1557.8c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6
-		c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1557.8z M154,1554.8c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2
-		v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1554.8z M154,1551.8c0,0.11-0.09,0.2-0.2,0.2h-2.6
-		c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1551.8z M154,1548.8c0,0.11-0.09,0.2-0.2,0.2
-		h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1548.8z M158,1557.8
-		c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1557.8z
-		 M158,1554.8c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2
-		V1554.8z M158,1551.8c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6
-		c0.11,0,0.2,0.09,0.2,0.2V1551.8z M158,1548.8c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6
-		c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1548.8z M162,1557.8c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2
-		v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1557.8z M162,1554.8c0,0.11-0.09,0.2-0.2,0.2h-2.6
-		c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1554.8z M162,1551.8c0,0.11-0.09,0.2-0.2,0.2
-		h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1551.8z M162,1548.8
-		c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2V1548.8z
-		 M166,1557.8c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-7.6c0-0.11,0.09-0.2,0.2-0.2h2.6c0.11,0,0.2,0.09,0.2,0.2
-		V1557.8z M166,1548.8c0,0.11-0.09,0.2-0.2,0.2h-2.6c-0.11,0-0.2-0.09-0.2-0.2v-1.6c0-0.11,0.09-0.2,0.2-0.2h2.6
-		c0.11,0,0.2,0.09,0.2,0.2V1548.8z M166,1544c0,0.55-0.45,1-1,1h-13c-0.55,0-1-0.45-1-1v-3c0-0.55,0.45-1,1-1h13c0.55,0,1,0.45,1,1
-		V1544z"/>
-</g>
-<g id="playing_x5F_dices">
-	<path d="M123.985,1545.379l-6.364-6.364c-1.166-1.167-3.076-1.167-4.242,0l-5.985,5.985H111c1.65,0,3,1.35,3,3v3.51
-		c0.322-0.487,0.874-0.81,1.5-0.81c0.992,0,1.8,0.808,1.8,1.8s-0.808,1.8-1.8,1.8c-0.626,0-1.178-0.322-1.5-0.81v2.958
-		c1.146,0.662,2.644,0.516,3.621-0.463l6.364-6.364C125.152,1548.455,125.152,1546.545,123.985,1545.379z M115.5,1544.3
-		c-0.992,0-1.8-0.808-1.8-1.8s0.808-1.8,1.8-1.8s1.8,0.808,1.8,1.8S116.492,1544.3,115.5,1544.3z M120.5,1549.3
-		c-0.992,0-1.8-0.808-1.8-1.8s0.808-1.8,1.8-1.8s1.8,0.808,1.8,1.8S121.492,1549.3,120.5,1549.3z M110,1546h-9c-1.65,0-3,1.35-3,3v9
-		c0,1.65,1.35,3,3,3h9c1.65,0,3-1.35,3-3v-9C113,1547.35,111.65,1546,110,1546z M101.5,1559.3c-0.993,0-1.8-0.808-1.8-1.8
-		s0.807-1.8,1.8-1.8s1.8,0.808,1.8,1.8S102.493,1559.3,101.5,1559.3z M101.5,1551.3c-0.993,0-1.8-0.808-1.8-1.8s0.807-1.8,1.8-1.8
-		s1.8,0.808,1.8,1.8S102.493,1551.3,101.5,1551.3z M105.5,1555.3c-0.993,0-1.8-0.808-1.8-1.8s0.807-1.8,1.8-1.8s1.8,0.808,1.8,1.8
-		S106.493,1555.3,105.5,1555.3z M109.5,1559.3c-0.993,0-1.8-0.808-1.8-1.8s0.807-1.8,1.8-1.8s1.8,0.808,1.8,1.8
-		S110.493,1559.3,109.5,1559.3z M109.5,1551.3c-0.993,0-1.8-0.808-1.8-1.8s0.807-1.8,1.8-1.8s1.8,0.808,1.8,1.8
-		S110.493,1551.3,109.5,1551.3z"/>
-</g>
-<g id="gamepad">
-	<path d="M74.968,1555.361l-3.128-12.744c-0.393-1.602-2.015-2.55-3.604-2.105L64,1542h-3l-4.303-1.488
-		c-1.589-0.444-3.211,0.504-3.604,2.105l-3.128,12.744c-0.393,1.604,0.254,3.002,1.439,3.109c1.185,0.107,2.927-0.911,3.873-2.264
-		l2.55-3.65c0.499,0.273,1.063,0.443,1.673,0.443c1.281,0,2.39-0.695,3-1.723c0.61,1.027,1.719,1.723,3,1.723
-		c0.59,0,1.137-0.16,1.625-0.418l2.532,3.625c0.945,1.353,2.688,2.371,3.873,2.264C74.714,1558.363,75.361,1556.965,74.968,1555.361
-		z M57,1546h-1v-1h-1v-1h1v-1h1v1h1v1h-1V1546z M59.5,1551.38c-1.039,0-1.88-0.842-1.88-1.88c0-1.039,0.841-1.88,1.88-1.88
-		s1.88,0.841,1.88,1.88C61.38,1550.538,60.539,1551.38,59.5,1551.38z M65.5,1551.38c-1.039,0-1.88-0.842-1.88-1.88
-		c0-1.039,0.841-1.88,1.88-1.88s1.88,0.841,1.88,1.88C67.38,1550.538,66.539,1551.38,65.5,1551.38z M66.5,1545.396
-		c-0.493,0-0.896-0.403-0.896-0.896s0.403-0.896,0.896-0.896s0.896,0.403,0.896,0.896S66.993,1545.396,66.5,1545.396z
-		 M68.5,1547.396c-0.493,0-0.896-0.403-0.896-0.896s0.403-0.896,0.896-0.896s0.896,0.403,0.896,0.896S68.993,1547.396,68.5,1547.396
-		z M68.5,1543.396c-0.493,0-0.896-0.403-0.896-0.896s0.403-0.896,0.896-0.896s0.896,0.403,0.896,0.896
-		S68.993,1543.396,68.5,1543.396z M70.5,1545.396c-0.493,0-0.896-0.403-0.896-0.896s0.403-0.896,0.896-0.896
-		s0.896,0.403,0.896,0.896S70.993,1545.396,70.5,1545.396z"/>
-</g>
-<g id="filter">
-	<path d="M4,1537v1.361c0,0.55,0.45,1,1,1h18c0.55,0,1-0.45,1-1V1537H4z"/>
-	<path d="M12,1551v10l4-4v-6l7-11H5L12,1551z M14.256,1550.709h-0.993L7.085,1541h0.993L14.256,1550.709z"/>
-</g>
-<g id="sort">
-	<path d="M454,1493.5v16c0,0.275-0.225,0.5-0.5,0.5h-2c-0.275,0-0.5-0.225-0.5-0.5V1496h-13.458c-0.275,0-0.542-0.225-0.542-0.5v-2
-		c0-0.275,0.267-0.5,0.542-0.5H453.5C453.775,1493,454,1493.225,454,1493.5z M433.5,1497c-0.275,0-0.5,0.225-0.5,0.5v16
-		c0,0.275,0.225,0.5,0.5,0.5h16c0.275,0,0.5-0.225,0.5-0.5V1497H433.5z M457.5,1489h-15.958c-0.275,0-0.542,0.225-0.542,0.5v2
-		c0,0.275,0.267,0.5,0.542,0.5H455v13.5c0,0.275,0.225,0.5,0.5,0.5h2c0.275,0,0.5-0.225,0.5-0.5v-16
-		C458,1489.225,457.775,1489,457.5,1489z"/>
-</g>
-<g id="more_x5F_items">
-	<g>
-		<path d="M407.5,1489h-15.958c-0.275,0-0.542,0.225-0.542,0.5v2.5h13.5h0.5v1.5l0.031,15.5h2.469c0.275,0,0.5-0.225,0.5-0.5v-19
-			C408,1489.225,407.775,1489,407.5,1489z"/>
-	</g>
-	<path d="M387.5,1493c-0.275,0-0.5,0.225-0.5,0.5v19c0,0.275,0.225,0.5,0.5,0.5h16c0.275,0,0.5-0.225,0.5-0.5V1493H387.5z"/>
-</g>
-<g id="tree_x5F_deciduous_1_">
-	<path d="M360,1499c0-1.618-0.964-3.002-2.345-3.633c0.213-0.411,0.345-0.871,0.345-1.367c0-1.658-1.344-3-3-3
-		c-0.364,0-0.708,0.074-1.031,0.193c-0.157-1.788-1.642-3.193-3.469-3.193c-1.427,0-2.649,0.856-3.194,2.081
-		c-0.263-0.048-0.53-0.081-0.806-0.081c-2.484,0-4.5,2.014-4.5,4.5c0,0.562,0.115,1.094,0.304,1.59
-		c-1.319,0.314-2.304,1.493-2.304,2.91c0,1.371,0.926,2.514,2.181,2.873c-0.106,0.359-0.165,0.732-0.181,1.127
-		c-0.131,3.348,4,5.438,6,2.621V1512l-1,1h7l-1-1v-6.778c2,1.841,4.125,0.216,4-2.222c-0.002-0.047-0.012-0.091-0.014-0.137
-		C358.716,1502.422,360,1500.867,360,1499z"/>
-</g>
-<g id="tree_x5F_conifer_1_">
-	<path d="M312.502,1508c0.275,0,0.34-0.157,0.144-0.35l-4.74-4.65h3.558c0.275,0,0.34-0.157,0.144-0.35l-4.74-4.65h2.559
-		c0.274,0,0.339-0.157,0.144-0.35l-4.74-4.65h1.559c0.274,0,0.339-0.157,0.143-0.35l-3.672-3.604c-0.197-0.192-0.518-0.192-0.715,0
-		l-3.672,3.604c-0.196,0.192-0.132,0.35,0.143,0.35h1.559l-4.74,4.65c-0.195,0.192-0.131,0.35,0.144,0.35h2.559l-4.74,4.65
-		c-0.196,0.192-0.132,0.35,0.144,0.35h3.558l-4.74,4.65c-0.196,0.192-0.132,0.35,0.144,0.35H300v4l-1,1h7l-1-1v-4H312.502z"/>
-</g>
-<g id="bowling_1_">
-	<path d="M254,1489.75c-6.213,0-11.25,5.037-11.25,11.25s5.037,11.25,11.25,11.25s11.25-5.037,11.25-11.25
-		S260.213,1489.75,254,1489.75z M255.5,1499.3c-0.992,0-1.8-0.808-1.8-1.8s0.808-1.8,1.8-1.8s1.8,0.808,1.8,1.8
-		S256.492,1499.3,255.5,1499.3z M256.7,1494.5c0-0.992,0.808-1.8,1.8-1.8s1.8,0.808,1.8,1.8s-0.808,1.8-1.8,1.8
-		S256.7,1495.492,256.7,1494.5z M261.5,1501.3c-0.992,0-1.8-0.808-1.8-1.8s0.808-1.8,1.8-1.8s1.8,0.808,1.8,1.8
-		S262.492,1501.3,261.5,1501.3z"/>
-</g>
-<g id="table_x5F_tennis_1_">
-	<g>
-		<g>
-			<path d="M213.521,1492.119l-0.004,0.005C213.618,1492.222,213.521,1492.119,213.521,1492.119z"/>
-		</g>
-	</g>
-	<g>
-		<path d="M213.5,1512.671c-1.199,0-2.171-0.974-2.171-2.171c0-1.199,0.972-2.172,2.171-2.172c1.2,0,2.172,0.973,2.172,2.172
-			C215.672,1511.697,214.7,1512.671,213.5,1512.671z M206.014,1508.412c2.582,0.162,5.072-1.166,7.197-3.291
-			c3.397-3.397,4.539-8.746,0.297-12.988c-4.242-4.243-9.6-3.108-12.996,0.289c-2.125,2.125-3.458,4.61-3.299,7.189l0.166,0.165
-			l8.484,8.485L206.014,1508.412z M198.916,1509.194c-0.88,0.888-2.323,2.585-2.739,3.116c-0.473-0.033-1.053-0.52-1.7-1.147
-			c-0.697-0.717-1.108-1.222-1.142-1.694c0.531-0.416,2.23-1.857,3.119-2.736c0.523-0.52,1.259-1.035,1.586-1.962l1.883-1.035
-			l1.993,1.993l-1.035,1.883C199.954,1507.938,199.435,1508.67,198.916,1509.194z"/>
-	</g>
-	<g opacity="0.3">
-		<g>
-			<path d="M197.379,1499.776l-0.166-0.165c0.051,0.829,0.251,1.668,0.635,2.508c0.449,1.113,0.421,2.007,0.192,2.651l1.883-1.035
-				l1.993,1.993l-0.989,1.839c0.646-0.228,1.466-0.24,2.579,0.209c0.84,0.384,1.678,0.584,2.508,0.636l-0.15-0.15L197.379,1499.776z
-				"/>
-		</g>
-	</g>
-</g>
-<g id="ax_1_">
-	<g id="ax_2_">
-		<path d="M153,1499.564v1.414l-0.106-0.015c-2.52,2.519-5.356,5.294-5.731,5.669c-1.417,1.418-2.156,3.539-2.156,3.539l2.813,2.828
-			c0,0,0.7-2.122,2.117-3.537c1.417-1.419,10.418-10.377,10.418-10.377l-3.463-3.535L153,1499.564z"/>
-		<path d="M161.717,1489.186l-4.949,4.949l5.306,5.305c0,0,0.354,2.691,0.354,4.597c5.656,1.414,9.191-4.95,9.191-4.95
-			L161.717,1489.186z M158.732,1494.685l-0.55-0.55l3.535-3.535l0.551,0.55L158.732,1494.685z"/>
-	</g>
-</g>
-<g id="rugby">
-	<g opacity="0.3">
-		<path d="M121.645,1497.351c-0.238,1.336-0.649,2.767-1.274,4.205c-0.4-0.733-2.019-3.514-4.684-6.173
-			c-1.885-1.879-3.831-3.234-5.072-4.008c1.433-0.59,2.852-0.971,4.173-1.182c1.009,0.739,2.162,1.676,3.295,2.805
-			C119.637,1494.549,120.836,1496.145,121.645,1497.351z M105.316,1505.722c-1.823-1.817-3.704-3.143-4.947-3.931
-			c-0.447,1.144-0.771,2.273-0.974,3.346c1.062,0.763,2.306,1.757,3.526,2.973c1.554,1.549,2.754,3.143,3.561,4.347
-			c1.062-0.185,2.185-0.484,3.32-0.91C109.192,1510.495,107.659,1508.061,105.316,1505.722z"/>
-	</g>
-	<g>
-		<path d="M110.614,1491.375c-2.12,0.868-4.258,2.176-6.096,4.008c-1.934,1.929-3.277,4.188-4.149,6.408
-			c1.243,0.788,3.124,2.113,4.947,3.931c2.343,2.339,3.876,4.773,4.486,5.824c2.312-0.862,4.676-2.229,6.681-4.23
-			c1.748-1.741,3.017-3.75,3.887-5.76c-0.4-0.733-2.019-3.514-4.684-6.173C113.802,1493.504,111.855,1492.148,110.614,1491.375z
-			 M111.292,1497.386c-0.133,0.132-0.309,0.205-0.495,0.205s-0.362-0.073-0.495-0.205l-0.874-0.874l-1.01,1.01l0.874,0.874
-			c0.132,0.133,0.205,0.309,0.205,0.495s-0.073,0.362-0.205,0.495c-0.133,0.132-0.309,0.205-0.495,0.205s-0.362-0.073-0.495-0.205
-			l-0.874-0.874l-1.01,1.01l0.874,0.874c0.132,0.133,0.205,0.309,0.205,0.495s-0.073,0.362-0.205,0.495
-			c-0.133,0.132-0.309,0.205-0.495,0.205s-0.362-0.073-0.495-0.205l-0.874-0.874l-0.547,0.548c-0.133,0.132-0.309,0.205-0.495,0.205
-			s-0.362-0.073-0.495-0.205c-0.272-0.273-0.272-0.717,0-0.99l0.547-0.548l-0.876-0.876c-0.132-0.133-0.205-0.309-0.205-0.495
-			s0.073-0.362,0.205-0.495c0.133-0.132,0.309-0.205,0.495-0.205s0.362,0.073,0.495,0.205l0.876,0.876l1.01-1.01l-0.876-0.876
-			c-0.132-0.133-0.205-0.309-0.205-0.495s0.073-0.362,0.205-0.495c0.133-0.132,0.309-0.205,0.495-0.205s0.362,0.073,0.495,0.205
-			l0.876,0.876l1.01-1.01l-0.876-0.876c-0.132-0.133-0.205-0.309-0.205-0.495s0.073-0.362,0.205-0.495
-			c0.133-0.132,0.309-0.205,0.495-0.205s0.362,0.073,0.495,0.205l0.876,0.876l0.593-0.592c0.133-0.132,0.309-0.205,0.495-0.205
-			s0.362,0.073,0.495,0.205c0.132,0.133,0.205,0.309,0.205,0.495s-0.073,0.362-0.205,0.495l-0.593,0.592l0.874,0.874
-			c0.132,0.133,0.205,0.309,0.205,0.495S111.424,1497.253,111.292,1497.386z"/>
-		<path d="M99.396,1505.137c-0.575,3.023-0.24,5.579,0.735,6.551c0.949,0.948,3.418,1.287,6.352,0.769
-			c-0.807-1.204-2.007-2.798-3.561-4.347C101.701,1506.894,100.458,1505.899,99.396,1505.137z"/>
-		<path d="M120.871,1491.009c-0.921-0.917-3.27-1.263-6.084-0.815c1.009,0.739,2.162,1.676,3.295,2.805
-			c1.555,1.551,2.754,3.146,3.562,4.353C122.162,1494.421,121.824,1491.959,120.871,1491.009z"/>
-	</g>
-</g>
-<g id="baseball_1_">
-	<circle cx="71" cy="1509" r="3.125"/>
-	<path d="M74.026,1491.597l-2.122-2.122c-0.338-0.339-0.79-0.525-1.272-0.525s-0.935,0.187-1.274,0.528l-6.068,6.068
-		c-0.685,0.684-2.396,3.106-3.084,4.482c-0.703,1.405-1.43,2.857-2.159,3.588l-5.86,5.86l-0.495-0.495
-		c-0.194-0.194-0.513-0.194-0.707,0l-0.505,0.506c-0.194,0.194-0.194,0.513,0,0.707l2.828,2.828c0.194,0.194,0.513,0.194,0.707,0
-		l0.505-0.504c0.194-0.194,0.194-0.513,0.001-0.707l-0.496-0.495l5.861-5.861c0.73-0.73,2.184-1.457,3.588-2.16
-		c1.377-0.688,3.799-2.399,4.482-3.083l6.071-6.07c0.339-0.338,0.524-0.79,0.524-1.272S74.365,1491.935,74.026,1491.597z
-		 M64.467,1497.225c-0.978,0.978-3.079,2.921-3.079,2.921c0.783-1.327,2.014-3.02,2.497-3.502l6.087-6.087l0.582,0.581
-		L64.467,1497.225z"/>
-</g>
-<g id="flower_3_">
-	<g>
-		<path d="M13.549,1494.349c0.428,0.428,0.73,0.942,0.951,1.483c0.221-0.541,0.523-1.056,0.951-1.483
-			c0.631-0.63,1.446-1.002,2.271-1.215c-0.264-2.692-3.221-4.817-3.221-4.817s-2.958,2.125-3.222,4.817
-			C12.104,1493.347,12.918,1493.719,13.549,1494.349z"/>
-	</g>
-	<path d="M18.919,1504.184c0.265-0.34,0.573-0.734-0.003,0.004c-0.418,0.536-0.229,0.294-0.003,0.005
-		c-0.909,1.17-0.72,2.279-0.604,2.949L16,1509.449v-7.664c2.409-0.291,4.819-1.863,5.629-4.225c0.486-1.415,0.552-3.021,0.331-4.496
-		c-0.719-0.045-1.485-0.064-2.169-0.064c0.129-1-0.06-2.604-0.06-2.604s-0.651-0.113-1.567-0.113c0.914,1.154,1.102,3.84,1.102,3.84
-		l-0.993,0.256c-1.226,0.316-2.177,1.01-2.661,2.198l-1.111,2.724l-1.111-2.724c-0.484-1.188-1.435-1.882-2.661-2.198l-0.993-0.256
-		c0,0,0.188-2.686,1.102-3.84c-0.916,0-1.567,0.113-1.567,0.113S9.08,1492,9.209,1493c-0.684,0-1.45,0.02-2.169,0.064
-		c-0.221,1.475-0.155,3.081,0.331,4.496c0.81,2.361,3.22,3.934,5.629,4.225v7.664l-2.309-2.308c0.115-0.67,0.305-1.779-0.604-2.949
-		c0.226,0.289,0.415,0.531-0.003-0.005c-0.576-0.738-0.269-0.344-0.003-0.004c-1.07-1.368-2.349-1.294-5.081-2.088
-		c0,6.377,3.575,6.193,5.008,5.775l2.992,2.992V1513h1.5H16v-2.137l2.992-2.992c1.434,0.418,5.008,0.602,5.008-5.775
-		C21.268,1502.89,19.99,1502.815,18.919,1504.184z"/>
-</g>
-<g id="comments">
-	<path d="M455,1442h-18c-1.65,0-3,1.35-3,3v11c0,1.65,1.35,3,3,3h2v6l6-6h10c1.65,0,3-1.35,3-3v-11
-		C458,1443.35,456.65,1442,455,1442z"/>
-</g>
-<g id="share_x5F_alt">
-	<path d="M404.5,1457c-0.904,0-1.721,0.352-2.342,0.915l-6.412-3.782c0.086-0.365,0.145-0.74,0.145-1.133
-		c0-0.404-0.062-0.791-0.155-1.167l6.394-3.771c0.625,0.577,1.453,0.938,2.371,0.938c1.934,0,3.5-1.566,3.5-3.5s-1.566-3.5-3.5-3.5
-		s-3.5,1.566-3.5,3.5c0,0.291,0.046,0.569,0.113,0.84l-6.254,3.688c-0.895-1.158-2.281-1.918-3.859-1.918
-		c-2.701,0-4.891,2.188-4.891,4.891s2.189,4.891,4.891,4.891c1.59,0,2.988-0.771,3.882-1.945l6.241,3.681
-		c-0.072,0.281-0.123,0.57-0.123,0.874c0,1.934,1.566,3.5,3.5,3.5s3.5-1.566,3.5-3.5S406.434,1457,404.5,1457z"/>
-</g>
-<g id="life_x5F_preserver">
-	<path d="M358.344,1444.656c-2.229-2.229-5.191-3.456-8.344-3.456s-6.115,1.228-8.344,3.456c-4.601,4.602-4.601,12.087,0,16.688
-		c2.229,2.229,5.191,3.456,8.344,3.456s6.115-1.228,8.344-3.456C362.944,1456.743,362.944,1449.257,358.344,1444.656z
-		 M346.236,1456.764c-2.075-2.075-2.075-5.452,0-7.527c1.005-1.005,2.342-1.559,3.764-1.559s2.759,0.554,3.764,1.559
-		s1.559,2.342,1.559,3.764s-0.554,2.759-1.559,3.764c-1.006,1.006-2.343,1.56-3.764,1.56S347.242,1457.77,346.236,1456.764z
-		 M356.367,1455.718c0.361-0.849,0.555-1.768,0.555-2.718c0-0.949-0.192-1.869-0.555-2.718l2.688-1.972
-		c1.516,2.931,1.516,6.446,0.001,9.378L356.367,1455.718z M354.691,1443.943l-1.974,2.689c-0.849-0.361-1.768-0.555-2.718-0.555
-		s-1.869,0.193-2.717,0.555l-1.973-2.69c1.433-0.743,3.029-1.143,4.689-1.143C351.661,1442.8,353.259,1443.199,354.691,1443.943z
-		 M340.943,1448.312l2.691,1.972c-0.361,0.848-0.554,1.767-0.554,2.717s0.192,1.869,0.554,2.717l-2.69,1.974
-		C339.429,1454.76,339.429,1451.243,340.943,1448.312z M345.309,1462.057l1.974-2.689c0.848,0.362,1.768,0.556,2.718,0.556
-		s1.869-0.193,2.718-0.556l1.972,2.69c-1.433,0.743-3.029,1.143-4.689,1.143C348.339,1463.2,346.741,1462.801,345.309,1462.057z"/>
-</g>
-<g id="bicycle">
-	<path d="M312,1450.991c-0.749,0-1.463,0.144-2.125,0.394l-1.679-2.817l1.241-3.338c0.028-0.075,0.027-0.152,0.036-0.229H310
-		c0.55,0,1-0.484,1-1.035c0-0.549-0.444-0.934-0.986-0.844l-4.027,0.663c-0.542,0.09-0.986,0.405-0.986,0.681s0.45,0.535,1,0.535
-		h1.389l-1.217,3h-8.855l0.553-1.533c0.256-0.842-0.275-1.467-1.2-1.467H294c-0.553,0-1,0.447-1,1s0.447,1,1,1h1.552l-1.475,4.093
-		c-0.351-0.063-0.709-0.102-1.077-0.102c-3.33,0-6.039,2.709-6.039,6.039s2.709,6.039,6.039,6.039s6.039-2.709,6.039-6.039
-		c0-2.255-1.244-4.223-3.081-5.26l0.37-1.028l6.965,6.965c0.188,0.188,0.441,0.293,0.707,0.293h2.046
-		c0.467,2.869,2.955,5.069,5.954,5.069c3.33,0,6.039-2.709,6.039-6.039S315.33,1450.991,312,1450.991z M297.039,1457.03
-		c0,2.228-1.812,4.039-4.039,4.039s-4.039-1.812-4.039-4.039s1.812-4.039,4.039-4.039c0.13,0,0.252,0.026,0.379,0.038l-1.319,3.662
-		c-0.188,0.52,0.082,1.093,0.602,1.279c0.112,0.041,0.227,0.06,0.339,0.06c0.409,0,0.794-0.253,0.94-0.661l1.326-3.68
-		C296.335,1454.417,297.039,1455.643,297.039,1457.03z M308.144,1452.388c-1.081,0.899-1.839,2.17-2.088,3.612h-0.624l1.869-5.026
-		L308.144,1452.388z M309.188,1454.141l1.108,1.859h-2.186C308.301,1455.283,308.672,1454.643,309.188,1454.141z M303.601,1455.186
-		l-5.187-5.186h7.115L303.601,1455.186z M312,1461.069c-1.892,0-3.471-1.312-3.908-3.069H312c0.553,0,1-0.447,1-1
-		c0-0.155-0.15-0.622-0.204-0.712l-1.867-3.134c0.344-0.096,0.698-0.163,1.071-0.163c2.228,0,4.039,1.812,4.039,4.039
-		S314.228,1461.069,312,1461.069z"/>
-</g>
-<g id="temple_x5F_buddhist_2_">
-	<path d="M268,1454v-1c0,0,0,0-1,0s-4.891-2.375-5-3v-1h4v-1c0,0,0,0-1,0s-4.891-2-5-2v-1h2v-1c0,0,0,0-1,0s-3.891-2-4-2
-		c-0.191,0-5.809,0-6,0c-0.109,0-3,2-4,2s-1,0-1,0v1h2v1c-0.109,0-4,2-5,2s-1,0-1,0v1h4v1c-0.109,0.625-4,3-5,3s-1,0-1,0v1h5v5h-3v5
-		h24v-5h-3v-5H268z M249,1457h-2v-3h2V1457z M253,1457h-2v-3h2V1457z M257,1457h-2v-3h2V1457z M261,1457h-2v-3h2V1457z"/>
-</g>
-<g id="temple_x5F_hindu_2_">
-	<rect x="194" y="1460" width="24" height="6"/>
-	<path d="M216,1457h-2l-4-12v-2h-2v-1h-4v1h-2v2l-4,12h-2v2h20V1457z M207,1455h-2v-3h2V1455z M207,1450h-2v-2h2V1450z M207,1447h-2
-		v-1h2V1447z"/>
-</g>
-<g id="temple_x5F_islam_2_">
-	<path d="M170.5,1449c0.275,0,0.5-0.225,0.5-0.5v-0.5l-2.5-6l-2.5,6v0.5c0,0.275,0.225,0.5,0.5,0.5h0.5v2h-0.5
-		c-0.275,0-0.5,0.225-0.5,0.5v1c0,0.275,0.225,0.5,0.5,0.5h0.5v6h-1v-1h-1v-3h-0.029c-0.248-2.317-2.193-4.215-4.775-4.805L159,1449
-		v-1.5c0-0.275-0.225-0.5-0.5-0.5s-0.5,0.225-0.5,0.5v1.5l-1.195,1.195c-2.582,0.59-4.527,2.487-4.775,4.805H152v3h-1v1h-1v-6h0.5
-		c0.275,0,0.5-0.225,0.5-0.5v-1c0-0.275-0.225-0.5-0.5-0.5H150v-2h0.5c0.275,0,0.5-0.225,0.5-0.5v-0.5l-2.5-6l-2.5,6v0.5
-		c0,0.275,0.225,0.5,0.5,0.5h0.5v2h-0.5c-0.275,0-0.5,0.225-0.5,0.5v1c0,0.275,0.225,0.5,0.5,0.5h0.5v13h23v-13h0.5
-		c0.275,0,0.5-0.225,0.5-0.5v-1c0-0.275-0.225-0.5-0.5-0.5H170v-2H170.5z M151,1464h-1v-4h1V1464z M153,1464h-1v-4h1V1464z
-		 M155,1464h-1v-4h1V1464z M163,1464h-1v-4h1V1464z M165,1464h-1v-4h1V1464z M167,1464h-1v-4h1V1464z"/>
-</g>
-<g id="temple_x5F_christianity_x5F_church">
-	<path d="M107,1454h11l3,3v1h-14V1454z M122,1465v1h-1H99v-14h-1v-1l4-3.949V1444h-2v-1h2v-2h1v2h2v1h-2v3.051l4,3.949v1h-1v7h15v6
-		H122z M109,1460h-1v4h1V1460z M111,1460h-1v4h1V1460z M113,1460h-1v4h1V1460z M115,1460h-1v4h1V1460z M117,1460h-1v4h1V1460z
-		 M119,1460h-1v4h1V1460z"/>
-</g>
-<g id="webcam_1_">
-	<g opacity="0.5">
-		<path d="M65.343,1451.498c0,1.569-1.274,2.845-2.845,2.845c-1.48,0-2.684-1.138-2.817-2.583c0.331,0.189,0.708,0.305,1.118,0.305
-			c1.252,0,2.266-1.014,2.266-2.266c0-0.41-0.115-0.787-0.305-1.118C64.206,1448.814,65.343,1450.019,65.343,1451.498z"/>
-	</g>
-	<g>
-		<path d="M64.914,1458.914c3.658-1.053,6.346-4.423,6.346-8.414c0-4.661-3.912-8.473-8.51-8.734v5.941
-			c1.883,0.248,3.594,1.844,3.594,3.793s-1.711,3.545-3.594,3.793V1459h-0.5v-3.707c-1.883-0.248-3.594-1.844-3.594-3.793
-			s1.711-3.545,3.594-3.793v-5.941c-4.598,0.262-8.51,4.073-8.51,8.734c0,3.991,2.688,7.361,6.346,8.414l-5.379,5.379
-			C54.318,1464.682,54.45,1465,55,1465h2c0.55,0,1.318-0.318,1.707-0.707l1.586-1.586C60.682,1462.318,61.45,1462,62,1462h1
-			c0.55,0,1.318,0.318,1.707,0.707l1.586,1.586C66.682,1464.682,67.45,1465,68,1465h2c0.55,0,0.682-0.318,0.293-0.707
-			L64.914,1458.914z"/>
-	</g>
-</g>
-<g id="microphone">
-	<path d="M23,1449.5c0,0.275-0.223,0.537-0.493,0.582L22,1450.167v3.841c0,3.906-3,6.041-5,6.686v1.174l3,1.364V1465H9v-1.769
-		l3-1.364v-1.174c-2-0.645-5-2.779-5-6.686v-3.841l-0.507-0.085C6.223,1450.037,6,1449.775,6,1449.5s0.225-0.5,0.5-0.5H9v1v4.008
-		c0,3.612,2.984,5.133,5.577,5.133s5.423-2.188,5.423-5.133V1450v-1h2.5C22.775,1449,23,1449.225,23,1449.5z M10,1453.391V1450h9
-		v3.391c0,0.928-1.045,4.143-4.5,4.143S10,1454.318,10,1453.391z M11,1453.391c0,0.243,0.231,1.289,1,2.109v-0.697
-		c-0.364-0.63-0.5-1.235-0.5-1.412V1451H11V1453.391z M19,1449h-9v-3.5c0-2.485,2.015-4.5,4.5-4.5s4.5,2.015,4.5,4.5V1449z
-		 M12,1443.059c-0.617,0.631-1,1.491-1,2.441v2.5h0.5v-2.5c0-0.652,0.187-1.257,0.5-1.777V1443.059z"/>
-</g>
-<g id="hospital_x5F_h_2_">
-	<path d="M458,1395.5c0-1.381-1.119-2.5-2.5-2.5h-19c-1.381,0-2.5,1.119-2.5,2.5v19c0,1.381,1.119,2.5,2.5,2.5h19
-		c1.381,0,2.5-1.119,2.5-2.5V1395.5z M454,1414h-5v-8h-6v8h-5v-18h5v6h6v-6h5V1414z"/>
-</g>
-<g id="hospital_2_">
-	<path d="M410,1395.5c0-1.381-1.119-2.5-2.5-2.5h-19c-1.381,0-2.5,1.119-2.5,2.5v19c0,1.381,1.119,2.5,2.5,2.5h19
-		c1.381,0,2.5-1.119,2.5-2.5V1395.5z M407,1408h-6v6h-6v-6h-6v-6h6v-6h6v6h6V1408z"/>
-</g>
-<g id="kettle">
-	<g>
-		<polygon points="357,1414 342,1414 342,1415 340,1417 359,1417 357,1415 		"/>
-		<path d="M361.833,1400.354c0-5.646-7.04-7.063-11.833-7.063s-7,2.709-7,2.709h-1h-3l3,9.144V1411c0,1.1,0.9,2,2,2h11
-			c2.618,0,2-2.396,2-2.396C357,1408.938,361.833,1406,361.833,1400.354z M357,1397.841c1.018,0.051,2.453,0.514,2.453,2.737
-			c0,2.938-1.283,3.6-2.453,4.676V1397.841z M354,1408c0,1.1-0.675,2-1.5,2c-0.551,0-1.029-0.406-1.29-1H352v-1h-1v-1h1v-1h-1v-1h1
-			v-1h-1v-1h1v-1h-1v-1h1v-1h-0.79c0.261-0.594,0.739-1,1.29-1c0.825,0,1.5,0.9,1.5,2V1408z"/>
-	</g>
-	<path opacity="0.3" d="M352.5,1399c-0.551,0-1.029,0.406-1.29,1H352v1h-1v1h1v1h-1v1h1v1h-1v1h1v1h-1v1h1v1h-0.79
-		c0.261,0.594,0.739,1,1.29,1c0.825,0,1.5-0.9,1.5-2v-7C354,1399.9,353.325,1399,352.5,1399z"/>
-</g>
-<g id="grater">
-	<path d="M307,1393h-10c-2.2,0-4,1.8-4,4v2v18h2v-2h14v2h2v-19v-1C311,1394.8,309.2,1393,307,1393z M295,1396c0-0.55,0.45-1,1-1h12
-		c0.55,0,1,0.45,1,1v2h-14V1396z M296.484,1405.411c0.46,0,0.79,0.476,0.624,0.905l-0.631,1.233l-0.609-1.216
-		C295.696,1405.9,296.009,1405.411,296.484,1405.411z M296.478,1401.55l-0.609-1.216c-0.462-1.165,1.681-1.159,1.24-0.018
-		L296.478,1401.55z M296.868,1403.334c-0.462-1.165,1.681-1.159,1.24-0.018l-0.631,1.233L296.868,1403.334z M297.815,1400.08
-		c0-1.027,1.662-0.72,1.293,0.236l-0.631,1.233l-0.609-1.216C297.831,1400.239,297.815,1400.159,297.815,1400.08z M298.484,1405.411
-		c0.46,0,0.79,0.476,0.624,0.905l-0.631,1.233l-0.609-1.216C297.696,1405.9,298.009,1405.411,298.484,1405.411z M298.868,1403.334
-		c-0.462-1.165,1.681-1.159,1.24-0.018l-0.631,1.233L298.868,1403.334z M299.815,1400.08c0-1.027,1.662-0.72,1.293,0.236
-		l-0.631,1.233l-0.609-1.216C299.831,1400.239,299.815,1400.159,299.815,1400.08z M300.484,1405.411c0.46,0,0.79,0.476,0.624,0.905
-		l-0.631,1.233l-0.609-1.216C299.696,1405.9,300.009,1405.411,300.484,1405.411z M300.868,1403.334
-		c-0.462-1.165,1.681-1.159,1.24-0.018l-0.631,1.233L300.868,1403.334z M301.815,1400.08c0-1.027,1.662-0.72,1.293,0.236
-		l-0.631,1.233l-0.609-1.216C301.831,1400.239,301.815,1400.159,301.815,1400.08z M302.484,1405.411c0.46,0,0.79,0.476,0.624,0.905
-		l-0.631,1.233l-0.609-1.216C301.696,1405.9,302.009,1405.411,302.484,1405.411z M302.868,1403.334
-		c-0.462-1.165,1.681-1.159,1.24-0.018l-0.631,1.233L302.868,1403.334z M303.815,1400.08c0-1.027,1.662-0.72,1.293,0.236
-		l-0.631,1.233l-0.609-1.216C303.831,1400.239,303.815,1400.159,303.815,1400.08z M304.484,1405.411c0.46,0,0.79,0.476,0.624,0.905
-		l-0.631,1.233l-0.609-1.216C303.696,1405.9,304.009,1405.411,304.484,1405.411z M304.868,1403.334
-		c-0.462-1.165,1.681-1.159,1.24-0.018l-0.631,1.233L304.868,1403.334z M305.815,1400.08c0-1.027,1.662-0.72,1.293,0.236
-		l-0.631,1.233l-0.609-1.216C305.831,1400.239,305.815,1400.159,305.815,1400.08z M306.484,1405.411c0.46,0,0.79,0.476,0.624,0.905
-		l-0.631,1.233l-0.609-1.216C305.696,1405.9,306.009,1405.411,306.484,1405.411z M306.868,1403.334
-		c-0.462-1.165,1.681-1.159,1.24-0.018l-0.631,1.233L306.868,1403.334z M295.484,1402.411c0.46,0,0.79,0.476,0.624,0.905
-		l-0.631,1.233l-0.609-1.216C294.696,1402.9,295.009,1402.411,295.484,1402.411z M294.868,1409.334
-		c-0.462-1.165,1.681-1.159,1.24-0.018l-0.631,1.233L294.868,1409.334z M297.108,1412.316l-0.631,1.233l-0.609-1.216
-		C295.406,1411.169,297.549,1411.175,297.108,1412.316z M296.868,1409.334c-0.462-1.165,1.681-1.159,1.24-0.018l-0.631,1.233
-		L296.868,1409.334z M299.108,1412.316l-0.631,1.233l-0.609-1.216C297.406,1411.169,299.549,1411.175,299.108,1412.316z
-		 M298.868,1409.334c-0.462-1.165,1.681-1.159,1.24-0.018l-0.631,1.233L298.868,1409.334z M301.108,1412.316l-0.631,1.233
-		l-0.609-1.216C299.406,1411.169,301.549,1411.175,301.108,1412.316z M300.868,1409.334c-0.462-1.165,1.681-1.159,1.24-0.018
-		l-0.631,1.233L300.868,1409.334z M303.108,1412.316l-0.631,1.233l-0.609-1.216C301.406,1411.169,303.549,1411.175,303.108,1412.316
-		z M302.868,1409.334c-0.462-1.165,1.681-1.159,1.24-0.018l-0.631,1.233L302.868,1409.334z M305.108,1412.316l-0.631,1.233
-		l-0.609-1.216C303.406,1411.169,305.549,1411.175,305.108,1412.316z M304.868,1409.334c-0.462-1.165,1.681-1.159,1.24-0.018
-		l-0.631,1.233L304.868,1409.334z M307.108,1412.316l-0.631,1.233l-0.609-1.216C305.406,1411.169,307.549,1411.175,307.108,1412.316
-		z M306.868,1409.334c-0.462-1.165,1.681-1.159,1.24-0.018l-0.631,1.233L306.868,1409.334z M309.108,1412.316l-0.631,1.233
-		l-0.609-1.216C307.406,1411.169,309.549,1411.175,309.108,1412.316z M309.108,1406.316l-0.631,1.233l-0.609-1.216
-		C307.406,1405.169,309.549,1405.175,309.108,1406.316z M309.108,1400.316l-0.631,1.233l-0.609-1.216
-		C307.406,1399.169,309.549,1399.175,309.108,1400.316z"/>
-</g>
-<g id="pot">
-	<path d="M267.5,1402H265v-2h-21v2h-2.5c-0.275,0-0.5,0.154-0.5,0.344s0.18,0.479,0.4,0.644l2.6,1.95V1414c0,1.104,0.896,2,2,2h17
-		c1.104,0,2-0.896,2-2v-9.062l2.6-1.95c0.22-0.165,0.4-0.454,0.4-0.644S267.775,1402,267.5,1402z M245.5,1414H245v-12h0.5V1414z
-		 M243,1398.5c0-0.275,0.225-0.5,0.5-0.5h0.5c0-1.186,1.8-2,4-2h4v-1.5c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5v1.5
-		h4c2.2,0,4,0.814,4,2h0.5c0.275,0,0.5,0.225,0.5,0.5s-0.225,0.5-0.5,0.5h-22C243.225,1399,243,1398.775,243,1398.5z"/>
-</g>
-<g id="coffe_x5F_cup">
-	<g>
-		<path d="M196.325,1416l0.667,0.445c0.458,0.305,1.283,0.555,1.833,0.555h13.349c0.55,0,1.375-0.25,1.833-0.555l0.667-0.445
-			l2.325-2h-23L196.325,1416z"/>
-		<path d="M216,1401h-1v-3h-19v8v3v1c0,1.656,1.343,3,3,3h13c1.657,0,3-1.344,3-3v-1h1c1.654,0,3-1.346,3-3v-2
-			C219,1402.346,217.654,1401,216,1401z M207.709,1406.957c-0.631,0.618-1.347,1.319-1.967,2.166l-0.242,0.331l-0.242-0.331
-			c-0.62-0.847-1.335-1.548-1.967-2.167c-1.016-0.994-1.818-1.78-1.818-2.728c0-1.269,1.119-2.382,2.395-2.382
-			c0.627,0,1.197,0.273,1.639,0.777c0.459-0.504,1.038-0.777,1.661-0.777c1.257,0,2.359,1.113,2.359,2.382
-			C209.526,1405.176,208.725,1405.962,207.709,1406.957z M217,1406c0,0.552-0.449,1-1,1h-1v-1v-3h1c0.551,0,1,0.448,1,1V1406z"/>
-	</g>
-	<path opacity="0.3" d="M207.709,1406.957c-0.631,0.618-1.347,1.319-1.967,2.166l-0.242,0.331l-0.242-0.331
-		c-0.62-0.847-1.335-1.548-1.967-2.167c-1.016-0.994-1.818-1.78-1.818-2.728c0-1.269,1.119-2.382,2.395-2.382
-		c0.627,0,1.197,0.273,1.639,0.777c0.459-0.504,1.038-0.777,1.661-0.777c1.257,0,2.359,1.113,2.359,2.382
-		C209.526,1405.176,208.725,1405.962,207.709,1406.957z"/>
-</g>
-<g id="french_x5F_press">
-	<path d="M165,1396c0-0.55-0.9-1-2-1h-5v-1c1.1,0,2-0.45,2-1s-0.9-1-2-1h-1c-1.1,0-2,0.45-2,1s0.9,1,2,1v1h-5c-1.1,0-2,0.45-2,1v1
-		h15V1396z"/>
-	<path d="M169.5,1400.375c-0.438-1.059-1.75-1.375-2.723-1.375H165v-1h-15h-3l3,3v13c0,1.65,1.35,3,3,3h9c1.65,0,3-1.35,3-3v-2.085
-		c0.527-1.427,1.312-2.958,2.484-4.13C169.245,1406.024,169.983,1401.541,169.5,1400.375z M151.5,1414H151v-13h0.5V1414z
-		 M166.07,1406.371c-0.395,0.395-0.747,0.82-1.07,1.262V1402v-1h1.777C167.625,1401,167.635,1404.806,166.07,1406.371z"/>
-</g>
-<g id="tea_x5F_kettle">
-	<path d="M112.64,1402c0.334-0.215,0.569-0.572,0.569-1c0-0.668-0.542-1.209-1.209-1.209s-1.209,0.541-1.209,1.209
-		c0,0.428,0.273,0.797,0.569,1c-1.501,0-3.36,1.102-3.36,2h8C116,1403.102,114.219,1402,112.64,1402z"/>
-	<path d="M119,1408.037v-2.938c0.05,0.481,0.427,0.9,0.926,0.9c0.017,0,0.034,0,0.051,0c0.529,0,0.971-0.415,0.998-0.95l0.008-0.14
-		c0.009-0.154,0.018-0.309,0.018-0.466c0-6.735-3.191-10.444-8.984-10.444s-8.984,3.709-8.984,10.444
-		c0,0.157,0.008,0.312,0.018,0.466l0.008,0.14c0.028,0.553,0.508,0.974,1.049,0.949c0.426-0.022,0.77-0.309,0.895-0.691v1.968
-		c-1.821,1.357-2.5,3.225-2.5,3.225l-4.383-2.789l-1.495,1.494L103.5,1417H118c0,0,4-0.228,4-4
-		C121.637,1410.862,120.312,1409.205,119,1408.037z M116,1406v-1h-8v1c-0.757,0.126-1.42,0.359-2,0.652v-2.152
-		c0-0.275-0.225-0.5-0.5-0.5c-0.215,0-0.396,0.14-0.466,0.332c0.031-5.604,2.314-8.332,6.981-8.332c4.7,0,6.984,2.762,6.984,8.444
-		c0,0.016-0.001,0.03-0.002,0.046c-0.005-0.271-0.227-0.49-0.498-0.49c-0.275,0-0.5,0.225-0.5,0.5v2.727
-		C116.897,1406.418,116,1406,116,1406z"/>
-</g>
-<g id="celebration_1_">
-	<path id="celebration" d="M71,1395h-5v-2c0-0.55,0.45-1,1-1h3c0.55,0,1,0.45,1,1V1395z M62,1404H50l5,5.5v6.5h-3v1h8v-1h-3v-6.5
-		L62,1404z M74,1404v12c0,0.55-0.45,1-1,1h-9c-0.55,0-1-0.45-1-1v-12c0-2,3-3,3-5v-3h5v3C71,1401,74,1402,74,1404z M64.5,1405H64v11
-		h0.5V1405z"/>
-</g>
-<g id="skull">
-	<path d="M14,1393c-11.107,0-10.055,9-10.055,9L5,1404l1,5l3.5,1l1.168,2h6.664l1.168-2l3.5-1l1-5l1.055-2
-		C24.055,1402,25.107,1393,14,1393z M10.3,1407h-1c-0.715,0-1.3-0.585-1.3-1.3v-1.4c0-0.715,0.585-1.3,1.3-1.3h2.4
-		c0.715,0,1.106,0.553,0.87,1.227l-0.541,1.547C11.793,1406.447,11.015,1407,10.3,1407z M15,1410h-2c-0.55,0-0.75-0.375-0.445-0.832
-		l0.891-1.336c0.305-0.457,0.805-0.457,1.109,0l0.891,1.336C15.75,1409.625,15.55,1410,15,1410z M20,1405.7
-		c0,0.715-0.585,1.3-1.3,1.3h-1c-0.715,0-1.493-0.553-1.729-1.227l-0.541-1.547c-0.236-0.674,0.155-1.227,0.87-1.227h2.4
-		c0.715,0,1.3,0.585,1.3,1.3V1405.7z"/>
-	<polygon points="17,1414 11,1414 8,1411 7,1411 9,1416 10,1416 11,1417 17,1417 18,1416 19,1416 21,1411 20,1411 	"/>
-</g>
-<g id="bomb">
-	<path d="M460,1348.449l-2.604-0.765l1.301-2.382l-2.383,1.301l-0.764-2.604l-0.766,2.604l-2.381-1.301l1.301,2.382l-2.604,0.765
-		l1.727,0.507c-0.545,0.228-1.258,0.416-1.906,0.233c-0.621-0.174-1.113-0.675-1.463-1.488c-0.801-1.87-2.562-2.88-4.285-2.525
-		c-1.625,0.333-2.674,1.824-2.674,3.824H440v2.422c-3,1.236-6.001,4.56-6.001,8.477c0,4.971,4.03,9,9.001,9s9-4.029,9-9
-		c0-3.917-2-7.24-6-8.477V1349h-2.5c0-2,0.969-2.659,1.875-2.845c1.057-0.215,2.447,0.289,3.166,1.966
-		c0.473,1.105,1.184,1.785,2.111,2.045c0.277,0.078,0.557,0.104,0.832,0.104c0.711,0,1.383-0.225,1.895-0.454l-0.975,1.782
-		l2.381-1.301l0.766,2.602l0.764-2.604l2.383,1.301l-1.301-2.382L460,1348.449z M441,1350h0.5v1H441V1350z"/>
-</g>
-<g id="scissors">
-	<path d="M408.96,1359.299l-0.941-0.941c-1.436-1.435-3.875-1.549-5.186-0.236c-0.375,0.375-0.635,0.832-0.791,1.331l-1.608-1.417
-		L402,1354c0,0,0-1.008,0-4.004c0-5.996-5-6.996-5-6.996v11.793l-8.148-8.339c0,0-2.73,4.243,1.508,8.482
-		c2.119,2.118,2.688,2.831,2.688,2.831l3.952,1.611v2.006c0-0.239-0.961-0.385-1.5-0.385c-1.93,0-3.5,1.721-3.5,3.835v1.33
-		c0,2.114,1.57,3.835,3.5,3.835s3.5-1.721,3.5-3.835v-5.276l0.459-0.618l0.725,0.247l3.801,3.73c0.76,0.76,1.796,1.195,2.823,1.195
-		c0.915,0,1.764-0.341,2.381-0.959c0.676-0.676,1.019-1.602,0.956-2.606C410.084,1360.92,409.665,1360.004,408.96,1359.299z
-		 M397,1366.165c0,0.995-0.688,1.835-1.5,1.835s-1.5-0.84-1.5-1.835v-1.33c0-0.995,0.688-1.835,1.5-1.835s1.5,0.84,1.5,1.835V1366
-		V1366.165z M407.782,1363.07c-0.309,0.308-0.693,0.373-0.962,0.373c-0.501,0-1.009-0.223-1.396-0.609l-0.941-0.941
-		c-0.361-0.36-0.576-0.818-0.605-1.29c-0.027-0.424,0.104-0.803,0.369-1.067c0.307-0.308,0.691-0.372,0.961-0.372
-		c0.5,0,1.01,0.222,1.396,0.608l0.941,0.941c0.36,0.36,0.575,0.818,0.605,1.29C408.177,1362.427,408.046,1362.806,407.782,1363.07z"
-		/>
-</g>
-<g id="leather">
-	<path d="M361.787,1354.286c0.626-2.62-0.166-4.353-1.889-5.812C354.35,1351.205,353,1345,353,1345h-5c0,0-1.35,6.209-6.898,3.479
-		c-1.723,1.459-2.515,3.196-1.889,5.816c3.332,2.172,2.783,8.085,0,9.874c0.099,2.021,1.458,3.923,3.28,4.155
-		c1.856-1.393,4.138-3.324,7.507-0.324h1c3.369-3,5.65-1.068,7.507,0.324c1.822-0.232,3.182-2.151,3.28-4.173
-		C359.004,1362.362,358.455,1356.458,361.787,1354.286z M350.5,1350.263c-0.975,0-1.763-0.788-1.763-1.763s0.788-1.763,1.763-1.763
-		s1.763,0.788,1.763,1.763S351.475,1350.263,350.5,1350.263z"/>
-</g>
-<g id="fabric_1_">
-	<polygon id="fabric" points="313,1352 315.5,1349.5 312.5,1346.5 310,1349 307.5,1346.5 305,1349 302.5,1346.5 300,1349 
-		297.5,1346.5 295,1349 292.5,1346.5 289.5,1349.5 292,1352 289.5,1354.5 292,1357 289.5,1359.5 292,1362 289.5,1364.5 
-		292.5,1367.5 295,1365 297.5,1367.5 300,1365 302.5,1367.5 305,1365 307.5,1367.5 310,1365 312.5,1367.5 315.5,1364.5 313,1362 
-		315.5,1359.5 313,1357 315.5,1354.5 	"/>
-</g>
-<g id="sweater">
-	<path d="M268.729,1362.876l-6.283-12.407c-0.097-0.258-0.518-0.557-0.771-0.665l-4.675-1.941v-2.362c0-0.275-0.208-0.5-0.482-0.5
-		H252.5c-0.275,0-0.5,0.225-0.5,0.5v2.362l-4.667,1.941c-0.253,0.108-0.666,0.407-0.762,0.665l-6.283,12.407
-		c0,0.275-1.01,1.417,0.865,2.417s2.282-0.5,2.907-1.209l4.655-7.609c0.087-0.262,0.285-0.25,0.285,0.025v11.5v0.5
-		c0,0.276,0.224,0.5,0.5,0.5h10.018c0.276,0,0.482-0.224,0.482-0.5v-0.5v-11.5c0-0.275,0.207-0.287,0.293-0.025l4.659,7.609
-		c0.625,0.709,1.034,2.209,2.909,1.209S268.729,1363.151,268.729,1362.876z"/>
-</g>
-<g id="pants">
-	<path d="M200,1347l-3,22h7l2-16h1l2,16h7l-3-22v-2h-13V1347z"/>
-</g>
-<g id="t-shirt">
-	<path d="M162.016,1346c0.01,0.083-0.547,3.5-3.984,3.5s-4.011-3.415-4-3.5L144,1354l4,4l4-2.671V1368c0,0.55,0.45,1,1,1h10
-		c0.55,0,1-0.45,1-1v-12.671l4,2.671l4-4L162.016,1346z"/>
-</g>
-<g id="cardio">
-	<polygon points="112.047,1369.688 108.697,1356.996 106,1365 97,1365 104.035,1363 108.927,1344.504 112.621,1361.562 
-		115.311,1353.226 117.229,1363 122,1365 116.294,1365 115.38,1362.399 	"/>
-</g>
-<g id="bullets">
-	<g id="bullets_1_">
-		<g>
-			<path d="M52,1361h-1v-7h1V1361z M53,1346h-1v7h1V1346z M50,1369h1v-7h-1V1369z M62,1362l1,1v5l-1,1H52v-7H62z M62,1363h-9v0.5h9
-				V1363z M67,1352h-1v-5h1h2l7.021,2.5L69,1352H67z M67,1348.5h2v-0.5h-2V1348.5z M64,1353H54v-7h10l1,1v5L64,1353z M55,1347.5h9
-				v-0.5h-9V1347.5z M67,1363l7.021,2.5L67,1368h-2h-1v-5h1H67z M67,1364h-2v0.5h2V1364z M68,1355l7.021,2.5L68,1360h-2h-1v-5h1H68z
-				 M68,1356h-2v0.5h2V1356z M64,1360l-1,1H53v-7h10l1,1V1360z M63,1355h-9v0.5h9V1355z"/>
-		</g>
-	</g>
-</g>
-<g id="settings_1_">
-	<path d="M17.859,1358.845l6.42,5.879c0.207,0.185,0.213,0.496,0.02,0.692l-3.504,3.502c-0.195,0.195-0.508,0.188-0.693-0.017
-		l-5.768-6.36L17.859,1358.845z M5.28,1352.518c0.277-0.013,0.664,0.136,0.861,0.33l2.997,2.956l1.918-1.797L8,1350.992
-		c-0.197-0.193-0.348-0.577-0.336-0.854l0.023-0.518c0.012-0.277-0.166-0.627-0.398-0.776l-2.84-1.841
-		c-0.23-0.151-0.58-0.114-0.775,0.081l-1.438,1.437c-0.195,0.195-0.232,0.546-0.082,0.777l1.832,2.842
-		c0.15,0.232,0.5,0.412,0.777,0.399L5.28,1352.518z M25.578,1351.026l-4.828,2.432L17.969,1349l4.975-2.657
-		c-1.933-1.376-4.003-1.227-5.885-0.168c-2.468,1.39-3.556,4.263-2.712,6.843l-11.518,11.518c-0.389,0.389-0.389,1.025,0,1.414
-		l2.122,2.121c0.389,0.389,1.025,0.389,1.414,0l1.415-1.414l10.039-10.04c1.534,0.547,3.301,0.428,4.861-0.448
-		C24.561,1355.11,25.751,1353.396,25.578,1351.026z"/>
-</g>
-<g id="tablet">
-	<path d="M447,1300v-2h-1v-4h-1v4h-1v2h-11v19h25v-19H447z M436,1307h-2v-5h2V1307z M454,1314h-17v-12h17V1314z M457,1307h-2v-5h2
-		V1307z"/>
-	<g opacity="0.5">
-		<rect x="437" y="1302" width="17" height="12"/>
-	</g>
-	<g opacity="0.3">
-		<rect x="455" y="1302" width="2" height="5"/>
-	</g>
-	<g opacity="0.3">
-		<rect x="434" y="1302" width="2" height="5"/>
-	</g>
-</g>
-<g id="birthday_x5F_cake_2_">
-	<g opacity="0.5">
-		<path fill-rule="evenodd" clip-rule="evenodd" d="M390,1297c0,0.553,0.447,1,1,1s1-0.447,1-1c0,0,0-1-1-3
-			C390,1296,390,1297,390,1297z M394,1292c1,2,1,3,1,3c0,0.553-0.447,1-1,1s-1-0.447-1-1C393,1295,393,1294,394,1292z M398,1294
-			c1,2,1,3,1,3c0,0.553-0.447,1-1,1s-1-0.447-1-1C397,1297,397,1296,398,1294z M402,1292c1,2,1,3,1,3c0,0.553-0.447,1-1,1
-			s-1-0.447-1-1C401,1295,401,1294,402,1292z M406,1297c0,0.553-0.447,1-1,1s-1-0.447-1-1c0,0,0-1,1-3C406,1296,406,1297,406,1297z"
-			/>
-	</g>
-	<path d="M388.059,1312.461c0.593,0.67,0.561,1.725,0.791,2.544c0.818-0.575,1.89-1.817,3.002-1.275
-		c0.896,0.436,1.084,1.68,1.506,2.479c0.666-0.677,1.398-1.968,2.502-1.846c1.1,0.09,1.575,1.482,2.146,2.232
-		c0.545-0.772,1.054-2.144,2.148-2.232c1.136,0,1.771,1.16,2.5,1.846c0.381-0.807,0.615-2.046,1.493-2.475
-		c1.13-0.552,2.166,0.724,3.014,1.271c0.199-0.816,0.196-1.877,0.78-2.54c0.838-0.95,2.164-0.121,3.06,0.272v-0.722V1312v-4h-0.062
-		c-0.272-0.995-1.938-1.915-3.938-2.642V1304c0,0-0.442-0.851-1-1.221v-3.279c0-0.275-0.225-0.5-0.5-0.5h-1
-		c-0.275,0-0.5,0.225-0.5,0.5v2.4c-0.316-0.096-0.646-0.187-1-0.268v-4.133c0-0.275-0.225-0.5-0.5-0.5h-1
-		c-0.275,0-0.5,0.225-0.5,0.5v3.797c-0.638-0.077-1.305-0.132-2-0.158v-1.639c0-0.275-0.225-0.5-0.5-0.5h-1
-		c-0.275,0-0.5,0.225-0.5,0.5v1.639c-0.695,0.026-1.362,0.081-2,0.158v-3.797c0-0.275-0.225-0.5-0.5-0.5h-1
-		c-0.275,0-0.5,0.225-0.5,0.5v4.133c-0.354,0.081-0.684,0.172-1,0.268v-2.4c0-0.275-0.225-0.5-0.5-0.5h-1
-		c-0.275,0-0.5,0.225-0.5,0.5v3.047v0.232c-0.558,0.37-1,1.221-1,1.221v1.234c-2.28,0.744-3.65,1.715-3.938,2.766H385v4v0.015
-		c0,0,0,0.295,0,0.717C385.144,1312.67,387.333,1311.639,388.059,1312.461z M390.176,1303.873c0,0,0.199,0.127,0.324,0.127h1
-		c0.275,0,0.5-0.225,0.5-0.5v-0.562c0.308-0.102,0.653-0.198,1.03-0.289c0.064,0.201,0.247,0.351,0.47,0.351h1
-		c0.275,0,0.5-0.225,0.5-0.5v-0.201c0.614-0.076,1.277-0.133,2-0.16v2.361c0,0.275,0.225,0.5,0.5,0.5h1c0.275,0,0.5-0.225,0.5-0.5
-		v-2.361c0.723,0.027,1.386,0.084,2,0.16v1.201c0,0.275,0.225,0.5,0.5,0.5h1c0.275,0,0.5-0.225,0.5-0.5v-0.843
-		c0.365,0.089,0.701,0.183,1,0.281v0.562c0,0.275,0.225,0.5,0.5,0.5h1c0.125,0,0.236-0.051,0.324-0.127
-		c0.816,0.84-2.421,1.678-2.89,1.791c-1.612,0.389-3.278,0.532-4.935,0.532s-3.321-0.144-4.934-0.532
-		C392.598,1305.551,389.359,1304.713,390.176,1303.873C390.264,1303.949,390.176,1303.873,390.176,1303.873z M388.883,1307h0.509
-		c0.861,0.767,2.116,1.144,3.204,1.438c1.757,0.475,3.587,0.688,5.404,0.688s3.647-0.213,5.404-0.688
-		c1.088-0.294,2.343-0.671,3.204-1.438h0.509c0.258,0.134,2.521,1.085,2.369,1.561c-0.169,0.531-1.026,0.88-1.473,1.088
-		c-3.057,1.424-6.692,1.717-10.014,1.717c-3.32,0-6.955-0.289-10.014-1.706c-0.445-0.206-1.304-0.553-1.473-1.083
-		C386.359,1308.092,388.621,1307.136,388.883,1307z M411,1314.439v1.894c0,1.688-2.409,2.586-3.685,3.022
-		c-2.966,1.016-6.197,1.312-9.315,1.312c-3.037,0-6.166-0.286-9.067-1.229c-1.326-0.431-3.933-1.337-3.933-3.105
-		c0,0,0-1.061,0-1.894l0.088-0.027c0.632-0.195,1.196-0.556,1.822-0.766c0.293,0.915,0.188,2.297,1.111,2.871
-		c1.137,0.708,2.298-0.703,3.16-1.261c0.468,0.835,0.638,2.206,1.648,2.587c1.249,0.471,2.122-1.11,2.869-1.814
-		c0.621,0.773,1.103,2.287,2.299,2.287c1.183,0,1.689-1.496,2.288-2.285c0.75,0.655,1.458,2.079,2.645,1.879
-		c1.174-0.199,1.421-1.78,1.882-2.653c0.189,0.114,0.728,0.539,0.728,0.539c0.766,0.601,1.981,1.454,2.783,0.41
-		c0.549-0.714,0.518-1.72,0.757-2.553C409.713,1313.848,411,1314.439,411,1314.439z"/>
-</g>
-<g id="pizza">
-	<path d="M355.834,1298.041l-0.892-2.736c-3.713,1.297-7.11,3.287-10.37,6.601s-5.304,6.657-6.6,10.37l2.715,0.912
-		C343.729,1306.062,348.938,1301.041,355.834,1298.041z"/>
-	<path d="M356.403,1299.687c0,0-5.216,2.563-8.653,6.063s-5.396,7.986-5.396,7.986l8.646,2.882v1.784
-		c0,0.624,0.498,1.244,1.107,1.38l0.785,0.174c0.609,0.136,1.107-0.264,1.107-0.888v-1.45l1,0.333v3.884
-		c0,0.624,0.609,1.295,1.201,1.492l1.973,0.617c0.592,0.197,0.826-0.151,0.826-0.775v-3.884l1,0.333v2.551
-		c0,0.624,0.484,1.295,1.076,1.492l0.848,0.283c0.592,0.197,1.076-0.151,1.076-0.775v-3.691L356.403,1299.687z M345.613,1313.663
-		 M351.509,1315.642l-5.896-1.979c0,0-0.005-1.531,0.96-2.603c1.316-1.319,3.46-1.319,4.776,0
-		C352.609,1312.317,352.652,1314.314,351.509,1315.642z M352.584,1308.209c-0.678,0.678-1.776,0.678-2.454,0
-		c-0.677-0.677-0.677-1.775,0-2.453c0.678-0.678,1.776-0.678,2.454,0C353.261,1306.434,353.261,1307.532,352.584,1308.209z
-		 M356.258,1315.204c-0.498,0.498-1.305,0.498-1.801,0c-0.498-0.496-0.498-1.302,0-1.8c0.496-0.498,1.303-0.498,1.801,0
-		C356.754,1313.902,356.754,1314.708,356.258,1315.204z M355.294,1308.94c-1.08-1.079-1.081-2.835,0-3.916
-		c0.402-0.402,0.899-0.636,1.417-0.736l1.793,5.152C357.464,1309.969,356.164,1309.811,355.294,1308.94z M358.506,1309.439
-		 M360.419,1316.043c-0.587,0.587-1.537,0.587-2.124,0c-0.586-0.585-0.586-1.535,0-2.122c0.587-0.587,1.537-0.587,2.124,0
-		C361.004,1314.508,361.004,1315.458,360.419,1316.043z"/>
-</g>
-<g id="cutlery">
-	<path d="M308.5,1297.028c-0.167,0-3.5,0.972-3.5,3.972v9h-0.5c-0.275,0-0.5,0.225-0.5,0.5v10c0,0.275,0.225,0.5,0.5,0.5h4
-		c0.275,0,0.5-0.225,0.5-0.5v-9.5c0,0,0-12.972,0-13.472S308.667,1297.028,308.5,1297.028z"/>
-	<path d="M300,1297.528V1303c-0.308,0-0.648,0-1,0v-5.472l-0.5-0.5l-0.5,0.5V1303c-0.352,0-0.692,0-1,0v-5.472l-0.5-0.5l-0.5,0.5
-		v4.972c0,1,1,3,1,4v3.5h-0.5c-0.275,0-0.5,0.225-0.5,0.5v10c0,0.275,0.225,0.5,0.5,0.5h4c0.275,0,0.5-0.225,0.5-0.5v-10
-		c0-0.275-0.225-0.5-0.5-0.5H300v-3.5c0-1.5,1-3,1-4v-4.972l-0.5-0.5L300,1297.528z"/>
-</g>
-<g id="fast_x5F_food_1_">
-	<path d="M264.125,1298.969l-0.629,3.031H269v2h-1.158l-1.801,17H257l-1.82-17h-1.158v-2h7.182l1.203-5H269v1.969H264.125z
-		 M244.5,1321h7c1.649,0,3-1.35,3-3h-13C241.5,1319.65,242.851,1321,244.5,1321z M248.001,1310c-4.501,0-6.501,1.779-6.501,3.979h13
-		C254.5,1311.779,252.502,1310,248.001,1310z M254.5,1315.021h-13c-0.275,0-0.5,0.225-0.5,0.5v0.979c0,0.275,0.225,0.5,0.5,0.5h13
-		c0.275,0,0.5-0.225,0.5-0.5v-0.979C255,1315.245,254.775,1315.021,254.5,1315.021z"/>
-</g>
-<g id="beer">
-	<path d="M217.276,1306.161c-0.587-0.771-1.494-1.161-2.666-1.161H212v-0.312c0,0,1.18-0.52,1.697-1.169
-		c0.297-0.407,0.521-0.706,0.412-2.081s-2.266-2.594-3.663-1.863c-0.509-0.84-1.151-1.328-2.088-1.525
-		c-0.198-0.042-0.403-0.062-0.609-0.062c-0.691,0-1.343,0.23-1.876,0.561c-0.699-0.79-1.837-1.459-3.461-1.459
-		c-0.99,0-1.834,0.43-2.377,1.211c-0.255,0.366-0.426,0.78-0.533,1.2c-0.428-0.139-0.896-0.212-1.395-0.212
-		c-1.714,0-3.107,1.512-3.107,3.369c0,1.037,1,1.781,1,3.172V1310v9c0,1.104,0.839,2,1.943,2h12c1.104,0,2.057-0.896,2.057-2v-2
-		v-0.117c2-0.334,4.161-1.43,5.144-5.008C217.881,1309.191,218.153,1307.312,217.276,1306.161z M201,1317.498c0,0.55-0.45,1-1,1
-		s-1-0.45-1-1c0,0,0-4.936,0-5.311c1.312,0,2-1.094,2-1.984C201,1310.844,201,1317.498,201,1317.498z M205,1317.498
-		c0,0.55-0.45,1-1,1s-1-0.45-1-1v-8.953c0-0.559,0.047-1.445,0.375-1.998c0.25-0.422,1.625-0.609,1.625-0.609V1317.498z M209,1316
-		v1.498c0,0.55-0.45,1-1,1s-1-0.45-1-1v-11.779c0.97-0.117,2-0.266,2-0.266V1316z M203.641,1304.266
-		c-1.278,0.188-1.781,1.281-1.844,2.266c-0.038,0.601-0.235,1.328-0.747,1.328c-0.568,0-0.831-0.461-0.951-0.844
-		c-0.085-0.27-0.099,0.012-0.099,0.012v2.863c0,0.477-0.33,1-1.001,1s-0.999-0.533-0.999-1.016v-3.688
-		c0-2.225-2.141-4.094-0.031-5.078c1.219-0.5,2.578,0.922,2.578,0.922s-0.135-2.981,2.031-3.078
-		c2.109-0.094,2.708,1.442,2.938,2.547c0.5-1.292,1.438-1.938,2.438-1.75c0.984,0.234,1.484,1.688,1.484,1.688
-		c0.688-0.75,3-0.854,3,0.641C212.438,1304.401,204.465,1304.144,203.641,1304.266z M215.362,1311.5
-		c-0.636,2.313-2.362,3.029-3.362,3.35V1314v-7h2.883c0.695,0,0.953,0.213,1.075,0.374
-		C216.169,1307.65,216.113,1308.763,215.362,1311.5z"/>
-	<path opacity="0.5" d="M201,1317.498c0,0.55-0.45,1-1,1s-1-0.45-1-1c0,0,0-4.936,0-5.311c1.312,0,2-1.094,2-1.984
-		C201,1310.844,201,1317.498,201,1317.498z"/>
-	<path opacity="0.5" d="M205,1317.498c0,0.55-0.45,1-1,1s-1-0.45-1-1v-8.953c0-0.559,0.047-1.445,0.375-1.998
-		c0.25-0.422,1.625-0.609,1.625-0.609V1317.498z"/>
-	<path opacity="0.5" d="M209,1316v1.498c0,0.55-0.45,1-1,1s-1-0.45-1-1v-11.779c0.97-0.117,2-0.266,2-0.266V1316z"/>
-</g>
-<g id="drink">
-	<path d="M165.496,1305l2.625-8h-1.939l-2.675,8h-4.183c0.124-0.48,0.197-0.981,0.197-1.5c0-3.32-2.701-6.021-6.021-6.021
-		s-6.021,2.701-6.021,6.021s2.701,6.021,6.021,6.021c1.557,0,2.972-0.599,4.042-1.571L160,1321h7l3-16H165.496z M148.801,1302.923
-		c0.084-0.919,0.378-1.637,0.983-2.399l0.139-0.176l2.853,2.853h-3.786l-0.209-0.059L148.801,1302.923z M149.794,1306.467
-		c-0.621-0.779-0.909-1.472-0.992-2.375l-0.049-0.292h4.022l-2.842,2.842L149.794,1306.467z M153.2,1308.01l-0.06,0.21l-0.219-0.021
-		c-0.918-0.085-1.635-0.379-2.398-0.982l-0.176-0.14l2.853-2.853V1308.01z M153.2,1302.775l-2.852-2.851l0.175-0.14
-		c0.773-0.615,1.465-0.9,2.377-0.983l0.299-0.04V1302.775z M157.216,1300.523c0.606,0.764,0.9,1.478,0.992,2.449l0.031,0.228h-4.015
-		l2.853-2.853L157.216,1300.523z M153.8,1298.99l0.06-0.21l0.219,0.021c0.919,0.085,1.637,0.379,2.399,0.981l0.176,0.14
-		l-2.854,2.854V1298.99z M156.477,1307.216c-0.773,0.614-1.465,0.899-2.45,0.992l-0.227,0.03v-4.014l2.853,2.853L156.477,1307.216z
-		 M157.049,1306.624l-2.963-2.963l4.146-0.002l-0.032,0.331c-0.094,0.902-0.444,1.753-1.011,2.46L157.049,1306.624z"/>
-</g>
-<g id="cake_2_">
-	<polygon points="121,1313.429 99,1317 99,1313 121,1309.429 	"/>
-	<path opacity="0.5" d="M121,1317.429L99,1321v-4l22-3.571V1317.429z M121,1305.143l-22,3.715V1313l22-3.571V1305.143z"/>
-	<path d="M108,1297c8,0,13,0,13,6.143l-22,3.715L108,1297z"/>
-</g>
-<g id="ring_2_">
-	<path d="M61.565,1307.406l-2.619-2.812c0,0,1.302,0.781,2.583,0.781s2.417-0.781,2.417-0.781L61.565,1307.406z M67.855,1303.646
-		l-3.13,3.131c1.743,1.021,3.251,3.111,3.111,5.957c-0.134,2.723-3.185,5.745-6.391,5.745s-6.356-2.961-6.493-5.745
-		c-0.141-2.846,1.367-4.937,3.111-5.957l-3.131-3.131c-2.84,2.209-3.664,4.453-3.652,7.282c0.022,5.459,3.845,9.828,10.172,9.828
-		c6.326,0,10.136-4.369,10.158-9.828C71.623,1308.1,70.696,1305.855,67.855,1303.646z M61.488,1298.709
-		c-0.441,0-0.857-0.09-1.25-0.232L58.946,1303c0,0,1.192,0.891,2.505,0.891s2.495-0.891,2.495-0.891l-1.286-4.5
-		C62.291,1298.625,61.9,1298.709,61.488,1298.709z M58.631,1297.315L54.946,1301l2,2l2.208-5.151
-		C58.961,1297.688,58.787,1297.512,58.631,1297.315z M67.946,1301l-2,2l-2.187-5.101c0.202-0.16,0.384-0.34,0.547-0.538L67.946,1301
-		z M59.691,1297c0.475,0.436,1.102,0.709,1.797,0.709c0.693,0,1.321-0.273,1.796-0.709H59.691z"/>
-</g>
-<g id="shield">
-	<path d="M14,1297c-7,0-11,3-11,3v4c0.479,14.129,11,17,11,17s10.521-2.871,11-17v-4C25,1300,21,1297,14,1297z M14,1317.799V1308
-		H6.527c-0.279-1.213-0.473-2.548-0.527-4.053v-2.232c1.417-0.693,4-1.715,6-1.715c0.098,0,1.9,0,2,0v8l7.344-0.016l0.129,0.016
-		C19.985,1314.464,15.794,1317,14,1317.799z"/>
-</g>
-<g id="keyboard_x5F_wired_1_">
-	<path id="keyboard_x5F_wired" d="M452,1265h4v3h-4V1265z M453,1264h3v-3h-3V1264z M456,1255h-5v1h5V1255z M456,1257h-5v3h5V1257z
-		 M452,1261h-3v3h3V1261z M441,1261v3h3v-3H441z M439,1268h12v-3h-12V1268z M445,1261v3h3v-3H445z M450,1255h-3v1h3V1255z M438,1255
-		h-3v1h3V1255z M440,1261h-5v3h5V1261z M459,1253v17c0,0.55-0.45,1-1,1h-25c-0.55,0-1-0.45-1-1v-17c0-0.55,0.45-1,1-1h11v-2h1v-4h1
-		v4h1v2h11C458.55,1252,459,1252.45,459,1253z M457,1254h-23v15h23V1254z M438,1257h-3v3h3V1257z M438,1265h-3v3h3V1265z M442,1255
-		h-3v1h3V1255z M446,1257h-3v3h3V1257z M442,1257h-3v3h3V1257z M446,1255h-3v1h3V1255z M450,1257h-3v3h3V1257z"/>
-</g>
-<g id="keyboard_x5F_wireless_4_">
-	<path d="M412,1253v17c0,0.55-0.45,1-1,1h-25c-0.55,0-1-0.45-1-1v-17c0-0.55,0.45-1,1-1h25C411.55,1252,412,1252.45,412,1253z
-		 M410,1254h-23v15h23V1254z M406,1264h3v-3h-3V1264z M409,1255h-5v1h5V1255z M405,1268h4v-3h-4V1268z M394,1261v3h3v-3H394z
-		 M392,1268h12v-3h-12V1268z M409,1257h-5v3h5V1257z M405,1261h-3v3h3V1261z M398,1261v3h3v-3H398z M395,1257h-3v3h3V1257z
-		 M391,1255h-3v1h3V1255z M393,1261h-5v3h5V1261z M391,1257h-3v3h3V1257z M391,1265h-3v3h3V1265z M399,1257h-3v3h3V1257z M399,1255
-		h-3v1h3V1255z M395,1255h-3v1h3V1255z M403,1257h-3v3h3V1257z M403,1255h-3v1h3V1255z"/>
-</g>
-<g id="credit_x5F_card">
-	<g>
-		<g>
-			<path d="M362,1252h-24c-0.55,0-1,0.45-1,1v3h26v-3C363,1252.45,362.55,1252,362,1252z"/>
-		</g>
-		<g>
-			<path d="M337,1270c0,0.55,0.45,1,1,1h24c0.55,0,1-0.45,1-1v-11h-26V1270z M361,1261h1v1h-1V1261z M359,1261h1v1h-1V1261z
-				 M350,1261h8v1h-8V1261z M339,1266h7v3h-7V1266z"/>
-		</g>
-	</g>
-	<g opacity="0.3">
-		<rect x="339" y="1266" width="7" height="3"/>
-	</g>
-</g>
-<g id="flag_1_">
-	<path d="M295,1249.75c0,0.086,0,22.25,0,22.25h-0.03c0.02,0,0.03-0.086,0.03,0c0,0.69-0.672,1.125-1.5,1.125s-1.5-0.372-1.5-1.062
-		c0-0.086,0.011-0.062,0.03-0.062H292c0,0,0-22.164,0-22.25c0-0.69,0.672-1.25,1.5-1.25S295,1249.06,295,1249.75z M302,1251
-		c-4,0-6-1.5-6-1.5v13c0,0,2,1.5,6,1.5s5.5-3.5,11-1.5c0-0.881,0-12.068,0-13C307.5,1247.5,306,1251,302,1251z"/>
-</g>
-<g id="electrical_x5F_plug">
-	<path d="M262.5,1255H260v-6c0-0.553-0.448-1-1-1s-1,0.447-1,1v6h-8v-6c0-0.553-0.448-1-1-1s-1,0.447-1,1v6h-2.5
-		c-0.276,0-0.5,0.224-0.5,0.5v2.5c0,3,5,6.482,5,11.301V1271h2v2h4v-2h2v-1.699c0-4.818,5-8.301,5-11.301v-2.5
-		C263,1255.224,262.776,1255,262.5,1255z M255.5,1264h-3c-0.276,0-0.5-0.224-0.5-0.5s0.224-0.5,0.5-0.5h3c0.276,0,0.5,0.224,0.5,0.5
-		S255.776,1264,255.5,1264z M256.5,1262h-5c-0.275,0-0.5-0.225-0.5-0.5s0.225-0.5,0.5-0.5h5c0.275,0,0.5,0.225,0.5,0.5
-		S256.775,1262,256.5,1262z M257.5,1260h-7c-0.275,0-0.5-0.225-0.5-0.5s0.225-0.5,0.5-0.5h7c0.275,0,0.5,0.225,0.5,0.5
-		S257.775,1260,257.5,1260z M258.5,1258h-9c-0.275,0-0.5-0.225-0.5-0.5s0.225-0.5,0.5-0.5h9c0.275,0,0.5,0.225,0.5,0.5
-		S258.775,1258,258.5,1258z"/>
-</g>
-<g id="vcard">
-	<path d="M195,1249v18.509V1273h3v-1c0-0.553,0.448-1,1-1h5c0.552,0,1,0.447,1,1v1h2v-1c0-0.553,0.448-1,1-1h5c0.552,0,1,0.447,1,1
-		v1h3v-24H195z M213,1266h-14c0-1,0-0.957,0-1.171c0-0.732,0.355-1.033,0.912-1.35c0.449-0.255,2.088-1.404,4.088-2.012v-1.959
-		c-1-0.316-1-1.252-1-2c0-1.739,0-2,0-2c0-1.722,0.913-3,3-3s3,1.278,3,3v2c0,0.74,0,1.684-1,2v1.959
-		c2,0.607,3.639,1.757,4.088,2.012c0.557,0.316,0.912,0.617,0.912,1.35C213,1265.043,213,1265,213,1266z"/>
-</g>
-<g id="bank_1_">
-	<path d="M170,1272.5c0,0.276-0.224,0.5-0.5,0.5h-23c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h23
-		c0.276,0,0.5,0.224,0.5,0.5V1272.5z M146,1259.385c0-0.268,0.178-0.682,0.395-0.85l11.211-9.26
-		c0.217-0.168,0.572-0.152,0.789,0.016l11.211,9.234c0.217,0.168,0.395,0.593,0.395,0.859s-0.225,0.615-0.5,0.615H167v8h1.5
-		c0.275,0,0.5,0.214,0.5,0.489v1c0,0.275-0.225,0.511-0.5,0.511h-21c-0.275,0-0.5-0.235-0.5-0.511v-1c0-0.275,0.225-0.489,0.5-0.489
-		h1.5v-8h-2.5C146.225,1260,146,1259.65,146,1259.385z M153,1268v-8h-2v8H153z M157,1268v-8h-2v8H157z M161,1268v-8h-2v8H161z
-		 M165,1260h-2v8h2V1260z"/>
-</g>
-<g id="spade">
-	<g id="spade_1_">
-		<path d="M121.705,1253.538l-4.242-4.243c-0.195-0.194-0.514-0.194-0.707,0l-0.708,0.707c-0.194,0.194-0.194,0.513,0,0.707
-			l1.062,1.062l-9.193,9.192l-0.707-0.707l-1.414,1.414l-2.828-2.828l-2.121,2.121c-4.95,4.949-1.938,11.129-1.938,11.129
-			s6.18,3.014,11.13-1.937l2.121-2.122l-2.829-2.828l1.415-1.414l-0.707-0.707l9.192-9.192l1.061,1.061
-			c0.194,0.194,0.513,0.194,0.707,0l0.707-0.707C121.899,1254.051,121.899,1253.732,121.705,1253.538z M110.21,1267.498l0.535,0.535
-			l-1.415,1.414c-3.812,3.812-8.402,2.383-9.66,1.884c-0.054-0.135-0.119-0.315-0.187-0.521c1.72,0.561,5.908,1.507,9.312-1.897
-			L110.21,1267.498z"/>
-	</g>
-</g>
-<g id="buoy_1_">
-	<path d="M72.534,1264.328c-0.68-0.544-1.611-1.288-3.338-1.288s-2.658,0.744-3.338,1.288c-0.526,0.421-0.79,0.632-1.466,0.632
-		c-0.674,0-0.938-0.211-1.464-0.632c-0.68-0.543-1.61-1.288-3.337-1.288c-1.726,0-2.656,0.745-3.336,1.289
-		c-0.524,0.42-0.788,0.631-1.46,0.631s-0.936-0.211-1.46-0.631c-0.68-0.544-1.61-1.289-3.336-1.289v3
-		c0.673,0,0.937,0.211,1.461,0.631c0.68,0.544,1.609,1.289,3.335,1.289s2.655-0.745,3.335-1.289c0.524-0.42,0.788-0.631,1.461-0.631
-		c0.674,0,0.938,0.211,1.464,0.632c0.68,0.543,1.61,1.288,3.337,1.288c1.728,0,2.659-0.745,3.339-1.288
-		c0.526-0.421,0.79-0.632,1.465-0.632s0.938,0.211,1.465,0.632c0.68,0.543,1.611,1.288,3.339,1.288v-3
-		C73.324,1264.96,73.061,1264.749,72.534,1264.328z"/>
-	<path d="M69.196,1268.04c-1.727,0-2.658,0.744-3.338,1.288c-0.526,0.421-0.79,0.632-1.466,0.632c-0.674,0-0.938-0.211-1.464-0.632
-		c-0.68-0.543-1.61-1.288-3.337-1.288c-1.726,0-2.656,0.745-3.336,1.289c-0.524,0.42-0.788,0.631-1.46,0.631
-		s-0.936-0.211-1.46-0.631c-0.68-0.544-1.61-1.289-3.336-1.289v3c0.673,0,0.937,0.211,1.461,0.631
-		c0.68,0.544,1.609,1.289,3.335,1.289s2.655-0.745,3.335-1.289c0.524-0.42,0.788-0.631,1.461-0.631c0.674,0,0.938,0.211,1.464,0.632
-		c0.68,0.543,1.61,1.288,3.337,1.288c1.728,0,2.659-0.745,3.339-1.288c0.526-0.421,0.79-0.632,1.465-0.632s0.938,0.211,1.465,0.632
-		c0.68,0.543,1.611,1.288,3.339,1.288v-3c-0.676,0-0.939-0.211-1.466-0.632C71.854,1268.784,70.923,1268.04,69.196,1268.04z"/>
-	<path d="M63.862,1263.155c0.153,0.123,0.278,0.282,0.56,0.282s0.349-0.16,0.499-0.28c0.278-0.224,0.628-0.501,1.068-0.764
-		c-0.054-2.265-1.778-4.096-3.989-4.344v-7.551c0-0.274-0.225-0.499-0.499-0.499h-0.002c-0.274,0-0.499,0.225-0.499,0.499v7.549
-		c-2.1,0.235-3.751,1.906-3.956,4.019c0.669-0.298,1.497-0.522,2.548-0.522C61.841,1261.544,63.106,1262.552,63.862,1263.155z"/>
-	<path d="M63,1250v5c0,0,6.342-5.43,6.538-5.605s0.124-0.352-0.129-0.311S63,1250,63,1250z"/>
-</g>
-<g id="pool_1_">
-	<path d="M18.98,1249.166c-0.359-0.107-0.721-0.161-1.073-0.161c-0.87,0-1.656,0.329-2.273,0.948
-		c-0.617,0.617-1.038,1.036-1.46,1.45c-0.405,0.396-0.809,0.802-1.381,1.374C12.375,1253.195,12,1253.609,12,1254H8
-		c0.554-0.553,1.437-1.327,1.437-1.327s0.848-0.831,1.471-1.453c0.275-0.276,0.613-0.417,1.005-0.417
-		c0.176,0,0.361,0.029,0.55,0.086c0.224,0.066,0.44,0.172,0.637,0.303l1.279-1.279c-0.416-0.334-0.893-0.595-1.397-0.746
-		c-0.359-0.107-0.721-0.161-1.073-0.161c-0.87,0-1.656,0.329-2.273,0.948c-0.617,0.617-1.038,1.036-1.461,1.451
-		c-0.404,0.396-0.808,0.803-1.38,1.373C6.375,1253.195,6,1253.734,6,1254v8.795c0,0.109,0.455,0.165,0.797,0.165
-		c0.551,0,1.203-0.149,1.203-0.433V1262h0.002c0,0,2.463-0.96,3.59-0.96s1.723,0.423,2.408,0.626V1254
-		c0.554-0.553,1.041-0.94,1.437-1.327c0.423-0.414,0.848-0.831,1.47-1.453c0.275-0.276,0.614-0.417,1.006-0.417
-		c0.177,0,0.361,0.029,0.55,0.086c0.67,0.201,1.17,0.695,1.349,1.111h1.851C21.281,1250.875,20.312,1249.566,18.98,1249.166z
-		 M12,1260H8v-1h4V1260z M12,1257H8v-1h4V1257z"/>
-	<path d="M21.196,1268.04c-1.727,0-2.658,0.744-3.338,1.288c-0.526,0.421-0.79,0.632-1.466,0.632c-0.674,0-0.938-0.211-1.464-0.632
-		c-0.68-0.543-1.61-1.288-3.337-1.288c-1.726,0-2.656,0.745-3.336,1.289c-0.524,0.42-0.788,0.631-1.46,0.631
-		s-0.936-0.211-1.46-0.631c-0.68-0.544-1.61-1.289-3.336-1.289v3c0.673,0,0.937,0.211,1.461,0.631
-		c0.68,0.544,1.609,1.289,3.335,1.289s2.655-0.745,3.335-1.289c0.524-0.42,0.788-0.631,1.461-0.631c0.674,0,0.938,0.211,1.464,0.632
-		c0.68,0.543,1.61,1.288,3.337,1.288c1.728,0,2.659-0.745,3.339-1.288c0.526-0.421,0.79-0.632,1.465-0.632s0.938,0.211,1.465,0.632
-		c0.68,0.543,1.611,1.288,3.339,1.288v-3c-0.676,0-0.939-0.211-1.466-0.632C23.854,1268.784,22.923,1268.04,21.196,1268.04z"/>
-	<path d="M21.196,1263.04c-1.727,0-2.658,0.744-3.338,1.288c-0.526,0.421-0.79,0.632-1.466,0.632c-0.674,0-0.938-0.211-1.464-0.632
-		c-0.68-0.543-1.61-1.288-3.337-1.288c-1.726,0-2.656,0.745-3.336,1.289c-0.524,0.42-0.788,0.631-1.46,0.631
-		s-0.936-0.211-1.46-0.631c-0.68-0.544-1.61-1.289-3.336-1.289v3c0.673,0,0.937,0.211,1.461,0.631
-		c0.68,0.544,1.609,1.289,3.335,1.289s2.655-0.745,3.335-1.289c0.524-0.42,0.788-0.631,1.461-0.631c0.674,0,0.938,0.211,1.464,0.632
-		c0.68,0.543,1.61,1.288,3.337,1.288c1.728,0,2.659-0.745,3.339-1.288c0.526-0.421,0.79-0.632,1.465-0.632s0.938,0.211,1.465,0.632
-		c0.68,0.543,1.611,1.288,3.339,1.288v-3c-0.676,0-0.939-0.211-1.466-0.632C23.854,1263.784,22.923,1263.04,21.196,1263.04z"/>
-</g>
-<g id="barcode">
-	<path id="barcode_1_" d="M434,1201h2v21h-2V1201z M445,1201h-4v21h4V1201z M448,1201h-2v21h2V1201z M452,1201h-2v21h2V1201z
-		 M458,1201h-2v21h2V1201z M455,1201h-2v21h2V1201z M437,1222h2v-21h-2V1222z M434,1225h3v-2h-3V1225z M438,1225h2v-2h-2V1225z
-		 M441,1225h2v-2h-2V1225z M444,1225h2v-2h-2V1225z M447,1225h2v-2h-2V1225z M450,1225h2v-2h-2V1225z M454,1225h4v-2h-4V1225z"/>
-</g>
-<g id="qrcode">
-	<path id="qrcode_1_" d="M394,1209h-6v-6h6V1209z M396,1211h-10v-10h10V1211z M395,1202h-8v8h8V1202z M408,1203h-6v6h6V1203z
-		 M410,1201v10h-10v-10H410z M409,1202h-8v8h8V1202z M388,1223h6v-6h-6V1223z M386,1215h10v10h-10V1215z M387,1224h8v-8h-8V1224z
-		 M404,1217h-2h-4v4h4v-2h4v-2v-2h-2V1217z M408,1220h2v-2h-2V1220z M398,1225h5v-2h-5V1225z M403,1221v2h2v-2H403z M408,1217h2v-5
-		h-2V1217z M407,1212h-2v2h2V1212z M399,1208h-2v2h2V1208z M399,1202h-2v4h2V1202z M388,1212h-2v2h2V1212z M391,1214v-2h-2v2H391z
-		 M408,1223h-3v2h5v-2v-2h-2V1223z M399,1212h-6v2h6v2h2h2v-4h-2H399z"/>
-</g>
-<g id="sheriffs_x5F_star">
-	<path d="M360.154,1216.659c-0.354,0-0.68,0.104-0.96,0.275l-2.235-3.658l2.192-3.378c0.288,0.188,0.632,0.299,1.003,0.299
-		c1.02,0,1.846-0.826,1.846-1.846s-0.826-2.021-1.846-2.021s-1.847,0.67-1.847,1.67h-4.357l-2.989-4.717
-		c0.529-0.324,0.885-0.815,0.885-1.481c0-1.02-0.826-1.802-1.846-1.802s-1.846,0.847-1.846,1.866c0,0.668,0.356,1.083,0.888,1.407
-		l-2.988,4.727h-4.361c0-1-0.827-1.67-1.847-1.67s-1.846,0.915-1.846,1.935s0.826,1.889,1.846,1.889c0.372,0,0.716-0.09,1.007-0.279
-		l2.192,3.391l-2.236,3.666c-0.281-0.172-0.609-0.273-0.963-0.273c-1.02,0-1.846,0.826-1.846,1.846s0.826,2.095,1.846,2.095
-		s1.847-0.598,1.847-1.598h4.742l2.582,3.732c-0.517,0.328-0.862,0.778-0.862,1.435c0,1.02,0.826,1.784,1.846,1.784
-		s1.846-0.858,1.846-1.878c0-0.656-0.344-0.997-0.859-1.325l2.582-3.748h4.739c0,1,0.827,1.6,1.847,1.6s1.846-0.952,1.846-1.972
-		S361.174,1216.659,360.154,1216.659z M354.54,1216h-2.993l-1.545,2.25l-0.002,0.064l-1.543-2.314h-2.993l1.451-2.568l-1.451-2.432
-		h2.819l1.717-2.748l0.002-0.033l1.718,2.781h2.82l-1.452,2.432L354.54,1216z"/>
-</g>
-<g id="delete">
-	<path d="M313,1205h-14.768h-2l-7.646,7.646c-0.194,0.194-0.204,0.521-0.021,0.727l7.668,8.627H313c0.55,0,1-0.45,1-1v-15
-		C314,1205.45,313.55,1205,313,1205z M309.669,1215.933c0.169,0.169,0.169,0.446,0,0.615l-1.822,1.822
-		c-0.169,0.169-0.446,0.169-0.615,0l-2.472-2.472l-2.475,2.475c-0.169,0.169-0.445,0.169-0.615,0l-1.822-1.822
-		c-0.17-0.17-0.17-0.447,0-0.615l2.475-2.475l-2.478-2.477c-0.169-0.17-0.169-0.446,0-0.615l1.823-1.823
-		c0.169-0.169,0.445-0.169,0.615,0l2.477,2.478l2.475-2.475c0.168-0.17,0.445-0.17,0.615,0l1.822,1.822
-		c0.169,0.17,0.169,0.446,0,0.615l-2.475,2.475L309.669,1215.933z"/>
-</g>
-<g id="boat_2_">
-	<path d="M262.081,1206.606l-2.292-0.982c-0.006-0.015-1.567-3.176-1.567-3.176c-0.122-0.247-0.447-0.448-0.722-0.448H256v-0.5
-		c0-0.275-0.225-0.5-0.5-0.5h-3c-0.275,0-0.5,0.225-0.5,0.5v0.5h-1.5c-0.275,0-0.601,0.201-0.724,0.447c0,0-1.567,3.155-1.575,3.181
-		l-2.283,0.979c-0.505,0.216-0.919,0.844-0.919,1.394v3.741l9-3.741l9,3.741V1208C263,1207.45,262.586,1206.822,262.081,1206.606z
-		 M246,1210.242V1208c0-0.149,0.175-0.415,0.312-0.474l5.163-2.214c0.079-0.033,1.285-0.282,1.525-0.3V1207
-		c0,0.108,0.03,0.209,0.062,0.307L246,1210.242z M262,1210.242l-7.062-2.936c0.032-0.098,0.062-0.198,0.062-0.307v-1.983
-		c0.183,0.015,1.477,0.276,1.526,0.297l5.161,2.212c0.138,0.06,0.312,0.325,0.312,0.475V1210.242z"/>
-	<path d="M264.74,1214.164l-9.816-4.081c-0.508-0.211-1.34-0.211-1.848,0l-9.816,4.081c-0.508,0.211-0.694,0.771-0.414,1.244
-		l5.645,8.731c0.28,0.474,0.51,0.86,1.51,0.86s4-3.979,4-3.979s3,3.979,4,3.979s1.229-0.387,1.51-0.86l5.645-8.731
-		C265.435,1214.935,265.248,1214.375,264.74,1214.164z M250,1223.667l-6.203-8.698l0.859,0.031l5.484,6.984l3.172-1.844
-		L250,1223.667z"/>
-</g>
-<g id="fishes_2_">
-	<path d="M219.006,1200.533c0-0.275-0.183-0.37-0.408-0.212l-3.509,2.453c-1.036-0.759-3.084-1.895-5.083-2.444l0.005-2.318
-		l-4.261,2.134c-3.837,0.591-6.704,2.906-6.705,3.341c-0.001,0.5,3.805,3.509,8.5,3.52c0.778,0.002,1.501-0.099,2.217-0.258
-		l2.226,1.259l0.004-1.991c1.001-0.557,2.39-1.231,3.093-1.742l3.481,2.47c0.224,0.159,0.416,0.065,0.417-0.21
-		c0,0-1.054-1.768-1.052-2.955C217.935,1202.391,219.006,1200.533,219.006,1200.533z M203.531,1203.479c-0.553,0-1-0.447-1-1
-		s0.447-1,1-1s1,0.447,1,1S204.084,1203.479,203.531,1203.479z M211.985,1210.5c0-0.275-0.184-0.37-0.407-0.211l-3.496,2.461
-		c-1.038-0.756-3.082-1.887-5.082-2.433V1208l-4.264,2.144c-3.835,0.6-6.7,2.922-6.7,3.356c0,0.5,3.812,3.5,8.506,3.5
-		c0.778,0,1.507-0.103,2.224-0.263l2.234,1.253v-1.991c1-0.559,2.379-1.237,3.082-1.749l3.483,2.461
-		c0.225,0.159,0.414,0.064,0.414-0.211c0,0-1.06-1.766-1.06-2.953S211.985,1210.5,211.985,1210.5z M196.517,1213.469
-		c-0.553,0-1-0.447-1-1s0.447-1,1-1s1,0.447,1,1S197.069,1213.469,196.517,1213.469z M219.949,1220.51
-		c0-0.275-0.184-0.37-0.408-0.211l-3.478,2.461c-1.038-0.756-3.063-1.887-5.063-2.433v-2.317l-4.281,2.144
-		c-3.836,0.6-6.71,2.922-6.71,3.356c0,0.5,3.808,3.5,8.501,3.5c0.779,0,1.523-0.103,2.24-0.263L213,1228v-1.991
-		c1-0.559,2.361-1.237,3.063-1.749l3.475,2.461c0.225,0.159,0.409,0.064,0.409-0.211c0,0-1.061-1.766-1.061-2.953
-		S219.949,1220.51,219.949,1220.51z M204.48,1223.479c-0.553,0-1-0.447-1-1s0.447-1,1-1s1,0.447,1,1
-		S205.033,1223.479,204.48,1223.479z"/>
-</g>
-<g id="fins">
-	<path d="M154,1202.375h-0.021c-0.105-1-1.245-1.999-2.479-1.999s-2.375,0.999-2.479,1.999H149l-4,16.042v4.958c0,0,1.812,2,6.5,2
-		s6.5-2,6.5-2v-4.958L154,1202.375z M151.5,1209.202c-1.108,0-2.005-0.726-2.005-1.833c0-0.057,0.02-0.197,0.02-0.197
-		c0.012-0.117,0.032-0.316,0.063-0.428c0,0,0.81-3.489,0.81-3.494c0-0.614,0.498-1.123,1.113-1.123s1.113,0.492,1.113,1.106
-		c0,0.005-0.002,0.007-0.002,0.007l0.812,3.419c0.031,0.111,0.051,0.397,0.063,0.515c0,0,0.02,0.139,0.02,0.195
-		C153.505,1208.477,152.608,1209.202,151.5,1209.202z M160.131,1200.015l-0.017,0.013c-0.671-0.749-2.18-0.891-3.181-0.168
-		c-1.001,0.723-1.34,2.2-0.839,3.072l-0.017,0.013l6.154,15.345l2.904,4.02c0,0,2.64,0.56,6.439-2.187s4.097-5.429,4.097-5.429
-		l-2.904-4.018L160.131,1200.015z M162.103,1207.013c-0.898,0.649-2.051,0.587-2.699-0.311c-0.033-0.046-0.099-0.171-0.099-0.171
-		c-0.059-0.104-0.16-0.275-0.199-0.384c0,0-1.388-3.303-1.391-3.307c-0.36-0.498-0.254-1.202,0.244-1.562
-		c0.499-0.36,1.19-0.253,1.55,0.244c0.002,0.004,0.002,0.007,0.004,0.01l2.658,2.293c0.09,0.072,0.274,0.293,0.353,0.381
-		l0.122,0.159c0,0-0.024-0.06,0.009-0.013C163.304,1205.25,163.001,1206.365,162.103,1207.013z"/>
-</g>
-<g id="oxygen_x5F_bottle">
-	<path d="M121,1199h-2c-0.55,0-1,0.45-1,1h-1c0-0.55-0.45-1-1-1s-1,0.45-1,1h-1v1h1v1h-0.5c-0.275,0-0.5,0.225-0.5,0.5v1.642
-		c-1.723,0.446-3,1.997-3,3.858v17c0,0.553,0.447,1,1,1h8c0.553,0,1-0.447,1-1v-17c0-1.861-1.277-3.412-3-3.858v-1.642
-		c0-0.275-0.225-0.5-0.5-0.5H117v-1h1c0,0.55,0.45,1,1,1h2c0.55,0,1-0.45,1-1v-1C122,1199.45,121.55,1199,121,1199z M112.5,1225H112
-		v-17h0.5V1225z"/>
-	<path d="M107,1204.142v-1.642c0-0.275-0.225-0.5-0.5-0.5H106v-2c0-0.55-0.45-1-1-1s-1,0.45-1,1v2h-0.5c-0.275,0-0.5,0.225-0.5,0.5
-		v1.642c-1.723,0.446-3,1.997-3,3.858v17c0,0.553,0.447,1,1,1h8c0.553,0,1-0.447,1-1v-17
-		C110,1206.139,108.723,1204.588,107,1204.142z M101.5,1225H101v-17h0.5V1225z"/>
-</g>
-<g id="scuba_x5F_diving_2_">
-	<path d="M71.208,1204.338l-7.325-0.783c-0.319,0-0.451,0.248-0.367,0.539l1.449,5.152c0.12,0.417,0.564,0.696,0.99,0.642
-		l5.249-0.717c0.42-0.061,0.775-0.47,0.775-0.895v-3.076C71.979,1204.779,71.626,1204.385,71.208,1204.338z"/>
-	<path d="M61.064,1203.559c-0.01,0-0.02,0-0.03,0l-7.222,0.779c-0.418,0.047-0.771,0.441-0.771,0.862v3.076
-		c0,0.425,0.355,0.834,0.775,0.895l5.229,0.717c0.425,0.056,0.87-0.227,0.989-0.642l1.449-5.152
-		C61.582,1203.755,61.402,1203.559,61.064,1203.559z"/>
-	<path d="M75.5,1204H74c0-2.054-2.843-2.493-4.351-2.836c-2.262-0.514-4.615-1.031-6.942-1.078
-		c-2.344-0.047-4.743,0.512-7.017,1.021C54,1201.483,51,1201.725,51,1204h-1.5c-0.275,0-0.5,0.225-0.5,0.5v4.979
-		c0,0.275,0.225,0.5,0.5,0.5H51c0,1.062,0.827,1.987,1.883,2.104l6.91,0.801c0.221,0.022,0.435,0.009,0.651-0.035
-		c0.117,0.087,0.261,0.151,0.452,0.151h3c0.191,0,0.334-0.063,0.452-0.151c0.217,0.044,0.431,0.058,0.651,0.035l7.117-0.779
-		c1.056-0.117,1.883-1.042,1.883-2.104h1.5c0.275,0,0.5-0.225,0.5-0.5v-5C76,1204.225,75.775,1204,75.5,1204z M73,1210
-		c0,0.55-0.447,1.05-0.994,1.11l-7.115,0.779c-0.547,0.061-1.033-1.316-1.207-1.838l-0.367-1.104
-		c-0.161-0.481-0.066-1.667-0.816-1.667s-0.656,1.186-0.816,1.667l-0.367,1.104c-0.174,0.521-0.867,1.898-1.414,1.838l-6.908-0.801
-		c-0.547-0.061-0.994-0.561-0.994-1.11v-0.5v-4.979v-0.5c0-0.55,0.422-0.995,0.961-1.104c1.356-0.269,2.715-0.525,4.076-0.772
-		c1.77-0.321,3.654-0.812,5.463-0.812c1.731,0,3.534,0.466,5.229,0.772c1.426,0.259,2.85,0.528,4.271,0.812
-		c0.539,0.108,1,0.554,1,1.104v0.5v5V1210z"/>
-	<path d="M69,1219c0-0.55-0.45-1-1-1c0,0-1,0.016-1.266,0c-0.604-1.771-2.258-3-4.234-3c-2.485,0-4.5,2.015-4.5,4.5
-		s2.015,4.5,4.5,4.5c1.977,0,3.583-1.229,4.188-3c0.609,0,1.312,0,1.312,0c0.55,0,1-0.45,1-1h5v-1H69z M62.5,1222
-		c-1.381,0-2.5-1.119-2.5-2.5s1.119-2.5,2.5-2.5s2.5,1.119,2.5,2.5S63.881,1222,62.5,1222z"/>
-</g>
-<g id="snorkel_x5F_diving_2_">
-	<path d="M27.5,1204H26c0-2.054-2.843-2.493-4.351-2.836c-2.262-0.514-4.615-1.031-6.942-1.078
-		c-2.344-0.047-4.743,0.512-7.017,1.021C6,1201.483,3,1201.725,3,1204H1.5c-0.275,0-0.5,0.225-0.5,0.5v4.979
-		c0,0.275,0.225,0.5,0.5,0.5H3c0,1.062,0.827,1.987,1.883,2.104l6.91,0.801c0.221,0.022,0.435,0.009,0.651-0.035
-		c0.117,0.087,0.261,0.151,0.452,0.151h3c0.191,0,0.334-0.063,0.452-0.151c0.217,0.044,0.431,0.058,0.651,0.035l7.117-0.779
-		c1.056-0.117,1.883-1.042,1.883-2.104h1.5c0.275,0,0.5-0.225,0.5-0.5v-5C28,1204.225,27.775,1204,27.5,1204z M25,1210
-		c0,0.55-0.447,1.05-0.994,1.11l-7.115,0.779c-0.547,0.061-1.033-1.316-1.207-1.838l-0.367-1.104
-		c-0.161-0.481-0.066-1.667-0.816-1.667s-0.656,1.186-0.816,1.667l-0.367,1.104c-0.174,0.521-0.867,1.898-1.414,1.838l-6.908-0.801
-		c-0.547-0.061-0.994-0.561-0.994-1.11v-0.5v-4.979v-0.5c0-0.55,0.422-0.995,0.961-1.104c1.356-0.269,2.715-0.525,4.076-0.772
-		c1.77-0.321,3.654-0.812,5.463-0.812c1.731,0,3.534,0.466,5.229,0.772c1.426,0.259,2.85,0.528,4.271,0.812
-		c0.539,0.108,1,0.554,1,1.104v0.5v5V1210z"/>
-	<path d="M13.064,1203.559c-0.01,0-0.02,0-0.03,0l-7.222,0.779c-0.418,0.047-0.771,0.441-0.771,0.862v3.076
-		c0,0.425,0.355,0.834,0.775,0.895l5.229,0.717c0.425,0.056,0.87-0.227,0.989-0.642l1.449-5.152
-		C13.582,1203.755,13.402,1203.559,13.064,1203.559z"/>
-	<path d="M23.208,1204.338l-7.325-0.783c-0.319,0-0.451,0.248-0.367,0.539l1.449,5.152c0.12,0.417,0.564,0.696,0.99,0.642
-		l5.249-0.717c0.42-0.061,0.775-0.47,0.775-0.895v-3.076C23.979,1204.779,23.626,1204.385,23.208,1204.338z"/>
-	<path d="M9,1222h12v3H9V1222z M22,1222v3h4v-3H22z M10,1218.735c0-0.67-0.282-0.503-0.741-0.646
-		c-0.432-0.135-0.377-1.184,0.117-1.219c0.928-0.066,0.624-1.144,0.624-1.871H8.75c-0.55,0-0.75,1-0.75,1
-		c-2.611,0-5.25,1.656-5.25,4.5S5.389,1225,8,1225v-3c-1.223,0-2.25-0.023-2.25-1.5S6.777,1219,8,1219c0,0,0.2,1,0.75,1H10
-		C10,1220,10,1219.98,10,1218.735z"/>
-</g>
-<g id="divide_1_">
-	<path d="M455,1166.5c0,0.276-0.224,0.5-0.5,0.5h-17c-0.276,0-0.5-0.224-0.5-0.5v-3c0-0.276,0.224-0.5,0.5-0.5h17
-		c0.276,0,0.5,0.224,0.5,0.5V1166.5z M448,1157.5c0-0.276-0.224-0.5-0.5-0.5h-3c-0.276,0-0.5,0.224-0.5,0.5v3
-		c0,0.276,0.224,0.5,0.5,0.5h3c0.276,0,0.5-0.224,0.5-0.5V1157.5z M448,1169.5c0-0.276-0.224-0.5-0.5-0.5h-3
-		c-0.276,0-0.5,0.224-0.5,0.5v3c0,0.276,0.224,0.5,0.5,0.5h3c0.276,0,0.5-0.224,0.5-0.5V1169.5z"/>
-</g>
-<g id="asterisk">
-	<path d="M407.5,1163h-4.653l3.016-3.016c0.196-0.197,0.196-0.52,0-0.716l-2.118-2.118c-0.196-0.196-0.519-0.196-0.716,0
-		l-3.028,3.028v-4.679c0-0.275-0.225-0.5-0.5-0.5h-3c-0.275,0-0.5,0.225-0.5,0.5v4.665l-3.019-3.018
-		c-0.197-0.196-0.52-0.196-0.716,0l-2.118,2.119c-0.197,0.195-0.197,0.518,0,0.716l3.018,3.018H388.5c-0.275,0-0.5,0.225-0.5,0.5v3
-		c0,0.275,0.225,0.5,0.5,0.5h4.679l-3.029,3.029c-0.195,0.195-0.195,0.519,0,0.716l2.118,2.118c0.197,0.195,0.521,0.195,0.716,0
-		l3.017-3.017v4.653c0,0.275,0.225,0.5,0.5,0.5h3c0.275,0,0.5-0.225,0.5-0.5v-4.665l3.025,3.025c0.196,0.196,0.52,0.196,0.716,0
-		l2.119-2.119c0.195-0.195,0.195-0.519,0-0.716l-3.025-3.025h4.665c0.275,0,0.5-0.225,0.5-0.5v-3
-		C408,1163.225,407.775,1163,407.5,1163z"/>
-</g>
-<g id="female">
-	<path d="M355,1171.042h-3v-3.399v-0.233c3-0.743,5.639-3.682,5.639-7.189c0-4.067-3.365-7.376-7.432-7.376
-		c-4.068,0-7.543,3.309-7.543,7.376c0,3.419,2.336,6.293,5.336,7.126v0.297v3.399h-3c-0.553,0-1,0.697-1,1.25v1.351
-		c0,0.553,0.447,1.333,1,1.333h3v2.667c0,0.553,0.447,1.333,1,1.333h2c0.553,0,1-0.78,1-1.333v-2.667h3c0.553,0,1-0.78,1-1.333
-		v-1.351C356,1171.739,355.553,1171.042,355,1171.042z M346.775,1160.22c0-1.861,1.514-3.376,3.375-3.376s3.377,1.515,3.377,3.376
-		s-1.516,3.376-3.377,3.376S346.775,1162.081,346.775,1160.22z"/>
-</g>
-<g id="male_1_">
-	<path d="M312.703,1154.078l-8.99,1.146c-0.188,0.023-0.235,0.156-0.102,0.29l2.519,2.519l-3.937,3.937
-		c-0.999-0.506-2.124-0.797-3.317-0.797c-4.067,0-7.376,3.309-7.376,7.376s3.309,7.376,7.376,7.376s7.376-3.309,7.376-7.376
-		c0-1.376-0.385-2.659-1.043-3.763l3.837-3.837l2.454,2.518c0.133,0.134,0.266,0.086,0.291-0.102l1.208-8.988
-		C313.023,1154.189,312.89,1154.055,312.703,1154.078z M298.875,1171.925c-1.861,0-3.376-1.515-3.376-3.376s1.515-3.376,3.376-3.376
-		s3.376,1.515,3.376,3.376S300.737,1171.925,298.875,1171.925z"/>
-</g>
-<g id="chat_1_">
-	<path d="M265.885,1163.338c0,4.568-5.32,8.271-11.884,8.271c-1.713,0-3.339-0.255-4.81-0.707l-4.831,2.98
-		c-0.239,0.125-0.376,0.014-0.305-0.247l1.135-4.746c-1.912-1.469-3.075-3.416-3.075-5.552c0-4.568,5.321-8.272,11.885-8.272
-		S265.885,1158.77,265.885,1163.338z"/>
-</g>
-<g id="conversation_1_">
-	<path d="M216.937,1168.137c0.068,0.248-0.064,0.354-0.291,0.234l-3.445-1.806c-1.067,0.329-2.247,0.515-3.49,0.515
-		c-4.767,0-8.632-2.689-8.632-6.007c0-3.318,3.865-6.008,8.632-6.008c4.768,0,8.633,2.689,8.633,6.008
-		c0,1.551-0.851,2.958-2.236,4.024L216.937,1168.137z M209.43,1168.908c-5.705,0-10.173-3.299-10.173-7.512
-		c0-0.649,0.119-1.275,0.319-1.872c-3.237,0.894-5.528,3.089-5.528,5.66c0,1.572,0.863,3.001,2.267,4.081l-0.84,3.082
-		c-0.068,0.251,0.064,0.357,0.294,0.236l3.494-1.83c1.083,0.334,2.278,0.522,3.539,0.522c2.821,0,5.321-0.934,6.92-2.376
-		C209.624,1168.902,209.528,1168.908,209.43,1168.908z"/>
-</g>
-<g id="anchor">
-	<path d="M169.434,1168.096l-6.434,0.919c-0.272,0.039-0.336,0.229-0.142,0.425l1.706,1.684c-1.207,1.3-2.564,2.227-4.564,2.635
-		v-13.299c1-0.692,1.979-1.981,1.979-3.459c0-2.206-1.808-4.001-4.013-4.001c-2.207,0-3.984,1.795-3.984,4.001
-		c0,1.478,1.018,2.767,2.018,3.459v13.297c-2-0.407-3.404-1.338-4.613-2.643l1.669-1.68c0.193-0.194,0.125-0.385-0.148-0.424
-		l-6.435-0.92c-0.273-0.039-0.468,0.152-0.429,0.425l0.92,6.435c0.039,0.272,0.229,0.336,0.423,0.142l1.848-1.849
-		c2.189,2.318,5.289,3.758,8.719,3.758c3.416,0,6.499-1.467,8.686-3.779l1.875,1.875c0.194,0.194,0.385,0.131,0.424-0.142
-		l0.92-6.435C169.897,1168.248,169.706,1168.057,169.434,1168.096z M157.954,1159.11c-1.164,0-2.11-0.946-2.11-2.11
-		s0.946-2.11,2.11-2.11s2.11,0.946,2.11,2.11S159.118,1159.11,157.954,1159.11z"/>
-</g>
-<g id="google_x5F_maps">
-	<path d="M110,1153.023c-3.999,0-7.24,3.242-7.24,7.24c0,1.062,0.484,2.502,0.484,2.502c1.922,4.93,6.543,14.025,6.543,14.025
-		c0.059,0.124,0.136,0.186,0.213,0.186s0.154-0.062,0.213-0.186c0,0,4.621-9.096,6.543-14.025c0,0,0.484-1.44,0.484-2.502
-		C117.24,1156.266,113.999,1153.023,110,1153.023z M110,1163.568c-1.825,0-3.305-1.479-3.305-3.305s1.479-3.305,3.305-3.305
-		s3.305,1.479,3.305,3.305S111.825,1163.568,110,1163.568z"/>
-</g>
-<g id="flash_1_">
-	<path d="M60.316,1167.355c0.078-0.264-0.082-0.355-0.357-0.355h-4.686c-0.275,0-0.355-0.297-0.18-0.508
-		c0,0,9.653-12.826,9.842-13.073c0.142-0.231,0.298-0.185,0.247,0.084c-0.073,0.341-2.134,9.046-2.134,9.046
-		c-0.1,0.257,0.045,0.451,0.32,0.451h4.686c0.275,0,0.363,0.178,0.195,0.396c0,0-9.667,13.057-9.841,13.275
-		s-0.335,0.217-0.247-0.157S60.316,1167.355,60.316,1167.355z"/>
-</g>
-<g id="rotation_x5F_lock">
-	<path d="M17,1162.483V1164h0.5c0.275,0,0.5,0.225,0.5,0.5v5c0,0.275-0.225,0.5-0.5,0.5h-7c-0.275,0-0.5-0.225-0.5-0.5v-5
-		c0-0.275,0.225-0.5,0.5-0.5H11v-1.517c0-1.393,1.05-2.483,2.389-2.483h1.223C15.95,1160,17,1161.091,17,1162.483z M13,1164h2
-		v-1.517c0-0.298-0.149-0.483-0.389-0.483h-1.223c-0.239,0-0.389,0.186-0.389,0.483V1164z"/>
-	<path d="M28.699,1164.4L24.8,1170.1c-0.165,0.221-0.435,0.221-0.601,0L20.3,1164.4c-0.165-0.221-0.075-0.4,0.2-0.4h2.47
-		c-0.188-4.312-4.187-8-8.97-8c-4.963,0-9,4.037-9,9c0,6.459,5.867,8.976,8.517,8.976s4.308-0.561,5.987-1.864l0.004,0.004
-		c0.364-0.295,1.004-0.857,1.252-1.088c0.302-0.28,0.855-0.182,1.23,0.222l0.682,0.731c0.375,0.402,0.435,0.961,0.133,1.242
-		c-0.196,0.182-0.327,0.344-1.17,1.02c-1.885,1.426-4.302,2.717-8.218,2.717S2,1173.168,2,1165c0-6.617,5.383-12,12-12
-		c6.411,0,11.781,5.219,11.973,10.93l0.004,0.07H28.5C28.774,1164,28.865,1164.181,28.699,1164.4z"/>
-</g>
-<g id="albums">
-	<path d="M433,1110v14c-0.553,0-1-0.447-1-1v-12C432,1110.447,432.447,1110,433,1110z"/>
-	<path d="M459,1110v14c0.553,0,1-0.447,1-1v-12C460,1110.447,459.553,1110,459,1110z"/>
-	<path d="M435,1109h1v16h-1c-0.553,0-1-0.447-1-1v-14C434,1109.447,434.447,1109,435,1109z"/>
-	<path d="M457,1109h-1v16h1c0.553,0,1-0.447,1-1v-14C458,1109.447,457.553,1109,457,1109z"/>
-	<path d="M454,1108h-16c-0.55,0-1,0.45-1,1v16c0,0.55,0.45,1,1,1h16c0.55,0,1-0.45,1-1v-16C455,1108.45,454.55,1108,454,1108z
-		 M451,1120c0,1.469-2.021,1.71-2.301,1.71c-0.846,0-1.55-0.396-1.752-1.02c-0.276-0.853,0.461-1.796,1.607-2.218
-		c0.648-0.238,1.445-0.155,1.445-0.146v-4.407l-6,1.369c0,0,0,3.899,0,5.712s-2.102,2.057-2.417,2.057
-		c-0.816,0-1.44-0.374-1.629-0.955c-0.271-0.835,0.441-1.77,1.604-2.174c0.646-0.225,1.442-0.137,1.442-0.131v-6.604
-		c0-0.245,0.072-0.469,0.291-0.529l7.491-1.854l-0.039-0.009c0.218,0,0.257,0.169,0.257,0.393C451,1111.192,451,1118.531,451,1120z"
-		/>
-</g>
-<g id="pin">
-	<g>
-		<path d="M398.023,1105.078c-2.705,0-4.899,2.193-4.899,4.898s2.194,4.898,4.899,4.898s4.898-2.193,4.898-4.898
-			S400.729,1105.078,398.023,1105.078z M398.216,1107.854c-0.923-0.064-2.467,0.601-2.553,1.438c-0.085,0.834-1.022,1.28-0.989-0.06
-			c0-1.571,1.588-2.687,3.35-2.687C399.439,1106.801,399.139,1107.918,398.216,1107.854z"/>
-	</g>
-	<g>
-		<path d="M397.046,1115.759c0,0,0,10.485,0,10.902s0.298,0.788,0.978,0.788s0.977-0.361,0.977-0.788s0-10.902,0-10.902
-			C398.686,1115.881,397.359,1115.881,397.046,1115.759z"/>
-	</g>
-	<path opacity="0.5" d="M399,1125.991c0,0.37,0,0.612,0,0.67c0,0.427-0.297,0.788-0.977,0.788s-0.978-0.371-0.978-0.788
-		c0-0.056,0-0.299,0-0.67c-1.225,0.206-2.112,0.777-2.112,1.458c0,0.854,1.383,1.545,3.09,1.545c1.705,0,3.088-0.691,3.088-1.545
-		C401.111,1126.769,400.224,1126.197,399,1125.991z"/>
-</g>
-<g id="zoom_x5F_out">
-	<path d="M345.5,1116c-0.275,0-0.5-0.225-0.5-0.5v-1c0-0.275,0.225-0.5,0.5-0.5h7c0.275,0,0.5,0.225,0.5,0.5v1
-		c0,0.275-0.225,0.5-0.5,0.5H345.5z"/>
-	<path d="M363.219,1127.257l-2.213,2.212c-0.202,0.202-0.534,0.202-0.736,0l-6.098-6.099c-1.537,0.993-3.362,1.577-5.323,1.577
-		c-5.431,0-9.849-4.418-9.849-9.849s4.418-9.849,9.849-9.849s9.849,4.418,9.849,9.849c0,1.961-0.584,3.786-1.576,5.323l6.098,6.098
-		C363.422,1126.722,363.422,1127.054,363.219,1127.257z M355.568,1115.099c0-3.706-3.014-6.72-6.72-6.72s-6.72,3.014-6.72,6.72
-		s3.014,6.72,6.72,6.72S355.568,1118.805,355.568,1115.099z"/>
-</g>
-<g id="zoom_x5F_in">
-	<path d="M315.469,1127.257l-2.213,2.212c-0.202,0.202-0.534,0.202-0.736,0l-6.098-6.099c-1.537,0.993-3.362,1.577-5.323,1.577
-		c-5.431,0-9.849-4.418-9.849-9.849s4.418-9.849,9.849-9.849s9.849,4.418,9.849,9.849c0,1.961-0.584,3.786-1.576,5.323l6.098,6.098
-		C315.672,1126.722,315.672,1127.054,315.469,1127.257z M307.818,1115.099c0-3.706-3.014-6.72-6.72-6.72s-6.72,3.014-6.72,6.72
-		s3.014,6.72,6.72,6.72S307.818,1118.805,307.818,1115.099z M304.5,1114H302v-2.5c0-0.275-0.225-0.5-0.5-0.5h-1
-		c-0.275,0-0.5,0.225-0.5,0.5v2.5h-2.5c-0.275,0-0.5,0.225-0.5,0.5v1c0,0.275,0.225,0.5,0.5,0.5h2.5v2.5c0,0.275,0.225,0.5,0.5,0.5
-		h1c0.275,0,0.5-0.225,0.5-0.5v-2.5h2.5c0.275,0,0.5-0.225,0.5-0.5v-1C305,1114.225,304.775,1114,304.5,1114z"/>
-</g>
-<g id="pen_1_">
-	<polygon points="243,1129 249.438,1125.938 246.156,1122.656 	"/>
-	<path d="M265.953,1107.412l-1.33-1.331c-0.389-0.389-1.025-0.389-1.414,0l-1.369,1.369c-0.391-0.348-0.991-0.344-1.366,0.031
-		l-0.519,0.519h-1.748h-1.414l-5.793,5.793v1.363l0.025,0.025l6.182-6.182h1.748l-0.446,0.446l-11.876,11.876l4.08,4.081
-		l13.841-13.842c0.375-0.374,0.379-0.976,0.031-1.366l1.368-1.369C266.342,1108.438,266.342,1107.801,265.953,1107.412z"/>
-</g>
-<g id="brush_1_">
-	<path d="M218.875,1106.747c-0.018,0.018-8.705,11.299-9.562,12.367c-0.857,1.069-1.674,1.751-1.926,1.938
-		c-0.252,0.186-2.85,1.692-2.85,1.692c-0.193,0.084-0.333-0.01-0.371-0.157c-0.115-0.449-0.326-0.846-0.654-1.172
-		c-0.334-0.332-0.744-0.527-1.203-0.653c-0.214-0.059-0.261-0.199-0.164-0.366c0,0,1.406-2.581,1.611-2.844
-		c0.203-0.262,1.143-1.187,2.027-1.978s11.953-9.339,12.17-9.501c0.283-0.215,0.67-0.264,0.869-0.066
-		C219.021,1106.206,219.074,1106.466,218.875,1106.747z M200.438,1121.766c-0.754,0.003-2.094,0.406-2.745,2.13
-		c-0.453,1.199-1.016,2.754-3.217,3.499c-0.111,0.038-0.184,0.149-0.168,0.267c0.014,0.117,0.109,0.209,0.227,0.219
-		c0.945,0.083,1.768,0.123,2.508,0.12c2.168-0.006,3.754-0.361,4.852-1.085c0.387-0.259,0.789-0.71,0.789-0.71
-		c0.857-1.122,0.754-2.716-0.242-3.705C201.906,1121.969,201.191,1121.764,200.438,1121.766z"/>
-</g>
-<g id="direction_1_">
-	<path d="M169.775,1104.963c0.121-0.246,0.019-0.35-0.229-0.228l-24.521,12.044c-0.247,0.121-0.225,0.221,0.051,0.221H157
-		l0.025,11.975c0,0.275,0.1,0.298,0.221,0.051L169.775,1104.963z M153.533,1115c-0.275,0-0.299-0.35-0.052-0.471l12.597-6.295
-		c0.246-0.121,0.304-0.07,0.109,0.125l-6.843,6.068c-0.194,0.194-0.579,0.572-0.854,0.572H153.533z"/>
-</g>
-<g id="cloud_2_">
-	<path d="M119.276,1114.969c0-0.011,0.002-0.02,0.002-0.029c0-3.805-3.009-6.889-6.719-6.889c-3.001,0-5.543,2.019-6.404,4.804
-		c-0.332-0.071-0.676-0.109-1.028-0.109c-2.774,0-5.024,2.593-5.024,5.438c0,0.179,0.009-0.184,0.026,0.816
-		c-0.007,0-0.015,0-0.021,0c-1.64,0-2.968,1.346-2.968,3.025c0,1.494,0.95,2.975,2.432,2.975s21.441,0,21.441,0
-		c1.719-1,2.925-2.777,2.925-4.818C123.938,1117.506,121.864,1115.062,119.276,1114.969z"/>
-</g>
-<g id="sun">
-	<path d="M62,1112.117c-2.662,0-4.883,2.222-4.883,4.883s2.221,4.883,4.883,4.883s4.883-2.222,4.883-4.883
-		S64.662,1112.117,62,1112.117z M66.901,1110.624l2.847-2.847l1.476,1.475l-2.847,2.847
-		C67.951,1111.545,67.455,1111.05,66.901,1110.624z M55.623,1112.099l-2.847-2.847l1.476-1.475l2.847,2.847
-		C56.545,1111.05,56.049,1111.545,55.623,1112.099z M54.012,1118H50v-2h4.012C53.923,1116,53.923,1118,54.012,1118z M61,1109.013
-		V1105h2v4.013C63,1108.924,61,1108.924,61,1109.013z M63,1124.987V1129h-2v-4.013C61,1125.076,63,1125.076,63,1124.987z M74,1116v2
-		h-4.012c0.089,0,0.089-2,0-2H74z M68.377,1121.901l2.846,2.846l-1.475,1.476l-2.847-2.847
-		C67.455,1122.95,67.951,1122.455,68.377,1121.901z M57.1,1123.377l-2.847,2.846l-1.476-1.475l2.846-2.847
-		C56.05,1122.455,56.545,1122.95,57.1,1123.377z"/>
-</g>
-<g id="moon_1_">
-	<path d="M23.688,1124.859c-2.094,2.327-4.995,3.741-8.376,3.85c-6.582,0.214-12.09-4.921-12.305-11.467
-		c-0.214-6.544,4.946-12.022,11.528-12.236c0.414-0.014,0.823,0.005,1.228,0.023c0.394,0.018,0.456,0.221,0.197,0.387
-		c-3.008,1.93-4.958,5.326-4.833,9.141c0.189,5.772,5.046,10.298,10.85,10.11c0.502-0.017,0.998-0.056,1.478-0.153
-		C23.906,1124.422,23.969,1124.547,23.688,1124.859z"/>
-</g>
-<g id="retweet_x5F_2_1_">
-	<path d="M448.211,1074l3.848,5H435.5c-0.827,0-1.5-0.673-1.5-1.5v-9.5h-3.959l6.344-8.639l6.646,8.639H439v6H448.211z M458,1071
-		v-9.475c0-0.827-0.63-1.525-1.457-1.525h-16.559l3.848,5H453v6h-3.988l6.646,8.639l6.344-8.639H458z"/>
-</g>
-<g id="gbp">
-	<path d="M405.59,1075.041c-1.072,1.144-1.816,1.295-2.619,1.295c-0.773,0-1.548-0.182-2.322-0.361
-		c-0.773-0.15-1.547-0.332-2.351-0.332c-0.565,0-1.071,0.091-2.024,0.693l-0.059-0.061c1.309-1.053,2.439-2.066,2.439-3.963
-		c0-0.551-0.045-1.312-0.162-1.312H402v-3h-4.492c-1.113-3-1.145-3.05-1.145-3.962c0-1.685,1.19-2.872,2.916-2.872
-		c3.036,0,3.111,2.834,3.2,3.834h4.019c0.029-5-2.694-7.479-7.188-7.479c-5,0-7.619,3.038-7.619,6.228
-		c0,1.679,0.665,3.252,1.24,4.252H391v3h3.208c0.253,0,0.429,0.9,0.429,1.463c0,2.197-1.696,3.787-3.363,4.87l1.846,2.735
-		c1.16-0.902,2.352-1.174,3.422-1.174c1.311,0,2.084,0.285,2.947,0.586c0.834,0.301,1.756,0.533,3.244,0.533
-		c1.518,0,3.215-0.545,4.643-1.93L405.59,1075.041z"/>
-</g>
-<g id="usd_1_">
-	<path d="M358.561,1073.455c0-4.971-4.656-5.98-6.125-6.381c-0.477-0.133-0.436-0.252-1.436-0.365v-5.217
-		c2,0.36,2.441,1.508,2.54,3.508h4.306c0-5-2.846-6.955-6.846-7.379V1056h-2v1.598c-3.316,0.369-6.52,2.51-6.52,6.566
-		c0,4.11,3.029,5.365,6.024,6.225c0.165,0.049,0.33,0.094,0.495,0.14v5.985c-1.565-0.466-2.635-1.514-2.635-3.514h-4.305
-		c-0.045,4,3.082,6.906,6.939,7.384V1082h2v-1.57C356,1080.053,358.561,1077.197,358.561,1073.455z M346.779,1063.764
-		c0-1.482,1.066-2.188,2.221-2.406v4.605C347.217,1065.357,346.779,1064.887,346.779,1063.764z M351,1076.672v-5.447
-		c2,0.543,3.005,1.247,3.005,2.785C354.005,1075.836,353,1076.492,351,1076.672z"/>
-</g>
-<g id="euro_1_">
-	<path d="M308.529,1072c-0.318,3-1.697,4.75-4.237,4.75c-2.35,0-3.774-1.758-4.507-3.75h4.812l0.805-3h-6.211
-		c-0.018-0.288-0.023-1-0.016-1h6.422l0.805-3h-6.738c0.69-3,2.139-3.844,4.628-3.844c2.063,0,3.924,1.844,4.188,3.844h4.02
-		c-0.502-5-4.055-7.887-8.208-7.887c-4.696,0-7.837,2.887-8.891,7.887h-2.999l-0.805,3h3.423c-0.008,0-0.002,0.714,0.013,1h-2.631
-		l-0.805,3h3.881c1.125,4.385,4.229,7.792,8.813,7.792c4.629,0,7.833-3.792,8.257-8.792H308.529z"/>
-</g>
-<g id="bluetooth_1_">
-	<path id="bluetooth" d="M260.469,1064.371l-8.368-7.137v8.238l-2.997-2.929l-1.684,1.722l4.681,4.575v0.195l-4.907,4.688
-		l1.665,1.741l3.242-3.099v8.398l8.356-7.128l-4.79-4.679L260.469,1064.371z M254.511,1062.455l2.365,2.019l-2.365,2.259V1062.455z
-		 M256.887,1073.518l-2.376,2.027v-4.351L256.887,1073.518z"/>
-</g>
-<g id="chevron-left">
-	<polygon points="197.808,1069 208.301,1058.507 211.973,1062.179 205.161,1069 211.978,1075.816 208.302,1079.492 	"/>
-</g>
-<g id="chevron-right">
-	<polygon points="166.228,1069 155.734,1058.507 152.062,1062.179 158.874,1069 152.058,1075.816 155.733,1079.492 	"/>
-</g>
-<g id="share">
-	<path d="M121.098,1069.293l-10.678,7.91c-0.222,0.164-0.402,0.072-0.402-0.203l-0.006-5.002c-3.017-0.023-9.574-0.105-11.512,4.505
-		c0.139-9.503,9.264-10.8,11.505-10.976l-0.005-4.514c0-0.275,0.182-0.367,0.402-0.203l10.695,7.889
-		C121.318,1068.862,121.319,1069.129,121.098,1069.293z"/>
-</g>
-<g id="unshare">
-	<path d="M73.5,1076.503c-1.938-4.61-8.495-4.528-11.512-4.505L61.982,1077c0,0.275-0.181,0.367-0.402,0.203l-10.678-7.91
-		c-0.222-0.164-0.221-0.431,0-0.594l10.695-7.889c0.221-0.164,0.402-0.072,0.402,0.203l-0.005,4.514
-		C64.236,1065.703,73.361,1067,73.5,1076.503z"/>
-</g>
-<g id="play_x5F_button_1_">
-	<path d="M14,1081.25c-6.755,0-12.25-5.495-12.25-12.25s5.495-12.25,12.25-12.25s12.25,5.495,12.25,12.25S20.755,1081.25,14,1081.25
-		z M14,1060c-4.963,0-9,4.037-9,9s4.037,9,9,9s9-4.037,9-9S18.963,1060,14,1060z M18.939,1069.172l-7.728,4.545
-		c-0.109,0.094-0.212,0.045-0.212-0.109v-9.215c0-0.154,0.102-0.203,0.21-0.109l7.735,4.545
-		C19.054,1068.922,19.048,1069.078,18.939,1069.172z"/>
-</g>
-<g id="circle_x5F_arrow_x5F_down">
-	<path d="M433.75,1020.938c0,6.73,5.456,12.188,12.188,12.188s12.188-5.457,12.188-12.188s-5.456-12.188-12.188-12.188
-		S433.75,1014.207,433.75,1020.938z M447.5,1015c0.275,0,0.5,0.225,0.5,0.5v5.5h3.5c0.275,0,0.354,0.171,0.175,0.38l-5.35,6.24
-		c-0.179,0.209-0.472,0.21-0.651,0.001l-5.38-6.242c-0.18-0.209-0.102-0.379,0.174-0.379H444v-5.5c0-0.275,0.225-0.5,0.5-0.5H447.5z
-		"/>
-</g>
-<g id="circle_x5F_arrow_x5F_top">
-	<path d="M398.938,1033.125c6.731,0,12.188-5.457,12.188-12.188s-5.456-12.188-12.188-12.188s-12.188,5.457-12.188,12.188
-		S392.206,1033.125,398.938,1033.125z M397.5,1027c-0.275,0-0.5-0.225-0.5-0.5v-5.5h-3.532c-0.275,0-0.354-0.17-0.174-0.379
-		l5.38-6.242c0.18-0.209,0.473-0.208,0.651,0.001l5.35,6.24c0.179,0.209,0.101,0.38-0.175,0.38H401v5.5c0,0.275-0.225,0.5-0.5,0.5
-		H397.5z"/>
-</g>
-<g id="circle_x5F_arrow_x5F_right">
-	<path d="M337.75,1020.938c0,6.731,5.457,12.188,12.188,12.188s12.188-5.456,12.188-12.188s-5.457-12.188-12.188-12.188
-		S337.75,1014.206,337.75,1020.938z M344,1019.5c0-0.275,0.225-0.5,0.5-0.5h5.5v-3.532c0-0.275,0.173-0.356,0.384-0.18l6.398,5.329
-		c0.211,0.176,0.211,0.465,0,0.641l-6.398,5.329c-0.211,0.177-0.384,0.096-0.384-0.18V1023h-5.5c-0.275,0-0.5-0.225-0.5-0.5V1019.5z
-		"/>
-</g>
-<g id="circle_x5F_arrow_x5F_left">
-	<path d="M301.938,1008.75c-6.73,0-12.188,5.456-12.188,12.188s5.457,12.188,12.188,12.188s12.188-5.456,12.188-12.188
-		S308.668,1008.75,301.938,1008.75z M308,1022.5c0,0.275-0.225,0.5-0.5,0.5H302v3.407c0,0.275-0.173,0.356-0.384,0.18l-6.398-5.329
-		c-0.211-0.176-0.211-0.465,0-0.641l6.398-5.329c0.211-0.177,0.384-0.096,0.384,0.18V1019h5.5c0.275,0,0.5,0.225,0.5,0.5V1022.5z"/>
-</g>
-<g id="resize_x5F_full_1_">
-	<path d="M243.53,1023.445l2.519,2.518l4.126-4.126c0.134-0.134,0.364-0.133,0.497,0.001l2.42,2.42
-		c0.133,0.133,0.133,0.361-0.001,0.496l-4.126,4.125l2.518,2.52c0.135,0.133,0.086,0.266-0.102,0.289l-8.989,1.146
-		c-0.188,0.023-0.321-0.111-0.296-0.299l1.144-8.988C243.264,1023.359,243.396,1023.312,243.53,1023.445z M264.767,1018.453
-		l1.144-8.988c0.025-0.188-0.108-0.322-0.296-0.299l-8.989,1.146c-0.188,0.023-0.236,0.156-0.102,0.289l2.518,2.52l-4.126,4.125
-		c-0.134,0.135-0.134,0.363-0.001,0.496l2.42,2.42c0.133,0.133,0.363,0.135,0.497,0l4.126-4.125l2.519,2.518
-		C264.609,1018.688,264.742,1018.641,264.767,1018.453z"/>
-</g>
-<g id="resize_x5F_small_1_">
-	<path d="M203.75,1031.129l-2.518-2.518l-4.127,4.126c-0.134,0.134-0.363,0.133-0.498-0.001l-2.418-2.42
-		c-0.134-0.133-0.135-0.361,0-0.496l4.127-4.125l-2.52-2.52c-0.133-0.133-0.086-0.266,0.102-0.289l8.99-1.146
-		c0.188-0.023,0.32,0.111,0.297,0.299l-1.145,8.988C204.016,1031.215,203.883,1031.263,203.75,1031.129z M207.959,1010.973
-		l-1.145,8.988c-0.023,0.188,0.109,0.322,0.297,0.299l8.99-1.146c0.188-0.023,0.234-0.156,0.102-0.289l-2.52-2.52l4.127-4.125
-		c0.135-0.135,0.134-0.363,0-0.496l-2.418-2.42c-0.135-0.133-0.364-0.135-0.498,0l-4.127,4.125l-2.518-2.518
-		C208.117,1010.738,207.984,1010.785,207.959,1010.973z"/>
-</g>
-<g id="up_x5F_arrow_1_">
-	<path d="M166.181,1022H161v8.487c0,0.275-0.237,0.513-0.513,0.513h-4.977c-0.274,0-0.511-0.237-0.511-0.513V1022h-5.181
-		c-0.275,0-0.362-0.187-0.194-0.404l8.069-10.428c0.168-0.218,0.443-0.215,0.611,0.002l8.069,10.425
-		C166.543,1021.812,166.455,1022,166.181,1022z"/>
-</g>
-<g id="down_x5F_arrow_1_">
-	<path d="M101.819,1020H107v-8.487c0-0.275,0.237-0.513,0.513-0.513h4.977c0.274,0,0.511,0.237,0.511,0.513V1020h5.181
-		c0.275,0,0.362,0.187,0.194,0.404l-8.069,10.428c-0.168,0.217-0.443,0.216-0.611-0.002l-8.069-10.425
-		C101.457,1020.188,101.545,1020,101.819,1020z"/>
-</g>
-<g id="right_x5F_arrow_2_">
-	<path d="M61,1029.181V1024h-8.487c-0.275,0-0.513-0.237-0.513-0.513v-4.977c0-0.274,0.237-0.511,0.513-0.511H61v-5.181
-		c0-0.275,0.187-0.362,0.404-0.194l10.428,8.069c0.218,0.168,0.216,0.443-0.002,0.611l-10.425,8.069
-		C61.188,1029.543,61,1029.455,61,1029.181z"/>
-</g>
-<g id="left_x5F_arrow_2_">
-	<path d="M14.596,1029.375l-10.424-8.069c-0.218-0.168-0.22-0.443-0.002-0.611l10.427-8.069c0.218-0.168,0.403-0.081,0.403,0.194
-		V1018h8.489c0.275,0,0.511,0.236,0.511,0.511v4.977c0,0.275-0.235,0.513-0.511,0.513H15v5.181
-		C15,1029.455,14.813,1029.543,14.596,1029.375z"/>
-</g>
-<g id="cart_x5F_in_1_">
-	<path d="M458,962h-2.5c-0.463,0-0.866,0.318-0.973,0.77l-0.766,3.23h-4.065l-1.65,2H449v1h-1v-0.944L446.396,970H447v1h-1v-0.521
-		l-0.502,0.608c-0.314,0.418-0.86,0.729-1.451,0.729c-0.597,0-1.153-0.277-1.528-0.761L442.472,971H442v-0.561L440.788,969H440
-		v-0.936L438.263,966H434.5c-0.303,0-0.59,0.138-0.78,0.374c-0.189,0.237-0.262,0.547-0.196,0.843l2,9
-		c0.102,0.458,0.508,0.783,0.977,0.783h14.656l-0.947,4H438c-0.553,0-1,0.447-1,1s0.447,1,1,1h1.092
-		c-0.056,0.157-0.092,0.324-0.092,0.5c0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5c0-0.176-0.036-0.343-0.092-0.5h5.184
-		c-0.056,0.157-0.092,0.324-0.092,0.5c0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5c0-0.176-0.036-0.343-0.092-0.5H451
-		c0.473,0,0.867-0.5,0.971-1h0.002l4.318-18H458c0.553,0,1-0.447,1-1S458.553,962,458,962z M437,973h-0.143l-0.222-1H437V973z
-		 M437,971h-0.587l-0.222-1H437V971z M437,969h-1.031l-0.223-1H437V969z M439,975h-1v-1h1V975z M439,973h-1v-1h1V973z M439,971h-1
-		v-1h1V971z M439,969h-1v-1h1V969z M441,975h-1v-1h1V975z M441,973h-1v-1h1V973z M441,971h-1v-1h1V971z M443,975h-1v-1h1V975z
-		 M443,973h-1v-1h1V973z M445,975h-1v-1h1V975z M445,973h-1v-1h1V973z M447,975h-1v-1h1V975z M447,973h-1v-1h1V973z M449,975h-1v-1
-		h1V975z M449,973h-1v-1h1V973z M449,971h-1v-1h1V971z M451,975h-1v-1h1V975z M451,973h-1v-1h1V973z M451,971h-1v-1h1V971z M451,969
-		h-1v-1h1V969z M452.104,973H452v-1h0.341L452.104,973z M452.727,970.372L452.578,971H452v-1h0.809L452.727,970.372z M453.031,969
-		H452v-1h1.254L453.031,969z M439.068,964.317c-0.091-0.117-0.044-0.317,0.104-0.317H442v-2.5c0-0.275,0.225-0.5,0.5-0.5h3
-		c0.275,0,0.5,0.225,0.5,0.5v2.5h2.849c0.148,0,0.196,0.188,0.105,0.306l-4.764,5.734c-0.04,0.053-0.091,0.076-0.144,0.076
-		c-0.066,0-0.135-0.037-0.186-0.103L439.068,964.317z"/>
-</g>
-<g id="cart_x5F_out_1_">
-	<path d="M410,962h-2.5c-0.463,0-0.866,0.318-0.973,0.77l-0.766,3.23h-3.785c0.355,0.479,0.416,0.893,0.17,1.394
-		C401.901,967.895,401,968,401,968v1h-1v-1h-1v3h-7v-1h1v-1h-1v-1h-0.826c-0.555,0-1.053-0.102-1.299-0.6
-		c-0.236-0.479-0.184-0.966,0.111-1.4H386.5c-0.303,0-0.59,0.138-0.78,0.374c-0.189,0.237-0.262,0.547-0.196,0.843l2,9
-		c0.102,0.458,0.508,0.783,0.977,0.783h14.656l-0.947,4H390c-0.553,0-1,0.447-1,1s0.447,1,1,1h1.092
-		c-0.056,0.157-0.092,0.324-0.092,0.5c0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5c0-0.176-0.036-0.343-0.092-0.5h5.184
-		c-0.056,0.157-0.092,0.324-0.092,0.5c0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5c0-0.176-0.036-0.343-0.092-0.5H403
-		c0.473,0,0.867-0.5,0.971-1h0.002l4.318-18H410c0.553,0,1-0.447,1-1S410.553,962,410,962z M389,973h-0.143l-0.222-1H389V973z
-		 M389,971h-0.587l-0.222-1H389V971z M389,969h-1.031l-0.223-1H389V969z M391,975h-1v-1h1V975z M391,973h-1v-1h1V973z M391,971h-1
-		v-1h1V971z M391,969h-1v-1h1V969z M393,975h-1v-1h1V975z M393,973h-1v-1h1V973z M395,975h-1v-1h1V975z M395,973h-1v-1h1V973z
-		 M397,975h-1v-1h1V975z M397,973h-1v-1h1V973z M399,975h-1v-1h1V975z M399,973h-1v-1h1V973z M401,975h-1v-1h1V975z M401,973h-1v-1
-		h1V973z M401,971h-1v-1h1V971z M403,975h-1v-1h1V975z M403,973h-1v-1h1V973z M403,971h-1v-1h1V971z M403,969h-1v-1h1V969z
-		 M404.104,973H404v-1h0.341L404.104,973z M404.727,970.372L404.578,971H404v-1h0.809L404.727,970.372z M405.031,969H404v-1h1.254
-		L405.031,969z M391.174,967c-0.148,0-0.196-0.133-0.105-0.251l4.764-5.681c0.04-0.053,0.091-0.083,0.144-0.083
-		c0.066,0,0.135,0.022,0.186,0.088l4.793,5.667c0.091,0.117,0.044,0.26-0.104,0.26H398v2.5c0,0.275-0.225,0.5-0.5,0.5h-3
-		c-0.275,0-0.5-0.225-0.5-0.5V967H391.174z"/>
-</g>
-<g id="remove_x5F_2">
-	<path d="M353.195,972.996l5.648-5.648c0.221-0.222,0.221-0.585,0-0.806l-2.383-2.383c-0.221-0.221-0.583-0.221-0.805,0
-		l-5.649,5.649l-5.653-5.652c-0.222-0.221-0.584-0.221-0.805,0l-2.383,2.384c-0.222,0.22-0.222,0.582,0,0.806l5.652,5.651
-		l-5.65,5.65c-0.22,0.22-0.22,0.583,0,0.805l2.383,2.383c0.222,0.22,0.586,0.22,0.806,0l5.649-5.649l5.646,5.646
-		c0.221,0.221,0.585,0.221,0.806,0l2.384-2.384c0.22-0.22,0.22-0.583,0-0.806L353.195,972.996z"/>
-</g>
-<g id="ok_x5F_2">
-	<path d="M313.008,967.27c0.196,0.193,0.197,0.51,0.003,0.705l-14.475,14.474c-0.194,0.194-0.513,0.194-0.707,0l-3.245-3.246
-		c-0.195-0.194-0.514-0.513-0.707-0.707l-3.906-3.907c-0.195-0.193-0.195-0.512,0-0.707l3.246-3.246
-		c0.194-0.194,0.513-0.194,0.707,0l3.906,3.906c0.195,0.194,0.514,0.194,0.707,0l10.493-10.492c0.194-0.194,0.514-0.195,0.71-0.002
-		L313.008,967.27z"/>
-</g>
-<g id="electricity">
-	<path d="M253.201,978.496c0.055-0.27-0.127-0.49-0.402-0.49h-1.477c-0.275,0-0.438-0.216-0.359-0.479l1.295-5.047
-		c0.076-0.264-0.084-0.479-0.359-0.479h-2.529c-0.275,0-0.43-0.214-0.346-0.476l3.348-10.049c0.086-0.262,0.381-0.476,0.654-0.476
-		h6.607c0.275,0,0.402,0.203,0.283,0.45l-4.08,7.131c-0.119,0.248,0.008,0.448,0.283,0.445l2.529-0.026
-		c0.275-0.004,0.398,0.195,0.275,0.441l-2.426,6.143c-0.123,0.246,0.002,0.447,0.277,0.447h1.498c0.273,0,0.361,0.178,0.191,0.395
-		l-6.379,8.436c-0.168,0.217-0.264,0.174-0.209-0.096L253.201,978.496z"/>
-</g>
-<g id="unlock">
-	<path d="M215.338,970H214v-5.002c0-3.083-2.893-5.998-5.947-5.998h-5.105c-3.055,0-5.947,2.915-5.947,5.998V966h4v-1.002
-		c0-1.4,0.628-1.998,2-1.998h5c1.372,0,2,0.598,2,1.998V970h-14.338c-0.365,0-0.662,0.263-0.662,0.587v13.826
-		c0,0.324,0.297,0.587,0.662,0.587h19.676c0.365,0,0.662-0.263,0.662-0.587v-13.826C216,970.263,215.703,970,215.338,970z
-		 M206.5,977.431V980c0,0.275-0.225,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5v-2.569c-0.596-0.347-1-0.984-1-1.723
-		c0-1.104,0.896-1.999,2-1.999s2,0.895,2,1.999C207.5,976.446,207.096,977.084,206.5,977.431z"/>
-</g>
-<g id="lock">
-	<path d="M167.338,970H166v-5.002c0-3.083-2.893-5.998-5.947-5.998h-5.105c-3.055,0-5.947,2.915-5.947,5.998V970h-1.338
-		c-0.365,0-0.662,0.263-0.662,0.587v13.826c0,0.324,0.297,0.587,0.662,0.587h19.676c0.365,0,0.662-0.263,0.662-0.587v-13.826
-		C168,970.263,167.703,970,167.338,970z M153,964.998c0-1.4,0.628-1.998,2-1.998h5c1.372,0,2,0.598,2,1.998V970h-9V964.998z
-		 M158.5,977.431V980c0,0.275-0.225,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5v-2.569c-0.596-0.347-1-0.984-1-1.723
-		c0-1.104,0.896-1.999,2-1.999s2,0.895,2,1.999C159.5,976.446,159.096,977.084,158.5,977.431z"/>
-</g>
-<g id="shopping_x5F_cart">
-	<path d="M123,962h-2.5c-0.463,0-0.866,0.318-0.973,0.77l-0.766,3.23H99.5c-0.303,0-0.59,0.138-0.78,0.374
-		c-0.189,0.237-0.262,0.547-0.196,0.843l2,9c0.102,0.458,0.508,0.783,0.977,0.783h14.656l-0.947,4H103c-0.553,0-1,0.447-1,1
-		s0.447,1,1,1h1.092c-0.056,0.157-0.092,0.324-0.092,0.5c0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5
-		c0-0.176-0.036-0.343-0.092-0.5h5.184c-0.056,0.157-0.092,0.324-0.092,0.5c0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5
-		c0-0.176-0.036-0.343-0.092-0.5H116c0.473,0,0.867-0.5,0.971-1h0.002l4.318-18H123c0.553,0,1-0.447,1-1S123.553,962,123,962z
-		 M102,973h-0.143l-0.222-1H102V973z M102,971h-0.587l-0.222-1H102V971z M102,969h-1.031l-0.223-1H102V969z M104,975h-1v-1h1V975z
-		 M104,973h-1v-1h1V973z M104,971h-1v-1h1V971z M104,969h-1v-1h1V969z M106,975h-1v-1h1V975z M106,973h-1v-1h1V973z M106,971h-1v-1
-		h1V971z M106,969h-1v-1h1V969z M108,975h-1v-1h1V975z M108,973h-1v-1h1V973z M108,971h-1v-1h1V971z M108,969h-1v-1h1V969z M110,975
-		h-1v-1h1V975z M110,973h-1v-1h1V973z M110,971h-1v-1h1V971z M110,969h-1v-1h1V969z M112,975h-1v-1h1V975z M112,973h-1v-1h1V973z
-		 M112,971h-1v-1h1V971z M112,969h-1v-1h1V969z M114,975h-1v-1h1V975z M114,973h-1v-1h1V973z M114,971h-1v-1h1V971z M114,969h-1v-1
-		h1V969z M116,975h-1v-1h1V975z M116,973h-1v-1h1V973z M116,971h-1v-1h1V971z M116,969h-1v-1h1V969z M117.104,973H117v-1h0.341
-		L117.104,973z M117.578,971H117v-1h0.809L117.578,971z M118.031,969H117v-1h1.254L118.031,969z"/>
-</g>
-<g id="upload">
-	<path d="M62,985.25c-6.755,0-12.25-5.495-12.25-12.25s5.495-12.25,12.25-12.25s12.25,5.495,12.25,12.25S68.755,985.25,62,985.25z
-		 M62,964c-4.963,0-9,4.037-9,9s4.037,9,9,9s9-4.037,9-9S66.963,964,62,964z M67.688,974H65v4.469c0,0.275-0.225,0.5-0.5,0.5h-5
-		c-0.275,0-0.5-0.225-0.5-0.5V974h-2.765c-0.192,0-0.253-0.28-0.136-0.433l5.648-7.374c0.117-0.152,0.31-0.188,0.428-0.035
-		l5.647,7.428C67.941,973.737,67.879,974,67.688,974z"/>
-</g>
-<g id="download_1_">
-	<path d="M26.25,973c0,6.755-5.495,12.25-12.25,12.25S1.75,979.755,1.75,973S7.245,960.75,14,960.75S26.25,966.245,26.25,973z
-		 M23,973c0-4.963-4.037-9-9-9s-9,4.037-9,9s4.037,9,9,9S23,977.963,23,973z M19.823,972.414l-5.647,7.428
-		c-0.118,0.152-0.311,0.117-0.428-0.035L8.1,972.433C7.982,972.28,8.043,972,8.235,972H11v-4.469c0-0.275,0.225-0.5,0.5-0.5h5
-		c0.275,0,0.5,0.225,0.5,0.5V972h2.688C19.879,972,19.941,972.263,19.823,972.414z"/>
-</g>
-<g id="ban">
-	<path d="M446,912.75c-6.755,0-12.25,5.495-12.25,12.25s5.495,12.25,12.25,12.25s12.25-5.495,12.25-12.25S452.755,912.75,446,912.75
-		z M446,916c1.766,0,3.409,0.519,4.801,1.4l-12.4,12.4c-0.882-1.392-1.4-3.035-1.4-4.801C437,920.037,441.037,916,446,916z M446,934
-		c-1.765,0-3.408-0.518-4.799-1.399l12.399-12.399c0.882,1.391,1.399,3.034,1.399,4.799C455,929.963,450.963,934,446,934z"/>
-</g>
-<g id="ok">
-	<path d="M398,912.75c-6.755,0-12.25,5.495-12.25,12.25s5.495,12.25,12.25,12.25s12.25-5.495,12.25-12.25S404.755,912.75,398,912.75
-		z M398,934c-4.963,0-9-4.037-9-9s4.037-9,9-9s9,4.037,9,9S402.963,934,398,934z M404.061,922.987l-7.512,7.511
-		c-0.127,0.128-0.337,0.128-0.465,0l-2.132-2.133c-0.128-0.128-0.338-0.337-0.465-0.465l-1.567-1.567
-		c-0.128-0.127-0.128-0.336,0-0.465l2.134-2.133c0.128-0.128,0.337-0.128,0.464,0l1.567,1.567c0.128,0.127,0.337,0.127,0.465,0
-		l4.896-4.895c0.127-0.128,0.337-0.129,0.467-0.002l2.146,2.118C404.188,922.651,404.188,922.859,404.061,922.987z"/>
-</g>
-<g id="remove_2_">
-	<path d="M350,912.75c-6.755,0-12.25,5.495-12.25,12.25s5.495,12.25,12.25,12.25s12.25-5.495,12.25-12.25S356.755,912.75,350,912.75
-		z M350,934c-4.963,0-9-4.037-9-9s4.037-9,9-9s9,4.037,9,9S354.963,934,350,934z M355.646,922.16l-2.843,2.843l2.839,2.839
-		c0.195,0.195,0.195,0.514,0,0.707l-2.094,2.094c-0.193,0.195-0.512,0.195-0.707,0l-2.839-2.839l-2.843,2.843
-		c-0.193,0.193-0.512,0.193-0.707,0l-2.094-2.094c-0.193-0.195-0.193-0.514,0-0.707l2.843-2.843l-2.845-2.845
-		c-0.195-0.195-0.195-0.514,0-0.707l2.094-2.094c0.193-0.195,0.512-0.195,0.707,0l2.845,2.845l2.843-2.843
-		c0.193-0.193,0.512-0.193,0.707,0l2.094,2.094C355.84,921.648,355.84,921.967,355.646,922.16z"/>
-</g>
-<g id="circle_x5F_exclamation_x5F_mark">
-	<path d="M302,912.75c-6.765,0-12.25,5.484-12.25,12.25s5.485,12.25,12.25,12.25s12.25-5.484,12.25-12.25S308.765,912.75,302,912.75
-		z M304,932.5c0,0.275-0.225,0.5-0.5,0.5h-3c-0.275,0-0.5-0.225-0.5-0.5v-3c0-0.275,0.225-0.5,0.5-0.5h3c0.275,0,0.5,0.225,0.5,0.5
-		V932.5z M304,921.5c0,0.275-0.044,0.721-0.098,0.99l-0.9,4.77c-0.053,0.27-0.322,0.74-0.598,0.74h-0.785
-		c-0.275,0-0.545-0.471-0.6-0.74l-0.92-4.645c-0.055-0.27-0.1-0.84-0.1-1.115v-4c0-0.275,0.225-0.5,0.5-0.5h3
-		c0.275,0,0.5,0.225,0.5,0.5V921.5z"/>
-</g>
-<g id="circle_x5F_info">
-	<path d="M254,912.75c-6.765,0-12.25,5.484-12.25,12.25s5.485,12.25,12.25,12.25s12.25-5.484,12.25-12.25S260.765,912.75,254,912.75
-		z M253,918.5c0-0.275,0.225-0.5,0.5-0.5h2c0.275,0,0.5,0.225,0.5,0.5v2c0,0.275-0.225,0.5-0.5,0.5h-2c-0.275,0-0.5-0.225-0.5-0.5
-		V918.5z M258,931.5c0,0.275-0.225,0.5-0.5,0.5h-6c-0.275,0-0.5-0.225-0.5-0.5v-2c0-0.275,0.225-0.5,0.5-0.5h1.5v-4h-1.5
-		c-0.275,0-0.5-0.225-0.5-0.5v-2c0-0.275,0.225-0.5,0.5-0.5h4c0.275,0,0.5,0.225,0.5,0.5v6.5h1.5c0.275,0,0.5,0.225,0.5,0.5V931.5z"
-		/>
-</g>
-<g id="circle_x5F_question_x5F_mark">
-	<path d="M208.047,932.5c0,0.275-0.225,0.5-0.5,0.5H204.5c-0.275,0-0.5-0.225-0.5-0.5v-3c0-0.275,0.225-0.5,0.5-0.5h3.047
-		c0.275,0,0.5,0.225,0.5,0.5V932.5z M206,912.75c-6.765,0-12.25,5.484-12.25,12.25s5.485,12.25,12.25,12.25s12.25-5.484,12.25-12.25
-		S212.765,912.75,206,912.75z M208.85,924.832c-0.967,0.631-1.256,1.175-1.288,2.424c-0.003,0.137-0.114,0.244-0.25,0.244h-2.562
-		c-0.068,0-0.25-0.182-0.25-0.25v-1.02c0-1.069,0.576-2.01,1.766-2.877c0.093-0.064,0.983-0.646,0.983-1.449
-		c0-0.666-0.501-1.131-1.219-1.131c-1.022,0-1.593,0.513-1.647,1.491c-0.008,0.132-0.117,0.235-0.25,0.235H204h-2.561
-		c-0.068,0-0.135-0.028-0.182-0.078c-0.047-0.049-0.072-0.116-0.068-0.185c0.14-2.716,1.904-4.273,4.844-4.273
-		c2.229,0,4.629,1.209,4.629,3.864C210.662,923.607,210.256,923.943,208.85,924.832z"/>
-</g>
-<g id="circle_x5F_ok">
-	<path d="M166.662,916.338c-4.784-4.784-12.54-4.784-17.324,0s-4.784,12.54,0,17.324s12.54,4.784,17.324,0
-		C171.445,928.878,171.446,921.122,166.662,916.338z M165.061,921.987l-8.512,8.511c-0.127,0.128-0.337,0.128-0.465,0l-5.164-5.165
-		c-0.128-0.127-0.128-0.336,0-0.465l2.134-2.133c0.128-0.128,0.337-0.128,0.464,0l2.567,2.567c0.128,0.127,0.337,0.127,0.465,0
-		l5.896-5.895c0.127-0.128,0.337-0.129,0.467-0.002l2.146,2.118C165.188,921.651,165.188,921.859,165.061,921.987z"/>
-</g>
-<g id="circle_x5F_remove">
-	<path d="M118.662,916.338c-4.784-4.784-12.54-4.784-17.324,0s-4.784,12.54,0,17.324s12.54,4.784,17.324,0
-		C123.445,928.878,123.446,921.122,118.662,916.338z M113.535,930.656c-0.194,0.195-0.513,0.195-0.707,0L110,927.828l-2.828,2.828
-		c-0.194,0.195-0.513,0.195-0.707,0l-2.121-2.121c-0.195-0.193-0.195-0.512,0-0.707l2.828-2.828l-2.828-2.828
-		c-0.195-0.195-0.195-0.514,0-0.707l2.121-2.121c0.194-0.195,0.512-0.195,0.707,0l2.828,2.828l2.828-2.828
-		c0.195-0.195,0.513-0.195,0.707,0l2.121,2.121c0.195,0.193,0.195,0.512,0,0.707L112.828,925l2.828,2.828
-		c0.195,0.195,0.195,0.514,0,0.707L113.535,930.656z"/>
-</g>
-<g id="circle_x5F_minus">
-	<path d="M62,912.75c-6.765,0-12.25,5.484-12.25,12.25s5.485,12.25,12.25,12.25s12.25-5.484,12.25-12.25S68.765,912.75,62,912.75z
-		 M68,926.5c0,0.276-0.224,0.5-0.5,0.5h-11c-0.276,0-0.5-0.224-0.5-0.5v-3c0-0.276,0.224-0.5,0.5-0.5h11c0.276,0,0.5,0.224,0.5,0.5
-		V926.5z"/>
-</g>
-<g id="circle_x5F_plus">
-	<path d="M14,912.75c-6.765,0-12.25,5.483-12.25,12.25S7.235,937.25,14,937.25s12.25-5.483,12.25-12.25S20.765,912.75,14,912.75z
-		 M21.086,926.519c0,0.278-0.228,0.506-0.506,0.506h-4.555v4.618c0,0.279-0.227,0.507-0.506,0.507h-3.037
-		c-0.279,0-0.506-0.228-0.506-0.507v-4.618H7.42c-0.279,0-0.506-0.228-0.506-0.506v-3.037c0-0.278,0.228-0.506,0.506-0.506h4.555
-		v-4.555c0-0.279,0.228-0.507,0.506-0.507h3.037c0.279,0,0.506,0.228,0.506,0.507v4.555h4.555c0.279,0,0.506,0.228,0.506,0.506
-		V926.519z"/>
-</g>
-<g id="brightness_x5F_increase">
-	<path d="M446,871c-3.308,0-6,2.692-6,6s2.692,6,6,6s6-2.692,6-6S449.308,871,446,871z M446,880.913
-		c-2.158,0-3.913-1.755-3.913-3.913s1.755-3.913,3.913-3.913s3.913,1.755,3.913,3.913S448.158,880.913,446,880.913z M437.812,878
-		h-3.745c-0.027-0.33-0.051-0.662-0.051-1s0.023-0.67,0.051-1h3.745c-0.04,0.328-0.066,0.661-0.066,1S437.771,877.672,437.812,878z
-		 M440.921,883.493l-2.649,2.649c-0.51-0.432-0.982-0.904-1.414-1.414l2.649-2.649C439.92,882.605,440.395,883.08,440.921,883.493z
-		 M439.507,871.921l-2.649-2.649c0.432-0.51,0.904-0.982,1.414-1.414l2.649,2.649C440.395,870.92,439.92,871.395,439.507,871.921z
-		 M454.188,876h3.745c0.027,0.33,0.051,0.662,0.051,1s-0.023,0.67-0.051,1h-3.745c0.04-0.328,0.066-0.661,0.066-1
-		S454.229,876.328,454.188,876z M447,885.188v3.746c-0.33,0.027-0.662,0.051-1,0.051s-0.67-0.023-1-0.051v-3.746
-		c0.328,0.041,0.661,0.067,1,0.067S446.672,885.229,447,885.188z M455.143,869.271l-2.649,2.649
-		c-0.413-0.526-0.888-1.001-1.414-1.414l2.649-2.649C454.238,868.289,454.711,868.762,455.143,869.271z M452.493,882.079
-		l2.649,2.649c-0.432,0.51-0.904,0.982-1.414,1.414l-2.649-2.649C451.605,883.08,452.08,882.605,452.493,882.079z M447,865.066
-		v3.746c-0.328-0.041-0.661-0.067-1-0.067s-0.672,0.026-1,0.067v-3.746c0.33-0.027,0.662-0.051,1-0.051S446.67,865.039,447,865.066z
-		"/>
-</g>
-<g id="brightness_x5F_reduce">
-	<path d="M390.898,877c0-0.34,0.032-0.672,0.079-1h-2.904c-0.033,0.329-0.051,0.662-0.051,1s0.018,0.671,0.051,1h2.904
-		C390.931,877.672,390.898,877.34,390.898,877z"/>
-	<path d="M399,886.927v-2.904c-0.328,0.047-0.66,0.079-1,0.079s-0.672-0.032-1-0.079v2.904c0.329,0.033,0.662,0.051,1,0.051
-		S398.671,886.96,399,886.927z"/>
-	<path d="M403.671,872.743l2.052-2.052c-0.424-0.517-0.897-0.99-1.414-1.414l-2.052,2.052
-		C402.792,871.732,403.268,872.208,403.671,872.743z"/>
-	<path d="M407.927,876h-2.904c0.047,0.328,0.079,0.66,0.079,1s-0.032,0.672-0.079,1h2.904c0.033-0.329,0.051-0.662,0.051-1
-		S407.96,876.329,407.927,876z"/>
-	<path d="M398,869.898c0.34,0,0.672,0.032,1,0.079v-2.904c-0.329-0.033-0.662-0.051-1-0.051s-0.671,0.018-1,0.051v2.904
-		C397.328,869.931,397.66,869.898,398,869.898z"/>
-	<path d="M403.671,881.257c-0.403,0.535-0.879,1.011-1.414,1.414l2.052,2.052c0.517-0.424,0.99-0.897,1.414-1.414L403.671,881.257z"
-		/>
-	<path d="M392.329,881.257l-2.052,2.052c0.424,0.517,0.897,0.99,1.414,1.414l2.052-2.052
-		C393.208,882.268,392.732,881.792,392.329,881.257z"/>
-	<path d="M392.329,872.743c0.403-0.535,0.879-1.011,1.414-1.414l-2.052-2.052c-0.517,0.424-0.99,0.897-1.414,1.414L392.329,872.743z
-		"/>
-	<path d="M398,880.987c-2.199,0-3.987-1.788-3.987-3.987s1.788-3.987,3.987-3.987s3.987,1.788,3.987,3.987
-		S400.199,880.987,398,880.987z M398,875.045c-1.077,0-1.954,0.877-1.954,1.955c0,1.077,0.877,1.954,1.954,1.954
-		c1.078,0,1.954-0.877,1.954-1.954C399.954,875.922,399.078,875.045,398,875.045z"/>
-</g>
-<g id="more_1_">
-	<path d="M344.874,877.114c0,1.593-1.292,2.886-2.885,2.886c-1.594,0-2.886-1.293-2.886-2.886s1.292-2.886,2.886-2.886
-		C343.582,874.229,344.874,875.521,344.874,877.114z M349.968,874.229c-1.593,0-2.885,1.293-2.885,2.886s1.292,2.886,2.885,2.886
-		c1.594,0,2.886-1.293,2.886-2.886S351.562,874.229,349.968,874.229z M357.947,874.229c-1.593,0-2.886,1.293-2.886,2.886
-		s1.293,2.886,2.886,2.886c1.594,0,2.886-1.293,2.886-2.886S359.541,874.229,357.947,874.229z"/>
-</g>
-<g id="move">
-	<path d="M313.646,876.646l-4.293-4.293c-0.194-0.194-0.354-0.129-0.354,0.146v2.5h-5v-5l2.484-0.013
-		c0.275-0.002,0.341-0.162,0.146-0.356l-4.277-4.277c-0.194-0.194-0.513-0.194-0.707,0l-4.293,4.293
-		c-0.194,0.194-0.128,0.354,0.146,0.354h2.5v5h-5v-2.5c0-0.275-0.159-0.341-0.354-0.146l-4.293,4.293
-		c-0.194,0.194-0.194,0.513,0,0.707l4.293,4.293c0.194,0.194,0.354,0.129,0.354-0.146V879h5v5h-2.5
-		c-0.275,0-0.341,0.159-0.146,0.354l4.293,4.293c0.194,0.194,0.513,0.194,0.707,0l4.293-4.293c0.194-0.194,0.128-0.354-0.146-0.354
-		H304v-5h5v2.5c0,0.275,0.159,0.341,0.354,0.146l4.293-4.293C313.841,877.159,313.841,876.841,313.646,876.646z"/>
-</g>
-<g id="screenshot">
-	<g>
-		<path d="M254.508,884.023c-4.136,0-7.5-3.364-7.5-7.5s3.364-7.5,7.5-7.5s7.5,3.364,7.5,7.5S258.644,884.023,254.508,884.023z
-			 M254.508,870.023c-3.584,0-6.5,2.916-6.5,6.5s2.916,6.5,6.5,6.5s6.5-2.916,6.5-6.5S258.092,870.023,254.508,870.023z"/>
-	</g>
-	<g>
-		<path d="M244,877h-2.5c-0.275,0-0.5-0.225-0.5-0.5s0.225-0.5,0.5-0.5h2.5h3.025h1H253v1h-4.975h-1H244z M254,870.025V875h1v-4.975
-			v-1V867v-3.5c0-0.275-0.225-0.5-0.5-0.5s-0.5,0.225-0.5,0.5v3.5v2.025V870.025z M267.5,876H265h-3.025h-1H256v1h4.975h1H265h2.5
-			c0.275,0,0.5-0.225,0.5-0.5S267.775,876,267.5,876z M255,882.975V878h-1v4.975v1V886v3.5c0,0.275,0.225,0.5,0.5,0.5
-			s0.5-0.225,0.5-0.5V886v-2.025V882.975z"/>
-	</g>
-	<g opacity="0.3">
-		<path d="M260.975,877H256v-1h4.975h0.007c-0.255-3.177-2.801-5.711-5.981-5.951V875h-1v-4.951
-			c-3.174,0.248-5.711,2.779-5.966,5.951H253v1h-4.968c0.233,3.193,2.778,5.749,5.968,5.998v-0.023V878h1v4.975v0.023
-			c3.196-0.241,5.75-2.8,5.983-5.998H260.975z"/>
-	</g>
-</g>
-<g id="volume_x5F_up_1_">
-	<path d="M217.75,877c0,4.558-1.596,8.748-4.253,12.049l-1.546-1.267c2.374-2.956,3.799-6.705,3.799-10.782
-		c0-4.089-1.433-7.848-3.819-10.808l1.581-1.223C216.16,868.268,217.75,872.451,217.75,877z M210.35,867.414l-1.582,1.223
-		c1.863,2.283,2.982,5.194,2.982,8.363c0,3.116-1.084,5.982-2.892,8.248l1.546,1.268c2.091-2.611,3.346-5.919,3.346-9.516
-		C213.75,873.371,212.474,870.035,210.35,867.414z M207.187,869.859l-1.583,1.225c1.338,1.605,2.146,3.668,2.146,5.916
-		c0,2.155-0.747,4.137-1.988,5.711l1.551,1.27c1.523-1.92,2.438-4.345,2.438-6.98C209.75,874.291,208.787,871.803,207.187,869.859z
-		 M204,869.292c0-0.275-0.168-0.35-0.373-0.167l-4.854,4.563c-0.205,0.183-0.599,0.333-0.873,0.333H194.5
-		c-0.275,0-0.5,0.225-0.5,0.5v3.979c0,0.275,0.225,0.5,0.5,0.5h3.464c0.274,0,0.663,0.154,0.863,0.344l4.81,4.562
-		c0.2,0.188,0.363,0.118,0.363-0.156V869.292z"/>
-</g>
-<g id="volume_x5F_down">
-	<path d="M159.187,869.859l-1.583,1.225c1.338,1.605,2.146,3.668,2.146,5.916c0,2.155-0.747,4.137-1.988,5.711l1.551,1.27
-		c1.523-1.92,2.438-4.345,2.438-6.98C161.75,874.291,160.787,871.803,159.187,869.859z M156,869.292c0-0.275-0.168-0.35-0.373-0.167
-		l-4.854,4.563c-0.205,0.183-0.599,0.333-0.873,0.333H146.5c-0.275,0-0.5,0.225-0.5,0.5v3.979c0,0.275,0.225,0.5,0.5,0.5h3.464
-		c0.274,0,0.663,0.154,0.863,0.344l4.81,4.562c0.2,0.188,0.363,0.118,0.363-0.156V869.292z"/>
-</g>
-<g id="mute">
-	<path d="M119.851,880.087c0.198,0.197,0.198,0.521,0,0.718l-1.075,1.076c-0.199,0.198-0.521,0.198-0.719,0l-3.045-3.044
-		l-3.047,3.046c-0.197,0.198-0.521,0.198-0.718,0l-1.075-1.076c-0.199-0.197-0.199-0.521,0-0.718l3.046-3.047l-3.048-3.049
-		c-0.199-0.196-0.199-0.52,0-0.718l1.075-1.076c0.198-0.197,0.522-0.197,0.718,0l3.049,3.048l3.047-3.046
-		c0.197-0.198,0.52-0.198,0.719,0l1.075,1.076c0.198,0.198,0.198,0.521,0,0.718l-3.046,3.047L119.851,880.087z M108,869.292
-		c0-0.275-0.168-0.35-0.373-0.167l-4.854,4.563c-0.205,0.183-0.599,0.333-0.873,0.333H98.5c-0.275,0-0.5,0.225-0.5,0.5v3.979
-		c0,0.275,0.225,0.5,0.5,0.5h3.464c0.274,0,0.663,0.154,0.863,0.344l4.81,4.562c0.2,0.188,0.363,0.118,0.363-0.156V869.292z"/>
-</g>
-<g id="download_x5F_alt">
-	<path d="M73.461,884H62.573l7.37-8.588c0.159-0.205,0.078-0.412-0.182-0.412H65v-9.511c0-0.26-0.196-0.489-0.455-0.489h-5.024
-		c-0.26,0-0.521,0.229-0.521,0.489V875h-4.681c-0.26,0-0.343,0.208-0.184,0.413L61.507,884H50.5c-0.275,0-0.5,0.225-0.5,0.5v4.5h2.5
-		H74v-0.5v-4C74,884.225,73.736,884,73.461,884z M72,887h-2v-1h2V887z"/>
-</g>
-<g id="facetime_x5F_video_1_">
-	<path d="M26,871v12c0,0.275-0.17,0.353-0.378,0.172L19,877.867v5.633c0,0.825-0.675,1.5-1.5,1.5h-14c-0.825,0-1.5-0.675-1.5-1.5
-		v-13c0-0.825,0.675-1.5,1.5-1.5h14c0.825,0,1.5,0.675,1.5,1.5v5.633l6.622-5.305C25.83,870.647,26,870.725,26,871z"/>
-</g>
-<g id="eject">
-	<path d="M437.296,832c-0.275,0-0.362-0.471-0.194-0.689l8.608-11.104c0.168-0.218,0.443-0.19,0.611,0.026l8.592,11.096
-		c0.168,0.218,0.08,0.671-0.194,0.671H437.296z M437.5,834c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h17
-		c0.275,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.225-0.5-0.5-0.5H437.5z"/>
-</g>
-<g id="step_x5F_forward">
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M405,820.5v17c0,0.275-0.225,0.5-0.5,0.5h-2c-0.275,0-0.5-0.225-0.5-0.5v-7.789
-		l-10.453,8.187c-0.218,0.168-0.547,0.08-0.547-0.194V820.28c0-0.275,0.329-0.362,0.547-0.194L402,828.242V820.5
-		c0-0.275,0.225-0.5,0.5-0.5h2C404.775,820,405,820.225,405,820.5z"/>
-</g>
-<g id="fast_x5F_forward_1_">
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M362,820.5v17c0,0.275-0.225,0.5-0.5,0.5h-2c-0.275,0-0.5-0.225-0.5-0.5v-7.789
-		l-10.453,8.187c-0.218,0.168-0.547,0.08-0.547-0.194v-7.971v-0.021l-10.453,8.187c-0.218,0.168-0.547,0.08-0.547-0.194V820.28
-		c0-0.275,0.329-0.362,0.547-0.194L348,828.242v-0.022v-7.939c0-0.275,0.329-0.362,0.547-0.194L359,828.242V820.5
-		c0-0.275,0.225-0.5,0.5-0.5h2C361.775,820,362,820.225,362,820.5z"/>
-</g>
-<g id="forward">
-	<path d="M313.518,829.306l-10.971,8.592c-0.218,0.168-0.547,0.08-0.547-0.194v-7.971v-0.021l-10.453,8.187
-		c-0.218,0.168-0.547,0.08-0.547-0.194V820.28c0-0.275,0.329-0.362,0.547-0.194L302,828.242v-0.022v-7.939
-		c0-0.275,0.329-0.362,0.547-0.194l11.033,8.608C313.798,828.862,313.734,829.138,313.518,829.306z"/>
-</g>
-<g id="stop_1_">
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M261,835.5c0,0.275-0.225,0.5-0.5,0.5h-13c-0.275,0-0.5-0.225-0.5-0.5v-13
-		c0-0.275,0.225-0.5,0.5-0.5h13c0.275,0,0.5,0.225,0.5,0.5V835.5z"/>
-</g>
-<g id="pause">
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M205,836.5c0,0.275-0.225,0.5-0.5,0.5h-3c-0.275,0-0.5-0.225-0.5-0.5v-15
-		c0-0.275,0.225-0.5,0.5-0.5h3c0.275,0,0.5,0.225,0.5,0.5V836.5z M211,821.5c0-0.275-0.225-0.5-0.5-0.5h-3
-		c-0.275,0-0.5,0.225-0.5,0.5v15c0,0.275,0.225,0.5,0.5,0.5h3c0.275,0,0.5-0.225,0.5-0.5V821.5z"/>
-</g>
-<g id="play_1_">
-	<path d="M166.854,829.306l-15.433,8.069c-0.217,0.168-0.422,0.08-0.422-0.194v-16.361c0-0.275,0.203-0.362,0.42-0.194l15.446,8.069
-		C167.084,828.862,167.072,829.138,166.854,829.306z"/>
-</g>
-<g id="rewind">
-	<path d="M121,820.28v17.423c0,0.274-0.329,0.362-0.547,0.194L110,829.711v0.021v7.971c0,0.274-0.329,0.362-0.547,0.194
-		l-10.971-8.592c-0.217-0.168-0.28-0.443-0.062-0.611l11.033-8.608c0.218-0.168,0.547-0.081,0.547,0.194v7.939v0.022l10.453-8.156
-		C120.671,819.918,121,820.005,121,820.28z"/>
-</g>
-<g id="fast_x5F_backward_1_">
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M74.453,820.086L64,828.242v-0.022v-7.939c0-0.275-0.329-0.362-0.547-0.194
-		L53,828.242V820.5c0-0.275-0.225-0.5-0.5-0.5h-2c-0.275,0-0.5,0.225-0.5,0.5v17c0,0.275,0.225,0.5,0.5,0.5h2
-		c0.275,0,0.5-0.225,0.5-0.5v-7.789l10.453,8.187c0.218,0.168,0.547,0.08,0.547-0.194v-7.971v-0.021l10.453,8.187
-		c0.218,0.168,0.547,0.08,0.547-0.194V820.28C75,820.005,74.671,819.918,74.453,820.086z"/>
-</g>
-<g id="step_x5F_backward">
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M20.453,820.086L10,828.242V820.5c0-0.275-0.225-0.5-0.5-0.5h-2
-		c-0.275,0-0.5,0.225-0.5,0.5v17c0,0.275,0.225,0.5,0.5,0.5h2c0.275,0,0.5-0.225,0.5-0.5v-7.789l10.453,8.187
-		c0.218,0.168,0.547,0.08,0.547-0.194V820.28C21,820.005,20.671,819.918,20.453,820.086z"/>
-</g>
-<g id="phone">
-	<g>
-		<path d="M445.547,768.062c-4.781,0-7.547,1.838-7.547,2.938v20c0,1.1,0.9,2,2,2h11c1.1,0,2-0.9,2-2v-20
-			C453,769.9,450.328,768.062,445.547,768.062z M443,791h-3v-2h3V791z M443,788h-3v-2h3V788z M443,785h-3v-2h3V785z M447,791h-3v-2
-			h3V791z M447,788h-3v-2h3V788z M447,785h-3v-2h3V785z M451,791h-3v-2h3V791z M451,788h-3v-2h3V788z M451,785h-3v-2h3V785z
-			 M451,781h-11v-10h11V781z"/>
-	</g>
-	<g opacity="0.3">
-		<rect x="440" y="771" width="11" height="10"/>
-	</g>
-</g>
-<g id="ear_x5F_plugs_1_">
-	<path d="M403.5,772c-2.484,0-4.5,2.017-4.5,4.5c0,1.941,1.24,3.578,2.965,4.209C401.778,778.91,400,778,400,778v-3c0,0,3,3,3,6v3h2
-		v-3.275c1.744-0.621,3-2.27,3-4.225C408,774.017,405.984,772,403.5,772z"/>
-	<polygon points="402,790 403,790 403,793 404,793 404,790 405,790 405,785 402,785 	"/>
-	<polygon points="391,787 392,787 392,793 393,793 393,787 394,787 394,782 391,782 	"/>
-	<path d="M392.5,769c-2.484,0-4.5,2.017-4.5,4.5c0,1.941,1.24,3.578,2.965,4.209C390.778,775.91,389,775,389,775v-3c0,0,3,3,3,6v3h2
-		v-3.275c1.744-0.621,3-2.27,3-4.225C397,771.017,394.984,769,392.5,769z"/>
-</g>
-<g id="ipod_x5F_shuffle_1_">
-	<g id="ipod_x5F_shuffle">
-		<path d="M343,775v13h15v-13H343z M350.5,786.402c-2.708,0-4.902-2.194-4.902-4.902s2.194-4.902,4.902-4.902
-			s4.902,2.194,4.902,4.902S353.208,786.402,350.5,786.402z M353.349,781.5c0,1.574-1.275,2.849-2.849,2.849
-			s-2.849-1.274-2.849-2.849c0-1.573,1.275-2.849,2.849-2.849S353.349,779.927,353.349,781.5z"/>
-	</g>
-</g>
-<g id="ipod">
-	<g id="body_4_">
-		<path d="M307.634,770h-11.268c-0.755,0-1.366,0.611-1.366,1.366v19.268c0,0.755,0.611,1.366,1.366,1.366h11.268
-			c0.755,0,1.366-0.611,1.366-1.366v-19.268C309,770.611,308.389,770,307.634,770z M302,789.652c-2.264,0-4.098-1.836-4.098-4.099
-			c0-2.264,1.834-4.099,4.098-4.099s4.098,1.835,4.098,4.099C306.098,787.816,304.264,789.652,302,789.652z M303.594,785.554
-			c0,0.88-0.714,1.594-1.594,1.594s-1.594-0.714-1.594-1.594s0.714-1.594,1.594-1.594S303.594,784.674,303.594,785.554z M307,778
-			h-10v-6h10V778z"/>
-	</g>
-	<g opacity="0.3">
-		<rect x="297" y="772" width="10" height="6"/>
-	</g>
-</g>
-<g id="iphone_x5F_exchange">
-	<g>
-		<path d="M264.907,780.844l-5.608-4.657c-0.115-0.089-0.299-0.042-0.299,0.103V779h-9v-2.711c0-0.145-0.184-0.191-0.299-0.103
-			l-5.608,4.657c-0.114,0.088-0.089,0.233,0.026,0.322l5.57,4.686c0.114,0.089,0.311,0.043,0.311-0.102V783h9v2.75
-			c0,0.145,0.196,0.19,0.311,0.102l5.57-4.686C264.996,781.077,265.021,780.932,264.907,780.844z"/>
-	</g>
-	<g opacity="0.3">
-		<path d="M267,773v15h-10v-2.25c0,0.546,0.214,1.039,0.555,1.418c0.398,0.443,0.973,0.729,1.619,0.729l0,0
-			c0.493,0,0.978-0.165,1.424-0.515l5.504-4.632c0.56-0.432,0.88-1.075,0.879-1.767c0-0.679-0.311-1.308-0.795-1.679l-2.182-1.811
-			l-3.484-2.892c-0.385-0.297-0.866-0.461-1.354-0.461c-1.194,0-2.166,0.963-2.166,2.147V773H267z M242.873,779.259l5.551-4.611
-			c0.441-0.342,0.923-0.506,1.41-0.506c0.434,0,0.834,0.13,1.174,0.348c0.596,0.383,0.992,1.045,0.992,1.8V773h-10v15h10v-2.25
-			c0,1.184-0.975,2.146-2.174,2.146c-0.493,0-0.978-0.165-1.365-0.466l-3.896-3.277l-1.732-1.457
-			c-0.493-0.378-0.813-1.021-0.812-1.713C242.02,780.305,242.33,779.676,242.873,779.259z"/>
-	</g>
-	<g>
-		<path d="M252,785v0.75V788h-10v-15h10v3.289V777h2v-5.5c0-1.375-1.125-2.5-2.5-2.5h-9c-1.375,0-2.5,1.125-2.5,2.5v19
-			c0,1.375,1.125,2.5,2.5,2.5h9c1.375,0,2.5-1.125,2.5-2.5V785H252z M247,792.271c-0.979,0-1.771-0.793-1.771-1.771
-			s0.793-1.771,1.771-1.771s1.771,0.793,1.771,1.771S247.979,792.271,247,792.271z"/>
-	</g>
-	<g>
-		<path d="M266.502,769h-9c-1.375,0-2.502,1.125-2.502,2.5v5.5h2v-4h10v15h-10v-3h-2v5.5c0,1.375,1.127,2.5,2.502,2.5h9
-			c1.375,0,2.498-1.125,2.498-2.5v-19C269,770.125,267.877,769,266.502,769z M262.002,792.271c-0.979,0-1.771-0.793-1.771-1.771
-			s0.793-1.771,1.771-1.771s1.771,0.793,1.771,1.771S262.98,792.271,262.002,792.271z"/>
-	</g>
-</g>
-<g id="iphone_x5F_transfer">
-	<g>
-		<path d="M211.891,781.166l-5.575,4.686c-0.114,0.089-0.315,0.043-0.315-0.102V783h-4.49c-0.275,0-0.51-0.245-0.51-0.521V779.5
-			c0-0.275,0.234-0.5,0.51-0.5H206v-2.711c0-0.145,0.188-0.191,0.304-0.103l5.61,4.657
-			C212.029,780.932,212.006,781.077,211.891,781.166z"/>
-	</g>
-	<g>
-		<path d="M218.502,769h-9c-1.375,0-2.502,1.125-2.502,2.5v2.809c0,0.076,2,1.516,2,1.516V773h10v15h-10v-1.791l-1.395,1.173
-			c-0.195,0.153-0.605,0.265-0.605,0.349v2.77c0,1.375,1.127,2.5,2.502,2.5h9c1.375,0,2.498-1.125,2.498-2.5v-19
-			C221,770.125,219.877,769,218.502,769z M214.002,792.271c-0.979,0-1.771-0.793-1.771-1.771s0.793-1.771,1.771-1.771
-			s1.771,0.793,1.771,1.771S214.98,792.271,214.002,792.271z"/>
-	</g>
-	<g>
-		<path d="M204,785.75V785l0,0v3h-10v-15h10v4l0,0v-0.711c0-1.125,0.889-2.039,2-2.13V771.5c0-1.375-1.125-2.5-2.5-2.5h-9
-			c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h9c1.375,0,2.5-1.125,2.5-2.5v-2.622
-			C204.889,787.784,204,786.871,204,785.75z M199,792.271c-0.979,0-1.771-0.793-1.771-1.771s0.793-1.771,1.771-1.771
-			s1.771,0.793,1.771,1.771S199.979,792.271,199,792.271z"/>
-	</g>
-	<g opacity="0.3">
-		<path d="M199,782.479c0,1.379,1.131,2.521,2.51,2.521H204v3h-10v-15h10v4h-2.549c-0.045,0-0.088,0.008-0.131,0.014l-0.004,0.006
-			c-1.289,0.098-2.316,1.166-2.316,2.48V782.479z M209,773v2.824l4.193,3.48c0.388,0.297,0.656,0.76,0.752,1.279l-0.001,0.001
-			c0.024,0.13,0.046,0.263,0.046,0.398c0,0.691-0.319,1.335-0.879,1.767L209,786.224V788h10v-14.997l0.002-0.003H209z"/>
-	</g>
-</g>
-<g id="iphone">
-	<g opacity="0.3">
-		<rect x="153" y="773" width="10" height="15"/>
-	</g>
-	<g id="body_5_">
-		<path d="M162.5,769h-9c-1.375,0-2.5,1.125-2.5,2.5v19c0,1.375,1.125,2.5,2.5,2.5h9c1.375,0,2.5-1.125,2.5-2.5v-19
-			C165,770.125,163.875,769,162.5,769z M158,792.271c-0.979,0-1.771-0.793-1.771-1.771s0.793-1.771,1.771-1.771
-			s1.771,0.793,1.771,1.771S158.979,792.271,158,792.271z M153,788v-15h10v15H153z"/>
-	</g>
-</g>
-<g id="ipad">
-	<path d="M119,767h-18c-1.1,0-2,0.9-2,2v23c0,1.1,0.9,2,2,2h18c1.1,0,2-0.9,2-2v-23C121,767.9,120.1,767,119,767z M110,793.675
-		c-0.649,0-1.175-0.526-1.175-1.175s0.526-1.175,1.175-1.175c0.649,0,1.175,0.526,1.175,1.175S110.649,793.675,110,793.675z
-		 M118,791h-15.973H102v-21h16V791z"/>
-	<polygon opacity="0.3" points="118,791 102.027,791 102,791 102,770 118,770 	"/>
-</g>
-<g id="macbook">
-	<g opacity="0.3">
-		<rect x="53" y="776" width="18" height="11"/>
-	</g>
-	<g id="macbook_1_">
-		<path d="M75.5,787H73v-12c0-0.55-0.45-1-1-1H52c-0.55,0-1,0.45-1,1v12h-2.5c-0.275,0-0.5,0.225-0.5,0.5v0.5
-			c0,0.275,0.225,0.5,0.5,0.5L49,789h26l0.5-0.5c0.275,0,0.5-0.225,0.5-0.5v-0.5C76,787.225,75.775,787,75.5,787z M53,776h18v11H53
-			V776z"/>
-	</g>
-</g>
-<g id="imac">
-	<g opacity="0.3">
-		<rect x="3" y="773" width="22" height="12"/>
-	</g>
-	<g>
-		<line x1="1" y1="787" x2="27" y2="787"/>
-	</g>
-	<g>
-		<path d="M25.5,771h-23c-0.825,0-1.5,0.675-1.5,1.5V787h26v-14.5C27,771.675,26.325,771,25.5,771z M25,785H3v-12h22V785z"/>
-	</g>
-	<g opacity="0.5">
-		<path d="M1,787.25v1.375C1,789.533,1.675,790,2.5,790h23c0.825,0,1.5-0.467,1.5-1.375v-1.375H1z"/>
-	</g>
-	<g>
-		<path d="M19.609,792.703c0.266,0,0.293,0.297-0.004,0.297H8.426c-0.297,0-0.285-0.297-0.004-0.297S11,793,11,791c0-1,0-1,0-1
-			h5.986c0,0-0.014,0,0,1C17,793,19.344,792.703,19.609,792.703z"/>
-	</g>
-</g>
-<g id="playlist_1_">
-	<path d="M459.192,732.032c-0.847,0.339-0.179-0.339-0.179-0.339s1.422-2.092,0.406-3.786c-0.793-1.321-3.338-1.075-4.42-1.669
-		v14.154c0,0.037-0.016,0.07-0.021,0.106c-0.154,1.504-1.607,3.034-3.696,3.712c-2.56,0.829-5.103,0.063-5.678-1.711
-		c-0.574-1.774,1.034-3.887,3.595-4.717c0.66-0.189,2.207-0.439,2.801-0.193v-15.982c0-0.335,0.271-0.607,0.607-0.607h1.785
-		c0.336,0,0.607,0.272,0.607,0.607v0.549c1.542,1.004,6.18,1.455,6.851,4.139C462.656,729.52,460.038,731.693,459.192,732.032z
-		 M434.5,729H450v-3h-15.5c-0.275,0-0.5,0.225-0.5,0.5v2C434,728.775,434.225,729,434.5,729z M434.5,735H450v-3h-15.5
-		c-0.275,0-0.5,0.225-0.5,0.5v2C434,734.775,434.225,735,434.5,735z M444.625,738H434.5c-0.275,0-0.5,0.225-0.5,0.5v2
-		c0,0.275,0.225,0.5,0.5,0.5h8.551C443.228,739.925,443.779,738.887,444.625,738z"/>
-</g>
-<g id="show_x5F_lines_1_">
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M410,740.5c0,0.275-0.225,0.5-0.5,0.5h-23c-0.275,0-0.5-0.225-0.5-0.5v-2
-		c0-0.275,0.225-0.5,0.5-0.5h23c0.275,0,0.5,0.225,0.5,0.5V740.5z M410,732.5c0-0.275-0.225-0.5-0.5-0.5h-23
-		c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h23c0.275,0,0.5-0.225,0.5-0.5V732.5z M410,726.5
-		c0-0.275-0.225-0.5-0.5-0.5h-23c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h23c0.275,0,0.5-0.225,0.5-0.5V726.5z"/>
-</g>
-<g id="show_x5F_thumbnails_x5F_with_x5F_lines_1_">
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M362,740.5c0,0.275-0.225,0.5-0.5,0.5h-18c-0.275,0-0.5-0.225-0.5-0.5v-2
-		c0-0.275,0.225-0.5,0.5-0.5h18c0.275,0,0.5,0.225,0.5,0.5V740.5z M341,740.5c0,0.275-0.225,0.5-0.5,0.5h-2
-		c-0.275,0-0.5-0.225-0.5-0.5v-2c0-0.275,0.225-0.5,0.5-0.5h2c0.275,0,0.5,0.225,0.5,0.5V740.5z M362,734.5
-		c0,0.275-0.225,0.5-0.5,0.5h-18c-0.275,0-0.5-0.225-0.5-0.5v-2c0-0.275,0.225-0.5,0.5-0.5h18c0.275,0,0.5,0.225,0.5,0.5V734.5z
-		 M341,734.5c0,0.275-0.225,0.5-0.5,0.5h-2c-0.275,0-0.5-0.225-0.5-0.5v-2c0-0.275,0.225-0.5,0.5-0.5h2c0.275,0,0.5,0.225,0.5,0.5
-		V734.5z M362,728.5c0,0.275-0.225,0.5-0.5,0.5h-18c-0.275,0-0.5-0.225-0.5-0.5v-2c0-0.275,0.225-0.5,0.5-0.5h18
-		c0.275,0,0.5,0.225,0.5,0.5V728.5z M341,728.5c0,0.275-0.225,0.5-0.5,0.5h-2c-0.275,0-0.5-0.225-0.5-0.5v-2
-		c0-0.275,0.225-0.5,0.5-0.5h2c0.275,0,0.5,0.225,0.5,0.5V728.5z"/>
-</g>
-<g id="show_x5F_thumbnails_1_">
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M307.5,744c-0.275,0-0.5-0.225-0.5-0.5v-5c0-0.275,0.225-0.5,0.5-0.5h5
-		c0.275,0,0.5,0.225,0.5,0.5v5c0,0.275-0.225,0.5-0.5,0.5H307.5z M299.5,744c-0.275,0-0.5-0.225-0.5-0.5v-5
-		c0-0.275,0.225-0.5,0.5-0.5h5c0.275,0,0.5,0.225,0.5,0.5v5c0,0.275-0.225,0.5-0.5,0.5H299.5z M291.5,744
-		c-0.275,0-0.5-0.225-0.5-0.5v-5c0-0.275,0.225-0.5,0.5-0.5h5c0.275,0,0.5,0.225,0.5,0.5v5c0,0.275-0.225,0.5-0.5,0.5H291.5z
-		 M307.5,736c-0.275,0-0.5-0.225-0.5-0.5v-5c0-0.275,0.225-0.5,0.5-0.5h5c0.275,0,0.5,0.225,0.5,0.5v5c0,0.275-0.225,0.5-0.5,0.5
-		H307.5z M299.5,736c-0.275,0-0.5-0.225-0.5-0.5v-5c0-0.275,0.225-0.5,0.5-0.5h5c0.275,0,0.5,0.225,0.5,0.5v5
-		c0,0.275-0.225,0.5-0.5,0.5H299.5z M291.5,736c-0.275,0-0.5-0.225-0.5-0.5v-5c0-0.275,0.225-0.5,0.5-0.5h5
-		c0.275,0,0.5,0.225,0.5,0.5v5c0,0.275-0.225,0.5-0.5,0.5H291.5z M307.5,728c-0.275,0-0.5-0.225-0.5-0.5v-5
-		c0-0.275,0.225-0.5,0.5-0.5h5c0.275,0,0.5,0.225,0.5,0.5v5c0,0.275-0.225,0.5-0.5,0.5H307.5z M299.5,728
-		c-0.275,0-0.5-0.225-0.5-0.5v-5c0-0.275,0.225-0.5,0.5-0.5h5c0.275,0,0.5,0.225,0.5,0.5v5c0,0.275-0.225,0.5-0.5,0.5H299.5z
-		 M291.5,728c-0.275,0-0.5-0.225-0.5-0.5v-5c0-0.275,0.225-0.5,0.5-0.5h5c0.275,0,0.5,0.225,0.5,0.5v5c0,0.275-0.225,0.5-0.5,0.5
-		H291.5z"/>
-</g>
-<g id="show_x5F_big_x5F_thumbnails_1_">
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M255.5,744c-0.275,0-0.5-0.225-0.5-0.5v-9c0-0.275,0.225-0.5,0.5-0.5h9
-		c0.275,0,0.5,0.225,0.5,0.5v9c0,0.275-0.225,0.5-0.5,0.5H255.5z M252.5,744c0.275,0,0.5-0.225,0.5-0.5v-9
-		c0-0.275-0.225-0.5-0.5-0.5h-9c-0.275,0-0.5,0.225-0.5,0.5v9c0,0.275,0.225,0.5,0.5,0.5H252.5z M264.5,732
-		c0.275,0,0.5-0.225,0.5-0.5v-9c0-0.275-0.225-0.5-0.5-0.5h-9c-0.275,0-0.5,0.225-0.5,0.5v9c0,0.275,0.225,0.5,0.5,0.5H264.5z
-		 M252.5,732c0.275,0,0.5-0.225,0.5-0.5v-9c0-0.275-0.225-0.5-0.5-0.5h-9c-0.275,0-0.5,0.225-0.5,0.5v9c0,0.275,0.225,0.5,0.5,0.5
-		H252.5z"/>
-</g>
-<g id="more_x5F_windows">
-	<path d="M213,727h-10c-2.205,0-4,1.794-4,4v10c0,2.206,1.795,4,4,4h10c2.205,0,4-1.794,4-4v-10C217,728.794,215.205,727,213,727z
-		 M215,742c0,0.55-0.45,1-1,1h-12c-0.55,0-1-0.45-1-1v-12c0-0.55,0.45-1,1-1h12c0.55,0,1,0.45,1,1V742z M198,740
-		c-2.205,0-4-1.794-4-4v-10c0-2.206,1.795-4,4-4h10c2.205,0,4,1.794,4,4h-2v-1c0-0.55-0.45-1-1-1h-12c-0.55,0-1,0.45-1,1v12
-		c0,0.55,0.45,1,1,1h1V740z"/>
-</g>
-<g id="unchecked">
-	<path d="M161,727h-10c-2.205,0-4,1.794-4,4v10c0,2.206,1.795,4,4,4h10c2.205,0,4-1.794,4-4v-10C165,728.794,163.205,727,161,727z
-		 M163,742c0,0.55-0.45,1-1,1h-12c-0.55,0-1-0.45-1-1v-12c0-0.55,0.45-1,1-1h12c0.55,0,1,0.45,1,1V742z"/>
-</g>
-<g id="check">
-	<path d="M115,739.307V742c0,0.55-0.45,1-1,1h-12c-0.55,0-1-0.45-1-1v-12c0-0.55,0.45-1,1-1h10.651l1.737-1.737
-		C113.955,727.101,113.49,727,113,727h-10c-2.205,0-4,1.794-4,4v10c0,2.206,1.795,4,4,4h10c2.205,0,4-1.794,4-4v-3.693L115,739.307z
-		"/>
-	<path d="M120.92,729.454c0.199,0.196,0.2,0.52,0.002,0.718l-11.004,11.003c-0.197,0.198-0.521,0.198-0.719,0l-5.896-5.896
-		c-0.197-0.197-0.197-0.521,0-0.72l2.334-2.333c0.197-0.198,0.521-0.198,0.719,0l2.844,2.843c0.197,0.197,0.521,0.197,0.72,0
-		l7.93-7.929c0.198-0.198,0.522-0.199,0.722-0.002L120.92,729.454z"/>
-</g>
-<g id="new_x5F_window">
-	<path d="M66,740.736V742c0,0.55-0.45,1-1,1H53c-0.55,0-1-0.45-1-1v-12c0-0.55,0.45-1,1-1h3.093c1.007-0.834,2.146-1.493,3.356-2H54
-		c-2.205,0-4,1.794-4,4v10c0,2.206,1.795,4,4,4h10c2.205,0,4-1.794,4-4v-1.766L66,740.736z"/>
-	<path d="M75.277,730.697l-9.868-7.384c-0.22-0.165-0.4-0.075-0.4,0.2l0.004,3.719c0,0.022-0.01,0.043-0.013,0.065v0.436
-		c-2.129,0.169-10.839,1.4-10.968,10.328c1.819-4.33,8.121-4.262,10.968-4.239v0.404c0.006,0.031,0.02,0.062,0.02,0.096l0.005,4.178
-		c0,0.275,0.18,0.365,0.4,0.199l9.853-7.402C75.498,731.132,75.497,730.862,75.277,730.697z"/>
-</g>
-<g id="edit">
-	<path d="M18,737.656V742c0,0.55-0.45,1-1,1H5c-0.55,0-1-0.45-1-1v-12c0-0.55,0.45-1,1-1h10.344l1.81-1.811
-		C16.785,727.078,16.404,727,16,727H6c-2.205,0-4,1.794-4,4v10c0,2.206,1.795,4,4,4h10c2.205,0,4-1.794,4-4v-5.343L18,737.656z"/>
-	<path d="M25.717,726.451l-2.168-2.169c-0.199-0.198-0.524-0.198-0.725,0l-1.445,1.446l2.893,2.893l1.445-1.445
-		C25.916,726.976,25.916,726.65,25.717,726.451z"/>
-	<path d="M13.333,739.459l-2.792-2.833l-1.632,4.172c-0.101,0.263,0.03,0.394,0.294,0.293L13.333,739.459z"/>
-	<rect x="15.357" y="726.163" transform="matrix(0.7071 0.7071 -0.7071 0.7071 523.1218 202.2676)" width="4.091" height="12.869"/>
-</g>
-<g id="folder_x5F_new">
-	<path d="M461.8,676h-1.86l1.206-1.097c0.078-0.079,0.078-0.153,0-0.231l-0.848-0.82c-0.079-0.079-0.106-0.065-0.187,0.014
-		L459,675.091v-1.872c0-0.11-0.29-0.219-0.4-0.219H457.4c-0.11,0-0.4,0.108-0.4,0.219v1.865l-1.107-1.206
-		c-0.078-0.079-0.158-0.079-0.236,0l-0.822,0.847c-0.08,0.078-0.067,0.099,0.013,0.178l1.219,1.098H454.2
-		c-0.11,0-0.2,0.309-0.2,0.419v1.199c0,0.11,0.09,0.382,0.2,0.382h1.872l-1.213,1.121c-0.078,0.078-0.078,0.162,0,0.242l0.848,0.823
-		c0.079,0.078,0.109,0.067,0.188-0.011l1.105-1.218v1.86c0,0.11,0.29,0.182,0.4,0.182h1.199c0.11,0,0.4-0.071,0.4-0.182v-1.865
-		l1.109,1.209c0.08,0.079,0.158,0.079,0.237,0l0.821-0.847c0.078-0.078,0.066-0.117-0.012-0.196L459.935,678h1.865
-		c0.11,0,0.2-0.271,0.2-0.382v-1.199C462,676.309,461.91,676,461.8,676z M450,680h-15v-2c0-0.55,0.45-1,1-1h1.334l0.35-1.052
-		C437.857,675.427,438.45,675,439,675h5c0.55,0,1.143,0.427,1.316,0.948l0.35,1.052H450h1h1c0,1.094,0.299,2.116,0.812,3h-1.255H450
-		z M458,683v1v2v10c0,0.55-0.45,1-1,1h-22c-0.55,0-1-0.45-1-1v-14c0-0.55,0.45-1,1-1h16h1.082h1.458
-		C454.64,682.225,456.229,683,458,683z"/>
-</g>
-<g id="folder_x5F_flag">
-	<path d="M412.501,672H410h-1h-0.501H408h-0.499h-0.002H407v0.499V673v7.501c0,0.274,0.225,0.499,0.499,0.499h0.002
-		c0.274,0,0.499-0.225,0.499-0.499V678l1-0.396V677.6l3.537-1.414c0.255-0.103,0.463-0.41,0.463-0.685v-3.002
-		C413,672.225,412.775,672,412.501,672z M402,680h-15v-2c0-0.55,0.45-1,1-1h1.334l0.35-1.052C389.857,675.427,390.45,675,391,675h5
-		c0.55,0,1.143,0.427,1.316,0.948l0.35,1.052H402h1h2v3h-1.443H402z M409.949,681H410v3v2v10c0,0.55-0.45,1-1,1h-22
-		c-0.55,0-1-0.45-1-1v-14c0-0.55,0.45-1,1-1h16h1.082h0.969c0.231,1.14,1.242,2,2.45,2C408.708,683,409.718,682.14,409.949,681z"/>
-</g>
-<g id="folder_x5F_lock">
-	<path d="M365.809,675H365v-2.551c0-0.744-0.715-1.449-1.453-1.449h-3.132c-0.739,0-1.415,0.705-1.415,1.449V675h-0.828
-		c-0.088,0-0.172,0.104-0.172,0.182v5.661c0,0.078,0.084,0.157,0.172,0.157h7.637c0.088,0,0.191-0.079,0.191-0.157v-5.661
-		C366,675.104,365.896,675,365.809,675z M360,672.449c0-0.338,0.096-0.449,0.428-0.449h3.106c0.331,0,0.466,0.111,0.466,0.449V675
-		h-4V672.449z M354,680h-15v-2c0-0.55,0.45-1,1-1h1.334l0.35-1.052C341.857,675.427,342.45,675,343,675h5
-		c0.55,0,1.143,0.427,1.316,0.948l0.35,1.052H354h1h1v3h-0.443H354z M362,683v1v2v10c0,0.55-0.45,1-1,1h-22c-0.55,0-1-0.45-1-1v-14
-		c0-0.55,0.45-1,1-1h16h1.016c0.083,1.115,1.014,2,2.156,2H362z"/>
-</g>
-<g id="folder_x5F_minus">
-	<path d="M307.557,680H291v-2c0-0.55,0.45-1,1-1h1.334l0.35-1.052C293.857,675.427,294.45,675,295,675h5
-		c0.55,0,1.143,0.427,1.316,0.948l0.35,1.052H307C307,678.128,307.198,679.131,307.557,680z M308.082,681H291c-0.55,0-1,0.45-1,1v14
-		c0,0.55,0.45,1,1,1h22c0.55,0,1-0.45,1-1v-12C311.506,684,309.321,682.948,308.082,681z"/>
-	<path d="M314,672c-2.761,0-5,1.711-5,5s2.239,5,5,5c2.762,0,5-2.04,5-4.802S316.762,672,314,672z M317,677.5
-		c0,0.275-0.225,0.5-0.5,0.5h-5c-0.275,0-0.5-0.225-0.5-0.5v-1c0-0.275,0.225-0.5,0.5-0.5h5c0.275,0,0.5,0.225,0.5,0.5V677.5z"/>
-</g>
-<g id="folder_x5F_plus">
-	<path d="M259.557,680H243v-2c0-0.55,0.45-1,1-1h1.334l0.35-1.052C245.857,675.427,246.45,675,247,675h5
-		c0.55,0,1.143,0.427,1.316,0.948l0.35,1.052H259C259,678.128,259.198,679.131,259.557,680z M260.082,681H243c-0.55,0-1,0.45-1,1v14
-		c0,0.55,0.45,1,1,1h22c0.55,0,1-0.45,1-1v-12C263.506,684,261.321,682.948,260.082,681z"/>
-	<path d="M266,672c-2.761,0-5,2.016-5,5c0,3.206,2.239,5,5,5c2.762,0,5-2.238,5-5S268.762,672,266,672z M269,677.5
-		c0,0.275-0.225,0.5-0.5,0.5H267v1.5c0,0.275-0.225,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5V678h-1.5c-0.275,0-0.5-0.225-0.5-0.5
-		v-1c0-0.275,0.225-0.5,0.5-0.5h1.5v-1.5c0-0.275,0.225-0.5,0.5-0.5h1c0.275,0,0.5,0.225,0.5,0.5v1.5h1.5c0.275,0,0.5,0.225,0.5,0.5
-		V677.5z"/>
-</g>
-<g id="folder_x5F_open">
-	<path d="M198.516,681.688c-0.25,0.562-4.516,11.219-4.516,11.219V678c0-0.55,0.45-1,1-1h1.334l0.35-1.052
-		C196.857,675.427,197.45,675,198,675h5c0.55,0,1.143,0.427,1.316,0.948l0.35,1.052H214c0.55,0,1,0.45,1,1v3h-15.5
-		C199.225,681,198.766,681.125,198.516,681.688z M223,682h-22c-0.55,0-1.167,0.418-1.371,0.929l-5.258,13.143
-		C194.167,696.582,194.45,697,195,697h22c0.55,0,1.167-0.418,1.371-0.929l5.258-13.143C223.833,682.418,223.55,682,223,682z"/>
-</g>
-<g id="database_x5F_ban">
-	<path d="M167.047,670c-2.73,0-4.953,2.223-4.953,4.953c0,2.731,2.223,4.953,4.953,4.953c2.731,0,4.953-2.222,4.953-4.953
-		C172,672.223,169.778,670,167.047,670z M167.047,671.238c0.729,0,1.408,0.215,1.981,0.579l-5.117,5.117
-		c-0.364-0.574-0.579-1.253-0.579-1.981C163.332,672.904,164.998,671.238,167.047,671.238z M167.047,678.668
-		c-0.729,0-1.406-0.214-1.98-0.577l5.118-5.119c0.363,0.575,0.577,1.253,0.577,1.981
-		C170.762,677.002,169.096,678.668,167.047,678.668z M160.882,691.666c0.069,0.109,0.118,0.22,0.118,0.334v3c0,1.104-3.357,2-7.5,2
-		s-7.5-0.896-7.5-2v-3c0-0.114,0.049-0.225,0.118-0.334c2.054,1.252,6.315,1.334,7.382,1.334S158.828,692.918,160.882,691.666z
-		 M153.5,688c-1.066,0-5.328-0.082-7.382-1.334c-0.069,0.109-0.118,0.22-0.118,0.334v3c0,1.104,3.357,2,7.5,2s7.5-0.896,7.5-2v-3
-		c0-0.114-0.049-0.225-0.118-0.334C158.828,687.918,154.566,688,153.5,688z M153.5,683c-1.066,0-5.328-0.082-7.382-1.334
-		c-0.069,0.109-0.118,0.22-0.118,0.334v3c0,1.104,3.357,2,7.5,2s7.5-0.896,7.5-2v-3c0-0.114-0.049-0.225-0.118-0.334
-		C158.828,682.918,154.566,683,153.5,683z M161,677v3c0,1.104-3.357,2-7.5,2s-7.5-0.896-7.5-2v-3c0-1.104,3.357-2,7.5-2
-		S161,675.896,161,677z M156.729,676.5c0-0.356-1.445-0.646-3.229-0.646s-3.229,0.289-3.229,0.646s1.445,0.646,3.229,0.646
-		S156.729,676.856,156.729,676.5z"/>
-</g>
-<g id="database_x5F_minus">
-	<path d="M112.882,691.666c0.069,0.109,0.118,0.22,0.118,0.334v3c0,1.104-3.357,2-7.5,2s-7.5-0.896-7.5-2v-3
-		c0-0.114,0.049-0.225,0.118-0.334c2.054,1.252,6.315,1.334,7.382,1.334S110.828,692.918,112.882,691.666z M105.5,688
-		c-1.066,0-5.328-0.082-7.382-1.334C98.049,686.775,98,686.886,98,687v3c0,1.104,3.357,2,7.5,2s7.5-0.896,7.5-2v-3
-		c0-0.114-0.049-0.225-0.118-0.334C110.828,687.918,106.566,688,105.5,688z M105.5,683c-1.066,0-5.328-0.082-7.382-1.334
-		C98.049,681.775,98,681.886,98,682v3c0,1.104,3.357,2,7.5,2s7.5-0.896,7.5-2v-3c0-0.114-0.049-0.225-0.118-0.334
-		C110.828,682.918,106.566,683,105.5,683z M113,677v3c0,1.104-3.357,2-7.5,2s-7.5-0.896-7.5-2v-3c0-1.104,3.357-2,7.5-2
-		S113,675.896,113,677z M108.729,676.5c0-0.356-1.445-0.646-3.229-0.646s-3.229,0.289-3.229,0.646s1.445,0.646,3.229,0.646
-		S108.729,676.856,108.729,676.5z M120,670c-2.761,0-5,1.711-5,5s2.239,5,5,5c2.762,0,5-2.04,5-4.802S122.762,670,120,670z
-		 M123,675.5c0,0.275-0.225,0.5-0.5,0.5h-5c-0.275,0-0.5-0.225-0.5-0.5v-1c0-0.275,0.225-0.5,0.5-0.5h5c0.275,0,0.5,0.225,0.5,0.5
-		V675.5z"/>
-</g>
-<g id="database_x5F_plus">
-	<path d="M64.882,691.666C64.951,691.775,65,691.886,65,692v3c0,1.104-3.357,2-7.5,2s-7.5-0.896-7.5-2v-3
-		c0-0.114,0.049-0.225,0.118-0.334C52.172,692.918,56.434,693,57.5,693S62.828,692.918,64.882,691.666z M57.5,688
-		c-1.066,0-5.328-0.082-7.382-1.334C50.049,686.775,50,686.886,50,687v3c0,1.104,3.357,2,7.5,2s7.5-0.896,7.5-2v-3
-		c0-0.114-0.049-0.225-0.118-0.334C62.828,687.918,58.566,688,57.5,688z M57.5,683c-1.066,0-5.328-0.082-7.382-1.334
-		C50.049,681.775,50,681.886,50,682v3c0,1.104,3.357,2,7.5,2s7.5-0.896,7.5-2v-3c0-0.114-0.049-0.225-0.118-0.334
-		C62.828,682.918,58.566,683,57.5,683z M65,677v3c0,1.104-3.357,2-7.5,2s-7.5-0.896-7.5-2v-3c0-1.104,3.357-2,7.5-2
-		S65,675.896,65,677z M60.729,676.5c0-0.356-1.445-0.646-3.229-0.646s-3.229,0.289-3.229,0.646s1.445,0.646,3.229,0.646
-		S60.729,676.856,60.729,676.5z M72,670c-2.761,0-5,2.016-5,5c0,3.206,2.239,5,5,5c2.762,0,5-2.238,5-5S74.762,670,72,670z
-		 M75,675.5c0,0.275-0.225,0.5-0.5,0.5H73v1.5c0,0.275-0.225,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5V676h-1.5
-		c-0.275,0-0.5-0.225-0.5-0.5v-1c0-0.275,0.225-0.5,0.5-0.5H71v-1.5c0-0.275,0.225-0.5,0.5-0.5h1c0.275,0,0.5,0.225,0.5,0.5v1.5h1.5
-		c0.275,0,0.5,0.225,0.5,0.5V675.5z"/>
-</g>
-<g id="database_x5F_lock">
-	<path d="M27.809,673H27v-2.551c0-0.744-0.715-1.449-1.453-1.449h-3.132c-0.739,0-1.415,0.705-1.415,1.449V673h-0.828
-		c-0.088,0-0.172,0.104-0.172,0.182v5.661c0,0.078,0.084,0.157,0.172,0.157h7.637c0.088,0,0.191-0.079,0.191-0.157v-5.661
-		C28,673.104,27.896,673,27.809,673z M22,670.449c0-0.338,0.096-0.449,0.428-0.449h3.106c0.331,0,0.466,0.111,0.466,0.449V673h-4
-		V670.449z M16.882,691.666C16.951,691.775,17,691.886,17,692v3c0,1.104-3.357,2-7.5,2S2,696.104,2,695v-3
-		c0-0.114,0.049-0.225,0.118-0.334C4.172,692.918,8.434,693,9.5,693S14.828,692.918,16.882,691.666z M9.5,688
-		c-1.066,0-5.328-0.082-7.382-1.334C2.049,686.775,2,686.886,2,687v3c0,1.104,3.357,2,7.5,2s7.5-0.896,7.5-2v-3
-		c0-0.114-0.049-0.225-0.118-0.334C14.828,687.918,10.566,688,9.5,688z M9.5,683c-1.066,0-5.328-0.082-7.382-1.334
-		C2.049,681.775,2,681.886,2,682v3c0,1.104,3.357,2,7.5,2s7.5-0.896,7.5-2v-3c0-0.114-0.049-0.225-0.118-0.334
-		C14.828,682.918,10.566,683,9.5,683z M17,677v3c0,1.104-3.357,2-7.5,2S2,681.104,2,680v-3c0-1.104,3.357-2,7.5-2S17,675.896,17,677
-		z M12.729,676.5c0-0.356-1.445-0.646-3.229-0.646s-3.229,0.289-3.229,0.646s1.445,0.646,3.229,0.646S12.729,676.856,12.729,676.5z"
-		/>
-</g>
-<g id="adjust_x5F_alt">
-	<path d="M449,634h-1v-9h-3v9h-1c-0.55,0-1,0.45-1,1v3c0,0.55,0.45,1,1,1h1h3h1c0.55,0,1-0.45,1-1v-3C450,634.45,449.55,634,449,634
-		z M449,637h-5v-0.5h5V637z"/>
-	<path d="M457,629h-1v-4h-3v4h-1c-0.55,0-1,0.45-1,1v3c0,0.55,0.45,1,1,1h1h3h1c0.55,0,1-0.45,1-1v-3C458,629.45,457.55,629,457,629
-		z M457,632h-5v-0.5h5V632z"/>
-	<rect x="445" y="640" width="3" height="9"/>
-	<path d="M441,639h-1v-14h-3v14h-1c-0.55,0-1,0.45-1,1v3c0,0.55,0.45,1,1,1h1h3h1c0.55,0,1-0.45,1-1v-3
-		C442,639.45,441.55,639,441,639z M441,642h-5v-0.5h5V642z"/>
-	<rect x="453" y="635" width="3" height="14"/>
-	<rect x="437" y="645" width="3" height="4"/>
-</g>
-<g id="picture_1_">
-	<path d="M409.125,627h-22.25c-0.483,0-0.875,0.392-0.875,0.875v18.25c0,0.483,0.392,0.875,0.875,0.875h22.25
-		c0.483,0,0.875-0.392,0.875-0.875v-18.25C410,627.392,409.608,627,409.125,627z M408,638.578L404.474,635c0,0-0.974-1-1.942-1
-		s-1.91,1-1.91,1s-2.637,3.011-3.631,4.004c1.604,0.684,4.03,4.635,2.176,3.456c-1.854-1.179-5.104-2.459-5.104-2.459L388,644v-15
-		h20V638.578z M389.813,633c0-1.205,0.979-2.187,2.187-2.187s2.187,0.981,2.187,2.187s-0.979,2.187-2.187,2.187
-		S389.813,634.205,389.813,633z"/>
-</g>
-<g id="cogwheels_1_">
-	<g id="cogwheel_2_">
-		<path d="M356.811,638.599c0.065-0.505,0.11-1.016,0.11-1.539s-0.045-1.034-0.11-1.539l-3.157-0.79
-			c-0.205-0.768-0.507-1.494-0.896-2.167l1.673-2.787c-0.63-0.817-1.361-1.549-2.179-2.179l-2.787,1.673
-			c-0.673-0.389-1.399-0.69-2.167-0.896l-0.79-3.157c-0.505-0.065-1.016-0.11-1.539-0.11s-1.034,0.045-1.539,0.11l-0.79,3.157
-			c-0.767,0.205-1.493,0.507-2.165,0.896l-2.788-1.674c-0.817,0.63-1.549,1.361-2.179,2.179l1.673,2.787
-			c-0.39,0.673-0.691,1.399-0.896,2.168l-3.157,0.79c-0.065,0.505-0.11,1.016-0.11,1.539s0.045,1.034,0.11,1.539l3.157,0.79
-			c0.205,0.768,0.507,1.495,0.896,2.167l-1.674,2.787c0.63,0.817,1.361,1.549,2.179,2.179l2.787-1.673
-			c0.673,0.389,1.399,0.69,2.167,0.896l0.79,3.157c0.505,0.065,1.016,0.11,1.539,0.11s1.034-0.045,1.539-0.11l0.79-3.157
-			c0.769-0.206,1.495-0.507,2.168-0.896l2.788,1.673c0.816-0.63,1.548-1.361,2.178-2.179l-1.674-2.787
-			c0.389-0.673,0.69-1.398,0.896-2.166L356.811,638.599z M344.969,641.24c-2.309,0-4.181-1.872-4.181-4.181s1.872-4.181,4.181-4.181
-			s4.181,1.872,4.181,4.181S347.277,641.24,344.969,641.24z"/>
-	</g>
-	<path d="M361,651.732c-0.25,0-0.496-0.021-0.738-0.053l-0.379-1.515l-0.056-0.016c-0.326-0.093-0.641-0.224-0.935-0.387
-		l-0.051-0.028l-1.337,0.803c-0.421-0.331-0.756-0.671-1.046-1.047l0.802-1.337l-0.028-0.051c-0.165-0.297-0.295-0.611-0.385-0.934
-		l-0.016-0.056l-1.516-0.379c-0.034-0.278-0.053-0.507-0.053-0.74c0-0.25,0.021-0.496,0.053-0.738l1.516-0.379l0.016-0.056
-		c0.09-0.321,0.22-0.636,0.386-0.935l0.028-0.051l-0.803-1.338c0.328-0.417,0.667-0.752,1.047-1.045l1.337,0.802l0.051-0.028
-		c0.297-0.165,0.611-0.295,0.934-0.385l0.056-0.016l0.379-1.516c0.278-0.034,0.507-0.053,0.738-0.053
-		c0.252,0,0.496,0.021,0.74,0.053l0.379,1.516l0.056,0.016c0.322,0.09,0.637,0.22,0.934,0.385l0.051,0.028l1.336-0.802
-		c0.421,0.331,0.757,0.669,1.048,1.045l-0.803,1.338l0.028,0.051c0.163,0.294,0.294,0.608,0.387,0.935l0.016,0.056l1.515,0.379
-		c0.034,0.278,0.053,0.507,0.053,0.738c0,0.252-0.021,0.498-0.053,0.74l-1.515,0.379l-0.016,0.056
-		c-0.094,0.326-0.224,0.641-0.387,0.934l-0.027,0.051l0.802,1.336c-0.331,0.421-0.669,0.757-1.045,1.048l-1.337-0.804l-0.051,0.028
-		c-0.293,0.163-0.607,0.294-0.936,0.388l-0.056,0.016l-0.379,1.515C361.461,651.714,361.233,651.732,361,651.732z M361,643.848
-		c-1.184,0-2.146,0.963-2.146,2.146c0,1.185,0.963,2.148,2.146,2.148c1.185,0,2.148-0.964,2.148-2.148
-		C363.148,644.811,362.185,643.848,361,643.848z"/>
-</g>
-<g id="cogwheel">
-	<path d="M313.794,638.491c0.065-0.505,0.11-1.016,0.11-1.539s-0.045-1.034-0.11-1.539l-3.157-0.79
-		c-0.205-0.768-0.507-1.494-0.896-2.167l1.673-2.787c-0.63-0.817-1.361-1.549-2.179-2.179l-2.787,1.673
-		c-0.673-0.389-1.399-0.69-2.167-0.896l-0.79-3.157c-0.505-0.065-1.016-0.11-1.539-0.11s-1.034,0.045-1.539,0.11l-0.79,3.157
-		c-0.767,0.205-1.493,0.507-2.165,0.896l-2.788-1.674c-0.817,0.63-1.549,1.361-2.179,2.179l1.673,2.787
-		c-0.39,0.673-0.691,1.399-0.896,2.168l-3.157,0.79c-0.065,0.505-0.11,1.016-0.11,1.539s0.045,1.034,0.11,1.539l3.157,0.79
-		c0.205,0.768,0.507,1.495,0.896,2.167l-1.674,2.787c0.63,0.817,1.361,1.549,2.179,2.179l2.787-1.673
-		c0.673,0.389,1.399,0.69,2.167,0.896l0.79,3.157c0.505,0.065,1.016,0.11,1.539,0.11s1.034-0.045,1.539-0.11l0.79-3.157
-		c0.769-0.206,1.495-0.507,2.168-0.896l2.788,1.673c0.816-0.63,1.548-1.361,2.178-2.179l-1.674-2.787
-		c0.389-0.673,0.69-1.398,0.896-2.166L313.794,638.491z M301.952,641.133c-2.309,0-4.181-1.872-4.181-4.181s1.872-4.181,4.181-4.181
-		s4.181,1.872,4.181,4.181S304.261,641.133,301.952,641.133z"/>
-</g>
-<g id="inbox_x5F_out">
-	<path d="M265.98,638c-0.002,0,0-0.151-0.014-0.193l-3.723-11.371c-0.088-0.27-0.387-0.436-0.665-0.436h-2.833l2.254,3h-1l3.095,9
-		H259l-2,5h-6l-2-5h-4.095l3.095-9h-1l2.219-3h-2.798c-0.278,0-0.577,0.221-0.665,0.49l-3.723,11.316
-		c-0.014,0.042-0.012,0.193-0.014,0.193H242v8.5v1.5v0.5c0,0.275,0.225,0.5,0.5,0.5h23c0.275,0,0.5-0.225,0.5-0.5V648v-1.5v-7.594
-		V638H265.98z M258.849,629H256v6.736c0,0.275-0.225,0.264-0.5,0.264h-3c-0.275,0-0.5,0.012-0.5-0.264V629h-2.827
-		c-0.148,0-0.195-0.082-0.104-0.199l4.793-5.637c0.051-0.066,0.119-0.073,0.186-0.073c0.053,0,0.104,0.038,0.144,0.091l4.764,5.623
-		C259.045,628.923,258.997,629,258.849,629z"/>
-</g>
-<g id="inbox_x5F_in">
-	<path d="M217.967,637.807l-3.723-11.371c-0.088-0.27-0.387-0.436-0.665-0.436H209v3h3.062l3.032,9H211l-2,5h-6l-2-5h-4.095l3.032-9
-		H203v-3h-4.579c-0.278,0-0.577,0.221-0.665,0.49l-3.723,11.316C194.02,637.849,194,648.5,194,648.5c0,0.275,0.225,0.5,0.5,0.5h23
-		c0.275,0,0.5-0.225,0.5-0.5C218,648.5,217.979,637.843,217.967,637.807z"/>
-	<path d="M210.849,630H208v-6.5c0-0.275-0.225-0.5-0.5-0.5h-3c-0.275,0-0.5,0.225-0.5,0.5v6.5h-2.827
-		c-0.148,0-0.195,0.2-0.104,0.317l4.793,5.696c0.051,0.065,0.119,0.103,0.186,0.103c0.053,0,0.104-0.023,0.144-0.076l4.764-5.734
-		C211.045,630.188,210.997,630,210.849,630z"/>
-</g>
-<g id="inbox_x5F_lock">
-	<path d="M172,625.182v5.661c0,0.078-0.104,0.157-0.191,0.157h-7.637c-0.088,0-0.172-0.079-0.172-0.157v-5.661
-		c0-0.078,0.084-0.182,0.172-0.182H165v-2.551c0-0.744,0.676-1.449,1.415-1.449h3.132c0.738,0,1.453,0.705,1.453,1.449V625h0.809
-		C171.896,625,172,625.104,172,625.182z M166,625h4v-2.551c0-0.338-0.135-0.449-0.466-0.449h-3.106
-		c-0.332,0-0.428,0.111-0.428,0.449V625z M169.967,637.807L168.721,634h-2.973l1.347,4H163l-2,5h-6l-2-5h-4.095l3.032-9H161v-3
-		h-10.579c-0.278,0-0.577,0.221-0.665,0.49l-3.723,11.316C146.02,637.849,146,648.5,146,648.5c0,0.275,0.225,0.5,0.5,0.5h23
-		c0.275,0,0.5-0.225,0.5-0.5C170,648.5,169.98,637.849,169.967,637.807z"/>
-</g>
-<g id="inbox_x5F_minus">
-	<path d="M121.967,637.807L120.721,634h-2.973l1.347,4H115l-2,5h-6l-2-5h-4.095l3.032-9H113v-3h-10.579
-		c-0.278,0-0.577,0.221-0.665,0.49l-3.723,11.316C98.02,637.849,98,648.5,98,648.5c0,0.275,0.225,0.5,0.5,0.5h23
-		c0.275,0,0.5-0.225,0.5-0.5C122,648.5,121.98,637.849,121.967,637.807z M120,622c-2.761,0-5,1.711-5,5s2.239,5,5,5
-		c2.762,0,5-2.04,5-4.802S122.762,622,120,622z M123,627.5c0,0.275-0.225,0.5-0.5,0.5h-5c-0.275,0-0.5-0.225-0.5-0.5v-1
-		c0-0.275,0.225-0.5,0.5-0.5h5c0.275,0,0.5,0.225,0.5,0.5V627.5z"/>
-</g>
-<g id="inbox_x5F_plus">
-	<path d="M74,648.5c0,0.275-0.225,0.5-0.5,0.5h-23c-0.275,0-0.5-0.225-0.5-0.5c0,0,0.02-10.651,0.033-10.693l3.723-11.316
-		c0.088-0.27,0.387-0.49,0.665-0.49H65v3h-9.062l-3.032,9H57l2,5h6l2-5h4.095l-1.347-4h2.973l1.246,3.807
-		C73.98,637.849,74,648.5,74,648.5z M72,622c-2.761,0-5,2.016-5,5c0,3.206,2.239,5,5,5c2.762,0,5-2.238,5-5S74.762,622,72,622z
-		 M75,627.5c0,0.275-0.225,0.5-0.5,0.5H73v1.5c0,0.275-0.225,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5V628h-1.5
-		c-0.275,0-0.5-0.225-0.5-0.5v-1c0-0.275,0.225-0.5,0.5-0.5H71v-1.5c0-0.275,0.225-0.5,0.5-0.5h1c0.275,0,0.5,0.225,0.5,0.5v1.5h1.5
-		c0.275,0,0.5,0.225,0.5,0.5V627.5z"/>
-</g>
-<g id="inbox">
-	<path d="M25.967,637.807l-3.723-11.371c-0.088-0.27-0.387-0.436-0.665-0.436H6.421c-0.278,0-0.577,0.221-0.665,0.49l-3.723,11.316
-		C2.02,637.849,2,648.5,2,648.5c0,0.275,0.225,0.5,0.5,0.5h23c0.275,0,0.5-0.225,0.5-0.5C26,648.5,25.98,637.849,25.967,637.807z
-		 M7.938,629h12.125l3.032,9H19l-2,5h-6l-2-5H4.905L7.938,629z"/>
-</g>
-<g id="message_x5F_new">
-	<path d="M461.8,582h-1.86l1.206-1.097c0.078-0.079,0.078-0.153,0-0.231l-0.848-0.82c-0.079-0.079-0.106-0.065-0.187,0.014
-		L459,581.091v-1.872c0-0.11-0.29-0.219-0.4-0.219H457.4c-0.11,0-0.4,0.108-0.4,0.219v1.865l-1.107-1.206
-		c-0.078-0.079-0.158-0.079-0.236,0l-0.822,0.847c-0.08,0.078-0.067,0.099,0.013,0.178l1.219,1.098H454.2
-		c-0.11,0-0.2,0.309-0.2,0.419v1.199c0,0.11,0.09,0.382,0.2,0.382h1.872l-1.213,1.121c-0.078,0.078-0.078,0.162,0,0.242l0.848,0.823
-		c0.079,0.078,0.109,0.067,0.188-0.011l1.105-1.218v1.86c0,0.11,0.29,0.182,0.4,0.182h1.199c0.11,0,0.4-0.071,0.4-0.182v-1.865
-		l1.109,1.209c0.08,0.079,0.158,0.079,0.237,0l0.822-0.847c0.078-0.078,0.065-0.117-0.013-0.196L459.935,584h1.865
-		c0.11,0,0.2-0.271,0.2-0.382v-1.199C462,582.309,461.91,582,461.8,582z M440,593l-6,6v-12L440,593z M446,597l-12-12h18.35
-		c0.465,1.307,1.367,2.404,2.533,3.117L446,597z M456.26,588.74c0.551,0.168,1.135,0.26,1.74,0.26v10l-6-6L456.26,588.74z M451,594
-		l7,7h-24l7-7l5,5L451,594z"/>
-</g>
-<g id="message_x5F_lock">
-	<path d="M414,581.182v5.661c0,0.078-0.104,0.157-0.191,0.157h-7.637c-0.088,0-0.172-0.079-0.172-0.157v-5.661
-		c0-0.078,0.084-0.182,0.172-0.182H407v-2.551c0-0.744,0.676-1.449,1.415-1.449h3.132c0.738,0,1.453,0.705,1.453,1.449V581h0.809
-		C413.896,581,414,581.104,414,581.182z M408,581h4v-2.551c0-0.338-0.135-0.449-0.466-0.449h-3.106
-		c-0.332,0-0.428,0.111-0.428,0.449V581z M386,587v12l6-6L386,587z M406.016,588.984c-1.123-0.081-2.016-1.006-2.016-2.142V585h-18
-		l12,12L406.016,588.984z M398,599l-5-5l-7,7h24l-7-7L398,599z M408,589l-4,4l6,6v-10H408z"/>
-</g>
-<g id="message_x5F_flag">
-	<polygon points="350.029,599 345.029,594 338.029,601 362.029,601 355.029,594 	"/>
-	<path d="M350.029,597l-12-12H357v1.501c0,0.954,0.544,1.774,1.332,2.196L350.029,597z M360.072,588.928L356,593l6,6v-12
-		l-0.072,0.072C361.712,587.99,360.99,588.711,360.072,588.928z M365,578.499v3.002c0,0.274-0.208,0.582-0.463,0.685L360,584v2.501
-		c0,0.274-0.225,0.499-0.499,0.499h-0.002c-0.274,0-0.499-0.225-0.499-0.499V578h5.501C364.775,578,365,578.225,365,578.499z"/>
-	<polygon points="338,587 338,599 344,593 	"/>
-</g>
-<g id="message_x5F_ban">
-	<path d="M302,597l-12-12h17.24c0.436,1.77,1.447,3.105,2.813,3.946L302,597z M290,587v12l6-6L290,587z M308,593l6,6v-9
-		c-0.912,0-1.782-0.145-2.582-0.418L308,593z M302,599l-5-5l-7,7h24l-7-7L302,599z M319,583.019c0,2.731-2.222,4.953-4.953,4.953
-		c-2.73,0-4.953-2.222-4.953-4.953c0-2.73,2.223-4.953,4.953-4.953C316.778,578.065,319,580.288,319,583.019z M310.332,583.019
-		c0,0.729,0.215,1.407,0.579,1.981l5.117-5.117c-0.573-0.364-1.253-0.579-1.981-0.579
-		C311.998,579.304,310.332,580.97,310.332,583.019z M317.762,583.019c0-0.729-0.214-1.406-0.577-1.981l-5.118,5.119
-		c0.574,0.363,1.252,0.577,1.98,0.577C316.096,586.733,317.762,585.067,317.762,583.019z"/>
-</g>
-<g id="message_x5F_minus">
-	<polygon points="242,587 242,599 248,593 	"/>
-	<path d="M262.054,588.946c-1.366-0.841-2.378-2.177-2.813-3.946H242l12,12L262.054,588.946z"/>
-	<polygon points="254,599 249,594 242,601 266,601 259,594 	"/>
-	<path d="M260,593l6,6v-9c-0.912,0-1.782-0.145-2.582-0.418L260,593z"/>
-	<path d="M266,578c-2.761,0-5,1.711-5,5s2.239,5,5,5c2.762,0,5-2.04,5-4.802S268.762,578,266,578z M269,583.5
-		c0,0.275-0.225,0.5-0.5,0.5h-5c-0.275,0-0.5-0.225-0.5-0.5v-1c0-0.275,0.225-0.5,0.5-0.5h5c0.275,0,0.5,0.225,0.5,0.5V583.5z"/>
-</g>
-<g id="message_x5F_plus">
-	<polygon points="194,587 194,599 200,593 	"/>
-	<path d="M214.054,588.946c-1.366-0.841-2.378-2.177-2.813-3.946H194l12,12L214.054,588.946z"/>
-	<polygon points="206,599 201,594 194,601 218,601 211,594 	"/>
-	<path d="M212,593l6,6v-9c-0.912,0-1.782-0.145-2.582-0.418L212,593z"/>
-	<path d="M218,578c-2.761,0-5,2.016-5,5c0,3.206,2.239,5,5,5c2.762,0,5-2.238,5-5S220.762,578,218,578z M221,583.5
-		c0,0.275-0.225,0.5-0.5,0.5H219v1.5c0,0.275-0.225,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5V584h-1.5c-0.275,0-0.5-0.225-0.5-0.5
-		v-1c0-0.275,0.225-0.5,0.5-0.5h1.5v-1.5c0-0.275,0.225-0.5,0.5-0.5h1c0.275,0,0.5,0.225,0.5,0.5v1.5h1.5c0.275,0,0.5,0.225,0.5,0.5
-		V583.5z"/>
-</g>
-<g id="message_x5F_out">
-	<path d="M170,599l-7-7l7-7V599z M153,592l-7-7v14L153,592z M162,593h-8l-8,8h24L162,593z M158,573l-12,12h2l7,7h6l7-7h2L158,573z
-		 M162.839,584H160v4.604c0,0.282-0.16,0.396-0.441,0.396h-3.111c-0.282,0-0.447-0.114-0.447-0.396V584h-2.837
-		c-0.148,0-0.196-0.188-0.105-0.306l4.764-5.734c0.09-0.118,0.238-0.091,0.329,0.026l4.793,5.696
-		C163.034,583.8,162.987,584,162.839,584z"/>
-</g>
-<g id="message_x5F_in">
-	<path d="M122,585v14l-7-7L122,585z M106,593l-8,8h24l-8-8H106z M105,592l-7-7v14L105,592z M110,573l12,12h-2l-7,7h-6l-7-7h-2
-		L110,573z M111.564,578h-3.111c-0.281,0-0.453,0.114-0.453,0.396V583h-2.827c-0.148,0-0.195,0.2-0.104,0.317l4.793,5.696
-		c0.091,0.117,0.239,0.145,0.329,0.026l4.764-5.734c0.091-0.118,0.043-0.306-0.105-0.306H112v-4.604
-		C112,578.114,111.847,578,111.564,578z"/>
-</g>
-<g id="message_x5F_empty">
-	<polygon points="50,585 52,585 59,592 65,592 72,585 74,585 62,573 	"/>
-	<polygon points="57,592 50,585 50,599 	"/>
-	<polygon points="67,592 74,599 74,585 	"/>
-	<polygon points="58,593 50,601 74,601 66,593 	"/>
-</g>
-<g id="message_x5F_full">
-	<path d="M26,599l-7-7l7-7V599z M9,592l-7-7v14L9,592z M18,593h-8l-8,8h24L18,593z"/>
-	<polygon points="6.016,587.016 16,580 22.5,586.5 24,585 26,585 14,573 2,585 4,585 	"/>
-</g>
-<g id="table">
-	<g opacity="0.3">
-		<g>
-			<path d="M456,540v-1h-6v-3h-1v3h-6v-3h-1v3h-6v1h6v3h-6v1h6v3h-6v1h6v3h1v-3h6v3h1v-3h6v-1h-6v-3h6v-1h-6v-3H456z M449,547h-6v-3
-				h6V547z M449,543h-6v-3h6V543z"/>
-		</g>
-	</g>
-	<g>
-		<path d="M456,551h-20v-15h20V551z M456,534h-20v-3h20V534z M437,529c-1.65,0-3,1.35-3,3v18c0,1.65,1.35,3,3,3h18
-			c1.65,0,3-1.35,3-3v-18c0-1.65-1.35-3-3-3H437z"/>
-	</g>
-	<g opacity="0.3">
-		<g>
-			<rect x="436" y="531" width="20" height="3"/>
-		</g>
-	</g>
-</g>
-<g id="embed_x5F_close">
-	<path d="M394.246,553l9.414-24h2.486l-9.386,24H394.246z M383,542.63l11,6.359v-2.663l-7.887-4.445l7.887-4.208v-2.657l-11,6.118
-		V542.63z M405.938,537.205l-0.831,2.125l4.78,2.551l-7.411,4.178L402,547.273v1.716l11-6.359v-1.496L405.938,537.205z"/>
-</g>
-<g id="embed">
-	<path d="M365,541.134v1.496l-11,6.359v-2.663l7.887-4.445L354,537.673v-2.657L365,541.134z M335,541.134v1.496l11,6.359v-2.663
-		l-7.887-4.445l7.887-4.208v-2.657L335,541.134z"/>
-</g>
-<g id="text_x5F_bigger">
-	<path d="M310,530v5c0,0,0,0-0.996,0c-0.004-2-1.233-3-3.004-3h-4v18c0,1,2,1,3,1c0,1,0,1,0,1h-10c0,0,0,0,0-1c1,0,3,0,3-1v-18h-4
-		c-1.771,0-3,1-3.004,3C290,535,290,535,290,535v-5c0,0,1.865,0,3,0h14C308.135,530,310,530,310,530z M314,541h-3v-3h-2v3h-3v2h3v3
-		h2v-3h3V541z"/>
-</g>
-<g id="text_x5F_smaller">
-	<path d="M247,533h7c1.135,0,3,0,3,0v5c0,0,0,0-0.996,0c-0.004-2-1.233-3-3.004-3h-1v12c0,1,2,1,3,1c0,1,0,1,0,1h-9c0,0,0,0,0-1
-		c1,0,3,0,3-1v-12h-1c-1.771,0-3,1-3.004,3C244,538,244,538,244,538v-5C244,533,245.865,533,247,533z M258,543h8v-2h-8V543z"/>
-</g>
-<g id="list">
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M218,545.5c0,0.275-0.225,0.5-0.5,0.5h-18c-0.275,0-0.5-0.225-0.5-0.5v-2
-		c0-0.275,0.225-0.5,0.5-0.5h18c0.275,0,0.5,0.225,0.5,0.5V545.5z M197,543.5c0-0.275-0.225-0.5-0.5-0.5h-2
-		c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h2c0.275,0,0.5-0.225,0.5-0.5V543.5z M218,549.5
-		c0-0.275-0.225-0.5-0.5-0.5h-18c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h18c0.275,0,0.5-0.225,0.5-0.5V549.5z
-		 M197,549.5c0-0.275-0.225-0.5-0.5-0.5h-2c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h2c0.275,0,0.5-0.225,0.5-0.5
-		V549.5z M218,537.5c0-0.275-0.225-0.5-0.5-0.5h-18c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h18
-		c0.275,0,0.5-0.225,0.5-0.5V537.5z M197,537.5c0-0.275-0.225-0.5-0.5-0.5h-2c-0.275,0-0.5,0.225-0.5,0.5v2
-		c0,0.275,0.225,0.5,0.5,0.5h2c0.275,0,0.5-0.225,0.5-0.5V537.5z M218,531.5c0-0.275-0.225-0.5-0.5-0.5h-18
-		c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h18c0.275,0,0.5-0.225,0.5-0.5V531.5z M197,531.5
-		c0-0.275-0.225-0.5-0.5-0.5h-2c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h2c0.275,0,0.5-0.225,0.5-0.5V531.5z"/>
-</g>
-<g id="justify">
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M146,543.5c0-0.275,0.225-0.5,0.5-0.5h23c0.275,0,0.5,0.225,0.5,0.5v2
-		c0,0.275-0.225,0.5-0.5,0.5h-23c-0.275,0-0.5-0.225-0.5-0.5V543.5z M146,539.5c0,0.275,0.225,0.5,0.5,0.5h23
-		c0.275,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.225-0.5-0.5-0.5h-23c-0.275,0-0.5,0.225-0.5,0.5V539.5z M146,533.5
-		c0,0.275,0.225,0.5,0.5,0.5h23c0.275,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.225-0.5-0.5-0.5h-23c-0.275,0-0.5,0.225-0.5,0.5V533.5z
-		 M146,551.5c0,0.275,0.225,0.5,0.5,0.5h23c0.275,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.225-0.5-0.5-0.5h-23c-0.275,0-0.5,0.225-0.5,0.5
-		V551.5z"/>
-</g>
-<g id="align_x5F_right">
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M104.013,543.5c0-0.275,0.225-0.5,0.5-0.5H121.5c0.275,0,0.5,0.225,0.5,0.5v2
-		c0,0.275-0.225,0.5-0.5,0.5h-16.987c-0.275,0-0.5-0.225-0.5-0.5V543.5z M100.013,539.5c0,0.275,0.225,0.5,0.5,0.5H121.5
-		c0.275,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.225-0.5-0.5-0.5h-20.987c-0.275,0-0.5,0.225-0.5,0.5V539.5z M108.013,533.5
-		c0,0.275,0.225,0.5,0.5,0.5H121.5c0.275,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.225-0.5-0.5-0.5h-12.987c-0.275,0-0.5,0.225-0.5,0.5
-		V533.5z M98,551.5c0,0.275,0.225,0.5,0.5,0.5h23c0.275,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.225-0.5-0.5-0.5h-23
-		c-0.275,0-0.5,0.225-0.5,0.5V551.5z"/>
-</g>
-<g id="align_x5F_center">
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M54,543.5c0-0.275,0.225-0.5,0.5-0.5h15c0.275,0,0.5,0.225,0.5,0.5v2
-		c0,0.275-0.225,0.5-0.5,0.5h-15c-0.275,0-0.5-0.225-0.5-0.5V543.5z M50,539.5c0,0.275,0.225,0.5,0.5,0.5h23
-		c0.275,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.225-0.5-0.5-0.5h-23c-0.275,0-0.5,0.225-0.5,0.5V539.5z M54,533.5
-		c0,0.275,0.225,0.5,0.5,0.5h15c0.275,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.225-0.5-0.5-0.5h-15c-0.275,0-0.5,0.225-0.5,0.5V533.5z
-		 M50,551.5c0,0.275,0.225,0.5,0.5,0.5h23c0.275,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.225-0.5-0.5-0.5h-23c-0.275,0-0.5,0.225-0.5,0.5
-		V551.5z"/>
-</g>
-<g id="align_x5F_left">
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M19.987,545.5c0,0.275-0.225,0.5-0.5,0.5H2.5c-0.275,0-0.5-0.225-0.5-0.5v-2
-		c0-0.275,0.225-0.5,0.5-0.5h16.987c0.275,0,0.5,0.225,0.5,0.5V545.5z M23.987,537.5c0-0.275-0.225-0.5-0.5-0.5H2.5
-		c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h20.987c0.275,0,0.5-0.225,0.5-0.5V537.5z M15.987,531.5
-		c0-0.275-0.225-0.5-0.5-0.5H2.5c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h12.987c0.275,0,0.5-0.225,0.5-0.5V531.5z
-		 M26,549.5c0-0.275-0.225-0.5-0.5-0.5h-23c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h23c0.275,0,0.5-0.225,0.5-0.5
-		V549.5z"/>
-</g>
-<g id="right_x5F_indent">
-	<path d="M446,491.5c0,0.276-0.224,0.5-0.5,0.5h-11c-0.276,0-0.5-0.224-0.5-0.5v-2c0-0.276,0.224-0.5,0.5-0.5h11
-		c0.276,0,0.5,0.224,0.5,0.5V491.5z M434.5,487h6c0.275,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.225-0.5-0.5-0.5h-6
-		c-0.275,0-0.5,0.225-0.5,0.5v2C434,486.775,434.225,487,434.5,487z M434.5,497h8c0.275,0,0.5-0.225,0.5-0.5v-2
-		c0-0.275-0.225-0.5-0.5-0.5h-8c-0.275,0-0.5,0.225-0.5,0.5v2C434,496.775,434.225,497,434.5,497z M447.5,499h-13
-		c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h13c0.275,0,0.5-0.225,0.5-0.5v-2C448,499.225,447.775,499,447.5,499z
-		 M455,491l-3.333,2.5L455,496v-2h3v-1h-3V491z M449,504h2v-22h-2V504z"/>
-</g>
-<g id="left_x5F_indent">
-	<path d="M408,491.5c0,0.276-0.224,0.5-0.5,0.5h-11c-0.276,0-0.5-0.224-0.5-0.5v-2c0-0.276,0.224-0.5,0.5-0.5h11
-		c0.276,0,0.5,0.224,0.5,0.5V491.5z M396.5,487h6c0.275,0,0.5-0.225,0.5-0.5v-2c0-0.275-0.225-0.5-0.5-0.5h-6
-		c-0.275,0-0.5,0.225-0.5,0.5v2C396,486.775,396.225,487,396.5,487z M396.5,497h8c0.275,0,0.5-0.225,0.5-0.5v-2
-		c0-0.275-0.225-0.5-0.5-0.5h-8c-0.275,0-0.5,0.225-0.5,0.5v2C396,496.775,396.225,497,396.5,497z M409.5,499h-13
-		c-0.275,0-0.5,0.225-0.5,0.5v2c0,0.275,0.225,0.5,0.5,0.5h13c0.275,0,0.5-0.225,0.5-0.5v-2C410,499.225,409.775,499,409.5,499z
-		 M389,493h-3v1h3v2l3.333-2.5L389,491V493z M393,504h2v-22h-2V504z"/>
-</g>
-<g id="text_x5F_resize">
-	<path d="M343,484c-1.135,0-3,0-3,0v5c0,0,0,0,0.996,0c0.004-2,1.233-3,3.004-3h4v14c0,1-2,1-3,1c0,1,0,1,0,1h10c0,0,0,0,0-1
-		c-1,0-3,0-3-1v-14h4c1.771,0,3,1,3.004,3c0.996,0,0.996,0,0.996,0v-5c0,0-1.865,0-3,0H343z"/>
-	<path d="M363,483v-3h-3v1h-20v-1h-3v3h1v20h-1v3h3v-1h20v1h3v-3h-1v-20H363z M338,481h1v1h-1V481z M339,505h-1v-1h1V505z M360,504
-		h-20v-1h-1v-20h1v-1h20v1h1v20h-1V504z M362,505h-1v-1h1V505z M361,482v-1h1v1H361z"/>
-</g>
-<g id="text_x5F_width">
-	<path d="M296,483h4v15c0,1-2,1-3,1c0,1,0,1,0,1h10c0,0,0,0,0-1c-1,0-3,0-3-1v-15h4c1.771,0,3,1,3.004,3c0.996,0,0.996,0,0.996,0v-5
-		c0,0-1.865,0-3,0h-14c-1.135,0-3,0-3,0v5c0,0,0,0,0.996,0C293,484,294.229,483,296,483z"/>
-	<polygon points="312.333,502.5 309,500 309,502 295,502 295,500 291.667,502.5 295,505 295,503 309,503 309,505 	"/>
-</g>
-<g id="text_x5F_height">
-	<polygon points="246,484 243.5,480.667 241,484 243,484 243,500 241,500 243.5,503.333 246,500 244,500 244,484 	"/>
-	<path d="M264,481h-14c-1.135,0-3,0-3,0v5c0,0,0,0,0.996,0c0.004-2,1.233-3,3.004-3h4v18c0,1-2,1-3,1c0,1,0,1,0,1h10c0,0,0,0,0-1
-		c-1,0-3,0-3-1v-18h4c1.771,0,3,1,3.004,3c0.996,0,0.996,0,0.996,0v-5C267,481,265.135,481,264,481z"/>
-</g>
-<g id="text_x5F_strike">
-	<path d="M208,483v8h8v2h-8v8c0,1,2,1,3,1c0,1,0,1,0,1h-10c0,0,0,0,0-1c1,0,3,0,3-1v-8h-8v-2h8v-8h-4c-1.771,0-3,1-3.004,3
-		C196,486,196,486,196,486v-5h20v5c0,0,0,0-0.996,0c-0.004-2-1.233-3-3.004-3H208z"/>
-</g>
-<g id="text_x5F_underline">
-	<polygon points="148,504 148,505 168,505 168,504 168,503 148,503 	"/>
-	<path d="M148,481v5c0,0,0,0,0.996,0c0.004-2,1.233-3,3.004-3h4v16c0,1-2,1-3,1c0,1,0,1,0,1h10c0,0,0,0,0-1c-1,0-3,0-3-1v-16h4
-		c1.771,0,3,1,3.004,3c0.996,0,0.996,0,0.996,0v-5H148z"/>
-</g>
-<g id="bold">
-	<path d="M113.04,492.5c0,0,4.46-1.26,4.46-5.16c0-3.91-3.54-6.34-6.54-6.34H100v1.43c2,0.471,2,0.78,2,2.29v16.55
-		c0,1.131-1,1.79-2,1.95V505h10.92c3.1,0,7.852-1.811,7.852-6.12C118.771,493.88,113.04,492.5,113.04,492.5z M107,484
-		c0,0,0.96,0,2.96,0s2.601,1.76,2.601,3.5c0,1.729-0.601,3.5-2.601,3.5s-2.96,0-2.96,0V484z M109.99,502H107v-8c0,0,0.43,0,2.96,0
-		s3.67,1.995,3.67,4.345C113.63,500.685,112.21,502,109.99,502z"/>
-</g>
-<g id="italic">
-	<path d="M68.048,482.144L68.024,481h-4.718H60v1.144c2,0.538,1.807,0.743,1.503,2.468l-3.192,16.822
-		c-0.229,1.293-1.311,2.244-3.311,2.423V505h9v-1.144c-1-0.179-1.978-1.13-1.749-2.423l2.835-16.822
-		C65.391,482.887,65.667,482.682,68.048,482.144z"/>
-</g>
-<g id="font">
-	<g id="XMLID_1_">
-		<path d="M24,502.729V504h-8c0,0,0-0.682,0-1.271c1.438,0,1.922-1.479,1.533-2.534c-0.283-0.773-1.58-4.258-1.58-4.258h-7.5
-			c0,0-1.102,2.791-1.762,4.505s0.887,2.287,2.309,2.287C9,503.531,9,504,9,504H2v-1.271c0,0,1.078-0.46,1.608-0.988
-			s0.991-1.438,0.991-1.438L12.263,481h1.785l7.384,19.139c0,0,0.385,0.967,1.151,1.773C23.351,502.719,24,502.729,24,502.729z
-			 M15.482,494l-2.224-6.073l-0.876-2.687L8.955,494H15.482z"/>
-	</g>
-	<g id="XMLID_2_" opacity="0.5">
-		<path d="M29,490.42V491h-4v-0.58l1.095-0.5l-0.76-2l-3.524,0.005l-0.91,2.01L22,490.4v0.6h-3v-0.6l0.93-0.46l3.756-8.94H24.5
-			l3.64,8.96L29,490.42z M25.154,487l-1.014-2.805l-0.4-1.21L22.175,487H25.154z"/>
-	</g>
-</g>
-<g id="vector_x5F_path_x5F_all">
-	<path d="M458,437v-4h-4v1h-6v-1h-4v1h-6v-1h-4v4h1v6h-1v4h1v6h-1v4h4v-1h6v1h4v-1h6v1h4v-4h-1v-6h1v-4h-1v-6H458z M445,434h2v2h-2
-		V434z M435,434h2v2h-2V434z M435,444h2v2h-2V444z M437,456h-2v-2h2V456z M447,456h-2v-2h2V456z M454,454h-6v-1h-4v1h-6v-1h-1v-6h1
-		v-4h-1v-6h1v-1h6v1h4v-1h6v1h1v6h-1v4h1v6h-1V454z M457,456h-2v-2h2V456z M457,446h-2v-2h2V446z M455,436v-2h2v2H455z"/>
-</g>
-<g id="vector_x5F_path_x5F_curve">
-	<path d="M406,433v1.356c-9.516,1.664-16.979,9.128-18.643,18.644H386v4h4v-4h-0.605c1.615-8.406,8.199-14.991,16.605-16.606V437h4
-		v-4H406z M389,456h-2v-2h2V456z M409,436h-2v-2h2V436z"/>
-</g>
-<g id="vector_x5F_path_x5F_line">
-	<path d="M358,433v2.586L340.586,453H338v4h4v-2.586L359.414,437H362v-4H358z M341,456h-2v-2h2V456z M361,436h-2v-2h2V436z"/>
-</g>
-<g id="vector_x5F_path_x5F_polygon">
-	<g>
-		<path d="M311.98,440l-7.98-5.744V432h-4v2.259L292.049,440H289v4h1.489l2.946,9H293v4h4v-1h10v1h4v-4h-0.438l2.94-9H315v-4H311.98
-			z M292,443h-2v-2h2V443z M301,433h2v2h-2V433z M296,456h-2v-2h2V456z M310,456h-2v-2h2V456z M308.459,453H307v1h-10v-1h-1.459
-			l-2.947-9H293v-2.22l8.004-5.78h1.997l7.999,5.759V444h0.399L308.459,453z M314,443h-2v-2h2V443z"/>
-	</g>
-	<polygon opacity="0.3" points="307,454 307,453 308.459,453 310.656,446.274 311.399,444 311,444 311,441.759 306.137,438.258 
-		303.001,436 301.004,436 297.43,438.581 293,441.78 293,444 292.594,444 293.322,446.224 295.541,453 297,453 297,454 	"/>
-</g>
-<g id="vector_x5F_path_x5F_circle">
-	<g>
-		<path d="M264.809,443c-0.824-4.463-4.346-7.984-8.809-8.809V433h-4v1.191c-4.463,0.824-7.984,4.346-8.809,8.809H242v4h1.191
-			c0.824,4.463,4.346,7.984,8.809,8.809V457h4v-1.191c4.463-0.824,7.984-4.346,8.809-8.809H266v-4H264.809z M253,434h2v2h-2V434z
-			 M245,446h-2v-2h2V446z M255,456h-2v-2h2V456z M262.768,447c-0.766,3.357-3.41,6.002-6.768,6.769V453h-4v0.769
-			c-3.357-0.767-6.002-3.411-6.768-6.769H246v-4h-0.768c0.766-3.357,3.41-6.002,6.768-6.769V437h4v-0.769
-			c3.357,0.767,6.002,3.411,6.768,6.769H262v4H262.768z M265,446h-2v-2h2V446z"/>
-	</g>
-	<path opacity="0.3" d="M262,447v-4h0.768c-0.094-0.411-0.217-0.811-0.365-1.198c-0.005-0.014-0.01-0.026-0.015-0.04
-		c-0.299-0.772-0.703-1.492-1.191-2.144c-0.015-0.02-0.029-0.039-0.043-0.059c-0.491-0.645-1.067-1.22-1.711-1.711
-		c-0.021-0.016-0.042-0.031-0.062-0.047c-0.649-0.486-1.366-0.889-2.135-1.187c-0.019-0.008-0.039-0.015-0.058-0.021
-		c-0.382-0.146-0.776-0.268-1.182-0.36c-0.002-0.001-0.004-0.001-0.006-0.002V437h-4v-0.769c-0.002,0.001-0.004,0.001-0.006,0.002
-		c-0.405,0.093-0.799,0.215-1.182,0.36c-0.019,0.008-0.039,0.014-0.058,0.021c-0.769,0.298-1.485,0.7-2.135,1.187
-		c-0.021,0.016-0.042,0.031-0.062,0.047c-0.644,0.491-1.22,1.066-1.711,1.711c-0.015,0.02-0.029,0.039-0.043,0.059
-		c-0.489,0.651-0.892,1.371-1.191,2.144c-0.005,0.013-0.01,0.027-0.015,0.04c-0.148,0.388-0.271,0.787-0.365,1.198H246v4h-0.768
-		c0.094,0.411,0.217,0.811,0.365,1.197c0.005,0.014,0.01,0.028,0.015,0.042c0.299,0.771,0.702,1.491,1.191,2.143
-		c0.015,0.02,0.029,0.039,0.043,0.059c0.491,0.645,1.067,1.22,1.711,1.711c0.021,0.016,0.042,0.031,0.062,0.047
-		c0.649,0.486,1.366,0.888,2.134,1.187c0.02,0.008,0.04,0.015,0.059,0.021c0.382,0.146,0.776,0.268,1.181,0.36
-		c0.002,0.001,0.004,0.001,0.006,0.002V453h4v0.769c0.002-0.001,0.004-0.001,0.006-0.002c0.405-0.093,0.799-0.215,1.181-0.36
-		c0.019-0.007,0.039-0.014,0.058-0.021c0.769-0.298,1.485-0.7,2.135-1.187c0.021-0.016,0.042-0.031,0.062-0.047
-		c0.644-0.491,1.22-1.066,1.711-1.711c0.015-0.02,0.029-0.039,0.043-0.059c0.489-0.651,0.893-1.371,1.191-2.144
-		c0.005-0.013,0.01-0.026,0.015-0.04c0.148-0.388,0.271-0.787,0.365-1.198H262z"/>
-</g>
-<g id="vector_x5F_path_x5F_square">
-	<g>
-		<path d="M218,437v-4h-4v1h-16v-1h-4v4h1v16h-1v4h4v-1h16v1h4v-4h-1v-16H218z M215,434h2v2h-2V434z M195,434h2v2h-2V434z M197,456
-			h-2v-2h2V456z M217,456h-2v-2h2V456z M215,453h-1v1h-16v-1h-1v-16h1v-1h16v1h1V453z"/>
-	</g>
-	<polygon opacity="0.3" points="214,454 214,453 215,453 215,437 214,437 214,436 198,436 198,437 197,437 197,453 198,453 198,454 
-			"/>
-</g>
-<g id="crop">
-	<path d="M167,450v-10v-2.586l3.707-3.707l-1.414-1.414L165.586,436H163h-10v-3h-4v3v4v10v4h4h10h4h4v-4H167z M161.586,440
-		L153,448.586V440H161.586z M154.414,450l8.586-8.586V450H154.414z M145,436h3v4h-3V436z M163,455h4v3h-4V455z"/>
-</g>
-<g id="tint">
-	<path d="M98.893,449.092c0,4.349,4.128,6.971,7.68,6.971s7.68-2.673,7.68-7.021c0-5.933-5.813-9.327-7.68-15.569
-		C104.626,439.715,98.893,443.16,98.893,449.092z M104.573,452.511c-2.183-0.104-3.614-1.767-3.625-3.42s0.885-3.772,1.648-5.08
-		c0.498-0.917,1.482-0.714,1.261,0c-0.436,1.317-0.67,3.324-0.67,4.864c0,1.123,0.553,2.209,1.386,2.581
-		S105.615,452.459,104.573,452.511z"/>
-	<path d="M113.664,439.81c0,2.174,2.064,3.485,3.84,3.485s3.84-1.337,3.84-3.511c0-2.966-2.906-4.663-3.84-7.784
-		C116.53,435.121,113.664,436.844,113.664,439.81z M116.504,441.519c-1.091-0.052-1.807-0.883-1.812-1.709
-		c-0.005-0.827,0.442-1.887,0.824-2.541c0.249-0.458,0.741-0.356,0.63,0c-0.218,0.659-0.335,1.662-0.335,2.433
-		c0,0.562,0.276,1.104,0.693,1.29C116.92,441.178,117.025,441.493,116.504,441.519z"/>
-</g>
-<g id="adjust_2_">
-	<path d="M62,432.75c-6.755,0-12.25,5.495-12.25,12.25s5.495,12.25,12.25,12.25s12.25-5.495,12.25-12.25S68.755,432.75,62,432.75z
-		 M52.289,445c0-5.036,3.711-9.191,8.711-9.736v19.473C56,454.191,52.289,450.036,52.289,445z"/>
-</g>
-<g id="eyedropper">
-	<path d="M24.031,439.378c1.251-1.252,2.461-2.912,0.707-4.667l-0.707-0.707c-1.775-1.774-3.514-0.446-4.667,0.707l-3.188,3.188
-		c-0.048,0.049-0.085,0.104-0.127,0.156l-1.553-1.554c-0.321-0.321-0.836-0.329-1.148-0.017l-1.414,1.414
-		c-0.312,0.312-0.305,0.827,0.017,1.148l1.115,1.114l-8.98,8.98c-0.724,0.723-1.097,1.943-0.887,2.902
-		c0,0.059-0.071,0.259-0.132,0.325l-0.352,0.352c-0.936,0.936-0.956,2.439-0.045,3.351c0.912,0.912,2.415,0.892,3.351-0.044
-		l0.354-0.354c0.064-0.059,0.266-0.13,0.356-0.126c0.926,0.205,2.147-0.168,2.87-0.891l8.98-8.98l1.114,1.114
-		c0.321,0.321,0.836,0.329,1.147,0.017l1.414-1.414c0.312-0.312,0.305-0.826-0.017-1.147l-1.553-1.554
-		c0.052-0.042,0.107-0.078,0.156-0.127L24.031,439.378z M8.61,453.667c-0.389,0.389-1.114,0.617-1.613,0.509
-		c-0.498-0.109-1.225,0.119-1.613,0.508l-0.354,0.354c-0.389,0.389-1.005,0.408-1.37,0.044c-0.364-0.364-0.344-0.981,0.045-1.37
-		l0.354-0.354c0.389-0.389,0.617-1.114,0.508-1.613c-0.109-0.498,0.119-1.224,0.508-1.612l8.981-8.98l3.536,3.535L8.61,453.667z"/>
-	<path opacity="0.3" d="M5.206,450l-0.132,0.132c-0.389,0.389-0.617,1.114-0.508,1.612c0.109,0.499-0.119,1.225-0.508,1.613
-		l-0.354,0.354c-0.389,0.389-0.409,1.006-0.045,1.37c0.365,0.364,0.981,0.345,1.37-0.044l0.354-0.354
-		c0.389-0.389,1.115-0.617,1.613-0.508c0.499,0.108,1.225-0.12,1.613-0.509L12.277,450H5.206z"/>
-</g>
-<g id="building">
-	<path d="M456,386h-20l2-2h5l1-1h4l1,1h5L456,386z M458,408v1h-10v-3h-4v3h-10v-1h1v-1h1v-20h20v20h1v1H458z M443,402h-4v2h4V402z
-		 M443,398h-4v2h4V398z M443,394h-4v2h4V394z M443,390h-4v2h4V390z M448,402h-4v2h4V402z M448,398h-4v2h4V398z M448,394h-4v2h4V394z
-		 M448,390h-4v2h4V390z M453,402h-4v2h4V402z M453,398h-4v2h4V398z M453,394h-4v2h4V394z M453,390h-4v2h4V390z"/>
-</g>
-<g id="adress_x5F_book">
-	<path d="M405,385h-14.5l-3.5,3.75V409h15c1.65,0,3-1.35,3-3v-14c0-1.65-1.35-3-3-3h-12.266l2-2c0,0,11.266,0,12.266,0c2,0,3,1,3,3
-		c0,1,0,16,0,16l2-2v-15C409,387,407,385,405,385z M391,401.756c0-0.458,0.086-0.646,0.436-0.846c0.28-0.16,2.677-0.937,3.564-1.316
-		v-0.906c-0.469-0.125-1-0.858-1-1.328c0-1.09,0-1.99,0-1.99c0-1.076,0.702-1.955,2-1.962c1.298,0.007,2,0.886,2,1.962
-		c0,0,0,0.9,0,1.99c0,0.47-0.531,1.203-1,1.328v0.906c0.888,0.38,3.284,1.156,3.564,1.316c0.35,0.2,0.436,0.388,0.436,0.846
-		c0,0.188,0,1.026,0,1.026c0,0.119-0.099,0.218-0.218,0.218H396h-4.782c-0.119,0-0.218-0.099-0.218-0.218
-		C391,402.782,391,401.943,391,401.756z"/>
-</g>
-<g id="log_x5F_book">
-	<g id="book_1_">
-		<path d="M342.425,399.029l1.546-1.547c0.093-0.092,0.246-0.092,0.338,0l1.86,1.859c0.092,0.094,0.244,0.094,0.336,0l4.998-4.996
-			c0.093-0.093,0.244-0.094,0.338-0.001l1.558,1.535c0.094,0.092,0.094,0.242,0.001,0.335l-6.896,6.894
-			c-0.092,0.093-0.243,0.093-0.335,0l-3.744-3.743C342.332,399.273,342.332,399.121,342.425,399.029z M356,385h-14.5l-3.5,3.75V409
-			h15c1.65,0,3-1.35,3-3v-14c0-1.65-1.35-3-3-3h-12.266l2-2c0,0,11.266,0,12.266,0c2,0,3,1,3,3c0,1,0,16,0,16l2-2v-15
-			C360,387,358,385,356,385z"/>
-	</g>
-</g>
-<g id="display">
-	<g opacity="0.3">
-		<rect x="290" y="387" width="24" height="14"/>
-	</g>
-	<path d="M315,385h-26c-0.55,0-1,0.45-1,1v17c0,0.55,0.45,1,1,1h11c0,0.188,0,0.5,0,1c0,2-1.953,2-1.953,2h-3.692
-		c-0.194,0-0.354,0.16-0.354,0.354V409h16v-1.646c0-0.194-0.16-0.354-0.354-0.354H306c0,0-2,0-2-2c0-0.5,0-0.812,0-1h11
-		c0.55,0,1-0.45,1-1v-17C316,385.45,315.55,385,315,385z M314,403h-1v-1h1V403z M314,401h-24v-14h24V401z"/>
-</g>
-<g id="repeat">
-	<path d="M264.09,401.916l-0.829-0.561c-0.455-0.308-1.017-0.281-1.248,0.061s-0.927,1.295-1.132,1.532
-		c-2.01,2.323-4.542,3.073-6.843,3.05c-2.272-0.022-4.557-0.918-6.267-2.629s-2.632-4.065-2.632-6.369l0,0
-		c-0.005-1.832,0.535-3.68,1.689-5.274c2.801-3.875,8.123-4.87,12.143-2.286l-1.447,2.002c-0.16,0.221-0.068,0.399,0.208,0.395
-		l6.498-0.112c0.274-0.005,0.433-0.224,0.351-0.486l-1.926-6.208c-0.082-0.262-0.281-0.295-0.442-0.071l-1.479,2.045l-0.06-0.04
-		c-5.371-3.51-12.521-2.19-16.277,3.005c-1.538,2.127-2.256,4.659-2.256,7.032s0.75,5.748,3.51,8.507
-		c2.314,2.313,5.346,3.481,8.387,3.504c2.928,0.022,6.755-1.264,9.094-4.083c0.267-0.321,1.136-1.489,1.367-1.831
-		S264.545,402.224,264.09,401.916z"/>
-</g>
-<g id="heat">
-	<path d="M201.867,389.604c0.168,0.219,0.08,0.396-0.195,0.396h-2.622c0,2.691-0.626,4.107-1.178,5.356
-		c-0.495,1.119-0.922,2.085-0.922,4.144s0.427,3.024,0.922,4.144c0.552,1.249,1.178,2.665,1.178,5.356h-3
-		c0-2.059-0.427-3.024-0.922-4.144c-0.552-1.249-1.178-2.665-1.178-5.356s0.626-4.107,1.178-5.356
-		c0.495-1.119,0.922-2.085,0.922-4.144h-2.362c-0.275,0-0.367-0.182-0.204-0.403l3.796-5.168c0.162-0.222,0.434-0.226,0.601-0.007
-		L201.867,389.604z M211.867,389.604c0.168,0.219,0.08,0.396-0.195,0.396h-2.622c0,2.691-0.626,4.107-1.178,5.356
-		c-0.495,1.119-0.922,2.085-0.922,4.144s0.427,3.024,0.922,4.144c0.552,1.249,1.178,2.665,1.178,5.356h-3
-		c0-2.059-0.427-3.024-0.922-4.144c-0.552-1.249-1.178-2.665-1.178-5.356s0.626-4.107,1.178-5.356
-		c0.495-1.119,0.922-2.085,0.922-4.144h-2.362c-0.275,0-0.367-0.182-0.204-0.403l3.796-5.168c0.162-0.222,0.434-0.226,0.601-0.007
-		L211.867,389.604z M221.867,389.604c0.168,0.219,0.08,0.396-0.195,0.396h-2.622c0,2.691-0.626,4.107-1.178,5.356
-		c-0.495,1.119-0.922,2.085-0.922,4.144s0.427,3.024,0.922,4.144c0.552,1.249,1.178,2.665,1.178,5.356h-3
-		c0-2.059-0.427-3.024-0.922-4.144c-0.552-1.249-1.178-2.665-1.178-5.356s0.626-4.107,1.178-5.356
-		c0.495-1.119,0.922-2.085,0.922-4.144h-2.362c-0.275,0-0.367-0.182-0.204-0.403l3.796-5.168c0.162-0.222,0.434-0.226,0.601-0.007
-		L221.867,389.604z"/>
-</g>
-<g id="random_1_">
-	<path d="M171.647,402.202c0.22,0.165,0.22,0.435,0,0.6l-5.224,3.9c-0.221,0.165-0.424,0.075-0.424-0.2V404h-3.536l-4.307-3.946
-		l2.22-2.036l3.254,2.982H166v-2.498c0-0.275,0.203-0.365,0.424-0.2L171.647,402.202z M166,393v2.502c0,0.275,0.203,0.365,0.424,0.2
-		l5.212-3.9c0.22-0.165,0.226-0.435,0.006-0.6l-5.221-3.9c-0.221-0.165-0.421-0.075-0.421,0.2V390h-3.536l-12,11h-5.917
-		c-0.274,0-0.547,0.227-0.547,0.502v2c0,0.275,0.272,0.498,0.547,0.498h7.084l12-11H166z M144.547,393h5.917l3.253,2.983
-		l2.221-2.036L151.631,390h-7.084c-0.274,0-0.547,0.227-0.547,0.502v2C144,392.777,144.272,393,144.547,393z"/>
-</g>
-<g id="roundabout">
-	<path d="M106.708,391.565c-0.38,0.106-5.094,1.281-5.771,1.435s-0.82,0.143-0.797-0.5s0.189-5.672,0.228-6.094
-		s0.232-0.564,0.627-0.228s1.643,1.362,1.643,1.362c1.208-0.945,2.61-1.68,4.182-2.111c4.285-1.177,8.66,0.135,11.609,3.048
-		l-2.713,1.588c-2.185-1.796-5.174-2.546-8.103-1.742c-0.938,0.258-1.806,0.667-2.593,1.192c0,0,1.432,1.172,1.729,1.422
-		S107.088,391.459,106.708,391.565z M106.015,405.061c-2.224-1.1-3.989-3.101-4.696-5.676c-0.361-1.316-0.409-2.666-0.174-3.97
-		l-2.719-1.548c-0.545,2.002-0.59,4.166,0,6.312c1.033,3.765,3.752,6.605,7.117,7.952c0,0-0.312,1.994-0.371,2.447
-		s0.11,0.469,0.547,0.25s5.13-2.803,5.469-3s0.398-0.334,0.031-0.719s-3.962-3.979-4.281-4.281s-0.531-0.25-0.604,0.157
-		C106.234,403.547,106.015,405.061,106.015,405.061z M123.953,393.703c-1.402-0.789-5.396-3.045-5.613-3.166
-		c-0.262-0.146-0.423-0.07-0.483,0.187c-0.048,0.207-1.053,4.486-1.445,6.153c-0.095,0.406,0.025,0.568,0.393,0.424
-		s2.156-0.918,2.156-0.918c0.127,1.755-0.252,3.508-1.143,5.071c-1.084,1.905-2.791,3.314-4.842,4.03l-0.003,3.134
-		c0.067-0.018,0.134-0.026,0.2-0.045c3.195-0.877,5.732-2.966,7.252-5.636c1.309-2.3,1.855-5.03,1.424-7.785
-		c0,0,1.943-0.828,2.15-0.918S124.244,393.866,123.953,393.703z"/>
-</g>
-<g id="refresh_1_">
-	<path d="M53.269,399.919l-2.896,0.05c-0.85-3.333-0.285-7.002,1.883-10.001c3.756-5.195,10.906-6.515,16.277-3.005l0.06,0.04
-		l1.479-2.045c0.161-0.224,0.36-0.19,0.442,0.071l1.926,6.208c0.082,0.263-0.076,0.481-0.351,0.486l-6.498,0.112
-		c-0.276,0.005-0.368-0.174-0.208-0.395l1.447-2.002c-4.02-2.584-9.342-1.589-12.143,2.286c-1.771,2.449-2.121,5.494-1.221,8.161
-		L53.269,399.919z M73.604,394.102l-3.098,0.054c0.881,2.656,0.528,5.683-1.234,8.119c-2.801,3.875-8.123,4.87-12.143,2.287
-		l1.447-2.003c0.16-0.221,0.068-0.4-0.208-0.395l-6.498,0.112c-0.274,0.005-0.433,0.224-0.352,0.485l1.927,6.209
-		c0.082,0.262,0.281,0.295,0.442,0.072l1.479-2.046l0.06,0.04c5.371,3.51,12.521,2.19,16.277-3.005
-		C73.857,401.054,74.428,397.415,73.604,394.102z"/>
-</g>
-<g id="retweet">
-	<path d="M17.719,402H6v-6h0.013h2.498c0.275,0,0.365-0.294,0.2-0.515l-3.9-5.314c-0.165-0.22-0.435-0.167-0.6,0.053l-3.9,5.259
-		C0.146,395.703,0.236,396,0.511,396H3v8.5c0,0.275,0.225,0.5,0.5,0.5h16.527L17.719,402z"/>
-	<path d="M27.511,399h-2.498H25v-8.5c0-0.275-0.225-0.5-0.5-0.5H8.062l2.309,3H22v6h-2.489c-0.275,0-0.365,0.17-0.2,0.391l3.9,5.195
-		c0.165,0.22,0.435,0.209,0.6-0.011l3.9-5.188C27.876,399.167,27.787,399,27.511,399z"/>
-</g>
-<g id="signal_1_">
-	<path d="M437.5,354h-3c-0.275,0-0.5,0.225-0.5,0.5c0,2.167,0,4.333,0,6.5h4c0-2.167,0-4.333,0-6.5
-		C438,354.225,437.775,354,437.5,354z"/>
-	<path d="M442.5,351h-3c-0.275,0-0.5,0.225-0.5,0.5c0,3.167,0,6.333,0,9.5h4c0-3.167,0-6.333,0-9.5
-		C443,351.225,442.775,351,442.5,351z"/>
-	<path d="M447.5,348h-3c-0.275,0-0.5,0.225-0.5,0.5c0,4.167,0,8.333,0,12.5h4c0-4.167,0-8.333,0-12.5
-		C448,348.225,447.775,348,447.5,348z"/>
-	<path d="M452.5,343h-3c-0.275,0-0.5,0.225-0.5,0.5c0,5.833,0,11.667,0,17.5h4c0-5.833,0-11.667,0-17.5
-		C453,343.225,452.775,343,452.5,343z"/>
-	<path d="M457.5,337h-3c-0.275,0-0.5,0.225-0.5,0.5c0,7.833,0,15.667,0,23.5h4c0-7.833,0-15.667,0-23.5
-		C458,337.225,457.775,337,457.5,337z"/>
-</g>
-<g id="warning_x5F_sign_1_">
-	<path d="M412.179,358.754l-12.378-20.953c-0.268-0.467-0.764-0.754-1.301-0.754s-1.033,0.287-1.301,0.754l-12.378,20.953
-		c-0.267,0.464-0.265,1.035,0.003,1.498c0.269,0.463,0.764,0.748,1.299,0.748h24.754c0.535,0,1.03-0.285,1.299-0.748
-		C412.443,359.789,412.445,359.218,412.179,358.754z M388.711,358l9.789-16.797L408.289,358H388.711z M400,354.375v2.25
-		c0,0.207-0.168,0.375-0.375,0.375h-2.25c-0.207,0-0.375-0.168-0.375-0.375v-2.25c0-0.207,0.168-0.375,0.375-0.375h2.25
-		C399.832,354,400,354.168,400,354.375z M397.499,346h2.002c0.274,0,0.499,0.225,0.499,0.499v1.876c0,0.207-0.033,0.541-0.073,0.742
-		l-0.675,3.453c-0.04,0.201-0.242,0.43-0.449,0.43h-0.588c-0.207,0-0.409-0.229-0.45-0.43l-0.69-3.422
-		c-0.041-0.201-0.074-0.566-0.074-0.773v-1.876C397,346.225,397.225,346,397.499,346z"/>
-</g>
-<g id="headset">
-	<path d="M362,349.5l-0.02,8.696c-0.042,0.214-1.081,4.769-9.172,5.646C352.49,364.524,351.803,365,351,365h-1c-1.104,0-2-0.896-2-2
-		s0.896-2,2-2h1c0.68,0,1.278,0.341,1.64,0.859c5.999-0.664,7.204-3.521,7.36-3.99V349.5c0-5.238-4.762-9-10-9s-10,3.762-10,9v6
-		c0,0.275-0.225,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5v-6c0-6.341,5.659-12,12-12S362,343.159,362,349.5z M343.873,352h-2.529
-		c-0.275,0-0.344,0.24-0.344,0.516v7.984c0,0.275,0.068,0.5,0.344,0.5h2.529c0.275,0,0.5-0.225,0.5-0.5c0,0,0.5-1.5,0.5-4
-		s-0.5-3.992-0.5-3.992C344.373,352.232,344.148,352,343.873,352z M359,357.094v-4.578c0-0.275-0.068-0.516-0.344-0.516h-2.529
-		c-0.275,0-0.5,0.232-0.5,0.508c0,0-0.5,1.488-0.5,3.988c0,0.871,0.164,2.069,0.272,2.927
-		C357.203,358.922,358.234,358.016,359,357.094z"/>
-</g>
-<g id="headphones_1_">
-	<path d="M296.373,352.508c0,0,0.5,1.492,0.5,3.992s-0.5,4-0.5,4c0,0.275-0.225,0.5-0.5,0.5h-2.529c-0.275,0-0.344-0.225-0.344-0.5
-		v-7.984c0-0.275,0.068-0.516,0.344-0.516h2.529C296.148,352,296.373,352.232,296.373,352.508z M310.656,352h-2.529
-		c-0.275,0-0.5,0.232-0.5,0.508c0,0-0.5,1.488-0.5,3.988s0.5,4.002,0.5,4.002c0,0.275,0.225,0.502,0.5,0.502h2.529
-		c0.275,0,0.344-0.225,0.344-0.5v-7.984C311,352.24,310.932,352,310.656,352z M302,337.5c-6.341,0-12,5.659-12,12v6
-		c0,0.275,0.225,0.5,0.5,0.5h1c0.275,0,0.5-0.225,0.5-0.5v-6c0-5.238,4.762-9,10-9s10,3.762,10,9v6c0,0.275,0.225,0.5,0.5,0.5h1
-		c0.275,0,0.5-0.225,0.5-0.5v-6C314,343.159,308.341,337.5,302,337.5z"/>
-</g>
-<g id="stroller">
-	<path d="M260.504,356.007c-0.111,0-0.456-0.007-0.527-0.007h-2.982l-6.67-7h11.242l3.434-7l-3.434-4L256,336h-4l1.874,8h-8.315
-		L245,343l-3.699-0.954c-0.527-0.163-1.041,0.036-1.207,0.563c-0.166,0.525,0.129,1.053,0.656,1.219l3.188,0.844L245,349h2.561
-		l3.339,3.502l-2.603,2.052c-0.524-0.315-1.133-0.509-1.789-0.509c-1.929,0-3.492,1.563-3.492,3.493s1.563,3.491,3.492,3.491
-		s3.492-1.563,3.492-3.493c0-0.541-0.134-1.048-0.354-1.505l2.633-2.08l3.859,4.049h1.92c-0.033,0-0.051,0.33-0.051,0.502
-		c0,1.379,1.117,2.498,2.496,2.498c1.377,0,2.496-1.118,2.496-2.497S261.881,356.007,260.504,356.007z M246.508,359.029
-		c-0.824,0-1.492-0.67-1.492-1.492c0-0.823,0.668-1.492,1.492-1.492s1.492,0.669,1.492,1.492
-		C248,358.359,247.332,359.029,246.508,359.029z M260.504,359.144c-0.354,0-0.642-0.287-0.642-0.641
-		c0-0.354,0.287-0.642,0.642-0.642c0.354,0,0.641,0.287,0.641,0.642C261.145,358.856,260.857,359.144,260.504,359.144z"/>
-</g>
-<g id="cup">
-	<path d="M216,339h-3c0-0.499,0-1.862,0-2h-14c0,0.138,0,1.501,0,2h-3c-0.55,0-1,0.45-1,1c0,2.955,0,6,1.203,8.031
-		c1.646,2.778,4.726,4.107,7.874,3.957c0.431,0.681,0.758,1.361,0.923,2.063V355c0,0.852-0.366,1.511-0.782,2H203v1h-1v3h8v-3h-1v-1
-		h-1.218c-0.416-0.489-0.782-1.148-0.782-2v-1.148c0.136-0.683,0.384-1.313,0.708-1.91c1.27,0.393,3.263-0.178,4.454-0.662
-		c1.394-0.566,2.304-1.394,3.378-2.803c1.08-1.417,1.46-1.965,1.46-8.477C217,339.45,216.55,339,216,339z M198.912,348.313
-		c-2.164-2.202-1.984-4.458-1.943-7.313H199c0,1.761-0.048,2.473,0.589,4.148c0.672,1.771,1.836,3.282,2.986,4.766
-		C200.99,349.723,199.78,349.197,198.912,348.313C199.78,349.197,196.899,346.266,198.912,348.313z M213.111,348.311
-		c-1.025,1.025-2.272,1.49-4.044,1.641c1.127-1.422,2.235-2.648,3.152-4.437S213,342.908,213,341h2.01c0,0.551,0.018,1.496,0.018,2
-		C215.028,345.91,214.137,347.285,213.111,348.311z"/>
-</g>
-<g id="wifi">
-	<path d="M165.848,352.984l-1.94,1.939c-1.382-1.391-3.294-2.254-5.405-2.254c-2.093,0-3.992,0.85-5.371,2.22l-1.94-1.939
-		c1.876-1.867,4.46-3.025,7.311-3.025C161.371,349.925,163.969,351.096,165.848,352.984z M158.502,355.436
-		c-1.331,0-2.538,0.538-3.416,1.409l3.45,3.45l3.416-3.416C161.071,355.988,159.851,355.436,158.502,355.436z M143.131,344.891
-		l2.017,2.016c3.424-3.416,8.147-5.531,13.354-5.531c5.225,0,9.961,2.129,13.389,5.564l2.016-2.016
-		c-3.943-3.953-9.394-6.402-15.405-6.402C152.508,338.521,147.072,340.956,143.131,344.891z M158.502,344.14
-		c-4.445,0-8.476,1.806-11.4,4.722l2.134,2.134c2.377-2.368,5.653-3.835,9.266-3.835c3.63,0,6.92,1.479,9.3,3.869l2.133-2.135
-		C167.01,345.959,162.965,344.14,158.502,344.14z"/>
-</g>
-<g id="bookmark">
-	<path d="M117.5,337h-14c-0.275,0-0.5,0.225-0.5,0.5v22.875c0,0.274,0.28,0.353,0.475,0.158l7.086-6.283l6.908,6.172
-		c0.194,0.194,0.531,0.156,0.531-0.297V337.5C118,337.225,117.775,337,117.5,337z"/>
-</g>
-<g id="book">
-	<path d="M69,337H54.5l-3.5,3.75V361h15c1.65,0,3-1.35,3-3v-14c0-1.65-1.35-3-3-3H53.734l2-2c0,0,11.266,0,12.266,0c2,0,3,1,3,3
-		c0,1,0,16,0,16l2-2v-15C73,339,71,337,69,337z"/>
-</g>
-<g id="umbrella">
-	<path d="M13,350.211v8.799c0,0.342-0.011,1.99-2,1.99c-1.579,0-2-1.055-2-1.99v-0.49c0-0.275-0.225-0.504-0.5-0.507h-1
-		c-0.275,0.003-0.5,0.231-0.5,0.507v0.49c0,2.46,1.535,3.99,3.91,3.99c2.811,0,4.09-2.04,4.09-3.99v-8.799
-		c0-0.047-0.492-0.201-1-0.201S13,350.164,13,350.211z"/>
-	<path d="M15,337.062v-1.053c0-0.553-0.447-1-1-1s-1,0.447-1,1v1.053c-6.711,0.486-12,6.51-12,13.656h0.046
-		c1.013-2,2.612-2.709,4.418-2.709c1.717,0,3.251,0.813,4.269,2.116c1.018-1.303,2.551-2.308,4.268-2.308s3.25,0.909,4.268,2.213
-		c1.018-1.304,2.552-2.006,4.269-2.006c1.806,0,3.405,0.693,4.418,2.693H27C27,343.572,21.71,337.549,15,337.062z"/>
-</g>
-<g id="gift">
-	<g>
-		<path d="M436,305h8v8h-8V305z M448,313h8v-8h-8V313z M458,294.625v2.958c0,0.275-0.225,0.417-0.5,0.417c-0.5,0-1,0-1.5,0v3h-8v-7
-			h-4v7h-8v-3c-0.5,0-1,0-1.5,0c-0.275,0-0.5-0.142-0.5-0.417v-2.958c0-0.275,0.225-0.625,0.5-0.625c0.532,0,1.063,0,1.596,0
-			c-0.094,0,0.712-3.795,0.769-4.037c0.343-1.227,1.591-1.994,2.836-1.644c0.548,0.154,1.113,0.489,1.632,0.726
-			c1.247,0.568,2.495,1.138,3.742,1.707c0.316,0.183,0.584,0.425,0.796,0.708c0.212-0.283,0.479-0.523,0.794-0.705
-			c1.198-0.548,2.397-1.096,3.596-1.644c0.494-0.226,0.983-0.479,1.482-0.689c1.313-0.555,2.764,0.183,3.142,1.543
-			c0.056,0.242,0.86,4.035,0.762,4.035c0.618,0,1.236,0,1.854,0C457.775,294,458,294.35,458,294.625z M443.826,293.597l-4.605-2.765
-			l-0.632,2.887c-0.034,0.121,0.05,0.281,0.164,0.281c1.646,0,4.938,0,4.938,0L443.826,293.597z M453.388,293.705l-0.63-2.907
-			l-4.608,2.788l0.132,0.414c0,0,3.284,0,4.927,0C453.33,294,453.423,293.83,453.388,293.705z"/>
-	</g>
-	<g opacity="0.3">
-		<path d="M456,305h-8v8h-4v-8h-8v-4h8v-7h4v7h8V305z"/>
-	</g>
-</g>
-<g id="ruller">
-	<g>
-		<path d="M412,295h-1v6h-1v-6h-1v6h-1v-6h-1v10h-1v-10h-1v6h-1v-6h-1v6h-1v-6h-1v6h-1v-6h-1v6h-1v-6h-1v10h-1v-10h-1v6h-1v-6h-1v6
-			h-1v-6h-1v6h-1v-6h-1v6h-1v-6h-1v10h-1v-10h-0.5H385v0.5V306v2.5c0,0.275,0.225,0.5,0.5,0.5h26c0.275,0,0.5-0.225,0.5-0.5V308V295
-			z"/>
-	</g>
-	<g opacity="0.3">
-		<path d="M387,305h-1v-10h1V305z M389,295h-1v6h1V295z M391,295h-1v6h1V295z M393,295h-1v6h1V295z M395,295h-1v6h1V295z M397,295
-			h-1v10h1V295z M399,295h-1v6h1V295z M401,295h-1v6h1V295z M403,295h-1v6h1V295z M405,295h-1v6h1V295z M407,295h-1v10h1V295z
-			 M409,295h-1v6h1V295z M411,295h-1v6h1V295z"/>
-	</g>
-</g>
-<g id="cleaning">
-	<path d="M351,304v-1.938c0,0-1.172-5.062-5.984-5.062s-5.943,4.992-6.016,4.91V304h1v8l1.021,1h7.938l1.042-1v-8H351z
-		 M345.016,298.328c3.406,0,4.508,3.672,4.508,3.672h-0.844h-7.357h-0.846C340.477,302,341.609,298.328,345.016,298.328z M352,309
-		h10l1,4h-12L352,309z M362,306.75v1.75h-10v-1.75c0-0.55,0.201-0.75,0.751-0.75H356v-16.25c0-0.553,0.448-1,1-1s1,0.447,1,1V306
-		h2.751C361.301,306,362,306.2,362,306.75z"/>
-</g>
-<g id="tags">
-	<path d="M316.289,303.803l-8.878,8.878c-0.193,0.193-0.518,0.111-0.713-0.082l-1.595-1.604l7.19-7.191
-		c0.528-0.527,0.487-0.928,0-1.414L298.894,289h3.005c0.275,0,0.905,0.08,1.064,0.177c0.158,0.097,0.448,0.336,0.643,0.53
-		l12.684,12.682C316.648,302.748,316.71,303.382,316.289,303.803z"/>
-	<path d="M297.252,289.354c-0.194-0.194-0.578-0.354-0.854-0.354H287.5c-0.275,0-0.5,0.225-0.5,0.5v8.899
-		c0,0.274,0.159,0.659,0.354,0.854l13.389,13.39c0.195,0.193,0.514,0.193,0.707,0l9.193-9.193c0.193-0.193,0.193-0.512,0-0.707
-		L297.252,289.354z M293.414,295.414c-0.781,0.781-2.047,0.781-2.828,0s-0.781-2.047,0-2.828s2.047-0.781,2.828,0
-		S294.195,294.633,293.414,295.414z"/>
-</g>
-<g id="tag_2_">
-	<path d="M252.256,289.354c-0.193-0.194-0.578-0.354-0.854-0.354h-8.898c-0.274,0-0.504,0.225-0.504,0.5v8.899
-		c0,0.274,0.161,0.659,0.355,0.854l13.391,13.39c0.194,0.193,0.514,0.193,0.707,0l9.193-9.193c0.193-0.193,0.194-0.512,0-0.707
-		L252.256,289.354z M248.414,295.414c-0.781,0.781-2.047,0.781-2.828,0s-0.781-2.047,0-2.828s2.047-0.781,2.828,0
-		S249.195,294.633,248.414,295.414z"/>
-</g>
-<g id="lightbulb">
-	<g>
-		<path d="M206,287.826c-0.029,0,0,0.005,0,0.005c-0.029,0-0.058-0.005-0.087-0.005c-5.315,0-9.086,3.858-9.086,9.174
-			c0,2.823,1.304,4.528,2.455,6.033c1.119,1.463,2.085,2.727,2.085,4.967c0,0.771,0.227,1.396,0.633,1.836V311c0,0.275,1,1,1,1v0.5
-			c0,0.275,0.214,0.5,0.489,0.5h5c0.275,0,0.511-0.225,0.511-0.5V312c0,0,1-0.725,1-1v-1.335c0.302-0.427,0.47-0.986,0.47-1.665
-			c0-2.24,0.978-3.504,2.097-4.967c1.15-1.505,2.477-3.21,2.477-6.033C215.043,291.685,211.315,287.826,206,287.826z
-			 M210.978,301.818c-1.17,1.53-2.475,3.265-2.475,6.182h-2.254h-0.475h-2.406c0-2.917-1.327-4.651-2.497-6.182
-			c-1.097-1.434-2.043-2.672-2.043-4.818c0-4.224,2.95-7.174,7.173-7.174c4,0,7.097,2.95,7.097,7.174
-			C213.097,299.146,212.074,300.385,210.978,301.818z"/>
-	</g>
-	<g opacity="0.3">
-		<path d="M206,289.826c-0.417,0-0.818,0.037-1.209,0.093c0.13,0.336,0.209,0.698,0.209,1.081c0,1.656-1.343,3-3,3
-			c-0.841,0-1.6-0.349-2.145-0.907c-0.657,1.098-1.029,2.421-1.029,3.907c0,2.146,0.947,3.385,2.043,4.818
-			c1.17,1.53,2.497,3.265,2.497,6.182h5.135c0-2.917,1.305-4.651,2.475-6.182c1.097-1.434,2.12-2.672,2.12-4.818
-			C213.097,292.776,210,289.826,206,289.826z"/>
-	</g>
-</g>
-<g id="power">
-	<g>
-		<path d="M160,297.999c0,0.551-0.45,1.001-1,1.001h-2c-0.55,0-1-0.45-1-1.001v-7.998c0-0.551,0.45-1.001,1-1.001h2
-			c0.55,0,1,0.45,1,1.001V297.999z M163.291,292.938c-0.588-0.344-1.291-0.484-1.291,0.328c0,0.453,0,1.309,0,1.834
-			c0,0.715,0.475,0.888,0.697,1.066c1.706,1.375,2.803,3.477,2.803,5.834c0,4.136-3.364,7.5-7.5,7.5s-7.5-3.364-7.5-7.5
-			c0-2.37,1.107-4.48,2.831-5.856c0.214-0.171,0.669-0.237,0.669-1.053c0-0.512,0-1.255,0-1.763c0-0.844-0.609-0.828-1.373-0.342
-			c-3.067,1.835-5.127,5.187-5.127,9.014c0,5.79,4.711,10.5,10.5,10.5s10.5-4.71,10.5-10.5
-			C168.5,298.139,166.404,294.761,163.291,292.938z"/>
-	</g>
-</g>
-<g id="paperclip">
-	<path d="M110.083,312.068c-0.39,0-0.982-0.877-1.238-1.133c-0.096-0.096-0.096-0.258,0-0.354
-		c3.388-3.389,6.776-6.777,10.164-10.166c1.076-1.076,1.859-2.324,1.978-3.884c0.195-2.589-1.561-4.985-4.142-5.451
-		c-3.022-0.545-4.897,1.549-6.798,3.449c-2.209,2.21-4.419,4.42-6.629,6.63c-1.523,1.523-4.203,3.412-3.849,5.844
-		c0.401,2.756,3.819,3.379,5.639,1.56c0.454-0.454,0.907-0.907,1.361-1.361c2.167-2.168,4.334-4.335,6.502-6.503
-		c1.137-1.138,2.273-2.274,3.411-3.411c1.363-1.364-0.385-3.155-1.731-1.805c-0.419,0.36-0.792,0.792-1.183,1.183
-		c-1.712,1.713-5.909,5.924-6.307,6.303c-0.202,0.191-0.662,0.876-0.969,0.569c-0.347-0.347-0.693-0.693-1.04-1.04
-		c-0.096-0.096-0.096-0.258,0-0.354c1.583-1.579,6.725-6.854,8.04-8.06c0.917-0.84,2.062-1.255,3.221-1.036
-		c2.68,0.506,3.185,3.85,1.417,5.618c-0.454,0.454-0.907,0.907-1.361,1.361c-2.167,2.168-4.334,4.335-6.502,6.503
-		c-1.473,1.473-3.075,3.619-4.991,4.552c-2.381,1.159-5.389,0.438-6.794-1.86c-1.302-2.129-0.817-4.937,0.917-6.67
-		c3.516-3.518,7.033-7.034,10.549-10.551c0.695-0.694,1.368-1.39,2.218-1.905c2.078-1.261,4.733-1.461,6.95-0.44
-		c4.665,2.146,5.298,8.385,1.806,11.877c-3.436,3.437-6.872,6.873-10.308,10.31C110.325,311.93,110.222,312.068,110.083,312.068z"/>
-</g>
-<g id="keynote">
-	<g>
-		<path d="M72,301v2h-9v8c0,0.553-0.672,1-1.5,1s-1.5-0.447-1.5-1v-8h-8v-2H72z M70,291H55.5c0-2.23,0.437-3.64,1.229-3.968
-			c0.537-0.222,1.324,0.031,2.162,0.663L58.586,288l1.914,1.914l1.414-1.414L60,286.586l-0.399,0.398
-			c-1.184-0.93-2.339-1.257-3.255-0.876c-1.225,0.507-1.846,2.153-1.846,4.892H54l-1.5,9h19L70,291z"/>
-	</g>
-	<g opacity="0.5">
-		<path d="M63,307.154V311c0,0.553-0.672,1-1.5,1s-1.5-0.447-1.5-1v-3.846c-2.308,0.476-4,2.016-4,3.846c0,2.209,2.463,4,5.5,4
-			s5.5-1.791,5.5-4C67,309.17,65.308,307.63,63,307.154z"/>
-	</g>
-</g>
-<g id="compass">
-	<path d="M16.328,302.666l3.122-6.867c0.114-0.251,0.002-0.363-0.249-0.248l-6.867,3.121c-0.25,0.114-0.548,0.412-0.662,0.662
-		l-3.122,6.867c-0.114,0.251-0.002,0.363,0.249,0.248l6.867-3.121C15.916,303.214,16.214,302.916,16.328,302.666z M13.169,301.831
-		c-0.46-0.459-0.46-1.204,0-1.662c0.458-0.46,1.204-0.46,1.663-0.001s0.459,1.205,0,1.663
-		C14.373,302.291,13.629,302.291,13.169,301.831z M14,313c-6.617,0-12-5.383-12-12s5.383-12,12-12s12,5.383,12,12S20.617,313,14,313
-		z M14,292c-4.963,0-9,4.037-9,9s4.037,9,9,9s9-4.037,9-9S18.963,292,14,292z"/>
-</g>
-<g id="cargo_1_">
-	<g>
-		<rect x="433" y="261" width="19" height="3"/>
-	</g>
-	<g>
-		<polygon points="452,264 458,258 458,255 452,261 		"/>
-	</g>
-	<g>
-		<rect x="433" y="263" width="5" height="2"/>
-	</g>
-	<g>
-		<rect x="441" y="263" width="4" height="2"/>
-	</g>
-	<g>
-		<rect x="448" y="263" width="4" height="2"/>
-	</g>
-	<g>
-		<g>
-			<polygon points="453,262 452,263 452,265 453,264 			"/>
-		</g>
-		<g>
-			<polygon points="454,263 456,261 456,259 454,261 			"/>
-		</g>
-		<g>
-			<polygon points="457,258 457,260 458,259 458,257 			"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<path d="M442.453,243.547C442.922,243.094,444,242,444,242h-7c0,0-1.188,1.188-1.578,1.578S435,244.25,435,244.703
-				s0,1.297,0,1.297h7c0,0,0-0.703,0-1.312C442,244.234,441.984,244,442.453,243.547z"/>
-		</g>
-		<g>
-			<path d="M444,244.688c0,0.438,0,1.312,0,1.312h7l2-2c0,0,0-1.109,0-1.469S452.812,242,452.453,242S446,242,446,242
-				s-1.078,1.078-1.547,1.547S444,244.25,444,244.688z"/>
-		</g>
-		<g>
-			<rect x="435" y="247" width="7" height="4"/>
-		</g>
-		<g>
-			<polygon points="453,249 453,245 451,247 444,247 444,251 451,251 			"/>
-		</g>
-		<g>
-			<path d="M447,239c0,0-5.43,0-6.141,0s-0.812-0.047-1.203,0.344S438,241,438,241h7L447,239z"/>
-		</g>
-		<g>
-			<polygon points="444,256 451,256 453,254 453,250 451,252 444,252 			"/>
-		</g>
-		<g>
-			<rect x="435" y="252" width="7" height="4"/>
-		</g>
-		<g>
-			<polygon points="454,248 456,246 456,242 454,244 			"/>
-		</g>
-		<g>
-			<path d="M449,239l-2,2c0,0,5.25,0,6,0s1,0.333,1,0.979s0,1.021,0,1.021l2-2c0,0,0-0.626,0-1.001c0-0.718-0.25-0.999-1-0.999
-				C454.562,239,449,239,449,239z"/>
-		</g>
-		<g>
-			<polygon points="454,253 456,251 456,247 454,249 			"/>
-		</g>
-		<g>
-			<polygon points="454,257 456,255 456,252 454,254 			"/>
-		</g>
-		<g>
-			<polygon points="451,257 444,257 444,260 451,260 453,258 453,255 			"/>
-		</g>
-		<g>
-			<rect x="435" y="257" width="7" height="3"/>
-		</g>
-	</g>
-	<path opacity="0.3" d="M442,260h2v-3h7l2-2v3l1-1v-3l2-2v-1l-2,2v-4l2-2v-1l-2,2v-4l2-2v-1l-2,2v-1.021c0-0.646-0.25-0.979-1-0.979
-		h-6l2-2h-2l-2,2h-7l-1,1h7c0,0-1.078,1.094-1.547,1.547S442,244.234,442,244.688V246h-7v1h7v4h-7v1h7v4h-7v1h7V260z M444,244.688
-		c0-0.438-0.016-0.672,0.453-1.141c0.066-0.066,0.147-0.147,0.234-0.234L446,242h5.984c0.245,0,0.418,0,0.469,0
-		c0.359,0,0.547,0.172,0.547,0.531c0,0.106,0,0.279,0,0.469v1l-2,2h-7V244.688z M444,247h7l2-2v4l-2,2h-7V247z M444,252h7l2-2v4
-		l-2,2h-7V252z"/>
-</g>
-<g id="truck">
-	<g>
-		<line x1="410" y1="245.008" x2="410" y2="246.008"/>
-	</g>
-	<g>
-		<polyline points="410,246.008 410,255.007 410,256.008 		"/>
-	</g>
-	<g opacity="0.3">
-		<path d="M388,251.219c0,0.275,0.212,0.575,0.472,0.667c0,0,3.165,1.227,9.528,1.227s9.528-1.227,9.528-1.227
-			c0.26-0.092,0.472-0.392,0.472-0.667v-4.711c0-0.275-0.225-0.5-0.5-0.5h-19c-0.275,0-0.5,0.225-0.5,0.5V251.219z M403,257.008h-10
-			v1h10V257.008z M403,255.008h-10v1h10V255.008z"/>
-	</g>
-	<path d="M413,246v-0.5c0-0.275-0.225-0.5-0.5-0.5s-2.5,0-2.5,0v-0.575c0-0.633-0.424-1.167-1-1.347V239h-22v4.078
-		c-0.576,0.18-1,0.714-1,1.347V245c0,0-2.225,0-2.5,0s-0.5,0.225-0.5,0.5v0.5c-0.55,0-1,0.458-1,1.008v5c0,0.55,0.45,0.992,1,0.992
-		v0.5c0,0.275,0.225,0.5,0.5,0.5s2.5,0,2.5,0v11.5c0,0.275,0.225,0.5,0.5,0.5h2c0.275,0,0.5-0.225,0.5-0.5V264h18v1.5
-		c0,0.275,0.225,0.5,0.5,0.5h2c0.275,0,0.5-0.225,0.5-0.5V254c0,0,2.225,0,2.5,0s0.5-0.225,0.5-0.5V253c0.55,0,1-0.442,1-0.992v-5
-		C414,246.458,413.55,246,413,246z M409,258.107L408,259h-4v-1.992l5-1V258.107z M388,246.508c0-0.275,0.225-0.508,0.5-0.508h19
-		c0.275,0,0.5,0.232,0.5,0.508v4.711c0,0.275-0.212,0.575-0.472,0.667c0,0-3.165,1.227-9.528,1.227s-9.528-1.227-9.528-1.227
-		c-0.26-0.092-0.472-0.392-0.472-0.667V246.508z M384,253c0.55,0,1-0.442,1-0.992v-5c0-0.55-0.45-1.008-1-1.008c0.236,0,1.764,0,2,0
-		v0.145V253C385.764,253,384.236,253,384,253z M392,261h-3v-1h3V261z M392,259h-4l-1-0.893v-2.1l5,1V259z M401,263h-6v-2h6V263z
-		 M403,258h-10v-1h10V258z M403,256h-10v-1h10V256z M404,261v-1h3v1H404z M412,253c-0.236,0-1.764,0-2,0v-7c0.236,0,1.764,0,2,0
-		c-0.55,0-1,0.458-1,1.008v5C411,252.558,411.45,253,412,253z"/>
-</g>
-<g id="history_1_">
-	<path d="M355.205,249.258l-3.268,3.27c0.037,0.153,0.062,0.314,0.062,0.479c0,1.104-0.895,2.006-2,2.006
-		c-0.748,0-1.393-0.512-1.736-1.012H345.5c-0.275,0-0.5-0.249-0.5-0.523v-0.953c0-0.274,0.225-0.523,0.5-0.523h2.764
-		c0.344-0.5,0.988-1.012,1.736-1.012c0.197,0,0.385,0.049,0.565,0.103l3.238-3.237c0.194-0.194,0.513-0.194,0.707,0l0.694,0.696
-		C355.4,248.744,355.4,249.062,355.205,249.258z M361.791,255c0.115-1,0.197-1.334,0.197-2.018c0-6.618-5.383-12.01-12-12.01
-		s-11.994,5.377-11.994,11.996c0,6.615,5.006,11.994,12.006,11.994v-0.002c2-0.006,4.509-0.643,6.527-1.961l0.057-0.039l1.477,2.046
-		c0.162,0.224,0.361,0.188,0.442-0.073l2.205-6.439c0.082-0.263-0.077-0.48-0.353-0.486l-6.835,0.002
-		c-0.276-0.006-0.37,0.174-0.21,0.396l1.515,2.12c-1.495,0.961-2.825,1.424-4.825,1.431v0.008c-5-0.001-9.008-4.03-9.006-9.001
-		c0-4.971,4.027-9,8.998-9c4.97,0,8.998,4.048,8.998,9.02c0,0.688-0.092,1.018-0.24,2.018H361.791z"/>
-</g>
-<g id="projector">
-	<g opacity="0.3">
-		<path d="M291.279,251c0.349-0.594,0.986-1,1.721-1h9v1H291.279z M302,252h-11v1h11V252z M302,254h-11v1h11V254z M291.279,256
-			c0.349,0.594,0.986,1,1.721,1h9v-1H291.279z"/>
-	</g>
-	<g>
-		<path d="M313.203,246.021c-1.184-1.242-2.851-2.021-4.703-2.021c-1.842,0-3.502,0.77-4.685,2H291c-1.1,0-2,0.9-2,2v11
-			c0,1.1,0.9,2,2,2v1l1.501,1l1.499-1v-1h16v1l1.501,1l1.499-1v-1c1.1,0,2-0.9,2-2v-11C315,246.97,314.207,246.125,313.203,246.021z
-			 M302,257h-9c-0.734,0-1.372-0.406-1.721-1H302V257z M302,255h-11v-1h11V255z M302,253h-11v-1h11V253z M302,251h-10.721
-			c0.349-0.594,0.986-1,1.721-1h9V251z M308.5,254.9c-2.43,0-4.4-1.971-4.4-4.4s1.971-4.4,4.4-4.4s4.4,1.971,4.4,4.4
-			S310.93,254.9,308.5,254.9z"/>
-	</g>
-	<g opacity="0.5">
-		<g>
-			<path d="M308.5,247.1c-0.433,0-0.842,0.089-1.223,0.236c0.375,0.251,0.623,0.678,0.623,1.164c0,0.773-0.627,1.4-1.4,1.4
-				c-0.485,0-0.913-0.248-1.164-0.623c-0.147,0.381-0.236,0.79-0.236,1.223c0,1.877,1.522,3.4,3.4,3.4s3.4-1.523,3.4-3.4
-				S310.378,247.1,308.5,247.1z"/>
-		</g>
-	</g>
-	<g opacity="0.5">
-		<path d="M305.108,242.816l-2.73-2.73l0.707-0.707l3.02,3.019C305.761,242.514,305.429,242.654,305.108,242.816z M311.892,242.816
-			l2.73-2.73l-0.707-0.707l-3.02,3.019C311.239,242.514,311.571,242.654,311.892,242.816z M309,242.025V238h-1v4.025
-			C308.166,242.014,308.834,242.014,309,242.025z M303.412,244H300v1h2.51C302.78,244.64,303.082,244.306,303.412,244z M313.588,244
-			c0.33,0.306,0.632,0.64,0.902,1H317v-1H313.588z"/>
-	</g>
-</g>
-<g id="stopwatch_1_">
-	<path d="M254,242.865c-6.065,0-11,4.935-11,11s4.935,11,11,11s11-4.935,11-11S260.065,242.865,254,242.865z M254,261.865
-		c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S258.411,261.865,254,261.865z M256,253.865c0,0.738-0.404,1.376-1,1.723v0.891
-		c0,0.275-0.225,0.521-0.5,0.521h-1c-0.275,0-0.5-0.246-0.5-0.521v-0.891c-0.596-0.347-1-0.984-1-1.723s0.404-1.376,1-1.723V248.5
-		c0-0.275,0.225-0.5,0.5-0.5h1c0.275,0,0.5,0.225,0.5,0.5v3.643C255.596,252.489,256,253.127,256,253.865z M254,240.906
-		c-0.508,0-1.508,0.035-2,0.094v-2.469c0-0.275,0.225-0.531,0.5-0.531h3c0.275,0,0.5,0.256,0.5,0.531V241
-		C255.508,240.941,254.508,240.906,254,240.906z M265.624,244.659l-1.48,1.479c-0.306-0.389-0.636-0.767-0.995-1.126
-		c-0.358-0.358-0.736-0.688-1.126-0.995l1.479-1.479c0.195-0.194,0.514-0.194,0.708,0l1.414,1.414
-		C265.818,244.146,265.818,244.465,265.624,244.659z"/>
-</g>
-<g id="clock_1_">
-	<g id="clock">
-		<path d="M206,241c-6.617,0-12,5.383-12,12s5.383,12,12,12s12-5.383,12-12S212.617,241,206,241z M211.205,248.55
-			c0.195,0.194,0.195,0.513,0,0.708l-3.268,3.27c0.037,0.153,0.062,0.314,0.062,0.479c0,1.104-0.895,2.006-2,2.006
-			c-0.748,0-1.393-0.512-1.736-1.012H201.5c-0.275,0-0.5-0.249-0.5-0.523v-0.953c0-0.274,0.225-0.523,0.5-0.523h2.764
-			c0.344-0.5,0.988-1.012,1.736-1.012c0.197,0,0.385,0.049,0.565,0.103l3.238-3.237c0.194-0.194,0.513-0.194,0.707,0L211.205,248.55
-			z M206,262c-4.971,0-9-4.029-9-9s4.029-9,9-9s9,4.029,9,9S210.971,262,206,262z"/>
-	</g>
-</g>
-<g id="alarm">
-	<path d="M158,243c-6.065,0-11,4.935-11,11s4.935,11,11,11s11-4.935,11-11S164.065,243,158,243z M158,262c-4.411,0-8-3.589-8-8
-		s3.589-8,8-8s8,3.589,8,8S162.411,262,158,262z M146.277,247.492l-1.244-1.462c-0.537-0.642-0.452-1.606,0.191-2.145l4.196-3.585
-		c0.642-0.536,1.675-0.41,2.214,0.233l1.462,1.719c-2.745,1.08-5.054,3.039-6.571,5.53L146.277,247.492z M171.074,245.992
-		l-1.562,1.867c-1.502-2.503-3.797-4.477-6.535-5.574l1.45-1.732c0.532-0.646,1.564-0.782,2.21-0.25l4.229,3.546
-		C171.512,244.382,171.605,245.346,171.074,245.992z M160.008,254c0,1.104-0.902,2-2.008,2c-0.738,0-1.376-0.404-1.723-1H154.5
-		c-0.275,0-0.5-0.225-0.5-0.5v-0.952c0-0.274,0.225-0.548,0.5-0.548h1.752c0.175-0.5,0.433-0.562,0.748-0.746l0.001-3.738
-		c0-0.275,0.226-0.516,0.5-0.516h0.982c0.274,0,0.517,0.24,0.517,0.516v3.753C159.5,252.613,160.008,253.256,160.008,254z"/>
-</g>
-<g id="eye_x5F_close">
-	<path d="M116.136,250.802c0.063,0.342,0.104,0.691,0.104,1.053c0,1.951-0.937,3.681-2.383,4.772l-1.544,3.949
-		c6.945-1.102,12.814-7.284,12.814-7.284s-2.456-4.301-7.258-6.923L116.136,250.802z M115.909,257.562
-		c1.469-1.455,2.381-3.474,2.381-5.707c0-0.517-0.054-1.021-0.146-1.511c2.108,1.006,3.771,2.176,4.615,2.949
-		C121.635,254.325,119.068,256.289,115.909,257.562z"/>
-	<path d="M116.051,241l-1.621,4.044c-1.279-0.354-2.665-0.614-4.171-0.614c-9.844,0-14.868,8.884-14.868,8.884
-		s5.924,6.306,12.911,7.364L106.637,265h2.515l9.386-24H116.051z M109.39,253.657l-0.734,0.734
-		c-0.538-0.342-0.941-0.859-1.178-1.459l0.813-0.812C108.383,252.796,108.797,253.37,109.39,253.657z M98.195,253.291
-		c0.809-0.743,2.275-1.852,4.161-2.83c-0.08,0.453-0.129,0.917-0.129,1.394c0,2.181,0.871,4.154,2.28,5.602
-		C101.59,256.183,99.292,254.296,98.195,253.291z M109.404,257.768c-2.898-0.415-5.127-2.9-5.127-5.913
-		c0-0.881,0.195-1.714,0.537-2.466c0.998-0.36,2.059-0.656,3.175-0.832c-1.048,0.723-1.737,1.93-1.737,3.298
-		c0,2.177,1.74,3.942,3.903,3.998L109.404,257.768z"/>
-</g>
-<g id="eye_x5F_open">
-	<path d="M62.347,244.583c-9.844,0-14.868,8.906-14.868,8.906s7.064,7.469,14.868,7.469s14.868-7.469,14.868-7.469
-		S72.19,244.583,62.347,244.583z M61.478,253.854l-0.734,0.734c-0.538-0.342-0.941-0.859-1.178-1.459l0.813-0.812
-		C60.471,252.993,60.885,253.567,61.478,253.854z M58.34,252.052c0,2.212,1.794,4.009,4.007,4.009s4.007-1.797,4.007-4.009
-		c0-1.37-0.691-2.579-1.742-3.302c1.092,0.167,2.15,0.441,3.154,0.782c0.357,0.767,0.562,1.618,0.562,2.52
-		c0,3.304-2.678,5.981-5.981,5.981s-5.981-2.678-5.981-5.981c0-0.88,0.195-1.714,0.537-2.466c0.998-0.36,2.059-0.656,3.175-0.832
-		C59.029,249.477,58.34,250.684,58.34,252.052z M54.444,250.658c-0.079,0.453-0.129,0.917-0.129,1.394
-		c0,2.181,0.871,4.154,2.28,5.601c-2.918-1.272-5.216-3.159-6.312-4.164C51.092,252.745,52.559,251.637,54.444,250.658z
-		 M67.997,257.759c1.47-1.455,2.381-3.474,2.381-5.707c0-0.517-0.054-1.021-0.146-1.511c2.108,1.006,3.771,2.176,4.615,2.949
-		C73.723,254.522,71.156,256.486,67.997,257.759z"/>
-</g>
-<g id="link_1_">
-	<path d="M22.799,250.854l-2.133,2.132c-0.277-0.961-0.798-1.885-1.559-2.683l1.57-1.571c0.562-0.561,0.299-1.52-0.266-2.084
-		l-1.641-1.64c-0.518-0.518-1.358-0.79-1.983-0.165l-5.245,5.244c-0.597,0.598-0.379,1.443,0.146,1.978v-0.001
-		c0.009,0.009,0.016,0.019,0.022,0.025l2.805,2.805l-2.121,2.121l-2.805-2.804L9.579,254.2c-0.003-0.004-0.005-0.006-0.008-0.01
-		c-0.002-0.001-0.003-0.003-0.005-0.004l0,0c-1.778-1.793-1.844-4.521-0.145-6.221l5.245-5.244c1.699-1.699,4.435-1.627,6.226,0.164
-		l1.641,1.641C24.381,246.374,24.498,249.153,22.799,250.854z M15.236,248.543c-0.004-0.005-0.01-0.009-0.014-0.013l-2.122,2.121
-		c0.005,0.006,0.01,0.009,0.015,0.014l2.7,2.699c0.565,0.566,0.827,1.523,0.266,2.086l-5.244,5.244
-		c-0.566,0.566-1.528,0.307-2.093-0.26l-1.641-1.639c-0.533-0.533-0.758-1.389-0.156-1.99l1.559-1.559
-		c-0.777-0.781-1.302-1.699-1.582-2.661l-2.098,2.098c-1.704,1.704-1.635,4.442,0.156,6.233l1.64,1.64
-		c1.818,1.817,4.661,1.935,6.336,0.259l5.245-5.244c1.699-1.699,1.582-4.479-0.267-6.328L15.236,248.543z"/>
-</g>
-<g id="star">
-	<path d="M458.906,202h-9.438l-2.922-9h-0.031l-2.939,9H434l7.757,5.455l-2.913,8.862l-0.031,0.002l7.68-5.565l7.679,5.508
-		l-2.909-8.85L458.906,202z"/>
-</g>
-<g id="dislikes_1_">
-	<path d="M410.906,202h-9.438l-2.922-9h-0.031l-2.939,9H386l7.757,5.455l-2.913,8.862l-0.031,0.002l7.68-5.565l7.679,5.508
-		l-2.909-8.85L410.906,202z M398.488,208.278l-3.83,2.77l1.456-4.368l-3.872-2.68h4.785l1.498-4.588l1.489,4.588h4.683l-3.79,2.639
-		l1.472,4.476L398.488,208.278z"/>
-</g>
-<g id="camera_x5F_small_1_">
-	<g>
-		<path d="M355.5,193c-3.037,0-5.5,2.461-5.5,5.5c0,1.176,0.372,2.264,1,3.156V203h-1c0-0.55-0.45-1-1-1h-9c-0.55,0-1,0.45-1,1v7
-			c0,0.55,0.45,1,1,1h9c0.55,0,1-0.45,1-1h1v4.165c0,1.56,1.275,2.835,2.834,2.835h3.332c1.559,0,2.834-1.275,2.834-2.835V206
-			v-2.165v-2.179c0.628-0.893,1-1.98,1-3.156C361,195.461,358.537,193,355.5,193z M353,213v-1h1v1H353z M355,215h-1v-1h1V215z
-			 M357,215h-1v-1h1V215z M355,213v-1h1v1H355z M358,213h-1v-1h1V213z M355.5,202c-1.934,0-3.5-1.566-3.5-3.5s1.566-3.5,3.5-3.5
-			s3.5,1.566,3.5,3.5S357.434,202,355.5,202z"/>
-	</g>
-	<g opacity="0.5">
-		<path d="M358.001,198.5c0,1.38-1.12,2.501-2.501,2.501c-1.303,0-2.359-1.001-2.478-2.271c0.291,0.167,0.622,0.269,0.983,0.269
-			c1.102,0,1.992-0.892,1.992-1.993c0-0.359-0.102-0.691-0.269-0.982C357.002,196.141,358.001,197.199,358.001,198.5z"/>
-	</g>
-</g>
-<g id="router_1_">
-	<g>
-		<path d="M313,210h-1h-15v-5l-1-4v-3v-1h-0.003c-0.009,0,0.034-0.484-0.497-0.484S295.012,197,295.003,197H295v1v3l-1,4v5h-2h-1
-			c-0.55,0-1,0.45-1,1v1v2c0,1.1,0.9,2,2,2v1h20v-1c1.1,0,2-0.9,2-2v-2v-1C314,210.45,313.55,210,313,210z M301,213h-1v-1h1V213z
-			 M303,213h-1v-1h1V213z M305,213h-1v-1h1V213z M307,213h-1v-1h1V213z M311,214h-2v-2h2V214z"/>
-	</g>
-	<g opacity="0.5">
-		<path d="M300.301,193.135l1.414-1.414c1.413,1.519,2.285,3.547,2.285,5.779c0,2.486-1.08,4.721-2.788,6.276l-1.413-1.413
-			c1.346-1.192,2.201-2.928,2.201-4.863C302,195.818,301.353,194.289,300.301,193.135z M289,197.5c0-1.682,0.647-3.211,1.699-4.365
-			l-1.414-1.414c-1.413,1.519-2.285,3.547-2.285,5.779c0,2.486,1.08,4.721,2.788,6.276l1.413-1.413
-			C289.855,201.171,289,199.436,289,197.5z M297.385,197.5c0,0.664-0.348,1.246-0.867,1.582l1.419,1.419
-			c0.876-0.713,1.448-1.786,1.448-3.001c0-0.96-0.363-1.828-0.942-2.507l-1.413,1.413
-			C297.251,196.716,297.385,197.092,297.385,197.5z M293.615,197.5c0-0.408,0.134-0.784,0.355-1.094l-1.413-1.413
-			c-0.579,0.679-0.942,1.547-0.942,2.507c0,1.215,0.572,2.288,1.448,3.001l1.419-1.419
-			C293.963,198.746,293.615,198.164,293.615,197.5z M307,212h-1v1h1V212z M305,212h-1v1h1V212z M303,212h-1v1h1V212z M301,212h-1v1
-			h1V212z"/>
-	</g>
-</g>
-<g id="calendar">
-	<path d="M242,200v16c0,0.55,0.45,1,1,1h21c0.55,0,1-0.45,1-1v-16H242z M247,215h-3v-3h3V215z M247,211h-3v-3h3V211z M247,207h-3v-3
-		h3V207z M251,215h-3v-3h3V215z M251,211h-3v-3h3V211z M251,207h-3v-3h3V207z M255,215h-3v-3h3V215z M255,211h-3v-3h3V211z M255,207
-		h-3v-3h3V207z M259,215h-3v-3h3V215z M259,211h-3v-3h3V211z M259,207h-3v-3h3V207z M263,215h-3v-3h3V215z M263,211h-3v-3h3V211z
-		 M263,207h-3v-3h3V207z M265,196v3h-23v-3c0-0.55,0.45-1,1-1h2v-1c0-0.55,0.45-1,1-1h1c0.55,0,1,0.45,1,1v1h11v-1
-		c0-0.55,0.45-1,1-1h1c0.55,0,1,0.45,1,1v1h2C264.55,195,265,195.45,265,196z"/>
-</g>
-<g id="keys">
-	<g>
-		<path d="M208.487,192.93l-5.993-0.859c-0.272-0.039-0.72-0.07-0.994-0.07c-0.275,0-0.723,0.031-0.995,0.07l-5.992,0.859
-			c-0.272,0.039-0.44,0.289-0.374,0.556l2.753,11.029c0.066,0.267,0.346,0.485,0.621,0.485H199v11l1.876,2h1.094l0.03-0.029V217h-1
-			v-1h1v-1h-1v-1h1v-1h-1v-1h1v-1h-1v-1h1v-1h-1v-1h1v-1l0.333-2h0.334l0.333,2v9.985l1-0.985v-11h1.487
-			c0.275,0,0.555-0.219,0.621-0.485l2.753-11.029C208.928,193.219,208.76,192.969,208.487,192.93z M201.5,197.938
-			c-1.07,0-1.938-0.867-1.938-1.938s0.867-1.938,1.938-1.938s1.938,0.867,1.938,1.938S202.57,197.938,201.5,197.938z"/>
-	</g>
-	<g opacity="0.5">
-		<polygon points="202,207 202,208 201,208 201,209 202,209 202,210 201,210 201,211 202,211 202,212 201,212 201,213 202,213 
-			202,214 201,214 201,215 202,215 202,216 201,216 201,217 202,217 202,218 203,216.985 203,207 202.672,205 202.328,205 		"/>
-	</g>
-	<path d="M211.799,204.264l1.34-0.896c0.229-0.153,0.339-0.49,0.246-0.749l-3.043-8.462l-2.481,10.746
-		c-0.234,0.945-0.86,1.645-1.86,1.694v1.034v0.164c0.189,0.131,0.41,0.143,0.611,0.008l1.082-0.759l6.073,9.278l2.762,0.55
-		l0.902-0.608l0.469-2.722L211.799,204.264z"/>
-</g>
-<g id="group">
-	<path d="M169,214.148c0,1.054,0,2.5,0,2.5c0,0.146-0.121,0.336-0.268,0.336h-22.465c-0.146,0-0.268-0.19-0.268-0.336
-		c0,0,0-1.446,0-2.5c0-1.053,0.199-1.485,1-1.94c0.644-0.366,4.968-2.851,7-3.724v-3.767c-0.624-0.454-1-1.158-1-2.233
-		c0-2.5,0-2.984,0-2.984c0-2.475,1.5-4.5,4.5-4.5s4.5,2.025,4.5,4.5v2.984c0,1.064-0.376,1.767-1,2.223v3.777
-		c2.157,0.873,6.356,3.357,7,3.724C168.801,212.663,169,213.096,169,214.148z M146.259,210.904l0.139-0.08
-		c2.281-1.301,4.102-2.295,5.451-2.977c-0.624-0.305-1.263-0.583-1.849-0.761v-2.628c1-0.316,1-0.806,1-1.546v-1.783
-		c0-1.722-0.913-3.13-3-3.13s-3,1.408-3,3.13c0,0,0,0.044,0,1.783c0,0.748,0,1.237,1,1.554v2.62c-2,0.607-4.639,2.336-5.088,2.591
-		c-0.557,0.316-0.912,0.617-0.912,1.35s0,1.739,0,1.739c0,0.101,0.084,0.233,0.187,0.233h4.427
-		C144.795,212.178,145.242,211.481,146.259,210.904z M174.088,209.678c-0.449-0.255-3.088-1.983-5.088-2.591v-2.628
-		c1-0.316,1-0.806,1-1.546v-1.783c0-1.722-0.913-3.13-3-3.13s-3,1.408-3,3.13c0,0,0,0.044,0,1.783c0,0.748,0,1.237,1,1.554v2.62
-		c-0.579,0.176-1.209,0.448-1.826,0.749c1.915,0.953,4.201,2.277,5.21,2.861l0.358,0.207c1.016,0.577,1.463,1.273,1.645,2.096h4.427
-		c0.103,0,0.187-0.133,0.187-0.233c0,0,0-1.007,0-1.739S174.645,209.994,174.088,209.678z"/>
-</g>
-<g id="pie_x5F_chart">
-	<g>
-		<path d="M98.871,205.035c0-6.162,5.023-11.157,11.185-11.157c3.081,0,5.852,1.249,7.871,3.268l-7.927,7.89v11.157
-			C104,216.192,98.871,211.196,98.871,205.035z"/>
-	</g>
-	<path opacity="0.3" d="M112.044,205.035l7.888-7.89c4.357,4.357,4.357,11.422,0,15.778L112.044,205.035z"/>
-	<path opacity="0.5" d="M111,205.965v11.156c3,0,5.711-1.09,7.89-3.268L111,205.965z"/>
-</g>
-<g id="charts">
-	<path d="M73,215v-14.5c0-0.275-0.225-0.5-0.5-0.5h-4c-0.275,0-0.5,0.225-0.5,0.5V215h-1v-21.5c0-0.275-0.225-0.5-0.5-0.5h-4
-		c-0.275,0-0.5,0.225-0.5,0.5V215h-1v-10.5c0-0.275-0.225-0.5-0.5-0.5h-4c-0.275,0-0.5,0.225-0.5,0.5V215h-1v-4.5
-		c0-0.275-0.225-0.5-0.5-0.5h-4c-0.275,0-0.5,0.225-0.5,0.5v0.5v4h-2v2h27v-1v-1H73z"/>
-</g>
-<g id="stats">
-	<g>
-		<path d="M25.5,197.021c1.381,0,2.5-1.117,2.5-2.5s-1.119-2.5-2.5-2.5s-2.5,1.117-2.5,2.5c0,0.613,0.229,1.166,0.594,1.601
-			l-3.32,5.033c-0.244-0.08-0.502-0.134-0.773-0.134c-1.381,0-2.5,1.117-2.5,2.5c0,0.105,0.019,0.205,0.031,0.307l-4.654,2.058
-			c-0.458-0.525-1.125-0.864-1.877-0.864c-1.381,0-2.5,1.117-2.5,2.5c0,0.474,0.139,0.911,0.367,1.288L4,213.854V192H3H2v25h1h24v-1
-			v-1H4.992l4.497-5.196c0.31,0.138,0.65,0.217,1.011,0.217c1.381,0,2.5-1.117,2.5-2.5c0-0.089-0.018-0.173-0.026-0.26l4.679-2.068
-			c0.457,0.505,1.112,0.828,1.848,0.828c1.381,0,2.5-1.117,2.5-2.5c0-0.562-0.191-1.076-0.505-1.493l3.364-5.1
-			C25.064,196.982,25.277,197.021,25.5,197.021z"/>
-	</g>
-	<g opacity="0.3">
-		<path d="M5.604,212H4v-1h2.471L5.604,212z M7,208H4v-1h3v-3H4v-1h3v-3H4v-1h3v-3H4v-1h3v-3h1v3h3v-3h1v3h3v-3h1v3h3v-3h1v3h3
-			v-0.479c0,0.613,0.229,1.166,0.594,1.601l-0.594,0.9V196h-3v3h1.694l-0.659,1H20v1.084c-0.162-0.036-0.326-0.063-0.5-0.063
-			c-0.172,0-0.338,0.018-0.5,0.051V200h-3v3h1.056C17.02,203.168,17,203.342,17,203.521c0,0.105,0.019,0.205,0.031,0.307L16.64,204
-			H16v0.283l-1,0.441V204h-3v1.531c-0.29-0.222-0.63-0.378-1-0.455V204H8v3h0.056C8.02,207.168,8,207.342,8,207.521
-			c0,0.167,0.037,0.322,0.068,0.479H8v1.232l-1,1.155V208z M16,199h3v-3h-3V199z M12,199h3v-3h-3V199z M12,203h3v-3h-3V203z M8,199
-			h3v-3H8V199z M8,203h3v-3H8V203z M24,192.531V192h-1v2.521C23,193.704,23.396,192.987,24,192.531z M24,199h3v1h-3v3h3v1h-3v3h3v1
-			h-3v3h3v1h-3v3h-1v-3h-3v3h-1v-3h-3v3h-1v-3h-3v3h-1v-3H8v3H7v-2.32L8.454,211H11v-1.03c0.372-0.075,0.708-0.239,1-0.46V211h3v-3
-			h-2.049c0.031-0.155,0.049-0.315,0.049-0.479c0-0.089-0.018-0.173-0.026-0.26l0.59-0.261H15v-0.635l1-0.442V207h3v-1.034
-			c0.162,0.033,0.328,0.055,0.5,0.055s0.338-0.018,0.5-0.051V207h3v-3h-1.049c0.031-0.155,0.049-0.315,0.049-0.479
-			c0-0.18-0.025-0.353-0.062-0.521H23v-3h-0.168L24,198.23V199z M19,208h-3v3h3V208z M23,208h-3v3h3V208z"/>
-	</g>
-</g>
-<g id="notes">
-	<g>
-		<path d="M436,168.5c0,0.275,0.225,0.5,0.5,0.5h19c0.275,0,0.5-0.225,0.5-0.5V150h-20V168.5z M453,158h-13v-1h13V158z M440,153h13
-			v1h-13V153z M439,155h10v1h-10V155z M439,159h14v1h-14V159z M439,161h14v1h-14V161z M439,163h14v1h-14V163z M439,165h5v1h-5V165z"
-			/>
-		<path d="M455,144c-0.553,0-1,0.447-1,1h-1c0-0.553-0.447-1-1-1s-1,0.447-1,1h-1c0-0.553-0.447-1-1-1s-1,0.447-1,1h-1
-			c0-0.553-0.447-1-1-1s-1,0.447-1,1h-1c0-0.553-0.447-1-1-1s-1,0.447-1,1h-1c0-0.553-0.447-1-1-1s-1,0.447-1,1h-1
-			c0-0.553-0.447-1-1-1s-1,0.447-1,1v4h20v-4C456,144.447,455.553,144,455,144z"/>
-	</g>
-</g>
-<g id="airplane">
-	<path d="M409.619,162.115L401,154.918v-6.979c0-1.451-1-2.938-2.966-2.938S395,146.487,395,147.938v6.979l-8.619,7.197
-		c-0.21,0.178-0.381,0.549-0.381,0.823v1.709c0,0.275,0.199,0.396,0.442,0.268l9.558-4.977v6l-2.605,2.11
-		c-0.217,0.168-0.395,0.531-0.395,0.806v0.755c0,0.274,0.216,0.437,0.48,0.359l3.52-1.03c0.265-0.077,1.735-0.077,2,0l3.52,1.03
-		c0.265,0.077,0.48-0.085,0.48-0.359v-0.755c0-0.274-0.178-0.638-0.395-0.807L400,165.938v-6l9.557,4.967
-		c0.244,0.127,0.443,0.007,0.443-0.269v-1.698C410,162.664,409.828,162.293,409.619,162.115z"/>
-</g>
-<g id="coins">
-	<g>
-		<path d="M353.971,168.974c-1.061,0-2.116-0.197-3.109-0.566c-1.149,0.294-2.328,0.474-3.512,0.55
-			c-2.147,0.139-4.325-0.055-6.407-0.601c-1.266-0.332-2.894-0.837-3.604-2.037c-0.482-0.812-0.271-2.029-0.271-2.932
-			c0-0.515,0.222-1.008,0.724-1.469c-0.502-0.464-0.791-0.957-0.791-1.471v-1.959c0-0.689,0.471-1.352,1.344-1.921
-			c-0.234-0.33-0.344-0.673-0.344-1.02v-1.96c0-0.689,0.471-1.35,1.345-1.92c-0.235-0.331-0.345-0.673-0.345-1.021v-1.959
-			c0-1.978,3.018-2.817,4.503-3.164c2.379-0.556,4.952-0.601,7.37-0.296c1.851,0.233,4.355,0.712,5.664,2.199
-			c0.754,0.856,0.519,2.163,0.519,3.22c0,0.27-0.106,0.515-0.242,0.746c4.095,1.339,6.736,5.683,6.089,9.934
-			C362.245,165.642,358.327,168.974,353.971,168.974z M353.957,152.902c-0.879,0-1.753,0.182-2.574,0.49
-			c-3.83,1.535-5.543,6.074-3.714,9.754c1.009,2.009,3.044,3.499,5.282,3.788c4.041,0.686,7.926-2.677,8.055-6.722
-			C361.13,156.315,357.864,152.902,353.957,152.902z M338.433,163.422c0.303,1.075,2.474,1.479,3.375,1.692
-			c1.843,0.438,3.635,0.339,5.503,0.411c-0.381-0.447-0.748-0.923-1.021-1.443c-2.381-0.117-6.393-0.655-6.863-1.359l-0.109-0.169
-			C338.46,162.833,338.433,163.422,338.433,163.422z M338.433,158.521c0.243,0.854,1.955,1.297,2.651,1.499
-			c1.394,0.405,2.837,0.557,4.282,0.615c-0.041-0.643-0.02-1.271,0.06-1.909c-1.868-0.137-3.873-0.441-5.538-1.353
-			c-0.442,0.191-1.293,0.512-1.453,1.038l-0.018,0.056L338.433,158.521z M339.412,153.622c0.292,1.026,2.401,1.444,3.252,1.649
-			c1.243,0.299,2.51,0.417,3.783,0.464c0.382-0.681,0.867-1.281,1.392-1.854c-2.343-0.038-5.879-0.892-6.972-1.407
-			C339.788,152.896,339.412,153.622,339.412,153.622z M340.394,148.722c0.287,1.026,2.402,1.445,3.25,1.65
-			c1.406,0.339,2.86,0.466,4.305,0.469c1.684,0.004,3.328-0.218,4.956-0.643c0.825-0.216,2.319-0.52,2.585-1.486l-0.016-0.055
-			c-0.245-0.878-1.837-1.255-2.583-1.482c-1.602-0.489-3.289-0.642-4.957-0.642c-1.709,0-3.437,0.161-5.075,0.669
-			c-0.79,0.245-2.209,0.558-2.48,1.465L340.394,148.722z"/>
-	</g>
-</g>
-<g id="file_1_">
-	<path d="M312,152v16.5c0,0.275-0.225,0.5-0.5,0.5h-18c-0.275,0-0.5-0.225-0.5-0.5v-23c0-0.275,0.225-0.5,0.5-0.5H305v6.5
-		c0,0.275,0.225,0.5,0.5,0.5H312z M306,145v5.5c0,0.275,0.225,0.5,0.5,0.5h5.5L306,145z"/>
-</g>
-<g id="woman_1_">
-	<path id="woman" d="M263.875,164.618c-0.74-0.421-4.875-1.719-6.875-2.724c0,0,0-1.677,0-2.301c2-0.144,3.715-1.307,4.382-2.031
-		c0.667-0.724-0.634-1.418-1.62-2.568c-0.985-1.15-1.174-2.129-1.174-4.43c0-2.15-1.774-4.522-4.587-4.558
-		c-2.813,0.035-4.587,2.407-4.587,4.558c0,2.301-0.189,3.279-1.174,4.43c-0.986,1.15-2.287,1.845-1.62,2.568
-		c0.667,0.725,2.382,1.888,4.382,2.031c0,0.624,0,2.301,0,2.301c-2,1.005-6.135,2.303-6.875,2.724
-		c-0.682,0.386-1.125,0.866-1.125,1.656v1.226c0,0.275,0.225,0.5,0.5,0.5h21c0.275,0,0.5-0.225,0.5-0.5v-1.226
-		C265,165.484,264.557,165.004,263.875,164.618z"/>
-</g>
-<g id="old_x5F_man">
-	<path d="M217,163.169c-0.644-0.366-4.843-2.851-7-3.724v-2.503c0.624-0.456,1-1.158,1-2.223v-1.648
-		c1.19-0.456,1.979-0.989,1.979-1.193c0-0.41-0.242-0.878-0.539-0.878h-1.126l-1.462-6.676c0.035-0.323-0.166-0.404-0.447-0.301
-		l-2.393,0.755c-0.281,0.104-0.742,0.099-1.023-0.006l-2.393-0.681c-0.281-0.104-0.484,0.003-0.449,0.328l-1.458,6.58h-1.128
-		c-0.297,0-0.539,0.468-0.539,0.878c0,0.204,0.789,0.737,1.979,1.193c0,0.418,0,0.947,0,1.648c0,1.075,0.376,1.779,1,2.233v2.492
-		c-2.032,0.873-6.356,3.357-7,3.724c-0.801,0.455-1,0.888-1,1.94c0,0.621,0,2.391,0,2.391c0,0.275,0.225,0.5,0.5,0.5h22
-		c0.275,0,0.5-0.225,0.5-0.5c0,0,0-1.77,0-2.391C218,164.057,217.801,163.624,217,163.169z"/>
-</g>
-<g id="luggage">
-	<g opacity="0.5">
-		<path d="M151,155c-0.542,0-1-0.458-1-1v-2c0-0.542,0.458-1,1-1h14c0.542,0,1,0.458,1,1v2c0,0.542-0.458,1-1,1H151z M165,167
-			c0.542,0,1-0.458,1-1v-8c0-0.542-0.458-1-1-1h-14c-0.542,0-1,0.458-1,1v8c0,0.542,0.458,1,1,1H165z"/>
-	</g>
-	<path d="M165,149h-4v-4h0.5c0.276,0,0.5-0.224,0.5-0.5v-1c0-0.276-0.224-0.5-0.5-0.5h-7c-0.276,0-0.5,0.224-0.5,0.5v1
-		c0,0.276,0.224,0.5,0.5,0.5h0.5v4h-4c-1.65,0-3,1.35-3,3v14c0,1.65,1.35,3,3,3h1c0,0.553,0.447,1,1,1s1-0.447,1-1h8
-		c0,0.553,0.447,1,1,1s1-0.447,1-1h1c1.65,0,3-1.35,3-3v-14C168,150.35,166.65,149,165,149z M159,145v4h-2v-4H159z M166,166
-		c0,0.542-0.458,1-1,1h-14c-0.542,0-1-0.458-1-1v-8c0-0.542,0.458-1,1-1h14c0.542,0,1,0.458,1,1V166z M166,154c0,0.542-0.458,1-1,1
-		h-14c-0.542,0-1-0.458-1-1v-2c0-0.542,0.458-1,1-1h14c0.542,0,1,0.458,1,1V154z"/>
-</g>
-<g id="wifi_x5F_alt">
-	<path d="M112.508,153.023c0-1.385-1.123-2.508-2.508-2.508s-2.508,1.123-2.508,2.508c0,1.107,0.723,2.036,1.718,2.368L108,169h4
-		l-1.21-13.608C111.786,155.06,112.508,154.131,112.508,153.023z"/>
-	<path d="M102.331,145.152l-1.414-1.412c-2.413,2.361-3.917,5.648-3.917,9.283s1.504,6.922,3.917,9.283l1.414-1.412
-		c-2.052-2-3.331-4.787-3.331-7.871S100.279,147.152,102.331,145.152z"/>
-	<path d="M104.558,147.379c-1.483,1.43-2.415,3.426-2.415,5.645c0,2.217,0.932,4.215,2.414,5.645l1.414-1.414
-		c-1.121-1.066-1.828-2.564-1.828-4.23s0.708-3.162,1.828-4.23L104.558,147.379z"/>
-	<path d="M119.083,143.74l-1.414,1.412c2.052,2,3.331,4.787,3.331,7.871s-1.279,5.871-3.331,7.871l1.414,1.412
-		c2.413-2.361,3.917-5.648,3.917-9.283S121.496,146.102,119.083,143.74z"/>
-	<path d="M115.442,147.379l-1.413,1.414c1.12,1.068,1.828,2.564,1.828,4.23s-0.707,3.164-1.828,4.23l1.414,1.414
-		c1.482-1.43,2.414-3.428,2.414-5.645C117.857,150.805,116.926,148.809,115.442,147.379z"/>
-</g>
-<g id="bus">
-	<g opacity="0.3">
-		<path d="M52,148.5c0-0.275,0.225-0.5,0.5-0.5h19c0.275,0,0.5,0.225,0.5,0.5v9.711c0,0.275-0.212,0.575-0.472,0.667
-			c0,0-3.165,1.227-9.528,1.227s-9.528-1.227-9.528-1.227c-0.26-0.092-0.472-0.392-0.472-0.667V148.5z"/>
-	</g>
-	<path d="M73.106,146.212l-0.659-1.317C72.201,144.402,71.55,144,71,144H53c-0.55,0-1.201,0.402-1.447,0.895l-0.664,1.329
-		C48.977,146.915,46,148.13,46,149c0,1.281,0,4,0,4c0,0.55,0.517,1,1.066,1h1c0.55,0,0.934-0.45,0.934-1c0,0,0-3.266,0-4
-		c0-0.241,0.429-0.553,1-0.863v9.862V168.5c0,0.275,0.225,0.5,0.5,0.5h2c0.275,0,0.5-0.225,0.5-0.5V167h18v1.5
-		c0,0.275,0.225,0.5,0.5,0.5h2c0.275,0,0.5-0.225,0.5-0.5v-10.501v-9.864c0.571,0.311,1,0.624,1,0.865c0,0.734,0,4,0,4
-		c0,0.55,0.45,1,1,1h1c0.55,0,1-0.45,1-1c0,0,0-2.719,0-4C78,148.125,75.007,146.901,73.106,146.212z M52,148.5
-		c0-0.275,0.225-0.5,0.5-0.5h19c0.275,0,0.5,0.225,0.5,0.5v9.711c0,0.275-0.212,0.575-0.472,0.667c0,0-3.165,1.227-9.528,1.227
-		s-9.528-1.227-9.528-1.227c-0.26-0.092-0.472-0.392-0.472-0.667V148.5z M55,164h-3l-1-0.9V161l4,1V164z M66,166h-7v-2h7V166z
-		 M69,164v-2l4-1v2.1l-1,0.9H69z"/>
-</g>
-<g id="pencil">
-	<path d="M19.687,147.232l0.51,0.511l3.06,3.061l0.511,0.51l0.51-0.51l1.021-1.02l0.509-0.512c0.281-0.279,0.282-0.738,0-1.021
-		l-3.059-3.059c-0.282-0.282-0.741-0.281-1.021-0.001l-0.511,0.51l-1.02,1.021L19.687,147.232z"/>
-	<rect x="4.996" y="154.04" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -106.8404 55.915)" width="18.158" height="5.771"/>
-	<path d="M4.379,162.54l-2.364,6.152c-0.101,0.262,0.03,0.393,0.292,0.292l6.152-2.363L4.379,162.54z"/>
-</g>
-<g id="notes_x5F_2">
-	<g>
-		<path d="M440,99v-1.979c0-0.55,0.471-1.021,1.021-1.021H443v-0.916c0-0.55,0.45-1.084,1-1.084h4c0.55,0,1,0.534,1,1.084V96h1.979
-			c0.551,0,1.021,0.472,1.021,1.021V99c0,0.55-0.471,1-1.021,1h-9.957C440.471,100,440,99.55,440,99z M456,97.5v23
-			c0,0.275-0.225,0.5-0.5,0.5h-19c-0.275,0-0.5-0.225-0.5-0.5v-23c0-0.275,0.225-0.5,0.5-0.5h2.5v3c0,0.55,0.45,1,1,1h12
-			c0.55,0,1-0.45,1-1v-3h2.5C455.775,97,456,97.225,456,97.5z M439,108h10v-1h-10V108z M444,117h-5v1h5V117z M453,115h-14v1h14V115z
-			 M453,113h-14v1h14V113z M453,111h-14v1h14V111z M453,109h-13v1h13V109z M453,105h-14v1h14V105z M453,103h-13v1h13V103z"/>
-	</g>
-</g>
-<g id="cars_1_">
-	<path d="M416.5,102h-1.9c0,0-0.826-1.809-1.143-2.475c-0.52-1.057-0.816-1.525-2.316-1.525H408h-5.641
-		c-1.312,0-1.799,0.484-2.316,1.525l-0.455,0.896c0.779,0.224,1.6,0.797,1.6,0.797s0.323-0.559,0.439-0.814
-		c0.125-0.22,0.295-0.404,0.607-0.404h9.031c0.312,0,0.482,0.185,0.607,0.404c0.168,0.368,0.688,2.596,0.688,2.596H402.25l1.5,4
-		h0.938c0.992,0,1.312,0.277,1.312,1.27V111h4v2h-5v1h8v1.5c0,0.275,0.225,0.5,0.5,0.5h2c0.275,0,0.5-0.225,0.5-0.5V105l-0.417-1
-		h0.917c0.276,0,0.5-0.224,0.5-0.5v-1C417,102.224,416.776,102,416.5,102z M415,108l-1,1h-2v-2l3-1.1V108z"/>
-	<g id="cars">
-		<g id="car_1_">
-			<path d="M404.5,108h-1.9l-1.643-4.475c-0.566-1.135-1.004-1.525-2.316-1.525h-11.281c-1.312,0-1.75,0.391-2.316,1.525L383.4,108
-				h-1.9c-0.276,0-0.5,0.224-0.5,0.5v1c0,0.276,0.224,0.5,0.5,0.5h0.917L382,111v11.5c0,0.275,0.225,0.5,0.5,0.5h2
-				c0.275,0,0.5-0.225,0.5-0.5V121h8h8v1.5c0,0.275,0.225,0.5,0.5,0.5h2c0.275,0,0.5-0.225,0.5-0.5V111l-0.417-1h0.917
-				c0.276,0,0.5-0.224,0.5-0.5v-1C405,108.224,404.776,108,404.5,108z M386.627,104.404c0.125-0.22,0.295-0.404,0.607-0.404h11.531
-				c0.312,0,0.482,0.185,0.607,0.404c0.168,0.368,1.188,4.596,1.188,4.596h-15.121C385.439,109,386.459,104.772,386.627,104.404z
-				 M387,115h-3l-1-1v-2.1l4,1.1V115z M397,119h-8v-2h8V119z M403,114l-1,1h-3v-2l4-1.1V114z"/>
-			<path opacity="0.3" d="M386.627,104.404c0.125-0.22,0.295-0.404,0.607-0.404h11.531c0.312,0,0.482,0.185,0.607,0.404
-				c0.168,0.368,1.188,4.596,1.188,4.596h-15.121C385.439,109,386.459,104.772,386.627,104.404z"/>
-		</g>
-	</g>
-	<path opacity="0.3" d="M402.25,103h10.311c0,0-0.52-2.228-0.688-2.596c-0.125-0.22-0.295-0.404-0.607-0.404H407h-4.766
-		c-0.312,0-0.482,0.185-0.607,0.404c-0.116,0.256-0.439,0.814-0.439,0.814L402.25,103z"/>
-</g>
-<g id="search_1_">
-	<path d="M361.602,117.755l-5.878-5.879c0.956-1.481,1.521-3.24,1.521-5.132c0-5.235-4.262-9.494-9.496-9.494
-		c-5.236,0-9.494,4.259-9.494,9.494c0,5.236,4.258,9.495,9.494,9.495c1.891,0,3.649-0.562,5.132-1.519l5.878,5.878
-		c0.195,0.196,0.518,0.196,0.712,0l2.132-2.132C361.799,118.271,361.799,117.951,361.602,117.755z M341.27,106.744
-		c0-3.571,2.906-6.479,6.479-6.479c3.573,0,6.479,2.907,6.479,6.479c0,3.573-2.905,6.479-6.479,6.479
-		C344.176,113.224,341.27,110.317,341.27,106.744z"/>
-</g>
-<g id="road">
-	<path d="M305.23,121H316l-8.615-24h-4.166l0.396,6h-3.23l0.407-6h-4.176L288,121h10.77l0.807-9h4.848L305.23,121z M299.756,110
-		l0.539-6h3.41l0.539,6H299.756z"/>
-</g>
-<g id="binoculars_1_">
-	<g>
-		<g>
-			<rect x="257" y="120" width="9" height="1"/>
-		</g>
-		<g>
-			<rect x="242" y="120" width="9" height="1"/>
-		</g>
-		<g>
-			<path d="M264,109l-3-9h-1v-3l-4,1v2h-1v-1h-2v1h-1v-2l-4-1v3h-1l-3,9l-2,7v3h9v-3l-1-7h8l-1,7v3h9v-3L264,109z M252,107h-1v-5h1
-				V107z M257,107h-1v-5h1V107z"/>
-		</g>
-	</g>
-	<g opacity="0.5">
-		<path d="M257,102v5h-1v-5H257z M251,102v5h1v-5H251z"/>
-	</g>
-</g>
-<g id="parents">
-	<path d="M211,115.208c-0.644-0.366-4.843-2.851-7-3.724v-3.777c0.624-0.456,1-1.158,1-2.223V102.5c0-2.475-1.5-4.5-4.5-4.5
-		s-4.5,2.025-4.5,4.5c0,0,0,0.484,0,2.984c0,1.075,0.376,1.779,1,2.233v3.767c-2.032,0.873-6.356,3.357-7,3.724
-		c-0.801,0.455-1,0.888-1,1.94c0,0.43,0,2.352,0,2.352c0,0.275,0.225,0.5,0.5,0.5h22c0.275,0,0.5-0.225,0.5-0.5c0,0,0-1.922,0-2.352
-		C212,116.096,211.801,115.663,211,115.208z M219.982,117.072c-0.639-0.363-2.982-1.483-4.982-2.352c0,0,0-1.448,0-1.987
-		c2-0.124,3.336-1.128,3.912-1.754c0.576-0.625-0.482-1.225-1.334-2.218c-0.851-0.994-0.983-1.839-0.983-3.826
-		c0-1.856-1.516-3.905-3.945-3.936c-2.43,0.03-3.954,2.079-3.954,3.936c0,1.987-0.159,2.832-1.01,3.826
-		c-0.852,0.993-2.011,1.593-1.435,2.218c0.179,0.194,0.424,0.426,0.725,0.655c0.469,0.248,0.941,0.504,1.407,0.763
-		c0.467,0.169,0.998,0.298,1.616,0.336c0,0.143,0,0.124,0,0.35c0.476,0.272,0.921,0.528,1.306,0.747
-		c1.413,0.803,1.694,1.61,1.694,2.888V120h7.542c0.273,0,0.458-0.229,0.458-0.504v-0.993
-		C221,117.82,220.571,117.405,219.982,117.072z"/>
-</g>
-<g id="magnet">
-	<g>
-		<path d="M162,105v4.979c0,2.418-1.415,5.021-4.441,5.021c-0.021,0-0.038-0.002-0.059-0.003c-0.021,0.001-0.038,0.003-0.059,0.003
-			c-3.026,0-4.441-2.604-4.441-5.021V105h-6v5c0,6.28,4.534,11,10.441,11c0.02,0,0.039-0.003,0.059-0.003s0.039,0.003,0.059,0.003
-			c5.907,0,10.441-4.72,10.441-11v-5H162z"/>
-	</g>
-	<g opacity="0.5">
-		<path d="M167,98h-4c-0.55,0-1,0.45-1,1v4h6v-4C168,98.45,167.55,98,167,98z"/>
-		<path d="M152,98h-4c-0.55,0-1,0.45-1,1v4h6v-4C153,98.45,152.55,98,152,98z"/>
-	</g>
-</g>
-<g id="fire">
-	<path d="M113.7,101.438c0.247,0.535,2.762,5.678,0.61,5.267c-2.153-0.411-5.343-6.679-4.94-10.458c0,0-4.072,3.04-3.321,7.51
-		c0.749,4.471,1.815,7.771-1.007,7.661s-1.213-3.558-0.625-5.208c-4.708,2.791-4.003,7.464-3.774,9.005
-		c0.191,1.285,0.786,4.286,4,5.5c4.9,1.075,6.821-7.039,6.654-9.761c1.333,1.576,2.2,3.788,2.02,5.246
-		c-0.353,2.857-2.752,5.119-0.45,4.867c3.477-0.381,6.036-2.062,6.991-6.352C120.899,110.037,119.715,104.286,113.7,101.438z"/>
-</g>
-<g id="snowflake_2_">
-	<path d="M75,108h-1.586l0.943-0.944c0.912-0.912-0.501-2.327-1.414-1.414L70.586,108h-2.997l-1.059-2.116L68.414,104H72
-		c1.29,0,1.29-2,0-2h-1.586l1.486-1.485c0.912-0.912-0.501-2.327-1.414-1.414L69,100.586V99c0-1.29-2-1.29-2,0v3.586l-1.884,1.884
-		L63,103.411v-2.997l2.357-2.358c0.912-0.912-0.502-2.326-1.414-1.414L63,97.586V96c0-1.29-2-1.29-2,0v1.586l-0.943-0.944
-		c-0.912-0.912-2.326,0.502-1.414,1.414L61,100.414v2.997l-2.115,1.06L57,102.586V99c0-1.29-2-1.29-2,0v1.586l-1.485-1.485
-		c-0.912-0.912-2.326,0.502-1.414,1.414L53.586,102H52c-1.29,0-1.29,2,0,2h3.586l1.885,1.884L56.412,108h-2.998l-2.357-2.358
-		c-0.913-0.913-2.326,0.502-1.414,1.414L50.586,108H49c-1.29,0-1.29,2,0,2h1.586l-0.943,0.944c-0.912,0.911,0.502,2.325,1.414,1.414
-		L53.414,110h2.998l1.059,2.116L55.586,114H52c-1.29,0-1.29,2,0,2h1.586l-1.484,1.485c-0.912,0.911,0.502,2.325,1.414,1.414
-		L55,117.414V119c0,1.29,2,1.29,2,0v-3.586l1.885-1.885L61,114.588v2.998l-2.357,2.358c-0.912,0.912,0.502,2.326,1.414,1.414
-		L61,120.414V122c0,1.29,2,1.29,2,0v-1.586l0.943,0.944c0.912,0.912,2.326-0.502,1.414-1.414L63,117.586v-2.998l2.115-1.059
-		L67,115.414V119c0,1.29,2,1.29,2,0v-1.586l1.485,1.485c0.912,0.912,2.326-0.502,1.414-1.414L70.414,116H72c1.29,0,1.29-2,0-2
-		h-3.586l-1.885-1.885L67.588,110h2.998l2.357,2.358c0.911,0.911,2.326-0.502,1.414-1.414L73.414,110H75C76.29,110,76.29,108,75,108
-		z M64.568,111.567L62,112.853l-2.568-1.285L58.147,109l1.284-2.567L62,105.147l2.568,1.283l1.284,2.568L64.568,111.567z"/>
-</g>
-<g id="home">
-	<polygon points="22,103.05 22,96 18,96 18,99.082 14.517,95.628 14.515,95.58 1.033,109 5,109 5,121 12,121 12,113 17,113 17,121 
-		24,121 24,109 28,109 	"/>
-</g>
-<g id="heart_x5F_empty_1_">
-	<path id="heart_x5F_empty" d="M446.062,53.402c-3.982-6.1-11.781-2.102-11.781,3.523c0,4.338,6.781,8.074,11.781,14.91
-		c5-6.836,11.781-10.572,11.781-14.91C457.844,51.301,450.293,47.303,446.062,53.402z M446.062,67.833
-		c-1.537-1.776-3.135-3.342-4.55-4.728c-2.55-2.495-4.731-4.632-4.731-6.18c0-2.336,2.174-4.081,4.119-4.081
-		c1.201,0,2.234,0.647,3.068,1.925L446,57.88l2.117-3.053c0.898-1.297,2.012-1.982,3.217-1.982c1.893,0,4.01,1.745,4.01,4.081
-		c0,1.548-2.184,3.685-4.711,6.158C449.197,64.491,447.598,66.057,446.062,67.833z"/>
-</g>
-<g id="note_1_">
-	<path d="M403.19,60.532c-0.848,0.339-0.18-0.339-0.18-0.339s1.423-2.092,0.407-3.786c-0.793-1.321-3.418-1.075-4.418-1.669v14.154
-		c0,0.037-0.018,0.07-0.023,0.106c-0.154,1.504-1.607,3.034-3.695,3.712c-2.561,0.829-5.104,0.063-5.679-1.711
-		s1.033-3.887,3.594-4.717c1.166-0.378,2.05-0.32,2.832-0.205c0-0.586,0.011-16.471,0.011-16.471c0-0.335,0.271-0.607,0.607-0.607
-		h1.743c0.336,0,0.61,0.272,0.61,0.607v0.549c2,1.004,6.178,1.955,6.85,4.639C406.654,58.02,404.036,60.193,403.19,60.532z"/>
-</g>
-<g id="music_1_">
-	<path d="M360,49.385v0.5v3.384V67h-0.008c-0.057,1-1.271,2.294-3.047,2.87c-2.105,0.682-4.196-0.101-4.67-1.562
-		c-0.473-1.459,0.85-3.274,2.957-3.958c0.98-0.316,1.955-0.424,2.768-0.222v-9.802l-11,2.935V70h-0.008
-		c-0.057,1-1.271,2.292-3.047,2.868c-2.105,0.682-4.196-0.103-4.67-1.563c-0.473-1.459,0.85-3.273,2.957-3.957
-		c0.98-0.317,1.955-0.425,2.768-0.223V57.32v-3.936v-0.04c0-0.275,0.217-0.56,0.482-0.632l14.035-3.696
-		C359.783,48.944,360,49.109,360,49.385z"/>
-</g>
-<g id="bin">
-	<path d="M311.5,49H306v-2c0-1.1-0.9-2-2-2h-4c-1.1,0-2,0.9-2,2v2h-5.5c-0.275,0-0.5,0.225-0.5,0.5v1c0,0.275,0.225,0.5,0.5,0.5h19
-		c0.275,0,0.5-0.225,0.5-0.5v-1C312,49.225,311.775,49,311.5,49z M300.042,49H300v-2h4v2H300.042z"/>
-	<path d="M310.294,52H293.5c-0.39,0-0.5,0.176-0.5,0.5v20.174c0,0,0.11,0.326,0.5,0.326h16.794c0.39,0,0.706-0.176,0.706-0.5V52.413
-		C311,52.089,310.684,52,310.294,52z M298,69.5c0,0.276-0.224,0.5-0.5,0.5h-1c-0.276,0-0.5-0.224-0.5-0.5v-14
-		c0-0.276,0.224-0.5,0.5-0.5h1c0.276,0,0.5,0.224,0.5,0.5V69.5z M303,69.5c0,0.275-0.225,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5
-		v-14c0-0.275,0.225-0.5,0.5-0.5h1c0.275,0,0.5,0.225,0.5,0.5V69.5z M308,69.5c0,0.276-0.224,0.5-0.5,0.5h-1
-		c-0.276,0-0.5-0.224-0.5-0.5v-14c0-0.276,0.224-0.5,0.5-0.5h1c0.276,0,0.5,0.224,0.5,0.5V69.5z"/>
-	<path opacity="0.3" d="M298,69.5c0,0.275-0.225,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5v-14c0-0.275,0.225-0.5,0.5-0.5h1
-		c0.275,0,0.5,0.225,0.5,0.5V69.5z M303,69.5c0,0.275-0.225,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5v-14
-		c0-0.275,0.225-0.5,0.5-0.5h1c0.275,0,0.5,0.225,0.5,0.5V69.5z M308,69.5c0,0.275-0.225,0.5-0.5,0.5h-1c-0.275,0-0.5-0.225-0.5-0.5
-		v-14c0-0.275,0.225-0.5,0.5-0.5h1c0.275,0,0.5,0.225,0.5,0.5V69.5z"/>
-</g>
-<g id="print">
-	<path d="M265.5,56h-3c-0.275,0-0.5,0.225-0.5,0.5v3c0,0.275-0.225,0.5-0.5,0.5h-15.031c-0.275,0-0.469-0.225-0.469-0.5v-3
-		c0-0.275-0.256-0.5-0.531-0.5H242.5c-0.275,0-0.5,0.225-0.5,0.5v13.969c0,0.275,0.225,0.531,0.5,0.531h3.703
-		c0.275,0,0.555-0.234,0.621-0.5l0.383-2.008c0.066-0.266,0.347-0.492,0.621-0.492h12.344c0.274,0,0.555,0.219,0.621,0.484
-		l0.383,2.016c0.066,0.266,0.346,0.5,0.621,0.5h3.703c0.275,0,0.5-0.256,0.5-0.531V56.5C266,56.225,265.775,56,265.5,56z
-		 M244,59.021c-0.553,0-1-0.446-1-1c0-0.552,0.447-1,1-1s1,0.448,1,1C245,58.575,244.553,59.021,244,59.021z"/>
-	<path d="M259.621,69.484C259.555,69.219,259.275,69,259,69h-10c-0.275,0-0.555,0.219-0.621,0.484l-0.758,3.031
-		C247.555,72.781,247.725,73,248,73h12c0.275,0,0.445-0.219,0.379-0.484L259.621,69.484z"/>
-	<path d="M260.947,58.44c0.029,0.273-0.172,0.497-0.447,0.497h-13c-0.275,0-0.477-0.224-0.447-0.497l1.895-8.943
-		C248.977,49.224,249.225,49,249.5,49h9c0.275,0,0.523,0.224,0.553,0.497L260.947,58.44z"/>
-</g>
-<g id="train">
-	<g>
-		<path d="M216,65v-4l-1.696-10.033C214.137,49.879,213.1,49,211.999,49h-11.997c-1.101,0-2.138,0.879-2.306,1.967L196,61v4
-			c0,0,1,4,4,4c1,0,1.357,0,1.357,0L196,75h4l3.188-6h5.54L212,75h4l-5.438-6c0,0,0.438,0,1.438,0C215,69,216,65,216,65z M202,66
-			l-4-1v-3l4,2V66z M206,62.312c-4,0-8-2.312-8-2.312l1.546-8.719c0.018-0.112,0.214-0.281,0.329-0.281h12.296
-			c0.115,0,0.312,0.169,0.329,0.282L214,60C214,60,210,62.312,206,62.312z M210,66v-2l4-2v3L210,66z"/>
-	</g>
-	<g opacity="0.3">
-		<path d="M206,62.312c-4,0-8-2.312-8-2.312l1.546-8.719c0.018-0.112,0.214-0.281,0.329-0.281h12.296
-			c0.115,0,0.312,0.169,0.329,0.282L214,60C214,60,210,62.312,206,62.312z"/>
-	</g>
-</g>
-<g id="beach_x5F_umbrella">
-	<path d="M157.195,61.602c0.309,0.179,0.569,0.4,0.797,0.641l-6.1,10.565h-2.363l6.686-11.582
-		C156.549,61.3,156.879,61.418,157.195,61.602z M167.85,67.69c-0.197,0.341-0.411,0.666-0.635,0.98
-		c0.1-1.759-0.752-3.507-2.381-4.447c-1.301-0.752-2.801-0.805-4.107-0.311c-0.098-1.644-0.987-3.207-2.519-4.091
-		c-1.518-0.878-3.3-0.878-4.763-0.16c-0.236-1.357-1.029-2.609-2.316-3.352c-1.66-0.959-3.646-0.801-5.129,0.218
-		c0.17-0.38,0.361-0.754,0.573-1.122c3.22-5.576,10.147-7.663,15.867-4.963l0.538-0.932c0.281-0.487,0.91-0.656,1.398-0.376
-		c0.487,0.283,0.656,0.911,0.374,1.4l-0.538,0.932C169.412,55.069,171.068,62.114,167.85,67.69z M161.495,52.043
-		c-1.352-0.611-2.79-0.921-4.274-0.921c-2.53,0-4.969,0.91-6.867,2.562l-0.264,0.229l0.334,0.105
-		c2.174,0.688,3.021,1.224,4.087,3.24l0.159,0.301l0.181-0.288c2.984-4.762,6.53-4.855,6.565-4.855L161.495,52.043z M163.303,53.085
-		l-0.285,0.256c0.018,0.03,1.709,3.148-0.923,8.113l-0.159,0.301l0.34-0.013c0.169-0.007,0.33-0.01,0.485-0.01
-		c1.913,0,2.807,0.506,4.364,1.931l0.258,0.235l0.066-0.343C168.229,59.565,166.6,55.455,163.303,53.085z"/>
-	<path opacity="0.5" d="M161.495,52.043c-1.352-0.611-2.79-0.921-4.274-0.921c-2.53,0-4.969,0.91-6.867,2.562l-0.264,0.229
-		l0.334,0.105c2.174,0.688,3.021,1.224,4.087,3.24l0.159,0.301l0.181-0.288c2.984-4.762,6.53-4.855,6.565-4.855L161.495,52.043z"/>
-	<path opacity="0.5" d="M163.303,53.085l-0.285,0.256c0.018,0.03,1.709,3.148-0.923,8.113l-0.159,0.301l0.34-0.013
-		c0.169-0.007,0.33-0.01,0.485-0.01c1.913,0,2.807,0.506,4.364,1.931l0.258,0.235l0.066-0.343
-		C168.229,59.565,166.6,55.455,163.303,53.085z"/>
-</g>
-<g id="heart">
-	<path d="M110,53.402c-3.982-6.1-11.781-2.102-11.781,3.523C98.219,61.264,105,65,110,71.836c5-6.836,11.781-10.572,11.781-14.91
-		C121.781,51.301,114.23,47.303,110,53.402z"/>
-</g>
-<g id="camera">
-	<g>
-		<circle cx="62" cy="63" r="2.75"/>
-	</g>
-	<g>
-		<path d="M71.599,54h-3.41c-0.013-0.035-0.016-0.069-0.031-0.105l-0.315-0.789C67.379,51.947,65.979,51,64.732,51h-5.465
-			c-1.247,0-2.646,0.947-3.11,2.105l-0.315,0.789c-0.015,0.036-0.018,0.07-0.031,0.105h-3.41C50.531,54,49,55.531,49,57.401v10.197
-			C49,69.469,50.531,71,52.401,71h19.197C73.469,71,75,69.469,75,67.599V57.401C75,55.531,73.469,54,71.599,54z M62,68.25
-			c-2.895,0-5.25-2.355-5.25-5.25s2.355-5.25,5.25-5.25s5.25,2.355,5.25,5.25S64.895,68.25,62,68.25z M72,58h-2v-1h2V58z"/>
-	</g>
-	<g opacity="0.3">
-		<rect x="70" y="57" width="2" height="1"/>
-	</g>
-</g>
-<g id="envelope">
-	<path d="M14,65L2,53h24L14,65z M14,67l-5-5l-7,7h24l-7-7L14,67z M20,61l6,6V55L20,61z M2,55v12l6-6L2,55z"/>
-</g>
-<g id="magic">
-	<polygon points="454.551,10 453.768,12.666 451.102,13.449 453.768,14.232 454.551,16.898 455.334,14.232 458,13.449 
-		455.334,12.666 	"/>
-	<polygon points="449.551,15.102 448.541,18.541 445.102,19.551 448.541,20.561 449.551,24 450.561,20.561 454,19.551 
-		450.561,18.541 	"/>
-	<path d="M450.035,6.89l-15.717,15.717c-0.194,0.194-0.194,0.513,0,0.707l1.414,1.414c0.194,0.194,0.513,0.194,0.707,0
-		l15.717-15.717L450.035,6.89z"/>
-	<path d="M457.771,3.396c0.194-0.194,0.194-0.513,0-0.707l-1.414-1.414c-0.194-0.194-0.513-0.194-0.707,0l-4.021,4.021l2.121,2.121
-		L457.771,3.396z"/>
-	<polygon points="439,9 434.051,7.562 439,6 440.5,1 442,6 446.922,7.516 442,9 440.531,13.984 	"/>
-</g>
-<g id="film">
-	<path d="M408,0h-20c-0.55,0-1,0.45-1,1v24c0,0.55,0.45,1,1,1h20c0.55,0,1-0.45,1-1V1C409,0.45,408.55,0,408,0z M405,20v-2h3v2H405z
-		 M408,22v2h-3v-2H408z M405,16v-2h3v2H405z M405,12v-2h3v2H405z M405,8V6h3v2H405z M405,4V2h3v2H405z M392,12V2h12v10H392z M404,14
-		v10h-12V14H404z M388,20v-2h3v2H388z M391,22v2h-3v-2H391z M388,16v-2h3v2H388z M388,12v-2h3v2H388z M388,8V6h3v2H388z M388,4V2h3
-		v2H388z"/>
-	<path opacity="0.3" d="M404,2h-12v10h12V2z M404,14h-12v10h12V14z"/>
-</g>
-<g id="user_x5F_remove">
-	<path d="M336.5,13c-0.275,0-0.5-0.225-0.5-0.5v-1c0-0.275,0.225-0.5,0.5-0.5h7c0.275,0,0.5,0.225,0.5,0.5v1
-		c0,0.275-0.225,0.5-0.5,0.5H336.5z"/>
-	<g id="user_5_">
-		<path id="user_8_" d="M361,19.208c-0.644-0.366-4.843-2.851-7-3.724v-3.777c0.624-0.456,1-1.158,1-2.223V6.5
-			c0-2.475-1.5-4.5-4.5-4.5S346,4.025,346,6.5c0,0,0,0.484,0,2.984c0,1.075,0.376,1.779,1,2.233v3.767
-			c-2.032,0.873-6.356,3.357-7,3.724c-0.801,0.455-1,0.888-1,1.94c0,0.43,0,2.352,0,2.352c0,0.275,0.225,0.5,0.5,0.5h22
-			c0.275,0,0.5-0.225,0.5-0.5c0,0,0-1.922,0-2.352C362,20.096,361.801,19.663,361,19.208z"/>
-	</g>
-</g>
-<g id="user_x5F_add">
-	<path d="M295.5,11H292V7.5c0-0.275-0.225-0.5-0.5-0.5h-1c-0.275,0-0.5,0.225-0.5,0.5V11h-3.5c-0.275,0-0.5,0.225-0.5,0.5v1
-		c0,0.275,0.225,0.5,0.5,0.5h3.5v3.5c0,0.275,0.225,0.5,0.5,0.5h1c0.275,0,0.5-0.225,0.5-0.5V13h3.5c0.275,0,0.5-0.225,0.5-0.5v-1
-		C296,11.225,295.775,11,295.5,11z"/>
-	<g id="user_3_">
-		<path id="user_4_" d="M313,19.208c-0.644-0.366-4.843-2.851-7-3.724v-3.777c0.624-0.456,1-1.158,1-2.223V6.5
-			c0-2.475-1.5-4.5-4.5-4.5S298,4.025,298,6.5c0,0,0,0.484,0,2.984c0,1.075,0.376,1.779,1,2.233v3.767
-			c-2.032,0.873-6.356,3.357-7,3.724c-0.801,0.455-1,0.888-1,1.94c0,0.43,0,2.352,0,2.352c0,0.275,0.225,0.5,0.5,0.5h22
-			c0.275,0,0.5-0.225,0.5-0.5c0,0,0-1.922,0-2.352C314,20.096,313.801,19.663,313,19.208z"/>
-	</g>
-</g>
-<g id="car">
-	<path d="M266.5,9h-1.9l-1.643-5.475C262.391,2.391,261.953,2,260.641,2H254h-6.641c-1.312,0-1.75,0.391-2.316,1.525L243.4,9h-1.9
-		c-0.276,0-0.5,0.224-0.5,0.5v1c0,0.276,0.224,0.5,0.5,0.5h0.917L242,12v11.5c0,0.275,0.225,0.5,0.5,0.5h2
-		c0.275,0,0.5-0.225,0.5-0.5V22h9h9v1.5c0,0.275,0.225,0.5,0.5,0.5h2c0.275,0,0.5-0.225,0.5-0.5V12l-0.417-1h0.917
-		c0.276,0,0.5-0.224,0.5-0.5v-1C267,9.224,266.776,9,266.5,9z M246.627,4.404C246.752,4.185,246.922,4,247.234,4H254h6.766
-		c0.312,0,0.482,0.185,0.607,0.404C261.542,4.772,262.561,9,262.561,9H254h-8.561C245.439,9,246.458,4.772,246.627,4.404z M247,16
-		h-3l-1-1v-2.1l4,1.1V16z M258,20h-8v-2h8V20z M265,15l-1,1h-3v-2l4-1.1V15z"/>
-	<path opacity="0.3" d="M246.627,4.404C246.752,4.185,246.922,4,247.234,4h13.531c0.312,0,0.482,0.185,0.607,0.404
-		C261.542,4.772,262.561,9,262.561,9h-17.121C245.439,9,246.458,4.772,246.627,4.404z"/>
-</g>
-<g id="girl">
-	<path d="M214.464,20.352C213.729,19.91,211,17.873,209,16.862v-2.021l2.489-0.924l2.063,3.135l2.303-2.316l-3.48-1.157L211,11V7
-		c-0.292-2.604-2.32-5-5-5c-3,0-5,2.396-5,5v4l-1.371,2.579l-3.477,1.157l2.302,2.316l2.061-3.135L203,14.842v2.021
-		c-2,1.011-4.725,3.048-5.46,3.489c-1.754,1.055-1.531,2.648-1.531,2.648H196v0.5c0,0.275,0.225,0.5,0.5,0.5h19
-		c0.275,0,0.5-0.225,0.5-0.5V23C216,23,216.219,21.406,214.464,20.352z"/>
-</g>
-<g id="user_2_">
-	<path id="user" d="M169,19.208c-0.644-0.366-4.843-2.851-7-3.724v-3.777c0.624-0.456,1-1.158,1-2.223V6.5c0-2.475-1.5-4.5-4.5-4.5
-		S154,4.025,154,6.5c0,0,0,0.484,0,2.984c0,1.075,0.376,1.779,1,2.233v3.767c-2.032,0.873-6.356,3.357-7,3.724
-		c-0.801,0.455-1,0.888-1,1.94c0,0.43,0,2.352,0,2.352c0,0.275,0.225,0.5,0.5,0.5h22c0.275,0,0.5-0.225,0.5-0.5c0,0,0-1.922,0-2.352
-		C170,20.096,169.801,19.663,169,19.208z"/>
-</g>
-<g id="dog_1_">
-	<path id="dog" d="M123.766,7.922l-3.153,2.098c-0.222,0.161-0.577,0.149-0.789-0.025l-0.679-0.563
-		c-0.211-0.176-0.543-0.16-0.738,0.034l-1.07,1.07c-0.194,0.195-0.513,0.195-0.707,0l-3.79-4.105c-0.194-0.193-0.194-0.512,0-0.707
-		l5.239-5.242C118.548-0.017,119-0.085,119,0.497V2c0.008,0.275,0.013,0.543,0.21,0.735l4.649,4.577
-		C124.056,7.504,123.987,7.761,123.766,7.922z M115.595,11.621l-3.843-4.105c-0.194-0.193-0.513-0.193-0.707,0
-		c0,0-0.312,0.484-1.233,0.484h-7.4c0,0-0.742,0.023-1.35-0.363s-2.246-1.584-2.246-1.584c-0.25-0.113-0.456-0.225-0.675-0.006
-		s-0.157,0.539,0.047,0.723l1.944,2.483c0.204,0.185,0.24,0.522,0.08,0.747l-1.915,2.654C98.137,12.878,98,13.287,98,13.562V24
-		c0,0.55,0.45,1,1,1h1c0.55,0,1-0.45,1-1c0,0,0-4.155,0-5.029l2.104-3.69c0.204-0.184,0.623-0.308,0.896-0.275l8.578,1.8
-		c0.273,0.033,0.422,0.285,0.422,0.561V24c0,0.55,0.45,1,1,1h1c0.55,0,1-0.45,1-1V12.477C116,12.201,115.789,11.816,115.595,11.621z
-		"/>
-</g>
-<g id="leaf_2_">
-	<path id="leaf_1_" d="M55.796,8.48c-3.829,4.913-2.21,9.577-1.983,11.706L50,24.021v1.414l4.377-4.4C57,21,73.985,27.057,73.985,1
-		C64.201,3.838,59.625,3.567,55.796,8.48z M63.062,13.216c-2.311,1.242-5.834,3.43-6.967,4.972
-		c-1.135,1.542-1.963,3.217-0.463-0.334c1.502-3.551,5.756-6.145,8.979-7.863c2.477-1.321,4.736-2.46,6.41-4.925
-		c1.676-2.465,0.496,0.286,0.496,0.286C69.32,9.857,66.281,11.489,63.062,13.216z"/>
-</g>
-<g id="glass_2_">
-	<path id="glass_1_" d="M15,13.888l10.5-12.88H2.656L13,13.813v8.347l-7,2.332v0.5h16v-0.5l-7-2.332V13.888z M8.959,3.007L13,12.001
-		L5.959,3.007H8.959z"/>
-</g>
-</svg>
diff --git a/openQRM-5.3.50-CE/src/web/base/img/glyphicons/halflings/glyphicons_halflings-white.png b/openQRM-5.3.50-CE/src/web/base/img/glyphicons/halflings/glyphicons_halflings-white.png
deleted file mode 100644
index 3889213..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/glyphicons/halflings/glyphicons_halflings-white.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/glyphicons/halflings/glyphicons_halflings-white.svg b/openQRM-5.3.50-CE/src/web/base/img/glyphicons/halflings/glyphicons_halflings-white.svg
deleted file mode 100644
index 12fc444..0000000
--- a/openQRM-5.3.50-CE/src/web/base/img/glyphicons/halflings/glyphicons_halflings-white.svg
+++ /dev/null
@@ -1,1119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="glyphicons_x5F_halflings" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" width="469px" height="230px" viewBox="0 0 469 230" enable-background="new 0 0 469 230" xml:space="preserve">
-<g id="tree_x5F_deciduous">
-	<path fill="#FFFFFF" d="M465.7,223.4c0.1,0.2,0.1,0.4,0.1,0.6c0,1-0.8,1.8-1.8,1.8c-0.4,0-0.7-0.1-1-0.3v3.1l0.8,0.5h-3.5l0.8-0.5
-		v-3.1c-0.3,0.2-0.6,0.3-1,0.3c-1,0-1.8-0.8-1.8-1.8c0-0.1,0-0.3,0-0.4c-0.6-0.3-1-0.9-1-1.6c0-1,0.8-1.8,1.8-1.8c0.1,0,0.2,0,0.2,0
-		c0-0.1,0-0.2,0-0.2c0-1.5,1.2-2.8,2.8-2.8c1.3,0,2.3,0.9,2.7,2c1.2,0.1,2.1,1.1,2.1,2.3C466.8,222.3,466.4,223,465.7,223.4z"/>
-</g>
-<g id="tree_x5F_conifer">
-	<path fill="#FFFFFF" d="M439,228.5l0.8,0.5h-3.5l0.8-0.5V227h-4l2.7-3H434l2.7-3H435l3-3.3l3,3.3h-1.7l2.7,3h-1.7l2.7,3h-4V228.5z"
-		/>
-</g>
-<g id="cloud_x5F_upload">
-	<path fill="#FFFFFF" d="M407.9,224.1c0-0.9,0.6-1.7,1.5-1.9c0-0.1,0-0.2,0-0.4c0-2,1.6-3.7,3.7-3.7c1.5,0,2.8,0.9,3.4,2.2
-		c0.3-0.1,0.6-0.1,0.9-0.1c1.6,0,2.9,1.3,2.9,2.9c0,1.3-0.9,2.5-2.2,2.8l-4-4l-4.1,4.1h-0.1C408.7,226,407.9,225.1,407.9,224.1z
-		 M415,227h2l-3-3l-3,3h2v3h2V227z"/>
-</g>
-<g id="cloud_x5F_download">
-	<path fill="#FFFFFF" d="M383.9,224.1c0-0.9,0.6-1.7,1.5-1.9c0-0.1,0-0.2,0-0.4c0-2,1.6-3.7,3.7-3.7c1.5,0,2.8,0.9,3.4,2.2
-		c0.3-0.1,0.6-0.1,0.9-0.1c1.6,0,2.9,1.3,2.9,2.9c0,1.6-1.3,2.9-2.9,2.9H392v-3h-4v3h-2.2C384.7,226,383.9,225.1,383.9,224.1z
-		 M391,224h-2v3h-2l3,3l3-3h-2V224z"/>
-</g>
-<g id="cloud">
-	<path fill="#FFFFFF" d="M372.2,223.1c0,1.6-1.3,2.9-2.9,2.9h-7.5c-1.1,0-1.9-0.9-1.9-1.9c0-0.9,0.6-1.7,1.5-1.9c0-0.1,0-0.2,0-0.4
-		c0-2,1.6-3.7,3.7-3.7c1.5,0,2.8,0.9,3.4,2.2c0.3-0.1,0.6-0.1,0.9-0.1C370.9,220.1,372.2,221.5,372.2,223.1z"/>
-</g>
-<g id="registration_x5F_mark">
-	<g id="registration_x5F_mark_1_">
-		<path fill="#FFFFFF" d="M342,217.1c-3.3,0-5.9,2.6-5.9,5.9s2.6,5.9,5.9,5.9c3.3,0,5.9-2.6,5.9-5.9S345.3,217.1,342,217.1z
-			 M342,227.2c-2.3,0-4.2-1.9-4.2-4.2s1.9-4.2,4.2-4.2c2.3,0,4.2,1.9,4.2,4.2S344.3,227.2,342,227.2z"/>
-		<polygon fill="#FFFFFF" points="343,221 340,221 340,225 341,225 341,224 343,224 343,223 341,223 341,222 343,222 343,223 
-			344,223 344,222 		"/>
-		<rect x="343" y="224" fill="#FFFFFF" width="1" height="1"/>
-	</g>
-</g>
-<g id="copyright_x5F_mark">
-	<path fill="#FFFFFF" d="M318,228.9c-3.3,0-5.9-2.6-5.9-5.9s2.6-5.9,5.9-5.9s5.9,2.6,5.9,5.9S321.3,228.9,318,228.9z M318,218.8
-		c-2.3,0-4.2,1.9-4.2,4.2s1.9,4.2,4.2,4.2c2.3,0,4.2-1.9,4.2-4.2S320.3,218.8,318,218.8z M320,222v-1h-3l-1,1v2l1,1h3v-1h-3v-2H320z
-		"/>
-</g>
-<g id="sound_x5F_7_x5F_1">
-	<path fill="#FFFFFF" d="M293,221v3h-1v-2h-2v-1H293z M290,225h1v1h-1V225z M291,224h1v1h-1V224z M294,225h1v1h-1V225z M296,222h-1
-		v-1h2v5h-1V222z M300,221c0-1.7-1.3-3-3-3h-7c-1.7,0-3,1.3-3,3v5c0,1.7,1.3,3,3,3h7c1.7,0,3-1.3,3-3V221z M298,227h-9v-7h9V227z"/>
-</g>
-<g id="sound_x5F_6_x5F_1">
-	<path fill="#FFFFFF" d="M269,222v4h-3v-5h1v1H269z M268,223h-1v2h1V223z M270,225h1v1h-1V225z M272,222h-1v-1h2v5h-1V222z M276,221
-		c0-1.7-1.3-3-3-3h-7c-1.7,0-3,1.3-3,3v5c0,1.7,1.3,3,3,3h7c1.7,0,3-1.3,3-3V221z M274,227h-9v-7h9V227z"/>
-</g>
-<g id="sound_x5F_5_x5F_1">
-	<path fill="#FFFFFF" d="M245,221v1h-2v1h2v3h-3v-1h2v-1h-2v-3H245z M246,225h1v1h-1V225z M248,222h-1v-1h2v5h-1V222z M252,221
-		c0-1.7-1.3-3-3-3h-7c-1.7,0-3,1.3-3,3v5c0,1.7,1.3,3,3,3h7c1.7,0,3-1.3,3-3V221z M250,227h-9v-7h9V227z"/>
-</g>
-<g id="sound_x5F_dolby">
-	<path fill="#FFFFFF" d="M228,221c0-1.7-1.3-3-3-3h-7c-1.7,0-3,1.3-3,3v5c0,1.7,1.3,3,3,3h7c1.7,0,3-1.3,3-3V221z M226,227h-9v-7h9
-		V227z M218,221v5h7v-5H218z M220.3,225c-0.5,0-1.3,0-1.3,0v-3c0,0,0.8,0,1.3,0c0.5,0,1,0.6,1,1.5C221.2,224.4,220.8,225,220.3,225z
-		 M224,225c0,0-0.8,0-1.3,0c-0.5,0-1-0.6-1-1.5c0-0.9,0.5-1.5,1-1.5c0.5,0,1.3,0,1.3,0V225z"/>
-</g>
-<g id="sound_x5F_stereo">
-	<path fill="#FFFFFF" d="M204,221c0-1.7-1.3-3-3-3h-7c-1.7,0-3,1.3-3,3v5c0,1.7,1.3,3,3,3h7c1.7,0,3-1.3,3-3V221z M202,227h-9v-7h9
-		V227z M197,225l-3-1.5l3-1.5V225z M198,222l3,1.5l-3,1.5V222z"/>
-</g>
-<g id="subtitles">
-	<path fill="#FFFFFF" d="M173,221v1h-2v3h2v1h-3v-5H173z M177,221v1h-2v3h2v1h-3v-5H177z M180,221c0-1.7-1.3-3-3-3h-7
-		c-1.7,0-3,1.3-3,3v5c0,1.7,1.3,3,3,3h7c1.7,0,3-1.3,3-3V221z M178,227h-9v-7h9V227z"/>
-</g>
-<g id="hd_x5F_video">
-	<path fill="#FFFFFF" d="M148,221h1v5h-1v-2h-1v2h-1v-5h1v2h1V221z M152,222h1v3h-1v1h-2v-5h2V222z M151,222v3h1v-3H151z M156,221
-		c0-1.7-1.3-3-3-3h-7c-1.7,0-3,1.3-3,3v5c0,1.7,1.3,3,3,3h7c1.7,0,3-1.3,3-3V221z M154,227h-9v-7h9V227z"/>
-</g>
-<g id="sd_x5F__x5F_video">
-	<path fill="#FFFFFF" d="M125,221v1h-2v1h2v3h-3v-1h2v-1h-2v-3H125z M128,222h1v3h-1v1h-2v-5h2V222z M127,222v3h1v-3H127z M129,218
-		h-7c-1.7,0-3,1.3-3,3v5c0,1.7,1.3,3,3,3h7c1.7,0,3-1.3,3-3v-5C132,219.3,130.7,218,129,218z M130,227h-9v-7h9V227z"/>
-</g>
-<g id="stats">
-	<path fill="#FFFFFF" d="M100,225v4h-3v-4c0-0.5,0.5-1,1-1h1C99.5,224,100,224.5,100,225z M103,218h-1c-0.5,0-1,0.5-1,1v10h3v-10
-		C104,218.5,103.5,218,103,218z M107,221h-1c-0.5,0-1,0.5-1,1v7h3v-7C108,221.5,107.5,221,107,221z"/>
-</g>
-<g id="tower">
-	<path fill="#FFFFFF" d="M75,225.5V223l-1-1v-4h1v2h1v-2h2v2h1v-2h2v2h1v-2h1v4l-1,1v2.5l1.2,1.5h-9.5L75,225.5z M73,228v1h11v-1H73
-		z"/>
-</g>
-<g id="phone_x5F_alt">
-	<path fill="#FFFFFF" d="M56,222.5V222c0,0,0-1-2-1s-2,1-2,1v0.5l-3.6,3c-0.2,0.2-0.4,0.6-0.4,0.9v2.1c0,0.3,0.2,0.5,0.5,0.5h11
-		c0.3,0,0.5-0.2,0.5-0.5v-2.1c0-0.3-0.2-0.7-0.4-0.9L56,222.5z M60,219.9v2c0,0.3-0.2,0.5-0.5,0.4l-2-0.3c-0.3,0-0.5-0.3-0.5-0.6
-		v-1.5c-0.8-0.1-1.8-0.2-3-0.2c-1.2,0-2.2,0.1-3,0.2v1.5c0,0.3-0.2,0.5-0.5,0.6l-2,0.3c-0.3,0-0.5-0.1-0.5-0.4v-2c0,0,1.5-1.9,6-1.9
-		S60,219.9,60,219.9z"/>
-</g>
-<g id="earphone">
-	<path fill="#FFFFFF" d="M24.2,218.9l1.6-1.6c0.2-0.2,0.6-0.2,0.8,0.1l1.4,1.9c0.2,0.3,0.1,0.6-0.1,0.9l-1.2,1.2
-		c0.6,0.8,1.3,1.7,2.3,2.7c1,1,1.9,1.7,2.7,2.3l1.2-1.2c0.2-0.2,0.6-0.3,0.9-0.1l1.9,1.4c0.3,0.2,0.3,0.6,0.1,0.8l-1.6,1.6
-		c0,0-2.8,0.2-6.5-3.4C23.9,221.7,24.2,218.9,24.2,218.9z"/>
-</g>
-<g id="compressed">
-	<path fill="#FFFFFF" d="M11,219v1v0.6v0.4H9.9L7,222v-1l-2-2H1l1-1h3.8l1,1H11z M7,226l-2,2H1l1,1h3.8l1-1H11v-1.4V226v-1l-2.9,1H7
-		z M7,225l4-1.3V222l-4,1.3V225z M1,227c-0.5,0-1-0.5-1-1v-5c0-0.5,0.5-1,1-1h3c0.5,0,1,0.5,1,1v5c0,0.5-0.5,1-1,1H1z M1,223h3v-2H1
-		V223z M1,226h3v-2H1V226z"/>
-</g>
-<g id="header">
-	<path fill="#FFFFFF" d="M467,195.1v8.9c0,0.5,1,0.5,1,0.5c0,0.5,0,0.6,0,0.6h-4c0,0,0-0.1,0-0.6c1,0,1,0,1-0.5V200h-5v3.9
-		c0,0.5,0,0.5,1,0.5c0,0.5,0,0.6,0,0.6h-4c0,0,0-0.1,0-0.6c0,0,1,0,1-0.5v-8.9c0-0.5-1-0.5-1-0.5c0-0.5,0-0.6,0-0.6h4
-		c0,0,0,0.1,0,0.6c-1,0-1,0-1,0.5v3.9h5v-3.9c0-0.5,0-0.5-1-0.5c0-0.5,0-0.6,0-0.6h4c0,0,0,0.1,0,0.6C468,194.6,467,194.6,467,195.1
-		z"/>
-</g>
-<g id="cutlery">
-	<path fill="#FFFFFF" d="M444,193.4v11.1c0,0.3-0.2,0.5-0.5,0.5h-2c-0.3,0-0.5-0.2-0.5-0.5v-4c0,0-1-0.5-1-1.5c0-0.5,0-3.6,0-3.6
-		c0-0.4,0.3-0.9,0.6-1.2l2.8-1.2C443.7,192.9,444,193,444,193.4z M437,194v3h-1v-3l-0.5-1l-0.5,1v3h-1v-3l-0.5-1l-0.5,1v3v1l1,2v4.5
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V200l1-2v-1v-3l-0.5-1L437,194z"/>
-</g>
-<g id="transfer">
-	<path fill="#FFFFFF" d="M419,200v2h-1v-2H419z M416,202h1v-2h-1V202z M415,200h-4v-2l-3,3l3,3v-2h4V200z M410,197v-2h-1v2H410z
-		 M412,195h-1v2h1V195z M413,197h4v2l3-3l-3-3v2h-4V197z"/>
-</g>
-<g id="credit_x5F_card_1_">
-	<path id="credit_x5F_card" fill="#FFFFFF" d="M396,194.5v1.5h-12v-1.5c0-0.3,0.2-0.5,0.5-0.5h11C395.8,194,396,194.2,396,194.5z
-		 M384,197h12v5.5c0,0.3-0.2,0.5-0.5,0.5h-11c-0.3,0-0.5-0.2-0.5-0.5V197z M385,202h4v-2h-4V202z"/>
-</g>
-<g id="floppy_x5F_open">
-	<path fill="#FFFFFF" d="M370,205h-2v-3h-2l3-3l3,3h-2V205z M367,193h-1v2h1V193z M369,197l2,2v-4l-2-2h-1v3h-5v-3h-2.5
-		c-0.3,0-0.5,0.2-0.5,0.5v10c0,0.3,0.2,0.5,0.5,0.5h1.5v-4h4L369,197z"/>
-</g>
-<g id="floppy_x5F_save">
-	<path fill="#FFFFFF" d="M346,202h2l-3,3l-3-3h2v-3h2V202z M343,193h-1v2h1V193z M343,198h4v-3l-2-2h-1v3h-5v-3h-2.5
-		c-0.3,0-0.5,0.2-0.5,0.5v10c0,0.3,0.2,0.5,0.5,0.5h1.5v-4h5V198z"/>
-</g>
-<g id="floppy_x5F_remove">
-	<path fill="#FFFFFF" d="M319,195h-1v-2h1V195z M320.3,197l1.7,1.7l1-1V195l-2-2h-1v3h-5v-3h-2.5c-0.3,0-0.5,0.2-0.5,0.5v10
-		c0,0.3,0.2,0.5,0.5,0.5h1.5v-4h3.3L320.3,197z M324.9,203.7l-1.7-1.7l1.7-1.7l-1.3-1.3l-1.7,1.7l-1.7-1.7l-1.3,1.3l1.7,1.7
-		l-1.7,1.7l1.3,1.3l1.7-1.7l1.7,1.7L324.9,203.7z"/>
-</g>
-<g id="floppy_x5F_saved">
-	<path fill="#FFFFFF" d="M295,195h-1v-2h1V195z M295,198.7l1.2,1.2l2.8-2.8V195l-2-2h-1v3h-5v-3h-2.5c-0.3,0-0.5,0.2-0.5,0.5v10
-		c0,0.3,0.2,0.5,0.5,0.5h1.5v-4h3.8L295,198.7z M299.8,198.4l-3.5,3.5l-1.2-1.2l-1.2,1.2l2.4,2.4l4.8-4.8L299.8,198.4"/>
-</g>
-<g id="floppy_x5F_disk">
-	<path fill="#FFFFFF" d="M271,195h-1v-2h1V195z M273,193h-1v3h-5v-3h-2.5c-0.3,0-0.5,0.2-0.5,0.5v10c0,0.3,0.2,0.5,0.5,0.5h1.5v-4h7
-		v4h1.5c0.3,0,0.5-0.2,0.5-0.5V195L273,193z"/>
-</g>
-<g id="send">
-	<path fill="#FFFFFF" d="M240.2,200.8h3.9v4.2l3.1-3.9l4.8,2.7V193L240.2,200.8z M244.9,202.9v-2.3l6.7-7.1L244.9,202.9z"/>
-</g>
-<g id="export">
-	<path fill="#FFFFFF" d="M216.2,202c-0.1,0-0.2,0.1-0.2,0.2v2.8h11v-2.8c0-0.1-0.1-0.2-0.3-0.2H216.2z M226,203.5h-1V203h1V203.5z
-		 M221.1,200l-1,1l-2.1-2.1l1-1L221.1,200z M219,193l7,0l0,7l-2.5-2.4l-1.5,1.5l-2.1-2.1l1.5-1.5L219,193z"/>
-</g>
-<g id="import">
-	<path fill="#FFFFFF" d="M192.2,202c-0.1,0-0.2,0.1-0.2,0.2v2.8h11v-2.8c0-0.1-0.1-0.2-0.3-0.2H192.2z M202,203.5h-1V203h1V203.5z
-		 M194,196.1l-1-1l2.1-2.1l1,1L194,196.1z M201,194l0,7l-7,0l2.4-2.5l-1.5-1.5l2.1-2.1l1.5,1.5L201,194z"/>
-</g>
-<g id="saved">
-	<path fill="#FFFFFF" d="M168.2,202c-0.1,0-0.2,0.1-0.2,0.2v2.8h11v-2.8c0-0.1-0.1-0.2-0.3-0.2H168.2z M178,203.5h-1V203h1V203.5z
-		 M169,197.9l1.5-1.5l1.5,1.5l4.4-4.4l1.5,1.5l-6,6L169,197.9z"/>
-</g>
-<g id="open">
-	<path fill="#FFFFFF" d="M144.2,202c-0.1,0-0.2,0.1-0.2,0.2v2.8h11v-2.8c0-0.1-0.1-0.2-0.3-0.2H144.2z M154,203.5h-1V203h1V203.5z
-		 M145,198l4.5-5l4.4,5H151v3h-3v-3H145z"/>
-</g>
-<g id="save">
-	<path fill="#FFFFFF" d="M120.2,202c-0.1,0-0.2,0.1-0.2,0.2v2.8h11v-2.8c0-0.1-0.1-0.2-0.3-0.2H120.2z M130,203.5h-1V203h1V203.5z
-		 M129.9,197l-4.5,5l-4.4-5h3v-4h3v4H129.9z"/>
-</g>
-<g id="record">
-	<path fill="#FFFFFF" d="M102,193.1c-3.2,0-5.9,2.6-5.9,5.9s2.6,5.9,5.9,5.9c3.2,0,5.9-2.6,5.9-5.9S105.2,193.1,102,193.1z
-		 M102,203.2c-2.3,0-4.2-1.9-4.2-4.2s1.9-4.2,4.2-4.2c2.3,0,4.2,1.9,4.2,4.2S104.3,203.2,102,203.2z M102,200.9
-		c-1.1,0-1.9-0.9-1.9-1.9c0-1.1,0.9-1.9,1.9-1.9c1.1,0,1.9,0.9,1.9,1.9C103.9,200.1,103.1,200.9,102,200.9z"/>
-</g>
-<g id="new_x5F_window">
-	<path fill="#FFFFFF" d="M83,200c0,0.6,0,1,0,1c0,2.2-1.8,4-4,4h-3c-2.2,0-4-1.8-4-4v-3c0-2.2,1.8-4,4-4h1l0.7,0.8l-1.2,1.2H75
-		c-0.5,0-1,0.5-1,1v5c0,0.5,0.5,1,1,1h5c0.5,0,1-0.5,1-1v-1.5l1.2-1.2L83,200z M84,193h-5l1.5,1.5l-3.5,3.4l2.1,2.1l3.4-3.5L84,198
-		V193z"/>
-</g>
-<g id="log_x5F_out">
-	<path fill="#FFFFFF" d="M56,205h-4c-2.2,0-4-1.8-4-4v-3c0-2.2,1.8-4,4-4h4v2h-5c-0.5,0-1,0.5-1,1v5c0,0.5,0.5,1,1,1h5V205z
-		 M61,199.5l-4-3.5v2h-3v3h3v2L61,199.5z"/>
-</g>
-<g id="flash">
-	<path fill="#FFFFFF" d="M28,205L28,205c-0.2-0.2-0.1-0.3-0.1-0.4c0-0.2,1.6-4.6,1.6-4.6h-3c-0.1,0-0.3-0.1-0.3-0.2
-		c-0.1-0.1,0-0.3,0.1-0.4c1.8-2,5.2-5.9,5.4-6.1c0.1-0.1,0.2-0.2,0.2-0.2h0.1l0.1,0.1c0,0,0.1,0.1,0.1,0.3c0,0.2-1.5,4.3-1.6,4.5
-		l3,0c0.1,0,0.3,0.1,0.3,0.2c0.1,0.1,0,0.2-0.1,0.4c0,0-5.3,6.2-5.4,6.3C28.3,204.9,28.2,205,28,205L28,205z"/>
-</g>
-<g id="log_x5F_in">
-	<path fill="#FFFFFF" d="M5,203h5c0.5,0,1-0.5,1-1v-5c0-0.5-0.5-1-1-1H5v-2h4c2.2,0,4,1.8,4,4v3c0,2.2-1.8,4-4,4H5V203z M7,199.5
-		L3,196v2H0v3h3v2L7,199.5z"/>
-</g>
-<g id="collapse-top">
-	<path id="collapse_x5F_top" fill="#FFFFFF" d="M468,177v-3c0-2.2-1.8-4-4-4h-3c-2.2,0-4,1.8-4,4v3c0,2.2,1.8,4,4,4c0,0,2,0,3,0
-		C466.2,181,468,179.2,468,177z M466,178c0,0.5-0.5,1-1,1h-5c-0.5,0-1-0.5-1-1v-5c0-0.5,0.5-1,1-1h5c0.5,0,1,0.5,1,1V178z M465,177
-		h-5l2.5-3.3L465,177z"/>
-</g>
-<g id="collapse_1_">
-	<path id="collapse" fill="#FFFFFF" d="M440,170c-1,0-3,0-3,0c-2.2,0-4,1.8-4,4v3c0,2.2,1.8,4,4,4h3c2.2,0,4-1.8,4-4v-3
-		C444,171.8,442.2,170,440,170z M442,178c0,0.5-0.5,1-1,1h-5c-0.5,0-1-0.5-1-1v-5c0-0.5,0.5-1,1-1h5c0.5,0,1,0.5,1,1V178z
-		 M438.5,177.3L436,174h5L438.5,177.3z"/>
-</g>
-<g id="expand_1_">
-	<path id="expand" fill="#FFFFFF" d="M408,174c0,1,0,3,0,3c0,2.2,1.8,4,4,4h3c2.2,0,4-1.8,4-4v-3c0-2.2-1.8-4-4-4h-3
-		C409.8,170,408,171.8,408,174z M416,172c0.5,0,1,0.5,1,1v5c0,0.5-0.5,1-1,1h-5c-0.5,0-1-0.5-1-1v-5c0-0.5,0.5-1,1-1H416z
-		 M415.3,175.5L412,178v-5L415.3,175.5z"/>
-</g>
-<g id="unchecked_1_">
-	<path id="unchecked" fill="#FFFFFF" d="M391,170h-3c-2.2,0-4,1.8-4,4v3c0,2.2,1.8,4,4,4h3c2.2,0,4-1.8,4-4c0,0,0-2,0-3
-		C395,171.8,393.2,170,391,170z M392,172c0.5,0,1,0.5,1,1v5c0,0.5-0.5,1-1,1h-5c-0.5,0-1-0.5-1-1v-5c0-0.5,0.5-1,1-1H392z"/>
-</g>
-<g id="sort-by-attributes-alt">
-	<path fill="#FFFFFF" d="M360,178h2v-9h2v9h2l-3,3L360,178z M369,178h-2v2h2V178z M370,175h-3v2h3V175z M372,169h-5v2h5V169z
-		 M371,172h-4v2h4V172z"/>
-</g>
-<g id="sort-by-attributes">
-	<path fill="#FFFFFF" d="M336,178h2v-9h2v9h2l-3,3L336,178z M345,169h-2v2h2V169z M346,172h-3v2h3V172z M348,178h-5v2h5V178z
-		 M347,175h-4v2h4V175z"/>
-</g>
-<g id="sort-by-order-alt">
-	<path fill="#FFFFFF" d="M312,178h2v-9h2v9h2l-3,3L312,178z M320,169v4h2v1h1v-5H320z M322,172h-1v-2h1V172z M321,181h1v-5h-2v1h1
-		V181z"/>
-</g>
-<g id="sort-by-order">
-	<path fill="#FFFFFF" d="M288,178h2v-9h2v9h2l-3,3L288,178z M296,176v4h2v1h1v-5H296z M298,179h-1v-2h1V179z M297,174h1v-5h-2v1h1
-		V174z"/>
-</g>
-<g id="sort-by-alphabet-alt">
-	<path fill="#FFFFFF" d="M264,178h2v-9h2v9h2l-3,3L264,178z M271,176v5h1v-1h1v1h1v-5H271z M273,179h-1v-2h1V179z M271,169v1h2v1h1
-		v-2H271z M271,174h3v-1h-2v-1h-1V174z M272,172h1v-1h-1V172z"/>
-</g>
-<g id="sort-by-alphabet">
-	<path fill="#FFFFFF" d="M240,178h2v-9h2v9h2l-3,3L240,178z M247,169v5h1v-1h1v1h1v-5H247z M249,172h-1v-2h1V172z M247,176v1h2v1h1
-		v-2H247z M247,181h3v-1h-2v-1h-1V181z M248,179h1v-1h-1V179z"/>
-</g>
-<g id="sort">
-	<path fill="#FFFFFF" d="M216,178h2v-9h2v9h2l-3,3L216,178z M222,172h2v9h2v-9h2l-3-3L222,172z"/>
-</g>
-<g id="gbp">
-	<path fill="#FFFFFF" d="M200.7,178c-0.1,0-0.5,0.3-1.4,0.3c-0.7,0-1.4-0.3-2.1-0.3c-0.2,0-1,0.1-1.5,0.3c0.5-0.5,0.8-0.9,1-1.1
-		c0.3-0.4,0.4-1.4,0.3-2.1h2v-1h-2.4c-0.4-0.7-0.9-1.4-0.9-2c0-0.4,0.1-0.7,0.4-1c0.3-0.3,0.9-0.5,1.4-0.5c0.6,0,1.8,0.4,1.8,1.5
-		h1.5c0-1.6-1.6-3-3.3-3c-1.1,0-2,0.3-2.6,0.9c-1.3,1.2-1,2.5-0.8,3c0.1,0.3,0.3,0.7,0.4,1H193v1h2.2c0.5,1,0.4,2-0.2,2.7
-		c-0.4,0.4-0.6,0.5-0.9,0.8l0.6,1.5c0,0,0.8-0.5,1.7-0.5c0.9-0.1,2.2,0.6,2.8,0.6c0.6,0,1.1,0,2-0.5L200.7,178z"/>
-</g>
-<g id="usd_1_">
-	<path id="usd" fill="#FFFFFF" d="M178.3,176.9c0-2.2-1.8-2.7-2.7-2.9c0,0-0.3,0-0.6-0.1v-3.1c1.1,0.2,1.3,0.8,1.4,1.6h1.6
-		c-0.1-2.3-1.9-2.9-3-3v-0.8h-1v0.8c-1.5,0.1-3,1.1-3,3c0,1.9,1.4,2.5,2.7,2.9c0.1,0,0.2,0.1,0.3,0.1v3.3c-1-0.2-1.6-0.9-1.7-1.9
-		H171c0,1,0.1,1.7,0.7,2.3c0.6,0.6,1.4,0.9,2.4,1v0.8h1v-0.8C177.1,179.9,178.3,178.7,178.3,176.9z M172.7,172.1
-		c0-1.1,0.7-1.3,1.3-1.4v2.7C173.3,173.3,172.7,173.2,172.7,172.1z M175,178.6v-3.1c0.9,0.3,1.7,0.7,1.7,1.6
-		C176.7,178.3,175.6,178.6,175,178.6z"/>
-</g>
-<g id="euro">
-	<path fill="#FFFFFF" d="M151.5,179.1c-0.6,0-2.2-0.5-2.5-3.1h3l1-1h-4.1c0-0.4,0-0.7,0.1-1h3l1-1h-3.8c0.5-1.7,1.8-2.2,2.3-2.2
-		c0.7,0,2.3,0.6,2.3,2.2h1.8c0-0.7-0.3-1.4-0.7-2.1c-0.7-1.3-1.9-1.9-3.5-1.9c-1.2,0-2.2,0.5-3,1.4c-0.4,0.4-0.8,1.3-1.1,2.6H146
-		l-1,1h2.2c0,0.3-0.1,0.6-0.1,1H146l-1,1h2.2c0.2,1.8,0.8,2.9,1.1,3.4c0.8,1.1,1.9,1.6,3.2,1.6c1.1,0,2-0.4,2.7-1.2
-		c0.7-0.7,1.1-1.7,1.3-2.8h-1.7C153.8,178.5,152.2,179.1,151.5,179.1z"/>
-</g>
-<g id="pushpin">
-	<path fill="#FFFFFF" d="M131.9,172l-2.8-2.8c-0.2-0.2-0.5-0.2-0.7,0s-0.2,0.5,0,0.7l0.4,0.4L126,173h-3l2.1,2.1l-3.1,3.1l-2,2.8
-		l2.8-2l3.1-3.1l2.1,2.1v-3l2.8-2.7l0.4,0.4c0.2,0.2,0.5,0.2,0.7,0C132,172.5,132,172.2,131.9,172z"/>
-</g>
-<g id="phone_1_">
-	<g opacity="0.3">
-		<rect x="99" y="171" fill="#FFFFFF" width="6" height="7"/>
-	</g>
-	<path fill="#FFFFFF" d="M102,169c-2.4,0-4,0.9-4,1.5v9.5c0,0.5,0.5,1,1,1h6c0.5,0,1-0.5,1-1v-9.5C106,169.9,104.4,169,102,169z
-		 M102,180.5c-0.6,0-1-0.5-1-1c0-0.6,0.5-1,1-1c0.6,0,1,0.5,1,1C103,180.1,102.6,180.5,102,180.5z M105,178h-6v-7h6V178z"/>
-</g>
-<g id="link">
-	<path fill="#FFFFFF" d="M76.2,181.1c-0.6,0-1.2-0.2-1.6-0.7l-1.4-1.4c-0.4-0.4-0.7-1-0.7-1.6c0-0.6,0.2-1.2,0.7-1.6l0.6-0.6
-		c0.2,0.4,0.4,0.7,0.8,1l0.2,0.2l-1,1l2.5,2.5l3.9-3.9l-2.1-2.1l1.1-1.1c0.1,0.1,0.1,0.1,0.2,0.2l1.4,1.4c0.9,0.9,0.9,2.3,0,3.2
-		l-2.8,2.8C77.4,180.9,76.8,181.1,76.2,181.1z M76.8,176.9l-1.4-1.4c-0.4-0.4-0.7-1-0.7-1.6c0-0.6,0.2-1.2,0.7-1.6l2.8-2.8
-		c0.4-0.4,1-0.7,1.6-0.7c0.6,0,1.2,0.2,1.6,0.7l1.4,1.4c0.4,0.4,0.7,1,0.7,1.6c0,0.6-0.5,1.4-0.9,1.8l-0.3,0.3
-		c-0.2-0.4-0.5-0.7-0.8-1l-0.2-0.2l1-1l-2.5-2.5l-3.9,3.9l2.1,2.1l-1.1,1.1C76.9,177.1,76.8,177,76.8,176.9z"/>
-</g>
-<g id="heart-empty">
-	<path fill="#FFFFFF" d="M54.5,171.5c-1.9-2.8-5.5-1-5.5,1.6c0,2,3.2,3.8,5.5,7c2.3-3.2,5.5-4.9,5.5-7
-		C60,170.5,56.5,168.7,54.5,171.5z M56.6,175.9c-0.7,0.7-1.4,1.4-2.1,2.2c-0.7-0.8-1.4-1.5-2-2.2c-1.1-1.1-2.2-2.1-2.2-2.8
-		c0-1.1,0.9-1.9,1.8-1.9c0.5,0,1,0.3,1.4,0.9l1,1.5l1-1.5c0.4-0.6,0.9-0.9,1.5-0.9c0.9,0,1.7,0.8,1.7,1.9
-		C58.7,173.9,57.7,174.8,56.6,175.9z"/>
-</g>
-<g id="paperclip">
-	<path fill="#FFFFFF" d="M29.2,179.7L29.2,179.7l2.5-2.6l2.5-2.5c0.6-0.6,0.9-1.2,1-1.9c0.1-1.3-0.8-2.5-2.1-2.7c-0.2,0-0.3,0-0.5,0
-		c-1.2,0-2,0.8-2.7,1.6l-3.5,3.5c-0.1,0.1-0.3,0.3-0.4,0.4c-0.8,0.7-1.5,1.3-1.3,2.3c0.1,0.9,0.9,1.3,1.5,1.3c0.5,0,0.9-0.2,1.2-0.5
-		l5.5-5.5c0.2-0.2,0.3-0.5,0.2-0.7c-0.1-0.2-0.3-0.4-0.5-0.4c-0.2,0-0.3,0.1-0.5,0.2c-0.1,0.1-0.3,0.2-0.4,0.4l-3.8,3.7l-0.7-0.7
-		l0.1-0.1c0,0,3.5-3.6,3.9-4c0.4-0.4,0.8-0.7,1.5-0.7c0.1,0,0.2,0,0.3,0c0.6,0.1,1,0.5,1.2,1c0.2,0.6,0,1.3-0.4,1.8l-3.9,3.9
-		c-0.2,0.2-0.4,0.4-0.6,0.6c-0.6,0.7-1.1,1.2-1.8,1.5c-0.4,0.2-0.8,0.3-1.2,0.3c-0.9,0-1.8-0.5-2.2-1.2c-0.6-1-0.4-2.5,0.5-3.4
-		l5.1-5.1c0.4-0.4,0.7-0.7,1.1-1c0.6-0.4,1.3-0.5,2-0.5c0.5,0,1.1,0.1,1.5,0.3c1,0.5,1.8,1.4,2,2.6c0.2,1.2-0.2,2.5-1.1,3.4
-		l-5.2,5.1C29.9,180.3,29.2,179.7,29.2,179.7z"/>
-</g>
-<g id="dashboard">
-	<path opacity="0.3" fill="#FFFFFF" d="M2.7,177c0.7,1.1,1.9,1.9,3.3,1.9s2.6-0.8,3.3-1.9H2.7z"/>
-	<g>
-		<path fill="#FFFFFF" d="M7.5,172c-0.3,0-0.5,0.2-0.5,0.5c0,0.1,0,0.2,0.1,0.3c0,0,0,0,0,0l-1.2,1.3c-0.4,0.1-0.7,0.4-0.7,0.9
-			c0,0.5,0.4,0.9,0.9,0.9c0.5,0,0.9-0.4,0.9-0.9c0-0.2-0.1-0.4-0.2-0.5l0.5-1.4c0.1,0.1,0.2,0.1,0.3,0.1c0.3,0,0.5-0.2,0.5-0.5
-			C8.1,172.2,7.8,172,7.5,172z"/>
-		<circle fill="#FFFFFF" cx="8.5" cy="174.5" r="0.5"/>
-		<circle fill="#FFFFFF" cx="4.5" cy="172.5" r="0.5"/>
-		<circle fill="#FFFFFF" cx="3.5" cy="174.5" r="0.5"/>
-		<path fill="#FFFFFF" d="M6,169.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8c3.2,0,5.8-2.6,5.8-5.8S9.2,169.2,6,169.2z M6,179.3
-			c-2.4,0-4.3-1.9-4.3-4.3c0-2.4,1.9-4.3,4.3-4.3s4.3,1.9,4.3,4.3C10.3,177.4,8.4,179.3,6,179.3z"/>
-	</g>
-</g>
-<g id="fullscreen">
-	<path fill="#FFFFFF" d="M457.3,147.7L456,149v-4h4l-1.3,1.3l2,2l-1.4,1.4L457.3,147.7z M460.7,153.7l-1.4-1.4l-2,2L456,153v4h4
-		l-1.3-1.3L460.7,153.7z M464.7,152.3l-1.4,1.4l2,2L464,157h4v-4l-1.3,1.3L464.7,152.3z M464,145l1.3,1.3l-2,2l1.4,1.4l2-2l1.3,1.3
-		v-4H464z"/>
-</g>
-<g id="briefcase">
-	<rect x="437" y="151" opacity="0.5" fill="#FFFFFF" width="2" height="1"/>
-	<rect x="432" y="152" opacity="0.3" fill="#FFFFFF" width="12" height="1"/>
-	<g>
-		<path fill="#FFFFFF" d="M437,153h-5v2c0,0.5,0.5,1,1,1h10c0.5,0,1-0.5,1-1v-2h-5H437z"/>
-		<path fill="#FFFFFF" d="M443,147h-3v-1c0-0.6-0.4-1-1-1h-2c-0.6,0-1,0.4-1,1v1h-3c-0.5,0-1,0.5-1,1v4h5v-1h2v1h5v-4
-			C444,147.5,443.5,147,443,147z M437,146h2v1h-2V146z"/>
-	</g>
-</g>
-<g id="filter">
-	<g>
-		<path fill="#FFFFFF" d="M413,152v5l2-2v-3l3.5-5h-9L413,152z"/>
-		<rect x="409" y="145" fill="#FFFFFF" width="10" height="1"/>
-	</g>
-</g>
-<g id="tasks">
-	<g id="tasks_x5F_alt">
-		<path fill="#FFFFFF" d="M396,151c0-0.6-0.4-1-1-1h-10c-0.6,0-1,0.4-1,1v1c0,0.6,0.4,1,1,1h10c0.6,0,1-0.4,1-1V151z M395,152h-10
-			v-1h10V152z M396,155c0-0.6-0.4-1-1-1h-10c-0.6,0-1,0.4-1,1v1c0,0.6,0.4,1,1,1h10c0.6,0,1-0.4,1-1V155z M395,156h-10v-1h10V156z
-			 M396,147c0-0.6-0.4-1-1-1h-10c-0.6,0-1,0.4-1,1v1c0,0.6,0.4,1,1,1h10c0.6,0,1-0.4,1-1V147z M395,148h-10v-1h10V148z"/>
-	</g>
-	<rect x="385" y="147" opacity="0.5" fill="#FFFFFF" width="8" height="1"/>
-	<rect x="385" y="151" opacity="0.5" fill="#FFFFFF" width="5" height="1"/>
-	<rect x="385" y="155" opacity="0.5" fill="#FFFFFF" width="7" height="1"/>
-</g>
-<g id="wrench">
-	<path fill="#FFFFFF" d="M372,148l-2.5,1.3l-1.4-2.3l2.6-1.4c-1-0.7-2.1-0.6-3.1-0.1c-1.3,0.7-1.8,2.2-1.4,3.6l-6,6
-		c-0.2,0.2-0.2,0.5,0,0.7l1.1,1.1c0.2,0.2,0.5,0.2,0.7,0l6-6c0.8,0.3,1.7,0.2,2.5-0.2C371.5,150.1,372.1,149.2,372,148z"/>
-</g>
-<g id="globe">
-	<path fill="#FFFFFF" d="M342.1,147.1c-0.2,0.1-0.3,0.5-0.6,0.2c-0.1,0.2-0.3,0.3-0.3,0.6c0.3,0.2,0.9,0.2,1.3,0.3
-		C342.5,148,342.1,147.5,342.1,147.1z"/>
-	<path fill="#FFFFFF" d="M342,145.2c-3.1,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8c3.1,0,5.8-2.6,5.8-5.8S345.1,145.2,342,145.2z
-		 M345.1,154.9c-0.6,0.5-1.4,1.1-2.2,1.1c-0.1-0.2,0-0.3,0-0.5c-0.4-0.1-0.7-0.5-0.9-0.8c-0.1-0.4,0.5-0.8,0.4-1.1
-		c-0.7,0.1-1.1-0.6-1.7-0.8c-0.4-0.1-0.7-0.2-1.1-0.4c-0.2-0.1-0.4-0.4-0.7-0.3c0-0.4-0.3-0.8-0.3-1c0.1-0.6-0.3-1.2-0.1-1.8
-		c0.1-0.6,0.5-1.1,0.6-1.7c0-0.1-0.2-0.2-0.2-0.4c0-0.2,0.7-0.5,0.9-0.6c0.3-0.1,0.6,0,0.9,0c0.5-0.1,1.1-0.1,1.5-0.5
-		c0.1,0,0.3,0,0.4,0c0.4,0.4,1.5,0.2,1.4,1.1c0,0-0.4,0.2-1.1-0.1c0.1,0,0,0.3,0,0.4c0.6,0.3,1.3,0.6,1.6,1.2
-		c-0.2,0.3-0.6,0.2-0.9,0.2c-0.1,0.1-0.1,0.2-0.1,0.4c-0.6,0.3-0.5,0.6-0.7,1.1c-0.1,0.3-0.4,0.4-0.4,0.8c0.1,0.4-0.1,0.6-0.2,1
-		c0,0-0.5-0.3-0.8-0.7c-0.1-0.2-0.6-0.1-0.8-0.2c-0.5,0.2-0.1,1.3,0.3,0.8c0.5-0.6,0.6,0.1,0.6,0.5c0.2,0.1,0.4,0,0.5,0.2
-		c0,0.1,0,0.4,0,0.5c0.1,0.2,0.6,0,0.7-0.1c0.5-0.3,1.1-0.2,1.6-0.2c0.3,0.2,0.7,0.2,1,0.3c0.3,0.1,0.5,0,0.7,0.2
-		C346.1,154,345.6,154.4,345.1,154.9z"/>
-</g>
-<g id="circle-arrow-down">
-	<g id="arrow_4_">
-		<path fill="#FFFFFF" d="M318,145.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8c3.2,0,5.8-2.6,5.8-5.8S321.2,145.2,318,145.2z
-			 M319,148v3h2l-3,4l-3-4h2v-3H319z"/>
-	</g>
-</g>
-<g id="circle-arrow-top">
-	<g id="arrow_3_">
-		<path fill="#FFFFFF" d="M294,156.8c3.2,0,5.8-2.6,5.8-5.8s-2.6-5.8-5.8-5.8c-3.2,0-5.8,2.6-5.8,5.8S290.8,156.8,294,156.8z
-			 M293,154v-3h-2l3-4l3,4h-2v3H293z"/>
-	</g>
-</g>
-<g id="circle-arrow-left">
-	<g id="arrow_2_">
-		<path fill="#FFFFFF" d="M270,145.2c-3.2,0-5.8,2.6-5.8,5.8c0,3.2,2.6,5.8,5.8,5.8c3.2,0,5.8-2.6,5.8-5.8
-			C275.8,147.8,273.2,145.2,270,145.2z M273,152h-3l0,1.9l-4-2.9l4-3v2h3L273,152z"/>
-	</g>
-</g>
-<g id="circle-arrow-right">
-	<g id="arrow_1_">
-		<path fill="#FFFFFF" d="M240.2,151c0,3.2,2.6,5.8,5.8,5.8c3.2,0,5.8-2.6,5.8-5.8c0-3.2-2.6-5.8-5.8-5.8
-			C242.8,145.2,240.2,147.8,240.2,151z M243,150h3v-2l4,3l-4,2.9l0-1.9h-3L243,150z"/>
-	</g>
-</g>
-<g id="hand-down">
-	<g id="hand_x5F_top_1_">
-		<g id="hand_x5F_right_2_">
-			<rect x="219" y="144" fill="#FFFFFF" width="6" height="2"/>
-			<path opacity="0.3" fill="#FFFFFF" d="M221.6,153.2c-0.2,0.1-0.6,0.3-0.6,0.5v-1.5l4-1.7v1.4L221.6,153.2z"/>
-			<rect x="219" y="146" opacity="0.5" fill="#FFFFFF" width="6" height="1"/>
-			<path fill="#FFFFFF" d="M225.4,152.6l-3.4,1.3v1.1c0,1.1-0.5,1.9-1.5,1.9s-1.5-0.9-1.5-1.9c0-0.9,0-2,0-3l-1.2,0.8
-				c-0.2,0.2-0.5,0.2-0.7,0l-1.1-1.1c-0.2-0.2-0.2-0.3-0.1-0.5l2.3-3.6c0,0,0.3-0.6,0.7-0.6c0.4,0,5.3,0,5.3,0
-				c0.2,0,1.7,1.7,1.7,1.7v3.4C226,152.4,225.6,152.6,225.4,152.6z M224.1,148h-5l-2.4,3.4l0.8,0.9l1.8-1.5c0.2-0.1,0.3-0.1,0.5-0.1
-				c0.2,0.1,0.2,0.3,0.2,0.4c0,0,0,4.1,0,4.6c0,0.5,1,0.5,1,0s0-2,0-2c0-0.2,0.4-0.4,0.6-0.5l3.4-1.3V149L224.1,148z"/>
-		</g>
-	</g>
-</g>
-<g id="hand-top">
-	<g id="hand_x5F_right_1_">
-		<rect x="196" y="155" fill="#FFFFFF" width="6" height="2"/>
-		<path opacity="0.3" fill="#FFFFFF" d="M198.6,147.8c-0.2-0.1-0.6-0.3-0.6-0.5v1.5l4,1.7v-1.4L198.6,147.8z"/>
-		<rect x="196" y="154" opacity="0.5" fill="#FFFFFF" width="6" height="1"/>
-		<path fill="#FFFFFF" d="M203,148.9v3.4c0,0.1-1.6,1.7-1.7,1.7c0,0-4.9,0-5.3,0c-0.4,0-0.7-0.6-0.7-0.6l-2.3-3.6
-			c-0.1-0.2-0.1-0.4,0.1-0.5l1.1-1.1c0.2-0.2,0.5-0.2,0.7,0l1.2,0.8c0-1,0-2.1,0-3c0-1.1,0.5-1.9,1.5-1.9s1.5,0.9,1.5,1.9v1.1
-			l3.4,1.3C202.6,148.4,203,148.6,203,148.9z M202,152v-2.9l-3.4-1.3c-0.2-0.1-0.6-0.3-0.6-0.5c0,0,0-1.6,0-2s-1-0.5-1,0
-			c0,0.5,0,4.6,0,4.6c0,0.2,0,0.4-0.2,0.4c-0.2,0.1-0.3,0.1-0.5-0.1l-1.8-1.5l-0.8,0.9l2.4,3.4h5L202,152z"/>
-	</g>
-</g>
-<g id="hand-left">
-	<rect x="178" y="149" fill="#FFFFFF" width="2" height="6"/>
-	<path opacity="0.3" fill="#FFFFFF" d="M170.7,151.6c-0.1-0.2-0.3-0.6-0.5-0.6h1.5l1.7,4H172L170.7,151.6z"/>
-	<rect x="177" y="149" opacity="0.5" fill="#FFFFFF" width="1" height="6"/>
-	<path fill="#FFFFFF" d="M171.3,155.4L170,152h-1.1c-1.1,0-1.9-0.5-1.9-1.5s0.9-1.5,1.9-1.5c0.9,0,2,0,3,0l-0.8-1.2
-		c-0.2-0.2-0.1-0.5,0-0.7l1.1-1.1c0.2-0.2,0.3-0.2,0.5-0.1l3.7,2.3c0,0,0.6,0.3,0.6,0.7s0,5.3,0,5.3c0,0.2-1.7,1.7-1.8,1.7h-3.4
-		C171.6,156,171.4,155.6,171.3,155.4z M176,154.1v-5l-3.4-2.4l-0.9,0.8l1.5,1.8c0.1,0.2,0.1,0.3,0,0.5c-0.1,0.2-0.3,0.2-0.5,0.2
-		c0,0-3.8,0-4.8,0v1c1,0,2.2,0,2.2,0c0.2,0,0.4,0.4,0.5,0.6l1.3,3.4h2.9L176,154.1z"/>
-</g>
-<g id="hand-right">
-	<rect x="144" y="149" fill="#FFFFFF" width="2" height="6"/>
-	<path opacity="0.3" fill="#FFFFFF" d="M153.2,151.6c0.1-0.2,0.3-0.6,0.5-0.6h-1.5l-1.7,4h1.4L153.2,151.6z"/>
-	<rect x="146" y="149" opacity="0.5" fill="#FFFFFF" width="1" height="6"/>
-	<path fill="#FFFFFF" d="M152.1,156h-3.4c-0.1,0-1.7-1.6-1.7-1.7c0,0,0-4.9,0-5.3s0.6-0.7,0.6-0.7l3.6-2.3c0.2-0.1,0.4-0.1,0.5,0.1
-		l1.1,1.1c0.2,0.2,0.2,0.5,0,0.7L152,149c1,0,2.1,0,3,0c1.1,0,1.9,0.5,1.9,1.5s-0.9,1.5-1.9,1.5h-1.1l-1.3,3.4
-		C152.6,155.6,152.4,156,152.1,156z M149,155h2.9l1.3-3.4c0.1-0.2,0.3-0.6,0.5-0.6c0,0,1.6,0,2,0c0.5,0,0.5-1,0-1
-		c-0.5,0-4.6,0-4.6,0c0,0,0,0,0,0c-0.2,0-0.4,0-0.4-0.2c-0.1-0.2-0.1-0.3,0.1-0.5l1.5-1.8l-0.9-0.8l-3.4,2.4v5L149,155z"/>
-</g>
-<g id="thumbs-down">
-	<g id="thumbs_x5F_up_3_">
-		<polygon opacity="0.3" fill="#FFFFFF" points="131,150.8 131,152 130,152 126.5,147 128.5,147 		"/>
-		<path fill="#FFFFFF" d="M127,156h-0.5l-1-2.1l-1.5-2.1V148h1l1.4-1h2.1l2.5,3.8v1.2h-4.5l0.5,2.2V156 M127,157c0.6,0,1-0.7,1-1.2
-			v-1.5c0-0.1-0.3-1.2-0.3-1.2h3.3c0.6,0,1-0.7,1-1.2v-1c0-0.3-0.1-0.6-0.3-0.7l-2.4-3.4c-0.2-0.3-0.5-0.6-0.8-0.6H126
-			c-0.2,0-1.4,1-1.4,1H124c-0.6,0-1,0.2-1,0.8v4c0,0.2,0.1,0.5,0.2,0.6l1.4,2l1,2c0.2,0.3,0.5,0.7,0.9,0.7H127L127,157z M122,147h-2
-			v6h2V147z"/>
-	</g>
-	<rect x="122" y="147" opacity="0.5" fill="#FFFFFF" width="1" height="6"/>
-</g>
-<g id="thumbs-up">
-	<g id="thumbs_x5F_up">
-		<polygon opacity="0.3" fill="#FFFFFF" points="107,151.2 107,150 106,150 102.5,155 104.5,155 		"/>
-		<path fill="#FFFFFF" d="M103,146v1.8l-0.5,2.2h4.5v1.2l-2.5,3.8h-2.1l-1.4-1h-1v-3.8l1.5-2.1l1-2.1H103 M103,145h-0.5
-			c-0.4,0-0.7,0.3-0.9,0.7l-1,2l-1.4,2c-0.1,0.2-0.2,0.4-0.2,0.6v4c0,0.6,0.4,0.8,1,0.8h0.6c0,0,1.2,1,1.4,1h2.5
-			c0.3,0,0.6-0.3,0.8-0.6l2.4-3.4c0.2-0.2,0.3-0.5,0.3-0.7v-1c0-0.6-0.4-1.2-1-1.2h-3.3c0,0,0.3-1.2,0.3-1.2v-1.5
-			C104,145.7,103.6,145,103,145L103,145z M98,149h-2v6h2V149z"/>
-	</g>
-	<rect x="98" y="149" opacity="0.5" fill="#FFFFFF" width="1" height="6"/>
-</g>
-<g id="certificate">
-	<polygon fill="#FFFFFF" points="78,147 79.6,145.2 80,147.5 82.2,146.8 81.5,149 83.8,149.4 82,151 83.8,152.6 81.5,153 
-		82.2,155.2 80,154.5 79.6,156.8 78,155 76.4,156.8 76,154.5 73.8,155.2 74.5,153 72.2,152.6 74,151 72.2,149.4 74.5,149 
-		73.8,146.8 76,147.5 76.4,145.2 	"/>
-</g>
-<g id="bell">
-	<path fill="#FFFFFF" d="M58.8,153h-0.2l-1.2-1.7l-0.6-3.3c-0.2-1-1.1-2-2.2-2.2c0,0,0.2-0.4,0.2-0.4c0.1-0.3-0.1-0.4-0.3-0.4h-0.9
-		c-0.3,0-0.4,0.2-0.3,0.5c0,0,0.2,0.3,0.2,0.3c-1.1,0.3-2,1.2-2.2,2.2l-0.6,3.3l-1.2,1.7h-0.2c-0.3,0-0.5,0.2-0.5,0.5
-		c0,0.3,0.2,0.6,0.4,0.7c0,0,2,0.8,4.8,0.8c2.8,0,4.8-0.8,4.8-0.8c0.2-0.1,0.4-0.4,0.4-0.7C59.3,153.2,59,153,58.8,153z M54,156
-		c0.4,0,0.7,0,1-0.1c-0.2,0.6-0.6,1.1-1,1.1c-0.5,0-0.9-0.5-1-1.1C53.3,155.9,53.6,156,54,156z"/>
-</g>
-<g id="bullhorn">
-	<g>
-		<path fill="#FFFFFF" d="M23,150.5v0.5c0,0.6,1,1,1,1v-2.5C24,149.5,23,149.9,23,150.5z"/>
-		<path fill="#FFFFFF" d="M35.5,146c-0.3,0-0.5,0.2-0.5,0.5v8.5c0,0.3,0.2,0.5,0.5,0.5s0.5-0.2,0.5-0.5v-8.5
-			C36,146.2,35.8,146,35.5,146z"/>
-		<path fill="#FFFFFF" d="M25.2,149c-0.3,0-0.2,0.2-0.2,0.5v2.5c0,0.1,0.6,3.5,0.6,3.5c0,0.3,0.3,0.5,0.5,0.5h0.8
-			c0.3,0,0.5,0,0.4-0.2l-0.5-2.8h0.4l6.8,2v-8.5l-6.8,2.5H25.2z"/>
-	</g>
-</g>
-<g id="hdd">
-	<path fill="#FFFFFF" d="M11.7,153l-1.7-7.3c-0.1-0.3-0.3-0.7-0.6-0.7H2.6c-0.3,0-0.5,0.3-0.6,0.6L0.3,153H11.7z"/>
-	<path fill="#FFFFFF" d="M11,154H1c-0.6,0-1,0.4-1,1v1c0,0.6,0.4,1,1,1h10c0.6,0,1-0.4,1-1v-1C12,154.4,11.6,154,11,154z M9,156H8
-		v-1h1V156z M11,156h-1v-1h1V156z"/>
-	<rect x="10" y="155" opacity="0.3" fill="#FFFFFF" width="1" height="1"/>
-</g>
-<g id="resize-horizontal">
-	<polygon fill="#FFFFFF" points="468,127 465,124 465,126 459,126 459,124 456,127 459,130 459,128 465,128 465,130 	"/>
-</g>
-<g id="resize-vertical">
-	<polygon fill="#FFFFFF" points="438,133 441,130 439,130 439,124 441,124 438,121 435,124 437,124 437,130 435,130 	"/>
-</g>
-<g id="folder-open">
-	<polygon fill="#FFFFFF" points="411,126 408,133 420,133 423,126 	"/>
-	<path fill="#FFFFFF" d="M420,125v-2h-5c0-0.5-0.5-1-1-1h-3c-0.5,0-1,0.5-1,1h-2v6l2-4H420z"/>
-</g>
-<g id="folder-close">
-	<rect x="384" y="125" fill="#FFFFFF" width="12" height="8"/>
-	<path fill="#FFFFFF" d="M391,123c0-0.5-0.5-1-1-1h-3c-0.5,0-1,0.5-1,1h-2v1h12v-1H391z"/>
-</g>
-<g id="shopping-cart">
-	<path fill="#FFFFFF" d="M370.3,124.7 M371.4,121h-0.9c-0.2,0-0.4,0.2-0.5,0.4l-0.4,1.6h-9c-0.2,0-0.3,0.1-0.4,0.2
-		c-0.1,0.1-0.1,0.3-0.1,0.4l1,4.8c0.1,0.2,0.3,0.6,0.8,0.6h6.3l-0.5,2h-5.4c-0.3,0-0.5,0.2-0.5,0.5s0.2,0.5,0.5,0.5h0.5v0.5
-		c0,0.3,0.2,0.5,0.5,0.5c0.3,0,0.5-0.2,0.5-0.5V132h3v0.5c0,0.3,0.2,0.5,0.5,0.5c0.3,0,0.5-0.2,0.5-0.5V132h0.3
-		c0.4,0,0.6-0.4,0.6-0.4l2-9.6h0.5c0.3,0,0.5-0.2,0.5-0.5S371.7,121,371.4,121z"/>
-</g>
-<g id="retweet">
-	<path fill="#FFFFFF" d="M350,129l-3,2.8l-3-2.8h2v-4h-3.8l-2.2-2h8v6H350z M336,126v6h8l-2.2-2H338v-4h2l-3-2.8l-3,2.8H336z"/>
-</g>
-<g id="chevron-down">
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="315,123 318.5,126.6 322,123 324,125 318.5,130.5 
-		313,125 	"/>
-</g>
-<g id="chevron-up">
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="297,130.9 293.5,127.3 290,130.9 288,128.9 293.5,123.4 
-		299,128.9 	"/>
-</g>
-<g id="magnet">
-	<path fill="#FFFFFF" d="M272,125c0,0,0,1.2,0,2.5s0.2,2.7-2,2.7c-2.2,0-2-1.3-2-2.7V125h-3v2c0,1.6,0.3,6,5,6s5-4.4,5-6v-2H272z"/>
-	<path opacity="0.5" fill="#FFFFFF" d="M268,124h-3v-3h3V124z M275,121h-3v3h3V121z"/>
-</g>
-<g id="comments">
-	<path fill="#FFFFFF" d="M251,122h-10c-0.5,0-1,0.5-1,1v6c0,0.5,0.5,1,1,1h1v3l3-3h6c0.5,0,1-0.5,1-1v-6
-		C252,122.5,251.5,122,251,122z"/>
-</g>
-<g id="random">
-	<path fill="#FFFFFF" d="M218.6,125H216v-2h3.4l1.8,1.8l-1.4,1.4L218.6,125z M227,125v2l3-3l-3-3v2h-2.4l-6,6H216v2h3.4l6-6H227z
-		 M227,129h-1.6l-1.2-1.2l-1.4,1.4l1.8,1.8h2.4v2l3-3l-3-3V129z"/>
-</g>
-<g id="calendar_1_">
-	<path fill="#FFFFFF" d="M203,122.5v1.5h-11v-1.5c0-0.3,0.2-0.5,0.5-0.5h1.5v-1h1v1h5v-1h1v1h1.5C202.8,122,203,122.2,203,122.5z
-		 M192,125h11v7.5c0,0.3-0.2,0.5-0.5,0.5h-10c-0.3,0-0.5-0.2-0.5-0.5V125z M201,128h1v-1h-1V128z M201,130h1v-1h-1V130z M201,132h1
-		v-1h-1V132z M199,128h1v-1h-1V128z M199,130h1v-1h-1V130z M199,132h1v-1h-1V132z M197,128h1v-1h-1V128z M197,130h1v-1h-1V130z
-		 M197,132h1v-1h-1V132z M195,128h1v-1h-1V128z M195,130h1v-1h-1V130z M195,132h1v-1h-1V132z M193,128h1v-1h-1V128z M193,130h1v-1
-		h-1V130z M193,132h1v-1h-1V132z"/>
-</g>
-<g id="plane">
-	<path fill="#FFFFFF" d="M179.6,129.1l-3.6-3.2v-3.4c0-0.8-0.7-1.5-1.5-1.5c-0.8,0-1.5,0.7-1.5,1.5v3.4l-3.6,3.2
-		c-0.2,0.2-0.4,0.6-0.4,0.8v0.4c0,0.3,0.2,0.4,0.4,0.2l3.6-2.5v1.9v0.7c-0.4,0.4-1,1-1,1.1v0.6c0,0.3,0.2,0.4,0.4,0.3l0.9-0.8h2.2
-		l0.9,0.8c0.2,0.1,0.4,0,0.4-0.3v-0.6c0-0.2-0.6-0.7-1-1.1V130v-1.9l3.6,2.5c0.2,0.2,0.4,0.1,0.4-0.2V130
-		C180,129.7,179.8,129.3,179.6,129.1z"/>
-</g>
-<g id="warning-sign">
-	<path fill="#FFFFFF" d="M151,127l-1,3l-1-3v-1h2V127z M156.5,133h-12.9c-0.5,0-0.7-0.6-0.4-1l6.4-10.7c0.3-0.4,0.7-0.4,1,0.1
-		l6.4,10.6C157.2,132.4,157,133,156.5,133z M154.4,131l-4.4-7.2l-4.4,7.2h3.4v-1h1h1v1H154.4z"/>
-</g>
-<g id="eye-close">
-	<path fill="#FFFFFF" d="M132.4,126.6c-0.1-0.1-1-1.6-2.6-2.8l-0.4,1.5c0.6,0.7,1.1,1.4,1.4,1.8c-0.5,0.7-1.6,2.2-2.6,2.9l-0.4,1.5
-		c2.6-1,4.5-3.8,4.5-4l0.3-0.4L132.4,126.6z"/>
-	<path fill="#FFFFFF" d="M127.6,121l-0.4,1.4c-0.4-0.1-0.8-0.2-1.2-0.2c-3.5,0-6.2,4.2-6.4,4.3l-0.3,0.4l0.3,0.4
-		c0.1,0.2,2.2,3.4,5.2,4.2l-0.4,1.4h1.5l3.1-12H127.6z M124.8,125.4c0,0,0.5,1,1.2,1.6l-0.2,0.9l-0.5,0.5c-0.7-0.4-1.2-1.1-1.5-1.9
-		L124.8,125.4z M121.2,127c0.5-0.7,1.3-1.7,2.3-2.6c-0.3,0.5-0.5,1-0.5,1.6c0,1.5,1.1,2.7,2.5,2.9l-0.4,1.4
-		C123.3,129.8,121.8,127.8,121.2,127z"/>
-</g>
-<g id="eye-open">
-	<path fill="#FFFFFF" d="M108.4,126.6c-0.1-0.2-2.8-4.3-6.4-4.3c-3.5,0-6.2,4.2-6.4,4.3l-0.3,0.4l0.3,0.4c0.1,0.2,2.8,4.3,6.4,4.3
-		c3.5,0,6.2-4.2,6.4-4.3l0.3-0.4L108.4,126.6z M100.8,125.4c0,0,0.7,1.4,1.5,1.9l-1,1c-0.7-0.4-1.2-1.1-1.5-1.9L100.8,125.4z
-		 M102,130.6c-2.7,0-4.1-2.7-4.8-3.6c0.5-0.7,1.3-1.7,2.3-2.6c-0.3,0.5-0.5,1-0.5,1.6c0,1.7,1.3,3,3,3c1.7,0,3-1.3,3-3
-		c0-0.6-0.2-1.2-0.5-1.6c1,0.9,1.9,2.1,2.3,2.6C105.9,128.2,104.7,130.6,102,130.6z"/>
-</g>
-<g id="fire">
-	<path fill="#FFFFFF" d="M76,125.5c-0.5-3,2.6-5,2.6-5c-1,3-0.4,4.7,1.2,5.3c1.5,0.7,0.3-2.5,0.2-2.7c2.1,1.4,3.4,3.9,2.9,6.2
-		c-0.5,2.3-2.3,3-3.8,3.5c-2.2,0.6-0.3-1.2-0.1-2.7c0.2-1.5-0.6-2.6-1.5-3.5c0.2,0.6,0.2,2.5-0.3,3.4c-0.4,0.9-1.6,2.5-2.7,1.8
-		c-1-0.7-1.4-1.7-1.5-2.3c-0.1-0.6-0.3-2.2,1.2-3.6c-0.3,0.8,0,2.6,1.1,2.3C76.6,128,76.2,126.7,76,125.5z"/>
-</g>
-<g id="leaf">
-	<path fill="#FFFFFF" d="M51.2,124.6c-1.6,2.1-1.2,4.1-1,5.3l-2.2,1.9v1.4v0l2-2l1-0.6c1.3,0,9,3.4,9-9.6
-		C55.1,122.4,53.1,122.1,51.2,124.6z M54.9,126.9c-1.3,0.7-3.1,1.7-3.7,2.3c-0.9,1.1-1.2,1.1-0.6-0.4c0.8-1.8,3-3.2,4.6-4
-		c0,0,2.4-1.2,3.1-2.3c0.4-0.5,0.7-0.6,0.8-0.5c0.1,0.1,0.1,0.1-0.2,0.8C57.9,125.1,56.6,126,54.9,126.9z"/>
-</g>
-<g id="gift">
-	<g>
-		<path fill="#FFFFFF" d="M25,129h4v4h-4V129z M31,133h4v-4h-4V133z M36,124v1h-1v2h-4v-3h-2v3h-4v-2h-1v-1h1.1c0,0,0-0.2,0-0.4
-			l0.3-1.8c0.1-0.5,0.6-0.8,1.1-0.8c0.2,0,0.4,0.1,0.6,0.2l2.4,1.4c0.2,0.1,0.3,0.2,0.4,0.4c0.1-0.1,0.2-0.3,0.4-0.4l2.4-1.4
-			c0.2-0.1,0.4-0.2,0.6-0.2c0.5,0,1,0.3,1.1,0.9l0.3,1.7c0,0.2,0.1,0.4,0,0.4H36z M26.7,122.1c0,0-0.7,1.9-0.7,1.9c0,0,2.7,0,2.8,0
-			L26.7,122.1z M33.3,122l-2,2c0.1,0,2.7,0,2.7,0C34.1,124,33.3,122,33.3,122z"/>
-	</g>
-	<g opacity="0.3">
-		<path fill="#FFFFFF" d="M35,129h-4v4h-2v-4h-4v-2h4v-3h2v3h4V129z"/>
-	</g>
-</g>
-<g id="exclamation-sign">
-	<path id="circle_x5F_exclamation_x5F_mark" fill="#FFFFFF" d="M6,121.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8
-		S9.2,121.2,6,121.2z M7,130H5v-1h2V130z M6.9,127.5c-0.1,0.3-0.3,0.5-0.6,0.5H5.7c-0.3,0-0.5-0.2-0.6-0.5l-0.6-3
-		C4.5,124.2,4.7,124,5,124H7c0.3,0,0.5,0.2,0.4,0.5L6.9,127.5z"/>
-</g>
-<g id="asterisk">
-	<polygon fill="#FFFFFF" points="467,102 464.4,102 466.2,100.2 464.8,98.8 463,100.6 463,98 461,98 461,100.6 459.2,98.8 
-		457.8,100.2 459.6,102 457,102 457,104 459.6,104 457.8,105.8 459.2,107.2 461,105.4 461,108 463,108 463,105.4 464.8,107.2 
-		466.2,105.8 464.4,104 467,104 	"/>
-</g>
-<g id="minus_1_">
-	<rect id="minus" x="434" y="102" fill="#FFFFFF" width="9" height="3"/>
-</g>
-<g id="plus">
-	<polygon fill="#FFFFFF" points="419,102 415,102 415,98 412,98 412,102 408,102 408,105 412,105 412,109 415,109 415,105 419,105 	
-		"/>
-</g>
-<g id="resize-small">
-	<polygon fill="#FFFFFF" points="387.3,104.3 384.3,107.2 385.8,108.7 388.7,105.7 390,107 390,103 386,103 	"/>
-	<polygon fill="#FFFFFF" points="395.7,98.8 394.2,97.3 391.3,100.3 390,99 390,103 394,103 392.7,101.7 	"/>
-</g>
-<g id="resize-full">
-	<path fill="#FFFFFF" d="M372,101l-1.3-1.3l-2.9,2.9l-1.4-1.4l2.9-2.9L368,97h4V101z M364.2,103.4l-2.9,2.9L360,105v4h4l-1.3-1.3
-		l2.9-2.9L364.2,103.4z"/>
-</g>
-<g id="share-alt">
-	<path fill="#FFFFFF" d="M342,107l6-4.5l-6-4.5v2.7c-4.3,0.2-5.8,2.9-6,6.3c1-2.1,3.6-2.9,6-3V107z"/>
-</g>
-<g id="arrow-down">
-	<polygon fill="#FFFFFF" points="319,103 319,97 316,97 316,103 313,103 317.5,109 322,103 	"/>
-</g>
-<g id="arrow-up">
-	<polygon fill="#FFFFFF" points="294.5,97 290,103 293,103 293,109 296,109 296,103 299,103 	"/>
-</g>
-<g id="arrow-right">
-	<polygon fill="#FFFFFF" points="270,108 276,103.5 270,99 270,102 264,102 264,105 270,105 	"/>
-</g>
-<g id="arrow-left">
-	<polygon fill="#FFFFFF" points="252,102 246,102 246,99 240,103.5 246,108 246,105 252,105 	"/>
-</g>
-<g id="ban-circle">
-	<path fill="#FFFFFF" d="M222,97.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S225.2,97.2,222,97.2z M217.7,103
-		c0-2.4,1.9-4.3,4.3-4.3c0.8,0,1.6,0.2,2.2,0.7l-5.9,5.9C218,104.6,217.7,103.8,217.7,103z M222,107.3c-0.8,0-1.5-0.2-2.2-0.6
-		l5.8-5.8c0.4,0.6,0.6,1.4,0.6,2.2C226.3,105.4,224.4,107.3,222,107.3z"/>
-</g>
-<g id="ok-circle">
-	<path fill="#FFFFFF" d="M198,98.7c2.4,0,4.3,1.9,4.3,4.3s-1.9,4.3-4.3,4.3s-4.3-1.9-4.3-4.3S195.6,98.7,198,98.7 M198,97.2
-		c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S201.2,97.2,198,97.2L198,97.2z"/>
-	<polygon fill="#FFFFFF" points="195.5,103.6 196.6,102.5 197.5,103.4 199.5,101.3 200.7,102.5 197.5,105.6 	"/>
-</g>
-<g id="remove-circle">
-	<path fill="#FFFFFF" d="M174,98.7c2.4,0,4.3,1.9,4.3,4.3s-1.9,4.3-4.3,4.3s-4.3-1.9-4.3-4.3S171.6,98.7,174,98.7 M174,97.2
-		c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S177.2,97.2,174,97.2L174,97.2z"/>
-	<polygon fill="#FFFFFF" points="174,103.8 172.6,105.2 171.8,104.4 173.2,103 171.8,101.6 172.6,100.8 174,102.2 175.4,100.8 
-		176.2,101.6 174.8,103 176.2,104.4 175.4,105.2 	"/>
-</g>
-<g id="screenshot">
-	<path fill="#FFFFFF" d="M155.7,102H154H154c-0.4-1.5-2-2.6-3-3v-0.1v-1.1V97h-2v0.8v1.1V99c-2,0.4-2.7,1.5-3.1,3h-0.1h-1.6H144v2
-		h0.2h1.6h0.1c0.4,1.5,1.1,2.7,3.1,3v0.1v1.1v0.8h2v-0.8v-1.1v0c1-0.4,2.6-1.5,3-3h0.1h1.6h0.3v-2H155.7z M151,106.1V104h-2v2.1
-		c-1-0.3-1.8-1.1-2.1-2.1h2.1v-2h-2.1c0.3-1,1.1-1.7,2.1-2v2h2v-2c1,0.3,1.7,1.1,2,2h-2v2h2C152.7,105,152,105.7,151,106.1z"/>
-</g>
-<g id="info-sign">
-	<path fill="#FFFFFF" d="M126,97.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S129.2,97.2,126,97.2z M125,100h2v1h-2
-		V100z M128,106h-4v-1h1v-2h-1v-1h3v3h1V106z"/>
-</g>
-<g id="question-sign">
-	<path fill="#FFFFFF" d="M102,97.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S105.2,97.2,102,97.2z M103,106h-2v-1h2
-		V106z M103,104c0,0-1.4,0-2,0c0-1.4,1.1-1.6,1.1-1.6c0.3-0.2,0.3-0.2,0.3-0.5c0-0.2-0.2-0.4-0.4-0.4c-0.4,0-0.6,0-0.6,0.3
-		c0,0.2-0.2,0.1-0.3,0.1c0,0-0.8,0-1.4,0c0-1.8,1.1-2.4,2.4-2.4c0.7,0,2.3,0.2,2.3,2C104.3,103.4,103,104,103,104z"/>
-</g>
-<g id="ok-sign">
-	<path fill="#FFFFFF" d="M78,97.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S81.2,97.2,78,97.2z M77.5,106.3l-2.8-2.8
-		l1.7-1.7l1,1l2.4-2.4l1.7,1.7L77.5,106.3z"/>
-</g>
-<g id="remove-sign">
-	<path fill="#FFFFFF" d="M54,97.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S57.2,97.2,54,97.2z M57.5,104.4l-2.1,2.1
-		l-1.4-1.4l-1.4,1.4l-2.1-2.1l1.4-1.4l-1.4-1.4l2.1-2.1l1.4,1.4l1.4-1.4l2.1,2.1l-1.4,1.4L57.5,104.4z"/>
-</g>
-<g id="minus-sign">
-	<path fill="#FFFFFF" d="M30,97.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S33.2,97.2,30,97.2z M33,104h-6v-2h6V104z
-		"/>
-</g>
-<g id="plus-sign">
-	<path fill="#FFFFFF" d="M6,97.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S9.2,97.2,6,97.2z M9,104H7v2H5v-2H3v-2h2
-		v-2h2v2h2V104z"/>
-</g>
-<g id="chevron-right">
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="459.1,83.1 462.7,79.5 459.1,76 461.1,74 466.6,79.5 
-		466.6,79.5 466.6,79.5 461.1,85 	"/>
-</g>
-<g id="chevron-left">
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="440.9,83.1 437.3,79.5 440.9,76 438.9,74 433.4,79.5 
-		433.4,79.5 433.4,79.5 438.9,85 	"/>
-</g>
-<g id="eject">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M420,81.5c0-0.3-0.2-0.5-0.5-0.5h-10c-0.3,0-0.5,0.2-0.5,0.5v1
-		c0,0.3,0.2,0.5,0.5,0.5h10c0.3,0,0.5-0.2,0.5-0.5V81.5z"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="420,80 409,80 414.5,74.4 	"/>
-</g>
-<g id="step-forward">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M393.5,74h-1c-0.3,0-0.5,0.2-0.5,0.5v4.4l-5-4.9v11l5-4.9v4.4
-		c0,0.3,0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5v-10C394,74.2,393.8,74,393.5,74z"/>
-</g>
-<g id="fast-forward">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M371.5,74h-1c-0.3,0-0.5,0.2-0.5,0.5v4.4l-5-4.9v4.9l-5-4.9v11
-		l5-4.9V85l5-4.9v4.4c0,0.3,0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5v-10C372,74.2,371.8,74,371.5,74z"/>
-</g>
-<g id="forward">
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="346.6,79.5 341,74 341,78.9 336,74 336,85 341,80.1 
-		341,85 	"/>
-</g>
-<g id="stop">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M323,83.5c0,0.3-0.2,0.5-0.5,0.5h-8c-0.3,0-0.5-0.2-0.5-0.5v-8
-		c0-0.3,0.2-0.5,0.5-0.5h8c0.3,0,0.5,0.2,0.5,0.5V83.5z"/>
-</g>
-<g id="pause">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M293,83.5c0,0.3-0.2,0.5-0.5,0.5h-2c-0.3,0-0.5-0.2-0.5-0.5v-8
-		c0-0.3,0.2-0.5,0.5-0.5h2c0.3,0,0.5,0.2,0.5,0.5V83.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M297,83.5c0,0.3-0.2,0.5-0.5,0.5h-2c-0.3,0-0.5-0.2-0.5-0.5v-8
-		c0-0.3,0.2-0.5,0.5-0.5h2c0.3,0,0.5,0.2,0.5,0.5V83.5z"/>
-</g>
-<g id="play">
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="266,85 266,74 275,79.5 	"/>
-</g>
-<g id="backward">
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="252,74 247,78.9 247,74 241.4,79.5 247,85 247,80.1 
-		252,85 	"/>
-</g>
-<g id="fast-backward">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M228,74l-5,4.9V74l-5,4.9v-4.4c0-0.3-0.2-0.5-0.5-0.5h-1
-		c-0.3,0-0.5,0.2-0.5,0.5v10c0,0.3,0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5v-4.4l5,4.9v-4.9l5,4.9V74z"/>
-</g>
-<g id="step-backward">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M201,74l-5,4.9v-4.4c0-0.3-0.2-0.5-0.5-0.5h-1
-		c-0.3,0-0.5,0.2-0.5,0.5v10c0,0.3,0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5v-4.4l5,4.9V74z"/>
-</g>
-<g id="move">
-	<polygon fill="#FFFFFF" points="180,79 177,76 177,78 175,78 175,76 177,76 174,73 171,76 173,76 173,78 171,78 171,76 168,79 
-		171,82 171,80 173,80 173,82 171,82 174,85 177,82 175,82 175,80 177,80 177,82 	"/>
-</g>
-<g id="check">
-	<polygon fill="#FFFFFF" points="147.4,78.7 148.8,77.3 150.3,78.8 154.6,74.5 155.9,75.8 150.3,81.5 	"/>
-	<path fill="#FFFFFF" d="M153,81.3V82c0,0.5-0.5,1-1,1h-5c-0.5,0-1-0.5-1-1v-5c0-0.5,0.5-1,1-1h3.5l1.8-1.8
-		c-0.4-0.1-0.8-0.2-1.3-0.2h-3c-2.2,0-4,1.8-4,4v3c0,2.2,1.8,4,4,4h3c2.2,0,4-1.8,4-4v-1.7L153,81.3z"/>
-</g>
-<g id="share_1_">
-	<path fill="#FFFFFF" d="M128.1,78.6c0,0-2.8-0.2-3.9,1.2c0.6-3.3,3.9-3.3,3.9-3.3l0-2.2l3.6,3.2l-3.6,3.2V78.6z"/>
-	<path fill="#FFFFFF" d="M129,82L129,82c0,0.6-0.5,1-1,1h-5c-0.5,0-1-0.5-1-1v-5c0-0.5,0.5-1,1-1h1.4c0.5-0.5,1.2-1,2.2-1.2l0-0.8
-		H124c-2.2,0-4,1.8-4,4v3c0,2.2,1.8,4,4,4h3c2.2,0,4-1.8,4-4v-0.5L129,82z"/>
-</g>
-<g id="edit">
-	<path fill="#FFFFFF" d="M100.9,79.9l4.1-4.1l1.1,1.1l-4.1,4.1l-1.6,0.5L100.9,79.9z M105.9,74.9l1.1-1.1L108,74l0.2,0.9l-1.1,1.1
-		L105.9,74.9z"/>
-	<path fill="#FFFFFF" d="M105,80.8V82c0,0.5-0.5,1-1,1h-5c-0.5,0-1-0.5-1-1v-5c0-0.5,0.5-1,1-1h3.1l1.9-1.9c-0.3-0.1-4-0.1-4-0.1
-		c-2.2,0-4,1.8-4,4v3c0,2.2,1.8,4,4,4h3c2.2,0,4-1.8,4-4v-2.2L105,80.8z"/>
-</g>
-<g id="tint">
-	<path fill="#FFFFFF" d="M77.5,72.1c-1.1,3.6-4.4,5.5-4.4,8.9c0,2.5,2.2,3.9,4.4,4c2.1-0.1,4.4-1.6,4.4-4.1
-		C81.9,77.5,78.6,75.6,77.5,72.1z M76.5,82c0,0-0.1,0.6-0.2,1c-1.3-0.4-1.8-1.1-2-2.2c-0.2-1,0.1-1.9,1.3-3.4c0,0-0.4,1.8,0,3.2
-		C75.9,81.5,76.5,82,76.5,82z"/>
-</g>
-<g id="adjust">
-	<path fill="#FFFFFF" d="M54,73.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S57.2,73.2,54,73.2z M49.7,79
-		c0-2.4,1.9-4.3,4.3-4.3v8.5C51.6,83.3,49.7,81.4,49.7,79z"/>
-</g>
-<g id="map-marker">
-	<path fill="#FFFFFF" d="M34.8,77.7c0,0.8-0.3,1.7-0.7,2.6c-1.6,2.4-3.6,4.7-3.6,4.7s-2.3-2.2-3.7-4.7c-0.4-0.8-0.6-1.6-0.6-2.5
-		c0-2.4,1.9-4.4,4.3-4.4C32.9,73.3,34.8,75.3,34.8,77.7z M32.7,77.5c0-1.2-1-2.2-2.2-2.2c-1.2,0-2.2,1-2.2,2.2c0,1.2,1,2.2,2.2,2.2
-		C31.7,79.7,32.7,78.7,32.7,77.5z"/>
-</g>
-<g id="pencil">
-	<path fill="#FFFFFF" d="M0.9,81.8L3.2,84l-3.3,1.1L0.9,81.8z M1.8,81L8,74.9l2.1,2.1L4,83.1L1.8,81z M8.8,74l0.9-1
-		c0.1-0.1,0.2-0.1,0.3-0.1c0.1,0,0.2,0,0.3,0.1l1.5,1.5c0.2,0.2,0.2,0.5,0,0.7l-1,0.9L8.8,74z"/>
-</g>
-<g id="picture_1_">
-	<path id="picture_4_" fill="#FFFFFF" d="M468,50.4c0-0.2-0.2-0.4-0.4-0.4h-11.1c-0.2,0-0.4,0.2-0.4,0.4v10.1c0,0.2,0.2,0.4,0.4,0.4
-		h11.1c0.2,0,0.4-0.2,0.4-0.4V50.4z M467,56l-2.4-2.9l-2.9,3.2l0.7,1.6l-3-1.3l-2.5,1.8V51h10V56z M460.8,53.5
-		c0-0.7-0.6-1.3-1.3-1.3c-0.7,0-1.3,0.6-1.3,1.3c0,0.7,0.6,1.3,1.3,1.3C460.2,54.8,460.8,54.2,460.8,53.5z"/>
-</g>
-<g id="facetime-video">
-	<path fill="#FFFFFF" d="M441,55.4v-0.9v-2.8c0-0.4-0.3-0.8-0.8-0.8h-7.5c-0.4,0-0.8,0.3-0.8,0.8v6.5c0,0.4,0.3,0.8,0.8,0.8h7.5
-		c0.4,0,0.8-0.3,0.8-0.8V55.4z"/>
-	<polygon fill="#FFFFFF" points="444,52 441,55 444,58 	"/>
-</g>
-<g id="indent-right">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M410,51.5c0,0.3-0.2,0.5-0.5,0.5h-1c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h1c0.3,0,0.5,0.2,0.5,0.5V51.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M414,54.5c0,0.3-0.2,0.5-0.5,0.5h-5c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h5c0.3,0,0.5,0.2,0.5,0.5V54.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M412,57.5c0,0.3-0.2,0.5-0.5,0.5h-3c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h3c0.3,0,0.5,0.2,0.5,0.5V57.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M415,60.5c0,0.3-0.2,0.5-0.5,0.5h-6c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h6c0.3,0,0.5,0.2,0.5,0.5V60.5z"/>
-	<rect x="416" y="50" fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" width="1" height="11"/>
-	<polygon fill="#FFFFFF" points="417.3,55.5 419,54.2 419,55 421,55 421,56 419,56 419,56.8 	"/>
-</g>
-<g id="indent-left">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M391,51.5c0,0.3-0.2,0.5-0.5,0.5h-1c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h1c0.3,0,0.5,0.2,0.5,0.5V51.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M395,54.5c0,0.3-0.2,0.5-0.5,0.5h-5c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h5c0.3,0,0.5,0.2,0.5,0.5V54.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M393,57.5c0,0.3-0.2,0.5-0.5,0.5h-3c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h3c0.3,0,0.5,0.2,0.5,0.5V57.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M396,60.5c0,0.3-0.2,0.5-0.5,0.5h-6c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h6c0.3,0,0.5,0.2,0.5,0.5V60.5z"/>
-	<rect x="387" y="50" fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" width="1" height="11"/>
-	<polygon fill="#FFFFFF" points="386.7,55.5 385,54.2 385,55 383,55 383,56 385,56 385,56.8 	"/>
-</g>
-<g id="list">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M360,60.5c0,0.3,0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-1c-0.3,0-0.5,0.2-0.5,0.5V60.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M360,57.5c0,0.3,0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-1c-0.3,0-0.5,0.2-0.5,0.5V57.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M360,54.5c0,0.3,0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-1c-0.3,0-0.5,0.2-0.5,0.5V54.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M360,51.5c0,0.3,0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-1c-0.3,0-0.5,0.2-0.5,0.5V51.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M363,60.5c0,0.3,0.2,0.5,0.5,0.5h8c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-8c-0.3,0-0.5,0.2-0.5,0.5V60.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M363,57.5c0,0.3,0.2,0.5,0.5,0.5h8c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-8c-0.3,0-0.5,0.2-0.5,0.5V57.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M363,54.5c0,0.3,0.2,0.5,0.5,0.5h8c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-8c-0.3,0-0.5,0.2-0.5,0.5V54.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M363,51.5c0,0.3,0.2,0.5,0.5,0.5h8c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-8c-0.3,0-0.5,0.2-0.5,0.5V51.5z"/>
-</g>
-<g id="align-justify">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M336,60.5c0,0.3,0.2,0.5,0.5,0.5h11c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-11c-0.3,0-0.5,0.2-0.5,0.5V60.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M336,57.5c0,0.3,0.2,0.5,0.5,0.5h11c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-11c-0.3,0-0.5,0.2-0.5,0.5V57.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M336,54.5c0,0.3,0.2,0.5,0.5,0.5h11c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-11c-0.3,0-0.5,0.2-0.5,0.5V54.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M336,51.5c0,0.3,0.2,0.5,0.5,0.5h11c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-11c-0.3,0-0.5,0.2-0.5,0.5V51.5z"/>
-</g>
-<g id="align_x5F_right">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M317,51.5c0,0.3,0.2,0.5,0.5,0.5h6c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-6c-0.3,0-0.5,0.2-0.5,0.5V51.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M313,54.5c0,0.3,0.2,0.5,0.5,0.5h10c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-10c-0.3,0-0.5,0.2-0.5,0.5V54.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M315,57.5c0,0.3,0.2,0.5,0.5,0.5h8c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-8c-0.3,0-0.5,0.2-0.5,0.5V57.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M312,60.5c0,0.3,0.2,0.5,0.5,0.5h11c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-11c-0.3,0-0.5,0.2-0.5,0.5V60.5z"/>
-</g>
-<g id="align-center">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M298,51.5c0,0.3-0.2,0.5-0.5,0.5h-7c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h7c0.3,0,0.5,0.2,0.5,0.5V51.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M298,57.5c0,0.3-0.2,0.5-0.5,0.5h-7c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h7c0.3,0,0.5,0.2,0.5,0.5V57.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M300,60.5c0,0.3-0.2,0.5-0.5,0.5h-11c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h11c0.3,0,0.5,0.2,0.5,0.5V60.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M300,54.5c0,0.3-0.2,0.5-0.5,0.5h-11c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h11c0.3,0,0.5,0.2,0.5,0.5V54.5z"/>
-</g>
-<g id="align-left">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M271,51.5c0,0.3-0.2,0.5-0.5,0.5h-6c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h6c0.3,0,0.5,0.2,0.5,0.5V51.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M275,54.5c0,0.3-0.2,0.5-0.5,0.5h-10c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h10c0.3,0,0.5,0.2,0.5,0.5V54.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M273,57.5c0,0.3-0.2,0.5-0.5,0.5h-8c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h8c0.3,0,0.5,0.2,0.5,0.5V57.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M276,60.5c0,0.3-0.2,0.5-0.5,0.5h-11c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h11c0.3,0,0.5,0.2,0.5,0.5V60.5z"/>
-</g>
-<g id="text-width">
-	<path fill="#FFFFFF" d="M249.5,49H246h-3.5c-0.6,0-1.5,0-1.5,0v3c0,0,0,0,0.5,0c0-1,0.6-1,1.5-1h2v6.5l-1,0.5v1h2h2v-1l-1-0.5V51h2
-		c0.9,0,1.5,0,1.5,1c0.5,0,0.5,0,0.5,0v-3C251,49,250.1,49,249.5,49z"/>
-	<polygon fill="#FFFFFF" points="242,59.2 240.3,60.5 242,61.8 242,61 250,61 250,61.8 251.7,60.5 250,59.2 250,60 242,60 	"/>
-</g>
-<g id="text-height">
-	<path fill="#FFFFFF" d="M227.5,49H224h-3.5c-0.6,0-1.5,0-1.5,0v3c0,0,0,0,0.5,0c0-1,0.6-1,1.5-1h2v8.5l-1,0.5v1h2h2v-1l-1-0.5V51h2
-		c0.9,0,1.5,0,1.5,1c0.5,0,0.5,0,0.5,0v-3C229,49,228.1,49,227.5,49z"/>
-	<polygon fill="#FFFFFF" points="217.8,51 216.5,49.3 215.2,51 216,51 216,59 215.2,59 216.5,60.7 217.8,59 217,59 217,51 	"/>
-</g>
-<g id="italic_2_">
-	<path fill="#FFFFFF" d="M200.8,49.6l0-0.6h-2.4h-1.9v0.6c1,0.3,1.4,0.3,1.2,1.2l-1.7,8.5c-0.1,0.6-1,1.1-2,1.2V61h5v-0.6
-		c-1-0.1-1.2-0.5-1.1-1.2l1.3-8.2C199.2,51,199.6,49.8,200.8,49.6z"/>
-</g>
-<g id="bold_2_">
-	<path fill="#FFFFFF" d="M175.6,54.8c0,0,1.1-0.6,1.1-2.6c0-2-1.6-3.2-3.1-3.2l-4.7,0v0.7c1,0.2,1,0.4,1,1.1v8.3c0,0.6-0.5,0.9-1,1
-		V61h5c1.5,0,3.6-1.3,3.6-3.1C177.6,55.4,175.6,54.8,175.6,54.8z M172,50c2.1,0,3.2,0.7,3.2,2c0,1-0.8,2-1.8,2c-1,0-1.4,0-1.4,0
-		S172,50.4,172,50z M173.6,59H172v-4c0,0,0.3,0,1.6,0c1.3,0,2.2,1,2.2,2.2C175.8,58.4,174.7,59,173.6,59z"/>
-</g>
-<g id="font">
-	<path id="XMLID_2_" fill="#FFFFFF" d="M156,60.3V61h-4.2c0,0,0-0.4,0-0.7c0.7,0,1-0.8,0.8-1.3c-0.1-0.4-0.8-2.2-0.8-2.2h-3.9
-		c0,0-0.6,1.5-0.9,2.3c-0.3,0.9,0.5,1.2,1.2,1.2c0,0.4,0,0.7,0,0.7h-3.6v-0.7c0,0,0.6-0.2,0.8-0.5c0.3-0.3,0.5-0.8,0.5-0.8l4-10.1
-		h0.9l3.8,10c0,0,0.2,0.5,0.6,0.9C155.7,60.3,156,60.3,156,60.3z M151.6,55.8l-1.2-3.2l-0.5-1.4l-1.8,4.6H151.6z"/>
-</g>
-<g id="camera">
-	<path fill="#FFFFFF" d="M127.1,56c0,0.6-0.5,1.1-1.1,1.1c-0.6,0-1.1-0.5-1.1-1.1s0.5-1.1,1.1-1.1C126.6,54.9,127.1,55.4,127.1,56z
-		 M132,53v6c0,0.5-0.5,1-1,1h-10c-0.5,0-1-0.5-1-1v-6c0-0.5,0.5-1,1-1h1.5c0,0,1-2,2.5-2c0,0,0.5,0,2,0s2.5,2,2.5,2h1.5
-		C131.5,52,132,52.5,132,53z M128.4,56c0-1.3-1.1-2.4-2.4-2.4c-1.3,0-2.4,1.1-2.4,2.4c0,1.3,1.1,2.4,2.4,2.4
-		C127.3,58.4,128.4,57.3,128.4,56z M130,53h-1v1h1V53z"/>
-	<rect x="129" y="53" opacity="0.5" fill="#FFFFFF" width="1" height="1"/>
-</g>
-<g id="print">
-	<path fill="#FFFFFF" d="M105.5,52.7l-0.6,1.2h-5.9l-0.4-1.2l0.9-3.5c0-0.1,0.1-0.2,0.3-0.2h4.5c0.1,0,0.3,0.1,0.3,0.2L105.5,52.7z"
-		/>
-	<path fill="#FFFFFF" d="M104.8,59.2c0-0.1-0.2-0.2-0.3-0.2h-5c-0.1,0-0.3,0.1-0.3,0.2l-0.4,1.5c0,0.1,0.1,0.2,0.2,0.2h6
-		c0.1,0,0.2-0.1,0.2-0.2L104.8,59.2z"/>
-	<polygon fill="#FFFFFF" points="106,53 105,55 99,55 98,53 96,53 96,60 98,60 98,58 106,58 106,60 108,60 108,53 	"/>
-</g>
-<g id="bookmark_1_">
-	<path id="bookmark_4_" fill="#FFFFFF" d="M74,49.5c0-0.3,0.2-0.5,0.5-0.5h8c0.3,0,0.5,0.2,0.5,0.5V61l-4.5-4.4L74,61V49.5z"/>
-</g>
-<g id="book_2_">
-	<polygon fill="#FFFFFF" points="50.8,49 49,50.8 49,61 58,61 58,51 50.5,51 51.5,50 59,50 59,60 60,59 60,49 	"/>
-</g>
-<g id="tags">
-	<g id="tag_1_">
-		<path id="tag_2_" fill="#FFFFFF" d="M29,49h-4.7c-0.1,0-0.3,0.1-0.3,0.3l0,4.7l7,7l5-5L29,49z M27.2,52.2c-0.4,0.4-1,0.4-1.4,0
-			c-0.4-0.4-0.4-1,0-1.4c0.4-0.4,1-0.4,1.4,0C27.6,51.2,27.6,51.8,27.2,52.2z"/>
-	</g>
-	<polygon fill="#FFFFFF" points="32,49 31,49 38,56 33.5,60.5 34,61 39,56 	"/>
-</g>
-<g id="tag_3_">
-	<path id="tag_4_" fill="#FFFFFF" d="M5,49H0.3C0.1,49,0,49.1,0,49.3L0,54l7,7l5-5L5,49z M3.2,52.2c-0.4,0.4-1,0.4-1.4,0
-		c-0.4-0.4-0.4-1,0-1.4c0.4-0.4,1-0.4,1.4,0C3.6,51.2,3.6,51.8,3.2,52.2z"/>
-</g>
-<g id="barcode">
-	<path fill="#FFFFFF" d="M457,35h-1V25h1V35z M461,37h1v-0.9h-1V37z M459,25h-1v10h1V25z M463,25h-2v10h2V25z M457,36v1h3v-1H457z
-		 M463,37h1v-0.9h-1V37z M465,36.1V37h2v-0.9H465z M467,25h-1v10h1h1V25H467z M465,25h-1v10h1V25z"/>
-</g>
-<g id="qrcode">
-	<path fill="#FFFFFF" d="M434,27h1v1h-1V27z M442,30v1h2v1v1h-3v-1v-1v-1h-2v-3h-1v-2h1h5v5H442z M443,29v-3h-3v3H443z M441,28h1v-1
-		h-1V28z M435,34h-1v1h1V34z M438,37h1v-1h-1V37z M435,32h2v5h-5v-5h2v-1h1V32z M433,33v3h3v-3H433z M433,31h-1v-1v-5h5v3h1v1h-1v1
-		h-4V31z M433,29h3v-3h-3V29z M443,35h1v-1h-1V35z M441,36v1h2h1v-1h-1H441z M442,35v-1h-2v-1v-1v-1h-1h-2v1h2v1v1h-1v1h1v1h1h1v-1
-		H442z"/>
-</g>
-<g id="volume-up">
-	<path fill="#FFFFFF" d="M419.2,31c0,1.5-0.5,2.9-1.4,4.1l-0.1,0.1l-0.8-0.7l0.1-0.1c0.8-1,1.2-2.2,1.2-3.4c0-1.2-0.4-2.5-1.2-3.4
-		l-0.1-0.1l0.8-0.6l0.1,0.1C418.7,28.1,419.2,29.5,419.2,31z M415,28.4c0.6,0.7,0.9,1.6,0.9,2.6c0,0.9-0.3,1.8-0.9,2.5l0.7,0.5
-		c0.7-0.8,1.1-1.9,1.1-3c0-1.2-0.4-2.3-1.1-3.1L415,28.4z M408,29v4h3l3,2v-8l-3,2H408z"/>
-</g>
-<g id="volume-down">
-	<path fill="#FFFFFF" d="M387,29l3-2v8l-3-2h-3v-4H387z M391.7,27.9l-0.7,0.5c0.6,0.7,0.9,1.6,0.9,2.6c0,0.9-0.3,1.8-0.9,2.5
-		l0.7,0.5c0.7-0.8,1.1-1.9,1.1-3C392.8,29.8,392.4,28.7,391.7,27.9z"/>
-</g>
-<g id="volume-off">
-	<path fill="#FFFFFF" d="M363,29l3-2v8l-3-2h-3v-4H363z M371.1,29.6l-0.7-0.7l-1.4,1.4l-1.4-1.4l-0.7,0.7l1.4,1.4l-1.4,1.4l0.7,0.7
-		l1.4-1.4l1.4,1.4l0.7-0.7l-1.4-1.4L371.1,29.6z"/>
-</g>
-<g id="headphones">
-	<path fill="#FFFFFF" d="M348,31.2v0.2v2.8c0,0.1-0.1,0.2-0.2,0.2h-0.5c-0.1,0-0.2-0.1-0.2-0.2v-2.8v-0.2c0-2.6-2.4-4.5-5-4.5
-		c-2.6,0-5,1.9-5,4.5v0.2v2.8c0,0.1-0.1,0.2-0.2,0.2h-0.5c-0.1,0-0.2-0.1-0.2-0.2v-2.8v-0.2c0-3.2,2.8-6,6-6
-		C345.2,25.2,348,28.1,348,31.2z M340,32.2c0-0.1-0.1-0.2-0.2-0.2h-1.6c-0.1,0-0.2,0.1-0.2,0.2v4.6c0,0.1,0.1,0.2,0.2,0.2h1.6
-		c0.1,0,0.2-0.1,0.2-0.2V32.2z M346,32.2c0-0.1-0.1-0.2-0.2-0.2h-1.6c-0.1,0-0.2,0.1-0.2,0.2v4.6c0,0.1,0.1,0.2,0.2,0.2h1.6
-		c0.1,0,0.2-0.1,0.2-0.2V32.2z"/>
-</g>
-<g id="flag">
-	<path fill="#FFFFFF" d="M323,26c0,1,0,2,0,5c-2,4-5-1-8,2c0-2,0-3,0-5C316,24,321,30,323,26z M314,26h-1v11h1V26z"/>
-</g>
-<g id="lock">
-	<path fill="#FFFFFF" d="M298,29h-1v-2c0-1.1-0.9-2-2-2h-3c-1.1,0-2,0.9-2,2v2h-1c-0.5,0-1,0.5-1,1v6c0,0.5,0.5,1,1,1h9
-		c0.5,0,1-0.5,1-1v-6C299,29.5,298.5,29,298,29z M292,27.5c0-0.3,0.2-0.5,0.5-0.5h2c0.3,0,0.5,0.2,0.5,0.5V29h-3V27.5z"/>
-</g>
-<g id="list-alt">
-	<path fill="#FFFFFF" d="M274,35h-5v-1h5V35z M274,28h-5v1h5V28z M274,30h-5v1h5V30z M268,28h-1v1h1V28z M274,32h-5v1h5V32z M276,25
-		v2v9v1h-11v-1v-9v-2H276z M275,27h-9v9h9V27z M268,34h-1v1h1V34z M268,30h-1v1h1V30z M268,32h-1v1h1V32z"/>
-</g>
-<g id="refresh">
-	<path fill="#FFFFFF" d="M246,35.3c-0.9,0-1.8-0.3-2.5-0.8L245,33h-4v2v2l1.5-1.5c1,0.8,2.2,1.2,3.5,1.2c3.2,0,5.8-2.6,5.8-5.8h-1.5
-		C250.3,33.4,248.4,35.3,246,35.3z"/>
-	<path fill="#FFFFFF" d="M246,26.7c0.9,0,1.8,0.3,2.5,0.8L247,29h4v-4l-1.5,1.5c-1-0.8-2.2-1.2-3.5-1.2c-3.2,0-5.8,2.6-5.8,5.8h1.5
-		C241.7,28.6,243.6,26.7,246,26.7z"/>
-</g>
-<g id="repeat">
-	<path fill="#FFFFFF" d="M227.8,31c0,3.2-2.6,5.8-5.8,5.8s-5.8-2.6-5.8-5.8s2.6-5.8,5.8-5.8c1.3,0,2.6,0.5,3.5,1.2L227,25v4h-4
-		l1.5-1.5c-0.7-0.5-1.5-0.8-2.5-0.8c-2.4,0-4.3,1.9-4.3,4.3s1.9,4.3,4.3,4.3s4.3-1.9,4.3-4.3H227.8z"/>
-</g>
-<g id="play-circle">
-	<path fill="#FFFFFF" d="M198,26.7c2.4,0,4.3,1.9,4.3,4.3s-1.9,4.3-4.3,4.3s-4.3-1.9-4.3-4.3S195.6,26.7,198,26.7 M198,25.2
-		c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S201.2,25.2,198,25.2L198,25.2z"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="197,33 197,29 200,31 	"/>
-</g>
-<g id="inbox_3_">
-	<path fill="#FFFFFF" d="M180,32c0,0-2-7-2-7h-8c0,0-2,7-2,7l0,4.8c0,0.1,0.1,0.2,0.2,0.2h11.5c0.1,0,0.2-0.1,0.2-0.2V32z M171,27
-		h6.1l1,5h-2l-0.5,2h-3l-0.5-2h-2L171,27z"/>
-</g>
-<g id="upload">
-	<path fill="#FFFFFF" d="M150,25.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8c3.2,0,5.8-2.6,5.8-5.8S153.2,25.2,150,25.2z M150,35.3
-		c-2.4,0-4.3-1.9-4.3-4.3s1.9-4.3,4.3-4.3s4.3,1.9,4.3,4.3S152.4,35.3,150,35.3z"/>
-	<g id="XMLID_1_">
-		<g>
-			<polygon fill="#FFFFFF" points="150,28 152.5,31 151,31 151,34 149,34 149,31 147.5,31 			"/>
-		</g>
-		<g>
-		</g>
-	</g>
-</g>
-<g id="download">
-	<path fill="#FFFFFF" d="M126,25.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8c3.2,0,5.8-2.6,5.8-5.8S129.2,25.2,126,25.2z M126,35.3
-		c-2.4,0-4.3-1.9-4.3-4.3s1.9-4.3,4.3-4.3c2.4,0,4.3,1.9,4.3,4.3S128.4,35.3,126,35.3z"/>
-	<polygon fill="#FFFFFF" points="127,28 125,28 125,31 123.5,31 126,34 128.5,31 127,31 	"/>
-</g>
-<g id="download_x5F_alt">
-	<polygon fill="#FFFFFF" points="106.9,30 104,30 104,25 101,25 101,30 98,30 102.4,35 	"/>
-	<polygon fill="#FFFFFF" points="107,33 107,35 98,35 98,33 97,33 97,35 97,37 108,37 108,35 108,33 	"/>
-</g>
-<g id="road_2_">
-	<path fill="#FFFFFF" d="M79.6,37H85l-4.3-12h-2.1l0.2,3h-1.6l0.2-3h-2.1L71,37h5.4l0.4-4h2.4L79.6,37z M76.9,32l0.3-3h1.7l0.3,3
-		H76.9z"/>
-</g>
-<g id="time">
-	<polygon fill="#FFFFFF" points="54,28 53,28 53,32 56,32 56,31 54,31 	"/>
-	<path fill="#FFFFFF" d="M54,25.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S57.2,25.2,54,25.2z M54,35.3
-		c-2.4,0-4.3-1.9-4.3-4.3s1.9-4.3,4.3-4.3s4.3,1.9,4.3,4.3S56.4,35.3,54,35.3z"/>
-</g>
-<g id="file">
-	<polygon fill="#FFFFFF" points="31,26 31,29 34,29 	"/>
-	<path fill="#FFFFFF" d="M30,25h-4.8c-0.1,0-0.2,0.1-0.2,0.2v11.5c0,0.1,0.1,0.2,0.2,0.2h8.5c0.1,0,0.2-0.1,0.2-0.2V30h-4V25z"/>
-</g>
-<g id="home">
-	<polygon fill="#FFFFFF" points="6.6,24.6 0,31 2,31 2,37 5,37 5,33 8,33 8,37 11,37 11,31 13,31 	"/>
-</g>
-<g id="trash">
-	<path fill="#FFFFFF" d="M467.8,2H465V1c0-0.5-0.5-1-1-1h-3c-0.5,0-1,0.5-1,1v1h-2.8c-0.1,0-0.2,0.1-0.2,0.2v0.5
-		c0,0.1,0.1,0.2,0.2,0.2h10.5c0.1,0,0.2-0.1,0.2-0.2V2.2C468,2.1,467.9,2,467.8,2z M461,2L461,2l0-1h3v1H461z M458,12
-		c0,0.5,0.5,1,1,1h7c0.5,0,1-0.5,1-1V4h-9V12z M465,5h1v7h-1V5z M463,5h1v7h-1V5z M461,5h1v7h-1V5z M459,5h1v7h-1V5z"/>
-	<path opacity="0.5" fill="#FFFFFF" d="M460,12h-1V5h1V12z M462,5h-1v7h1V5z M464,5h-1v7h1V5z M466,5h-1v7h1V5z"/>
-</g>
-<g id="cog">
-	<path fill="#FFFFFF" d="M438,12.7c-0.2,0-0.5,0-0.7-0.1l-0.4-1.5l-0.1,0c-0.3-0.1-0.6-0.2-0.9-0.4l-0.1,0l-1.3,0.8
-		c-0.4-0.3-0.8-0.7-1-1l0.8-1.3l0-0.1c-0.2-0.3-0.3-0.6-0.4-0.9l0-0.1l-1.5-0.4c0-0.3-0.1-0.5-0.1-0.7c0-0.2,0-0.5,0.1-0.7l1.5-0.4
-		l0-0.1c0.1-0.3,0.2-0.6,0.4-0.9l0-0.1l-0.8-1.3c0.3-0.4,0.7-0.8,1-1l1.3,0.8l0.1,0c0.3-0.2,0.6-0.3,0.9-0.4l0.1,0l0.4-1.5
-		c0.3,0,0.5-0.1,0.7-0.1c0.3,0,0.5,0,0.7,0.1l0.4,1.5l0.1,0c0.3,0.1,0.6,0.2,0.9,0.4l0.1,0l1.3-0.8c0.4,0.3,0.8,0.7,1,1l-0.8,1.3
-		l0,0.1c0.2,0.3,0.3,0.6,0.4,0.9l0,0.1l1.5,0.4c0,0.3,0.1,0.5,0.1,0.7c0,0.3,0,0.5-0.1,0.7l-1.5,0.4l0,0.1c-0.1,0.3-0.2,0.6-0.4,0.9
-		l0,0.1l0.8,1.3c-0.3,0.4-0.7,0.8-1,1l-1.3-0.8l-0.1,0c-0.3,0.2-0.6,0.3-0.9,0.4l-0.1,0l-0.4,1.5C438.5,12.7,438.2,12.7,438,12.7z
-		 M438,4.8c-1.2,0-2.1,1-2.1,2.1c0,1.2,1,2.1,2.1,2.1c1.2,0,2.1-1,2.1-2.1C440.1,5.8,439.2,4.8,438,4.8z"/>
-</g>
-<g id="signal">
-	<path fill="#FFFFFF" d="M411,13h-2v-3h2V13z M414,8h-2v5h2V8z M417,5h-2v8h2V5z M420,1h-2v12h2V1z"/>
-</g>
-<g id="off">
-	<path fill="#FFFFFF" d="M391,5.5c0,0.3-0.2,0.5-0.5,0.5h-1c-0.3,0-0.5-0.2-0.5-0.5v-4c0-0.3,0.2-0.5,0.5-0.5h1
-		c0.3,0,0.5,0.2,0.5,0.5V5.5z M392,1.6v1.7c1.3,0.7,2.3,2.1,2.3,3.8c0,2.4-1.9,4.3-4.3,4.3s-4.3-1.9-4.3-4.3c0-1.6,0.9-3,2.3-3.8
-		V1.6c-2.2,0.8-3.8,2.9-3.8,5.4c0,3.2,2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8C395.8,4.5,394.2,2.4,392,1.6z"/>
-</g>
-<g id="zoom-out">
-	<g id="search_7_">
-		<path id="search_8_" fill="#FFFFFF" d="M372.1,11.7l-3-3c0.5-0.8,0.8-1.7,0.8-2.6c0-2.7-2.2-4.8-4.8-4.8c-2.7,0-4.8,2.2-4.8,4.8
-			c0,2.7,2.2,4.8,4.8,4.8c1,0,1.9-0.3,2.6-0.8l3,3c0.1,0.1,0.3,0.1,0.4,0l1.1-1.1C372.2,11.9,372.2,11.8,372.1,11.7z M361.8,6.1
-			c0-1.8,1.5-3.3,3.3-3.3c1.8,0,3.3,1.5,3.3,3.3c0,1.8-1.5,3.3-3.3,3.3C363.2,9.4,361.8,7.9,361.8,6.1z"/>
-	</g>
-	<rect x="363" y="5" fill="#FFFFFF" width="4" height="2"/>
-</g>
-<g id="zoom-in">
-	<path fill="#FFFFFF" d="M348.1,11.7l-3-3c0.5-0.8,0.8-1.7,0.8-2.6c0-2.7-2.2-4.8-4.8-4.8c-2.7,0-4.8,2.2-4.8,4.8
-		c0,2.7,2.2,4.8,4.8,4.8c1,0,1.9-0.3,2.6-0.8l3,3c0.1,0.1,0.3,0.1,0.4,0l1.1-1.1C348.2,11.9,348.2,11.8,348.1,11.7z M341.1,9.4
-		c-1.8,0-3.3-1.5-3.3-3.3c0-1.8,1.5-3.3,3.3-3.3c1.8,0,3.3,1.5,3.3,3.3C344.4,7.9,342.9,9.4,341.1,9.4z"/>
-	<polygon fill="#FFFFFF" points="342,4 340,4 340,5 339,5 339,7 340,7 340,8 342,8 342,7 343,7 343,5 342,5 	"/>
-</g>
-<g id="remove_1_">
-	<polygon fill="#FFFFFF" points="322.9,9.8 320.1,7 322.9,4.2 320.8,2.1 318,4.9 315.2,2.1 313.1,4.2 315.9,7 313.1,9.8 315.2,11.9 
-		318,9.1 320.8,11.9 	"/>
-</g>
-<g id="ok_1_">
-	<polygon fill="#FFFFFF" points="288.3,8.5 290.4,6.3 292.5,8.4 298.5,2.3 300.7,4.5 292.5,12.7 	"/>
-</g>
-<g id="th-list">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M267,8.5c0,0.3-0.2,0.5-0.5,0.5h-2c-0.3,0-0.5-0.2-0.5-0.5v-2
-		c0-0.3,0.2-0.5,0.5-0.5h2c0.3,0,0.5,0.2,0.5,0.5V8.5z M267,10.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V10.5z M267,2.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V2.5z M276,6.5c0-0.3-0.2-0.5-0.5-0.5h-7c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h7c0.3,0,0.5-0.2,0.5-0.5V6.5z M276,10.5c0-0.3-0.2-0.5-0.5-0.5h-7c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h7c0.3,0,0.5-0.2,0.5-0.5V10.5z M276,2.5c0-0.3-0.2-0.5-0.5-0.5h-7c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h7c0.3,0,0.5-0.2,0.5-0.5V2.5z"/>
-</g>
-<g id="th">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M251,2.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V2.5z M251,6.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V6.5z M251,10.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V10.5z M247,2.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V2.5z M247,6.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V6.5z M247,10.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V10.5z M243,2.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V2.5z M243,6.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V6.5z M243,10.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V10.5z"/>
-</g>
-<g id="th-large">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M227,2.5c0-0.3-0.2-0.5-0.5-0.5h-4c-0.3,0-0.5,0.2-0.5,0.5v4
-		c0,0.3,0.2,0.5,0.5,0.5h4c0.3,0,0.5-0.2,0.5-0.5V2.5z M227,8.5c0-0.3-0.2-0.5-0.5-0.5h-4c-0.3,0-0.5,0.2-0.5,0.5v4
-		c0,0.3,0.2,0.5,0.5,0.5h4c0.3,0,0.5-0.2,0.5-0.5V8.5z M221,2.5c0-0.3-0.2-0.5-0.5-0.5h-4c-0.3,0-0.5,0.2-0.5,0.5v4
-		c0,0.3,0.2,0.5,0.5,0.5h4c0.3,0,0.5-0.2,0.5-0.5V2.5z M221,8.5c0-0.3-0.2-0.5-0.5-0.5h-4c-0.3,0-0.5,0.2-0.5,0.5v4
-		c0,0.3,0.2,0.5,0.5,0.5h4c0.3,0,0.5-0.2,0.5-0.5V8.5z"/>
-</g>
-<g id="film">
-	<path fill="#FFFFFF" d="M192,2v11h12V2H192z M194,12h-1v-1h1V12z M194,10h-1V9h1V10z M194,8h-1V7h1V8z M194,6h-1V5h1V6z M194,4h-1
-		V3h1V4z M201,12h-6V8h6V12z M201,7h-6V3h6V7z M203,12h-1v-1h1V12z M203,10h-1V9h1V10z M203,8h-1V7h1V8z M203,6h-1V5h1V6z M203,4h-1
-		V3h1V4z"/>
-	<rect x="195" y="3" opacity="0.3" fill="#FFFFFF" width="6" height="4"/>
-	<rect x="195" y="8" opacity="0.3" fill="#FFFFFF" width="6" height="4"/>
-</g>
-<g id="user">
-	<path fill="#FFFFFF" d="M176,9V8c0.5,0,1-1.5,1-2V4c0-1.7-1.4-3-3-3c-1.6,0-3,1.3-3,3v2c0,0.5,0.5,2,1,2v1l-4,2.6c0,0,0,1.3,0,1.4
-		h12c0-0.1,0-1.4,0-1.4L176,9z"/>
-</g>
-<g id="star-empty">
-	<path fill="#FFFFFF" d="M155.7,5H151l-1.5-4h0l-1.5,4h-4.8l3.9,2.8l-1.5,4.5l0,0l3.8-2.8l3.8,2.8l-1.5-4.5L155.7,5z M149.5,8.3
-		l-1.9,1.4l0.7-2.3l-2-1.4h2.4l0.8-2.1l0.8,2.1h2.3l-1.9,1.4l0.7,2.3L149.5,8.3z"/>
-</g>
-<g id="star_1_">
-	<path id="star_4_" fill="#FFFFFF" d="M131.7,5l-3.8,2.8l1.5,4.5l-3.8-2.8l-3.8,2.8l0,0l1.5-4.5L119.3,5h4.8l1.5-4h0l1.5,4H131.7z"
-		/>
-</g>
-<g id="heart_2_">
-	<path fill="#FFFFFF" d="M102.5,3.5c-1.9-2.8-5.5-1-5.5,1.6c0,2,3.2,3.8,5.5,7c2.3-3.2,5.5-4.9,5.5-7C108,2.5,104.5,0.7,102.5,3.5z"
-		/>
-</g>
-<g id="envelope_2_">
-	<path fill="#FFFFFF" d="M78,8l-6-6h12L78,8z M78,10l-2-2l-4,4h12l-4-4L78,10z M81,7l3,3V4L81,7z M72,4v6l3-3L72,4z"/>
-</g>
-<g id="search_1_">
-	<path id="search_4_" fill="#FFFFFF" d="M60.1,11.7l-3-3c0.5-0.8,0.8-1.7,0.8-2.6c0-2.7-2.2-4.8-4.8-4.8c-2.7,0-4.8,2.2-4.8,4.8
-		c0,2.7,2.2,4.8,4.8,4.8c1,0,1.9-0.3,2.6-0.8l3,3c0.1,0.1,0.3,0.1,0.4,0l1.1-1.1C60.2,11.9,60.2,11.8,60.1,11.7z M49.8,6.1
-		c0-1.8,1.5-3.3,3.3-3.3c1.8,0,3.3,1.5,3.3,3.3c0,1.8-1.5,3.3-3.3,3.3C51.2,9.4,49.8,7.9,49.8,6.1z"/>
-</g>
-<g id="music_1_">
-	<path id="music_4_" fill="#FFFFFF" d="M35,1.2c0,0,0,8,0,8.8s-0.6,1.3-1.5,1.6c-1.1,0.3-2.1,0-2.3-0.7c-0.2-0.7,0.4-1.6,1.5-1.9
-		c0.5-0.2,1-0.2,1.4-0.1V3.7l-6,1.6c0,0,0,5.4,0,6.1c0,0.5-0.6,1.3-1.5,1.6c-1.1,0.3-2.1,0-2.3-0.7c-0.2-0.7,0.4-1.6,1.5-1.9
-		c0.5-0.2,1-0.2,1.4-0.1V3.3c0-0.1,0.1-0.3,0.2-0.3L34.8,1C34.9,1,35,1.1,35,1.2z"/>
-</g>
-<g id="glass_1_">
-	<polygon id="glass" fill="#FFFFFF" points="7,6.5 12,1 0,1 5,6.5 5,12 2,12 2,13 10,13 10,12 7,12 	"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/openQRM-5.3.50-CE/src/web/base/img/glyphicons/halflings/glyphicons_halflings.png b/openQRM-5.3.50-CE/src/web/base/img/glyphicons/halflings/glyphicons_halflings.png
deleted file mode 100644
index 525b26d..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/glyphicons/halflings/glyphicons_halflings.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/glyphicons/halflings/glyphicons_halflings.svg b/openQRM-5.3.50-CE/src/web/base/img/glyphicons/halflings/glyphicons_halflings.svg
deleted file mode 100644
index e519298..0000000
--- a/openQRM-5.3.50-CE/src/web/base/img/glyphicons/halflings/glyphicons_halflings.svg
+++ /dev/null
@@ -1,1119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="glyphicons_x5F_halflings" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" width="469px" height="230px" viewBox="0 0 469 230" enable-background="new 0 0 469 230" xml:space="preserve">
-<g id="tree_x5F_deciduous">
-	<path fill="#333333" d="M465.7,223.4c0.1,0.2,0.1,0.4,0.1,0.6c0,1-0.8,1.8-1.8,1.8c-0.4,0-0.7-0.1-1-0.3v3.1l0.8,0.5h-3.5l0.8-0.5
-		v-3.1c-0.3,0.2-0.6,0.3-1,0.3c-1,0-1.8-0.8-1.8-1.8c0-0.1,0-0.3,0-0.4c-0.6-0.3-1-0.9-1-1.6c0-1,0.8-1.8,1.8-1.8c0.1,0,0.2,0,0.2,0
-		c0-0.1,0-0.2,0-0.2c0-1.5,1.2-2.8,2.8-2.8c1.3,0,2.3,0.9,2.7,2c1.2,0.1,2.1,1.1,2.1,2.3C466.8,222.3,466.4,223,465.7,223.4z"/>
-</g>
-<g id="tree_x5F_conifer">
-	<path fill="#333333" d="M439,228.5l0.8,0.5h-3.5l0.8-0.5V227h-4l2.7-3H434l2.7-3H435l3-3.3l3,3.3h-1.7l2.7,3h-1.7l2.7,3h-4V228.5z"
-		/>
-</g>
-<g id="cloud_x5F_upload">
-	<path fill="#333333" d="M407.9,224.1c0-0.9,0.6-1.7,1.5-1.9c0-0.1,0-0.2,0-0.4c0-2,1.6-3.7,3.7-3.7c1.5,0,2.8,0.9,3.4,2.2
-		c0.3-0.1,0.6-0.1,0.9-0.1c1.6,0,2.9,1.3,2.9,2.9c0,1.3-0.9,2.5-2.2,2.8l-4-4l-4.1,4.1h-0.1C408.7,226,407.9,225.1,407.9,224.1z
-		 M415,227h2l-3-3l-3,3h2v3h2V227z"/>
-</g>
-<g id="cloud_x5F_download">
-	<path fill="#333333" d="M383.9,224.1c0-0.9,0.6-1.7,1.5-1.9c0-0.1,0-0.2,0-0.4c0-2,1.6-3.7,3.7-3.7c1.5,0,2.8,0.9,3.4,2.2
-		c0.3-0.1,0.6-0.1,0.9-0.1c1.6,0,2.9,1.3,2.9,2.9c0,1.6-1.3,2.9-2.9,2.9H392v-3h-4v3h-2.2C384.7,226,383.9,225.1,383.9,224.1z
-		 M391,224h-2v3h-2l3,3l3-3h-2V224z"/>
-</g>
-<g id="cloud">
-	<path fill="#333333" d="M372.2,223.1c0,1.6-1.3,2.9-2.9,2.9h-7.5c-1.1,0-1.9-0.9-1.9-1.9c0-0.9,0.6-1.7,1.5-1.9c0-0.1,0-0.2,0-0.4
-		c0-2,1.6-3.7,3.7-3.7c1.5,0,2.8,0.9,3.4,2.2c0.3-0.1,0.6-0.1,0.9-0.1C370.9,220.1,372.2,221.5,372.2,223.1z"/>
-</g>
-<g id="registration_x5F_mark">
-	<g id="registration_x5F_mark_1_">
-		<path fill="#333333" d="M342,217.1c-3.3,0-5.9,2.6-5.9,5.9s2.6,5.9,5.9,5.9c3.3,0,5.9-2.6,5.9-5.9S345.3,217.1,342,217.1z
-			 M342,227.2c-2.3,0-4.2-1.9-4.2-4.2s1.9-4.2,4.2-4.2c2.3,0,4.2,1.9,4.2,4.2S344.3,227.2,342,227.2z"/>
-		<polygon fill="#333333" points="343,221 340,221 340,225 341,225 341,224 343,224 343,223 341,223 341,222 343,222 343,223 
-			344,223 344,222 		"/>
-		<rect x="343" y="224" fill="#333333" width="1" height="1"/>
-	</g>
-</g>
-<g id="copyright_x5F_mark">
-	<path fill="#333333" d="M318,228.9c-3.3,0-5.9-2.6-5.9-5.9s2.6-5.9,5.9-5.9s5.9,2.6,5.9,5.9S321.3,228.9,318,228.9z M318,218.8
-		c-2.3,0-4.2,1.9-4.2,4.2s1.9,4.2,4.2,4.2c2.3,0,4.2-1.9,4.2-4.2S320.3,218.8,318,218.8z M320,222v-1h-3l-1,1v2l1,1h3v-1h-3v-2H320z
-		"/>
-</g>
-<g id="sound_x5F_7_x5F_1">
-	<path fill="#333333" d="M293,221v3h-1v-2h-2v-1H293z M290,225h1v1h-1V225z M291,224h1v1h-1V224z M294,225h1v1h-1V225z M296,222h-1
-		v-1h2v5h-1V222z M300,221c0-1.7-1.3-3-3-3h-7c-1.7,0-3,1.3-3,3v5c0,1.7,1.3,3,3,3h7c1.7,0,3-1.3,3-3V221z M298,227h-9v-7h9V227z"/>
-</g>
-<g id="sound_x5F_6_x5F_1">
-	<path fill="#333333" d="M269,222v4h-3v-5h1v1H269z M268,223h-1v2h1V223z M270,225h1v1h-1V225z M272,222h-1v-1h2v5h-1V222z M276,221
-		c0-1.7-1.3-3-3-3h-7c-1.7,0-3,1.3-3,3v5c0,1.7,1.3,3,3,3h7c1.7,0,3-1.3,3-3V221z M274,227h-9v-7h9V227z"/>
-</g>
-<g id="sound_x5F_5_x5F_1">
-	<path fill="#333333" d="M245,221v1h-2v1h2v3h-3v-1h2v-1h-2v-3H245z M246,225h1v1h-1V225z M248,222h-1v-1h2v5h-1V222z M252,221
-		c0-1.7-1.3-3-3-3h-7c-1.7,0-3,1.3-3,3v5c0,1.7,1.3,3,3,3h7c1.7,0,3-1.3,3-3V221z M250,227h-9v-7h9V227z"/>
-</g>
-<g id="sound_x5F_dolby">
-	<path fill="#333333" d="M228,221c0-1.7-1.3-3-3-3h-7c-1.7,0-3,1.3-3,3v5c0,1.7,1.3,3,3,3h7c1.7,0,3-1.3,3-3V221z M226,227h-9v-7h9
-		V227z M218,221v5h7v-5H218z M220.3,225c-0.5,0-1.3,0-1.3,0v-3c0,0,0.8,0,1.3,0c0.5,0,1,0.6,1,1.5C221.2,224.4,220.8,225,220.3,225z
-		 M224,225c0,0-0.8,0-1.3,0c-0.5,0-1-0.6-1-1.5c0-0.9,0.5-1.5,1-1.5c0.5,0,1.3,0,1.3,0V225z"/>
-</g>
-<g id="sound_x5F_stereo">
-	<path fill="#333333" d="M204,221c0-1.7-1.3-3-3-3h-7c-1.7,0-3,1.3-3,3v5c0,1.7,1.3,3,3,3h7c1.7,0,3-1.3,3-3V221z M202,227h-9v-7h9
-		V227z M197,225l-3-1.5l3-1.5V225z M198,222l3,1.5l-3,1.5V222z"/>
-</g>
-<g id="subtitles">
-	<path fill="#333333" d="M173,221v1h-2v3h2v1h-3v-5H173z M177,221v1h-2v3h2v1h-3v-5H177z M180,221c0-1.7-1.3-3-3-3h-7
-		c-1.7,0-3,1.3-3,3v5c0,1.7,1.3,3,3,3h7c1.7,0,3-1.3,3-3V221z M178,227h-9v-7h9V227z"/>
-</g>
-<g id="hd_x5F_video">
-	<path fill="#333333" d="M148,221h1v5h-1v-2h-1v2h-1v-5h1v2h1V221z M152,222h1v3h-1v1h-2v-5h2V222z M151,222v3h1v-3H151z M156,221
-		c0-1.7-1.3-3-3-3h-7c-1.7,0-3,1.3-3,3v5c0,1.7,1.3,3,3,3h7c1.7,0,3-1.3,3-3V221z M154,227h-9v-7h9V227z"/>
-</g>
-<g id="sd_x5F__x5F_video">
-	<path fill="#333333" d="M125,221v1h-2v1h2v3h-3v-1h2v-1h-2v-3H125z M128,222h1v3h-1v1h-2v-5h2V222z M127,222v3h1v-3H127z M129,218
-		h-7c-1.7,0-3,1.3-3,3v5c0,1.7,1.3,3,3,3h7c1.7,0,3-1.3,3-3v-5C132,219.3,130.7,218,129,218z M130,227h-9v-7h9V227z"/>
-</g>
-<g id="stats">
-	<path fill="#333333" d="M100,225v4h-3v-4c0-0.5,0.5-1,1-1h1C99.5,224,100,224.5,100,225z M103,218h-1c-0.5,0-1,0.5-1,1v10h3v-10
-		C104,218.5,103.5,218,103,218z M107,221h-1c-0.5,0-1,0.5-1,1v7h3v-7C108,221.5,107.5,221,107,221z"/>
-</g>
-<g id="tower">
-	<path fill="#333333" d="M75,225.5V223l-1-1v-4h1v2h1v-2h2v2h1v-2h2v2h1v-2h1v4l-1,1v2.5l1.2,1.5h-9.5L75,225.5z M73,228v1h11v-1H73
-		z"/>
-</g>
-<g id="phone_x5F_alt">
-	<path fill="#333333" d="M56,222.5V222c0,0,0-1-2-1s-2,1-2,1v0.5l-3.6,3c-0.2,0.2-0.4,0.6-0.4,0.9v2.1c0,0.3,0.2,0.5,0.5,0.5h11
-		c0.3,0,0.5-0.2,0.5-0.5v-2.1c0-0.3-0.2-0.7-0.4-0.9L56,222.5z M60,219.9v2c0,0.3-0.2,0.5-0.5,0.4l-2-0.3c-0.3,0-0.5-0.3-0.5-0.6
-		v-1.5c-0.8-0.1-1.8-0.2-3-0.2c-1.2,0-2.2,0.1-3,0.2v1.5c0,0.3-0.2,0.5-0.5,0.6l-2,0.3c-0.3,0-0.5-0.1-0.5-0.4v-2c0,0,1.5-1.9,6-1.9
-		S60,219.9,60,219.9z"/>
-</g>
-<g id="earphone">
-	<path fill="#333333" d="M24.2,218.9l1.6-1.6c0.2-0.2,0.6-0.2,0.8,0.1l1.4,1.9c0.2,0.3,0.1,0.6-0.1,0.9l-1.2,1.2
-		c0.6,0.8,1.3,1.7,2.3,2.7c1,1,1.9,1.7,2.7,2.3l1.2-1.2c0.2-0.2,0.6-0.3,0.9-0.1l1.9,1.4c0.3,0.2,0.3,0.6,0.1,0.8l-1.6,1.6
-		c0,0-2.8,0.2-6.5-3.4C23.9,221.7,24.2,218.9,24.2,218.9z"/>
-</g>
-<g id="compressed">
-	<path fill="#333333" d="M11,219v1v0.6v0.4H9.9L7,222v-1l-2-2H1l1-1h3.8l1,1H11z M7,226l-2,2H1l1,1h3.8l1-1H11v-1.4V226v-1l-2.9,1H7
-		z M7,225l4-1.3V222l-4,1.3V225z M1,227c-0.5,0-1-0.5-1-1v-5c0-0.5,0.5-1,1-1h3c0.5,0,1,0.5,1,1v5c0,0.5-0.5,1-1,1H1z M1,223h3v-2H1
-		V223z M1,226h3v-2H1V226z"/>
-</g>
-<g id="header">
-	<path fill="#333333" d="M467,195.1v8.9c0,0.5,1,0.5,1,0.5c0,0.5,0,0.6,0,0.6h-4c0,0,0-0.1,0-0.6c1,0,1,0,1-0.5V200h-5v3.9
-		c0,0.5,0,0.5,1,0.5c0,0.5,0,0.6,0,0.6h-4c0,0,0-0.1,0-0.6c0,0,1,0,1-0.5v-8.9c0-0.5-1-0.5-1-0.5c0-0.5,0-0.6,0-0.6h4
-		c0,0,0,0.1,0,0.6c-1,0-1,0-1,0.5v3.9h5v-3.9c0-0.5,0-0.5-1-0.5c0-0.5,0-0.6,0-0.6h4c0,0,0,0.1,0,0.6C468,194.6,467,194.6,467,195.1
-		z"/>
-</g>
-<g id="cutlery">
-	<path fill="#333333" d="M444,193.4v11.1c0,0.3-0.2,0.5-0.5,0.5h-2c-0.3,0-0.5-0.2-0.5-0.5v-4c0,0-1-0.5-1-1.5c0-0.5,0-3.6,0-3.6
-		c0-0.4,0.3-0.9,0.6-1.2l2.8-1.2C443.7,192.9,444,193,444,193.4z M437,194v3h-1v-3l-0.5-1l-0.5,1v3h-1v-3l-0.5-1l-0.5,1v3v1l1,2v4.5
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V200l1-2v-1v-3l-0.5-1L437,194z"/>
-</g>
-<g id="transfer">
-	<path fill="#333333" d="M419,200v2h-1v-2H419z M416,202h1v-2h-1V202z M415,200h-4v-2l-3,3l3,3v-2h4V200z M410,197v-2h-1v2H410z
-		 M412,195h-1v2h1V195z M413,197h4v2l3-3l-3-3v2h-4V197z"/>
-</g>
-<g id="credit_x5F_card_1_">
-	<path id="credit_x5F_card" fill="#333333" d="M396,194.5v1.5h-12v-1.5c0-0.3,0.2-0.5,0.5-0.5h11C395.8,194,396,194.2,396,194.5z
-		 M384,197h12v5.5c0,0.3-0.2,0.5-0.5,0.5h-11c-0.3,0-0.5-0.2-0.5-0.5V197z M385,202h4v-2h-4V202z"/>
-</g>
-<g id="floppy_x5F_open">
-	<path fill="#333333" d="M370,205h-2v-3h-2l3-3l3,3h-2V205z M367,193h-1v2h1V193z M369,197l2,2v-4l-2-2h-1v3h-5v-3h-2.5
-		c-0.3,0-0.5,0.2-0.5,0.5v10c0,0.3,0.2,0.5,0.5,0.5h1.5v-4h4L369,197z"/>
-</g>
-<g id="floppy_x5F_save">
-	<path fill="#333333" d="M346,202h2l-3,3l-3-3h2v-3h2V202z M343,193h-1v2h1V193z M343,198h4v-3l-2-2h-1v3h-5v-3h-2.5
-		c-0.3,0-0.5,0.2-0.5,0.5v10c0,0.3,0.2,0.5,0.5,0.5h1.5v-4h5V198z"/>
-</g>
-<g id="floppy_x5F_remove">
-	<path fill="#333333" d="M319,195h-1v-2h1V195z M320.3,197l1.7,1.7l1-1V195l-2-2h-1v3h-5v-3h-2.5c-0.3,0-0.5,0.2-0.5,0.5v10
-		c0,0.3,0.2,0.5,0.5,0.5h1.5v-4h3.3L320.3,197z M324.9,203.7l-1.7-1.7l1.7-1.7l-1.3-1.3l-1.7,1.7l-1.7-1.7l-1.3,1.3l1.7,1.7
-		l-1.7,1.7l1.3,1.3l1.7-1.7l1.7,1.7L324.9,203.7z"/>
-</g>
-<g id="floppy_x5F_saved">
-	<path fill="#333333" d="M295,195h-1v-2h1V195z M295,198.7l1.2,1.2l2.8-2.8V195l-2-2h-1v3h-5v-3h-2.5c-0.3,0-0.5,0.2-0.5,0.5v10
-		c0,0.3,0.2,0.5,0.5,0.5h1.5v-4h3.8L295,198.7z M299.8,198.4l-3.5,3.5l-1.2-1.2l-1.2,1.2l2.4,2.4l4.8-4.8L299.8,198.4"/>
-</g>
-<g id="floppy_x5F_disk">
-	<path fill="#333333" d="M271,195h-1v-2h1V195z M273,193h-1v3h-5v-3h-2.5c-0.3,0-0.5,0.2-0.5,0.5v10c0,0.3,0.2,0.5,0.5,0.5h1.5v-4h7
-		v4h1.5c0.3,0,0.5-0.2,0.5-0.5V195L273,193z"/>
-</g>
-<g id="send">
-	<path fill="#333333" d="M240.2,200.8h3.9v4.2l3.1-3.9l4.8,2.7V193L240.2,200.8z M244.9,202.9v-2.3l6.7-7.1L244.9,202.9z"/>
-</g>
-<g id="export">
-	<path fill="#333333" d="M216.2,202c-0.1,0-0.2,0.1-0.2,0.2v2.8h11v-2.8c0-0.1-0.1-0.2-0.3-0.2H216.2z M226,203.5h-1V203h1V203.5z
-		 M221.1,200l-1,1l-2.1-2.1l1-1L221.1,200z M219,193l7,0l0,7l-2.5-2.4l-1.5,1.5l-2.1-2.1l1.5-1.5L219,193z"/>
-</g>
-<g id="import">
-	<path fill="#333333" d="M192.2,202c-0.1,0-0.2,0.1-0.2,0.2v2.8h11v-2.8c0-0.1-0.1-0.2-0.3-0.2H192.2z M202,203.5h-1V203h1V203.5z
-		 M194,196.1l-1-1l2.1-2.1l1,1L194,196.1z M201,194l0,7l-7,0l2.4-2.5l-1.5-1.5l2.1-2.1l1.5,1.5L201,194z"/>
-</g>
-<g id="saved">
-	<path fill="#333333" d="M168.2,202c-0.1,0-0.2,0.1-0.2,0.2v2.8h11v-2.8c0-0.1-0.1-0.2-0.3-0.2H168.2z M178,203.5h-1V203h1V203.5z
-		 M169,197.9l1.5-1.5l1.5,1.5l4.4-4.4l1.5,1.5l-6,6L169,197.9z"/>
-</g>
-<g id="open">
-	<path fill="#333333" d="M144.2,202c-0.1,0-0.2,0.1-0.2,0.2v2.8h11v-2.8c0-0.1-0.1-0.2-0.3-0.2H144.2z M154,203.5h-1V203h1V203.5z
-		 M145,198l4.5-5l4.4,5H151v3h-3v-3H145z"/>
-</g>
-<g id="save">
-	<path fill="#333333" d="M120.2,202c-0.1,0-0.2,0.1-0.2,0.2v2.8h11v-2.8c0-0.1-0.1-0.2-0.3-0.2H120.2z M130,203.5h-1V203h1V203.5z
-		 M129.9,197l-4.5,5l-4.4-5h3v-4h3v4H129.9z"/>
-</g>
-<g id="record">
-	<path fill="#333333" d="M102,193.1c-3.2,0-5.9,2.6-5.9,5.9s2.6,5.9,5.9,5.9c3.2,0,5.9-2.6,5.9-5.9S105.2,193.1,102,193.1z
-		 M102,203.2c-2.3,0-4.2-1.9-4.2-4.2s1.9-4.2,4.2-4.2c2.3,0,4.2,1.9,4.2,4.2S104.3,203.2,102,203.2z M102,200.9
-		c-1.1,0-1.9-0.9-1.9-1.9c0-1.1,0.9-1.9,1.9-1.9c1.1,0,1.9,0.9,1.9,1.9C103.9,200.1,103.1,200.9,102,200.9z"/>
-</g>
-<g id="new_x5F_window">
-	<path fill="#333333" d="M83,200c0,0.6,0,1,0,1c0,2.2-1.8,4-4,4h-3c-2.2,0-4-1.8-4-4v-3c0-2.2,1.8-4,4-4h1l0.7,0.8l-1.2,1.2H75
-		c-0.5,0-1,0.5-1,1v5c0,0.5,0.5,1,1,1h5c0.5,0,1-0.5,1-1v-1.5l1.2-1.2L83,200z M84,193h-5l1.5,1.5l-3.5,3.4l2.1,2.1l3.4-3.5L84,198
-		V193z"/>
-</g>
-<g id="log_x5F_out">
-	<path fill="#333333" d="M56,205h-4c-2.2,0-4-1.8-4-4v-3c0-2.2,1.8-4,4-4h4v2h-5c-0.5,0-1,0.5-1,1v5c0,0.5,0.5,1,1,1h5V205z
-		 M61,199.5l-4-3.5v2h-3v3h3v2L61,199.5z"/>
-</g>
-<g id="flash">
-	<path fill="#333333" d="M28,205L28,205c-0.2-0.2-0.1-0.3-0.1-0.4c0-0.2,1.6-4.6,1.6-4.6h-3c-0.1,0-0.3-0.1-0.3-0.2
-		c-0.1-0.1,0-0.3,0.1-0.4c1.8-2,5.2-5.9,5.4-6.1c0.1-0.1,0.2-0.2,0.2-0.2h0.1l0.1,0.1c0,0,0.1,0.1,0.1,0.3c0,0.2-1.5,4.3-1.6,4.5
-		l3,0c0.1,0,0.3,0.1,0.3,0.2c0.1,0.1,0,0.2-0.1,0.4c0,0-5.3,6.2-5.4,6.3C28.3,204.9,28.2,205,28,205L28,205z"/>
-</g>
-<g id="log_x5F_in">
-	<path fill="#333333" d="M5,203h5c0.5,0,1-0.5,1-1v-5c0-0.5-0.5-1-1-1H5v-2h4c2.2,0,4,1.8,4,4v3c0,2.2-1.8,4-4,4H5V203z M7,199.5
-		L3,196v2H0v3h3v2L7,199.5z"/>
-</g>
-<g id="collapse-top">
-	<path id="collapse_x5F_top" fill="#333333" d="M468,177v-3c0-2.2-1.8-4-4-4h-3c-2.2,0-4,1.8-4,4v3c0,2.2,1.8,4,4,4c0,0,2,0,3,0
-		C466.2,181,468,179.2,468,177z M466,178c0,0.5-0.5,1-1,1h-5c-0.5,0-1-0.5-1-1v-5c0-0.5,0.5-1,1-1h5c0.5,0,1,0.5,1,1V178z M465,177
-		h-5l2.5-3.3L465,177z"/>
-</g>
-<g id="collapse_1_">
-	<path id="collapse" fill="#333333" d="M440,170c-1,0-3,0-3,0c-2.2,0-4,1.8-4,4v3c0,2.2,1.8,4,4,4h3c2.2,0,4-1.8,4-4v-3
-		C444,171.8,442.2,170,440,170z M442,178c0,0.5-0.5,1-1,1h-5c-0.5,0-1-0.5-1-1v-5c0-0.5,0.5-1,1-1h5c0.5,0,1,0.5,1,1V178z
-		 M438.5,177.3L436,174h5L438.5,177.3z"/>
-</g>
-<g id="expand_1_">
-	<path id="expand" fill="#333333" d="M408,174c0,1,0,3,0,3c0,2.2,1.8,4,4,4h3c2.2,0,4-1.8,4-4v-3c0-2.2-1.8-4-4-4h-3
-		C409.8,170,408,171.8,408,174z M416,172c0.5,0,1,0.5,1,1v5c0,0.5-0.5,1-1,1h-5c-0.5,0-1-0.5-1-1v-5c0-0.5,0.5-1,1-1H416z
-		 M415.3,175.5L412,178v-5L415.3,175.5z"/>
-</g>
-<g id="unchecked_1_">
-	<path id="unchecked" fill="#333333" d="M391,170h-3c-2.2,0-4,1.8-4,4v3c0,2.2,1.8,4,4,4h3c2.2,0,4-1.8,4-4c0,0,0-2,0-3
-		C395,171.8,393.2,170,391,170z M392,172c0.5,0,1,0.5,1,1v5c0,0.5-0.5,1-1,1h-5c-0.5,0-1-0.5-1-1v-5c0-0.5,0.5-1,1-1H392z"/>
-</g>
-<g id="sort-by-attributes-alt">
-	<path fill="#333333" d="M360,178h2v-9h2v9h2l-3,3L360,178z M369,178h-2v2h2V178z M370,175h-3v2h3V175z M372,169h-5v2h5V169z
-		 M371,172h-4v2h4V172z"/>
-</g>
-<g id="sort-by-attributes">
-	<path fill="#333333" d="M336,178h2v-9h2v9h2l-3,3L336,178z M345,169h-2v2h2V169z M346,172h-3v2h3V172z M348,178h-5v2h5V178z
-		 M347,175h-4v2h4V175z"/>
-</g>
-<g id="sort-by-order-alt">
-	<path fill="#333333" d="M312,178h2v-9h2v9h2l-3,3L312,178z M320,169v4h2v1h1v-5H320z M322,172h-1v-2h1V172z M321,181h1v-5h-2v1h1
-		V181z"/>
-</g>
-<g id="sort-by-order">
-	<path fill="#333333" d="M288,178h2v-9h2v9h2l-3,3L288,178z M296,176v4h2v1h1v-5H296z M298,179h-1v-2h1V179z M297,174h1v-5h-2v1h1
-		V174z"/>
-</g>
-<g id="sort-by-alphabet-alt">
-	<path fill="#333333" d="M264,178h2v-9h2v9h2l-3,3L264,178z M271,176v5h1v-1h1v1h1v-5H271z M273,179h-1v-2h1V179z M271,169v1h2v1h1
-		v-2H271z M271,174h3v-1h-2v-1h-1V174z M272,172h1v-1h-1V172z"/>
-</g>
-<g id="sort-by-alphabet">
-	<path fill="#333333" d="M240,178h2v-9h2v9h2l-3,3L240,178z M247,169v5h1v-1h1v1h1v-5H247z M249,172h-1v-2h1V172z M247,176v1h2v1h1
-		v-2H247z M247,181h3v-1h-2v-1h-1V181z M248,179h1v-1h-1V179z"/>
-</g>
-<g id="sort">
-	<path fill="#333333" d="M216,178h2v-9h2v9h2l-3,3L216,178z M222,172h2v9h2v-9h2l-3-3L222,172z"/>
-</g>
-<g id="gbp">
-	<path fill="#333333" d="M200.7,178c-0.1,0-0.5,0.3-1.4,0.3c-0.7,0-1.4-0.3-2.1-0.3c-0.2,0-1,0.1-1.5,0.3c0.5-0.5,0.8-0.9,1-1.1
-		c0.3-0.4,0.4-1.4,0.3-2.1h2v-1h-2.4c-0.4-0.7-0.9-1.4-0.9-2c0-0.4,0.1-0.7,0.4-1c0.3-0.3,0.9-0.5,1.4-0.5c0.6,0,1.8,0.4,1.8,1.5
-		h1.5c0-1.6-1.6-3-3.3-3c-1.1,0-2,0.3-2.6,0.9c-1.3,1.2-1,2.5-0.8,3c0.1,0.3,0.3,0.7,0.4,1H193v1h2.2c0.5,1,0.4,2-0.2,2.7
-		c-0.4,0.4-0.6,0.5-0.9,0.8l0.6,1.5c0,0,0.8-0.5,1.7-0.5c0.9-0.1,2.2,0.6,2.8,0.6c0.6,0,1.1,0,2-0.5L200.7,178z"/>
-</g>
-<g id="usd_1_">
-	<path id="usd" fill="#333333" d="M178.3,176.9c0-2.2-1.8-2.7-2.7-2.9c0,0-0.3,0-0.6-0.1v-3.1c1.1,0.2,1.3,0.8,1.4,1.6h1.6
-		c-0.1-2.3-1.9-2.9-3-3v-0.8h-1v0.8c-1.5,0.1-3,1.1-3,3c0,1.9,1.4,2.5,2.7,2.9c0.1,0,0.2,0.1,0.3,0.1v3.3c-1-0.2-1.6-0.9-1.7-1.9
-		H171c0,1,0.1,1.7,0.7,2.3c0.6,0.6,1.4,0.9,2.4,1v0.8h1v-0.8C177.1,179.9,178.3,178.7,178.3,176.9z M172.7,172.1
-		c0-1.1,0.7-1.3,1.3-1.4v2.7C173.3,173.3,172.7,173.2,172.7,172.1z M175,178.6v-3.1c0.9,0.3,1.7,0.7,1.7,1.6
-		C176.7,178.3,175.6,178.6,175,178.6z"/>
-</g>
-<g id="euro">
-	<path fill="#333333" d="M151.5,179.1c-0.6,0-2.2-0.5-2.5-3.1h3l1-1h-4.1c0-0.4,0-0.7,0.1-1h3l1-1h-3.8c0.5-1.7,1.8-2.2,2.3-2.2
-		c0.7,0,2.3,0.6,2.3,2.2h1.8c0-0.7-0.3-1.4-0.7-2.1c-0.7-1.3-1.9-1.9-3.5-1.9c-1.2,0-2.2,0.5-3,1.4c-0.4,0.4-0.8,1.3-1.1,2.6H146
-		l-1,1h2.2c0,0.3-0.1,0.6-0.1,1H146l-1,1h2.2c0.2,1.8,0.8,2.9,1.1,3.4c0.8,1.1,1.9,1.6,3.2,1.6c1.1,0,2-0.4,2.7-1.2
-		c0.7-0.7,1.1-1.7,1.3-2.8h-1.7C153.8,178.5,152.2,179.1,151.5,179.1z"/>
-</g>
-<g id="pushpin">
-	<path fill="#333333" d="M131.9,172l-2.8-2.8c-0.2-0.2-0.5-0.2-0.7,0s-0.2,0.5,0,0.7l0.4,0.4L126,173h-3l2.1,2.1l-3.1,3.1l-2,2.8
-		l2.8-2l3.1-3.1l2.1,2.1v-3l2.8-2.7l0.4,0.4c0.2,0.2,0.5,0.2,0.7,0C132,172.5,132,172.2,131.9,172z"/>
-</g>
-<g id="phone_1_">
-	<g opacity="0.3">
-		<rect x="99" y="171" fill="#333333" width="6" height="7"/>
-	</g>
-	<path fill="#333333" d="M102,169c-2.4,0-4,0.9-4,1.5v9.5c0,0.5,0.5,1,1,1h6c0.5,0,1-0.5,1-1v-9.5C106,169.9,104.4,169,102,169z
-		 M102,180.5c-0.6,0-1-0.5-1-1c0-0.6,0.5-1,1-1c0.6,0,1,0.5,1,1C103,180.1,102.6,180.5,102,180.5z M105,178h-6v-7h6V178z"/>
-</g>
-<g id="link">
-	<path fill="#333333" d="M76.2,181.1c-0.6,0-1.2-0.2-1.6-0.7l-1.4-1.4c-0.4-0.4-0.7-1-0.7-1.6c0-0.6,0.2-1.2,0.7-1.6l0.6-0.6
-		c0.2,0.4,0.4,0.7,0.8,1l0.2,0.2l-1,1l2.5,2.5l3.9-3.9l-2.1-2.1l1.1-1.1c0.1,0.1,0.1,0.1,0.2,0.2l1.4,1.4c0.9,0.9,0.9,2.3,0,3.2
-		l-2.8,2.8C77.4,180.9,76.8,181.1,76.2,181.1z M76.8,176.9l-1.4-1.4c-0.4-0.4-0.7-1-0.7-1.6c0-0.6,0.2-1.2,0.7-1.6l2.8-2.8
-		c0.4-0.4,1-0.7,1.6-0.7c0.6,0,1.2,0.2,1.6,0.7l1.4,1.4c0.4,0.4,0.7,1,0.7,1.6c0,0.6-0.5,1.4-0.9,1.8l-0.3,0.3
-		c-0.2-0.4-0.5-0.7-0.8-1l-0.2-0.2l1-1l-2.5-2.5l-3.9,3.9l2.1,2.1l-1.1,1.1C76.9,177.1,76.8,177,76.8,176.9z"/>
-</g>
-<g id="heart-empty">
-	<path fill="#333333" d="M54.5,171.5c-1.9-2.8-5.5-1-5.5,1.6c0,2,3.2,3.8,5.5,7c2.3-3.2,5.5-4.9,5.5-7
-		C60,170.5,56.5,168.7,54.5,171.5z M56.6,175.9c-0.7,0.7-1.4,1.4-2.1,2.2c-0.7-0.8-1.4-1.5-2-2.2c-1.1-1.1-2.2-2.1-2.2-2.8
-		c0-1.1,0.9-1.9,1.8-1.9c0.5,0,1,0.3,1.4,0.9l1,1.5l1-1.5c0.4-0.6,0.9-0.9,1.5-0.9c0.9,0,1.7,0.8,1.7,1.9
-		C58.7,173.9,57.7,174.8,56.6,175.9z"/>
-</g>
-<g id="paperclip">
-	<path fill="#333333" d="M29.2,179.7L29.2,179.7l2.5-2.6l2.5-2.5c0.6-0.6,0.9-1.2,1-1.9c0.1-1.3-0.8-2.5-2.1-2.7c-0.2,0-0.3,0-0.5,0
-		c-1.2,0-2,0.8-2.7,1.6l-3.5,3.5c-0.1,0.1-0.3,0.3-0.4,0.4c-0.8,0.7-1.5,1.3-1.3,2.3c0.1,0.9,0.9,1.3,1.5,1.3c0.5,0,0.9-0.2,1.2-0.5
-		l5.5-5.5c0.2-0.2,0.3-0.5,0.2-0.7c-0.1-0.2-0.3-0.4-0.5-0.4c-0.2,0-0.3,0.1-0.5,0.2c-0.1,0.1-0.3,0.2-0.4,0.4l-3.8,3.7l-0.7-0.7
-		l0.1-0.1c0,0,3.5-3.6,3.9-4c0.4-0.4,0.8-0.7,1.5-0.7c0.1,0,0.2,0,0.3,0c0.6,0.1,1,0.5,1.2,1c0.2,0.6,0,1.3-0.4,1.8l-3.9,3.9
-		c-0.2,0.2-0.4,0.4-0.6,0.6c-0.6,0.7-1.1,1.2-1.8,1.5c-0.4,0.2-0.8,0.3-1.2,0.3c-0.9,0-1.8-0.5-2.2-1.2c-0.6-1-0.4-2.5,0.5-3.4
-		l5.1-5.1c0.4-0.4,0.7-0.7,1.1-1c0.6-0.4,1.3-0.5,2-0.5c0.5,0,1.1,0.1,1.5,0.3c1,0.5,1.8,1.4,2,2.6c0.2,1.2-0.2,2.5-1.1,3.4
-		l-5.2,5.1C29.9,180.3,29.2,179.7,29.2,179.7z"/>
-</g>
-<g id="dashboard">
-	<path opacity="0.3" fill="#333333" d="M2.7,177c0.7,1.1,1.9,1.9,3.3,1.9s2.6-0.8,3.3-1.9H2.7z"/>
-	<g>
-		<path fill="#333333" d="M7.5,172c-0.3,0-0.5,0.2-0.5,0.5c0,0.1,0,0.2,0.1,0.3c0,0,0,0,0,0l-1.2,1.3c-0.4,0.1-0.7,0.4-0.7,0.9
-			c0,0.5,0.4,0.9,0.9,0.9c0.5,0,0.9-0.4,0.9-0.9c0-0.2-0.1-0.4-0.2-0.5l0.5-1.4c0.1,0.1,0.2,0.1,0.3,0.1c0.3,0,0.5-0.2,0.5-0.5
-			C8.1,172.2,7.8,172,7.5,172z"/>
-		<circle fill="#333333" cx="8.5" cy="174.5" r="0.5"/>
-		<circle fill="#333333" cx="4.5" cy="172.5" r="0.5"/>
-		<circle fill="#333333" cx="3.5" cy="174.5" r="0.5"/>
-		<path fill="#333333" d="M6,169.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8c3.2,0,5.8-2.6,5.8-5.8S9.2,169.2,6,169.2z M6,179.3
-			c-2.4,0-4.3-1.9-4.3-4.3c0-2.4,1.9-4.3,4.3-4.3s4.3,1.9,4.3,4.3C10.3,177.4,8.4,179.3,6,179.3z"/>
-	</g>
-</g>
-<g id="fullscreen">
-	<path fill="#333333" d="M457.3,147.7L456,149v-4h4l-1.3,1.3l2,2l-1.4,1.4L457.3,147.7z M460.7,153.7l-1.4-1.4l-2,2L456,153v4h4
-		l-1.3-1.3L460.7,153.7z M464.7,152.3l-1.4,1.4l2,2L464,157h4v-4l-1.3,1.3L464.7,152.3z M464,145l1.3,1.3l-2,2l1.4,1.4l2-2l1.3,1.3
-		v-4H464z"/>
-</g>
-<g id="briefcase">
-	<rect x="437" y="151" opacity="0.5" fill="#333333" width="2" height="1"/>
-	<rect x="432" y="152" opacity="0.3" fill="#333333" width="12" height="1"/>
-	<g>
-		<path fill="#333333" d="M437,153h-5v2c0,0.5,0.5,1,1,1h10c0.5,0,1-0.5,1-1v-2h-5H437z"/>
-		<path fill="#333333" d="M443,147h-3v-1c0-0.6-0.4-1-1-1h-2c-0.6,0-1,0.4-1,1v1h-3c-0.5,0-1,0.5-1,1v4h5v-1h2v1h5v-4
-			C444,147.5,443.5,147,443,147z M437,146h2v1h-2V146z"/>
-	</g>
-</g>
-<g id="filter">
-	<g>
-		<path fill="#333333" d="M413,152v5l2-2v-3l3.5-5h-9L413,152z"/>
-		<rect x="409" y="145" fill="#333333" width="10" height="1"/>
-	</g>
-</g>
-<g id="tasks">
-	<g id="tasks_x5F_alt">
-		<path fill="#333333" d="M396,151c0-0.6-0.4-1-1-1h-10c-0.6,0-1,0.4-1,1v1c0,0.6,0.4,1,1,1h10c0.6,0,1-0.4,1-1V151z M395,152h-10
-			v-1h10V152z M396,155c0-0.6-0.4-1-1-1h-10c-0.6,0-1,0.4-1,1v1c0,0.6,0.4,1,1,1h10c0.6,0,1-0.4,1-1V155z M395,156h-10v-1h10V156z
-			 M396,147c0-0.6-0.4-1-1-1h-10c-0.6,0-1,0.4-1,1v1c0,0.6,0.4,1,1,1h10c0.6,0,1-0.4,1-1V147z M395,148h-10v-1h10V148z"/>
-	</g>
-	<rect x="385" y="147" opacity="0.5" fill="#333333" width="8" height="1"/>
-	<rect x="385" y="151" opacity="0.5" fill="#333333" width="5" height="1"/>
-	<rect x="385" y="155" opacity="0.5" fill="#333333" width="7" height="1"/>
-</g>
-<g id="wrench">
-	<path fill="#333333" d="M372,148l-2.5,1.3l-1.4-2.3l2.6-1.4c-1-0.7-2.1-0.6-3.1-0.1c-1.3,0.7-1.8,2.2-1.4,3.6l-6,6
-		c-0.2,0.2-0.2,0.5,0,0.7l1.1,1.1c0.2,0.2,0.5,0.2,0.7,0l6-6c0.8,0.3,1.7,0.2,2.5-0.2C371.5,150.1,372.1,149.2,372,148z"/>
-</g>
-<g id="globe">
-	<path fill="#333333" d="M342.1,147.1c-0.2,0.1-0.3,0.5-0.6,0.2c-0.1,0.2-0.3,0.3-0.3,0.6c0.3,0.2,0.9,0.2,1.3,0.3
-		C342.5,148,342.1,147.5,342.1,147.1z"/>
-	<path fill="#333333" d="M342,145.2c-3.1,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8c3.1,0,5.8-2.6,5.8-5.8S345.1,145.2,342,145.2z
-		 M345.1,154.9c-0.6,0.5-1.4,1.1-2.2,1.1c-0.1-0.2,0-0.3,0-0.5c-0.4-0.1-0.7-0.5-0.9-0.8c-0.1-0.4,0.5-0.8,0.4-1.1
-		c-0.7,0.1-1.1-0.6-1.7-0.8c-0.4-0.1-0.7-0.2-1.1-0.4c-0.2-0.1-0.4-0.4-0.7-0.3c0-0.4-0.3-0.8-0.3-1c0.1-0.6-0.3-1.2-0.1-1.8
-		c0.1-0.6,0.5-1.1,0.6-1.7c0-0.1-0.2-0.2-0.2-0.4c0-0.2,0.7-0.5,0.9-0.6c0.3-0.1,0.6,0,0.9,0c0.5-0.1,1.1-0.1,1.5-0.5
-		c0.1,0,0.3,0,0.4,0c0.4,0.4,1.5,0.2,1.4,1.1c0,0-0.4,0.2-1.1-0.1c0.1,0,0,0.3,0,0.4c0.6,0.3,1.3,0.6,1.6,1.2
-		c-0.2,0.3-0.6,0.2-0.9,0.2c-0.1,0.1-0.1,0.2-0.1,0.4c-0.6,0.3-0.5,0.6-0.7,1.1c-0.1,0.3-0.4,0.4-0.4,0.8c0.1,0.4-0.1,0.6-0.2,1
-		c0,0-0.5-0.3-0.8-0.7c-0.1-0.2-0.6-0.1-0.8-0.2c-0.5,0.2-0.1,1.3,0.3,0.8c0.5-0.6,0.6,0.1,0.6,0.5c0.2,0.1,0.4,0,0.5,0.2
-		c0,0.1,0,0.4,0,0.5c0.1,0.2,0.6,0,0.7-0.1c0.5-0.3,1.1-0.2,1.6-0.2c0.3,0.2,0.7,0.2,1,0.3c0.3,0.1,0.5,0,0.7,0.2
-		C346.1,154,345.6,154.4,345.1,154.9z"/>
-</g>
-<g id="circle-arrow-down">
-	<g id="arrow_4_">
-		<path fill="#333333" d="M318,145.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8c3.2,0,5.8-2.6,5.8-5.8S321.2,145.2,318,145.2z
-			 M319,148v3h2l-3,4l-3-4h2v-3H319z"/>
-	</g>
-</g>
-<g id="circle-arrow-top">
-	<g id="arrow_3_">
-		<path fill="#333333" d="M294,156.8c3.2,0,5.8-2.6,5.8-5.8s-2.6-5.8-5.8-5.8c-3.2,0-5.8,2.6-5.8,5.8S290.8,156.8,294,156.8z
-			 M293,154v-3h-2l3-4l3,4h-2v3H293z"/>
-	</g>
-</g>
-<g id="circle-arrow-left">
-	<g id="arrow_2_">
-		<path fill="#333333" d="M270,145.2c-3.2,0-5.8,2.6-5.8,5.8c0,3.2,2.6,5.8,5.8,5.8c3.2,0,5.8-2.6,5.8-5.8
-			C275.8,147.8,273.2,145.2,270,145.2z M273,152h-3l0,1.9l-4-2.9l4-3v2h3L273,152z"/>
-	</g>
-</g>
-<g id="circle-arrow-right">
-	<g id="arrow_1_">
-		<path fill="#333333" d="M240.2,151c0,3.2,2.6,5.8,5.8,5.8c3.2,0,5.8-2.6,5.8-5.8c0-3.2-2.6-5.8-5.8-5.8
-			C242.8,145.2,240.2,147.8,240.2,151z M243,150h3v-2l4,3l-4,2.9l0-1.9h-3L243,150z"/>
-	</g>
-</g>
-<g id="hand-down">
-	<g id="hand_x5F_top_1_">
-		<g id="hand_x5F_right_2_">
-			<rect x="219" y="144" fill="#333333" width="6" height="2"/>
-			<path opacity="0.3" fill="#333333" d="M221.6,153.2c-0.2,0.1-0.6,0.3-0.6,0.5v-1.5l4-1.7v1.4L221.6,153.2z"/>
-			<rect x="219" y="146" opacity="0.5" fill="#333333" width="6" height="1"/>
-			<path fill="#333333" d="M225.4,152.6l-3.4,1.3v1.1c0,1.1-0.5,1.9-1.5,1.9s-1.5-0.9-1.5-1.9c0-0.9,0-2,0-3l-1.2,0.8
-				c-0.2,0.2-0.5,0.2-0.7,0l-1.1-1.1c-0.2-0.2-0.2-0.3-0.1-0.5l2.3-3.6c0,0,0.3-0.6,0.7-0.6c0.4,0,5.3,0,5.3,0
-				c0.2,0,1.7,1.7,1.7,1.7v3.4C226,152.4,225.6,152.6,225.4,152.6z M224.1,148h-5l-2.4,3.4l0.8,0.9l1.8-1.5c0.2-0.1,0.3-0.1,0.5-0.1
-				c0.2,0.1,0.2,0.3,0.2,0.4c0,0,0,4.1,0,4.6c0,0.5,1,0.5,1,0s0-2,0-2c0-0.2,0.4-0.4,0.6-0.5l3.4-1.3V149L224.1,148z"/>
-		</g>
-	</g>
-</g>
-<g id="hand-top">
-	<g id="hand_x5F_right_1_">
-		<rect x="196" y="155" fill="#333333" width="6" height="2"/>
-		<path opacity="0.3" fill="#333333" d="M198.6,147.8c-0.2-0.1-0.6-0.3-0.6-0.5v1.5l4,1.7v-1.4L198.6,147.8z"/>
-		<rect x="196" y="154" opacity="0.5" fill="#333333" width="6" height="1"/>
-		<path fill="#333333" d="M203,148.9v3.4c0,0.1-1.6,1.7-1.7,1.7c0,0-4.9,0-5.3,0c-0.4,0-0.7-0.6-0.7-0.6l-2.3-3.6
-			c-0.1-0.2-0.1-0.4,0.1-0.5l1.1-1.1c0.2-0.2,0.5-0.2,0.7,0l1.2,0.8c0-1,0-2.1,0-3c0-1.1,0.5-1.9,1.5-1.9s1.5,0.9,1.5,1.9v1.1
-			l3.4,1.3C202.6,148.4,203,148.6,203,148.9z M202,152v-2.9l-3.4-1.3c-0.2-0.1-0.6-0.3-0.6-0.5c0,0,0-1.6,0-2s-1-0.5-1,0
-			c0,0.5,0,4.6,0,4.6c0,0.2,0,0.4-0.2,0.4c-0.2,0.1-0.3,0.1-0.5-0.1l-1.8-1.5l-0.8,0.9l2.4,3.4h5L202,152z"/>
-	</g>
-</g>
-<g id="hand-left">
-	<rect x="178" y="149" fill="#333333" width="2" height="6"/>
-	<path opacity="0.3" fill="#333333" d="M170.7,151.6c-0.1-0.2-0.3-0.6-0.5-0.6h1.5l1.7,4H172L170.7,151.6z"/>
-	<rect x="177" y="149" opacity="0.5" fill="#333333" width="1" height="6"/>
-	<path fill="#333333" d="M171.3,155.4L170,152h-1.1c-1.1,0-1.9-0.5-1.9-1.5s0.9-1.5,1.9-1.5c0.9,0,2,0,3,0l-0.8-1.2
-		c-0.2-0.2-0.1-0.5,0-0.7l1.1-1.1c0.2-0.2,0.3-0.2,0.5-0.1l3.7,2.3c0,0,0.6,0.3,0.6,0.7s0,5.3,0,5.3c0,0.2-1.7,1.7-1.8,1.7h-3.4
-		C171.6,156,171.4,155.6,171.3,155.4z M176,154.1v-5l-3.4-2.4l-0.9,0.8l1.5,1.8c0.1,0.2,0.1,0.3,0,0.5c-0.1,0.2-0.3,0.2-0.5,0.2
-		c0,0-3.8,0-4.8,0v1c1,0,2.2,0,2.2,0c0.2,0,0.4,0.4,0.5,0.6l1.3,3.4h2.9L176,154.1z"/>
-</g>
-<g id="hand-right">
-	<rect x="144" y="149" fill="#333333" width="2" height="6"/>
-	<path opacity="0.3" fill="#333333" d="M153.2,151.6c0.1-0.2,0.3-0.6,0.5-0.6h-1.5l-1.7,4h1.4L153.2,151.6z"/>
-	<rect x="146" y="149" opacity="0.5" fill="#333333" width="1" height="6"/>
-	<path fill="#333333" d="M152.1,156h-3.4c-0.1,0-1.7-1.6-1.7-1.7c0,0,0-4.9,0-5.3s0.6-0.7,0.6-0.7l3.6-2.3c0.2-0.1,0.4-0.1,0.5,0.1
-		l1.1,1.1c0.2,0.2,0.2,0.5,0,0.7L152,149c1,0,2.1,0,3,0c1.1,0,1.9,0.5,1.9,1.5s-0.9,1.5-1.9,1.5h-1.1l-1.3,3.4
-		C152.6,155.6,152.4,156,152.1,156z M149,155h2.9l1.3-3.4c0.1-0.2,0.3-0.6,0.5-0.6c0,0,1.6,0,2,0c0.5,0,0.5-1,0-1
-		c-0.5,0-4.6,0-4.6,0c0,0,0,0,0,0c-0.2,0-0.4,0-0.4-0.2c-0.1-0.2-0.1-0.3,0.1-0.5l1.5-1.8l-0.9-0.8l-3.4,2.4v5L149,155z"/>
-</g>
-<g id="thumbs-down">
-	<g id="thumbs_x5F_up_3_">
-		<polygon opacity="0.3" fill="#333333" points="131,150.8 131,152 130,152 126.5,147 128.5,147 		"/>
-		<path fill="#333333" d="M127,156h-0.5l-1-2.1l-1.5-2.1V148h1l1.4-1h2.1l2.5,3.8v1.2h-4.5l0.5,2.2V156 M127,157c0.6,0,1-0.7,1-1.2
-			v-1.5c0-0.1-0.3-1.2-0.3-1.2h3.3c0.6,0,1-0.7,1-1.2v-1c0-0.3-0.1-0.6-0.3-0.7l-2.4-3.4c-0.2-0.3-0.5-0.6-0.8-0.6H126
-			c-0.2,0-1.4,1-1.4,1H124c-0.6,0-1,0.2-1,0.8v4c0,0.2,0.1,0.5,0.2,0.6l1.4,2l1,2c0.2,0.3,0.5,0.7,0.9,0.7H127L127,157z M122,147h-2
-			v6h2V147z"/>
-	</g>
-	<rect x="122" y="147" opacity="0.5" fill="#333333" width="1" height="6"/>
-</g>
-<g id="thumbs-up">
-	<g id="thumbs_x5F_up">
-		<polygon opacity="0.3" fill="#333333" points="107,151.2 107,150 106,150 102.5,155 104.5,155 		"/>
-		<path fill="#333333" d="M103,146v1.8l-0.5,2.2h4.5v1.2l-2.5,3.8h-2.1l-1.4-1h-1v-3.8l1.5-2.1l1-2.1H103 M103,145h-0.5
-			c-0.4,0-0.7,0.3-0.9,0.7l-1,2l-1.4,2c-0.1,0.2-0.2,0.4-0.2,0.6v4c0,0.6,0.4,0.8,1,0.8h0.6c0,0,1.2,1,1.4,1h2.5
-			c0.3,0,0.6-0.3,0.8-0.6l2.4-3.4c0.2-0.2,0.3-0.5,0.3-0.7v-1c0-0.6-0.4-1.2-1-1.2h-3.3c0,0,0.3-1.2,0.3-1.2v-1.5
-			C104,145.7,103.6,145,103,145L103,145z M98,149h-2v6h2V149z"/>
-	</g>
-	<rect x="98" y="149" opacity="0.5" fill="#333333" width="1" height="6"/>
-</g>
-<g id="certificate">
-	<polygon fill="#333333" points="78,147 79.6,145.2 80,147.5 82.2,146.8 81.5,149 83.8,149.4 82,151 83.8,152.6 81.5,153 
-		82.2,155.2 80,154.5 79.6,156.8 78,155 76.4,156.8 76,154.5 73.8,155.2 74.5,153 72.2,152.6 74,151 72.2,149.4 74.5,149 
-		73.8,146.8 76,147.5 76.4,145.2 	"/>
-</g>
-<g id="bell">
-	<path fill="#333333" d="M58.8,153h-0.2l-1.2-1.7l-0.6-3.3c-0.2-1-1.1-2-2.2-2.2c0,0,0.2-0.4,0.2-0.4c0.1-0.3-0.1-0.4-0.3-0.4h-0.9
-		c-0.3,0-0.4,0.2-0.3,0.5c0,0,0.2,0.3,0.2,0.3c-1.1,0.3-2,1.2-2.2,2.2l-0.6,3.3l-1.2,1.7h-0.2c-0.3,0-0.5,0.2-0.5,0.5
-		c0,0.3,0.2,0.6,0.4,0.7c0,0,2,0.8,4.8,0.8c2.8,0,4.8-0.8,4.8-0.8c0.2-0.1,0.4-0.4,0.4-0.7C59.3,153.2,59,153,58.8,153z M54,156
-		c0.4,0,0.7,0,1-0.1c-0.2,0.6-0.6,1.1-1,1.1c-0.5,0-0.9-0.5-1-1.1C53.3,155.9,53.6,156,54,156z"/>
-</g>
-<g id="bullhorn">
-	<g>
-		<path fill="#333333" d="M23,150.5v0.5c0,0.6,1,1,1,1v-2.5C24,149.5,23,149.9,23,150.5z"/>
-		<path fill="#333333" d="M35.5,146c-0.3,0-0.5,0.2-0.5,0.5v8.5c0,0.3,0.2,0.5,0.5,0.5s0.5-0.2,0.5-0.5v-8.5
-			C36,146.2,35.8,146,35.5,146z"/>
-		<path fill="#333333" d="M25.2,149c-0.3,0-0.2,0.2-0.2,0.5v2.5c0,0.1,0.6,3.5,0.6,3.5c0,0.3,0.3,0.5,0.5,0.5h0.8
-			c0.3,0,0.5,0,0.4-0.2l-0.5-2.8h0.4l6.8,2v-8.5l-6.8,2.5H25.2z"/>
-	</g>
-</g>
-<g id="hdd">
-	<path fill="#333333" d="M11.7,153l-1.7-7.3c-0.1-0.3-0.3-0.7-0.6-0.7H2.6c-0.3,0-0.5,0.3-0.6,0.6L0.3,153H11.7z"/>
-	<path fill="#333333" d="M11,154H1c-0.6,0-1,0.4-1,1v1c0,0.6,0.4,1,1,1h10c0.6,0,1-0.4,1-1v-1C12,154.4,11.6,154,11,154z M9,156H8
-		v-1h1V156z M11,156h-1v-1h1V156z"/>
-	<rect x="10" y="155" opacity="0.3" fill="#333333" width="1" height="1"/>
-</g>
-<g id="resize-horizontal">
-	<polygon fill="#333333" points="468,127 465,124 465,126 459,126 459,124 456,127 459,130 459,128 465,128 465,130 	"/>
-</g>
-<g id="resize-vertical">
-	<polygon fill="#333333" points="438,133 441,130 439,130 439,124 441,124 438,121 435,124 437,124 437,130 435,130 	"/>
-</g>
-<g id="folder-open">
-	<polygon fill="#333333" points="411,126 408,133 420,133 423,126 	"/>
-	<path fill="#333333" d="M420,125v-2h-5c0-0.5-0.5-1-1-1h-3c-0.5,0-1,0.5-1,1h-2v6l2-4H420z"/>
-</g>
-<g id="folder-close">
-	<rect x="384" y="125" fill="#333333" width="12" height="8"/>
-	<path fill="#333333" d="M391,123c0-0.5-0.5-1-1-1h-3c-0.5,0-1,0.5-1,1h-2v1h12v-1H391z"/>
-</g>
-<g id="shopping-cart">
-	<path fill="#333333" d="M370.3,124.7 M371.4,121h-0.9c-0.2,0-0.4,0.2-0.5,0.4l-0.4,1.6h-9c-0.2,0-0.3,0.1-0.4,0.2
-		c-0.1,0.1-0.1,0.3-0.1,0.4l1,4.8c0.1,0.2,0.3,0.6,0.8,0.6h6.3l-0.5,2h-5.4c-0.3,0-0.5,0.2-0.5,0.5s0.2,0.5,0.5,0.5h0.5v0.5
-		c0,0.3,0.2,0.5,0.5,0.5c0.3,0,0.5-0.2,0.5-0.5V132h3v0.5c0,0.3,0.2,0.5,0.5,0.5c0.3,0,0.5-0.2,0.5-0.5V132h0.3
-		c0.4,0,0.6-0.4,0.6-0.4l2-9.6h0.5c0.3,0,0.5-0.2,0.5-0.5S371.7,121,371.4,121z"/>
-</g>
-<g id="retweet">
-	<path fill="#333333" d="M350,129l-3,2.8l-3-2.8h2v-4h-3.8l-2.2-2h8v6H350z M336,126v6h8l-2.2-2H338v-4h2l-3-2.8l-3,2.8H336z"/>
-</g>
-<g id="chevron-down">
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#333333" points="315,123 318.5,126.6 322,123 324,125 318.5,130.5 
-		313,125 	"/>
-</g>
-<g id="chevron-up">
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#333333" points="297,130.9 293.5,127.3 290,130.9 288,128.9 293.5,123.4 
-		299,128.9 	"/>
-</g>
-<g id="magnet">
-	<path fill="#333333" d="M272,125c0,0,0,1.2,0,2.5s0.2,2.7-2,2.7c-2.2,0-2-1.3-2-2.7V125h-3v2c0,1.6,0.3,6,5,6s5-4.4,5-6v-2H272z"/>
-	<path opacity="0.5" fill="#333333" d="M268,124h-3v-3h3V124z M275,121h-3v3h3V121z"/>
-</g>
-<g id="comments">
-	<path fill="#333333" d="M251,122h-10c-0.5,0-1,0.5-1,1v6c0,0.5,0.5,1,1,1h1v3l3-3h6c0.5,0,1-0.5,1-1v-6
-		C252,122.5,251.5,122,251,122z"/>
-</g>
-<g id="random">
-	<path fill="#333333" d="M218.6,125H216v-2h3.4l1.8,1.8l-1.4,1.4L218.6,125z M227,125v2l3-3l-3-3v2h-2.4l-6,6H216v2h3.4l6-6H227z
-		 M227,129h-1.6l-1.2-1.2l-1.4,1.4l1.8,1.8h2.4v2l3-3l-3-3V129z"/>
-</g>
-<g id="calendar_1_">
-	<path fill="#333333" d="M203,122.5v1.5h-11v-1.5c0-0.3,0.2-0.5,0.5-0.5h1.5v-1h1v1h5v-1h1v1h1.5C202.8,122,203,122.2,203,122.5z
-		 M192,125h11v7.5c0,0.3-0.2,0.5-0.5,0.5h-10c-0.3,0-0.5-0.2-0.5-0.5V125z M201,128h1v-1h-1V128z M201,130h1v-1h-1V130z M201,132h1
-		v-1h-1V132z M199,128h1v-1h-1V128z M199,130h1v-1h-1V130z M199,132h1v-1h-1V132z M197,128h1v-1h-1V128z M197,130h1v-1h-1V130z
-		 M197,132h1v-1h-1V132z M195,128h1v-1h-1V128z M195,130h1v-1h-1V130z M195,132h1v-1h-1V132z M193,128h1v-1h-1V128z M193,130h1v-1
-		h-1V130z M193,132h1v-1h-1V132z"/>
-</g>
-<g id="plane">
-	<path fill="#333333" d="M179.6,129.1l-3.6-3.2v-3.4c0-0.8-0.7-1.5-1.5-1.5c-0.8,0-1.5,0.7-1.5,1.5v3.4l-3.6,3.2
-		c-0.2,0.2-0.4,0.6-0.4,0.8v0.4c0,0.3,0.2,0.4,0.4,0.2l3.6-2.5v1.9v0.7c-0.4,0.4-1,1-1,1.1v0.6c0,0.3,0.2,0.4,0.4,0.3l0.9-0.8h2.2
-		l0.9,0.8c0.2,0.1,0.4,0,0.4-0.3v-0.6c0-0.2-0.6-0.7-1-1.1V130v-1.9l3.6,2.5c0.2,0.2,0.4,0.1,0.4-0.2V130
-		C180,129.7,179.8,129.3,179.6,129.1z"/>
-</g>
-<g id="warning-sign">
-	<path fill="#333333" d="M151,127l-1,3l-1-3v-1h2V127z M156.5,133h-12.9c-0.5,0-0.7-0.6-0.4-1l6.4-10.7c0.3-0.4,0.7-0.4,1,0.1
-		l6.4,10.6C157.2,132.4,157,133,156.5,133z M154.4,131l-4.4-7.2l-4.4,7.2h3.4v-1h1h1v1H154.4z"/>
-</g>
-<g id="eye-close">
-	<path fill="#333333" d="M132.4,126.6c-0.1-0.1-1-1.6-2.6-2.8l-0.4,1.5c0.6,0.7,1.1,1.4,1.4,1.8c-0.5,0.7-1.6,2.2-2.6,2.9l-0.4,1.5
-		c2.6-1,4.5-3.8,4.5-4l0.3-0.4L132.4,126.6z"/>
-	<path fill="#333333" d="M127.6,121l-0.4,1.4c-0.4-0.1-0.8-0.2-1.2-0.2c-3.5,0-6.2,4.2-6.4,4.3l-0.3,0.4l0.3,0.4
-		c0.1,0.2,2.2,3.4,5.2,4.2l-0.4,1.4h1.5l3.1-12H127.6z M124.8,125.4c0,0,0.5,1,1.2,1.6l-0.2,0.9l-0.5,0.5c-0.7-0.4-1.2-1.1-1.5-1.9
-		L124.8,125.4z M121.2,127c0.5-0.7,1.3-1.7,2.3-2.6c-0.3,0.5-0.5,1-0.5,1.6c0,1.5,1.1,2.7,2.5,2.9l-0.4,1.4
-		C123.3,129.8,121.8,127.8,121.2,127z"/>
-</g>
-<g id="eye-open">
-	<path fill="#333333" d="M108.4,126.6c-0.1-0.2-2.8-4.3-6.4-4.3c-3.5,0-6.2,4.2-6.4,4.3l-0.3,0.4l0.3,0.4c0.1,0.2,2.8,4.3,6.4,4.3
-		c3.5,0,6.2-4.2,6.4-4.3l0.3-0.4L108.4,126.6z M100.8,125.4c0,0,0.7,1.4,1.5,1.9l-1,1c-0.7-0.4-1.2-1.1-1.5-1.9L100.8,125.4z
-		 M102,130.6c-2.7,0-4.1-2.7-4.8-3.6c0.5-0.7,1.3-1.7,2.3-2.6c-0.3,0.5-0.5,1-0.5,1.6c0,1.7,1.3,3,3,3c1.7,0,3-1.3,3-3
-		c0-0.6-0.2-1.2-0.5-1.6c1,0.9,1.9,2.1,2.3,2.6C105.9,128.2,104.7,130.6,102,130.6z"/>
-</g>
-<g id="fire">
-	<path fill="#333333" d="M76,125.5c-0.5-3,2.6-5,2.6-5c-1,3-0.4,4.7,1.2,5.3c1.5,0.7,0.3-2.5,0.2-2.7c2.1,1.4,3.4,3.9,2.9,6.2
-		c-0.5,2.3-2.3,3-3.8,3.5c-2.2,0.6-0.3-1.2-0.1-2.7c0.2-1.5-0.6-2.6-1.5-3.5c0.2,0.6,0.2,2.5-0.3,3.4c-0.4,0.9-1.6,2.5-2.7,1.8
-		c-1-0.7-1.4-1.7-1.5-2.3c-0.1-0.6-0.3-2.2,1.2-3.6c-0.3,0.8,0,2.6,1.1,2.3C76.6,128,76.2,126.7,76,125.5z"/>
-</g>
-<g id="leaf">
-	<path fill="#333333" d="M51.2,124.6c-1.6,2.1-1.2,4.1-1,5.3l-2.2,1.9v1.4v0l2-2l1-0.6c1.3,0,9,3.4,9-9.6
-		C55.1,122.4,53.1,122.1,51.2,124.6z M54.9,126.9c-1.3,0.7-3.1,1.7-3.7,2.3c-0.9,1.1-1.2,1.1-0.6-0.4c0.8-1.8,3-3.2,4.6-4
-		c0,0,2.4-1.2,3.1-2.3c0.4-0.5,0.7-0.6,0.8-0.5c0.1,0.1,0.1,0.1-0.2,0.8C57.9,125.1,56.6,126,54.9,126.9z"/>
-</g>
-<g id="gift">
-	<g>
-		<path fill="#333333" d="M25,129h4v4h-4V129z M31,133h4v-4h-4V133z M36,124v1h-1v2h-4v-3h-2v3h-4v-2h-1v-1h1.1c0,0,0-0.2,0-0.4
-			l0.3-1.8c0.1-0.5,0.6-0.8,1.1-0.8c0.2,0,0.4,0.1,0.6,0.2l2.4,1.4c0.2,0.1,0.3,0.2,0.4,0.4c0.1-0.1,0.2-0.3,0.4-0.4l2.4-1.4
-			c0.2-0.1,0.4-0.2,0.6-0.2c0.5,0,1,0.3,1.1,0.9l0.3,1.7c0,0.2,0.1,0.4,0,0.4H36z M26.7,122.1c0,0-0.7,1.9-0.7,1.9c0,0,2.7,0,2.8,0
-			L26.7,122.1z M33.3,122l-2,2c0.1,0,2.7,0,2.7,0C34.1,124,33.3,122,33.3,122z"/>
-	</g>
-	<g opacity="0.3">
-		<path fill="#333333" d="M35,129h-4v4h-2v-4h-4v-2h4v-3h2v3h4V129z"/>
-	</g>
-</g>
-<g id="exclamation-sign">
-	<path id="circle_x5F_exclamation_x5F_mark" fill="#333333" d="M6,121.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8
-		S9.2,121.2,6,121.2z M7,130H5v-1h2V130z M6.9,127.5c-0.1,0.3-0.3,0.5-0.6,0.5H5.7c-0.3,0-0.5-0.2-0.6-0.5l-0.6-3
-		C4.5,124.2,4.7,124,5,124H7c0.3,0,0.5,0.2,0.4,0.5L6.9,127.5z"/>
-</g>
-<g id="asterisk">
-	<polygon fill="#333333" points="467,102 464.4,102 466.2,100.2 464.8,98.8 463,100.6 463,98 461,98 461,100.6 459.2,98.8 
-		457.8,100.2 459.6,102 457,102 457,104 459.6,104 457.8,105.8 459.2,107.2 461,105.4 461,108 463,108 463,105.4 464.8,107.2 
-		466.2,105.8 464.4,104 467,104 	"/>
-</g>
-<g id="minus_1_">
-	<rect id="minus" x="434" y="102" fill="#333333" width="9" height="3"/>
-</g>
-<g id="plus">
-	<polygon fill="#333333" points="419,102 415,102 415,98 412,98 412,102 408,102 408,105 412,105 412,109 415,109 415,105 419,105 	
-		"/>
-</g>
-<g id="resize-small">
-	<polygon fill="#333333" points="387.3,104.3 384.3,107.2 385.8,108.7 388.7,105.7 390,107 390,103 386,103 	"/>
-	<polygon fill="#333333" points="395.7,98.8 394.2,97.3 391.3,100.3 390,99 390,103 394,103 392.7,101.7 	"/>
-</g>
-<g id="resize-full">
-	<path fill="#333333" d="M372,101l-1.3-1.3l-2.9,2.9l-1.4-1.4l2.9-2.9L368,97h4V101z M364.2,103.4l-2.9,2.9L360,105v4h4l-1.3-1.3
-		l2.9-2.9L364.2,103.4z"/>
-</g>
-<g id="share-alt">
-	<path fill="#333333" d="M342,107l6-4.5l-6-4.5v2.7c-4.3,0.2-5.8,2.9-6,6.3c1-2.1,3.6-2.9,6-3V107z"/>
-</g>
-<g id="arrow-down">
-	<polygon fill="#333333" points="319,103 319,97 316,97 316,103 313,103 317.5,109 322,103 	"/>
-</g>
-<g id="arrow-up">
-	<polygon fill="#333333" points="294.5,97 290,103 293,103 293,109 296,109 296,103 299,103 	"/>
-</g>
-<g id="arrow-right">
-	<polygon fill="#333333" points="270,108 276,103.5 270,99 270,102 264,102 264,105 270,105 	"/>
-</g>
-<g id="arrow-left">
-	<polygon fill="#333333" points="252,102 246,102 246,99 240,103.5 246,108 246,105 252,105 	"/>
-</g>
-<g id="ban-circle">
-	<path fill="#333333" d="M222,97.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S225.2,97.2,222,97.2z M217.7,103
-		c0-2.4,1.9-4.3,4.3-4.3c0.8,0,1.6,0.2,2.2,0.7l-5.9,5.9C218,104.6,217.7,103.8,217.7,103z M222,107.3c-0.8,0-1.5-0.2-2.2-0.6
-		l5.8-5.8c0.4,0.6,0.6,1.4,0.6,2.2C226.3,105.4,224.4,107.3,222,107.3z"/>
-</g>
-<g id="ok-circle">
-	<path fill="#333333" d="M198,98.7c2.4,0,4.3,1.9,4.3,4.3s-1.9,4.3-4.3,4.3s-4.3-1.9-4.3-4.3S195.6,98.7,198,98.7 M198,97.2
-		c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S201.2,97.2,198,97.2L198,97.2z"/>
-	<polygon fill="#333333" points="195.5,103.6 196.6,102.5 197.5,103.4 199.5,101.3 200.7,102.5 197.5,105.6 	"/>
-</g>
-<g id="remove-circle">
-	<path fill="#333333" d="M174,98.7c2.4,0,4.3,1.9,4.3,4.3s-1.9,4.3-4.3,4.3s-4.3-1.9-4.3-4.3S171.6,98.7,174,98.7 M174,97.2
-		c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S177.2,97.2,174,97.2L174,97.2z"/>
-	<polygon fill="#333333" points="174,103.8 172.6,105.2 171.8,104.4 173.2,103 171.8,101.6 172.6,100.8 174,102.2 175.4,100.8 
-		176.2,101.6 174.8,103 176.2,104.4 175.4,105.2 	"/>
-</g>
-<g id="screenshot">
-	<path fill="#333333" d="M155.7,102H154H154c-0.4-1.5-2-2.6-3-3v-0.1v-1.1V97h-2v0.8v1.1V99c-2,0.4-2.7,1.5-3.1,3h-0.1h-1.6H144v2
-		h0.2h1.6h0.1c0.4,1.5,1.1,2.7,3.1,3v0.1v1.1v0.8h2v-0.8v-1.1v0c1-0.4,2.6-1.5,3-3h0.1h1.6h0.3v-2H155.7z M151,106.1V104h-2v2.1
-		c-1-0.3-1.8-1.1-2.1-2.1h2.1v-2h-2.1c0.3-1,1.1-1.7,2.1-2v2h2v-2c1,0.3,1.7,1.1,2,2h-2v2h2C152.7,105,152,105.7,151,106.1z"/>
-</g>
-<g id="info-sign">
-	<path fill="#333333" d="M126,97.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S129.2,97.2,126,97.2z M125,100h2v1h-2
-		V100z M128,106h-4v-1h1v-2h-1v-1h3v3h1V106z"/>
-</g>
-<g id="question-sign">
-	<path fill="#333333" d="M102,97.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S105.2,97.2,102,97.2z M103,106h-2v-1h2
-		V106z M103,104c0,0-1.4,0-2,0c0-1.4,1.1-1.6,1.1-1.6c0.3-0.2,0.3-0.2,0.3-0.5c0-0.2-0.2-0.4-0.4-0.4c-0.4,0-0.6,0-0.6,0.3
-		c0,0.2-0.2,0.1-0.3,0.1c0,0-0.8,0-1.4,0c0-1.8,1.1-2.4,2.4-2.4c0.7,0,2.3,0.2,2.3,2C104.3,103.4,103,104,103,104z"/>
-</g>
-<g id="ok-sign">
-	<path fill="#333333" d="M78,97.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S81.2,97.2,78,97.2z M77.5,106.3l-2.8-2.8
-		l1.7-1.7l1,1l2.4-2.4l1.7,1.7L77.5,106.3z"/>
-</g>
-<g id="remove-sign">
-	<path fill="#333333" d="M54,97.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S57.2,97.2,54,97.2z M57.5,104.4l-2.1,2.1
-		l-1.4-1.4l-1.4,1.4l-2.1-2.1l1.4-1.4l-1.4-1.4l2.1-2.1l1.4,1.4l1.4-1.4l2.1,2.1l-1.4,1.4L57.5,104.4z"/>
-</g>
-<g id="minus-sign">
-	<path fill="#333333" d="M30,97.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S33.2,97.2,30,97.2z M33,104h-6v-2h6V104z
-		"/>
-</g>
-<g id="plus-sign">
-	<path fill="#333333" d="M6,97.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S9.2,97.2,6,97.2z M9,104H7v2H5v-2H3v-2h2
-		v-2h2v2h2V104z"/>
-</g>
-<g id="chevron-right">
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#333333" points="459.1,83.1 462.7,79.5 459.1,76 461.1,74 466.6,79.5 
-		466.6,79.5 466.6,79.5 461.1,85 	"/>
-</g>
-<g id="chevron-left">
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#333333" points="440.9,83.1 437.3,79.5 440.9,76 438.9,74 433.4,79.5 
-		433.4,79.5 433.4,79.5 438.9,85 	"/>
-</g>
-<g id="eject">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M420,81.5c0-0.3-0.2-0.5-0.5-0.5h-10c-0.3,0-0.5,0.2-0.5,0.5v1
-		c0,0.3,0.2,0.5,0.5,0.5h10c0.3,0,0.5-0.2,0.5-0.5V81.5z"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#333333" points="420,80 409,80 414.5,74.4 	"/>
-</g>
-<g id="step-forward">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M393.5,74h-1c-0.3,0-0.5,0.2-0.5,0.5v4.4l-5-4.9v11l5-4.9v4.4
-		c0,0.3,0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5v-10C394,74.2,393.8,74,393.5,74z"/>
-</g>
-<g id="fast-forward">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M371.5,74h-1c-0.3,0-0.5,0.2-0.5,0.5v4.4l-5-4.9v4.9l-5-4.9v11
-		l5-4.9V85l5-4.9v4.4c0,0.3,0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5v-10C372,74.2,371.8,74,371.5,74z"/>
-</g>
-<g id="forward">
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#333333" points="346.6,79.5 341,74 341,78.9 336,74 336,85 341,80.1 
-		341,85 	"/>
-</g>
-<g id="stop">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M323,83.5c0,0.3-0.2,0.5-0.5,0.5h-8c-0.3,0-0.5-0.2-0.5-0.5v-8
-		c0-0.3,0.2-0.5,0.5-0.5h8c0.3,0,0.5,0.2,0.5,0.5V83.5z"/>
-</g>
-<g id="pause">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M293,83.5c0,0.3-0.2,0.5-0.5,0.5h-2c-0.3,0-0.5-0.2-0.5-0.5v-8
-		c0-0.3,0.2-0.5,0.5-0.5h2c0.3,0,0.5,0.2,0.5,0.5V83.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M297,83.5c0,0.3-0.2,0.5-0.5,0.5h-2c-0.3,0-0.5-0.2-0.5-0.5v-8
-		c0-0.3,0.2-0.5,0.5-0.5h2c0.3,0,0.5,0.2,0.5,0.5V83.5z"/>
-</g>
-<g id="play">
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#333333" points="266,85 266,74 275,79.5 	"/>
-</g>
-<g id="backward">
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#333333" points="252,74 247,78.9 247,74 241.4,79.5 247,85 247,80.1 
-		252,85 	"/>
-</g>
-<g id="fast-backward">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M228,74l-5,4.9V74l-5,4.9v-4.4c0-0.3-0.2-0.5-0.5-0.5h-1
-		c-0.3,0-0.5,0.2-0.5,0.5v10c0,0.3,0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5v-4.4l5,4.9v-4.9l5,4.9V74z"/>
-</g>
-<g id="step-backward">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M201,74l-5,4.9v-4.4c0-0.3-0.2-0.5-0.5-0.5h-1
-		c-0.3,0-0.5,0.2-0.5,0.5v10c0,0.3,0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5v-4.4l5,4.9V74z"/>
-</g>
-<g id="move">
-	<polygon fill="#333333" points="180,79 177,76 177,78 175,78 175,76 177,76 174,73 171,76 173,76 173,78 171,78 171,76 168,79 
-		171,82 171,80 173,80 173,82 171,82 174,85 177,82 175,82 175,80 177,80 177,82 	"/>
-</g>
-<g id="check">
-	<polygon fill="#333333" points="147.4,78.7 148.8,77.3 150.3,78.8 154.6,74.5 155.9,75.8 150.3,81.5 	"/>
-	<path fill="#333333" d="M153,81.3V82c0,0.5-0.5,1-1,1h-5c-0.5,0-1-0.5-1-1v-5c0-0.5,0.5-1,1-1h3.5l1.8-1.8
-		c-0.4-0.1-0.8-0.2-1.3-0.2h-3c-2.2,0-4,1.8-4,4v3c0,2.2,1.8,4,4,4h3c2.2,0,4-1.8,4-4v-1.7L153,81.3z"/>
-</g>
-<g id="share_1_">
-	<path fill="#333333" d="M128.1,78.6c0,0-2.8-0.2-3.9,1.2c0.6-3.3,3.9-3.3,3.9-3.3l0-2.2l3.6,3.2l-3.6,3.2V78.6z"/>
-	<path fill="#333333" d="M129,82L129,82c0,0.6-0.5,1-1,1h-5c-0.5,0-1-0.5-1-1v-5c0-0.5,0.5-1,1-1h1.4c0.5-0.5,1.2-1,2.2-1.2l0-0.8
-		H124c-2.2,0-4,1.8-4,4v3c0,2.2,1.8,4,4,4h3c2.2,0,4-1.8,4-4v-0.5L129,82z"/>
-</g>
-<g id="edit">
-	<path fill="#333333" d="M100.9,79.9l4.1-4.1l1.1,1.1l-4.1,4.1l-1.6,0.5L100.9,79.9z M105.9,74.9l1.1-1.1L108,74l0.2,0.9l-1.1,1.1
-		L105.9,74.9z"/>
-	<path fill="#333333" d="M105,80.8V82c0,0.5-0.5,1-1,1h-5c-0.5,0-1-0.5-1-1v-5c0-0.5,0.5-1,1-1h3.1l1.9-1.9c-0.3-0.1-4-0.1-4-0.1
-		c-2.2,0-4,1.8-4,4v3c0,2.2,1.8,4,4,4h3c2.2,0,4-1.8,4-4v-2.2L105,80.8z"/>
-</g>
-<g id="tint">
-	<path fill="#333333" d="M77.5,72.1c-1.1,3.6-4.4,5.5-4.4,8.9c0,2.5,2.2,3.9,4.4,4c2.1-0.1,4.4-1.6,4.4-4.1
-		C81.9,77.5,78.6,75.6,77.5,72.1z M76.5,82c0,0-0.1,0.6-0.2,1c-1.3-0.4-1.8-1.1-2-2.2c-0.2-1,0.1-1.9,1.3-3.4c0,0-0.4,1.8,0,3.2
-		C75.9,81.5,76.5,82,76.5,82z"/>
-</g>
-<g id="adjust">
-	<path fill="#333333" d="M54,73.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S57.2,73.2,54,73.2z M49.7,79
-		c0-2.4,1.9-4.3,4.3-4.3v8.5C51.6,83.3,49.7,81.4,49.7,79z"/>
-</g>
-<g id="map-marker">
-	<path fill="#333333" d="M34.8,77.7c0,0.8-0.3,1.7-0.7,2.6c-1.6,2.4-3.6,4.7-3.6,4.7s-2.3-2.2-3.7-4.7c-0.4-0.8-0.6-1.6-0.6-2.5
-		c0-2.4,1.9-4.4,4.3-4.4C32.9,73.3,34.8,75.3,34.8,77.7z M32.7,77.5c0-1.2-1-2.2-2.2-2.2c-1.2,0-2.2,1-2.2,2.2c0,1.2,1,2.2,2.2,2.2
-		C31.7,79.7,32.7,78.7,32.7,77.5z"/>
-</g>
-<g id="pencil">
-	<path fill="#333333" d="M0.9,81.8L3.2,84l-3.3,1.1L0.9,81.8z M1.8,81L8,74.9l2.1,2.1L4,83.1L1.8,81z M8.8,74l0.9-1
-		c0.1-0.1,0.2-0.1,0.3-0.1c0.1,0,0.2,0,0.3,0.1l1.5,1.5c0.2,0.2,0.2,0.5,0,0.7l-1,0.9L8.8,74z"/>
-</g>
-<g id="picture_1_">
-	<path id="picture_4_" fill="#333333" d="M468,50.4c0-0.2-0.2-0.4-0.4-0.4h-11.1c-0.2,0-0.4,0.2-0.4,0.4v10.1c0,0.2,0.2,0.4,0.4,0.4
-		h11.1c0.2,0,0.4-0.2,0.4-0.4V50.4z M467,56l-2.4-2.9l-2.9,3.2l0.7,1.6l-3-1.3l-2.5,1.8V51h10V56z M460.8,53.5
-		c0-0.7-0.6-1.3-1.3-1.3c-0.7,0-1.3,0.6-1.3,1.3c0,0.7,0.6,1.3,1.3,1.3C460.2,54.8,460.8,54.2,460.8,53.5z"/>
-</g>
-<g id="facetime-video">
-	<path fill="#333333" d="M441,55.4v-0.9v-2.8c0-0.4-0.3-0.8-0.8-0.8h-7.5c-0.4,0-0.8,0.3-0.8,0.8v6.5c0,0.4,0.3,0.8,0.8,0.8h7.5
-		c0.4,0,0.8-0.3,0.8-0.8V55.4z"/>
-	<polygon fill="#333333" points="444,52 441,55 444,58 	"/>
-</g>
-<g id="indent-right">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M410,51.5c0,0.3-0.2,0.5-0.5,0.5h-1c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h1c0.3,0,0.5,0.2,0.5,0.5V51.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M414,54.5c0,0.3-0.2,0.5-0.5,0.5h-5c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h5c0.3,0,0.5,0.2,0.5,0.5V54.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M412,57.5c0,0.3-0.2,0.5-0.5,0.5h-3c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h3c0.3,0,0.5,0.2,0.5,0.5V57.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M415,60.5c0,0.3-0.2,0.5-0.5,0.5h-6c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h6c0.3,0,0.5,0.2,0.5,0.5V60.5z"/>
-	<rect x="416" y="50" fill-rule="evenodd" clip-rule="evenodd" fill="#333333" width="1" height="11"/>
-	<polygon fill="#333333" points="417.3,55.5 419,54.2 419,55 421,55 421,56 419,56 419,56.8 	"/>
-</g>
-<g id="indent-left">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M391,51.5c0,0.3-0.2,0.5-0.5,0.5h-1c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h1c0.3,0,0.5,0.2,0.5,0.5V51.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M395,54.5c0,0.3-0.2,0.5-0.5,0.5h-5c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h5c0.3,0,0.5,0.2,0.5,0.5V54.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M393,57.5c0,0.3-0.2,0.5-0.5,0.5h-3c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h3c0.3,0,0.5,0.2,0.5,0.5V57.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M396,60.5c0,0.3-0.2,0.5-0.5,0.5h-6c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h6c0.3,0,0.5,0.2,0.5,0.5V60.5z"/>
-	<rect x="387" y="50" fill-rule="evenodd" clip-rule="evenodd" fill="#333333" width="1" height="11"/>
-	<polygon fill="#333333" points="386.7,55.5 385,54.2 385,55 383,55 383,56 385,56 385,56.8 	"/>
-</g>
-<g id="list">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M360,60.5c0,0.3,0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-1c-0.3,0-0.5,0.2-0.5,0.5V60.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M360,57.5c0,0.3,0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-1c-0.3,0-0.5,0.2-0.5,0.5V57.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M360,54.5c0,0.3,0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-1c-0.3,0-0.5,0.2-0.5,0.5V54.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M360,51.5c0,0.3,0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-1c-0.3,0-0.5,0.2-0.5,0.5V51.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M363,60.5c0,0.3,0.2,0.5,0.5,0.5h8c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-8c-0.3,0-0.5,0.2-0.5,0.5V60.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M363,57.5c0,0.3,0.2,0.5,0.5,0.5h8c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-8c-0.3,0-0.5,0.2-0.5,0.5V57.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M363,54.5c0,0.3,0.2,0.5,0.5,0.5h8c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-8c-0.3,0-0.5,0.2-0.5,0.5V54.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M363,51.5c0,0.3,0.2,0.5,0.5,0.5h8c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-8c-0.3,0-0.5,0.2-0.5,0.5V51.5z"/>
-</g>
-<g id="align-justify">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M336,60.5c0,0.3,0.2,0.5,0.5,0.5h11c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-11c-0.3,0-0.5,0.2-0.5,0.5V60.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M336,57.5c0,0.3,0.2,0.5,0.5,0.5h11c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-11c-0.3,0-0.5,0.2-0.5,0.5V57.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M336,54.5c0,0.3,0.2,0.5,0.5,0.5h11c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-11c-0.3,0-0.5,0.2-0.5,0.5V54.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M336,51.5c0,0.3,0.2,0.5,0.5,0.5h11c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-11c-0.3,0-0.5,0.2-0.5,0.5V51.5z"/>
-</g>
-<g id="align_x5F_right">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M317,51.5c0,0.3,0.2,0.5,0.5,0.5h6c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-6c-0.3,0-0.5,0.2-0.5,0.5V51.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M313,54.5c0,0.3,0.2,0.5,0.5,0.5h10c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-10c-0.3,0-0.5,0.2-0.5,0.5V54.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M315,57.5c0,0.3,0.2,0.5,0.5,0.5h8c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-8c-0.3,0-0.5,0.2-0.5,0.5V57.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M312,60.5c0,0.3,0.2,0.5,0.5,0.5h11c0.3,0,0.5-0.2,0.5-0.5v-1
-		c0-0.3-0.2-0.5-0.5-0.5h-11c-0.3,0-0.5,0.2-0.5,0.5V60.5z"/>
-</g>
-<g id="align-center">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M298,51.5c0,0.3-0.2,0.5-0.5,0.5h-7c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h7c0.3,0,0.5,0.2,0.5,0.5V51.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M298,57.5c0,0.3-0.2,0.5-0.5,0.5h-7c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h7c0.3,0,0.5,0.2,0.5,0.5V57.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M300,60.5c0,0.3-0.2,0.5-0.5,0.5h-11c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h11c0.3,0,0.5,0.2,0.5,0.5V60.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M300,54.5c0,0.3-0.2,0.5-0.5,0.5h-11c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h11c0.3,0,0.5,0.2,0.5,0.5V54.5z"/>
-</g>
-<g id="align-left">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M271,51.5c0,0.3-0.2,0.5-0.5,0.5h-6c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h6c0.3,0,0.5,0.2,0.5,0.5V51.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M275,54.5c0,0.3-0.2,0.5-0.5,0.5h-10c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h10c0.3,0,0.5,0.2,0.5,0.5V54.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M273,57.5c0,0.3-0.2,0.5-0.5,0.5h-8c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h8c0.3,0,0.5,0.2,0.5,0.5V57.5z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M276,60.5c0,0.3-0.2,0.5-0.5,0.5h-11c-0.3,0-0.5-0.2-0.5-0.5v-1
-		c0-0.3,0.2-0.5,0.5-0.5h11c0.3,0,0.5,0.2,0.5,0.5V60.5z"/>
-</g>
-<g id="text-width">
-	<path fill="#333333" d="M249.5,49H246h-3.5c-0.6,0-1.5,0-1.5,0v3c0,0,0,0,0.5,0c0-1,0.6-1,1.5-1h2v6.5l-1,0.5v1h2h2v-1l-1-0.5V51h2
-		c0.9,0,1.5,0,1.5,1c0.5,0,0.5,0,0.5,0v-3C251,49,250.1,49,249.5,49z"/>
-	<polygon fill="#333333" points="242,59.2 240.3,60.5 242,61.8 242,61 250,61 250,61.8 251.7,60.5 250,59.2 250,60 242,60 	"/>
-</g>
-<g id="text-height">
-	<path fill="#333333" d="M227.5,49H224h-3.5c-0.6,0-1.5,0-1.5,0v3c0,0,0,0,0.5,0c0-1,0.6-1,1.5-1h2v8.5l-1,0.5v1h2h2v-1l-1-0.5V51h2
-		c0.9,0,1.5,0,1.5,1c0.5,0,0.5,0,0.5,0v-3C229,49,228.1,49,227.5,49z"/>
-	<polygon fill="#333333" points="217.8,51 216.5,49.3 215.2,51 216,51 216,59 215.2,59 216.5,60.7 217.8,59 217,59 217,51 	"/>
-</g>
-<g id="italic_2_">
-	<path fill="#333333" d="M200.8,49.6l0-0.6h-2.4h-1.9v0.6c1,0.3,1.4,0.3,1.2,1.2l-1.7,8.5c-0.1,0.6-1,1.1-2,1.2V61h5v-0.6
-		c-1-0.1-1.2-0.5-1.1-1.2l1.3-8.2C199.2,51,199.6,49.8,200.8,49.6z"/>
-</g>
-<g id="bold_2_">
-	<path fill="#333333" d="M175.6,54.8c0,0,1.1-0.6,1.1-2.6c0-2-1.6-3.2-3.1-3.2l-4.7,0v0.7c1,0.2,1,0.4,1,1.1v8.3c0,0.6-0.5,0.9-1,1
-		V61h5c1.5,0,3.6-1.3,3.6-3.1C177.6,55.4,175.6,54.8,175.6,54.8z M172,50c2.1,0,3.2,0.7,3.2,2c0,1-0.8,2-1.8,2c-1,0-1.4,0-1.4,0
-		S172,50.4,172,50z M173.6,59H172v-4c0,0,0.3,0,1.6,0c1.3,0,2.2,1,2.2,2.2C175.8,58.4,174.7,59,173.6,59z"/>
-</g>
-<g id="font">
-	<path id="XMLID_2_" fill="#333333" d="M156,60.3V61h-4.2c0,0,0-0.4,0-0.7c0.7,0,1-0.8,0.8-1.3c-0.1-0.4-0.8-2.2-0.8-2.2h-3.9
-		c0,0-0.6,1.5-0.9,2.3c-0.3,0.9,0.5,1.2,1.2,1.2c0,0.4,0,0.7,0,0.7h-3.6v-0.7c0,0,0.6-0.2,0.8-0.5c0.3-0.3,0.5-0.8,0.5-0.8l4-10.1
-		h0.9l3.8,10c0,0,0.2,0.5,0.6,0.9C155.7,60.3,156,60.3,156,60.3z M151.6,55.8l-1.2-3.2l-0.5-1.4l-1.8,4.6H151.6z"/>
-</g>
-<g id="camera">
-	<path fill="#333333" d="M127.1,56c0,0.6-0.5,1.1-1.1,1.1c-0.6,0-1.1-0.5-1.1-1.1s0.5-1.1,1.1-1.1C126.6,54.9,127.1,55.4,127.1,56z
-		 M132,53v6c0,0.5-0.5,1-1,1h-10c-0.5,0-1-0.5-1-1v-6c0-0.5,0.5-1,1-1h1.5c0,0,1-2,2.5-2c0,0,0.5,0,2,0s2.5,2,2.5,2h1.5
-		C131.5,52,132,52.5,132,53z M128.4,56c0-1.3-1.1-2.4-2.4-2.4c-1.3,0-2.4,1.1-2.4,2.4c0,1.3,1.1,2.4,2.4,2.4
-		C127.3,58.4,128.4,57.3,128.4,56z M130,53h-1v1h1V53z"/>
-	<rect x="129" y="53" opacity="0.5" fill="#333333" width="1" height="1"/>
-</g>
-<g id="print">
-	<path fill="#333333" d="M105.5,52.7l-0.6,1.2h-5.9l-0.4-1.2l0.9-3.5c0-0.1,0.1-0.2,0.3-0.2h4.5c0.1,0,0.3,0.1,0.3,0.2L105.5,52.7z"
-		/>
-	<path fill="#333333" d="M104.8,59.2c0-0.1-0.2-0.2-0.3-0.2h-5c-0.1,0-0.3,0.1-0.3,0.2l-0.4,1.5c0,0.1,0.1,0.2,0.2,0.2h6
-		c0.1,0,0.2-0.1,0.2-0.2L104.8,59.2z"/>
-	<polygon fill="#333333" points="106,53 105,55 99,55 98,53 96,53 96,60 98,60 98,58 106,58 106,60 108,60 108,53 	"/>
-</g>
-<g id="bookmark_1_">
-	<path id="bookmark_4_" fill="#333333" d="M74,49.5c0-0.3,0.2-0.5,0.5-0.5h8c0.3,0,0.5,0.2,0.5,0.5V61l-4.5-4.4L74,61V49.5z"/>
-</g>
-<g id="book_2_">
-	<polygon fill="#333333" points="50.8,49 49,50.8 49,61 58,61 58,51 50.5,51 51.5,50 59,50 59,60 60,59 60,49 	"/>
-</g>
-<g id="tags">
-	<g id="tag_1_">
-		<path id="tag_2_" fill="#333333" d="M29,49h-4.7c-0.1,0-0.3,0.1-0.3,0.3l0,4.7l7,7l5-5L29,49z M27.2,52.2c-0.4,0.4-1,0.4-1.4,0
-			c-0.4-0.4-0.4-1,0-1.4c0.4-0.4,1-0.4,1.4,0C27.6,51.2,27.6,51.8,27.2,52.2z"/>
-	</g>
-	<polygon fill="#333333" points="32,49 31,49 38,56 33.5,60.5 34,61 39,56 	"/>
-</g>
-<g id="tag_3_">
-	<path id="tag_4_" fill="#333333" d="M5,49H0.3C0.1,49,0,49.1,0,49.3L0,54l7,7l5-5L5,49z M3.2,52.2c-0.4,0.4-1,0.4-1.4,0
-		c-0.4-0.4-0.4-1,0-1.4c0.4-0.4,1-0.4,1.4,0C3.6,51.2,3.6,51.8,3.2,52.2z"/>
-</g>
-<g id="barcode">
-	<path fill="#333333" d="M457,35h-1V25h1V35z M461,37h1v-0.9h-1V37z M459,25h-1v10h1V25z M463,25h-2v10h2V25z M457,36v1h3v-1H457z
-		 M463,37h1v-0.9h-1V37z M465,36.1V37h2v-0.9H465z M467,25h-1v10h1h1V25H467z M465,25h-1v10h1V25z"/>
-</g>
-<g id="qrcode">
-	<path fill="#333333" d="M434,27h1v1h-1V27z M442,30v1h2v1v1h-3v-1v-1v-1h-2v-3h-1v-2h1h5v5H442z M443,29v-3h-3v3H443z M441,28h1v-1
-		h-1V28z M435,34h-1v1h1V34z M438,37h1v-1h-1V37z M435,32h2v5h-5v-5h2v-1h1V32z M433,33v3h3v-3H433z M433,31h-1v-1v-5h5v3h1v1h-1v1
-		h-4V31z M433,29h3v-3h-3V29z M443,35h1v-1h-1V35z M441,36v1h2h1v-1h-1H441z M442,35v-1h-2v-1v-1v-1h-1h-2v1h2v1v1h-1v1h1v1h1h1v-1
-		H442z"/>
-</g>
-<g id="volume-up">
-	<path fill="#333333" d="M419.2,31c0,1.5-0.5,2.9-1.4,4.1l-0.1,0.1l-0.8-0.7l0.1-0.1c0.8-1,1.2-2.2,1.2-3.4c0-1.2-0.4-2.5-1.2-3.4
-		l-0.1-0.1l0.8-0.6l0.1,0.1C418.7,28.1,419.2,29.5,419.2,31z M415,28.4c0.6,0.7,0.9,1.6,0.9,2.6c0,0.9-0.3,1.8-0.9,2.5l0.7,0.5
-		c0.7-0.8,1.1-1.9,1.1-3c0-1.2-0.4-2.3-1.1-3.1L415,28.4z M408,29v4h3l3,2v-8l-3,2H408z"/>
-</g>
-<g id="volume-down">
-	<path fill="#333333" d="M387,29l3-2v8l-3-2h-3v-4H387z M391.7,27.9l-0.7,0.5c0.6,0.7,0.9,1.6,0.9,2.6c0,0.9-0.3,1.8-0.9,2.5
-		l0.7,0.5c0.7-0.8,1.1-1.9,1.1-3C392.8,29.8,392.4,28.7,391.7,27.9z"/>
-</g>
-<g id="volume-off">
-	<path fill="#333333" d="M363,29l3-2v8l-3-2h-3v-4H363z M371.1,29.6l-0.7-0.7l-1.4,1.4l-1.4-1.4l-0.7,0.7l1.4,1.4l-1.4,1.4l0.7,0.7
-		l1.4-1.4l1.4,1.4l0.7-0.7l-1.4-1.4L371.1,29.6z"/>
-</g>
-<g id="headphones">
-	<path fill="#333333" d="M348,31.2v0.2v2.8c0,0.1-0.1,0.2-0.2,0.2h-0.5c-0.1,0-0.2-0.1-0.2-0.2v-2.8v-0.2c0-2.6-2.4-4.5-5-4.5
-		c-2.6,0-5,1.9-5,4.5v0.2v2.8c0,0.1-0.1,0.2-0.2,0.2h-0.5c-0.1,0-0.2-0.1-0.2-0.2v-2.8v-0.2c0-3.2,2.8-6,6-6
-		C345.2,25.2,348,28.1,348,31.2z M340,32.2c0-0.1-0.1-0.2-0.2-0.2h-1.6c-0.1,0-0.2,0.1-0.2,0.2v4.6c0,0.1,0.1,0.2,0.2,0.2h1.6
-		c0.1,0,0.2-0.1,0.2-0.2V32.2z M346,32.2c0-0.1-0.1-0.2-0.2-0.2h-1.6c-0.1,0-0.2,0.1-0.2,0.2v4.6c0,0.1,0.1,0.2,0.2,0.2h1.6
-		c0.1,0,0.2-0.1,0.2-0.2V32.2z"/>
-</g>
-<g id="flag">
-	<path fill="#333333" d="M323,26c0,1,0,2,0,5c-2,4-5-1-8,2c0-2,0-3,0-5C316,24,321,30,323,26z M314,26h-1v11h1V26z"/>
-</g>
-<g id="lock">
-	<path fill="#333333" d="M298,29h-1v-2c0-1.1-0.9-2-2-2h-3c-1.1,0-2,0.9-2,2v2h-1c-0.5,0-1,0.5-1,1v6c0,0.5,0.5,1,1,1h9
-		c0.5,0,1-0.5,1-1v-6C299,29.5,298.5,29,298,29z M292,27.5c0-0.3,0.2-0.5,0.5-0.5h2c0.3,0,0.5,0.2,0.5,0.5V29h-3V27.5z"/>
-</g>
-<g id="list-alt">
-	<path fill="#333333" d="M274,35h-5v-1h5V35z M274,28h-5v1h5V28z M274,30h-5v1h5V30z M268,28h-1v1h1V28z M274,32h-5v1h5V32z M276,25
-		v2v9v1h-11v-1v-9v-2H276z M275,27h-9v9h9V27z M268,34h-1v1h1V34z M268,30h-1v1h1V30z M268,32h-1v1h1V32z"/>
-</g>
-<g id="refresh">
-	<path fill="#333333" d="M246,35.3c-0.9,0-1.8-0.3-2.5-0.8L245,33h-4v2v2l1.5-1.5c1,0.8,2.2,1.2,3.5,1.2c3.2,0,5.8-2.6,5.8-5.8h-1.5
-		C250.3,33.4,248.4,35.3,246,35.3z"/>
-	<path fill="#333333" d="M246,26.7c0.9,0,1.8,0.3,2.5,0.8L247,29h4v-4l-1.5,1.5c-1-0.8-2.2-1.2-3.5-1.2c-3.2,0-5.8,2.6-5.8,5.8h1.5
-		C241.7,28.6,243.6,26.7,246,26.7z"/>
-</g>
-<g id="repeat">
-	<path fill="#333333" d="M227.8,31c0,3.2-2.6,5.8-5.8,5.8s-5.8-2.6-5.8-5.8s2.6-5.8,5.8-5.8c1.3,0,2.6,0.5,3.5,1.2L227,25v4h-4
-		l1.5-1.5c-0.7-0.5-1.5-0.8-2.5-0.8c-2.4,0-4.3,1.9-4.3,4.3s1.9,4.3,4.3,4.3s4.3-1.9,4.3-4.3H227.8z"/>
-</g>
-<g id="play-circle">
-	<path fill="#333333" d="M198,26.7c2.4,0,4.3,1.9,4.3,4.3s-1.9,4.3-4.3,4.3s-4.3-1.9-4.3-4.3S195.6,26.7,198,26.7 M198,25.2
-		c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S201.2,25.2,198,25.2L198,25.2z"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#333333" points="197,33 197,29 200,31 	"/>
-</g>
-<g id="inbox_3_">
-	<path fill="#333333" d="M180,32c0,0-2-7-2-7h-8c0,0-2,7-2,7l0,4.8c0,0.1,0.1,0.2,0.2,0.2h11.5c0.1,0,0.2-0.1,0.2-0.2V32z M171,27
-		h6.1l1,5h-2l-0.5,2h-3l-0.5-2h-2L171,27z"/>
-</g>
-<g id="upload">
-	<path fill="#333333" d="M150,25.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8c3.2,0,5.8-2.6,5.8-5.8S153.2,25.2,150,25.2z M150,35.3
-		c-2.4,0-4.3-1.9-4.3-4.3s1.9-4.3,4.3-4.3s4.3,1.9,4.3,4.3S152.4,35.3,150,35.3z"/>
-	<g id="XMLID_1_">
-		<g>
-			<polygon fill="#333333" points="150,28 152.5,31 151,31 151,34 149,34 149,31 147.5,31 			"/>
-		</g>
-		<g>
-		</g>
-	</g>
-</g>
-<g id="download">
-	<path fill="#333333" d="M126,25.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8c3.2,0,5.8-2.6,5.8-5.8S129.2,25.2,126,25.2z M126,35.3
-		c-2.4,0-4.3-1.9-4.3-4.3s1.9-4.3,4.3-4.3c2.4,0,4.3,1.9,4.3,4.3S128.4,35.3,126,35.3z"/>
-	<polygon fill="#333333" points="127,28 125,28 125,31 123.5,31 126,34 128.5,31 127,31 	"/>
-</g>
-<g id="download_x5F_alt">
-	<polygon fill="#333333" points="106.9,30 104,30 104,25 101,25 101,30 98,30 102.4,35 	"/>
-	<polygon fill="#333333" points="107,33 107,35 98,35 98,33 97,33 97,35 97,37 108,37 108,35 108,33 	"/>
-</g>
-<g id="road_2_">
-	<path fill="#333333" d="M79.6,37H85l-4.3-12h-2.1l0.2,3h-1.6l0.2-3h-2.1L71,37h5.4l0.4-4h2.4L79.6,37z M76.9,32l0.3-3h1.7l0.3,3
-		H76.9z"/>
-</g>
-<g id="time">
-	<polygon fill="#333333" points="54,28 53,28 53,32 56,32 56,31 54,31 	"/>
-	<path fill="#333333" d="M54,25.2c-3.2,0-5.8,2.6-5.8,5.8s2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8S57.2,25.2,54,25.2z M54,35.3
-		c-2.4,0-4.3-1.9-4.3-4.3s1.9-4.3,4.3-4.3s4.3,1.9,4.3,4.3S56.4,35.3,54,35.3z"/>
-</g>
-<g id="file">
-	<polygon fill="#333333" points="31,26 31,29 34,29 	"/>
-	<path fill="#333333" d="M30,25h-4.8c-0.1,0-0.2,0.1-0.2,0.2v11.5c0,0.1,0.1,0.2,0.2,0.2h8.5c0.1,0,0.2-0.1,0.2-0.2V30h-4V25z"/>
-</g>
-<g id="home">
-	<polygon fill="#333333" points="6.6,24.6 0,31 2,31 2,37 5,37 5,33 8,33 8,37 11,37 11,31 13,31 	"/>
-</g>
-<g id="trash">
-	<path fill="#333333" d="M467.8,2H465V1c0-0.5-0.5-1-1-1h-3c-0.5,0-1,0.5-1,1v1h-2.8c-0.1,0-0.2,0.1-0.2,0.2v0.5
-		c0,0.1,0.1,0.2,0.2,0.2h10.5c0.1,0,0.2-0.1,0.2-0.2V2.2C468,2.1,467.9,2,467.8,2z M461,2L461,2l0-1h3v1H461z M458,12
-		c0,0.5,0.5,1,1,1h7c0.5,0,1-0.5,1-1V4h-9V12z M465,5h1v7h-1V5z M463,5h1v7h-1V5z M461,5h1v7h-1V5z M459,5h1v7h-1V5z"/>
-	<path opacity="0.5" fill="#333333" d="M460,12h-1V5h1V12z M462,5h-1v7h1V5z M464,5h-1v7h1V5z M466,5h-1v7h1V5z"/>
-</g>
-<g id="cog">
-	<path fill="#333333" d="M438,12.7c-0.2,0-0.5,0-0.7-0.1l-0.4-1.5l-0.1,0c-0.3-0.1-0.6-0.2-0.9-0.4l-0.1,0l-1.3,0.8
-		c-0.4-0.3-0.8-0.7-1-1l0.8-1.3l0-0.1c-0.2-0.3-0.3-0.6-0.4-0.9l0-0.1l-1.5-0.4c0-0.3-0.1-0.5-0.1-0.7c0-0.2,0-0.5,0.1-0.7l1.5-0.4
-		l0-0.1c0.1-0.3,0.2-0.6,0.4-0.9l0-0.1l-0.8-1.3c0.3-0.4,0.7-0.8,1-1l1.3,0.8l0.1,0c0.3-0.2,0.6-0.3,0.9-0.4l0.1,0l0.4-1.5
-		c0.3,0,0.5-0.1,0.7-0.1c0.3,0,0.5,0,0.7,0.1l0.4,1.5l0.1,0c0.3,0.1,0.6,0.2,0.9,0.4l0.1,0l1.3-0.8c0.4,0.3,0.8,0.7,1,1l-0.8,1.3
-		l0,0.1c0.2,0.3,0.3,0.6,0.4,0.9l0,0.1l1.5,0.4c0,0.3,0.1,0.5,0.1,0.7c0,0.3,0,0.5-0.1,0.7l-1.5,0.4l0,0.1c-0.1,0.3-0.2,0.6-0.4,0.9
-		l0,0.1l0.8,1.3c-0.3,0.4-0.7,0.8-1,1l-1.3-0.8l-0.1,0c-0.3,0.2-0.6,0.3-0.9,0.4l-0.1,0l-0.4,1.5C438.5,12.7,438.2,12.7,438,12.7z
-		 M438,4.8c-1.2,0-2.1,1-2.1,2.1c0,1.2,1,2.1,2.1,2.1c1.2,0,2.1-1,2.1-2.1C440.1,5.8,439.2,4.8,438,4.8z"/>
-</g>
-<g id="signal">
-	<path fill="#333333" d="M411,13h-2v-3h2V13z M414,8h-2v5h2V8z M417,5h-2v8h2V5z M420,1h-2v12h2V1z"/>
-</g>
-<g id="off">
-	<path fill="#333333" d="M391,5.5c0,0.3-0.2,0.5-0.5,0.5h-1c-0.3,0-0.5-0.2-0.5-0.5v-4c0-0.3,0.2-0.5,0.5-0.5h1
-		c0.3,0,0.5,0.2,0.5,0.5V5.5z M392,1.6v1.7c1.3,0.7,2.3,2.1,2.3,3.8c0,2.4-1.9,4.3-4.3,4.3s-4.3-1.9-4.3-4.3c0-1.6,0.9-3,2.3-3.8
-		V1.6c-2.2,0.8-3.8,2.9-3.8,5.4c0,3.2,2.6,5.8,5.8,5.8s5.8-2.6,5.8-5.8C395.8,4.5,394.2,2.4,392,1.6z"/>
-</g>
-<g id="zoom-out">
-	<g id="search_7_">
-		<path id="search_8_" fill="#333333" d="M372.1,11.7l-3-3c0.5-0.8,0.8-1.7,0.8-2.6c0-2.7-2.2-4.8-4.8-4.8c-2.7,0-4.8,2.2-4.8,4.8
-			c0,2.7,2.2,4.8,4.8,4.8c1,0,1.9-0.3,2.6-0.8l3,3c0.1,0.1,0.3,0.1,0.4,0l1.1-1.1C372.2,11.9,372.2,11.8,372.1,11.7z M361.8,6.1
-			c0-1.8,1.5-3.3,3.3-3.3c1.8,0,3.3,1.5,3.3,3.3c0,1.8-1.5,3.3-3.3,3.3C363.2,9.4,361.8,7.9,361.8,6.1z"/>
-	</g>
-	<rect x="363" y="5" fill="#333333" width="4" height="2"/>
-</g>
-<g id="zoom-in">
-	<path fill="#333333" d="M348.1,11.7l-3-3c0.5-0.8,0.8-1.7,0.8-2.6c0-2.7-2.2-4.8-4.8-4.8c-2.7,0-4.8,2.2-4.8,4.8
-		c0,2.7,2.2,4.8,4.8,4.8c1,0,1.9-0.3,2.6-0.8l3,3c0.1,0.1,0.3,0.1,0.4,0l1.1-1.1C348.2,11.9,348.2,11.8,348.1,11.7z M341.1,9.4
-		c-1.8,0-3.3-1.5-3.3-3.3c0-1.8,1.5-3.3,3.3-3.3c1.8,0,3.3,1.5,3.3,3.3C344.4,7.9,342.9,9.4,341.1,9.4z"/>
-	<polygon fill="#333333" points="342,4 340,4 340,5 339,5 339,7 340,7 340,8 342,8 342,7 343,7 343,5 342,5 	"/>
-</g>
-<g id="remove_1_">
-	<polygon fill="#333333" points="322.9,9.8 320.1,7 322.9,4.2 320.8,2.1 318,4.9 315.2,2.1 313.1,4.2 315.9,7 313.1,9.8 315.2,11.9 
-		318,9.1 320.8,11.9 	"/>
-</g>
-<g id="ok_1_">
-	<polygon fill="#333333" points="288.3,8.5 290.4,6.3 292.5,8.4 298.5,2.3 300.7,4.5 292.5,12.7 	"/>
-</g>
-<g id="th-list">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M267,8.5c0,0.3-0.2,0.5-0.5,0.5h-2c-0.3,0-0.5-0.2-0.5-0.5v-2
-		c0-0.3,0.2-0.5,0.5-0.5h2c0.3,0,0.5,0.2,0.5,0.5V8.5z M267,10.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V10.5z M267,2.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V2.5z M276,6.5c0-0.3-0.2-0.5-0.5-0.5h-7c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h7c0.3,0,0.5-0.2,0.5-0.5V6.5z M276,10.5c0-0.3-0.2-0.5-0.5-0.5h-7c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h7c0.3,0,0.5-0.2,0.5-0.5V10.5z M276,2.5c0-0.3-0.2-0.5-0.5-0.5h-7c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h7c0.3,0,0.5-0.2,0.5-0.5V2.5z"/>
-</g>
-<g id="th">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M251,2.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V2.5z M251,6.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V6.5z M251,10.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V10.5z M247,2.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V2.5z M247,6.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V6.5z M247,10.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V10.5z M243,2.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V2.5z M243,6.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V6.5z M243,10.5c0-0.3-0.2-0.5-0.5-0.5h-2c-0.3,0-0.5,0.2-0.5,0.5v2
-		c0,0.3,0.2,0.5,0.5,0.5h2c0.3,0,0.5-0.2,0.5-0.5V10.5z"/>
-</g>
-<g id="th-large">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#333333" d="M227,2.5c0-0.3-0.2-0.5-0.5-0.5h-4c-0.3,0-0.5,0.2-0.5,0.5v4
-		c0,0.3,0.2,0.5,0.5,0.5h4c0.3,0,0.5-0.2,0.5-0.5V2.5z M227,8.5c0-0.3-0.2-0.5-0.5-0.5h-4c-0.3,0-0.5,0.2-0.5,0.5v4
-		c0,0.3,0.2,0.5,0.5,0.5h4c0.3,0,0.5-0.2,0.5-0.5V8.5z M221,2.5c0-0.3-0.2-0.5-0.5-0.5h-4c-0.3,0-0.5,0.2-0.5,0.5v4
-		c0,0.3,0.2,0.5,0.5,0.5h4c0.3,0,0.5-0.2,0.5-0.5V2.5z M221,8.5c0-0.3-0.2-0.5-0.5-0.5h-4c-0.3,0-0.5,0.2-0.5,0.5v4
-		c0,0.3,0.2,0.5,0.5,0.5h4c0.3,0,0.5-0.2,0.5-0.5V8.5z"/>
-</g>
-<g id="film">
-	<path fill="#333333" d="M192,2v11h12V2H192z M194,12h-1v-1h1V12z M194,10h-1V9h1V10z M194,8h-1V7h1V8z M194,6h-1V5h1V6z M194,4h-1
-		V3h1V4z M201,12h-6V8h6V12z M201,7h-6V3h6V7z M203,12h-1v-1h1V12z M203,10h-1V9h1V10z M203,8h-1V7h1V8z M203,6h-1V5h1V6z M203,4h-1
-		V3h1V4z"/>
-	<rect x="195" y="3" opacity="0.3" fill="#333333" width="6" height="4"/>
-	<rect x="195" y="8" opacity="0.3" fill="#333333" width="6" height="4"/>
-</g>
-<g id="user">
-	<path fill="#333333" d="M176,9V8c0.5,0,1-1.5,1-2V4c0-1.7-1.4-3-3-3c-1.6,0-3,1.3-3,3v2c0,0.5,0.5,2,1,2v1l-4,2.6c0,0,0,1.3,0,1.4
-		h12c0-0.1,0-1.4,0-1.4L176,9z"/>
-</g>
-<g id="star-empty">
-	<path fill="#333333" d="M155.7,5H151l-1.5-4h0l-1.5,4h-4.8l3.9,2.8l-1.5,4.5l0,0l3.8-2.8l3.8,2.8l-1.5-4.5L155.7,5z M149.5,8.3
-		l-1.9,1.4l0.7-2.3l-2-1.4h2.4l0.8-2.1l0.8,2.1h2.3l-1.9,1.4l0.7,2.3L149.5,8.3z"/>
-</g>
-<g id="star_1_">
-	<path id="star_4_" fill="#333333" d="M131.7,5l-3.8,2.8l1.5,4.5l-3.8-2.8l-3.8,2.8l0,0l1.5-4.5L119.3,5h4.8l1.5-4h0l1.5,4H131.7z"
-		/>
-</g>
-<g id="heart_2_">
-	<path fill="#333333" d="M102.5,3.5c-1.9-2.8-5.5-1-5.5,1.6c0,2,3.2,3.8,5.5,7c2.3-3.2,5.5-4.9,5.5-7C108,2.5,104.5,0.7,102.5,3.5z"
-		/>
-</g>
-<g id="envelope_2_">
-	<path fill="#333333" d="M78,8l-6-6h12L78,8z M78,10l-2-2l-4,4h12l-4-4L78,10z M81,7l3,3V4L81,7z M72,4v6l3-3L72,4z"/>
-</g>
-<g id="search_1_">
-	<path id="search_4_" fill="#333333" d="M60.1,11.7l-3-3c0.5-0.8,0.8-1.7,0.8-2.6c0-2.7-2.2-4.8-4.8-4.8c-2.7,0-4.8,2.2-4.8,4.8
-		c0,2.7,2.2,4.8,4.8,4.8c1,0,1.9-0.3,2.6-0.8l3,3c0.1,0.1,0.3,0.1,0.4,0l1.1-1.1C60.2,11.9,60.2,11.8,60.1,11.7z M49.8,6.1
-		c0-1.8,1.5-3.3,3.3-3.3c1.8,0,3.3,1.5,3.3,3.3c0,1.8-1.5,3.3-3.3,3.3C51.2,9.4,49.8,7.9,49.8,6.1z"/>
-</g>
-<g id="music_1_">
-	<path id="music_4_" fill="#333333" d="M35,1.2c0,0,0,8,0,8.8s-0.6,1.3-1.5,1.6c-1.1,0.3-2.1,0-2.3-0.7c-0.2-0.7,0.4-1.6,1.5-1.9
-		c0.5-0.2,1-0.2,1.4-0.1V3.7l-6,1.6c0,0,0,5.4,0,6.1c0,0.5-0.6,1.3-1.5,1.6c-1.1,0.3-2.1,0-2.3-0.7c-0.2-0.7,0.4-1.6,1.5-1.9
-		c0.5-0.2,1-0.2,1.4-0.1V3.3c0-0.1,0.1-0.3,0.2-0.3L34.8,1C34.9,1,35,1.1,35,1.2z"/>
-</g>
-<g id="glass_1_">
-	<polygon id="glass" fill="#333333" points="7,6.5 12,1 0,1 5,6.5 5,12 2,12 2,13 10,13 10,12 7,12 	"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/openQRM-5.3.50-CE/src/web/base/img/ha.png b/openQRM-5.3.50-CE/src/web/base/img/ha.png
deleted file mode 100644
index 7f557fa..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/ha.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/header_dropShadow.png b/openQRM-5.3.50-CE/src/web/base/img/header_dropShadow.png
deleted file mode 100644
index 6610929..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/header_dropShadow.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/help.png b/openQRM-5.3.50-CE/src/web/base/img/help.png
deleted file mode 100644
index 2f9817d..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/help.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/help_small.png b/openQRM-5.3.50-CE/src/web/base/img/help_small.png
deleted file mode 100644
index cc2ec66..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/help_small.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/html-tabs-fix.png b/openQRM-5.3.50-CE/src/web/base/img/html-tabs-fix.png
deleted file mode 100644
index 8fac0ee..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/html-tabs-fix.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/idle.png b/openQRM-5.3.50-CE/src/web/base/img/idle.png
deleted file mode 100644
index 2233b06..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/idle.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/image.png b/openQRM-5.3.50-CE/src/web/base/img/image.png
deleted file mode 100644
index 5f5f2c7..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/image.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/import.png b/openQRM-5.3.50-CE/src/web/base/img/import.png
deleted file mode 100644
index 635091d..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/import.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/kernel.png b/openQRM-5.3.50-CE/src/web/base/img/kernel.png
deleted file mode 100644
index 07a55c0..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/kernel.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/loading.gif b/openQRM-5.3.50-CE/src/web/base/img/loading.gif
deleted file mode 100644
index 1c72ebb..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/loading.gif and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/logo.png b/openQRM-5.3.50-CE/src/web/base/img/logo.png
deleted file mode 100644
index 708c677..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/logo.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/logout.png b/openQRM-5.3.50-CE/src/web/base/img/logout.png
deleted file mode 100644
index 683d838..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/logout.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/mail.png b/openQRM-5.3.50-CE/src/web/base/img/mail.png
deleted file mode 100644
index 5420df9..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/mail.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/manage.png b/openQRM-5.3.50-CE/src/web/base/img/manage.png
deleted file mode 100644
index 5e26e7c..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/manage.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/menu-background.png b/openQRM-5.3.50-CE/src/web/base/img/menu-background.png
deleted file mode 100644
index 304f9de..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/menu-background.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/migrate.png b/openQRM-5.3.50-CE/src/web/base/img/migrate.png
deleted file mode 100644
index 163a104..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/migrate.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/monitoring.png b/openQRM-5.3.50-CE/src/web/base/img/monitoring.png
deleted file mode 100644
index d4028dc..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/monitoring.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/off.png b/openQRM-5.3.50-CE/src/web/base/img/off.png
deleted file mode 100644
index 2a23a11..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/off.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/off_small.png b/openQRM-5.3.50-CE/src/web/base/img/off_small.png
deleted file mode 100644
index c621292..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/off_small.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/page-background.gif b/openQRM-5.3.50-CE/src/web/base/img/page-background.gif
deleted file mode 100644
index 0990486..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/page-background.gif and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/plugin.png b/openQRM-5.3.50-CE/src/web/base/img/plugin.png
deleted file mode 100644
index 97b61a4..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/plugin.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/progress.gif b/openQRM-5.3.50-CE/src/web/base/img/progress.gif
deleted file mode 100644
index 1c72ebb..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/progress.gif and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/resize.png b/openQRM-5.3.50-CE/src/web/base/img/resize.png
deleted file mode 100644
index 642a21a..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/resize.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/resource.png b/openQRM-5.3.50-CE/src/web/base/img/resource.png
deleted file mode 100644
index 5cc8bb5..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/resource.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/snapshot.png b/openQRM-5.3.50-CE/src/web/base/img/snapshot.png
deleted file mode 100644
index 0b43c49..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/snapshot.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/spacer.gif b/openQRM-5.3.50-CE/src/web/base/img/spacer.gif
deleted file mode 100644
index 68b18e3..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/spacer.gif and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/start.png b/openQRM-5.3.50-CE/src/web/base/img/start.png
deleted file mode 100644
index 972c313..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/start.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/stop.png b/openQRM-5.3.50-CE/src/web/base/img/stop.png
deleted file mode 100644
index 6659872..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/stop.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/storage.png b/openQRM-5.3.50-CE/src/web/base/img/storage.png
deleted file mode 100644
index 4f1580e..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/storage.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/support.png b/openQRM-5.3.50-CE/src/web/base/img/support.png
deleted file mode 100644
index e19d860..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/support.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/support_small.png b/openQRM-5.3.50-CE/src/web/base/img/support_small.png
deleted file mode 100644
index 535fcf8..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/support_small.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/time.png b/openQRM-5.3.50-CE/src/web/base/img/time.png
deleted file mode 100644
index a4417d7..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/time.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/top_pageBgr.png b/openQRM-5.3.50-CE/src/web/base/img/top_pageBgr.png
deleted file mode 100644
index ed92bcc..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/top_pageBgr.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/transition.png b/openQRM-5.3.50-CE/src/web/base/img/transition.png
deleted file mode 100644
index 4147b5e..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/transition.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/transition_small.png b/openQRM-5.3.50-CE/src/web/base/img/transition_small.png
deleted file mode 100644
index da45bac..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/transition_small.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/unknown.png b/openQRM-5.3.50-CE/src/web/base/img/unknown.png
deleted file mode 100644
index fbeec42..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/unknown.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/up.png b/openQRM-5.3.50-CE/src/web/base/img/up.png
deleted file mode 100644
index 3f0b365..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/up.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/user.png b/openQRM-5.3.50-CE/src/web/base/img/user.png
deleted file mode 100644
index e952cbc..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/user.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/user_small.png b/openQRM-5.3.50-CE/src/web/base/img/user_small.png
deleted file mode 100644
index c770a17..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/user_small.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/img/virtualization.png b/openQRM-5.3.50-CE/src/web/base/img/virtualization.png
deleted file mode 100644
index 0026b9f..0000000
Binary files a/openQRM-5.3.50-CE/src/web/base/img/virtualization.png and /dev/null differ
diff --git a/openQRM-5.3.50-CE/src/web/base/include/htmlobject.inc.php b/openQRM-5.3.50-CE/src/web/base/include/htmlobject.inc.php
deleted file mode 100644
index eefb7d8..0000000
--- a/openQRM-5.3.50-CE/src/web/base/include/htmlobject.inc.php
+++ /dev/null
@@ -1,423 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-$ClassDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/class/';
-
-require_once($ClassDir."htmlobject.http.class.php");
-require_once($ClassDir."htmlobject.class.php");
-require_once($ClassDir."htmlobject.head.class.php");
-require_once($ClassDir."htmlobject.tabmenu.class.php");
-require_once($ClassDir."htmlobject.table.class.php");
-require_once($ClassDir."htmlobject.preloader.class.php");
-require_once($ClassDir."htmlobject.form.class.php");
-require_once($ClassDir."htmlobject.debug.class.php");
-require_once($ClassDir."regex.class.php");
-require_once($ClassDir."PHPLIB.php");
-
-//---------------------------------------------------------------
-/**
-* builds html input box
-* @access public
-* @param  $name string
-* @param  $value array(array(label=>, value=>))
-* @param  $type enum(text,hidden,password,checkbox)
-* @param  $maxlength int
-* @return string
-*/
-function htmlobject_input($name, $value, $type = 'text', $arg = '') {
-
-	$html = new htmlobject_input();
-	$html->name = $name;
-	$html->id = 'p'.uniqid();
-	$html->value = $value['value'];
-	$html->title = $value['label'];
-	$html->type = $type;
-
-	switch($type) {
-		case 'text':
-		case 'password':
-			$html->maxlength = $arg;
-			return htmlobject_box_from_object($html, ' input');
-			break;
-		case 'checkbox':
-			$html->value = '';
-			$html->checked = $arg;
-			return htmlobject_box_from_object($html, ' checkbox');
-			break;
-		case 'hidden':
-			$html->title = '';
-			$html->id = '';
-			return $html->get_string();
-			break;
-		default:
-			return $html->get_string();
-			break;
-	}
-}
-//---------------------------------------------------------------
-/**
-* builds html select box
-* @access public
-* @param  $name string
-* @param  $value array(label=>, value=>)
-* @param  $title string
-* @param  $selected array()
-* @return string
-*/
-function htmlobject_select($name, $value, $title = '', $selected = array()) {
-
-	$html = new htmlobject_select();
-	$html->id = 'p'.uniqid();
-	$html->name = $name;
-	$html->title = $title;
-	$html->selected = $selected;
-	$html->text_index = array("value" => "value", "text" => "label");
-	$html->text = $value;
-
-	return htmlobject_box_from_object($html, ' select');
-}
-//---------------------------------------------------------------
-/**
-* builds html select
-* @access public
-* @param  $name string
-* @param  $value array(label=>, value=>)
-* @param  $title string
-* @param  $selected array()
-* @return string
-*/
-function htmlobject_select_simple($name, $value, $title = '', $selected = '') {
-	$html = new htmlobject_select();
-	$html->name = $name;
-	$html->title = $title;
-	$html->selected = $selected;
-	$html->text_index = array("value" => "value", "text" => "label");
-	$html->text = $value;
-	return $html->get_string();
-}
-//---------------------------------------------------------------
-/**
-* builds html textarea box
-* @access public
-* @param  $name string
-* @param  $value array(label=>, value=>)
-* @return string
-*/
-function htmlobject_textarea($name, $value) {
-
-	$html = new htmlobject_textarea();
-	$html->id = 'p'.uniqid();
-	$html->name = $name;
-	$html->title = $value['label'];
-	$html->text = $value['value'];
-
-	return htmlobject_box_from_object($html, ' textarea');
-}
-//---------------------------------------------------------------
-/**
-* builds tabmenu
-* @access public
-* @param  $value array(array((label=>, value=>))
-* @return string
-*/
-function htmlobject_tabmenu($value) {
-
-	$tabmenu = new htmlobject_tabmenu($value);
-	$tabmenu->prefix_tab = 'tab';
-	$tabmenu->css = 'htmlobject_tabs';
-
-	/*
-	$i = 0;
-	foreach ($value as $val) {
-		$html = new htmlobject_div();
-		$html->id = 'tab'.$i;
-		$html->css = 'htmlobject_tab_box';
-		$html->title = $val['label'];
-		$html->text = $val['value'];
-		$tabmenu->add($html);
-		$i++;
-	}
-	*/
-
-	return $tabmenu->get_string();
-}
-//---------------------------------------------------------------
-/**
-* builds htmlbox from object
-* object must be htmlobject
-* @access public
-* @param $html object
-* @return string
-*/
-function htmlobject_box_from_object($html, $css='', $usetitle = true) {
-
-	$box = new htmlobject_box();
-	$box->id = 'htmlobject_box_'. $html->name;
-	$box->css = 'htmlobject_box'.$css;
-	$box->label = $html->title;
-	$box->content = $html;
-
-	if($usetitle === false) {
-		$html->title = '';
-	}
-
-	return $box->get_string();
-}
-//---------------------------------------------------------------
-/**
-* builds html radio box
-* @access public
-* @param  $name string
-* @param  $value array(label=>, value=>)
-* @param  $checked string
-* @return string
-*/
-function htmlobject_radio_list($name, $value, $title = '', $checked = '') {
-	$_strReturn = '';
-
-	$i = 0;
-	foreach ($value as $val) {
-		$html = new htmlobject_input();
-		$html->type = 'radio';
-		$html->id = 'p'.uniqid();
-		$html->name = $name;
-		$html->title =  $val['label'];
-		if($checked == $val['value']) {
-			$html->checked = true;
-		}
-		$html->value = $val['value'];
-		$_strReturn .= htmlobject_box_from_object($html, ' radio');
-
-		$i++;
-	}
-
-	$html = new htmlobject_div();
-	$html->name = '';
-	$html->title = $title;
-	$html->text = $_strReturn;
-
-	$_strReturn = htmlobject_box_from_object($html, ' outerbox', false);
-
-	return $_strReturn;
-}
-//---------------------------------------------------------------
-/**
-* builds html table
-* @access public
-* @param  $name string
-* @param  $value array(array(label=>, value=>, ...)
-* @param  $mode enum(object,string)
-* @return string
-*/
-function htmlobject_table($id, $value, $mode = 'object') {
-	$_strReturn = '';
-
-	$table = new htmlobject_table();
-	$table->id = $id;
-	$table->css = 'htmlobject_table';
-	$table->border = 1;
-	$table->cellspacing = 0;
-	$table->cellpadding = 0;
-
-	$i = 0;
-	if($mode == 'object') {
-		foreach ($value as $val) {
-		$tr = new htmlobject_tr();
-			foreach($val as $key => $v) {
-				$td = new htmlobject_td();
-				$td->css = $key;
-				$td->text = $v;
-				$tr->add($td);
-			}
-		$table->add($tr);
-		}
-	}
-	if($mode == 'string') {
-		$tr = '';
-			foreach ($value as $val) {
-				$tr .= $val;
-			}
-		$table->add($tr);
-	}
-
-	return $table->get_string();
-}
-//---------------------------------------------------------------
-/**
-* builds head of Page
-* @access public
-* @param $title string
-* @return string
-*/
-function htmlobject_head($title = '', $timer = '', $url = '') {
-
-	$html = new htmlobject_head();
-	$html->add_meta('content-language','en');
-	$html->add_meta('content-type','text/html; charset=utf-8');
-	$html->add_meta('expires','Sat, 01 Dec 2001 00:00:00 GMT');
-	$html->add_meta('cache-control','no-cache');
-	$html->add_meta('pragma','no-cache');
-	if($timer != '' && $url != '') {
-		$html->add_meta('refresh', $timer.'; URL='.$url);
-	}
-	$html->add_style('../../css/htmlobject.css');
-	$html->title = $title;
-
-	return $html->get_string();
-}
-//---------------------------------------------------------------
-function htmlobject_request($arg) {
-	if (isset($_REQUEST[$arg]))
-		return $_REQUEST[$arg];
-	else
-		return '';
-}
-
-function error_redirect($strMsg = '') {
-	global $thisfile;
-	$args = '?strMsg=<strong>Error:</strong><br>'.$strMsg;
-	foreach($_POST as $key => $value) {
-	if($key != 'action') {
-
-		if(is_array($value)) {
-			foreach($value as $key1 => $value1) {
-				$args .= '&'.$key.'[]='.$value1;
-			}
-		} else {
-			$args .= '&'.$key.'='.$value;
-		}
-	}
-	}
-	foreach($_GET as $key => $value) {
-	if($key != 'action') {
-
-		if(is_array($value)) {
-			foreach($value as $key1 => $value1) {
-				$args .= '&'.$key.'[]='.$value1;
-			}
-		} else {
-			$args .= '&'.$key.'='.$value;
-		}
-	}
-	}
-	return $thisfile.$args;
-}
-
-
-
-
-
-class htmlobject_db_table extends htmlobject_table_builder 
-{
-	function htmlobject_db_table($field = '', $order = '', $limit = '') {
-		parent::htmlobject_table_builder($field, $order, $limit);
-	}
-}
-
-class htmlobject_table_identifiers_checked extends htmlobject_table_builder 
-{
-
-	var $_identifiers = array();
-
-	function get_indentifier($key, $ident) {
-		if($this->identifier != '') {
-			$html = new htmlobject_input();
-			$html->id = $ident;
-			$html->name = 'identifier[]';
-			$html->value = $this->body[$key][$this->identifier];
-			$html->type = 'hidden';
-
-			$this->_identifiers[] = $html->get_string();
-		}
-	}
-
-	function get_table_head() {
-		$tr = '';
-		if(count($this->head) > 0) {
-			$tr = new htmlobject_tr();
-			$tr->css = 'htmlobject_tr';
-			$tr->id = 'tr_'. uniqid();
-
-			foreach($this->head as $key_2 => $value) {
-				if($value['title'] == '') { $value['title'] = '&#160;'; }
-				$td = new htmlobject_td();
-				$td->type = 'th';
-				$td->css = 'htmlobject_td '.$key_2;
-				$td->text = $value['title'];
-				$tr->add($td);
-			}
-		}
-		return $tr;
-	}
-
-	function get_table_bottom () {
-		$tr = '';
-		if(isset($this->bottom[0])) {
-			$tr = new htmlobject_tr();
-			$tr->css = 'htmlobject_tr';
-			$tr->id = 'tr_'. uniqid();
-
-			$td = new htmlobject_td();
-			$td->colspan = $this->_num_cols;
-			$td->type = 'td';
-			$td->css = 'htmlobject_td bottom';
-			$str = '';
-			foreach($this->bottom as $key_2 => $v) {
-				$html = new htmlobject_input();
-				$html->name = 'action';
-				$html->value = $v;
-				$html->type = 'submit';
-				$str .= $html->get_string();
-			}
-			$str .= join("", $this->_identifiers);
-			$td->text = $str;
-			$tr->add($td);
-		}
-	return $tr;
-	}
-}
-class htmlobject_table_identifiers_radio extends htmlobject_table_builder 
-{
-	function htmlobject_table_identifiers_radio($field = '', $order = '', $limit = '') {
-		parent::htmlobject_table_builder($field, $order, $limit);
-	}
-	
-	//----------------------------------------------------------------------------------------
-	/**
-	* returns JS for tr hover and click function
-	* @access public
-	* @return string
-	*/
-	//----------------------------------------------------------------------------------------
-	function  get_js() {
-	$_strReturn = '';
-		$_strReturn .= "\n";
-		$_strReturn .= '<script>'."\n";
-		$_strReturn .= 'function tr_hover(element) {'."\n";
-		$_strReturn .= '	x = element.className.match(/tr_hover/g);'."\n";
-		$_strReturn .= '	if(x == null) {	element.className = element.className + " tr_hover"; }'."\n";
-		$_strReturn .= '	else { element.className = element.className.replace(/ tr_hover/g, "");	}'."\n";
-		$_strReturn .= '}'."\n";
-		$_strReturn .= 'function tr_click(element, arg) {'."\n";
-		$_strReturn .= '	document.getElementById(arg).checked = true;'."\n";
-		$_strReturn .= '}'."\n";
-		$_strReturn .= '</script>'."\n";
-	return $_strReturn;
-	}
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/web/base/include/openqrm-database-functions.php b/openQRM-5.3.50-CE/src/web/base/include/openqrm-database-functions.php
deleted file mode 100644
index 35473ca..0000000
--- a/openQRM-5.3.50-CE/src/web/base/include/openqrm-database-functions.php
+++ /dev/null
@@ -1,310 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once ($RootDir.'include/openqrm-server-config.php');
-
-if (isset($OPENQRM_ORACLE_HOME))  {
-	PutEnv("LD_LIBRARY_PATH=$OPENQRM_LD_LIBRARY_PATH");
-	PutEnv("ORACLE_HOME=$OPENQRM_ORACLE_HOME");
-	PutEnv("TNS_ADMIN=$OPENQRM_TNS_ADMIN");
-}
-
-if (!defined("ADODB_ASSOC_CASE")) {
-	define('ADODB_ASSOC_CASE',0);
-}
-// different locations of adodb for suse/redhat/debian
-if (file_exists('/usr/share/php/adodb/adodb.inc.php')) {
-	require_once ('/usr/share/php/adodb/adodb.inc.php');
-} else if (file_exists($RootDir.'include/adodb/adodb.inc.php')) {
-	require_once ($RootDir.'include/adodb/adodb.inc.php');
-} else if (file_exists('/usr/share/adodb/adodb.inc.php')) {
-	require_once ('/usr/share/adodb/adodb.inc.php');
-} else {
-	echo 'ERROR: Could not find adodb on this system!';
-}
-
-
-global $OPENQRM_DATABASE_TYPE, $OPENQRM_DATABASE_USER;
-$IMAGE_INFO_TABLE="image_info";
-$DEPLOYMENT_INFO_TABLE="deployment_info";
-$KERNEL_INFO_TABLE="kernel_info";
-$RESOURCE_INFO_TABLE="resource_info";
-$EVENT_INFO_TABLE="event_info";
-$USER_INFO_TABLE="user_info";
-$APPLIANCE_INFO_TABLE="appliance_info";
-$VIRTUALIZATION_INFO_TABLE="virtualization_info";
-$IMAGE_AUTHENTICATION_TABLE="image_authentication_info";
-$STORAGE_INFO_TABLE="storage_info";
-if ("$OPENQRM_DATABASE_TYPE" == "db2") {
-	$IMAGE_INFO_TABLE="$OPENQRM_DATABASE_USER.$IMAGE_INFO_TABLE";
-	$DEPLOYMENT_INFO_TABLE="$OPENQRM_DATABASE_USER.$DEPLOYMENT_INFO_TABLE";
-	$KERNEL_INFO_TABLE="$OPENQRM_DATABASE_USER.$KERNEL_INFO_TABLE";
-	$RESOURCE_INFO_TABLE="$OPENQRM_DATABASE_USER.$RESOURCE_INFO_TABLE";
-	$EVENT_INFO_TABLE="$OPENQRM_DATABASE_USER.$EVENT_INFO_TABLE";
-	$USER_INFO_TABLE="$OPENQRM_DATABASE_USER.$USER_INFO_TABLE";
-	$APPLIANCE_INFO_TABLE="$OPENQRM_DATABASE_USER.$APPLIANCE_INFO_TABLE";
-	$VIRTUALIZATION_INFO_TABLE="$OPENQRM_DATABASE_USER.$VIRTUALIZATION_INFO_TABLE";
-	$IMAGE_AUTHENTICATION_TABLE="$OPENQRM_DATABASE_USER.$IMAGE_AUTHENTICATION_TABLE";
-	$STORAGE_INFO_TABLE="$OPENQRM_DATABASE_USER.$STORAGE_INFO_TABLE";
-
-}
-
-define('IMAGE_INFO_TABLE', $IMAGE_INFO_TABLE);
-define('DEPLOYMENT_INFO_TABLE', $DEPLOYMENT_INFO_TABLE);
-define('KERNEL_INFO_TABLE', $KERNEL_INFO_TABLE);
-define('RESOURCE_INFO_TABLE', $RESOURCE_INFO_TABLE);
-define('EVENT_INFO_TABLE', $EVENT_INFO_TABLE);
-define('USER_INFO_TABLE', $USER_INFO_TABLE);
-define('APPLIANCE_INFO_TABLE', $APPLIANCE_INFO_TABLE);
-define('VIRTUALIZATION_INFO_TABLE', $VIRTUALIZATION_INFO_TABLE);
-define('IMAGE_AUTHENTICATION_TABLE', $IMAGE_AUTHENTICATION_TABLE);
-define('STORAGE_INFO_TABLE', $STORAGE_INFO_TABLE);
-
-global $KERNEL_INFO_TABLE, $IMAGE_INFO_TABLE, $RESOURCE_INFO_TABLE, $EVENT_INFO_TABLE, $USER_INFO_TABLE, $DEPLOYMENT_INFO_TABLE, $APPLIANCE_INFO_TABLE, $STORAGE_INFO_TABLE, $VIRTUALIZATION_INFO_TABLE, $IMAGE_AUTHENTICATION_TABLE;
-
-
-// returns a db-connection
-function openqrm_get_db_connection() {
-	$openqrm_db = new openqrm_db();
-	return $openqrm_db;
-}
-
-
-
-class openqrm_db {
-
-	function __construct() {
-		// to get lowercase column name form e.g. oracle
-		global $OPENQRM_DATABASE_TYPE;
-		global $OPENQRM_DATABASE_SERVER;
-		global $OPENQRM_DATABASE_NAME;
-		global $OPENQRM_DATABASE_USER;
-		global $OPENQRM_DATABASE_PASSWORD;
-
-		if ("$OPENQRM_DATABASE_TYPE" == "db2") {
-			$db = ADONewConnection('odbc');
-			$db->PConnect($OPENQRM_DATABASE_NAME,$OPENQRM_DATABASE_USER,$OPENQRM_DATABASE_PASSWORD);
-			$db->SetFetchMode(ADODB_FETCH_ASSOC);
-			return $db;
-
-		} else if ("$OPENQRM_DATABASE_TYPE" == "oracle") {
-			// we need to use the oci8po driver because it is the
-			// only oracle driver supporting to set the column-names to lowercase
-			// via define('ADODB_ASSOC_CASE',0);
-			$db = NewADOConnection("oci8po");
-			$db->Connect($OPENQRM_DATABASE_NAME, $OPENQRM_DATABASE_USER, $OPENQRM_DATABASE_PASSWORD);
-
-		} else {
-			// use mysqli connector for adodb
-			if ("$OPENQRM_DATABASE_TYPE" == "mysql") {
-				$OPENQRM_DATABASE_TYPE="mysqli";
-			}
-			if (strlen($OPENQRM_DATABASE_PASSWORD)) {
-				$dsn = "$OPENQRM_DATABASE_TYPE://$OPENQRM_DATABASE_USER:$OPENQRM_DATABASE_PASSWORD@$OPENQRM_DATABASE_SERVER/$OPENQRM_DATABASE_NAME?persist";
-			} else {
-				$dsn = "$OPENQRM_DATABASE_TYPE://$OPENQRM_DATABASE_USER@$OPENQRM_DATABASE_SERVER/$OPENQRM_DATABASE_NAME?persist";
-			}
-		$db = ADONewConnection($dsn);
-#		$db = adoNewConnection($dsn);
-		}
-
-		// to get the column names in the resulting array
-		$db->SetFetchMode(ADODB_FETCH_ASSOC);
-		$this->db = $db;
-
-		$this->ha = false;
-
-	}
-
-
-
-
-	function get_ha_db() {
-		// to get lowercase column name form e.g. oracle
-		global $OPENQRM_DATABASE_TYPE;
-		global $OPENQRM_DATABASE_SERVER;
-		global $OPENQRM_DATABASE_NAME;
-		global $OPENQRM_DATABASE_USER;
-		global $OPENQRM_DATABASE_PASSWORD;
-
-
-// DEBUG
-
-$OPENQRM_HA_DATABASE_SERVER = "192.168.88.249";
-
-
-		if ("$OPENQRM_DATABASE_TYPE" == "db2") {
-			$ha_db = ADONewConnection('odbc');
-			$ha_db->PConnect($OPENQRM_DATABASE_NAME,$OPENQRM_DATABASE_USER,$OPENQRM_DATABASE_PASSWORD);
-			$ha_db->SetFetchMode(ADODB_FETCH_ASSOC);
-			return $ha_db;
-
-		} else if ("$OPENQRM_DATABASE_TYPE" == "oracle") {
-			// we need to use the oci8po driver because it is the
-			// only oracle driver supporting to set the column-names to lowercase
-			// via define('ADODB_ASSOC_CASE',0);
-			$ha_db = NewADOConnection("oci8po");
-			$ha_db->Connect($OPENQRM_DATABASE_NAME, $OPENQRM_DATABASE_USER, $OPENQRM_DATABASE_PASSWORD);
-
-		} else {
-			if (strlen($OPENQRM_DATABASE_PASSWORD)) {
-				$ha_dsn = "$OPENQRM_DATABASE_TYPE://$OPENQRM_DATABASE_USER:$OPENQRM_DATABASE_PASSWORD@$OPENQRM_HA_DATABASE_SERVER/openqrm?persist";
-			} else {
-				$ha_dsn = "$OPENQRM_DATABASE_TYPE://$OPENQRM_DATABASE_USER@$OPENQRM_HA_DATABASE_SERVER/openqrm?persist";
-			}
-		$ha_db = ADONewConnection($ha_dsn);
-		}
-
-		// to get the column names in the resulting array
-		$ha_db->SetFetchMode(ADODB_FETCH_ASSOC);
-		return $ha_db;
-	}
-
-
-
-
-
-
-	function GetAll($sql) {
-		return $this->db->GetAll($sql);
-	}
-
-	function SelectLimit($sql, $limit = NULL, $offset = NULL) {
-		return $this->db->SelectLimit($sql, $limit, $offset);
-	}
-
-	function SetFetchMode($mode) {
-		$this->db->SetFetchMode($mode);
-	}
-
-
-
-	function Execute($sql) {
-		$ret = $this->db->Execute($sql);
-		if ($this->ha) {
-			$ha_db = $this->get_ha_db();
-			$ha_db->Execute($sql);
-		}
-		return $ret;
-	}
-
-	function AutoExecute($table, $fields, $mode, $clause = NULL) {
-		if (isset($clause)) {
-			$ret = $this->db->AutoExecute($table, $fields, $mode, $clause);
-			if ($this->ha) {
-				$ha_db = $this->get_ha_db();
-				$ha_db->AutoExecute($table, $fields, $mode, $clause);
-			}
-			return $ret;
-		} else {
-			$ret = $this->db->AutoExecute($table, $fields, $mode);
-			if ($this->ha) {
-				$ha_db = $this->get_ha_db();
-				$ha_db->AutoExecute($table, $fields, $mode);
-			}
-			return $ret;
-		}
-	}
-
-
-	function Close() {
-		$this->db->Close();
-	}
-
-
-	function ErrorMsg() {
-		$this->db->ErrorMsg();
-	}
-
-}
-
-
-
-
-
-
-
-
-// function to print arrays
-function print_array($item, $key) {
-	if (!is_int($key)) {
-		echo "$key=\"$item\"\n";
-	}
-}
-
-//-----------------------------------------------------------------------------------
-function openqrm_db_get_free_id($fieldname, $tablename) {
-
-	$db=openqrm_get_db_connection();
-	$recordSet = $db->Execute("select $fieldname from $tablename");
-	if (!$recordSet)
-		print $db->ErrorMsg();
-	else {
-		$ar_ids = array();
-
-		while ($arr = $recordSet->FetchRow()) {
-		foreach($arr as $val) {
-			$ar_ids[] = $val;
-		}
-		}
-
-		$i=1;
-		while($i > 0) {
-			if(in_array($i, $ar_ids) == false) {
-				return $i;
-				break;
-			}
-		 $i++;
-		}
-	}
-	$db->Close();
-}
-//-----------------------------------------------------------------------------------
-function openqrm_db_get_result($query) {
-	$ar = array();
-	$db = openqrm_get_db_connection();
-	$db->SetFetchMode(ADODB_FETCH_ASSOC);
-	$result = $db->Execute($query);
-	if(is_object($result)) {
-		while ($arr = $result->FetchRow()) {
-			$tmp = array();
-			foreach ($arr as $key=>$val) {
-				if(is_string($key)) {
-					$tmp[] = array("value" => $val, "label" => $key);
-				}
-			}
-			$ar[] = $tmp;
-		}
-	}
-	return $ar;
-}
-//-----------------------------------------------------------------------------------
-function openqrm_db_get_result_single ($query) {
-	$result = openqrm_db_get_result($query);
-	if(isset($result[0][0]["value"])) {
-		return array("value" => $result[0][0]["value"], "label" => $result[0][0]["label"]);
-	}
-}
-//-----------------------------------------------------------------------------------
-function openqrm_db_get_result_double ($query) {
-	$ar_Return = array();
-	$result = openqrm_db_get_result($query);
-	foreach ( $result as $res) {
-		$ar_Return[] = array("value" => $res[0]["value"], "label" => $res[1]["value"]);
-	}
-	return $ar_Return;
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/include/openqrm-server-config.php b/openQRM-5.3.50-CE/src/web/base/include/openqrm-server-config.php
deleted file mode 100644
index e17268b..0000000
--- a/openQRM-5.3.50-CE/src/web/base/include/openqrm-server-config.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-if ((file_exists("/etc/init.d/openqrm")) && (is_link("/etc/init.d/openqrm"))) {
-	$OPENQRM_BASE_DIR=dirname(dirname(dirname(dirname(readlink("/etc/init.d/openqrm")))));
-} else {
-	$OPENQRM_BASE_DIR="/usr/share";
-}
-$OPENQRM_SERVER_CONFIG_FILE="$OPENQRM_BASE_DIR/openqrm/etc/openqrm-server.conf";
-
-
-// function to get infos from the openqrm-server.conf
-function openqrm_parse_conf ( $filepath ) {
-	$ini = file( $filepath );
-	if ( count( $ini ) == 0 ) { return array(); }
-	$sections = array();
-	$values = array();
-	$globals = array();
-	$i = 0;
-	foreach( $ini as $line ){
-		$line = trim( $line );
-		// Comments
-		if ( $line == '' || $line[0] != 'O' ) { continue; }
-		// Key-value pair
-		list( $key, $value ) = explode( '=', $line, 2 );
-		$key = trim( $key );
-		$value = trim( $value );
-		$value = str_replace("\"", "", $value );
-		$globals[ $key ] = $value;
-	}
-	return $globals;
-}
-
-
-$store = openqrm_parse_conf($OPENQRM_SERVER_CONFIG_FILE);
-extract($store);
-global $OPENQRM_SERVER_CONFIG_FILE;
-
diff --git a/openQRM-5.3.50-CE/src/web/base/include/requestfilter.inc.php b/openQRM-5.3.50-CE/src/web/base/include/requestfilter.inc.php
deleted file mode 100644
index 9d767b9..0000000
--- a/openQRM-5.3.50-CE/src/web/base/include/requestfilter.inc.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-// global filter for all html requests
-$requestfilter = 	array (
-	array ( 'pattern' => '/(&#*\w+)[\x00-\x20]+;/u', 'replace' => '$1;'),
-	array ( 'pattern' => '/(&#x*[0-9A-F]+);*/iu', 'replace' => '$1;'),
-	// Remove any attribute starting with "on" or xmlns
-	array ( 'pattern' => '#(<[^>]+?[\x00-\x20"\'])(?:on|xmlns)[^>]*+>#iu', 'replace' => '$1>'),
-	// Remove javascript: and vbscript: protocols
-	array ( 'pattern' => '#([a-z]*)[\x00-\x20]*=[\x00-\x20]*([`\'"]*)[\x00-\x20]*j[\x00-\x20]*a[\x00-\x20]*v[\x00-\x20]*a[\x00-\x20]*s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:#iu', 'replace' => '$1=$2nojavascript...'),
-	array ( 'pattern' => '#([a-z]*)[\x00-\x20]*=([\'"]*)[\x00-\x20]*v[\x00-\x20]*b[\x00-\x20]*s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:#iu', 'replace' => '$1=$2novbscript...'),
-	array ( 'pattern' => '#([a-z]*)[\x00-\x20]*=([\'"]*)[\x00-\x20]*-moz-binding[\x00-\x20]*:#u', 'replace' => '$1=$2nomozbinding...'),
-	// Only works in IE: <span style="width: expression(alert('Ping!'));"></span>
-	array ( 'pattern' => '#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?expression[\x00-\x20]*\([^>]*+>#i', 'replace' => '$1>'),
-	array ( 'pattern' => '#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?behaviour[\x00-\x20]*\([^>]*+>#i', 'replace' => '$1>'),
-	array ( 'pattern' => '#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:*[^>]*+>#iu', 'replace' => '$1>'),
-	// Remove namespaced elements (we do not need them)
-	array ( 'pattern' => '#</*\w+:\w[^>]*+>#i', 'replace' => ''),
-	// Remove really unwanted tags
-	array ( 'pattern' => '#</*(?:applet|b(?:ase|gsound|link)|embed|frame(?:set)?|i(?:frame|layer)|l(?:ayer|ink)|meta|object|s(?:cript|tyle)|title|xml|a)[^>]*+>#i', 'replace' => '')
-);
diff --git a/openQRM-5.3.50-CE/src/web/base/include/user.inc.php b/openQRM-5.3.50-CE/src/web/base/include/user.inc.php
deleted file mode 100644
index 51ef5a6..0000000
--- a/openQRM-5.3.50-CE/src/web/base/include/user.inc.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once( $RootDir.'/include/openqrm-database-functions.php');
-global $USER_INFO_TABLE;
-
-require_once( $RootDir.'/class/user.class.php');
-require_once ($RootDir.'/class/event.class.php');
-
-function set_env() {
-	// auth user
-	if (isset($_SERVER['PHP_AUTH_USER'])) {
-		$OPENQRM_USER = new user($_SERVER['PHP_AUTH_USER']);
-		if ($OPENQRM_USER->check_user_exists()) {
-			$OPENQRM_USER->set_user();
-			$GLOBALS['OPENQRM_USER'] = $OPENQRM_USER;
-			define('OPENQRM_USER_NAME', $OPENQRM_USER->name);
-			define('OPENQRM_USER_ROLE_NAME', $OPENQRM_USER->role);
-		}
-	}
-	// admin user for running commands
-	$OPENQRM_ADMIN = new user('openqrm');
-	$OPENQRM_ADMIN->set_user();
-	$GLOBALS['OPENQRM_ADMIN'] = $OPENQRM_ADMIN;
-}
-
-set_env();
-
diff --git a/openQRM-5.3.50-CE/src/web/base/index.php b/openQRM-5.3.50-CE/src/web/base/index.php
deleted file mode 100644
index 7b7140d..0000000
--- a/openQRM-5.3.50-CE/src/web/base/index.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//$ti = microtime(true);
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/class/openqrm.controller.class.php";
-if (!file_exists('unconfigured')) {
-	require_once($RootDir.'/include/user.inc.php');
-}
-$action = new openqrm_controller();
-$output = $action->action();
-echo $output->get_string();
-
-//if(function_exists('memory_get_peak_usage')) {
-//	$memory = memory_get_peak_usage(false);
-//}
-//echo 'memory: '.$memory.' byte<br>';
-//$ti = (microtime(true) - $ti);
-//echo 'time: '.$ti.' sec';
diff --git a/openQRM-5.3.50-CE/src/web/base/js/helpers.js b/openQRM-5.3.50-CE/src/web/base/js/helpers.js
deleted file mode 100644
index 933bc82..0000000
--- a/openQRM-5.3.50-CE/src/web/base/js/helpers.js
+++ /dev/null
@@ -1,378 +0,0 @@
-/**
- * Get Browser Infos
- * 
- */
-var BrowserInfo = {
-	swfVersion : function() {
-		var isIE    = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
-		var isWin   = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;
-		var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;
-		var version = "false";	
-		if (navigator.plugins != null && navigator.plugins.length > 0) {
-			if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
-				var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
-				var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
-				var descArray = flashDescription.split(" ");
-				var tempArrayMajor = descArray[2].split(".");			
-				var vMa = tempArrayMajor[0];
-				var vMin = tempArrayMajor[1];
-				var vRev = descArray[3];
-				if (vRev == "") {
-					vRev = descArray[4];
-				}
-				if (vRev[0] == "d") {
-					vRev = vRev.substring(1);
-				} else if (vRev[0] == "r") {
-					vRev = vRev.substring(1);
-					if (vRev.indexOf("d") > 0) {
-						vRev = vRev.substring(0, vRev.indexOf("d"));
-					}
-				}
-				version = vMa + "," + vMin + "," + vRev;
-			}
-		}
-		else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) version = 4;
-		else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) version = 3;
-		else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) version = 2;
-		else if (isIE && isWin && !isOpera) {
-			try {
-				axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
-				version = axo.GetVariable("$version");
-			} catch (e) {}
-			if (!version)
-			{
-				try {
-					axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");			
-					version = "WIN 6,0,21,0";
-					axo.AllowScriptAccess = "always";
-					version = axo.GetVariable("$version");
-				} catch (e) {}
-			}
-			if (!version)
-			{
-				try {
-					axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-					version = axo.GetVariable("$version");
-				} catch (e) {}
-			}
-			if (!version)
-			{
-				try {
-					axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-					version = "WIN 3,0,18,0";
-				} catch (e) {}
-			}
-			if (!version)
-			{
-				try {
-					axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
-					version = "WIN 2,0,0,11";
-				} catch (e) { version = "false"; }
-			}	
-		}
-		version = version.replace(/[a-z ]/gi, ''); 
-		version = version.replace(/,/g, '.'); 
-		return version;
-	},
-	info : function() {
-		info = {
-			CODENAME   : navigator.appCodeName,
-			APPNAME    : navigator.appName,
-			VERSION    : navigator.appVersion,
-			COOKIES    : navigator.cookieEnabled,
-			LANGUAGE   : navigator.language,
-			PLATFORM   : navigator.platform,
-			USERAGENT  : navigator.userAgent,
-			WxH        : screen.width +" x "+ screen.height,
-			COLORDEPTH : screen.colorDepth,
-			FLASH      : this.swfVersion()
-		}
-		return info;
-	}
-};
-
-/**
- * Drag functions
- * 
- */
-var Drag = {
-
-	obj : null,
-	init : function(o, oRoot, minX, maxX, minY, maxY, bSwapHorzRef, bSwapVertRef, fXMapper, fYMapper)
-	{
-		o.onmousedown	= Drag.start;        
-		o.hmode			= bSwapHorzRef ? false : true ;
-		o.vmode			= bSwapVertRef ? false : true ;
-		o.root = oRoot && oRoot != null ? oRoot : o ;
-
-		if (o.hmode  && isNaN(parseInt(o.root.style.left  ))) o.root.style.left   = "0px";
-		if (o.vmode  && isNaN(parseInt(o.root.style.top   ))) o.root.style.top    = "0px";
-		if (!o.hmode && isNaN(parseInt(o.root.style.right ))) o.root.style.right  = "0px";
-		if (!o.vmode && isNaN(parseInt(o.root.style.bottom))) o.root.style.bottom = "0px";
-
-		o.minX	= typeof minX != 'undefined' ? minX : 0;
-		o.minY	= typeof minY != 'undefined' ? minY : 0;
-		o.maxX	= typeof maxX != 'undefined' ? maxX : null;
-		o.maxY	= typeof maxY != 'undefined' ? maxY : null;
-
-		o.xMapper = fXMapper ? fXMapper : null;
-		o.yMapper = fYMapper ? fYMapper : null;
-
-		o.root.onDragStart	= new Function();
-		o.root.onDragEnd	= new Function();
-		o.root.onDrag		= new Function();
-	},
-
-	start : function(e)
-	{
-		var o = Drag.obj = this;
-		e = Drag.fixE(e);
-		var y = parseInt(o.vmode ? o.root.style.top  : o.root.style.bottom);
-		var x = parseInt(o.hmode ? o.root.style.left : o.root.style.right );
-		o.root.onDragStart(x, y);
-
-		o.lastMouseX	= e.clientX;
-		o.lastMouseY	= e.clientY;
-
-		if (o.hmode) {
-			if (o.minX != null)	o.minMouseX	= e.clientX - x + o.minX;
-			if (o.maxX != null)	o.maxMouseX	= o.minMouseX + o.maxX - o.minX;
-		} else {
-			if (o.minX != null) o.maxMouseX = -o.minX + e.clientX + x;
-			if (o.maxX != null) o.minMouseX = -o.maxX + e.clientX + x;
-		}
-
-		if (o.vmode) {
-			if (o.minY != null)	o.minMouseY	= e.clientY - y + o.minY;
-			if (o.maxY != null)	o.maxMouseY	= o.minMouseY + o.maxY - o.minY;
-		} else {
-			if (o.minY != null) o.maxMouseY = -o.minY + e.clientY + y;
-			if (o.maxY != null) o.minMouseY = -o.maxY + e.clientY + y;
-		}
-
-		document.onmousemove	= Drag.drag;
-		document.onmouseup		= Drag.end;
-
-		return false;
-	},
-
-	drag : function(e)
-	{
-		e = Drag.fixE(e);
-		var o = Drag.obj;
-
-		var ey	= e.clientY;
-		var ex	= e.clientX;
-		var y = parseInt(o.vmode ? o.root.style.top  : o.root.style.bottom);
-		var x = parseInt(o.hmode ? o.root.style.left : o.root.style.right );
-		var nx, ny;
-
-		if (o.minX != null) ex = o.hmode ? Math.max(ex, o.minMouseX) : Math.min(ex, o.maxMouseX);
-		if (o.maxX != null) ex = o.hmode ? Math.min(ex, o.maxMouseX) : Math.max(ex, o.minMouseX);
-		if (o.minY != null) ey = o.vmode ? Math.max(ey, o.minMouseY) : Math.min(ey, o.maxMouseY);
-		if (o.maxY != null) ey = o.vmode ? Math.min(ey, o.maxMouseY) : Math.max(ey, o.minMouseY);
-
-		nx = x + ((ex - o.lastMouseX) * (o.hmode ? 1 : -1));
-		ny = y + ((ey - o.lastMouseY) * (o.vmode ? 1 : -1));
-
-		if (o.xMapper)		nx = o.xMapper(y)
-		else if (o.yMapper)	ny = o.yMapper(x)
-
-		Drag.obj.root.style[o.hmode ? "left" : "right"] = nx + "px";
-		Drag.obj.root.style[o.vmode ? "top" : "bottom"] = ny + "px";
-		Drag.obj.lastMouseX	= ex;
-		Drag.obj.lastMouseY	= ey;
-
-		Drag.obj.root.onDrag(nx, ny);
-		return false;
-	},
-
-	end : function()
-	{
-		document.onmousemove = null;
-		document.onmouseup   = null;
-		Drag.obj.root.onDragEnd(	parseInt(Drag.obj.root.style[Drag.obj.hmode ? "left" : "right"]), 
-									parseInt(Drag.obj.root.style[Drag.obj.vmode ? "top" : "bottom"]));
-		Drag.obj = null;
-	},
-
-	fixE : function(e)
-	{
-		if (typeof e == 'undefined') e = window.event;
-		if (typeof e.layerX == 'undefined') e.layerX = e.offsetX;
-		if (typeof e.layerY == 'undefined') e.layerY = e.offsetY;
-		return e;
-	}
-};
-
-/**
- * Get current mouse position
- * 
- */
-var MousePosition = {	
-	init : function ()
-	{
-		this.x = '';
-		this.y = '';
-		this.MicrosoftModel = 0;
-		if (document.all){
-			this.MicrosoftModel  = 1;
-			document.onmousemove = this.capture;
-		}
-		if (!(this.MicrosoftModel)){
-			if (typeof(document.addEventListener) == "function"){
-				document.addEventListener("mousemove", this.capture, true);
-			} else if (document.runner){
-		  		window.captureEvents(Event.MOUSEMOVE);
-		 		window.onmousemove = this.capture;
-			}
-		}
-	},
-	capture : function( event ){
-		if (!event){  event = window.event; }
-		if (typeof(event)!="object") return;
-		if (document.all){
-			x = event.clientX;
-			y = event.clientY + document.documentElement.scrollTop;
-		} else {
-			x = event.pageX;
-			y = event.pageY;
-		}
-		MousePosition.x = x;
-		MousePosition.y = y;
-	},
-	get : function (){
-		return { x: this.x, y: this.y };
-	}
-};
-
-/**
- * Get window size
- * 
- */
-var WindowSize = function() {
-	height = "";
-	if(window.innerHeight != "undefined") {
-		height = window.innerHeight;
-	}
-	if(document.body.clientHeight != "undefined") {
-		height = document.body.clientHeight;
-	}
-	if(document.documentElement.clientHeight != "undefined") {
-		height = document.documentElement.clientHeight;
-	}
-
-	width = "";
-	if(window.innerWidth != "undefined") {
-		width = window.innerWidth;
-	}
-	if(document.body.clientWidth != "undefined") {
-		width = document.body.clientWidth;
-	}
-	if(document.documentElement.clientWidth != "undefined") {
-		width = document.documentElement.clientWidth;
-	}
-
-	return { height: height, width: width };
-};
-
-/**
- * Get or Set Selection or Insert at Selection of an element
- * 
- */
-var SelectionRange = {
-
-	get : function(element){
-		if(window.getSelection) {
-			start = element.selectionStart;
-			end   = element.selectionEnd;
-		}
-		else if( document.selection ){
-			// current selection
-			range = document.selection.createRange();
-			// use this as a 'dummy'
-			stored_range = range.duplicate();
-			// select all text
-			stored_range.moveToElementText( element );
-			// move 'dummy' end point to end point of original range
-			stored_range.setEndPoint( 'EndToEnd', range );
-			// calculate start and end points
-			start = parseInt(stored_range.text.length) - parseInt(range.text.length);
-			end   = parseInt(start) + parseInt(range.text.length);
-		}
-		return {start: start, end: end};
-	},
-
-	set : function(element, start, end){
-		if (element.setSelectionRange) {
-			element.focus();
-			element.setSelectionRange(start, end);
-		}
-		else if (element.createTextRange) {
-			range = element.createTextRange();
-			start = element.value.substring(0, start).replace(/\r/g,"");
-			end   = element.value.substring(0, end).replace(/\r/g,"");
-			range.collapse(true);
-			range.moveEnd('character', end.length);
-			range.moveStart('character', start.length);
-			range.select();
-		}
-	},
-
-	insert : function(element, content){
-		st  = element.scrollTop;
-		sl  = element.scrollLeft;
-		sel = this.get(element);
-		element.value = element.value.substring(0, sel.start) + content + element.value.substring(sel.end, element.value.length);
-		this.set(element,  parseInt(sel.start) + parseInt(content.length), parseInt(sel.start) + parseInt(content.length));
-		element.scrollTop  = st;
-		element.scrollLeft = sl;
-	}
-
-};
-
-/**
- * Parse object attributes
- *
- *
- */
-function objects(obj) {
-	val = new Array();
-	i = 0;
-	for (var attrib in obj) {
-		val[i] = attrib + ' : ' + obj[attrib];
-		i = i+1;
-	}
-	val.sort();
-	alert(val.join(", "));
-}
-
-/**
- * Generate Password
- */
-function GeneratePassword() {
-	var password = "";
-	var password_characters = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-	var one_random_char;
-	for (j=0; j<8; j++) {
-		one_random_char = password_characters.charAt(Math.floor(Math.random()*password_characters.length));
-		password += one_random_char;
-	}
-	return password;
-}
-
-/**
- * Temporary for compatibility reasons
- */
-function wait() {
-	var element = $('<div>').attr('data-message', jstranslation['please_wait']);
-	openqrm.wait(element, '');
-}
-
-function cancel() {
-	var element = $('<div>').attr('data-message', jstranslation['please_wait']);
-	openqrm.wait(element, '');
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/web/base/js/openqrm-progressbar.js b/openQRM-5.3.50-CE/src/web/base/js/openqrm-progressbar.js
deleted file mode 100644
index 8b83645..0000000
--- a/openQRM-5.3.50-CE/src/web/base/js/openqrm-progressbar.js
+++ /dev/null
@@ -1,35 +0,0 @@
-<script type="text/javascript">
-function trigger_progress_{id}() {
-	$("#progressbar_{id}").progressbar({});
-	$.ajax({
-		url: "{url}",
-		dataType: "text",
-		error: function(response) {
-			if($("#progressbar_{id}").html == '') {
-				setTimeout("trigger_progress_{id}()", 1000);
-			}
-		},
-		success: function(response) {
-			var no = parseInt(response);
-			if (no < 0) { no = 0; }
-			$("#progressbar_{id}").progressbar("option", "value", no);
-			if (no < 100) {
-				$("#watcher_{id}").html("&nbsp;&nbsp;<small>" + response + "% - {lang_in_progress}</small>");
-				setTimeout("trigger_progress_{id}()", 1000);
-			} else {
-				if(no == 100) {
-					$("#watcher_{id}").html("&nbsp;<small>100 % - {lang_finished}</small>");
-				} else {
-					setTimeout("trigger_progress_{id}()", 1000);
-				}
-			}	
-		}
-	});
-}
-trigger_progress_{id}();
-</script>
-<div class="progress_bar">
-	<div id="progressbar_{id}"></div>
-</div>
-<div id="watcher_{id}" class="progress_watcher">{lang_in_progress}</div>
-
diff --git a/openQRM-5.3.50-CE/src/web/base/js/openqrm-ui.js b/openQRM-5.3.50-CE/src/web/base/js/openqrm-ui.js
deleted file mode 100644
index 738c5b1..0000000
--- a/openQRM-5.3.50-CE/src/web/base/js/openqrm-ui.js
+++ /dev/null
@@ -1,414 +0,0 @@
-/**
- * This file contains misc openqrm UI javascript methods
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
- 
- 
-
-
-$.extend({
-    error: function( msg ) { throw msg; },
-    parseJSON: function( data ) {
-        if ( typeof data !== "string" || !data ) {
-            return null;
-        }    
-        data = jQuery.trim( data );    
-        if ( /^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
-            .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
-            .replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) {    
-            return window.JSON && window.JSON.parse ?
-                window.JSON.parse( data ) :
-                (new Function("return " + data))();    
-        } else {
-            jQuery.error( "Invalid JSON: " + data );
-        }
-    }
-});
-
-
-/**
-	List of global 'a' tag classes and their icon class
-	(see glyphicons-halflings @ http://www.glyphicons.com)
-	used for action-buttons.	
-*/
-var actionButtons = {
-	'a.add'		: 'plus-sign',
-	'a.edit'	: 'edit',
-	'a.manage'	: 'cog',
-	'a.resize'	: 'resize-full',
-	'a.details'	: 'search',
-	'a.remove'	: 'minus-sign',
-	'a.console'	: 'dashboard',
-	'a.snap'	: 'camera',
-	'a.migrate'	: 'arrow-right',
-	'a.clone'	: 'export',
-	'a.graphs'	: 'signal',
-	'a.stop'	: 'stop',
-	'a.start'	: 'play',
-	'a.enable'	: 'plus',
-	'a.disable'	: 'minus'
-};
-
-
-$(document).ready(function(){
-
-	// move error-event/active-event info from header to events menu item
-	//$('#Event_box').addClass('pull-right').appendTo('#menu1_9');
-	//$('#Event_active_box').addClass('pull-right').attr('style','display: none; margin-right:3px').appendTo('#menu1_9');
-
-	// add icon to menu section headers
-	$('#menu1_1').prepend( $('<span>').addClass('glyphicons global').prepend($('<i>')) );
-	$('#menu2_1').prepend( $('<span>').addClass('glyphicons show_big_thumbnails').prepend($('<i>'))	);
-	$('#menuSection_queue_1').prepend( $('<span>').addClass('glyphicons inbox_in').prepend($('<i>')) );
-		
-	// prepare actionButton links
-	$.each(actionButtons, function(key, value) {
-		$(key).prepend(
-			$('<span>').addClass('halflings-icon  white ' + value).prepend($('<i>'))
-		);
-	});
-	
-	// remove attribute 'style' from .pageturn_head a .pageturn_bottom a
-	$('.pageturn_head a[style="visibility:hidden;"]').addClass('disabled').removeAttr('style');
-	$('.pageturn_bottom a[style="visibility:hidden;"]').addClass('disabled').removeAttr('style');
-	
-	// find .disabled elements and remove href and onlick attributes
-	$('a.disabled').removeAttr('href').removeAttr('onclick').attr("disabled", "disabled");
-	
-	// add openqrm.wait event to listed elements
-	// list of interface elements that should trigger the openqrm.wait() function
-	var waitElements = [
-		'input.submit',
-		'a.edit',
-		'a.manage',
-		'.htmlobject_tabs li span a',
-		'.pageturn_head a:not(.disabled)',
-		'.pageturn_bottom a:not(.disabled)',
-		'.actiontable input',
-		'a.refresh'
-	];
-	
-	// attach wait function to list elements
-	$.each(waitElements, function(k, v) {
-		$(v).attr('data-message', jstranslation['please_wait']);
-		$(v).click(function() { openqrm.wait(v ,'') } );
-	});
-	
-	// attach namegen button to element
-	var namegen = $('<input>');
-	$(namegen).attr('type', 'button');
-	$(namegen).attr('class', 'namegenButton');
-	$(namegen).attr('tabindex', '-1');
-	$(namegen).attr('value', jstranslation['generate_name']);
-	$(namegen).click(function() {
-		openqrm.generateUniqueName($('input.namegen').attr('data-prefix'), $('input.namegen'), $('input.namegen').attr('data-length'));
-		return false;
-	});
-	$('input.namegen').after(namegen);
-
-	// htmlobjects_tablebuilder
-	$('select.sort').attr('data-message', jstranslation['please_wait']);
-	$('select.sort').change(function() { openqrm.wait(this ,''); this.form.submit(); } );
-	$('select.order').attr('data-message',  jstranslation['please_wait']);
-	$('select.order').change(function() { openqrm.wait(this ,''); this.form.submit(); } );
-	$('select.limit').attr('data-message',  jstranslation['please_wait']);
-	$('select.limit').change(function() { openqrm.wait(this ,''); this.form.submit(); } );
-
-	// menu
-	$.each($('a.phplmselected'), function(k, v) {
-		t = $(v).attr('target');
-		if(t != '_blank') {
-			$(v).attr('data-message', jstranslation['please_wait']);
-			$(v).click(function() { openqrm.wait(v ,'') } );
-		}
-	});
-	$.each($('a.phplm'), function(k, v) {
-		t = $(v).attr('target');
-		if(t != '_blank') {
-			$(v).attr('data-message', jstranslation['please_wait']);
-			$(v).click(function() { openqrm.wait(v ,'') } );
-		}
-	});
-
-});
-
-/* global openqrm interface methods */
-openqrm = {
-
-	wait : function(element, msg) {
-	
-		// TODO: after updating jquery we should use the 'data' method
-		if($(element).attr('data-message') != 'undefined') {
-			msg = $(element).attr('data-message');
-		}
-
-		// create transparent background overlay
-		$('body').prepend( 
-			$('<div>').attr('class','modal-overlay')
-		);
-		
-		// create content box with message
-		$('body').prepend(
-			$('<div>')
-				.attr('class', 'modal-box lead')
-				.append(
-					$('<p>').html(msg)
-				)
-				/*
-				.append(
-					$('<img>').attr({'src':'/openqrm/base/img/ajax-loader.gif','class':'ajax-loader'})
-				)
-				*/
-		);
-
-		// center content box on screen
-		$('.modal-box').css({
-			left: (($(window).width() - $('.modal-box').outerWidth())/2),
-			top: (($(window).height() - $('.modal-box').outerHeight())/2)
-		});
-	},
-	
-	/* Global generate names method
-		prefix:         string prefix to generate unique string
-		element:        input element that should be filled with generated string
-		length:         length of unique string
-	*/
-	generateUniqueName : function (prefix, element, length) {
-		if(!length) {
-			length = 10;
-		}
-		var name = "";
-		var name_characters = "123456789"; // don't use 0 because of openvz
-		var one_random_char;
-		for (j=0; j < length; j++) {
-			one_random_char = name_characters.charAt( Math.floor( Math.random() * name_characters.length ) );
-			name += one_random_char;
-		}
-		$(element).attr('value', prefix + name);
-	},
-	
-	/* Format date helper.
-		Usage:	openqrm.formatDate([timestamp], '%Y-%M-%d')
-		date:	unix timestamp
-		fmt:	format string
-	*/
-	formatDate : function(date, fmt) {
-	    function pad(value) {
-	        return (value.toString().length < 2) ? '0' + value : value;
-	    }
-	    return fmt.replace(/%([a-zA-Z])/g, function (_, fmtCode) {
-	        switch (fmtCode) {
-	        case 'Y':
-	            return date.getFullYear();
-	        case 'M':
-	            return pad(date.getMonth() + 1);
-	        case 'd':
-	            return pad(date.getDate());
-	        case 'H':
-	            return pad(date.getHours());
-	        case 'm':
-	            return pad(date.getMinutes());
-	        case 's':
-	            return pad(date.getSeconds());
-	        default:
-	            throw new Error('Unsupported format code: ' + fmtCode);
-	        }
-	    });
-	},
-	
-	/* Crop text helper. Appends '...' to returned text if it was cropped.
-	   text:	the text that should be cropped
-	   length:	number of characters
-	*/
-	crop : function(text, length) {
-		return (text.length > length) ? text.substring(0, length) + '...' : text;
-	},
-	
-	
-	getEventStatus : function(event_priority) {
-		var status;
-		switch (parseInt(event_priority)) {
-			/*
-			case 0: $icon = "off.png"; 	break;
-			case 1: $icon = "error.png"; break;
-			case 2: $icon = "error.png"; break;
-			case 3:	$icon = "error.png"; break;
-			case 4:	$icon = "unknown.png"; break;
-			case 5:	$icon = "active.png"; break;
-			case 6:	$icon = "idle.png"; break;
-			case 7:	$icon = "idle.png"; break;
-			case 8:	$icon = "idle.png"; break;
-			case 9:	$icon = "transition.png"; break;
-			case 10:$icon = "active.png"; break;
-			*/
-			
-			case 0: 	
-				status = 'disabled';
-				break;
-			case 1: 
-			case 2: 
-			case 3:	
-				status = 'error';		// error event
-				break;
-			case 4:	
-			case 5:	
-			case 6:	
-			case 7:	
-			case 8:	
-				status = 'notice';		// undefined event
-				break;
-			case 9:	
-				status = 'running';		// active event
-				break;
-			case 10:
-				status = 'ok';			// notice event
-				break;
-			default:
-				status = 'undefined';
-				break;
-			
-		}
-
-		return status;
-	},
-
-	get_datacenter_status : function() {
-
-		var data = $.ajax({
-			url : "api.php?action=base&base=aa_server&controller=datacenter&datacenter_action=dc_status",
-			type: "POST",
-			cache: false,
-			async: false,
-			dataType: "text",
-			success : function () {}
-		}).responseText;
-		// TODO: Convert to json
-		return data.split(',');
-	},
-	
-	get_datacenter_load : function() {
-	
-		var data = $.ajax({
-			url : "api.php?action=base&base=aa_server&controller=datacenter&datacenter_action=statistics",
-			type: "POST",
-			cache: false,
-			async: false,
-			dataType: "json",
-			success : function () { }
-		}).responseText;
-		var response = $.parseJSON(data);
-		return (response != null) ? response : false;
-	},	
-
-	get_event_list : function() {
-		var data = $.ajax({
-			url : "api.php?action=base&base=aa_server&controller=datacenter&datacenter_action=eventlist",
-			type: "POST",
-			cache: false,
-			async: false,
-			dataType: "json",
-			success : function () { }
-		}).responseText;
-		var response = $.parseJSON(data);
-		return (response != null) ? response : false;
-	},
-	
-	get_storage_list : function() {
-		var data = $.ajax({
-			url : "api.php?action=base&base=aa_server&controller=datacenter&datacenter_action=storage_list",
-			type: "POST",
-			cache: false,
-			async: false,
-			dataType: "json",
-			success : function () { }
-		}).responseText;
-		var response = $.parseJSON(data);
-		return (response != null) ? response : false;
-	},
-	
-	get_server_list : function() {
-	
-		var data = $.ajax({
-			url : "api.php?action=base&base=aa_server&controller=datacenter&datacenter_action=server_list",
-			type: "POST",
-			cache: false,
-			async: false,
-			dataType: "json",
-			success : function () { }
-		}).responseText;
-		var response = $.parseJSON(data);
-		return (response != null) ? response : false;
-	}
-
-};
-
-
-
-/**
-	method for resizing iframes depending on their content height
-*/
-var resizeFrame = {
-	set : function() {
-		h = '';
-		f = document.getElementById('MainFrame');
-		if(f.contentDocument && f.contentDocument.body.offsetHeight != "undefined") {
-			p = parseFloat(navigator.userAgent.substring(navigator.userAgent.indexOf("Firefox")).split("/")[1])>=0.1? 16 : 0
-			h = f.contentDocument.body.offsetHeight+p;
-		}
-		if(f.Document && f.Document.body.offsetHeight != "undefined") {
-			h = f.Document.body.offsetHeight;
-		}
-		f.height = h +20;
-	},
-	handlers : function() {
-		f = document.getElementById('MainFrame');
-		if (window.addEventListener) {
-			f.addEventListener("load", resizeFrame.set, false);
-		}
-		else if (window.attachEvent) {
-			f.attachEvent("onload", resizeFrame.set);
-		}
-		else {
-			f.onload = resizeFrame.set;
-		}
-	}
-};
-if(document.getElementById('MainFrame')) {
-	resizeFrame.handlers();
-}
-
-
-
-function Logout(element) {
-	path = window.location.protocol+"//dummy:dummy@"+window.location.host+""+window.location.pathname+'?'+Math.random()*11;
-	try{
-		var agt=navigator.userAgent.toLowerCase();
-		if (agt.indexOf("msie") != -1) {
-			// IE clear HTTP Authentication
-			document.execCommand("ClearAuthenticationCache");
-		} else {
-			var data = $.ajax({
-				url : path,
-				type: "POST",
-				cache: false,
-				async: false,
-				dataType: "text",
-				success : function () { }
-			}).responseText;
-		}
-		window.location.href = element.href;
-	} catch(e) { alert(e); }
-}
-
diff --git a/openQRM-5.3.50-CE/src/web/base/lang/de.file.handler.ini b/openQRM-5.3.50-CE/src/web/base/lang/de.file.handler.ini
deleted file mode 100644
index 4ff14ca..0000000
--- a/openQRM-5.3.50-CE/src/web/base/lang/de.file.handler.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-remove_error = "%s konnte nicht gelöscht werden"
-copy_error = "%s konnte nicht nach %s kopiert werden"
-filename_error = "Dateiname darf nur %s beinhalten"
-saved_error = "%s konnte nicht gespeichert werden"
-exists_error = "%s ist bereits vorhanden"
-file = "Datei"
-folder = "Verzeichnis"
-permission_denied = "Zugang verweigert"
-not_found = "Datei nicht gefunden"
diff --git a/openQRM-5.3.50-CE/src/web/base/lang/de.file.upload.ini b/openQRM-5.3.50-CE/src/web/base/lang/de.file.upload.ini
deleted file mode 100644
index 405bed5..0000000
--- a/openQRM-5.3.50-CE/src/web/base/lang/de.file.upload.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-400 = "Bad Request: Upload Datei nicht gesetzt"
-401 = "Unauthorized: Verzeichnis ist schreibgeschützt"
-403 = "Fehler: "
-404 = "Not Found: Verzeichnis nicht gefunden"
-406 = "Not Acceptable: Datei wurde nicht hochgeladen"
-500 = "Server Error: "
-[Server]
-1 = "Datei überschreitet upload_max_filesize"
-2 = "Datei überschreitet MAX_FILE_SIZE"
-3 = "Datei konnte nur teilweise hochgeladen werden"
-4 = "Keine Datei hochgeladen"
-6 = "Temporäres Verzeichnis nicht gefunden"
-7 = "Datei konnte nicht geschrieben werden"
-8 = "Dateiendung (Format) unzulässig"
diff --git a/openQRM-5.3.50-CE/src/web/base/lang/de.htmlobjects.ini b/openQRM-5.3.50-CE/src/web/base/lang/de.htmlobjects.ini
deleted file mode 100644
index 38758a8..0000000
--- a/openQRM-5.3.50-CE/src/web/base/lang/de.htmlobjects.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[table]
-button_refresh = "aktualisieren"
-label_sort = "sortieren nach"
-label_offset = "Offset"
-label_limit = "Limit"
-option_nolimit = "none"
-option_asc = "ASC"
-option_desc = "DESC"
-select_label = "Auswahl:"
-select_all = "alles"
-select_none = "nichts"
-select_invert = "invertiert"
-no_data = "Keine Daten vorhanden."
-
-[form]
-error_required = "%s darf nicht leer sein"
-required = "*"
-error_maxlength = "%s überschreitet Maximalgröße von %d"
-error_minlength = "%s unterschreitet Minimalgröße von %d"
-
-[response]
-submit = "absenden"
-cancel = "abbrechen"
-reset = "zurücksetzen"
-
diff --git a/openQRM-5.3.50-CE/src/web/base/lang/de.javascript.ini b/openQRM-5.3.50-CE/src/web/base/lang/de.javascript.ini
deleted file mode 100644
index d272e16..0000000
--- a/openQRM-5.3.50-CE/src/web/base/lang/de.javascript.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-please_wait = "Bitte warten ..."
-generate_name = "Namen generieren"
diff --git a/openQRM-5.3.50-CE/src/web/base/lang/de.openqrm.controller.ini b/openQRM-5.3.50-CE/src/web/base/lang/de.openqrm.controller.ini
deleted file mode 100644
index d3b242f..0000000
--- a/openQRM-5.3.50-CE/src/web/base/lang/de.openqrm.controller.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[content]
-tab = "License"
-ltimeout = "Ihre openQRM Enterprise Server Lizenz ist abgelaufen! Bitte kontaktieren Sie info@openqrm-enterprise.com!"
-lclients = "Ihre openQRM Enterprise Client Lizenz ist abgelaufen! Bitte kontaktieren Sie info@openqrm-enterprise.com!"
-[top]
-account = "Benutzerkonto"
-support = "Support"
-info = "Info"
-documentation = "Dokumentation"
-language = "Sprache"
-[upload]
-tab = "Upload"
-label = "Upload der Lizenz Dateien"
-public_key = "Public Key"
-server_license = "Server Lizenz"
-client_license = "Client Lizenz (optional)"
-welcome = "Willkommen zur neu installierten openQRM Enterprise Edition"
-explanation = "Bitte aktivieren Sie die openQRM Enterprisee Edition mit den erhaltenen Lizenz Dateien."
-msg = "Upload der Lizenz Dateie %s"
diff --git a/openQRM-5.3.50-CE/src/web/base/lang/de.upload.ini b/openQRM-5.3.50-CE/src/web/base/lang/de.upload.ini
deleted file mode 100644
index 410e9d9..0000000
--- a/openQRM-5.3.50-CE/src/web/base/lang/de.upload.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-label = "Lizenz Upload"
-upload = "Bitte wählen Sie die openQRM Enterprise Server Lizenz Datei von Ihrem lokalen Rechner und klicken Sie auf &quot;absenden&quot;"
-msg = "Lizenz Datei %s erfolgreich hochgeladen"
diff --git a/openQRM-5.3.50-CE/src/web/base/lang/en.file.handler.ini b/openQRM-5.3.50-CE/src/web/base/lang/en.file.handler.ini
deleted file mode 100644
index dffd9b8..0000000
--- a/openQRM-5.3.50-CE/src/web/base/lang/en.file.handler.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-remove_error = "failed to delete %s"
-copy_error = "failed to copy %s to %s"
-filename_error = "filename must be %s"
-saved_error = "failed to save %s"
-exists_error = "%s already exists"
-file = "File"
-folder = "Folder"
-permission_denied = "Permission denied"
-not_found = "File not found"
diff --git a/openQRM-5.3.50-CE/src/web/base/lang/en.file.upload.ini b/openQRM-5.3.50-CE/src/web/base/lang/en.file.upload.ini
deleted file mode 100644
index 621fe5c..0000000
--- a/openQRM-5.3.50-CE/src/web/base/lang/en.file.upload.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-400 = "Bad Request: Uploadfile not set"
-401 = "Unauthorized: Directory is not writeable"
-403 = "Forbidden: "
-404 = "Not Found: Directory not exists"
-406 = "Not Acceptable: File is not uploded"
-500 = "Server Error: "
-[Server]
-1 = "File exceeds upload_max_filesize"
-2 = "File exceeds MAX_FILE_SIZE"
-3 = "File was only partially uploaded"
-4 = "No file was uploaded"
-6 = "Missing a temporary folder"
-7 = "Failed to write file to disk"
-8 = "File upload stopped by extension"
diff --git a/openQRM-5.3.50-CE/src/web/base/lang/en.htmlobjects.ini b/openQRM-5.3.50-CE/src/web/base/lang/en.htmlobjects.ini
deleted file mode 100644
index 3454823..0000000
--- a/openQRM-5.3.50-CE/src/web/base/lang/en.htmlobjects.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-[table]
-button_refresh = "refresh"
-label_sort = "sort by"
-label_order = "sort order"
-label_offset = "offset"
-label_limit = "limit"
-option_nolimit = "none"
-option_asc = "ASC"
-option_desc = "DESC"
-select_label = "Select:"
-select_all = "all"
-select_none = "none"
-select_invert = "inverted"
-no_data = "no data"
-
-
-[form]
-error_required = "%s must not be empty"
-error_maxlength = "%s exeeds maxlength of %d"
-error_minlength = "%s undercuts minlength of %d"
-required       = "*"
-
-
-[response]
-submit = "submit"
-cancel = "cancel"
-reset = "reset"
-
diff --git a/openQRM-5.3.50-CE/src/web/base/lang/en.javascript.ini b/openQRM-5.3.50-CE/src/web/base/lang/en.javascript.ini
deleted file mode 100644
index 73376e8..0000000
--- a/openQRM-5.3.50-CE/src/web/base/lang/en.javascript.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-please_wait = "Please wait ..."
-generate_name = "Generate name"
diff --git a/openQRM-5.3.50-CE/src/web/base/lang/en.openqrm.controller.ini b/openQRM-5.3.50-CE/src/web/base/lang/en.openqrm.controller.ini
deleted file mode 100644
index a5c97ad..0000000
--- a/openQRM-5.3.50-CE/src/web/base/lang/en.openqrm.controller.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[content]
-tab = "License"
-ltimeout = "Your openQRM Enterprise server license key has expired! Please contact info@openqrm-enterprise.com for renewal!"
-lclients = "Your openQRM Enterprise client license key has expired! Please contact info@openqrm-enterprise.com for renewal!"
-[top]
-account = "Account"
-support = "Support"
-info = "Info"
-documentation = "Documentation"
-language = "Language"
-[upload]
-tab = "Upload"
-label = "Upload License File(s)"
-public_key = "Public Key"
-server_license = "Server License"
-client_license = "Client Licenses (optional)"
-welcome = "Welcome to your newly installed openQRM Enterprise Edition"
-explanation = "Please activate it by uploading the license key files you received by email."
-msg = "Uploaded License File %s"
diff --git a/openQRM-5.3.50-CE/src/web/base/lang/en.upload.ini b/openQRM-5.3.50-CE/src/web/base/lang/en.upload.ini
deleted file mode 100644
index 82bf637..0000000
--- a/openQRM-5.3.50-CE/src/web/base/lang/en.upload.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-label = "License upload"
-upload = "Please select the openQRM Enterprise Server License File and Public Key from your local computer and submit"
-msg = "Uploaded License file %s"
diff --git a/openQRM-5.3.50-CE/src/web/base/lang/es.htmlobjects.ini b/openQRM-5.3.50-CE/src/web/base/lang/es.htmlobjects.ini
deleted file mode 100644
index 9495930..0000000
--- a/openQRM-5.3.50-CE/src/web/base/lang/es.htmlobjects.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[table]
-button_refresh = "refrescar"
-label_sort = "pedido de"
-label_offset = "compensación"
-label_limit = "límite"
-option_nolimit = "nada"
-option_asc = "ASC"
-option_desc = "DESC"
-select_label = "Seleccionar:"
-select_all = "todo"
-select_none = "mada"
-select_invert = "invertir"
-no_data = "ningún dato"
-
-[form]
-error_required = "%s no debe estar vacío"
-required = "*"
-
-[response]
-submit = "enviar"
-cancel = "cancelar"
-reset = "reiniciar"
-
diff --git a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.configure.class.php b/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.configure.class.php
deleted file mode 100644
index b06caca..0000000
--- a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.configure.class.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-/**
- * Plugins Configuration
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class aa_plugins_configure
-{
-/**
-* plugin key
-* @access public
-* @var string
-*/
-var $plugin_key = 'aa_plugins';
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'aa_plugins_action';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'aa_plugins_identifier';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "aa_plugins_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'aa_plugins_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param htmlobject_response $response
-	 * @param file $file
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm  = $openqrm;
-		$this->user		= $openqrm->user();
-		$this->file     = $this->openqrm->file();
-		$this->plugin   = $this->response->html->request()->get($this->identifier_name);
-		$this->response->add($this->identifier_name, $this->plugin);
-		require_once($this->openqrm->get('classdir').'/openqrm_server.class.php');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$form = $this->configure();
-		if(isset($form->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $form->msg)
-			);
-		}
-		$t = $this->response->html->template($this->tpldir.'/aa_plugins-configure.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($form);
-		$t->add(sprintf($this->lang['label'], $this->plugin), 'label');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Configure
-	 *
-	 * @access public
-	 * @return htmlobject_tablebulider
-	 */
-	//--------------------------------------------
-	function configure() {
-
-		$response = $this->get_response();
-		$form     = $response->form;
-
-		$server = new openqrm_server();
-		$tmp  = $this->openqrm->get('basedir').'/var/lock/plugin_manager.'.$this->plugin.'.conf.tmp';
-		$file = $this->openqrm->get('basedir').'/var/lock/plugin_manager.'.$this->plugin.'.conf';
-
-		$command  = $this->openqrm->get('basedir').'/bin/openqrm boot-service view';
-		$command .= ' --openqrm-ui-user '.$this->user->name;
-		$command .= ' --openqrm-cmd-mode raw';
-		$command .= ' -n '.$this->plugin;
-		$command .= ' -a default';
-		$command .= ' > '.$tmp;
-		$command .= ' && mv '.$tmp.' '.$file;
-
-		if($this->file->exists($file)) {
-			$this->file->remove($file);
-		}
-		$server->send_command($command, null, true);
-		while (!$this->file->exists($file))
-		{
-			usleep(10000); // sleep 10ms to unload the CPU
-			clearstatcache();
-		}
-		sleep(2);
-		$d = $this->__parse_conf($file,str_replace('storage', '', $this->plugin));
-		// clean up
-		$this->file->remove($file);
-		$i = 0;
-		if(!isset($d)) {
-			$div = $this->response->html->div();
-			$div->name = 'no data';
-			$div->add($this->lang['no_data']);
-			$d['param_placeholder']['object'] = $div;
-		}
-		$form->add($d);
-		if(!$form->get_errors() && $response->submit()) {
-			$request = $form->get_request(null, true);
-			foreach($request as $k => $v) {
-				if($v === '') { $v = 'NoValue'; }
-				$command  = $this->openqrm->get('basedir').'/bin/openqrm boot-service configure';
-				$command .= ' --openqrm-ui-user '.$this->user->name;
-				$command .= ' --openqrm-cmd-mode background';
-				$command .= ' -a default';
-				$command .= ' -v '.$v;
-				$command .= ' -k '.$k;
-				$command .= ' -n '.$this->plugin;
-				$server->send_command($command, null, true);
-			}
-			$form->msg = sprintf($this->lang['msg'], $this->plugin);
-		}
-		return $form;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'configure');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$response->form = $form;
-
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Parse an openqrm config file
-	 *
-	 * @access public
-	 * @param string $path
-	 * @param string $replace
-	 * @param string $plugin
-	 * @return array
-	 */
-	//--------------------------------------------
-	function __parse_conf ( $path, $plugin = null ) {
-		if(file_exists($path)) {
-
-			$blacklist[] = 'OPENQRM_PLUGIN_VERSION';
-			$blacklist[] = 'OPENQRM_PLUGIN_BUILD_REQUIREMENTS';
-			$blacklist[] = 'OPENQRM_PLUGIN_DESCRIPTION';
-			$blacklist[] = 'OPENQRM_PLUGIN_TYPE';
-			$blacklist[] = 'OPENQRM_PLUGIN_DEPENDENCIES';
-			$blacklist[] = 'OPENQRM_PLUGIN_PLUGIN_DEPENDENCIES';
-			$blacklist[] = 'OPENQRM_PLUGIN_STATE_DIRS';
-			$blacklist[] = 'OPENQRM_PLUGIN_STATE_FILES';
-
-			$ini = $this->file->get_contents( $path );
-			$ini = explode("\n", $ini);
-			if ( count( $ini ) == 0 ) { return null; }
-			$d = null;
-			$i = 0;
-			foreach( $ini as $line ){
-				$line = trim( $line );
-				// only get lines starting with OPENQRM_ or $plugin_
-				if(strpos($line, 'OPENQRM_') === 0 || (isset($plugin) && stripos($line, str_replace('-', '_', $plugin)) === 0)) { 
-					// Key-value pair
-					list( $key, $value ) = explode( '=', $line, 2 );
-					$key   = trim( $key );
-					$value = trim( $value );
-					$value = str_replace("\"", "", $value );
-					if(!in_array($key, $blacklist)) {
-						$d['param_f'.$i]['label']                       = $key;
-						$d['param_f'.$i]['validate']['regex']           = '/^[^ ]+$/i';
-						$d['param_f'.$i]['validate']['errormsg']        = $this->lang['error_value'];
-						$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-						$d['param_f'.$i]['object']['attrib']['type']    = 'text';
-						$d['param_f'.$i]['object']['attrib']['name']    = $key;
-						$d['param_f'.$i]['object']['attrib']['value']   = $value;
-						if(isset($ini[$i-1]) && strpos($ini[$i-1], '#') === 0) {
-							$d['param_f'.$i]['object']['attrib']['title'] = trim(substr($ini[$i-1],1));
-						}
-					}
-				}
-				$i++;
-			}
-			return $d;
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.controller.class.php b/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.controller.class.php
deleted file mode 100644
index ac8fea8..0000000
--- a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.controller.class.php
+++ /dev/null
@@ -1,427 +0,0 @@
-<?php
-/**
- * aa_plugins Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class aa_plugins_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'aa_plugins_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "aa_plugins_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'aa_plugins_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'aa_plugins_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array (
-		'tab' => 'Plugin Manager',
-		'label' => 'Plugin Manager',
-		'action_start' => 'start',
-		'action_stop' => 'stop',
-		'action_enable' => 'install',
-		'action_disable' => 'uninstall',
-		'action_configure' => 'configure',
-		'title_start' => 'click to start plugin %s',
-		'title_stop' => 'click to stop plugin %s',
-		'title_enable' => 'click to install plugin %s',
-		'title_disable' => 'click to uninstall plugin %s',
-		'title_configure' => 'click to configure plugin %s',
-		'table_name' => 'Plugin',
-		'table_type' => 'Type',
-		'table_description' => 'Description',
-		'table_enabled' => 'installed',
-		'table_started' => 'running',
-		'lang_filter' => 'Filter by type',
-		'please_wait' => 'Loading. Please wait ..',
-	), 
-	'start' => array (
-		'label' => 'Start plugin',
-		'msg' => 'Started plugin %s',
-		'error_timeout' => 'Timeout while trying to start plugin %s',
-		'error_start' => 'Could not start plugin %s',
-	),
-	'stop' => array (
-		'label' => 'Stop plugin',
-		'msg' => 'Stopped plugin %s',
-		'error_timeout' => 'Timeout while trying to stop plugin %s',
-		'error_stop' => 'Could not stop plugin %s',
-	),
-	'enable' => array (
-		'label' => 'Install plugin',
-		'msg' => 'Install plugin %s',
-		'error_timeout' => 'Timeout while trying to install plugin %s',
-		'error_enable' => 'Could not install plugin %s',
-		'error_enabled' => 'Plugin %s already installed',
-		'error_dependencies' => 'Dependencies for %s failed. Please install %s first.',
-	),
-	'disable' => array (
-		'label' => 'Uninstall plugin',
-		'msg' => 'Uninstall plugin %s',
-		'error_timeout' => 'Timeout while trying to uninstall plugin %s',
-		'error_in_use' => 'Plugin %s is still in use by openQRM',
-		'error_disable' => 'Could not uninstall plugin %s',
-		'error_dependencies' => 'Dependencies for %s failed. Please uninstall %s first.',
-	),
-	'configure' => array (
-		'tab' => 'Configure Plugin',
-		'label' => 'Configure Plugin %s',
-		'msg' => 'Configured plugin %s',
-		'no_data' => 'No values found to configure',
-		'error_value' => 'Please do not use blank spaces',
-		'canceled' => 'Operation canceled. Please wait ..',
-		'please_wait' => 'Loading. Please wait ..',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param htmlobject_response $response
-	 * @param openqrm $openqrm
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-		$this->tpldir   = $this->rootdir.'plugins/aa_plugins/tpl';
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/plugins/aa_plugins/lang", 'aa_plugins.ini');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "select";
-		}
-
-		// handle response
-		$this->response->params['plugin_filter'] = $this->response->html->request()->get('plugin_filter');
-		$vars = $this->response->html->request()->get('plugins');
-		if($vars !== '') {
-			if(!isset($vars['action'])) {
-				foreach($vars as $k => $v) {
-					$this->response->add('plugins['.$k.']', $v);
-				}
-			} else {
-				foreach($vars as $k => $v) {
-					unset($this->response->params['plugins['.$k.']']);
-				}
-			}
-		}
-
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'start':
-				$content[] = $this->start(true);
-			break;
-			case 'stop':
-				$content[] = $this->stop(true);
-			break;
-			case 'enable':
-				$content[] = $this->enable(true);
-			break;
-			case 'disable':
-				$content[] = $this->disable(true);
-			break;
-			case 'configure':
-				$content[] = $this->select(false);
-				$content[] = $this->configure(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->rootdir.'/plugins/aa_plugins/class/aa_plugins.api.class.php');
-		$controller = new aa_plugins_api($this);
-		$controller->action();
-	}
-
-	
-	//--------------------------------------------
-	/**
-	 * Select Plugins
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/aa_plugins/class/aa_plugins.select.class.php');
-			$controller = new aa_plugins_select($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}	
-	
-	//--------------------------------------------
-	/**
-	 * Start Plugin
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function start( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/aa_plugins/class/aa_plugins.start.class.php');
-			$controller                  = new aa_plugins_start($this->response, $this->file);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['start'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Start';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'start' );
-		$content['onclick'] = false;
-		if($this->action === 'start'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Stop Plugin
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function stop( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/aa_plugins/class/aa_plugins.stop.class.php');
-			$controller                  = new aa_plugins_stop($this->response, $this->file);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['stop'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Stop';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'stop' );
-		$content['onclick'] = false;
-		if($this->action === 'stop'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Enable Plugin
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function enable( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/aa_plugins/class/aa_plugins.enable.class.php');
-			$controller                  = new aa_plugins_enable($this->response, $this->file);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['enable'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Enable';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'enable' );
-		$content['onclick'] = false;
-		if($this->action === 'enable'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Disable Plugin
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function disable( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/aa_plugins/class/aa_plugins.disable.class.php');
-			$controller                  = new aa_plugins_disable($this->response, $this->file);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['disable'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'disable';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'disable' );
-		$content['onclick'] = false;
-		if($this->action === 'disable'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Configure Plugin
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function configure( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/plugins/aa_plugins/class/aa_plugins.configure.class.php');
-			$controller                  = new aa_plugins_configure($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['configure'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['configure']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'configure' );
-		$content['onclick'] = false;
-		if($this->action === 'configure'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.disable.class.php b/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.disable.class.php
deleted file mode 100644
index e0c8303..0000000
--- a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.disable.class.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
- * disable Plugins
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class aa_plugins_disable
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'aa_plugins_action';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'aa_plugins_identifier';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "aa_plugins_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'aa_plugins_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param htmlobject_response $response
-	 * @param file $file
-	 */
-	//--------------------------------------------
-	function __construct($response, $file) {
-		$this->response = $response;
-		$this->file     = $file;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$msg        = '';
-		$event      = new event();
-		$server     = new openqrm_server();
-		$plugin     = new plugin();
-		$identifier = $this->response->html->request()->get($this->identifier_name);
-		$enabled    = $plugin->enabled();
-		if($identifier !== '') {
-			foreach($identifier as $id) {
-				if(in_array($id, $enabled)) {
-					$error = false;
-					// check dependencies
-					foreach($enabled as $v) {
-						if($v !== $id) {
-							$tmp = $plugin->get_dependencies($v);
-							if($tmp !== '' && isset($tmp['dependencies']) && $tmp['dependencies'] !== '') {
-								if(strpos($tmp['dependencies'], $id) !== false) {
-									$msg .= sprintf($this->lang['error_dependencies'], $id, $v).'<br>';
-									$error = true;
-								}
-							}
-						}
-					}
-					// handle plugin type
-					if($error === false) {
-						$tmp = $plugin->get_config($id);
-						switch($tmp['type']) {
-							case 'storage':
-								$storage = new storage();
-								$types = $storage->get_storage_types();
-								$deployment = new deployment();
-								$dep = $deployment->get_id_by_storagetype($id);
-								foreach($dep as $val) {
-									if(in_array($val['value'], $types)) {
-										$msg .= sprintf($this->lang['error_in_use'], $id).'<br>';
-										$error = true;
-									}
-								}
-							break;
-						}
-					}
-					if($error === false) {
-						$return = $server->send_command("openqrm_server_plugin_command ".$id." uninstall ".$GLOBALS['OPENQRM_ADMIN']->name.' '.$GLOBALS['OPENQRM_ADMIN']->password);
-						if($return === true) {
-							if ($this->__check($id)) {
-								$msg .= sprintf($this->lang['msg'], $id).'<br>';
-							} else {
-								$msg .= sprintf($this->lang['error_timeout'], $id).'<br>';
-							}
-						} else {
-							$msg .= sprintf($this->lang['error_disable'], $id).'<br>';
-						}
-					}
-				}
-			}
-		}
-		$this->response->redirect(
-			$this->response->get_url($this->actions_name, 'select', $this->message_param, $msg)
-		);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Check plugin state
-	 *
-	 * @access private
-	 * @param string $plugin
-	 * @return bool
-	 */
-	//--------------------------------------------
-	function __check($plugin) {
-		$f = $_SERVER["DOCUMENT_ROOT"]."/openqrm/base/plugins/".$plugin;
-		$i = 0;
-		while ($this->file->exists($f)) {
-			sleep(1);
-			$i++;
-			if ($i > 20)  {
-				return false;
-			}
-		}
-		return true;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.enable.class.php b/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.enable.class.php
deleted file mode 100644
index 132ba56..0000000
--- a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.enable.class.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
- * Enable Plugins
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class aa_plugins_enable
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'aa_plugins_action';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'aa_plugins_identifier';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "aa_plugins_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'aa_plugins_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param htmlobject_response $response
-	 * @param file $file
-	 */
-	//--------------------------------------------
-	function __construct($response, $file) {
-		$this->response = $response;
-		$this->file     = $file;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$msg        = '';
-		$event      = new event();
-		$server     = new openqrm_server();
-		$plugin     = new plugin();
-		$identifier = $this->response->html->request()->get($this->identifier_name);
-		$available  = $plugin->available();
-		if($identifier !== '') {
-			foreach($identifier as $id) {
-				if(in_array($id, $available)) {
-					$error = false;
-					// check dependencies
-					$tmp = $plugin->get_dependencies($id);
-					if($tmp !== '' && isset($tmp['dependencies']) && $tmp['dependencies'] !== '') {
-						$tmp = str_replace(' ', '', $tmp['dependencies']);
-						$tmp = explode(',', $tmp);
-						$enabled = $plugin->enabled();
-						$result = array_diff($tmp, $enabled);
-						if(count($result) > 0) {
-							$msg .= sprintf($this->lang['error_dependencies'], $id, implode(', ', $result)).'<br>';
-							$error = true;
-						}
-					}
-					// handle plugin type
-					if($error === false) {
-						$tmp = $plugin->get_config($id);
-						switch($tmp['type']) {
-							case 'storage':
-								$storage = new storage();
-								$types = $storage->get_storage_types();
-								$deployment = new deployment();
-								$dep = $deployment->get_id_by_storagetype($id);
-								foreach($dep as $val) {
-									if(in_array($val['value'], $types)) {
-										$msg .= sprintf($this->lang['error_enabled'], $id).'<br>';
-										$error = true;
-									}
-								}
-							break;
-						}
-					}
-					if($error === false) {
-						$return = $server->send_command("openqrm_server_plugin_command ".$id." init ".$GLOBALS['OPENQRM_ADMIN']->name.' '.$GLOBALS['OPENQRM_ADMIN']->password);
-						if($return === true) {
-							if ($this->__check($id)) {
-								$msg .= sprintf($this->lang['msg'], $id).'<br>';
-							} else {
-								$msg .= sprintf($this->lang['error_timeout'], $id).'<br>';
-							}
-						} else {
-							$msg .= sprintf($this->lang['error_enable'], $id).'<br>';
-						}
-					}
-				}
-			}
-		}
-		$this->response->redirect(
-			$this->response->get_url($this->actions_name, 'select', $this->message_param, $msg)
-		);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Check plugin state
-	 *
-	 * @access private
-	 * @param string $plugin
-	 * @return bool
-	 */
-	//--------------------------------------------
-	function __check($plugin) {
-		$f = $_SERVER["DOCUMENT_ROOT"]."/openqrm/base/plugins/".$plugin;
-		$i = 0;
-		while (!$this->file->exists($f)) {
-			sleep(1);
-			$i++;
-			if ($i > 20)  {
-				return false;
-			}
-		}
-		return true;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.select.class.php b/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.select.class.php
deleted file mode 100644
index 7735da8..0000000
--- a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.select.class.php
+++ /dev/null
@@ -1,346 +0,0 @@
-<?php
-/**
- * Plugins Select
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class aa_plugins_select
-{
-/**
-* plugin key
-* @access public
-* @var string
-*/
-var $plugin_key = 'aa_plugins';
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'aa_plugins_action';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'aa_plugins_identifier';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "aa_plugins_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'aa_plugins_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param htmlobject_response $response
-	 * @param openqrm $openqrm
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->openqrm  = $openqrm;
-		$this->file     = $this->openqrm->file();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$table = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/aa_plugins-select.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($table, 'table');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['lang_filter'], 'lang_filter');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return htmlobject_tablebulider
-	 */
-	//--------------------------------------------
-	function select() {
-
-		$icon_started = $this->lang['action_stop'];
-		$icon_stopped = $this->lang['action_start'];
-		$icon_enabled = $this->lang['action_disable'];
-		$icon_disabled = $this->lang['action_enable'];
-
-		$plugin = new plugin();
-		$plugins_available = $plugin->available();
-		$plugins_enabled = $plugin->enabled();
-		$plugins_started = $plugin->started();
-
-		$h = array();
- 		$h['name']['title'] = $this->lang['table_name'];
- 
- 		$h['type']['title'] = '&#160;';
- 		$h['type']['sortable'] = '&#160;';
- 
- 		$h['type_n']['title'] = $this->lang['table_type'];
- 		$h['type_n']['hidden'] = true;
- 
- 		$h['description']['title'] = $this->lang['table_description'];
- 		$h['description']['sortable'] = false;
-
-		$h['configure']['title'] = "&#160;";
- 		$h['configure']['sortable'] = false;
-		
-		$h['enabled']['title'] = "&#160;";
- 		$h['enabled']['sortable'] = false;
- 
- 		$h['enabled_n']['title'] = $this->lang['table_enabled'];
- 		$h['enabled_n']['hidden'] = true;
- 
- 		$h['started']['title'] = "&#160;";
- 		$h['started']['sortable'] = false;
- 
- 		$h['started_n']['title'] = $this->lang['table_started'];
- 		$h['started_n']['hidden'] = true;
-
-		$table = $this->response->html->tablebuilder('plugins', $this->response->get_array($this->actions_name, 'select'));
-		$table->max = count($plugins_available);
-		$table->sort = 'name';
-		$table->limit = 0;
-		$table->order = 'ASC';
-		$table->init();
-		$tps = $table->get_params();
-		$tp = '';
-		foreach($tps['plugins'] as $k => $v) {
-			$tp .= '&plugins['.$k.']='.$v;
-		}
-
-		$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-		$thisfile = $this->response->html->thisfile;
-		$b = array();
-		$plugtype = array();
-		$i = 0;
-		$openqrm_version = $this->openqrm->get('config', 'SERVER_VERSION');
-
-		foreach ($plugins_available as $index => $plugin_name) {
-			$tmp = $plugin->get_config($plugin_name);
-			$plugin_description = $tmp['description'];
-			$plugin_type =  $tmp['type'];
-			$plugtype[] = $plugin_type;
-			$plugin_version = $tmp['version'];
-			$plugin_major = substr($plugin_version, 0, strpos($plugin_version, '.'));
-			$plugin_minor = substr($plugin_version, strpos($plugin_version, '.')+1);
-			$plugin_minor = substr($plugin_minor, 0, strpos($plugin_minor, '.'));
-			$plugin_base_version = $plugin_major.".".$plugin_minor;
-			
-			if (!strlen($this->response->html->request()->get('plugin_filter')) || strstr($this->response->html->request()->get('plugin_filter'), $plugin_type )) {
-				
-				// 
-				$b[$i] = array();
-
-				// plugin version mismatch
-				if ($openqrm_version != $plugin_base_version) {
-					$b[$i]['name'] = $plugin_name;
-					$b[$i]['type'] = '<span class="pill ' . strtolower($plugin_type) . '">'.$plugin_type.'</span>';
-					$b[$i]['type_n'] = $plugin_type;
-					$b[$i]['description'] = $plugin_description;
-					$b[$i]['enabled'] = $this->lang['version_mismatch'];
-					$b[$i]['enabled_n'] = 'b';
-					$b[$i]['started'] = '&#160;';
-					$b[$i]['started_n'] = 'c';
-					$b[$i]['configure'] = '';
-					
-				} else {
-
-					// plugin not enabled!
-					if (!in_array($plugin_name, $plugins_enabled)) {
-
-						$a = $this->response->html->a();
-						$a->label    = $icon_disabled;
-						$a->href     = $this->response->get_url($this->actions_name, "enable");
-						$a->href    .= '&'.$this->identifier_name.'[]='.$plugin_name;
-						$a->href    .= '&plugin_filter='.$this->response->html->request()->get('plugin_filter');
-						$a->href    .= $tp;
-						$a->href    .= '#'.$plugin_name;
-						// anchor
-						$a->name     = $plugin_name;
-						$a->handler  = 'onclick="wait();"';
-						$a->css      = 'enable';
-						$a->title    = sprintf($this->lang['title_enable'], $plugin_name);
-
-						$b[$i]['name'] = $plugin_name;
-						$b[$i]['type'] = '<span class="pill ' . strtolower($plugin_type) . '">'.$plugin_type.'</span>';
-						$b[$i]['type_n'] = $plugin_type;
-						$b[$i]['description'] = $plugin_description;
-						$b[$i]['enabled'] = $a->get_string();
-						$b[$i]['enabled_n'] = 'b';
-						$b[$i]['started'] = '&#160;';
-						$b[$i]['started_n'] = 'c';
-					} else {
-						$plugin_icon_path="$RootDir/plugins/$plugin_name/img/plugin.png";
-						$plugin_icon="/openqrm/base/plugins/$plugin_name/img/plugin.png";
-						$plugin_icon_default="/openqrm/base/plugins/aa_plugins/img/plugin.png";
-						if ($this->file->exists($plugin_icon_path)) {
-							$plugin_icon_default=$plugin_icon;
-						}
-
-						$a = $this->response->html->a();
-						$a->label    = $icon_enabled;
-						$a->href     = $this->response->get_url($this->actions_name, "disable");
-						$a->href    .= '&'.$this->identifier_name.'[]='.$plugin_name;
-						$a->href    .= '&plugin_filter='.$this->response->html->request()->get('plugin_filter');
-						$a->href    .= $tp;
-						$a->href    .= '#'.$plugin_name;
-						// anchor
-						$a->name     = $plugin_name;
-						$a->handler  = 'onclick="wait();"';
-						$a->css      = (!in_array($plugin_name, $plugins_started)) 
-											? 'disable'
-											: 'disable disabled';			
-						$a->title    = sprintf($this->lang['title_disable'], $plugin_name);
-
-						$b[$i]['name'] = $plugin_name;
-						$b[$i]['type'] = '<span class="pill ' . strtolower($plugin_type) . '">'.$plugin_type.'</span>';
-						$b[$i]['type_n'] = $plugin_type;
-						$b[$i]['description'] = $plugin_description;
-						$b[$i]['enabled'] = $a->get_string();
-						$b[$i]['enabled_n'] = 'a';
-
-						// started ?
-						if (!in_array($plugin_name, $plugins_started)) {
-							$a = $this->response->html->a();
-							$a->label    = $icon_stopped;
-							$a->href     = $this->response->get_url($this->actions_name, "start");
-							$a->href    .= '&'.$this->identifier_name.'[]='.$plugin_name;
-							$a->href    .= '&plugin_filter='.$this->response->html->request()->get('plugin_filter');
-							$a->href    .= $tp;
-							$a->href    .= '#'.$plugin_name;
-							$a->handler  = 'onclick="wait();"';
-							$a->css      = 'start';
-							$a->title    = sprintf($this->lang['title_start'], $plugin_name);
-
-							$b[$i]['started'] = $a->get_string();
-							$b[$i]['started_n'] = 'b';
-						} else {
-							$a = $this->response->html->a();
-							$a->label    = $icon_started;
-							$a->href     = $this->response->get_url($this->actions_name, "stop");
-							$a->href    .= '&'.$this->identifier_name.'[]='.$plugin_name;
-							$a->href    .= '&plugin_filter='.$this->response->html->request()->get('plugin_filter');
-							$a->href    .= $tp;
-							$a->href    .= '#'.$plugin_name;
-							$a->handler  = 'onclick="wait();"';
-							$a->css      = 'stop';
-							$a->title    = sprintf($this->lang['title_stop'], $plugin_name);
-
-							$b[$i]['started'] = $a->get_string();
-							$b[$i]['started_n'] = 'a';
-						}
-					}
-					// configure button
-					$b[$i]['configure'] = '';
-					if(isset($tmp['configurable'])) {
-						$a = $this->response->html->a();
-						$a->label    = $this->lang['action_configure'];
-						$a->href     = $this->response->get_url($this->actions_name, "configure");
-						$a->href    .= '&'.$this->identifier_name.'='.$plugin_name;
-						$a->href    .= '&plugin_filter='.$this->response->html->request()->get('plugin_filter');
-						$a->href    .= $tp;
-						$a->handler  = 'onclick="wait();"';
-						$a->css      = 'manage';
-						$a->title    = sprintf($this->lang['title_configure'], $plugin_name);
-						$b[$i]['configure'] = $a->get_string();
-					}
-				}
-				$i++;
-			}
-		}
-
-		$plugs = array();
-		$plugs[] = array('','');
-		$plugtype = array_unique($plugtype);
-		natcasesort($plugtype);
-		foreach($plugtype as $p) {
-			$plugs[] = array($p,ucfirst($p));
-		}
-		
-		$select = $this->response->html->select();
-		$select->add($plugs, array(0,1));
-		$select->name = 'plugin_filter';
-		$select->handler = 'onchange="wait();this.form.submit();return false;"';
-		$select->selected = array($this->response->html->request()->get('plugin_filter'));
-		
-		$box = $this->response->html->box();
-		$box->add($select);
-		$box->id = 'plugins_filter';
-		$box->css = 'htmlobject_box';
-		$box->label = $this->lang['lang_filter'];
-
-		$table->id = 'Tabelle';
-		$table->tr_handler = array();
-		$table->css = 'htmlobject_table';
-		$table->border = 1;
-		$table->cellspacing = 0;
-		$table->cellpadding = 3;
-		$table->autosort = true;
-		$table->sort_link = false;
-		$table->add_headrow($box->get_string());
-		$table->head = $h;
-		$table->body = $b;
-		$table->max = count($b);
-		$table->form_action = $this->response->html->thisfile;
-	/*
-		$table->actions_name = $this->actions_name;
-		$table->actions = array(
-							array('enable' => $this->lang['action_enable']),
-							array('disable' => $this->lang['action_disable']),
-							array('start' => $this->lang['action_start']),
-							array('stop' => $this->lang['action_stop'])
-						);
-	
-		$table->identifier = 'name';
-		$table->identifier_name = $this->identifier_name;
-	*/
-		return $table;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.start.class.php b/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.start.class.php
deleted file mode 100644
index d2366c4..0000000
--- a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.start.class.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * Start Plugins
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class aa_plugins_start
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'aa_plugins_action';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'aa_plugins_identifier';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "aa_plugins_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'aa_plugins_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param htmlobject_response $response
-	 * @param file $file
-	 */
-	//--------------------------------------------
-	function __construct($response, $file) {
-		$this->response = $response;
-		$this->file     = $file;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$msg        = '';
-		$event      = new event();
-		$server     = new openqrm_server();
-		$plugin     = new plugin();
-		$identifier = $this->response->html->request()->get($this->identifier_name);
-		$enabled    = $plugin->enabled();
-		if($identifier !== '') {
-			foreach($identifier as $id) {
-				if(in_array($id, $enabled)) {
-					$return = $server->send_command("openqrm_server_plugin_command $id start");
-					if($return === true) {
-						if ($this->__check($id)) {
-							$msg .= sprintf($this->lang['msg'], $id).'<br>';
-						} else {
-							$msg .= sprintf($this->lang['error_timeout'], $id).'<br>';
-						}
-					} else {
-						$msg .= sprintf($this->lang['error_start'], $id).'<br>';
-					}
-				}
-			}
-		}
-		$this->response->redirect(
-			$this->response->get_url($this->actions_name, 'select', $this->message_param, $msg)
-		);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Check plugin state
-	 *
-	 * @access private
-	 * @param string $plugin
-	 * @return bool
-	 */
-	//--------------------------------------------
-	function __check($plugin) {
-		$f = $_SERVER["DOCUMENT_ROOT"]."/openqrm/base/plugins/".$plugin."/.running";
-		$i = 0;
-		while (!$this->file->exists($f)) {
-			sleep(1);
-			$i++;
-			if ($i > 20)  {
-				return false;
-			}
-		}
-		return true;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.stop.class.php b/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.stop.class.php
deleted file mode 100644
index ac38ccd..0000000
--- a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/class/aa_plugins.stop.class.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * Stop Plugins
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class aa_plugins_stop
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'aa_plugins_action';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'aa_plugins_identifier';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "aa_plugins_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'aa_plugins_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param htmlobject_response $response
-	 * @param file $file
-	 */
-	//--------------------------------------------
-	function __construct($response, $file) {
-		$this->response = $response;
-		$this->file     = $file;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$msg        = '';
-		$event      = new event();
-		$server     = new openqrm_server();
-		$plugin     = new plugin();
-		$identifier = $this->response->html->request()->get($this->identifier_name);
-		$enabled    = $plugin->enabled();
-		$started    = $plugin->started();
-		if($identifier !== '') {
-			foreach($identifier as $id) {
-				if(in_array($id, $enabled) && in_array($id, $started)) {
-					$return = $server->send_command("openqrm_server_plugin_command $id stop");
-					if($return === true) {
-						if ($this->__check($id)) {
-							$msg .= sprintf($this->lang['msg'], $id).'<br>';
-						} else {
-							$msg .= sprintf($this->lang['error_timeout'], $id).'<br>';
-						}
-					} else {
-						$msg .= sprintf($this->lang['error_stop'], $id).'<br>';
-					}
-				}
-			}
-		}
-		$this->response->redirect(
-			$this->response->get_url($this->actions_name, 'select', $this->message_param, $msg)
-		);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Check plugin state
-	 *
-	 * @access private
-	 * @param string $plugin
-	 * @return bool
-	 */
-	//--------------------------------------------
-	function __check($plugin) {
-		$f = $_SERVER["DOCUMENT_ROOT"]."/openqrm/base/plugins/".$plugin."/.running";
-		$i = 0;
-		while ($this->file->exists($f)) {
-			sleep(1);
-			$i++;
-			if ($i > 20)  {
-				return false;
-			}
-		}
-		return true;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/css/aa_plugins.css b/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/css/aa_plugins.css
deleted file mode 100644
index 3f0f752..0000000
--- a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/css/aa_plugins.css
+++ /dev/null
@@ -1,52 +0,0 @@
-.htmlobject_td.icon,
-.htmlobject_td.type,
-.htmlobject_td.type {
-	text-align:center;
-	width: 60px;
-}
-.htmlobject_td.enabled,
-.htmlobject_td.configure,
-.htmlobject_td.started {
-	width: 80px;
-	padding: 8px 5px 0px 0px;
-}
-.htmlobject_td.configure {
-	padding: 10px 4px 10px 15px;
-}
-.htmlobject_td.enabled,
-.htmlobject_td.started {
-	padding: 10px 4px 10px 0px;
-	margin: 0px;
-}
-#page #middle #content #plugins_filter .left {
-	width:110px;
-}
-a.enable, a.disable, a.manage { display:block; padding: 5px 12px 5px 5px; margin: 0px;}
-a.start, a.stop {  display:block; padding: 5px 12px 5px 5px; margin: 0px;}
-a.start {
-	background: #FF8000;
-}
-#configure_plugin .htmlobject_box .left {
-	width: 450px;
-}
-#configure_plugin .htmlobject_box .left label{
-	font-size: 11px;
-}
-#configure_plugin .htmlobject_box .right input.text {
-	width: 350px;
-}
-.htmlobject_tabs_box .msgBox {
-	display: block;
-	position: fixed;
-	top: 20px;
-	left: 500px;
-	font-size: 11px;
-	border: solid 1px #aaaaaa;
-	background-color: #FFFFE0;
-	color: black;
-	padding: 10px 15px;
-	margin: 0;
-	z-index: 100;
-	-webkit-box-shadow: 0 2px 2px 0 rgba(33, 33, 33, 0.5);
-	box-shadow: 0 2px 2px 0 rgba(33, 33, 33, 0.5);
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/lang/de.aa_plugins.ini b/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/lang/de.aa_plugins.ini
deleted file mode 100644
index a53ad51..0000000
--- a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/lang/de.aa_plugins.ini
+++ /dev/null
@@ -1,58 +0,0 @@
-[select]
-tab = "Plugin Verwaltung"
-label = "Plugin Verwaltung"
-action_start = "starten"
-action_stop = "stoppen"
-action_enable = "installieren"
-action_disable = "deinstallieren"
-action_configure = "konfigurieren"
-title_start = "Plugin %s starten"
-title_stop = "Plugin %s stoppen"
-title_enable = "Plugin %s installieren"
-title_disable = "Plugin %s deinstallieren"
-title_configure = "Plugin %s konfigurieren"
-table_name = "Plugin"
-table_type = "Typ"
-table_description = "Beschreibung"
-table_enabled = "installiert"
-table_started = "gestartet"
-lang_filter = "Filter nach Typ"
-please_wait = "Lade Plugins. Bitte warten .."
-
-[start]
-label = "Starte Plugins(s)"
-msg = "Plugin %s gestartet"
-error_timeout = "Timeout beim starten des Plugins %s"
-error_start = "Plugin %s konnte nicht gestartet werden"
-
-[stop]
-label = "Stop Plugins(s)"
-msg = "Plugin %s gestoppt"
-error_timeout = "Timeout beim stoppen des Plugins %s"
-error_stop = "Plugin %s konnte nicht gestoppt werden"
-
-[enable]
-label = "Plugins(s) initialisiern"
-msg = "Plugin %s initialisiert"
-error_timeout = "Timeout beim initialisiern des Plugin %s"
-error_enable = "Plugin %s konnte nicht initialisiert werden"
-error_enabled = "Plugin %s ist bereist initialisiert"
-error_dependencies = "Plugin Abhängigkeit des %s Plugins fehlgeschlagen. Bitte schlaten Sie zuerst die folgenden Plugins ein: %s"
-
-[disable]
-label = "Plugins(s) deinstallieren"
-msg = "Plugin %s deinstalliert"
-error_timeout = "Timeout beim deinstallieren des Plugins %s"
-error_in_use = "Plugin %s ist noch in Benutzung von openQRM"
-error_disable = "Plugin %s konnte nicht deinstalliert werden"
-error_dependencies = "Plugin Abhängigkeit des %s Plugins fehlgeschlagen. Bitte schalten Sie zuerst die folgenden Plugins aus: %s"
-
-[configure]
-tab = "Configure Plugin"
-label = "Configure Plugin %s"
-msg = "Configured plugin %s"
-no_data = "No values found to configure"
-error_value = "Please do not use blank spaces"
-canceled = "Operation canceled. Please wait .."
-please_wait = "Loading. Please wait .."
-
diff --git a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/lang/en.aa_plugins.ini b/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/lang/en.aa_plugins.ini
deleted file mode 100644
index 708b8a9..0000000
--- a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/lang/en.aa_plugins.ini
+++ /dev/null
@@ -1,57 +0,0 @@
-[select]
-tab	 = "Plugin Manager"
-label = "Plugin Manager"
-action_start = "start"
-action_stop = "stop"
-action_enable = "install"
-action_disable = "uninstall"
-action_configure = "configure"
-title_start = "click to start plugin %s"
-title_stop = "click to stop plugin %s"
-title_enable = "click to enable plugin %s"
-title_disable = "click to disable plugin %s"
-title_configure = "click to configure plugin %s"
-table_name = "Plugin"
-table_type = "Type"
-table_description = "Description"
-table_enabled = "installed"
-table_started = "running"
-lang_filter = "Filter by Type"
-please_wait = "Loading. Please wait ..."
-
-[start]
-label = "Start plugin"
-msg = "Started plugin %s"
-error_timeout = "Timeout while trying to start plugin %s"
-error_start = "Could not start plugin %s"
-
-[stop]
-label = "Stop plugin"
-msg = "Stopped plugin %s"
-error_timeout = "Timeout while trying to stop plugin %s"
-error_stop = "Could not stop plugin %s"
-
-[enable]
-label = "Install plugin"
-msg = "Install plugin %s"
-error_timeout = "Timeout while trying to install plugin %s"
-error_enable = "Could not enable plugin %s"
-error_enabled = "Plugin %s already installed"
-error_dependencies = "Dependencies for %s failed. Please install %s first."
-
-[disable]
-label = "Uninstall plugin"
-msg = "Uninstall plugin %s"
-error_timeout = "Timeout while trying to uninstall plugin %s"
-error_in_use = "Plugin %s is still in use by openQRM"
-error_disable = "Could not uninstall plugin %s"
-error_dependencies = "Dependencies for %s failed. Please uninstall %s first."
-
-[configure]
-tab = "Configure Plugin"
-label = "Configure Plugin %s"
-msg = "Configured plugin %s"
-no_data = "No values found to configure"
-error_value = "Please do not use blank spaces"
-canceled = "Operation canceled. Please wait .."
-please_wait = "Loading. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/lang/es.aa_plugins.ini b/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/lang/es.aa_plugins.ini
deleted file mode 100644
index c4c27f9..0000000
--- a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/lang/es.aa_plugins.ini
+++ /dev/null
@@ -1,57 +0,0 @@
-[select]
-tab	 = "Administrador de extensiones"
-label = "Administrador de extensiones"
-action_start = "Iniciar"
-action_stop = "Detener"
-action_enable = "Instalar"
-action_disable = "Desintalar"
-action_configure = "Configurar"
-title_start = "pulsar para iniciar la extensión '%s'"
-title_stop = "pulsar para detener la extensión '%s'"
-title_enable = "pulsar para habilitar la extensión '%s'"
-title_disable = "pulsar para deshabilitar la extensión '%s'"
-title_configure = "pulsar para configurar la extensión %s"
-table_name = "extensión clave"
-table_type = "Clase"
-table_description = "Descripción"
-table_enabled = "instalado"
-table_started = "procesando"
-lang_filter = "Clase de filtro"
-please_wait = "Cargando. Por favor espere..."
-
-[start]
-label = "Iniciar extensión"
-msg = "extensión iniciada %s"
-error_timeout = "El tiempo se expiró mientras se intenta iniciar la extensión %s"
-error_start = "La extensión %s no se pudo iniciar"
-
-[stop]
-label = "Detener extensión"
-msg = "extensión detenida %s"
-error_timeout = "El tiempo se expiró mientras se intenta detener la extensión %s"
-error_stop = "La extensión %s no se pudo detener"
-
-[enable]
-label = "Habilitar extensión"
-msg = "extensión habilitada %s"
-error_timeout = "El tiempo se expiró mientras se intenta habilitar la extensión %s"
-error_enable = "La extensión %s no se pudo habilitar"
-error_enabled = "La extensión %s ya ha sido habilitada"
-error_dependencies = "Las dependencias para %s fallaron. Por favor habilite %s primero."
-
-[disable]
-label = "Desabilitar extensión"
-msg = "extensión %s desabilitada"
-error_timeout = "El tiempo se expiró mientras se intenta desabilitar la extensión %s"
-error_in_use = "La extensión %s aun esta en uso por openQRM"
-error_disable = "La extensión %s no se pudo desabilitar"
-error_dependencies = "Las dependencias para %s fallaron. Por favor habilite %s primero."
-
-[configure]
-tab = "Configurar extensión"
-label = "Configurar extensión %s"
-msg = "Configurado extensión %s"
-no_data = "No se han encontrado para configurar los valores"
-error_value = "Por favor, no utilice espacios en blanco"
-canceled = "Operación cancelada. Por favor espere .."
-please_wait = "Cargando. Por favor espere .."
diff --git a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/menu.txt b/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/menu.txt
deleted file mode 100644
index 4ac7fd4..0000000
--- a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/menu.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-.|Plugins
-.|Plugin manager|index.php?plugin=aa_plugins|Manage the available Plugins
diff --git a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/tpl/aa_plugins-configure.tpl.php b/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/tpl/aa_plugins-configure.tpl.php
deleted file mode 100644
index bc72064..0000000
--- a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/tpl/aa_plugins-configure.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div id="configure_plugin">
-<form action="{thisfile}" method="POST">
-	<div id="form">
-		{form}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/tpl/aa_plugins-select.tpl.php b/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/tpl/aa_plugins-select.tpl.php
deleted file mode 100644
index bd68de0..0000000
--- a/openQRM-5.3.50-CE/src/web/base/plugins/aa_plugins/tpl/aa_plugins-select.tpl.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-{table}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/class/datacenter.api.class.php b/openQRM-5.3.50-CE/src/web/base/server/aa_server/class/datacenter.api.class.php
deleted file mode 100644
index 40b76b4..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/class/datacenter.api.class.php
+++ /dev/null
@@ -1,402 +0,0 @@
-<?php
-/**
- * Datacenter Api
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-class datacenter_api
-{
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param object $controller
-	 */
-	//--------------------------------------------
-	function __construct($controller) {
-		$this->controller = $controller;
-		$this->user       = $this->controller->user;
-		$this->html       = $this->controller->response->html;
-		$this->response   = $this->html->response();
-		$this->file       = $this->controller->file;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function action() {
-		$action = $this->response->html->request()->get($this->controller->actions_name);
-		switch( $action ) {
-			case 'dc_status':
-				$this->dc_status();
-			break;
-			case 'eventlist':
-				$this->eventlist();
-			break;
-			case 'statistics':
-				$this->statistics();
-			break;
-			case 'storage_list':
-				$this->storage_list();
-			break;
-			case 'server_list':
-				$this->server_list();
-			break;
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * DC Status
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function dc_status() {
-
-		// number of idle systems
-		$resources_all = 0;
-		// active deployed resources
-		$resources_active = 0;
-		// resources in error state
-		$resources_error = 0;
-		// physical resources
-		$resources_physical = 0;
-		// virtual resources
-		$resources_virtual = 0;
-		// number of idle systems
-		$resources_available = 0;
-		// physical resource available
-		$resources_available_physical = 0;
-		// virtal resource available
-		$resources_available_virtual = 0;
-		// overall load
-		$dc_load_overall = 0;
-		// active appliance load
-		$appliance_load_overall = 0;
-		// peak in appliance load
-		$appliance_load_peak = 0;
-		// active appliances
-		$appliance_active = 0;
-		// active appliance with resource in error state
-		$appliance_error = 0;
-		// storage load
-		$storage_load_overall = 0;
-		// storage peak
-		$storage_load_peak = 0;
-		// active storages
-		$storage_active = 0;
-		// storage with resource in error state
-		$storage_error = 0;
-
-		// get an array of resources which are assigned to an appliance
-		$appliance_resources_array = array();
-		$appliance = new appliance();
-		$appliance_list = $appliance->get_all_ids();
-		foreach ($appliance_list as $app) {
-			$app_id = $app['appliance_id'];
-			$g_appliance = new appliance();
-			$g_appliance->get_instance_by_id($app_id);
-			$g_appliance_resource = $g_appliance->resources;
-			if ((!strcmp($g_appliance->state, "active")) || ($g_appliance_resource == 0)) {
-				if ($g_appliance_resource != "-1") {
-					$appliance_resources_array[] .= $g_appliance_resource;
-				}
-			}
-		}
-		// get an array of resources which are a storage server
-		$storage_resources_array = array();
-		$storage = new storage();
-		$storage_list = $storage->get_list();
-		foreach ($storage_list as $store) {
-			$storage_id = $store['value'];
-			$g_storage = new storage();
-			$g_storage->get_instance_by_id($storage_id);
-			$g_storage_resource = $g_storage->resource_id;
-			$storage_resources_array[] .= $g_storage_resource;
-
-		}
-
-		$restype = 0;
-		$resource = new resource();
-		$resource_list = $resource->get_list();
-		foreach ($resource_list as $res) {
-			$res_id = $res['resource_id'];
-			//echo "!! res_id $res_id <br>";
-			$g_resource = new resource();
-			$g_resource->get_instance_by_id($res_id);
-			// start gathering
-			$resources_all++;
-			// physical or virtual ?
-			if ((strlen($g_resource->vtype)) && ($g_resource->vtype != "NULL")) {
-				$virtualization = new virtualization();
-				$virtualization->get_instance_by_id($g_resource->vtype);
-				if (strstr($virtualization->type, "-vm")) {
-					// virtual
-					$resources_virtual++;
-					$restype=1;
-				} else {
-					// physical
-					$resources_physical++;
-					$restype=0;
-				}
-			} else {
-				// we treat unknown system types as physical
-				$resources_physical++;
-				$restype=0;
-			}
-
-
-			// resource load
-			// is idle or active ?
-			if (("$g_resource->imageid" == "1") && ("$g_resource->state" == "active")) {
-				// idle
-				$resources_available++;
-				// virtual or physical ?
-				if ($restype == 0) {
-					$resources_available_physical++;
-				} else {
-					$resources_available_virtual++;
-				}
-			} else if ("$g_resource->state" == "active") {
-				// active
-				$resources_active++;
-				$dc_load_overall = $dc_load_overall + $g_resource->load;
-
-				// is storage ?
-				if (in_array($g_resource->id, $storage_resources_array)) {
-					$storage_active++;
-					$storage_load_overall = $storage_load_overall + $g_resource->load;
-					// is peak ?
-					if ($g_resource->load > $storage_load_peak) {
-						$storage_load_peak =  $g_resource->load;
-					}
-				}
-				// is appliance ?
-				if (in_array($g_resource->id, $appliance_resources_array)) {
-					$appliance_active++;
-					$appliance_load_overall = $appliance_load_overall + $g_resource->load;
-					// is peak ?
-					if ($g_resource->load > $appliance_load_peak) {
-						$appliance_load_peak =  $g_resource->load;
-					}
-				}
-
-
-			} else if ("$g_resource->state" == "error") {
-				// error
-				$resources_error++;
-				// is storage ?
-				if (in_array($g_resource->id, $storage_resources_array)) {
-					$storage_error++;
-				}
-				// is appliance ?
-				if (in_array($g_resource->id, $appliance_resources_array)) {
-					$appliance_error++;
-				}
-			}
-		}
-		// end of gathering
-
-		// divide with number of active resources, appliances + storages
-		if ($resources_active != 0) {
-			$dc_load_overall = $dc_load_overall/$resources_active;
-			$dc_load_overall = number_format($dc_load_overall, 2, '.', '');
-		}
-		if ($appliance_active != 0) {
-			$appliance_load_overall = $appliance_load_overall/$appliance_active;
-			$appliance_load_overall = number_format($appliance_load_overall, 2, '.', '');
-		}
-		if ($storage_active != 0) {
-			$storage_load_overall = $storage_load_overall/$storage_active;
-			$storage_load_overall = number_format($storage_load_overall, 2, '.', '');
-		}
-
-		echo "$dc_load_overall,$storage_load_overall,$storage_load_peak,$appliance_load_overall,$appliance_load_peak,$resources_all,$resources_physical,$resources_virtual,$resources_available,$resources_available_physical,$resources_available_virtual,$resources_error,$appliance_error,$storage_error";
-		exit(0);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get the last 10 event log entries
-	 * TODO: Add param 'limit'
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function eventlist() {
-		// check permissions
-		$this->controller->openqrm->init();
-		$class ='event_controller';
-		$path  = $this->controller->openqrm->get('webdir').'/server/event/class/event.controller.class.php';
-		$role  = $this->controller->openqrm->role($this->response);
-		require_once($path);
-		$controller = new $class($this->controller->openqrm, $this->response);
-		$_REQUEST[$controller->actions_name] = 'select';
-		$data = $role->check_permission($controller, true);
-		if($data === true) {
-			$event = new event();
-			$event_list = $event->display_overview(0,14,'event_time','desc');	// $offset, $limit, $sort, $order, $mode = null
-			echo json_encode($event_list);
-		} else {
-			$msg = array(
-						array(
-							'event_priority' => '9',
-							'event_source' => 'Permissions',
-							'event_time' => time(),
-							'event_description' => 'Permission denied for action <i>select</i> on controller <i>events</i>',
-						)
-					);
-			echo json_encode($msg);
-		}
-		exit(0);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get datacenter load statistics
-	 * currently used in the dashboard load chart
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function statistics() {
-		require_once($this->controller->openqrm->get('basedir').'/web/base/server/aa_server/class/datacenter.class.php');
-		$data = new datacenter();
-		echo json_encode($data->get());
-		exit(0);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get full storage list.
-	 * Storage type names are injected in storageList
-	 * used in the dashboard load chart
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function storage_list() {
-			require_once($this->controller->openqrm->get('basedir').'/web/base/class/storage.class.php');
-			require_once($this->controller->openqrm->get('basedir').'/web/base/class/deployment.class.php');
-			
-			$deploymentObj = new deployment();
-			foreach($deploymentObj->get_storagedescription_list() as $deploymentType){
-				$deploymentMap[$deploymentType['value']] = $deploymentType['label'];
-			}
-
-			$storageObj = new storage();
-			$list = $storageObj->get_full_storage_list();
-			$storageList = array();
-			$i=0;
-			foreach($list as $key => $storage) {
-				// check deployment type exists
-				if(isset($deploymentMap[$storage['storage_type']])) {
-					$storageList[$i]['storage_type'] = $deploymentMap[$storage['storage_type']];
-					$i++;
-				}
-			}
-			echo json_encode($storageList);
-			exit(0);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get full server list. 
-	 * Virtualization names are injected as string in applist
-	 * used in the dashboard server donut chart
-	 * TODO: Make limit in "display_overview()" call dynamic (e.g. no. of servers)
-	 * 
-	 * @access public
-	 */
-	//--------------------------------------------
-	function server_list() {
-			require_once($this->controller->openqrm->get('basedir').'/web/base/class/appliance.class.php');
-			require_once($this->controller->openqrm->get('basedir').'/web/base/class/virtualization.class.php');
-
-			$virtObj = new virtualization();
-			$list = $virtObj->get_list();
-			foreach($list as $virtualization) {
-				$virtualizationMap[$virtualization['value']] = $virtualization['label'];
-			}
-			
-			$applianceObj = new appliance();
-			$list = $applianceObj->display_overview(0, 1000, 'appliance_id', '');
-			$applist = array();
-			$i=0;
-			foreach($list as $appliance) {
-				// check virtualization type exists
-				if(isset($virtualizationMap[$appliance['appliance_virtualization']])) {
-					$applist[$i]['appliance_virtualization'] = $virtualizationMap[$appliance['appliance_virtualization']];
-					$i++;
-				}
-			}
-			echo json_encode($applist);
-			exit(0);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Method to map event_priority to status strings. 
-	 * 
-	 * @todo	Should be moved to event object
-	 * @param	int $event_priority	
-	 * @return	string	status string
-	 */
-	//--------------------------------------------
-	function __getEventStatus($event_priority) {
-		switch ($event_priority) {
-			/*
-			case 0: $icon = "off.png"; 	break;
-			case 1: $icon = "error.png"; break;
-			case 2: $icon = "error.png"; break;
-			case 3:	$icon = "error.png"; break;
-			case 4:	$icon = "unknown.png"; break;
-			case 5:	$icon = "active.png"; break;
-			case 6:	$icon = "idle.png"; break;
-			case 7:	$icon = "idle.png"; break;
-			case 8:	$icon = "idle.png"; break;
-			case 9:	$icon = "transition.png"; break;
-			case 10:$icon = "active.png"; break;
-			*/
-		
-			case 0: 	
-				$status = 'disabled'; 	break;
-			case 1: 
-			case 2: 
-			case 3:	
-				$status = 'error'; break;		// error event
-			case 4:	
-			case 5:	
-			case 6:	
-			case 7:	
-			case 8:	
-				$status = 'notice'; break;	// undefined event
-			case 9:	
-				$status = 'running'; break;	// active event
-			case 10:
-				$status = 'ok'; break;		// notice event
-			default:
-				$status = 'unkown'; break;
-		
-		}
-		return $status;
-	}
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/class/datacenter.class.php b/openQRM-5.3.50-CE/src/web/base/server/aa_server/class/datacenter.class.php
deleted file mode 100644
index 524729b..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/class/datacenter.class.php
+++ /dev/null
@@ -1,322 +0,0 @@
-<?php
-/**
- * @package openQRM
- */
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once $RootDir."/include/openqrm-database-functions.php";
-require_once $RootDir."/class/resource.class.php";
-require_once $RootDir."/class/storage.class.php";
-require_once $RootDir."/class/appliance.class.php";
-require_once $RootDir."/class/event.class.php";
-
-
-/**
- * This class represents the datacenter statistics for the openQRM Dashboard
- *
- * @package openQRM
- * @author Matt Rechenburg <mattr_sf@users.sourceforge.net>
- * @version 1.0
- * @author M. Rechenburg, A. Kuballa
- * @version 1.1 added documentation
- * @copyright Copyright 2013, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-class datacenter
-{
-
-/**
-* datacenter id
-* @access protected
-* @var int
-*/
-var $id = '';
-/**
-* datacenter load_overall
-* @access protected
-* @var string
-*/
-var $load_overall = '';
-/**
-* datacenter load_server
-* @access protected
-* @var date
-*/
-var $load_server = '';
-/**
-* datacenter load_storage
-* @access protected
-* @var int
-*/
-var $load_storage = '';
-/**
-* datacenter cpu_total
-* @access protected
-* @var string
-*/
-var $cpu_total = '';
-/**
-* datacenter mem_total
-* @access protected
-* @var string
-*/
-var $mem_total = '';
-/**
-* datacenter mem_used
-* @access protected
-* @var string
-*/
-var $mem_used = '';
-/**
-* datacenter resolution
-* @access protected
-* @var string
-*/
-var $resolution = 60;
-/**
-* datacenter last statistic id
-* @access protected
-* @var string
-*/
-var $oldest_statistics_id = '';
-/**
-* datacenter time of the last statistics
-* @access protected
-* @var string
-*/
-var $last_statistics = '';
-
-
-
-
-	//--------------------------------------------------
-	/**
-	* Constructor
-	*/
-	//--------------------------------------------------
-	function datacenter() {
-		$this->init();
-	}
-
-	//--------------------------------------------------
-	/**
-	* init datacenter environment
-	* @access public
-	*/
-	//--------------------------------------------------
-	function init() {
-		$this->_db_table = 'datacenter_info';
-		$this->RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-		$this->event = new event();
-	}
-
-	
-		//--------------------------------------------------
-	/**
-	* get number of statistics in datacenter
-	* @access public
-	* @return int
-	*/
-	//--------------------------------------------------
-	function get_count() {
-		$count=0;
-		$sql = "select count(datacenter_id) as num from ".$this->_db_table;
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute($sql);
-		if (!$rs) {
-			$this->log("get_count", $_SERVER['REQUEST_TIME'], 2, "datacenter.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			$count = $rs->fields["num"];
-		}
-		return $count;
-	}
-
-
-
-
-	//--------------------------------------------------
-	/**
-	* add statistics to datacenter
-	* <code>
-	* $datacenter = new datacenter();
-	* $datacenter->statistics();
-	* </code>
-	* @access public
-	* @param int $datacenter_id
-	* @param array $datacenter_fields
-	* @return bool
-	*/
-	//--------------------------------------------------e
-	function statistics() {
-		$resources_all = 0;
-		$resources_active = 0;
-		$resources_available = 0;
-		$dc_load_overall = 0;
-		$appliance_load_overall = 0;
-		$appliance_active = 0;
-		$storage_load_overall = 0;
-		$storage_active = 0;
-		$cpu_total = 0;
-		$mem_used = 0;
-		$mem_total = 0;
-
-		// run only each minute
-		$db=openqrm_get_db_connection();
-		$rs = $db->Execute("select MAX(datacenter_id) from $this->_db_table");
-		foreach ($rs as $index => $dc) {
-			if (isset($dc['MAX(datacenter_id)'])) {
-				$this->last_statistics = $dc['MAX(datacenter_id)'];
-			} else if (isset($dc['max'])) {
-				$this->last_statistics = $dc['max'];
-			}
-		}
-		// get an array of resources which are assigned to an appliance
-		$appliance_resources_array = array();
-		$appliance = new appliance();
-		$appliance_list = $appliance->get_all_ids();
-		foreach ($appliance_list as $app) {
-			$app_id = $app['appliance_id'];
-			$g_appliance = new appliance();
-			$g_appliance->get_instance_by_id($app_id);
-			$g_appliance_resource = $g_appliance->resources;
-			if ((!strcmp($g_appliance->state, "active")) || ($g_appliance_resource == 0)) {
-				if ($g_appliance_resource != "-1") {
-					$appliance_resources_array[] .= $g_appliance_resource;
-				}
-			}
-		}
-		// get an array of resources which are a storage server
-		$storage_resources_array = array();
-		$storage = new storage();
-		$storage_list = $storage->get_list();
-		foreach ($storage_list as $store) {
-			$storage_id = $store['value'];
-			$g_storage = new storage();
-			$g_storage->get_instance_by_id($storage_id);
-			$g_storage_resource = $g_storage->resource_id;
-			$storage_resources_array[] .= $g_storage_resource;
-
-		}
-
-		$resource = new resource();
-		$resource_list = $resource->get_list();
-		foreach ($resource_list as $res) {
-			$res_id = $res['resource_id'];
-			//echo "!! res_id $res_id <br>";
-			$g_resource = new resource();
-			$g_resource->get_instance_by_id($res_id);
-			// start gathering
-			$resources_all++;
-			$cpu_total = $cpu_total + $g_resource->cpunumber;
-			$mem_used = $mem_used + $g_resource->memused;
-			$mem_total = $mem_total + $g_resource->memtotal;
-			// resource load
-			if (("$g_resource->imageid" == "1") && ("$g_resource->state" == "active")) {
-				// idle
-				$resources_available++;
-			} else if ("$g_resource->state" == "active") {
-				// active
-				$resources_active++;
-				$dc_load_overall = $dc_load_overall + $g_resource->load;
-				// is storage ?
-				if (in_array($g_resource->id, $storage_resources_array)) {
-					$storage_active++;
-					$storage_load_overall = $storage_load_overall + $g_resource->load;
-				}
-				// is appliance ?
-				if (in_array($g_resource->id, $appliance_resources_array)) {
-					$appliance_active++;
-					$appliance_load_overall = $appliance_load_overall + $g_resource->load;
-				}
-			}
-		}
-		if ($resources_active != 0) {
-			$dc_load_overall = $dc_load_overall/$resources_active;
-			$dc_load_overall = number_format($dc_load_overall, 2, '.', '');
-		}
-		if ($appliance_active != 0) {
-			$appliance_load_overall = $appliance_load_overall/$appliance_active;
-			$appliance_load_overall = number_format($appliance_load_overall, 2, '.', '');
-		}
-		if ($storage_active != 0) {
-			$storage_load_overall = $storage_load_overall/$storage_active;
-			$storage_load_overall = number_format($storage_load_overall, 2, '.', '');
-		}
-		
-		$datacenter_fields = array();
-		$datacenter_fields['datacenter_load_overall'] = $dc_load_overall;
-		$datacenter_fields['datacenter_load_server'] = $appliance_load_overall;
-		$datacenter_fields['datacenter_load_storage'] = $storage_load_overall;
-		$datacenter_fields['datacenter_cpu_total'] = $cpu_total;
-		$datacenter_fields['datacenter_mem_total'] = $mem_total;
-		$datacenter_fields['datacenter_mem_used'] = $mem_used;
-		
-		$stats_count = $this->get_count();
-		if ($stats_count >= $this->resolution) {
-			$rs = $db->Execute("select MIN(datacenter_id) from $this->_db_table");
-			foreach ($rs as $index => $dc) {
-				if (isset($dc['MIN(datacenter_id)'])) {
-					$this->oldest_statistics_id = $dc['MIN(datacenter_id)'];
-				} else if (isset($dc['min'])) {
-					$this->oldest_statistics_id = $dc['min'];
-				}
-			}
-			$rs = $db->Execute("delete from $this->_db_table where datacenter_id=$this->oldest_statistics_id");
-			$stats_count = $this->get_count();
-		}
-		$datacenter_fields['datacenter_id'] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-		$result = $db->AutoExecute($this->_db_table, $datacenter_fields, 'INSERT');
-		if (! $result) {
-			$this->event->log("add", $_SERVER['REQUEST_TIME'], 2, "datacenter.class.php", "Failed updating datacenter ".$datacenter_fields['datacenter_id'], "", "", 0, 0, 0);
-		}
-	}
-
-
-	//--------------------------------------------------
-	/**
-	* get an array of datacenter statistics
-	* <code>
-	* $datacenter = new datacenter();
-	* $arr = $datacenter->get_list();
-	* // $arr[0]['value']
-	* // $arr[0]['label']
-	* </code>
-	* @access public
-	* @return array
-	*/
-	//--------------------------------------------------
-	function get() {
-		$sql = "select * from ".$this->_db_table." order by datacenter_id ASC";
-		$db=openqrm_get_db_connection();
-		$recordSet = $db->SelectLimit($sql, 60, 0);
-		$datacenter_array = array();
-		if (!$recordSet) {
-			$this->log("get", $_SERVER['REQUEST_TIME'], 2, "datacenter.class.php", $db->ErrorMsg(), "", "", 0, 0, 0);
-		} else {
-			while (!$recordSet->EOF) {
-				array_push($datacenter_array, $recordSet->fields);
-				$recordSet->MoveNext();
-			}
-			$recordSet->Close();
-		}
-		return $datacenter_array;
-		
-	}
-
-
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/class/datacenter.controller.class.php b/openQRM-5.3.50-CE/src/web/base/server/aa_server/class/datacenter.controller.class.php
deleted file mode 100644
index d8a9009..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/class/datacenter.controller.class.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-/**
- * Datacenter Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class datacenter_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'datacenter_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "datacenter_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'datacenter_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'datacenter_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'dashboard' => array (
-		'tab' => 'Datacenters',
-		'label' => 'Datacenters',
-		'title' => 'openQRM Datacenter Dashboard',
-		'load_headline' => 'Datacenter Load',
-		'load_current' => 'current',
-		'load_last_hour' => 'last hour',
-		'inventory_headline' => 'Inventory',
-		'inventory_servers' => 'Server by type',
-		'inventory_storages' => 'Storage Pool',
-		'events_headline' => 'Events',
-		'events_date' => 'Date',
-		'events_source' => 'Source',
-		'events_description' => 'Description',
-		'datacenter_load_overall' => 'Datacenter <small>(overall)</small>',
-		'appliance_load_overall' => 'Server',
-		'storage_load_overall' => 'Storage',
-		'link_server_management' => 'Server Management',
-		'link_storage_management' => 'Storage Management',
-		'no_data_available' => 'No Data available',
-		'please_wait' => 'Loading. Please wait ..',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->tpldir   = $this->rootdir.'/server/aa_server/tpl';
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/server/aa_server/lang", 'datacenter.ini');
-//		$response->html->debug();
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "dashboard";
-		}
-
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'dashboard':
-				$content[] = $this->dashboard(true);
-			break;
-		}
-
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->rootdir.'/server/aa_server/class/datacenter.api.class.php');
-		$controller = new datacenter_api($this);
-		$controller->action();
-	}
-
-	
-	//--------------------------------------------
-	/**
-	 * Datacenter Dashboard
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function dashboard( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/aa_server/class/datacenter.dashboard.class.php');
-			$controller = new datacenter_dashboard($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['dashboard'];
-			$data = $controller->action();
-		}
-		$content['label'] = $this->lang['dashboard']['tab'];
-		$content['value'] = $data;
-		$content['target'] = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'dashboard' );
-		$content['onclick'] = false;
-		if($this->action === 'dashboard'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/class/datacenter.dashboard.class.php b/openQRM-5.3.50-CE/src/web/base/server/aa_server/class/datacenter.dashboard.class.php
deleted file mode 100644
index 38ab941..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/class/datacenter.dashboard.class.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-/**
- * Datacenter Dashboard
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class datacenter_dashboard
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'datacenter_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "datacenter_msg";
-
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'datacenter_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/datacenter-dashboard.tpl.php');
-		
-		$t->add($this->lang['title'], 'title');
-		$t->add($this->lang['load_headline'], 'load_headline');
-		$t->add($this->lang['load_current'], 'load_current');
-		$t->add($this->lang['load_last_hour'], 'load_last_hour');
-		$t->add($this->lang['datacenter_load_overall'], 'datacenter_load_overall');
-		$t->add($this->lang['appliance_load_overall'], 'appliance_load_overall');
-		$t->add($this->lang['storage_load_overall'], 'storage_load_overall');
-		$t->add($this->lang['inventory_headline'], 'inventory_headline');
-		$t->add($this->lang['inventory_servers'], 'lang_inventory_servers');
-		$t->add($this->lang['inventory_storages'], 'lang_inventory_storages');
-		$t->add($this->lang['events_headline'], 'events_headline');
-		$t->add($this->lang['events_date'], 'events_date');
-		$t->add($this->lang['events_source'], 'events_source');
-		$t->add($this->lang['events_description'], 'events_description');
-		$t->add($this->lang['no_data_available'], 'no_data_available');
-
-/*
-		$t->add($this->lang['resource_overview'], 'resource_overview');
-		$t->add($this->lang['resource_load_physical'], 'resource_load_physical');
-		$t->add($this->lang['resource_load_vm'], 'resource_load_vm');
-		$t->add($this->lang['resource_available_overall'], 'resource_available_overall');
-		$t->add($this->lang['resource_available_physical'], 'resource_available_physical');
-		$t->add($this->lang['resource_available_vm'], 'resource_available_vm');
-		$t->add($this->lang['resource_error_overall'], 'resource_error_overall');
-		$t->add($this->lang['appliance_overview'], 'appliance_overview');
-		$t->add($this->lang['appliance_load_peak'], 'appliance_load_peak');
-		$t->add($this->lang['appliance_error_overall'], 'appliance_error_overall');
-		$t->add($this->lang['storage_overview'], 'storage_overview');
-		$t->add($this->lang['storage_load_peak'], 'storage_load_peak');
-		$t->add($this->lang['storage_error_overall'], 'storage_error_overall');
-*/
-
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->group_elements(array('param_' => 'form'));
-		
-		
-		$link_server = $this->response->html->a();
-		$link_server->label = $this->lang['link_server_management'];
-		$link_server->title = 'Server Management';
-		$link_server->href = 'index.php?base=appliance';
-		$link_server->css = 'btn add';
-		$t->add($link_server, 'link_server_management');
-		
-		$link_storage = $this->response->html->a();
-		$link_storage->label = $this->lang['link_storage_management'];
-		$link_storage->title = 'Server Management';
-		$link_storage->href = 'index.php?base=storage';
-		$link_storage->css = 'btn add';
-		$t->add($link_storage, 'link_storage_management');
-
-		
-		// Get dashboard quicklink from hook files
-		$quicklinks = $this->build_quicklinks();
-		if(count($quicklinks) > 0) {
-			$t->add('<h2>Quicklinks</h2>', 'quicklinks_headline');
-			$t->add(implode('', $quicklinks), 'quicklinks');
-		} else {
-			
-			// TODO: find nicer way to 'unset' view markers if not needed
-			//		 perhaps htmlobjects can do the job
-			$t->add('', 'quicklinks_headline');
-			$t->add('', 'quicklinks');
-		}
-		
-		return $t;
-	}
-
-
-
-	//--------------------------------------------
-	/**
-	 * build_quicklinks: Scan directories of started plugins for the 
-	 * dashboard quicklink hook and call hook method
-	 *
-	 * @access private
-	 * @return array
-	 */
-	//--------------------------------------------
-	private function build_quicklinks() {
-	
-		$quicklinks = array();
-		$plugin = new plugin();
-		$started_plugins = $plugin->started();			// get list of running plugins
-		
-		foreach ($started_plugins as $plugin_name) {
-			
-			$hook_file = $this->openqrm->get('webdir')."/plugins/".$plugin_name."/openqrm-".$plugin_name."-dashboard-quicklink-hook.php";
-			if (file_exists($hook_file)) {
-				require_once $hook_file;
-				
-				$hook_function = 'get_'.$plugin_name.'_dashboard_quicklink';
-				if(function_exists($hook_function)) {
-
-					$link = $hook_function($this->response->html);
-					if(is_object($link)) {
-						$quicklinks[] = $link->get_string();
-					}
-				}
-			}
-		}
-		return $quicklinks;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/css/aa_server.css b/openQRM-5.3.50-CE/src/web/base/server/aa_server/css/aa_server.css
deleted file mode 100644
index 1a39016..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/css/aa_server.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Override default margin in dashboard */
-.aa_server h2 {
-	margin-top: 30px;
-	border-bottom: 1px solid #ccc;
-}
-
-.aa_server h2 .widget-action {
-	font-size:12px;
-	opacity: 0.7;
-	text-decoration: none;
-	color: #353535;
-}
-.aa_server h2 .widget-action *{
-	vertical-align: baseline;
-}
-.aa_server .eventtable td {
-	font-size: 85%;	
-}
-.aa_server .donut-chart-legend {
-	margin-top:-25px;
-}
-.aa_server .donut-chart-legend ul {
-	list-style: none;
-	margin: 0;
-	padding-left: 40px;
-}
-.aa_server .donut-chart-legend ul li {
-	font-size: 11px;
-}
-
-.aa_server .donut-chart-legend li .legend-tile {
-	width: 10px;
-	height: 10px;
-	background: #bababa;
-	float: left;
-	display: inline;
-	margin: 5px 5px 0 0;
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/css/jquery.jqplot.min.css b/openQRM-5.3.50-CE/src/web/base/server/aa_server/css/jquery.jqplot.min.css
deleted file mode 100644
index 4cd9d55..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/css/jquery.jqplot.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.jqplot-target{position:relative;color:#666;font-family:"Trebuchet MS",Arial,Helvetica,sans-serif;font-size:1em;}.jqplot-axis{font-size:.75em;}.jqplot-xaxis{margin-top:10px;}.jqplot-x2axis{margin-bottom:10px;}.jqplot-yaxis{margin-right:10px;}.jqplot-y2axis,.jqplot-y3axis,.jqplot-y4axis,.jqplot-y5axis,.jqplot-y6axis,.jqplot-y7axis,.jqplot-y8axis,.jqplot-y9axis{margin-left:10px;margin-right:10px;}.jqplot-axis-tick,.jqplot-xaxis-tick,.jqplot-yaxis-tick,.jqplot-x2axis-tick,.jqplot-y2axis-tick,.jqplot-y3axis-tick,.jqplot-y4axis-tick,.jqplot-y5axis-tick,.jqplot-y6axis-tick,.jqplot-y7axis-tick,.jqplot-y8axis-tick,.jqplot-y9axis-tick{position:absolute;}.jqplot-xaxis-tick{top:0;left:15px;vertical-align:top;}.jqplot-x2axis-tick{bottom:0;left:15px;vertical-align:bottom;}.jqplot-yaxis-tick{right:0;top:15px;text-align:right;}.jqplot-y2axis-tick,.jqplot-y3axis-tick,.jqplot-y4axis-tick,.jqplot-y5axis-tick,.jqplot-y6axis-tick,.jqplot-y7axis-tick,.jqplot-y8axis-tick,.jqplot-y9axis-tick{left:0;top:15px;text-align:left;}.jqplot-meterGauge-tick{font-size:.75em;color:#999;}.jqplot-meterGauge-label{font-size:1em;color:#999;}.jqplot-xaxis-label{margin-top:10px;font-size:11pt;position:absolute;}.jqplot-x2axis-label{margin-bottom:10px;font-size:11pt;position:absolute;}.jqplot-yaxis-label{margin-right:10px;font-size:11pt;position:absolute;}.jqplot-y2axis-label,.jqplot-y3axis-label,.jqplot-y4axis-label,.jqplot-y5axis-label,.jqplot-y6axis-label,.jqplot-y7axis-label,.jqplot-y8axis-label,.jqplot-y9axis-label{font-size:11pt;position:absolute;}table.jqplot-table-legend{margin-top:12px;margin-bottom:12px;margin-left:12px;margin-right:12px;}table.jqplot-table-legend,table.jqplot-cursor-legend{background-color:rgba(255,255,255,0.6);border:1px solid #ccc;position:absolute;font-size:.75em;}td.jqplot-table-legend{vertical-align:middle;}td.jqplot-seriesToggle:hover,td.jqplot-seriesToggle:active{cursor:pointer;}td.jqplot-table-legend>div{border:1px solid #ccc;padding:1px;}div.jqplot-table-legend-swatch{width:0;height:0;border-top-width:5px;border-bottom-width:5px;border-left-width:6px;border-right-width:6px;border-top-style:solid;border-bottom-style:solid;border-left-style:solid;border-right-style:solid;}.jqplot-title{top:0;left:0;padding-bottom:.5em;font-size:1.2em;}table.jqplot-cursor-tooltip{border:1px solid #ccc;font-size:.75em;}.jqplot-cursor-tooltip{border:1px solid #ccc;font-size:.75em;white-space:nowrap;background:rgba(208,208,208,0.5);padding:1px;}.jqplot-highlighter-tooltip{border:1px solid #ccc;font-size:.75em;white-space:nowrap;background:rgba(208,208,208,0.5);padding:1px;}.jqplot-point-label{font-size:.75em;z-index:2;}td.jqplot-cursor-legend-swatch{vertical-align:middle;text-align:center;}div.jqplot-cursor-legend-swatch{width:1.2em;height:.7em;}.jqplot-error{text-align:center;}.jqplot-error-message{position:relative;top:46%;display:inline-block;}div.jqplot-bubble-label{font-size:.8em;padding-left:2px;padding-right:2px;color:rgb(20%,20%,20%);}div.jqplot-bubble-label.jqplot-bubble-label-highlight{background:rgba(90%,90%,90%,0.7);}
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/dc-overview.php b/openQRM-5.3.50-CE/src/web/base/server/aa_server/dc-overview.php
deleted file mode 100644
index 0ed73cd..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/dc-overview.php
+++ /dev/null
@@ -1,797 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-$thisfile = basename($_SERVER['PHP_SELF']);
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/appliance.class.php";
-require_once "$RootDir/class/kernel.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/include/htmlobject.inc.php";
-
-
-
-if(htmlobject_request('action') != '') {
-	switch (htmlobject_request('action')) {
-		case 'get_dc_status':
-			// number of idle systems
-			$resources_all = 0;
-			// active deployed resources
-			$resources_active = 0;
-			// resources in error state
-			$resources_error = 0;
-			// physical resources
-			$resources_physical = 0;
-			// virtual resources
-			$resources_virtual = 0;
-			// number of idle systems
-			$resources_available = 0;
-			// physical resource available
-			$resources_available_physical = 0;
-			// virtal resource available
-			$resources_available_virtual = 0;
-			// overall load
-			$dc_load_overall = 0;
-			// active appliance load
-			$appliance_load_overall = 0;
-			// peak in appliance load
-			$appliance_load_peak = 0;
-			// active appliances
-			$appliance_active = 0;
-			// active appliance with resource in error state
-			$appliance_error = 0;
-			// storage load
-			$storage_load_overall = 0;
-			// storage peak
-			$storage_load_peak = 0;
-			// active storages
-			$storage_active = 0;
-			// storage with resource in error state
-			$storage_error = 0;
-
-			// get an array of resources which are assigned to an appliance
-			$appliance_resources_array = array();
-			$appliance = new appliance();
-			$appliance_list = $appliance->get_all_ids();
-			foreach ($appliance_list as $app) {
-				$app_id = $app['appliance_id'];
-				$g_appliance = new appliance();
-				$g_appliance->get_instance_by_id($app_id);
-				$g_appliance_resource = $g_appliance->resources;
-				if ((!strcmp($g_appliance->state, "active")) || ($g_appliance_resource == 0)) {
-					if ($g_appliance_resource != "-1") {
-						$appliance_resources_array[] .= $g_appliance_resource;
-					}
-				}
-			}
-			// get an array of resources which are a storage server
-			$storage_resources_array = array();
-			$storage = new storage();
-			$storage_list = $storage->get_list();
-			foreach ($storage_list as $store) {
-				$storage_id = $store['value'];
-				$g_storage = new storage();
-				$g_storage->get_instance_by_id($storage_id);
-				$g_storage_resource = $g_storage->resource_id;
-				$storage_resources_array[] .= $g_storage_resource;
-
-			}
-
-			$restype = 0;
-			$resource = new resource();
-			$resource_list = $resource->get_list();
-			foreach ($resource_list as $res) {
-				$res_id = $res['resource_id'];
-				//echo "!! res_id $res_id <br>";
-				$g_resource = new resource();
-				$g_resource->get_instance_by_id($res_id);
-				// start gathering
-				$resources_all++;
-				// physical or virtual ?
-				if ((strlen($g_resource->vtype)) && ($g_resource->vtype != "NULL")) {
-					$virtualization = new virtualization();
-					$virtualization->get_instance_by_id($g_resource->vtype);
-					if (strstr($virtualization->type, "-vm")) {
-						// virtual
-						$resources_virtual++;
-						$restype=1;
-					} else {
-						// physical
-						$resources_physical++;
-						$restype=0;
-					}
-				} else {
-					// we treat unknown system types as physical
-					$resources_physical++;
-					$restype=0;
-				}
-
-
-				// resource load
-				// is idle or active ?
-				if (("$g_resource->imageid" == "1") && ("$g_resource->state" == "active")) {
-					// idle
-					$resources_available++;
-					// virtual or physical ?
-					if ($restype == 0) {
-						$resources_available_physical++;
-					} else {
-						$resources_available_virtual++;
-					}
-				} else if ("$g_resource->state" == "active") {
-					// active
-					$resources_active++;
-					$dc_load_overall = $dc_load_overall + $g_resource->load;
-
-					// is storage ?
-					if (in_array($g_resource->id, $storage_resources_array)) {
-						$storage_active++;
-						$storage_load_overall = $storage_load_overall + $g_resource->load;
-						// is peak ?
-						if ($g_resource->load > $storage_load_peak) {
-							$storage_load_peak =  $g_resource->load;
-						}
-					}
-					// is appliance ?
-					if (in_array($g_resource->id, $appliance_resources_array)) {
-						$appliance_active++;
-						$appliance_load_overall = $appliance_load_overall + $g_resource->load;
-						// is peak ?
-						if ($g_resource->load > $appliance_load_peak) {
-							$appliance_load_peak =  $g_resource->load;
-						}
-					}
-
-
-				} else if ("$g_resource->state" == "error") {
-					// error
-					$resources_error++;
-					// is storage ?
-					if (in_array($g_resource->id, $storage_resources_array)) {
-						$storage_error++;
-					}
-					// is appliance ?
-					if (in_array($g_resource->id, $appliance_resources_array)) {
-						$appliance_error++;
-					}
-				}
-			}
-			// end of gathering
-
-			// divide with number of active resources, appliances + storages
-			if ($resources_active != 0) {
-				$dc_load_overall = $dc_load_overall/$resources_active;
-				$dc_load_overall = number_format($dc_load_overall, 2, '.', '');
-			}
-			if ($appliance_active != 0) {
-				$appliance_load_overall = $appliance_load_overall/$appliance_active;
-				$appliance_load_overall = number_format($appliance_load_overall, 2, '.', '');
-			}
-			if ($storage_active != 0) {
-				$storage_load_overall = $storage_load_overall/$storage_active;
-				$storage_load_overall = number_format($storage_load_overall, 2, '.', '');
-			}
-
-
-			echo "$dc_load_overall,$storage_load_overall,$storage_load_peak,$appliance_load_overall,$appliance_load_peak,$resources_all,$resources_physical,$resources_virtual,$resources_available,$resources_available_physical,$resources_available_virtual,$resources_error,$appliance_error,$storage_error";
-			exit(0);
-			break;
-
-
-
-		// event status
-		case 'get_event_status':
-			// how many errors to show in the ui
-			$max_show_error = 10;
-			// all events
-			$events_all = 0;
-			// all error events
-			$events_error = 0;
-
-			$table = new htmlobject_table_identifiers_checked('event_id');
-
-			$arHead = array();
-			$arHead['event_icon'] = array();
-			$arHead['event_icon']['title'] ='';
-
-			$arHead['event_id'] = array();
-			$arHead['event_id']['title'] ='ID';
-
-			$arHead['event_description'] = array();
-			$arHead['event_description']['title'] ='Description';
-
-			$arBody = array();
-			$event = new event();
-			$event_list = $event->get_list();
-			foreach ($event_list as $ev) {
-				$events_all++;
-				$event_id = $ev['value'];
-				$g_event = new event();
-				$g_event->get_instance_by_id($event_id);
-				if (($g_event->priority <= 2) && ($g_event->status == 0)) {
-					// fill in event-error
-					$events_error++;
-					if ($events_error < $max_show_error) {
-						$arBody[] = array(
-							'event_icon' => "<img widht='16' height='16' src='/openqrm/base/img/error.png'>",
-							'event_id' => $g_event->id,
-							'event_description' => $g_event->description,
-						);
-					}
-				}
-			}
-			$table->id = 'Tabelle';
-			$table->css = 'htmlobject_table';
-			$table->border = 1;
-			$table->cellspacing = 0;
-			$table->cellpadding = 3;
-			$table->sort = '';
-			$table->head = $arHead;
-			$table->body = $arBody;
-			$table->max = $max_show_error;
-
-			// set template
-			$e = new Template_PHPLIB();
-			$e->debug = false;
-			$e->setFile('tplfile', $RootDir.'/server/aa_server/tpl/events-summary.tpl.php');
-			$e->setVar(array(
-				'events_all' => $events_all,
-				'events_error' => $events_error,
-				'events_error_table' => $table->get_string(),
-				'max_show_error' => $max_show_error,
-			));
-			$disp =  $e->parse('out', 'tplfile');
-			echo $disp;
-			exit(0);
-			break;
-
-
-
-		// event status
-		case 'get_resource_status':
-			// how many errors to show in the ui
-			$max_show_resources = 10;
-			// all resources
-			$res_all = 0;
-			// all available resources
-			$res_available = 0;
-			// all active resources
-			$res_active = 0;
-			// resources in error
-			$res_error = 0;
-
-			$table = new htmlobject_table_identifiers_checked('resource_id');
-
-			$arHead = array();
-			$arHead['resource_icon'] = array();
-			$arHead['resource_icon']['title'] ='';
-
-			$arHead['resource_id'] = array();
-			$arHead['resource_id']['title'] ='ID';
-
-			$arHead['resource_hostname'] = array();
-			$arHead['resource_hostname']['title'] ='Name';
-
-			$arHead['resource_ip'] = array();
-			$arHead['resource_ip']['title'] ='Ip-address';
-
-			$arHead['resource_mac'] = array();
-			$arHead['resource_mac']['title'] ='Mac-address';
-
-			$arHead['resource_load'] = array();
-			$arHead['resource_load']['title'] ='Load';
-
-			$arBody = array();
-			$resource = new resource();
-			// find active, error + available
-			$in_res_table=0;
-			$res_load_array = array();
-			$resource_list = $resource->get_list();
-			foreach ($resource_list as $res) {
-				$res_id = $res['resource_id'];
-				$g_resource = new resource();
-				$g_resource->get_instance_by_id($res_id);
-				// start gathering
-				$res_all++;
-				// resource load
-				// is idle or active ?
-				if (("$g_resource->imageid" == "1") && ("$g_resource->state" == "active")) {
-					// idle
-					$res_available++;
-				} else if ("$g_resource->state" == "active") {
-					// active
-					$res_active++;
-					// check load
-					$res_load_array[$g_resource->id] = $g_resource->load;
-				} else if ("$g_resource->state" == "error") {
-					// error
-					$res_error++;
-				}
-			}
-
-			// find the most loaded resources
-			arsort($res_load_array, true);
-			$sorted_res_load_array_ids = array_keys($res_load_array);
-			foreach ($sorted_res_load_array_ids as $ml_res_id) {
-				$l_resource = new resource();
-				$l_resource->get_instance_by_id($ml_res_id);
-				if (("$l_resource->state" == "active") && ("$l_resource->imageid" != "1")) {
-					if ($in_res_table < $max_show_resources) {
-						// fill in array body
-						$arBody[] = array(
-							'resource_icon' => "<img widht='16' height='16' src='/openqrm/base/img/active.png'>",
-							'resource_id' => $l_resource->id,
-							'resource_hostname' => $l_resource->hostname,
-							'resource_ip' => $l_resource->ip,
-							'resource_mac' => $l_resource->mac,
-							'resource_load' => $l_resource->load,
-						);
-						$in_res_table++;
-					} else {
-						break;
-					}
-				}
-			}
-
-			$table->id = 'Tabelle';
-			$table->css = 'htmlobject_table';
-			$table->border = 1;
-			$table->cellspacing = 0;
-			$table->cellpadding = 3;
-			$table->sort = '';
-			$table->head = $arHead;
-			$table->body = $arBody;
-			$table->max = $max_show_resources;
-
-			// set template
-			$e = new Template_PHPLIB();
-			$e->debug = false;
-			$e->setFile('tplfile', $RootDir.'/server/aa_server/tpl/resource-summary.tpl.php');
-			$e->setVar(array(
-				'resource_all' => $res_all,
-				'resource_available' => $res_available,
-				'resource_active' => $res_active,
-				'resource_error' => $res_error,
-				'resource_table' => $table->get_string(),
-				'max_show_resources' => $max_show_resources,
-			));
-			$disp =  $e->parse('out', 'tplfile');
-			echo $disp;
-			exit(0);
-			break;
-
-
-
-		// appliance status
-		case 'get_appliance_status':
-			// how many appliances to show in the ui
-			$max_show_appliance = 10;
-			// all appliances
-			$app_all = 0;
-			// all active appliances
-			$app_active = 0;
-			// all error events
-			$app_error = 0;
-
-			$table = new htmlobject_table_identifiers_checked('appliance_id');
-
-			$arHead = array();
-			$arHead['appliance_icon'] = array();
-			$arHead['appliance_icon']['title'] ='';
-
-			$arHead['appliance_id'] = array();
-			$arHead['appliance_id']['title'] ='ID';
-
-			$arHead['appliance_name'] = array();
-			$arHead['appliance_name']['title'] ='Name';
-
-			$arHead['appliance_resource'] = array();
-			$arHead['appliance_resource']['title'] ='Res.';
-
-			$arHead['appliance_load'] = array();
-			$arHead['appliance_load']['title'] ='Load';
-
-			$in_app_table = 0;
-			$arBody = array();
-			$app_load_array = array();
-			$appliance = new appliance();
-			$appliance_list = $appliance->get_list();
-			foreach ($appliance_list as $ap) {
-				$app_all++;
-				$appliance_id = $ap['value'];
-				$g_appliance = new appliance();
-				$g_appliance->get_instance_by_id($appliance_id);
-				if ((!strcmp($g_appliance->state, "active")) || ($g_appliance->resources == 0)) {
-					// fill in app_all
-					$app_active++;
-					// check resource state
-					$a_resource = new resource();
-					$a_resource->get_instance_by_id($g_appliance->resources);
-					if ("$a_resource->state" == "active") {
-						$app_load = $a_resource->load;
-						$app_load_array[$g_appliance->id] = $a_resource->load;
-					} else if ("$a_resource->state" == "error") {
-						$app_error++;
-					}
-
-				}
-			}
-
-			// find the most loaded appliance
-			arsort($app_load_array, true);
-			$sorted_app_load_array_ids = array_keys($app_load_array);
-			foreach ($sorted_app_load_array_ids as $ml_app_id) {
-				$l_app = new appliance();
-				$l_app->get_instance_by_id($ml_app_id);
-				if ($in_app_table < $max_show_appliance) {
-					$l_res = new resource();
-					$l_res->get_instance_by_id($l_app->resources);
-					$l_app_load = $l_res->load;
-					// fill in array body
-					$arBody[] = array(
-						'appliance_icon' => "<img widht='16' height='16' src='/openqrm/base/img/active.png'>",
-						'appliance_id' => $l_app->id,
-						'appliance_name' => $l_app->name,
-						'appliance_resource' => $l_app->resources,
-						'appliance_load' => $l_app_load,
-					);
-					$in_app_table++;
-				} else {
-					break;
-				}
-			}
-
-			$table->id = 'Tabelle';
-			$table->css = 'htmlobject_table';
-			$table->border = 1;
-			$table->cellspacing = 0;
-			$table->cellpadding = 3;
-			$table->sort = '';
-			$table->head = $arHead;
-			$table->body = $arBody;
-			$table->max = $max_show_appliance;
-
-			// set template
-			$e = new Template_PHPLIB();
-			$e->debug = false;
-			$e->setFile('tplfile', $RootDir.'/server/aa_server/tpl/appliance-summary.tpl.php');
-			$e->setVar(array(
-				'appliance_all' => $app_all,
-				'appliance_error' => $app_error,
-				'appliance_active' => $app_active,
-				'appliance_table' => $table->get_string(),
-				'max_show_appliance_' => $max_show_appliance,
-			));
-			$disp =  $e->parse('out', 'tplfile');
-			echo $disp;
-			exit(0);
-			break;
-
-
-
-		// storage status
-		case 'get_storage_status':
-			// how many storages to show in the ui
-			$max_show_storage = 10;
-			// all storages
-			$store_all = 0;
-			// all storages in error
-			$store_error = 0;
-
-			$table = new htmlobject_table_identifiers_checked('storage_id');
-
-			$arHead = array();
-			$arHead['storage_icon'] = array();
-			$arHead['storage_icon']['title'] ='';
-
-			$arHead['storage_id'] = array();
-			$arHead['storage_id']['title'] ='ID';
-
-			$arHead['storage_name'] = array();
-			$arHead['storage_name']['title'] ='Name';
-
-			$arHead['storage_resource'] = array();
-			$arHead['storage_resource']['title'] ='Res.';
-
-			$arHead['storage_type'] = array();
-			$arHead['storage_type']['title'] ='Type';
-
-			$arHead['storage_load'] = array();
-			$arHead['storage_load']['title'] ='Load';
-
-
-			$arBody = array();
-			$store_load_array = array();
-			$storage = new storage();
-			$storage_list = $storage->get_list();
-
-			foreach ($storage_list as $st) {
-				$store_all++;
-				$storage_id = $st['value'];
-				$g_storage = new storage();
-				$g_storage->get_instance_by_id($storage_id);
-				// check resource state
-				$st_resource = new resource();
-				$st_resource->get_instance_by_id($g_storage->resource_id);
-				if ("$st_resource->state" == "active") {
-					$store_load = $st_resource->load;
-					$store_load_array[$g_storage->id] = $st_resource->load;
-				} else if ("$st_resource->state" == "error") {
-					$store_error++;
-				}
-			}
-
-			// find the most loaded storage
-			$in_store_table = 0;
-			arsort($store_load_array, true);
-			$sorted_store_load_array_ids = array_keys($store_load_array);
-			foreach ($sorted_store_load_array_ids as $ml_store_id) {
-				$l_store = new storage();
-				$l_store->get_instance_by_id($ml_store_id);
-				if ($in_store_table < $max_show_storage) {
-					// get resource load
-					$l_res = new resource();
-					$l_res->get_instance_by_id($l_store->resource_id);
-					$l_store_load = $l_res->load;
-					// get storage type
-					$deployment = new deployment();
-					$deployment->get_instance_by_id($l_store->type);
-
-					// fill in array body
-					$arBody[] = array(
-						'storage_icon' => "<img widht='16' height='16' src='/openqrm/base/img/active.png'>",
-						'storage_id' => $l_store->id,
-						'storage_name' => $l_store->name,
-						'storage_resource' => $l_store->resource_id,
-						'storage_type' => $deployment->storagedescription,
-						'storage_load' => $l_store_load,
-					);
-					$in_store_table++;
-				} else {
-					break;
-				}
-			}
-
-			$table->id = 'Tabelle';
-			$table->css = 'htmlobject_table';
-			$table->border = 1;
-			$table->cellspacing = 0;
-			$table->cellpadding = 3;
-			$table->sort = '';
-			$table->head = $arHead;
-			$table->body = $arBody;
-			$table->max = $max_show_storage;
-
-			// set template
-			$e = new Template_PHPLIB();
-			$e->debug = false;
-			$e->setFile('tplfile', $RootDir.'/server/aa_server/tpl/storage-summary.tpl.php');
-			$e->setVar(array(
-				'storage_all' => $store_all,
-				'storage_error' => $store_error,
-				'storage_table' => $table->get_string(),
-				'max_show_storage' => $max_show_storage,
-			));
-			$disp =  $e->parse('out', 'tplfile');
-			echo $disp;
-			exit(0);
-			break;
-
-
-
-		// cloud status
-		case 'get_cloud_status':
-
-			// check if the cloud is enabled
-			if (!file_exists($RootDir."plugins/cloud/.running")) {
-				echo "<br><br><br><h1>The Cloud is not enabled</h1>";
-				echo "<h4>Please enable (and start) it via the Plugin-Manager</h4>";
-				exit(0);
-			}
-			require_once "$RootDir/plugins/cloud/class/clouduser.class.php";
-			require_once "$RootDir/plugins/cloud/class/cloudrequest.class.php";
-			// how many cloud requests to show in the ui
-			$max_show_cr = 10;
-			// all cloud users
-			$cloud_users = 0;
-			// all cloud requests
-			$cr_all = 0;
-			// all active cloud requests
-			$cr_active = 0;
-			// active cloud appliances which resource are in error
-			$cloud_errors = 0;
-
-			$table = new htmlobject_table_identifiers_checked('cr_id');
-
-			$arHead = array();
-
-			$arHead['cr_icon'] = array();
-			$arHead['cr_icon']['title'] ='';
-
-			$arHead['cr_id'] = array();
-			$arHead['cr_id']['title'] ='ID';
-
-			$arHead['cr_user'] = array();
-			$arHead['cr_user']['title'] ='User';
-
-			$arHead['cr_state'] = array();
-			$arHead['cr_state']['title'] ='State';
-
-			$arHead['cr_app'] = array();
-			$arHead['cr_app']['title'] ='Appliance';
-
-			$arHead['cr_res'] = array();
-			$arHead['cr_res']['title'] ='Res.';
-
-			$arHead['cr_load'] = array();
-			$arHead['cr_load']['title'] ='Load';
-
-			$arBody = array();
-			$cloud_load_array = array();
-			$cr = new cloudrequest();
-			$cr_list = $cr->get_all_ids();
-
-			foreach ($cr_list as $cr_id_arr) {
-				$cr_id=$cr_id_arr['cr_id'];
-				$cr_all++;
-				$g_cr = new cloudrequest();
-				$g_cr->get_instance_by_id($cr_id);
-				if ($g_cr->status == 3) {
-					// fill active
-					$cr_active++;
-					// find most active cloud appliance
-					$c_app = new appliance();
-					$c_app->get_instance_by_id($g_cr->appliance_id);
-					$c_resource = new resource();
-					$c_resource->get_instance_by_id($c_app->resources);
-					if ("$c_resource->state" == "active") {
-						$cloud_load_array[$cr_id] = $c_resource->load;
-					} else if ("$c_resource->state" == "error") {
-						$cloud_errors++;
-					}
-				}
-			}
-
-			// find the most loaded cloud appliance
-			$in_cr_table = 0;
-			arsort($cloud_load_array, true);
-			$sorted_cr_load_array_ids = array_keys($cloud_load_array);
-			foreach ($sorted_cr_load_array_ids as $ml_cr_id) {
-				$l_cr = new cloudrequest();
-				$l_cr->get_instance_by_id($ml_cr_id);
-				if ($in_cr_table < $max_show_cr) {
-					$ml_cr = new cloudrequest();
-					$ml_cr->get_instance_by_id($ml_cr_id);
-					// get user
-					$ml_cr_user = new clouduser();
-					$ml_cr_user->get_instance_by_id($ml_cr->cu_id);
-					// get appliance
-					$ml_app = new appliance();
-					$ml_app->get_instance_by_id($ml_cr->appliance_id);
-					// get resource load
-					$cr_res = new resource();
-					$cr_res->get_instance_by_id($ml_app->resources);
-					$cr_load = $cr_res->load;
-					// fill in array body
-					$arBody[] = array(
-						'cr_icon' => "<img widht='16' height='16' src='/openqrm/base/img/active.png'>",
-						'cr_id' => $ml_cr->id,
-						'cr_user' => $ml_cr_user->name,
-						'cr_state' => "active",
-						'cr_app' => $ml_cr->appliance_id." / ".$ml_app->name,
-						'cr_res' => $cr_res->id,
-						'cr_load' => $cr_load,
-					);
-					$in_cr_table++;
-				} else {
-					break;
-				}
-			}
-			// how many cloud users we have ?
-			$cu = new clouduser();
-			$cloud_users = $cu->get_count();
-
-			$table->id = 'Tabelle';
-			$table->css = 'htmlobject_table';
-			$table->border = 1;
-			$table->cellspacing = 0;
-			$table->cellpadding = 3;
-			$table->sort = '';
-			$table->head = $arHead;
-			$table->body = $arBody;
-			$table->max = $max_show_cr;
-
-			// set template
-			$e = new Template_PHPLIB();
-			$e->debug = false;
-			$e->setFile('tplfile', $RootDir.'/server/aa_server/tpl/cloud-summary.tpl.php');
-			$e->setVar(array(
-				'cr_all' => $cr_all,
-				'cr_active' => $cr_active,
-				'cloud_users' => $cloud_users,
-				'cloud_errors' => $cloud_errors,
-				'cloud_table' => $table->get_string(),
-				'max_show_cr' => $max_show_cr,
-			));
-			$disp =  $e->parse('out', 'tplfile');
-			echo $disp;
-			exit(0);
-			break;
-
-		
-		case 'get_eventlist':
-		
-			$event = new event();
-			$event_list = $event->display_overview(0,10,'event_time','desc');			// $offset, $limit, $sort, $order, $mode = null
-			echo json_encode($event_list);
-		
-			exit(0);
-			break;
-
-	}
-}
-
-/**
- * Method to map event_priority to status strings. 
- * 
- * @todo	Should be moved to event object
- * @param	int $event_priority	
- * @return	string	status string
- */
-function getEventStatus($event_priority) {
-	switch ($event_priority) {
-		/*
-		case 0: $icon = "off.png"; 	break;
-		case 1: $icon = "error.png"; break;
-		case 2: $icon = "error.png"; break;
-		case 3:	$icon = "error.png"; break;
-		case 4:	$icon = "unknown.png"; break;
-		case 5:	$icon = "active.png"; break;
-		case 6:	$icon = "idle.png"; break;
-		case 7:	$icon = "idle.png"; break;
-		case 8:	$icon = "idle.png"; break;
-		case 9:	$icon = "transition.png"; break;
-		case 10:$icon = "active.png"; break;
-		*/
-		
-		case 0: 	
-			$status = 'disabled'; 	break;
-		case 1: 
-		case 2: 
-		case 3:	
-			$status = 'error'; break;		// error event
-		case 4:	
-		case 5:	
-		case 6:	
-		case 7:	
-		case 8:	
-			$status = 'notice'; break;	// undefined event
-		case 9:	
-			$status = 'running'; break;	// active event
-		case 10:
-			$status = 'ok'; break;		// notice event
-		default:
-			$status = 'unkown'; break;
-		
-	}
-	return $status;
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/09-jquery.min.js b/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/09-jquery.min.js
deleted file mode 100644
index 006e953..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/09-jquery.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! jQuery v1.9.1 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license
-//@ sourceMappingURL=jquery.min.map
-*/(function(e,t){var n,r,i=typeof t,o=e.document,a=e.location,s=e.jQuery,u=e.$,l={},c=[],p="1.9.1",f=c.concat,d=c.push,h=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,b=function(e,t){return new b.fn.init(e,t,r)},x=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^[\],:{}\s]*$/,E=/(?:^|:|,)(?:\s*\[)+/g,S=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,j=/^-ms-/,D=/-([\da-z])/gi,L=function(e,t){return t.toUpperCase()},H=function(e){(o.addEventListener||"load"===e.type||"complete"===o.readyState)&&(q(),b.ready())},q=function(){o.addEventListener?(o.removeEventListener("DOMContentLoaded",H,!1),e.removeEventListener("load",H,!1)):(o.detachEvent("onreadystatechange",H),e.detachEvent("onload",H))};b.fn=b.prototype={jquery:p,constructor:b,init:function(e,n,r){var i,a;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof b?n[0]:n,b.merge(this,b.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,!0)),C.test(i[1])&&b.isPlainObject(n))for(i in n)b.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(a=o.getElementById(i[2]),a&&a.parentNode){if(a.id!==i[2])return r.find(e);this.length=1,this[0]=a}return this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):b.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),b.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return h.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=b.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return b.each(this,e,t)},ready:function(e){return b.ready.promise().done(e),this},slice:function(){return this.pushStack(h.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(b.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:d,sort:[].sort,splice:[].splice},b.fn.init.prototype=b.fn,b.extend=b.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||b.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(o=arguments[u]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(b.isPlainObject(r)||(n=b.isArray(r)))?(n?(n=!1,a=e&&b.isArray(e)?e:[]):a=e&&b.isPlainObject(e)?e:{},s[i]=b.extend(c,a,r)):r!==t&&(s[i]=r));return s},b.extend({noConflict:function(t){return e.$===b&&(e.$=u),t&&e.jQuery===b&&(e.jQuery=s),b},isReady:!1,readyWait:1,holdReady:function(e){e?b.readyWait++:b.ready(!0)},ready:function(e){if(e===!0?!--b.readyWait:!b.isReady){if(!o.body)return setTimeout(b.ready);b.isReady=!0,e!==!0&&--b.readyWait>0||(n.resolveWith(o,[b]),b.fn.trigger&&b(o).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===b.type(e)},isArray:Array.isArray||function(e){return"array"===b.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==b.type(e)||e.nodeType||b.isWindow(e))return!1;try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||y.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=b.buildFragment([e],t,i),i&&b(i).remove(),b.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=b.trim(n),n&&k.test(n.replace(S,"@").replace(A,"]").replace(E,"")))?Function("return "+n)():(b.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||b.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&b.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(j,"ms-").replace(D,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:v&&!v.call("\ufeff\u00a0")?function(e){return null==e?"":v.call(e)}:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?b.merge(n,"string"==typeof e?[e]:e):d.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(g)return g.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return f.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),b.isFunction(e)?(r=h.call(arguments,2),i=function(){return e.apply(n||this,r.concat(h.call(arguments)))},i.guid=e.guid=e.guid||b.guid++,i):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===b.type(r)){o=!0;for(u in r)b.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,b.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(b(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),b.ready.promise=function(t){if(!n)if(n=b.Deferred(),"complete"===o.readyState)setTimeout(b.ready);else if(o.addEventListener)o.addEventListener("DOMContentLoaded",H,!1),e.addEventListener("load",H,!1);else{o.attachEvent("onreadystatechange",H),e.attachEvent("onload",H);var r=!1;try{r=null==e.frameElement&&o.documentElement}catch(i){}r&&r.doScroll&&function a(){if(!b.isReady){try{r.doScroll("left")}catch(e){return setTimeout(a,50)}q(),b.ready()}}()}return n.promise(t)},b.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=b.type(e);return b.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=b(o);var _={};function F(e){var t=_[e]={};return b.each(e.match(w)||[],function(e,n){t[n]=!0}),t}b.Callbacks=function(e){e="string"==typeof e?_[e]||F(e):b.extend({},e);var n,r,i,o,a,s,u=[],l=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=u.length,n=!0;u&&o>a;a++)if(u[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,u&&(l?l.length&&c(l.shift()):r?u=[]:p.disable())},p={add:function(){if(u){var t=u.length;(function i(t){b.each(t,function(t,n){var r=b.type(n);"function"===r?e.unique&&p.has(n)||u.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=u.length:r&&(s=t,c(r))}return this},remove:function(){return u&&b.each(arguments,function(e,t){var r;while((r=b.inArray(t,u,r))>-1)u.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?b.inArray(e,u)>-1:!(!u||!u.length)},empty:function(){return u=[],this},disable:function(){return u=l=r=t,this},disabled:function(){return!u},lock:function(){return l=t,r||p.disable(),this},locked:function(){return!l},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!u||i&&!l||(n?l.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},b.extend({Deferred:function(e){var t=[["resolve","done",b.Callbacks("once memory"),"resolved"],["reject","fail",b.Callbacks("once memory"),"rejected"],["notify","progress",b.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return b.Deferred(function(n){b.each(t,function(t,o){var a=o[0],s=b.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&b.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?b.extend(e,r):r}},i={};return r.pipe=r.then,b.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=h.call(arguments),r=n.length,i=1!==r||e&&b.isFunction(e.promise)?r:0,o=1===i?e:b.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?h.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,u,l;if(r>1)for(s=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&b.isFunction(n[t].promise)?n[t].promise().done(a(t,l,n)).fail(o.reject).progress(a(t,u,s)):--i;return i||o.resolveWith(l,n),o.promise()}}),b.support=function(){var t,n,r,a,s,u,l,c,p,f,d=o.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*"),r=d.getElementsByTagName("a")[0],!n||!r||!n.length)return{};s=o.createElement("select"),l=s.appendChild(o.createElement("option")),a=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={getSetAttribute:"t"!==d.className,leadingWhitespace:3===d.firstChild.nodeType,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:"/a"===r.getAttribute("href"),opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:!!a.value,optSelected:l.selected,enctype:!!o.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==o.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===o.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},a.checked=!0,t.noCloneChecked=a.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!l.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}a=o.createElement("input"),a.setAttribute("value",""),t.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),t.radioValue="t"===a.value,a.setAttribute("checked","t"),a.setAttribute("name","t"),u=o.createDocumentFragment(),u.appendChild(a),t.appendChecked=a.checked,t.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;return d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip,b(function(){var n,r,a,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",u=o.getElementsByTagName("body")[0];u&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",u.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",a=d.getElementsByTagName("td"),a[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===a[0].offsetHeight,a[0].style.display="",a[1].style.display="none",t.reliableHiddenOffsets=p&&0===a[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=4===d.offsetWidth,t.doesNotIncludeMarginInBodyOffset=1!==u.offsetTop,e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(o.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(u.style.zoom=1)),u.removeChild(n),n=d=a=r=null)}),n=s=u=l=r=a=null,t}();var O=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,B=/([A-Z])/g;function P(e,n,r,i){if(b.acceptData(e)){var o,a,s=b.expando,u="string"==typeof n,l=e.nodeType,p=l?b.cache:e,f=l?e[s]:e[s]&&s;if(f&&p[f]&&(i||p[f].data)||!u||r!==t)return f||(l?e[s]=f=c.pop()||b.guid++:f=s),p[f]||(p[f]={},l||(p[f].toJSON=b.noop)),("object"==typeof n||"function"==typeof n)&&(i?p[f]=b.extend(p[f],n):p[f].data=b.extend(p[f].data,n)),o=p[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[b.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[b.camelCase(n)])):a=o,a}}function R(e,t,n){if(b.acceptData(e)){var r,i,o,a=e.nodeType,s=a?b.cache:e,u=a?e[b.expando]:b.expando;if(s[u]){if(t&&(o=n?s[u]:s[u].data)){b.isArray(t)?t=t.concat(b.map(t,b.camelCase)):t in o?t=[t]:(t=b.camelCase(t),t=t in o?[t]:t.split(" "));for(r=0,i=t.length;i>r;r++)delete o[t[r]];if(!(n?$:b.isEmptyObject)(o))return}(n||(delete s[u].data,$(s[u])))&&(a?b.cleanData([e],!0):b.support.deleteExpando||s!=s.window?delete s[u]:s[u]=null)}}}b.extend({cache:{},expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?b.cache[e[b.expando]]:e[b.expando],!!e&&!$(e)},data:function(e,t,n){return P(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return P(e,t,n,!0)},_removeData:function(e,t){return R(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&b.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),b.fn.extend({data:function(e,n){var r,i,o=this[0],a=0,s=null;if(e===t){if(this.length&&(s=b.data(o),1===o.nodeType&&!b._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>a;a++)i=r[a].name,i.indexOf("data-")||(i=b.camelCase(i.slice(5)),W(o,i,s[i]));b._data(o,"parsedAttrs",!0)}return s}return"object"==typeof e?this.each(function(){b.data(this,e)}):b.access(this,function(n){return n===t?o?W(o,e,b.data(o,e)):null:(this.each(function(){b.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){b.removeData(this,e)})}});function W(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(B,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:O.test(r)?b.parseJSON(r):r}catch(o){}b.data(e,n,r)}else r=t}return r}function $(e){var t;for(t in e)if(("data"!==t||!b.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}b.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=b._data(e,n),r&&(!i||b.isArray(r)?i=b._data(e,n,b.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=b.queue(e,t),r=n.length,i=n.shift(),o=b._queueHooks(e,t),a=function(){b.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return b._data(e,n)||b._data(e,n,{empty:b.Callbacks("once memory").add(function(){b._removeData(e,t+"queue"),b._removeData(e,n)})})}}),b.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?b.queue(this[0],e):n===t?this:this.each(function(){var t=b.queue(this,e,n);b._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&b.dequeue(this,e)})},dequeue:function(e){return this.each(function(){b.dequeue(this,e)})},delay:function(e,t){return e=b.fx?b.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=b.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=b._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var I,z,X=/[\t\r\n]/g,U=/\r/g,V=/^(?:input|select|textarea|button|object)$/i,Y=/^(?:a|area)$/i,J=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,G=/^(?:checked|selected)$/i,Q=b.support.getSetAttribute,K=b.support.input;b.fn.extend({attr:function(e,t){return b.access(this,b.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){b.removeAttr(this,e)})},prop:function(e,t){return b.access(this,b.prop,e,t,arguments.length>1)},removeProp:function(e){return e=b.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=b.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?b.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return b.isFunction(e)?this.each(function(n){b(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=b(this),u=t,l=e.match(w)||[];while(o=l[a++])u=r?u:!s.hasClass(o),s[u?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&b._data(this,"__className__",this.className),this.className=this.className||e===!1?"":b._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(X," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=b.isFunction(e),this.each(function(n){var o,a=b(this);1===this.nodeType&&(o=i?e.call(this,n,a.val()):e,null==o?o="":"number"==typeof o?o+="":b.isArray(o)&&(o=b.map(o,function(e){return null==e?"":e+""})),r=b.valHooks[this.type]||b.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=b.valHooks[o.type]||b.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(U,""):null==n?"":n)}}}),b.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;for(;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(b.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&b.nodeName(n.parentNode,"optgroup"))){if(t=b(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=b.makeArray(t);return b(e).find("option").each(function(){this.selected=b.inArray(b(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attr:function(e,n,r){var o,a,s,u=e.nodeType;if(e&&3!==u&&8!==u&&2!==u)return typeof e.getAttribute===i?b.prop(e,n,r):(a=1!==u||!b.isXMLDoc(e),a&&(n=n.toLowerCase(),o=b.attrHooks[n]||(J.test(n)?z:I)),r===t?o&&a&&"get"in o&&null!==(s=o.get(e,n))?s:(typeof e.getAttribute!==i&&(s=e.getAttribute(n)),null==s?t:s):null!==r?o&&a&&"set"in o&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r):(b.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=b.propFix[n]||n,J.test(n)?!Q&&G.test(n)?e[b.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:b.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!b.support.radioValue&&"radio"===t&&b.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!b.isXMLDoc(e),a&&(n=b.propFix[n]||n,o=b.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):V.test(e.nodeName)||Y.test(e.nodeName)&&e.href?0:t}}}}),z={get:function(e,n){var r=b.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?K&&Q?null!=i:G.test(n)?e[b.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?b.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&b.propFix[n]||n,n):e[b.camelCase("default-"+n)]=e[n]=!0,n}},K&&Q||(b.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return b.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t},set:function(e,n,r){return b.nodeName(e,"input")?(e.defaultValue=n,t):I&&I.set(e,n,r)}}),Q||(I=b.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},b.attrHooks.contenteditable={get:I.get,set:function(e,t,n){I.set(e,""===t?!1:t,n)}},b.each(["width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),b.support.hrefNormalized||(b.each(["href","src","width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),b.each(["href","src"],function(e,t){b.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),b.support.style||(b.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),b.support.optSelected||(b.propHooks.selected=b.extend(b.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),b.support.enctype||(b.propFix.enctype="encoding"),b.support.checkOn||b.each(["radio","checkbox"],function(){b.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),b.each(["radio","checkbox"],function(){b.valHooks[this]=b.extend(b.valHooks[this],{set:function(e,n){return b.isArray(n)?e.checked=b.inArray(b(e).val(),n)>=0:t}})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}b.event={global:{},add:function(e,n,r,o,a){var s,u,l,c,p,f,d,h,g,m,y,v=b._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=b.guid++),(u=v.events)||(u=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof b===i||e&&b.event.triggered===e.type?t:b.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(w)||[""],l=n.length;while(l--)s=rt.exec(n[l])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),p=b.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=b.event.special[g]||{},d=b.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&b.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=u[g])||(h=u[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),b.event.global[g]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,p,f,d,h,g,m=b.hasData(e)&&b._data(e);if(m&&(c=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(s=rt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=b.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));u&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||b.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)b.event.remove(e,d+t[l],n,r,!0);b.isEmptyObject(c)&&(delete m.handle,b._removeData(e,"events"))}},trigger:function(n,r,i,a){var s,u,l,c,p,f,d,h=[i||o],g=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];if(l=f=i=i||o,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+b.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),u=0>g.indexOf(":")&&"on"+g,n=n[b.expando]?n:new b.Event(g,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:b.makeArray(r,[n]),p=b.event.special[g]||{},a||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!a&&!p.noBubble&&!b.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(l=l.parentNode);l;l=l.parentNode)h.push(l),f=l;f===(i.ownerDocument||o)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((l=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(b._data(l,"events")||{})[n.type]&&b._data(l,"handle"),s&&s.apply(l,r),s=u&&l[u],s&&b.acceptData(l)&&s.apply&&s.apply(l,r)===!1&&n.preventDefault();if(n.type=g,!(a||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===g&&b.nodeName(i,"a")||!b.acceptData(i)||!u||!i[g]||b.isWindow(i))){f=i[u],f&&(i[u]=null),b.event.triggered=g;try{i[g]()}catch(v){}b.event.triggered=t,f&&(i[u]=f)}return n.result}},dispatch:function(e){e=b.event.fix(e);var n,r,i,o,a,s=[],u=h.call(arguments),l=(b._data(this,"events")||{})[e.type]||[],c=b.event.special[e.type]||{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=b.event.handlers.call(this,e,l),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((b.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,u),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(1===l.nodeType&&(l.disabled!==!0||"click"!==e.type)){for(o=[],a=0;u>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?b(r,this).index(l)>=0:b.find(r,this,null,[l]).length),o[r]&&o.push(i);o.length&&s.push({elem:l,handlers:o})}return n.length>u&&s.push({elem:this,handlers:n.slice(u)}),s},fix:function(e){if(e[b.expando])return e;var t,n,r,i=e.type,a=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new b.Event(a),t=r.length;while(t--)n=r[t],e[n]=a[n];return e.target||(e.target=a.srcElement||o),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,a):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,a,s=n.button,u=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||o,a=i.documentElement,r=i.body,e.pageX=n.clientX+(a&&a.scrollLeft||r&&r.scrollLeft||0)-(a&&a.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(a&&a.scrollTop||r&&r.scrollTop||0)-(a&&a.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&u&&(e.relatedTarget=u===e.target?n.toElement:u),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return b.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==o.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===o.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=b.extend(new b.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?b.event.trigger(i,null,t):b.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},b.removeEvent=o.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},b.Event=function(e,n){return this instanceof b.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&b.extend(this,n),this.timeStamp=e&&e.timeStamp||b.now(),this[b.expando]=!0,t):new b.Event(e,n)},b.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},b.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){b.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;
-return(!i||i!==r&&!b.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),b.support.submitBubbles||(b.event.special.submit={setup:function(){return b.nodeName(this,"form")?!1:(b.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=b.nodeName(n,"input")||b.nodeName(n,"button")?n.form:t;r&&!b._data(r,"submitBubbles")&&(b.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),b._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&b.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return b.nodeName(this,"form")?!1:(b.event.remove(this,"._submit"),t)}}),b.support.changeBubbles||(b.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(b.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),b.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),b.event.simulate("change",this,e,!0)})),!1):(b.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!b._data(t,"changeBubbles")&&(b.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||b.event.simulate("change",this.parentNode,e,!0)}),b._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return b.event.remove(this,"._change"),!Z.test(this.nodeName)}}),b.support.focusinBubbles||b.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){b.event.simulate(t,e.target,b.event.fix(e),!0)};b.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),b.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return b().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=b.guid++)),this.each(function(){b.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,b(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){b.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){b.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?b.event.trigger(e,n,r,!0):t}}),function(e,t){var n,r,i,o,a,s,u,l,c,p,f,d,h,g,m,y,v,x="sizzle"+-new Date,w=e.document,T={},N=0,C=0,k=it(),E=it(),S=it(),A=typeof t,j=1<<31,D=[],L=D.pop,H=D.push,q=D.slice,M=D.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},_="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=F.replace("w","w#"),B="([*^$|!~]?=)",P="\\["+_+"*("+F+")"+_+"*(?:"+B+_+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+O+")|)|)"+_+"*\\]",R=":("+F+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+P.replace(3,8)+")*)|.*)\\)|)",W=RegExp("^"+_+"+|((?:^|[^\\\\])(?:\\\\.)*)"+_+"+$","g"),$=RegExp("^"+_+"*,"+_+"*"),I=RegExp("^"+_+"*([\\x20\\t\\r\\n\\f>+~])"+_+"*"),z=RegExp(R),X=RegExp("^"+O+"$"),U={ID:RegExp("^#("+F+")"),CLASS:RegExp("^\\.("+F+")"),NAME:RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:RegExp("^("+F.replace("w","w*")+")"),ATTR:RegExp("^"+P),PSEUDO:RegExp("^"+R),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+_+"*(even|odd|(([+-]|)(\\d*)n|)"+_+"*(?:([+-]|)"+_+"*(\\d+)|))"+_+"*\\)|)","i"),needsContext:RegExp("^"+_+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+_+"*((?:-\\d)?\\d*)"+_+"*\\)|)(?=[^-]|$)","i")},V=/[\x20\t\r\n\f]*[+~]/,Y=/^[^{]+\{\s*\[native code/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,G=/^(?:input|select|textarea|button)$/i,Q=/^h\d$/i,K=/'|\\/g,Z=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,et=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{q.call(w.documentElement.childNodes,0)[0].nodeType}catch(nt){q=function(e){var t,n=[];while(t=this[e++])n.push(t);return n}}function rt(e){return Y.test(e+"")}function it(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>i.cacheLength&&delete e[t.shift()],e[n]=r}}function ot(e){return e[x]=!0,e}function at(e){var t=p.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function st(e,t,n,r){var i,o,a,s,u,l,f,g,m,v;if((t?t.ownerDocument||t:w)!==p&&c(t),t=t||p,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!d&&!r){if(i=J.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&y(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return H.apply(n,q.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&T.getByClassName&&t.getElementsByClassName)return H.apply(n,q.call(t.getElementsByClassName(a),0)),n}if(T.qsa&&!h.test(e)){if(f=!0,g=x,m=t,v=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){l=ft(e),(f=t.getAttribute("id"))?g=f.replace(K,"\\$&"):t.setAttribute("id",g),g="[id='"+g+"'] ",u=l.length;while(u--)l[u]=g+dt(l[u]);m=V.test(e)&&t.parentNode||t,v=l.join(",")}if(v)try{return H.apply(n,q.call(m.querySelectorAll(v),0)),n}catch(b){}finally{f||t.removeAttribute("id")}}}return wt(e.replace(W,"$1"),t,n,r)}a=st.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},c=st.setDocument=function(e){var n=e?e.ownerDocument||e:w;return n!==p&&9===n.nodeType&&n.documentElement?(p=n,f=n.documentElement,d=a(n),T.tagNameNoComments=at(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),T.attributes=at(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),T.getByClassName=at(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),T.getByName=at(function(e){e.id=x+0,e.innerHTML="<a name='"+x+"'></a><div name='"+x+"'></div>",f.insertBefore(e,f.firstChild);var t=n.getElementsByName&&n.getElementsByName(x).length===2+n.getElementsByName(x+0).length;return T.getIdNotName=!n.getElementById(x),f.removeChild(e),t}),i.attrHandle=at(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==A&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},T.getIdNotName?(i.find.ID=function(e,t){if(typeof t.getElementById!==A&&!d){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){return e.getAttribute("id")===t}}):(i.find.ID=function(e,n){if(typeof n.getElementById!==A&&!d){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==A&&r.getAttributeNode("id").value===e?[r]:t:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){var n=typeof e.getAttributeNode!==A&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=T.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==A?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.NAME=T.getByName&&function(e,n){return typeof n.getElementsByName!==A?n.getElementsByName(name):t},i.find.CLASS=T.getByClassName&&function(e,n){return typeof n.getElementsByClassName===A||d?t:n.getElementsByClassName(e)},g=[],h=[":focus"],(T.qsa=rt(n.querySelectorAll))&&(at(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||h.push("\\["+_+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||h.push(":checked")}),at(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&h.push("[*^$]="+_+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||h.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),h.push(",.*:")})),(T.matchesSelector=rt(m=f.matchesSelector||f.mozMatchesSelector||f.webkitMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&at(function(e){T.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",R)}),h=RegExp(h.join("|")),g=RegExp(g.join("|")),y=rt(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},v=f.compareDocumentPosition?function(e,t){var r;return e===t?(u=!0,0):(r=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&r||e.parentNode&&11===e.parentNode.nodeType?e===n||y(w,e)?-1:t===n||y(w,t)?1:0:4&r?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return u=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:0;if(o===a)return ut(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?ut(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},u=!1,[0,0].sort(v),T.detectDuplicates=u,p):p},st.matches=function(e,t){return st(e,null,null,t)},st.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Z,"='$1']"),!(!T.matchesSelector||d||g&&g.test(t)||h.test(t)))try{var n=m.call(e,t);if(n||T.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return st(t,p,null,[e]).length>0},st.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},st.attr=function(e,t){var n;return(e.ownerDocument||e)!==p&&c(e),d||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):d||T.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},st.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},st.uniqueSort=function(e){var t,n=[],r=1,i=0;if(u=!T.detectDuplicates,e.sort(v),u){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e};function ut(e,t){var n=t&&e,r=n&&(~t.sourceIndex||j)-(~e.sourceIndex||j);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function lt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ct(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function pt(e){return ot(function(t){return t=+t,ot(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}o=st.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=st.selectors={cacheLength:50,createPseudo:ot,match:U,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(et,tt),e[3]=(e[4]||e[5]||"").replace(et,tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||st.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&st.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return U.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&z.test(n)&&(t=ft(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(et,tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[e+" "];return t||(t=RegExp("(^|"+_+")"+e+"("+_+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==A&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=st.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[x]||(m[x]={}),l=c[e]||[],d=l[0]===N&&l[1],f=l[0]===N&&l[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[N,d,f];break}}else if(v&&(l=(t[x]||(t[x]={}))[e])&&l[0]===N)f=l[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[x]||(p[x]={}))[e]=[N,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||st.error("unsupported pseudo: "+e);return r[x]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?ot(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=M.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ot(function(e){var t=[],n=[],r=s(e.replace(W,"$1"));return r[x]?ot(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ot(function(e){return function(t){return st(e,t).length>0}}),contains:ot(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:ot(function(e){return X.test(e||"")||st.error("unsupported lang: "+e),e=e.replace(et,tt).toLowerCase(),function(t){var n;do if(n=d?t.getAttribute("xml:lang")||t.getAttribute("lang"):t.lang)return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return Q.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:pt(function(){return[0]}),last:pt(function(e,t){return[t-1]}),eq:pt(function(e,t,n){return[0>n?n+t:n]}),even:pt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:pt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:pt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:pt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[n]=lt(n);for(n in{submit:!0,reset:!0})i.pseudos[n]=ct(n);function ft(e,t){var n,r,o,a,s,u,l,c=E[e+" "];if(c)return t?0:c.slice(0);s=e,u=[],l=i.preFilter;while(s){(!n||(r=$.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),u.push(o=[])),n=!1,(r=I.exec(s))&&(n=r.shift(),o.push({value:n,type:r[0].replace(W," ")}),s=s.slice(n.length));for(a in i.filter)!(r=U[a].exec(s))||l[a]&&!(r=l[a](r))||(n=r.shift(),o.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?st.error(e):E(e,u).slice(0)}function dt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function ht(e,t,n){var i=t.dir,o=n&&"parentNode"===i,a=C++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,s){var u,l,c,p=N+" "+a;if(s){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[x]||(t[x]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,s)||r,l[1]===!0)return!0}}function gt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function mt(e,t,n,r,i){var o,a=[],s=0,u=e.length,l=null!=t;for(;u>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function yt(e,t,n,r,i,o){return r&&!r[x]&&(r=yt(r)),i&&!i[x]&&(i=yt(i,o)),ot(function(o,a,s,u){var l,c,p,f=[],d=[],h=a.length,g=o||xt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:mt(g,f,e,s,u),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,u),r){l=mt(y,d),r(l,[],s,u),c=l.length;while(c--)(p=l[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?M.call(o,p):f[c])>-1&&(o[l]=!(a[l]=p))}}else y=mt(y===a?y.splice(h,y.length):y),i?i(null,a,y,u):H.apply(a,y)})}function vt(e){var t,n,r,o=e.length,a=i.relative[e[0].type],s=a||i.relative[" "],u=a?1:0,c=ht(function(e){return e===t},s,!0),p=ht(function(e){return M.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>u;u++)if(n=i.relative[e[u].type])f=[ht(gt(f),n)];else{if(n=i.filter[e[u].type].apply(null,e[u].matches),n[x]){for(r=++u;o>r;r++)if(i.relative[e[r].type])break;return yt(u>1&&gt(f),u>1&&dt(e.slice(0,u-1)).replace(W,"$1"),n,r>u&&vt(e.slice(u,r)),o>r&&vt(e=e.slice(r)),o>r&&dt(e))}f.push(n)}return gt(f)}function bt(e,t){var n=0,o=t.length>0,a=e.length>0,s=function(s,u,c,f,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,T=l,C=s||a&&i.find.TAG("*",d&&u.parentNode||u),k=N+=null==T?1:Math.random()||.1;for(w&&(l=u!==p&&u,r=n);null!=(h=C[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,u,c)){f.push(h);break}w&&(N=k,r=++n)}o&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,o&&b!==v){g=0;while(m=t[g++])m(x,y,u,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=L.call(f));y=mt(y)}H.apply(f,y),w&&!s&&y.length>0&&v+t.length>1&&st.uniqueSort(f)}return w&&(N=k,l=T),x};return o?ot(s):s}s=st.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=ft(e)),n=t.length;while(n--)o=vt(t[n]),o[x]?r.push(o):i.push(o);o=S(e,bt(i,r))}return o};function xt(e,t,n){var r=0,i=t.length;for(;i>r;r++)st(e,t[r],n);return n}function wt(e,t,n,r){var o,a,u,l,c,p=ft(e);if(!r&&1===p.length){if(a=p[0]=p[0].slice(0),a.length>2&&"ID"===(u=a[0]).type&&9===t.nodeType&&!d&&i.relative[a[1].type]){if(t=i.find.ID(u.matches[0].replace(et,tt),t)[0],!t)return n;e=e.slice(a.shift().value.length)}o=U.needsContext.test(e)?0:a.length;while(o--){if(u=a[o],i.relative[l=u.type])break;if((c=i.find[l])&&(r=c(u.matches[0].replace(et,tt),V.test(a[0].type)&&t.parentNode||t))){if(a.splice(o,1),e=r.length&&dt(a),!e)return H.apply(n,q.call(r,0)),n;break}}}return s(e,p)(r,t,d,n,V.test(e)),n}i.pseudos.nth=i.pseudos.eq;function Tt(){}i.filters=Tt.prototype=i.pseudos,i.setFilters=new Tt,c(),st.attr=b.attr,b.find=st,b.expr=st.selectors,b.expr[":"]=b.expr.pseudos,b.unique=st.uniqueSort,b.text=st.getText,b.isXMLDoc=st.isXML,b.contains=st.contains}(e);var at=/Until$/,st=/^(?:parents|prev(?:Until|All))/,ut=/^.[^:#\[\.,]*$/,lt=b.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};b.fn.extend({find:function(e){var t,n,r,i=this.length;if("string"!=typeof e)return r=this,this.pushStack(b(e).filter(function(){for(t=0;i>t;t++)if(b.contains(r[t],this))return!0}));for(n=[],t=0;i>t;t++)b.find(e,this[t],n);return n=this.pushStack(i>1?b.unique(n):n),n.selector=(this.selector?this.selector+" ":"")+e,n},has:function(e){var t,n=b(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(b.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1))},filter:function(e){return this.pushStack(ft(this,e,!0))},is:function(e){return!!e&&("string"==typeof e?lt.test(e)?b(e,this.context).index(this[0])>=0:b.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,o=[],a=lt.test(e)||"string"!=typeof e?b(e,t||this.context):0;for(;i>r;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&11!==n.nodeType){if(a?a.index(n)>-1:b.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}}return this.pushStack(o.length>1?b.unique(o):o)},index:function(e){return e?"string"==typeof e?b.inArray(this[0],b(e)):b.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?b(e,t):b.makeArray(e&&e.nodeType?[e]:e),r=b.merge(this.get(),n);return this.pushStack(b.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),b.fn.andSelf=b.fn.addBack;function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}b.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return b.dir(e,"parentNode")},parentsUntil:function(e,t,n){return b.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return b.dir(e,"nextSibling")},prevAll:function(e){return b.dir(e,"previousSibling")},nextUntil:function(e,t,n){return b.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return b.dir(e,"previousSibling",n)},siblings:function(e){return b.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return b.sibling(e.firstChild)},contents:function(e){return b.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:b.merge([],e.childNodes)}},function(e,t){b.fn[e]=function(n,r){var i=b.map(this,t,n);return at.test(e)||(r=n),r&&"string"==typeof r&&(i=b.filter(r,i)),i=this.length>1&&!ct[e]?b.unique(i):i,this.length>1&&st.test(e)&&(i=i.reverse()),this.pushStack(i)}}),b.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?b.find.matchesSelector(t[0],e)?[t[0]]:[]:b.find.matches(e,t)},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!b(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(t=t||0,b.isFunction(t))return b.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return b.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=b.grep(e,function(e){return 1===e.nodeType});if(ut.test(t))return b.filter(t,r,!n);t=b.filter(t,r)}return b.grep(e,function(e){return b.inArray(e,t)>=0===n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Nt=/^(?:checkbox|radio)$/i,Ct=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:b.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(o),Dt=jt.appendChild(o.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,b.fn.extend({text:function(e){return b.access(this,function(e){return e===t?b.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(b.isFunction(e))return this.each(function(t){b(this).wrapAll(e.call(this,t))});if(this[0]){var t=b(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return b.isFunction(e)?this.each(function(t){b(this).wrapInner(e.call(this,t))}):this.each(function(){var t=b(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=b.isFunction(e);return this.each(function(n){b(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){b.nodeName(this,"body")||b(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=0;for(;null!=(n=this[r]);r++)(!e||b.filter(e,[n]).length>0)&&(t||1!==n.nodeType||b.cleanData(Ot(n)),n.parentNode&&(t&&b.contains(n.ownerDocument,n)&&Mt(Ot(n,"script")),n.parentNode.removeChild(n)));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&b.cleanData(Ot(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&b.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return b.clone(this,e,t)})},html:function(e){return b.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!b.support.htmlSerialize&&mt.test(e)||!b.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(b.cleanData(Ot(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){var t=b.isFunction(e);return t||"string"==typeof e||(e=b(e).not(this).detach()),this.domManip([e],!0,function(e){var t=this.nextSibling,n=this.parentNode;n&&(b(this).remove(),n.insertBefore(e,t))})},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=f.apply([],e);var i,o,a,s,u,l,c=0,p=this.length,d=this,h=p-1,g=e[0],m=b.isFunction(g);if(m||!(1>=p||"string"!=typeof g||b.support.checkClone)&&Ct.test(g))return this.each(function(i){var o=d.eq(i);m&&(e[0]=g.call(this,i,n?o.html():t)),o.domManip(e,n,r)});if(p&&(l=b.buildFragment(e,this[0].ownerDocument,!1,this),i=l.firstChild,1===l.childNodes.length&&(l=i),i)){for(n=n&&b.nodeName(i,"tr"),s=b.map(Ot(l,"script"),Ht),a=s.length;p>c;c++)o=l,c!==h&&(o=b.clone(o,!0,!0),a&&b.merge(s,Ot(o,"script"))),r.call(n&&b.nodeName(this[c],"table")?Lt(this[c],"tbody"):this[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,b.map(s,qt),c=0;a>c;c++)o=s[c],kt.test(o.type||"")&&!b._data(o,"globalEval")&&b.contains(u,o)&&(o.src?b.ajax({url:o.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):b.globalEval((o.text||o.textContent||o.innerHTML||"").replace(St,"")));l=i=null}return this}});function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function Ht(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function Mt(e,t){var n,r=0;for(;null!=(n=e[r]);r++)b._data(n,"globalEval",!t||b._data(t[r],"globalEval"))}function _t(e,t){if(1===t.nodeType&&b.hasData(e)){var n,r,i,o=b._data(e),a=b._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)b.event.add(t,n,s[n][r])}a.data&&(a.data=b.extend({},a.data))}}function Ft(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!b.support.noCloneEvent&&t[b.expando]){i=b._data(t);for(r in i.events)b.removeEvent(t,r,i.handle);t.removeAttribute(b.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),b.support.html5Clone&&e.innerHTML&&!b.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Nt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}b.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){b.fn[e]=function(e){var n,r=0,i=[],o=b(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),b(o[r])[t](n),d.apply(i,n.get());return this.pushStack(i)}});function Ot(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||b.nodeName(o,n)?s.push(o):b.merge(s,Ot(o,n));return n===t||n&&b.nodeName(e,n)?b.merge([e],s):s}function Bt(e){Nt.test(e.type)&&(e.defaultChecked=e.checked)}b.extend({clone:function(e,t,n){var r,i,o,a,s,u=b.contains(e.ownerDocument,e);if(b.support.html5Clone||b.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(b.support.noCloneEvent&&b.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||b.isXMLDoc(e)))for(r=Ot(o),s=Ot(e),a=0;null!=(i=s[a]);++a)r[a]&&Ft(i,r[a]);if(t)if(n)for(s=s||Ot(e),r=r||Ot(o),a=0;null!=(i=s[a]);a++)_t(i,r[a]);else _t(e,o);return r=Ot(o,"script"),r.length>0&&Mt(r,!u&&Ot(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,u,l,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===b.type(o))b.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),u=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[u]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!b.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!b.support.tbody){o="table"!==u||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)b.nodeName(l=o.childNodes[i],"tbody")&&!l.childNodes.length&&o.removeChild(l)
-}b.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),b.support.appendChecked||b.grep(Ot(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===b.inArray(o,r))&&(a=b.contains(o.ownerDocument,o),s=Ot(f.appendChild(o),"script"),a&&Mt(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,u=b.expando,l=b.cache,p=b.support.deleteExpando,f=b.event.special;for(;null!=(n=e[s]);s++)if((t||b.acceptData(n))&&(o=n[u],a=o&&l[o])){if(a.events)for(r in a.events)f[r]?b.event.remove(n,r):b.removeEvent(n,r,a.handle);l[o]&&(delete l[o],p?delete n[u]:typeof n.removeAttribute!==i?n.removeAttribute(u):n[u]=null,c.push(o))}}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+x+")(.*)$","i"),Yt=RegExp("^("+x+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+x+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===b.css(e,"display")||!b.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=b._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=b._data(r,"olddisplay",un(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&b._data(r,"olddisplay",i?n:b.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}b.fn.extend({css:function(e,n){return b.access(this,function(e,n,r){var i,o,a={},s=0;if(b.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=b.css(e,n[s],!1,o);return a}return r!==t?b.style(e,n,r):b.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?b(this).show():b(this).hide()})}}),b.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":b.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=b.camelCase(n),l=e.style;if(n=b.cssProps[u]||(b.cssProps[u]=tn(l,u)),s=b.cssHooks[n]||b.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(b.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||b.cssNumber[u]||(r+="px"),b.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=b.camelCase(n);return n=b.cssProps[u]||(b.cssProps[u]=tn(e.style,u)),s=b.cssHooks[n]||b.cssHooks[u],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||b.isNumeric(o)?o||0:a):a},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s.getPropertyValue(n)||s[n]:t,l=e.style;return s&&(""!==u||b.contains(e.ownerDocument,e)||(u=b.style(e,n)),Yt.test(u)&&Ut.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):o.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),Yt.test(u)&&!zt.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=b.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=b.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=b.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=b.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=b.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(b.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function un(e){var t=o,n=Gt[e];return n||(n=ln(e,t),"none"!==n&&n||(Pt=(Pt||b("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=ln(e,t),Pt.detach()),Gt[e]=n),n}function ln(e,t){var n=b(t.createElement(e)).appendTo(t.body),r=b.css(n[0],"display");return n.remove(),r}b.each(["height","width"],function(e,n){b.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(b.css(e,"display"))?b.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,i),i):0)}}}),b.support.opacity||(b.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=b.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===b.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),b(function(){b.support.reliableMarginRight||(b.cssHooks.marginRight={get:function(e,n){return n?b.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!b.support.pixelPosition&&b.fn.position&&b.each(["top","left"],function(e,n){b.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?b(e).position()[n]+"px":r):t}}})}),b.expr&&b.expr.filters&&(b.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!b.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||b.css(e,"display"))},b.expr.filters.visible=function(e){return!b.expr.filters.hidden(e)}),b.each({margin:"",padding:"",border:"Width"},function(e,t){b.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(b.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;b.fn.extend({serialize:function(){return b.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=b.prop(this,"elements");return e?b.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!b(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Nt.test(e))}).map(function(e,t){var n=b(this).val();return null==n?null:b.isArray(n)?b.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),b.param=function(e,n){var r,i=[],o=function(e,t){t=b.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=b.ajaxSettings&&b.ajaxSettings.traditional),b.isArray(e)||e.jquery&&!b.isPlainObject(e))b.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(b.isArray(t))b.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==b.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}b.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){b.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),b.fn.hover=function(e,t){return this.mouseenter(e).mouseleave(t||e)};var mn,yn,vn=b.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Nn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Cn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=b.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=a.href}catch(Ln){yn=o.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(w)||[];if(b.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(u){var l;return o[u]=!0,b.each(e[u]||[],function(e,u){var c=u(n,r,i);return"string"!=typeof c||a||o[c]?a?!(l=c):t:(n.dataTypes.unshift(c),s(c),!1)}),l}return s(n.dataTypes[0])||!o["*"]&&s("*")}function Mn(e,n){var r,i,o=b.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&b.extend(!0,e,r),e}b.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,u=e.indexOf(" ");return u>=0&&(i=e.slice(u,e.length),e=e.slice(0,u)),b.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&b.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?b("<div>").append(b.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},b.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){b.fn[t]=function(e){return this.on(t,e)}}),b.each(["get","post"],function(e,n){b[n]=function(e,r,i,o){return b.isFunction(r)&&(o=o||i,i=r,r=t),b.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),b.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Nn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":b.parseJSON,"text xml":b.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Mn(Mn(e,b.ajaxSettings),t):Mn(b.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,u,l,c,p=b.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?b(f):b.event,h=b.Deferred(),g=b.Callbacks("once memory"),m=p.statusCode||{},y={},v={},x=0,T="canceled",N={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return x||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)m[t]=[m[t],e[t]];else N.always(e[N.status]);return this},abort:function(e){var t=e||T;return l&&l.abort(t),k(0,t),this}};if(h.promise(N).complete=g.add,N.success=N.done,N.error=N.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=b.trim(p.dataType||"*").toLowerCase().match(w)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?80:443))==(mn[3]||("http:"===mn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=b.param(p.data,p.traditional)),qn(An,p,n,N),2===x)return N;u=p.global,u&&0===b.active++&&b.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Cn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(b.lastModified[o]&&N.setRequestHeader("If-Modified-Since",b.lastModified[o]),b.etag[o]&&N.setRequestHeader("If-None-Match",b.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&N.setRequestHeader("Content-Type",p.contentType),N.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)N.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,N,p)===!1||2===x))return N.abort();T="abort";for(i in{success:1,error:1,complete:1})N[i](p[i]);if(l=qn(jn,p,n,N)){N.readyState=1,u&&d.trigger("ajaxSend",[N,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){N.abort("timeout")},p.timeout));try{x=1,l.send(y,k)}catch(C){if(!(2>x))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,C=n;2!==x&&(x=2,s&&clearTimeout(s),l=t,a=i||"",N.readyState=e>0?4:0,r&&(w=_n(p,N,r)),e>=200&&300>e||304===e?(p.ifModified&&(T=N.getResponseHeader("Last-Modified"),T&&(b.lastModified[o]=T),T=N.getResponseHeader("etag"),T&&(b.etag[o]=T)),204===e?(c=!0,C="nocontent"):304===e?(c=!0,C="notmodified"):(c=Fn(p,w),C=c.state,y=c.data,v=c.error,c=!v)):(v=C,(e||!C)&&(C="error",0>e&&(e=0))),N.status=e,N.statusText=(n||C)+"",c?h.resolveWith(f,[y,C,N]):h.rejectWith(f,[N,C,v]),N.statusCode(m),m=t,u&&d.trigger(c?"ajaxSuccess":"ajaxError",[N,p,c?y:v]),g.fireWith(f,[N,C]),u&&(d.trigger("ajaxComplete",[N,p]),--b.active||b.event.trigger("ajaxStop")))}return N},getScript:function(e,n){return b.get(e,t,n,"script")},getJSON:function(e,t,n){return b.get(e,t,n,"json")}});function _n(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(s in c)s in r&&(n[c[s]]=r[s]);while("*"===l[0])l.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in u)if(u[s]&&u[s].test(o)){l.unshift(s);break}if(l[0]in r)a=l[0];else{for(s in r){if(!l[0]||e.converters[s+" "+l[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function Fn(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(i in e.converters)a[i.toLowerCase()]=e.converters[i];for(;r=u[++s];)if("*"!==r){if("*"!==l&&l!==r){if(i=a[l+" "+r]||a["* "+r],!i)for(n in a)if(o=n.split(" "),o[1]===r&&(i=a[l+" "+o[0]]||a["* "+o[0]])){i===!0?i=a[n]:a[n]!==!0&&(r=o[0],u.splice(s--,0,r));break}if(i!==!0)if(i&&e["throws"])t=i(t);else try{t=i(t)}catch(c){return{state:"parsererror",error:i?c:"No conversion from "+l+" to "+r}}}l=r}return{state:"success",data:t}}b.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return b.globalEval(e),e}}}),b.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),b.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||b("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var On=[],Bn=/(=)\?(?=&|$)|\?\?/;b.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=On.pop()||b.expando+"_"+vn++;return this[e]=!0,e}}),b.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return u||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=b.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||b.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,On.push(o)),s&&b.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}b.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=b.ajaxSettings.xhr(),b.support.cors=!!Rn&&"withCredentials"in Rn,Rn=b.support.ajax=!!Rn,Rn&&b.ajaxTransport(function(n){if(!n.crossDomain||b.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data||null),r=function(e,i){var s,l,c,p;try{if(r&&(i||4===u.readyState))if(r=t,a&&(u.onreadystatechange=b.noop,$n&&delete Pn[a]),i)4!==u.readyState&&u.abort();else{p={},s=u.status,l=u.getAllResponseHeaders(),"string"==typeof u.responseText&&(p.text=u.responseText);try{c=u.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,l)},n.async?4===u.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},b(e).unload($n)),Pn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+x+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n,r,i=this.createTween(e,t),o=Yn.exec(t),a=i.cur(),s=+a||0,u=1,l=20;if(o){if(n=+o[2],r=o[3]||(b.cssNumber[e]?"":"px"),"px"!==r&&s){s=b.css(i.elem,e,!0)||n||1;do u=u||".5",s/=u,b.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)*n:n}return i}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=b.now()}function Zn(e,t){b.each(t,function(t,n){var r=(Qn[t]||[]).concat(Qn["*"]),i=0,o=r.length;for(;o>i;i++)if(r[i].call(e,t,n))return})}function er(e,t,n){var r,i,o=0,a=Gn.length,s=b.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;for(;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:b.extend({},t),opts:b.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=b.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(tr(c,l.opts.specialEasing);a>o;o++)if(r=Gn[o].call(l,e,c,l.opts))return r;return Zn(l,c),b.isFunction(l.opts.start)&&l.opts.start.call(e,l),b.fx.timer(b.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function tr(e,t){var n,r,i,o,a;for(i in e)if(r=b.camelCase(i),o=t[r],n=e[i],b.isArray(n)&&(o=n[1],n=e[i]=n[0]),i!==r&&(e[r]=n,delete e[i]),a=b.cssHooks[r],a&&"expand"in a){n=a.expand(n),delete e[r];for(i in n)i in e||(e[i]=n[i],t[i]=o)}else t[r]=o}b.Animation=b.extend(er,{tweener:function(e,t){b.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,u,l,c,p,f=this,d=e.style,h={},g=[],m=e.nodeType&&nn(e);n.queue||(c=b._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,p=c.empty.fire,c.empty.fire=function(){c.unqueued||p()}),c.unqueued++,f.always(function(){f.always(function(){c.unqueued--,b.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===b.css(e,"display")&&"none"===b.css(e,"float")&&(b.support.inlineBlockNeedsLayout&&"inline"!==un(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",b.support.shrinkWrapBlocks||f.always(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(i in t)if(a=t[i],Vn.exec(a)){if(delete t[i],u=u||"toggle"===a,a===(m?"hide":"show"))continue;g.push(i)}if(o=g.length){s=b._data(e,"fxshow")||b._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?b(e).show():f.done(function(){b(e).hide()}),f.done(function(){var t;b._removeData(e,"fxshow");for(t in h)b.style(e,t,h[t])});for(i=0;o>i;i++)r=g[i],l=f.createTween(r,m?s[r]:0),h[r]=s[r]||b.style(e,r),r in s||(s[r]=l.start,m&&(l.end=l.start,l.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}b.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(b.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?b.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=b.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){b.fx.step[e.prop]?b.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[b.cssProps[e.prop]]||b.cssHooks[e.prop])?b.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},b.each(["toggle","show","hide"],function(e,t){var n=b.fn[t];b.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),b.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=b.isEmptyObject(e),o=b.speed(t,n,r),a=function(){var t=er(this,b.extend({},e),o);a.finish=function(){t.stop(!0)},(i||b._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=b.timers,a=b._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&b.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=b._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=b.timers,a=r?r.length:0;for(n.finish=!0,b.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}b.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){b.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),b.speed=function(e,t,n){var r=e&&"object"==typeof e?b.extend({},e):{complete:n||!n&&t||b.isFunction(e)&&e,duration:e,easing:n&&t||t&&!b.isFunction(t)&&t};return r.duration=b.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in b.fx.speeds?b.fx.speeds[r.duration]:b.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){b.isFunction(r.old)&&r.old.call(this),r.queue&&b.dequeue(this,r.queue)},r},b.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},b.timers=[],b.fx=rr.prototype.init,b.fx.tick=function(){var e,n=b.timers,r=0;for(Xn=b.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||b.fx.stop(),Xn=t},b.fx.timer=function(e){e()&&b.timers.push(e)&&b.fx.start()},b.fx.interval=13,b.fx.start=function(){Un||(Un=setInterval(b.fx.tick,b.fx.interval))},b.fx.stop=function(){clearInterval(Un),Un=null},b.fx.speeds={slow:600,fast:200,_default:400},b.fx.step={},b.expr&&b.expr.filters&&(b.expr.filters.animated=function(e){return b.grep(b.timers,function(t){return e===t.elem}).length}),b.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){b.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,b.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},b.offset={setOffset:function(e,t,n){var r=b.css(e,"position");"static"===r&&(e.style.position="relative");var i=b(e),o=i.offset(),a=b.css(e,"top"),s=b.css(e,"left"),u=("absolute"===r||"fixed"===r)&&b.inArray("auto",[a,s])>-1,l={},c={},p,f;u?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),b.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(l.top=t.top-o.top+p),null!=t.left&&(l.left=t.left-o.left+f),"using"in t?t.using.call(e,l):i.css(l)}},b.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===b.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),b.nodeName(e[0],"html")||(n=e.offset()),n.top+=b.css(e[0],"borderTopWidth",!0),n.left+=b.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-b.css(r,"marginTop",!0),left:t.left-n.left-b.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||o.documentElement;while(e&&!b.nodeName(e,"html")&&"static"===b.css(e,"position"))e=e.offsetParent;return e||o.documentElement})}}),b.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);b.fn[e]=function(i){return b.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?b(a).scrollLeft():o,r?o:b(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return b.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}b.each({Height:"height",Width:"width"},function(e,n){b.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){b.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return b.access(this,function(n,r,i){var o;return b.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?b.css(n,r,s):b.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=b,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return b})})(window);
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/10-jquery.jqplot.min.js b/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/10-jquery.jqplot.min.js
deleted file mode 100644
index f25712c..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/10-jquery.jqplot.min.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/* jqPlot 1.0.8r1250 | (c) 2009-2013 Chris Leonello | jplot.com
-   jsDate | (c) 2010-2013 Chris Leonello
- */(function(L){var u;L.fn.emptyForce=function(){for(var ah=0,ai;(ai=L(this)[ah])!=null;ah++){if(ai.nodeType===1){L.cleanData(ai.getElementsByTagName("*"))}if(L.jqplot.use_excanvas){ai.outerHTML=""}else{while(ai.firstChild){ai.removeChild(ai.firstChild)}}ai=null}return L(this)};L.fn.removeChildForce=function(ah){while(ah.firstChild){this.removeChildForce(ah.firstChild);ah.removeChild(ah.firstChild)}};L.fn.jqplot=function(){var ah=[];var aj=[];for(var ak=0,ai=arguments.length;ak<ai;ak++){if(L.isArray(arguments[ak])){ah.push(arguments[ak])}else{if(L.isPlainObject(arguments[ak])){aj.push(arguments[ak])}}}return this.each(function(an){var at,ar,aq=L(this),am=ah.length,al=aj.length,ap,ao;if(an<am){ap=ah[an]}else{ap=am?ah[am-1]:null}if(an<al){ao=aj[an]}else{ao=al?aj[al-1]:null}at=aq.attr("id");if(at===u){at="jqplot_target_"+L.jqplot.targetCounter++;aq.attr("id",at)}ar=L.jqplot(at,ap,ao);aq.data("jqplot",ar)})};L.jqplot=function(an,ak,ai){var aj=null,ah=null;if(arguments.length===3){aj=ak;ah=ai}else{if(arguments.length===2){if(L.isArray(ak)){aj=ak}else{if(L.isPlainObject(ak)){ah=ak}}}}if(aj===null&&ah!==null&&ah.data){aj=ah.data}var am=new R();L("#"+an).removeClass("jqplot-error");if(L.jqplot.config.catchErrors){try{am.init(an,aj,ah);am.draw();am.themeEngine.init.call(am);return am}catch(al){var ao=L.jqplot.config.errorMessage||al.message;L("#"+an).append('<div class="jqplot-error-message">'+ao+"</div>");L("#"+an).addClass("jqplot-error");document.getElementById(an).style.background=L.jqplot.config.errorBackground;document.getElementById(an).style.border=L.jqplot.config.errorBorder;document.getElementById(an).style.fontFamily=L.jqplot.config.errorFontFamily;document.getElementById(an).style.fontSize=L.jqplot.config.errorFontSize;document.getElementById(an).style.fontStyle=L.jqplot.config.errorFontStyle;document.getElementById(an).style.fontWeight=L.jqplot.config.errorFontWeight}}else{am.init(an,aj,ah);am.draw();am.themeEngine.init.call(am);return am}};L.jqplot.version="1.0.8";L.jqplot.revision="1250";L.jqplot.targetCounter=1;L.jqplot.CanvasManager=function(){if(typeof L.jqplot.CanvasManager.canvases=="undefined"){L.jqplot.CanvasManager.canvases=[];L.jqplot.CanvasManager.free=[]}var ah=[];this.getCanvas=function(){var ak;var aj=true;if(!L.jqplot.use_excanvas){for(var al=0,ai=L.jqplot.CanvasManager.canvases.length;al<ai;al++){if(L.jqplot.CanvasManager.free[al]===true){aj=false;ak=L.jqplot.CanvasManager.canvases[al];L.jqplot.CanvasManager.free[al]=false;ah.push(al);break}}}if(aj){ak=document.createElement("canvas");ah.push(L.jqplot.CanvasManager.canvases.length);L.jqplot.CanvasManager.canvases.push(ak);L.jqplot.CanvasManager.free.push(false)}return ak};this.initCanvas=function(ai){if(L.jqplot.use_excanvas){return window.G_vmlCanvasManager.initElement(ai)}return ai};this.freeAllCanvases=function(){for(var aj=0,ai=ah.length;aj<ai;aj++){this.freeCanvas(ah[aj])}ah=[]};this.freeCanvas=function(ai){if(L.jqplot.use_excanvas&&window.G_vmlCanvasManager.uninitElement!==u){window.G_vmlCanvasManager.uninitElement(L.jqplot.CanvasManager.canvases[ai]);L.jqplot.CanvasManager.canvases[ai]=null}else{var aj=L.jqplot.CanvasManager.canvases[ai];aj.getContext("2d").clearRect(0,0,aj.width,aj.height);L(aj).unbind().removeAttr("class").removeAttr("style");L(aj).css({left:"",top:"",position:""});aj.width=0;aj.height=0;L.jqplot.CanvasManager.free[ai]=true}}};L.jqplot.log=function(){if(window.console){window.console.log.apply(window.console,arguments)}};L.jqplot.config={addDomReference:false,enablePlugins:false,defaultHeight:300,defaultWidth:400,UTCAdjust:false,timezoneOffset:new Date(new Date().getTimezoneOffset()*60000),errorMessage:"",errorBackground:"",errorBorder:"",errorFontFamily:"",errorFontSize:"",errorFontStyle:"",errorFontWeight:"",catchErrors:false,defaultTickFormatString:"%.1f",defaultColors:["#4bb2c5","#EAA228","#c5b47f","#579575","#839557","#958c12","#953579","#4b5de4","#d8b83f","#ff5800","#0085cc","#c747a3","#cddf54","#FBD178","#26B4E3","#bd70c7"],defaultNegativeColors:["#498991","#C08840","#9F9274","#546D61","#646C4A","#6F6621","#6E3F5F","#4F64B0","#A89050","#C45923","#187399","#945381","#959E5C","#C7AF7B","#478396","#907294"],dashLength:4,gapLength:4,dotGapLength:2.5,srcLocation:"jqplot/src/",pluginLocation:"jqplot/src/plugins/"};L.jqplot.arrayMax=function(ah){return Math.max.apply(Math,ah)};L.jqplot.arrayMin=function(ah){return Math.min.apply(Math,ah)};L.jqplot.enablePlugins=L.jqplot.config.enablePlugins;L.jqplot.support_canvas=function(){if(typeof L.jqplot.support_canvas.result=="undefined"){L.jqplot.support_canvas.result=!!document.createElement("canvas").getContext}return L.jqplot.support_canvas.result};L.jqplot.support_canvas_text=function(){if(typeof L.jqplot.support_canvas_text.result=="undefined"){if(window.G_vmlCanvasManager!==u&&window.G_vmlCanvasManager._version>887){L.jqplot.support_canvas_text.result=true}else{L.jqplot.support_canvas_text.result=!!(document.createElement("canvas").getContext&&typeof document.createElement("canvas").getContext("2d").fillText=="function")}}return L.jqplot.support_canvas_text.result};L.jqplot.use_excanvas=((!L.support.boxModel||!L.support.objectAll||!$support.leadingWhitespace)&&!L.jqplot.support_canvas())?true:false;L.jqplot.preInitHooks=[];L.jqplot.postInitHooks=[];L.jqplot.preParseOptionsHooks=[];L.jqplot.postParseOptionsHooks=[];L.jqplot.preDrawHooks=[];L.jqplot.postDrawHooks=[];L.jqplot.preDrawSeriesHooks=[];L.jqplot.postDrawSeriesHooks=[];L.jqplot.preDrawLegendHooks=[];L.jqplot.addLegendRowHooks=[];L.jqplot.preSeriesInitHooks=[];L.jqplot.postSeriesInitHooks=[];L.jqplot.preParseSeriesOptionsHooks=[];L.jqplot.postParseSeriesOptionsHooks=[];L.jqplot.eventListenerHooks=[];L.jqplot.preDrawSeriesShadowHooks=[];L.jqplot.postDrawSeriesShadowHooks=[];L.jqplot.ElemContainer=function(){this._elem;this._plotWidth;this._plotHeight;this._plotDimensions={height:null,width:null}};L.jqplot.ElemContainer.prototype.createElement=function(ak,am,ai,aj,an){this._offsets=am;var ah=ai||"jqplot";var al=document.createElement(ak);this._elem=L(al);this._elem.addClass(ah);this._elem.css(aj);this._elem.attr(an);al=null;return this._elem};L.jqplot.ElemContainer.prototype.getWidth=function(){if(this._elem){return this._elem.outerWidth(true)}else{return null}};L.jqplot.ElemContainer.prototype.getHeight=function(){if(this._elem){return this._elem.outerHeight(true)}else{return null}};L.jqplot.ElemContainer.prototype.getPosition=function(){if(this._elem){return this._elem.position()}else{return{top:null,left:null,bottom:null,right:null}}};L.jqplot.ElemContainer.prototype.getTop=function(){return this.getPosition().top};L.jqplot.ElemContainer.prototype.getLeft=function(){return this.getPosition().left};L.jqplot.ElemContainer.prototype.getBottom=function(){return this._elem.css("bottom")};L.jqplot.ElemContainer.prototype.getRight=function(){return this._elem.css("right")};function w(ah){L.jqplot.ElemContainer.call(this);this.name=ah;this._series=[];this.show=false;this.tickRenderer=L.jqplot.AxisTickRenderer;this.tickOptions={};this.labelRenderer=L.jqplot.AxisLabelRenderer;this.labelOptions={};this.label=null;this.showLabel=true;this.min=null;this.max=null;this.autoscale=false;this.pad=1.2;this.padMax=null;this.padMin=null;this.ticks=[];this.numberTicks;this.tickInterval;this.renderer=L.jqplot.LinearAxisRenderer;this.rendererOptions={};this.showTicks=true;this.showTickMarks=true;this.showMinorTicks=true;this.drawMajorGridlines=true;this.drawMinorGridlines=false;this.drawMajorTickMarks=true;this.drawMinorTickMarks=true;this.useSeriesColor=false;this.borderWidth=null;this.borderColor=null;this.scaleToHiddenSeries=false;this._dataBounds={min:null,max:null};this._intervalStats=[];this._offsets={min:null,max:null};this._ticks=[];this._label=null;this.syncTicks=null;this.tickSpacing=75;this._min=null;this._max=null;this._tickInterval=null;this._numberTicks=null;this.__ticks=null;this._options={}}w.prototype=new L.jqplot.ElemContainer();w.prototype.constructor=w;w.prototype.init=function(){if(L.isFunction(this.renderer)){this.renderer=new this.renderer()}this.tickOptions.axis=this.name;if(this.tickOptions.showMark==null){this.tickOptions.showMark=this.showTicks}if(this.tickOptions.showMark==null){this.tickOptions.showMark=this.showTickMarks}if(this.tickOptions.showLabel==null){this.tickOptions.showLabel=this.showTicks}if(this.label==null||this.label==""){this.showLabel=false}else{this.labelOptions.label=this.label}if(this.showLabel==false){this.labelOptions.show=false}if(this.pad==0){this.pad=1}if(this.padMax==0){this.padMax=1}if(this.padMin==0){this.padMin=1}if(this.padMax==null){this.padMax=(this.pad-1)/2+1}if(this.padMin==null){this.padMin=(this.pad-1)/2+1}this.pad=this.padMax+this.padMin-1;if(this.min!=null||this.max!=null){this.autoscale=false}if(this.syncTicks==null&&this.name.indexOf("y")>-1){this.syncTicks=true}else{if(this.syncTicks==null){this.syncTicks=false}}this.renderer.init.call(this,this.rendererOptions)};w.prototype.draw=function(ah,ai){if(this.__ticks){this.__ticks=null}return this.renderer.draw.call(this,ah,ai)};w.prototype.set=function(){this.renderer.set.call(this)};w.prototype.pack=function(ai,ah){if(this.show){this.renderer.pack.call(this,ai,ah)}if(this._min==null){this._min=this.min;this._max=this.max;this._tickInterval=this.tickInterval;this._numberTicks=this.numberTicks;this.__ticks=this._ticks}};w.prototype.reset=function(){this.renderer.reset.call(this)};w.prototype.resetScale=function(ah){L.extend(true,this,{min:null,max:null,numberTicks:null,tickInterval:null,_ticks:[],ticks:[]},ah);this.resetDataBounds()};w.prototype.resetDataBounds=function(){var ao=this._dataBounds;ao.min=null;ao.max=null;var ai,ap,am;var aj=(this.show)?true:false;for(var al=0;al<this._series.length;al++){ap=this._series[al];if(ap.show||this.scaleToHiddenSeries){am=ap._plotData;if(ap._type==="line"&&ap.renderer.bands.show&&this.name.charAt(0)!=="x"){am=[[0,ap.renderer.bands._min],[1,ap.renderer.bands._max]]}var ah=1,an=1;if(ap._type!=null&&ap._type=="ohlc"){ah=3;an=2}for(var ak=0,ai=am.length;ak<ai;ak++){if(this.name=="xaxis"||this.name=="x2axis"){if((am[ak][0]!=null&&am[ak][0]<ao.min)||ao.min==null){ao.min=am[ak][0]}if((am[ak][0]!=null&&am[ak][0]>ao.max)||ao.max==null){ao.max=am[ak][0]}}else{if((am[ak][ah]!=null&&am[ak][ah]<ao.min)||ao.min==null){ao.min=am[ak][ah]}if((am[ak][an]!=null&&am[ak][an]>ao.max)||ao.max==null){ao.max=am[ak][an]}}}if(aj&&ap.renderer.constructor!==L.jqplot.BarRenderer){aj=false}else{if(aj&&this._options.hasOwnProperty("forceTickAt0")&&this._options.forceTickAt0==false){aj=false}else{if(aj&&ap.renderer.constructor===L.jqplot.BarRenderer){if(ap.barDirection=="vertical"&&this.name!="xaxis"&&this.name!="x2axis"){if(this._options.pad!=null||this._options.padMin!=null){aj=false}}else{if(ap.barDirection=="horizontal"&&(this.name=="xaxis"||this.name=="x2axis")){if(this._options.pad!=null||this._options.padMin!=null){aj=false}}}}}}}}if(aj&&this.renderer.constructor===L.jqplot.LinearAxisRenderer&&ao.min>=0){this.padMin=1;this.forceTickAt0=true}};function q(ah){L.jqplot.ElemContainer.call(this);this.show=false;this.location="ne";this.labels=[];this.showLabels=true;this.showSwatches=true;this.placement="insideGrid";this.xoffset=0;this.yoffset=0;this.border;this.background;this.textColor;this.fontFamily;this.fontSize;this.rowSpacing="0.5em";this.renderer=L.jqplot.TableLegendRenderer;this.rendererOptions={};this.preDraw=false;this.marginTop=null;this.marginRight=null;this.marginBottom=null;this.marginLeft=null;this.escapeHtml=false;this._series=[];L.extend(true,this,ah)}q.prototype=new L.jqplot.ElemContainer();q.prototype.constructor=q;q.prototype.setOptions=function(ah){L.extend(true,this,ah);if(this.placement=="inside"){this.placement="insideGrid"}if(this.xoffset>0){if(this.placement=="insideGrid"){switch(this.location){case"nw":case"w":case"sw":if(this.marginLeft==null){this.marginLeft=this.xoffset+"px"}this.marginRight="0px";break;case"ne":case"e":case"se":default:if(this.marginRight==null){this.marginRight=this.xoffset+"px"}this.marginLeft="0px";break}}else{if(this.placement=="outside"){switch(this.location){case"nw":case"w":case"sw":if(this.marginRight==null){this.marginRight=this.xoffset+"px"}this.marginLeft="0px";break;case"ne":case"e":case"se":default:if(this.marginLeft==null){this.marginLeft=this.xoffset+"px"}this.marginRight="0px";break}}}this.xoffset=0}if(this.yoffset>0){if(this.placement=="outside"){switch(this.location){case"sw":case"s":case"se":if(this.marginTop==null){this.marginTop=this.yoffset+"px"}this.marginBottom="0px";break;case"ne":case"n":case"nw":default:if(this.marginBottom==null){this.marginBottom=this.yoffset+"px"}this.marginTop="0px";break}}else{if(this.placement=="insideGrid"){switch(this.location){case"sw":case"s":case"se":if(this.marginBottom==null){this.marginBottom=this.yoffset+"px"}this.marginTop="0px";break;case"ne":case"n":case"nw":default:if(this.marginTop==null){this.marginTop=this.yoffset+"px"}this.marginBottom="0px";break}}}this.yoffset=0}};q.prototype.init=function(){if(L.isFunction(this.renderer)){this.renderer=new this.renderer()}this.renderer.init.call(this,this.rendererOptions)};q.prototype.draw=function(ai,aj){for(var ah=0;ah<L.jqplot.preDrawLegendHooks.length;ah++){L.jqplot.preDrawLegendHooks[ah].call(this,ai)}return this.renderer.draw.call(this,ai,aj)};q.prototype.pack=function(ah){this.renderer.pack.call(this,ah)};function y(ah){L.jqplot.ElemContainer.call(this);this.text=ah;this.show=true;this.fontFamily;this.fontSize;this.textAlign;this.textColor;this.renderer=L.jqplot.DivTitleRenderer;this.rendererOptions={};this.escapeHtml=false}y.prototype=new L.jqplot.ElemContainer();y.prototype.constructor=y;y.prototype.init=function(){if(L.isFunction(this.renderer)){this.renderer=new this.renderer()}this.renderer.init.call(this,this.rendererOptions)};y.prototype.draw=function(ah){return this.renderer.draw.call(this,ah)};y.prototype.pack=function(){this.renderer.pack.call(this)};function S(ah){ah=ah||{};L.jqplot.ElemContainer.call(this);this.show=true;this.xaxis="xaxis";this._xaxis;this.yaxis="yaxis";this._yaxis;this.gridBorderWidth=2;this.renderer=L.jqplot.LineRenderer;this.rendererOptions={};this.data=[];this.gridData=[];this.label="";this.showLabel=true;this.color;this.negativeColor;this.lineWidth=2.5;this.lineJoin="round";this.lineCap="round";this.linePattern="solid";this.shadow=true;this.shadowAngle=45;this.shadowOffset=1.25;this.shadowDepth=3;this.shadowAlpha="0.1";this.breakOnNull=false;this.markerRenderer=L.jqplot.MarkerRenderer;this.markerOptions={};this.showLine=true;this.showMarker=true;this.index;this.fill=false;this.fillColor;this.fillAlpha;this.fillAndStroke=false;this.disableStack=false;this._stack=false;this.neighborThreshold=4;this.fillToZero=false;this.fillToValue=0;this.fillAxis="y";this.useNegativeColors=true;this._stackData=[];this._plotData=[];this._plotValues={x:[],y:[]};this._intervals={x:{},y:{}};this._prevPlotData=[];this._prevGridData=[];this._stackAxis="y";this._primaryAxis="_xaxis";this.canvas=new L.jqplot.GenericCanvas();this.shadowCanvas=new L.jqplot.GenericCanvas();this.plugins={};this._sumy=0;this._sumx=0;this._type=""}S.prototype=new L.jqplot.ElemContainer();S.prototype.constructor=S;S.prototype.init=function(ak,ao,am){this.index=ak;this.gridBorderWidth=ao;var an=this.data;var aj=[],al,ah;for(al=0,ah=an.length;al<ah;al++){if(!this.breakOnNull){if(an[al]==null||an[al][0]==null||an[al][1]==null){continue}else{aj.push(an[al])}}else{aj.push(an[al])}}this.data=aj;if(!this.color){this.color=am.colorGenerator.get(this.index)}if(!this.negativeColor){this.negativeColor=am.negativeColorGenerator.get(this.index)}if(!this.fillColor){this.fillColor=this.color}if(this.fillAlpha){var ai=L.jqplot.normalize2rgb(this.fillColor);var ai=L.jqplot.getColorComponents(ai);this.fillColor="rgba("+ai[0]+","+ai[1]+","+ai[2]+","+this.fillAlpha+")"}if(L.isFunction(this.renderer)){this.renderer=new this.renderer()}this.renderer.init.call(this,this.rendererOptions,am);this.markerRenderer=new this.markerRenderer();if(!this.markerOptions.color){this.markerOptions.color=this.color}if(this.markerOptions.show==null){this.markerOptions.show=this.showMarker}this.showMarker=this.markerOptions.show;this.markerRenderer.init(this.markerOptions)};S.prototype.draw=function(an,ak,am){var ai=(ak==u)?{}:ak;an=(an==u)?this.canvas._ctx:an;var ah,al,aj;for(ah=0;ah<L.jqplot.preDrawSeriesHooks.length;ah++){L.jqplot.preDrawSeriesHooks[ah].call(this,an,ai)}if(this.show){this.renderer.setGridData.call(this,am);if(!ai.preventJqPlotSeriesDrawTrigger){L(an.canvas).trigger("jqplotSeriesDraw",[this.data,this.gridData])}al=[];if(ai.data){al=ai.data}else{if(!this._stack){al=this.data}else{al=this._plotData}}aj=ai.gridData||this.renderer.makeGridData.call(this,al,am);if(this._type==="line"&&this.renderer.smooth&&this.renderer._smoothedData.length){aj=this.renderer._smoothedData}this.renderer.draw.call(this,an,aj,ai,am)}for(ah=0;ah<L.jqplot.postDrawSeriesHooks.length;ah++){L.jqplot.postDrawSeriesHooks[ah].call(this,an,ai,am)}an=ak=am=ah=al=aj=null};S.prototype.drawShadow=function(an,ak,am){var ai=(ak==u)?{}:ak;an=(an==u)?this.shadowCanvas._ctx:an;var ah,al,aj;for(ah=0;ah<L.jqplot.preDrawSeriesShadowHooks.length;ah++){L.jqplot.preDrawSeriesShadowHooks[ah].call(this,an,ai)}if(this.shadow){this.renderer.setGridData.call(this,am);al=[];if(ai.data){al=ai.data}else{if(!this._stack){al=this.data}else{al=this._plotData}}aj=ai.gridData||this.renderer.makeGridData.call(this,al,am);this.renderer.drawShadow.call(this,an,aj,ai,am)}for(ah=0;ah<L.jqplot.postDrawSeriesShadowHooks.length;ah++){L.jqplot.postDrawSeriesShadowHooks[ah].call(this,an,ai)}an=ak=am=ah=al=aj=null};S.prototype.toggleDisplay=function(ai,ak){var ah,aj;if(ai.data.series){ah=ai.data.series}else{ah=this}if(ai.data.speed){aj=ai.data.speed}if(aj){if(ah.canvas._elem.is(":hidden")||!ah.show){ah.show=true;ah.canvas._elem.removeClass("jqplot-series-hidden");if(ah.shadowCanvas._elem){ah.shadowCanvas._elem.fadeIn(aj)}ah.canvas._elem.fadeIn(aj,ak);ah.canvas._elem.nextAll(".jqplot-point-label.jqplot-series-"+ah.index).fadeIn(aj)}else{ah.show=false;ah.canvas._elem.addClass("jqplot-series-hidden");if(ah.shadowCanvas._elem){ah.shadowCanvas._elem.fadeOut(aj)}ah.canvas._elem.fadeOut(aj,ak);ah.canvas._elem.nextAll(".jqplot-point-label.jqplot-series-"+ah.index).fadeOut(aj)}}else{if(ah.canvas._elem.is(":hidden")||!ah.show){ah.show=true;ah.canvas._elem.removeClass("jqplot-series-hidden");if(ah.shadowCanvas._elem){ah.shadowCanvas._elem.show()}ah.canvas._elem.show(0,ak);ah.canvas._elem.nextAll(".jqplot-point-label.jqplot-series-"+ah.index).show()}else{ah.show=false;ah.canvas._elem.addClass("jqplot-series-hidden");if(ah.shadowCanvas._elem){ah.shadowCanvas._elem.hide()}ah.canvas._elem.hide(0,ak);ah.canvas._elem.nextAll(".jqplot-point-label.jqplot-series-"+ah.index).hide()}}};function M(){L.jqplot.ElemContainer.call(this);this.drawGridlines=true;this.gridLineColor="#cccccc";this.gridLineWidth=1;this.background="#fffdf6";this.borderColor="#999999";this.borderWidth=2;this.drawBorder=true;this.shadow=true;this.shadowAngle=45;this.shadowOffset=1.5;this.shadowWidth=3;this.shadowDepth=3;this.shadowColor=null;this.shadowAlpha="0.07";this._left;this._top;this._right;this._bottom;this._width;this._height;this._axes=[];this.renderer=L.jqplot.CanvasGridRenderer;this.rendererOptions={};this._offsets={top:null,bottom:null,left:null,right:null}}M.prototype=new L.jqplot.ElemContainer();M.prototype.constructor=M;M.prototype.init=function(){if(L.isFunction(this.renderer)){this.renderer=new this.renderer()}this.renderer.init.call(this,this.rendererOptions)};M.prototype.createElement=function(ah,ai){this._offsets=ah;return this.renderer.createElement.call(this,ai)};M.prototype.draw=function(){this.renderer.draw.call(this)};L.jqplot.GenericCanvas=function(){L.jqplot.ElemContainer.call(this);this._ctx};L.jqplot.GenericCanvas.prototype=new L.jqplot.ElemContainer();L.jqplot.GenericCanvas.prototype.constructor=L.jqplot.GenericCanvas;L.jqplot.GenericCanvas.prototype.createElement=function(al,aj,ai,am){this._offsets=al;var ah="jqplot";if(aj!=u){ah=aj}var ak;ak=am.canvasManager.getCanvas();if(ai!=null){this._plotDimensions=ai}ak.width=this._plotDimensions.width-this._offsets.left-this._offsets.right;ak.height=this._plotDimensions.height-this._offsets.top-this._offsets.bottom;this._elem=L(ak);this._elem.css({position:"absolute",left:this._offsets.left,top:this._offsets.top});this._elem.addClass(ah);ak=am.canvasManager.initCanvas(ak);ak=null;return this._elem};L.jqplot.GenericCanvas.prototype.setContext=function(){this._ctx=this._elem.get(0).getContext("2d");return this._ctx};L.jqplot.GenericCanvas.prototype.resetCanvas=function(){if(this._elem){if(L.jqplot.use_excanvas&&window.G_vmlCanvasManager.uninitElement!==u){window.G_vmlCanvasManager.uninitElement(this._elem.get(0))}this._elem.emptyForce()}this._ctx=null};L.jqplot.HooksManager=function(){this.hooks=[];this.args=[]};L.jqplot.HooksManager.prototype.addOnce=function(ak,ai){ai=ai||[];var al=false;for(var aj=0,ah=this.hooks.length;aj<ah;aj++){if(this.hooks[aj]==ak){al=true}}if(!al){this.hooks.push(ak);this.args.push(ai)}};L.jqplot.HooksManager.prototype.add=function(ai,ah){ah=ah||[];this.hooks.push(ai);this.args.push(ah)};L.jqplot.EventListenerManager=function(){this.hooks=[]};L.jqplot.EventListenerManager.prototype.addOnce=function(al,ak){var am=false,aj,ai;for(var ai=0,ah=this.hooks.length;ai<ah;ai++){aj=this.hooks[ai];if(aj[0]==al&&aj[1]==ak){am=true}}if(!am){this.hooks.push([al,ak])}};L.jqplot.EventListenerManager.prototype.add=function(ai,ah){this.hooks.push([ai,ah])};var U=["yMidAxis","xaxis","yaxis","x2axis","y2axis","y3axis","y4axis","y5axis","y6axis","y7axis","y8axis","y9axis"];function R(){this.animate=false;this.animateReplot=false;this.axes={xaxis:new w("xaxis"),yaxis:new w("yaxis"),x2axis:new w("x2axis"),y2axis:new w("y2axis"),y3axis:new w("y3axis"),y4axis:new w("y4axis"),y5axis:new w("y5axis"),y6axis:new w("y6axis"),y7axis:new w("y7axis"),y8axis:new w("y8axis"),y9axis:new w("y9axis"),yMidAxis:new w("yMidAxis")};this.baseCanvas=new L.jqplot.GenericCanvas();this.captureRightClick=false;this.data=[];this.dataRenderer;this.dataRendererOptions;this.defaults={axesDefaults:{},axes:{xaxis:{},yaxis:{},x2axis:{},y2axis:{},y3axis:{},y4axis:{},y5axis:{},y6axis:{},y7axis:{},y8axis:{},y9axis:{},yMidAxis:{}},seriesDefaults:{},series:[]};this.defaultAxisStart=1;this.drawIfHidden=false;this.eventCanvas=new L.jqplot.GenericCanvas();this.fillBetween={series1:null,series2:null,color:null,baseSeries:0,fill:true};this.fontFamily;this.fontSize;this.grid=new M();this.legend=new q();this.noDataIndicator={show:false,indicator:"Loading Data...",axes:{xaxis:{min:0,max:10,tickInterval:2,show:true},yaxis:{min:0,max:12,tickInterval:3,show:true}}};this.negativeSeriesColors=L.jqplot.config.defaultNegativeColors;this.options={};this.previousSeriesStack=[];this.plugins={};this.series=[];this.seriesStack=[];this.seriesColors=L.jqplot.config.defaultColors;this.sortData=true;this.stackSeries=false;this.syncXTicks=true;this.syncYTicks=true;this.target=null;this.targetId=null;this.textColor;this.title=new y();this._drawCount=0;this._sumy=0;this._sumx=0;this._stackData=[];this._plotData=[];this._width=null;this._height=null;this._plotDimensions={height:null,width:null};this._gridPadding={top:null,right:null,bottom:null,left:null};this._defaultGridPadding={top:10,right:10,bottom:23,left:10};this._addDomReference=L.jqplot.config.addDomReference;this.preInitHooks=new L.jqplot.HooksManager();this.postInitHooks=new L.jqplot.HooksManager();this.preParseOptionsHooks=new L.jqplot.HooksManager();this.postParseOptionsHooks=new L.jqplot.HooksManager();this.preDrawHooks=new L.jqplot.HooksManager();this.postDrawHooks=new L.jqplot.HooksManager();this.preDrawSeriesHooks=new L.jqplot.HooksManager();this.postDrawSeriesHooks=new L.jqplot.HooksManager();this.preDrawLegendHooks=new L.jqplot.HooksManager();this.addLegendRowHooks=new L.jqplot.HooksManager();this.preSeriesInitHooks=new L.jqplot.HooksManager();this.postSeriesInitHooks=new L.jqplot.HooksManager();this.preParseSeriesOptionsHooks=new L.jqplot.HooksManager();this.postParseSeriesOptionsHooks=new L.jqplot.HooksManager();this.eventListenerHooks=new L.jqplot.EventListenerManager();this.preDrawSeriesShadowHooks=new L.jqplot.HooksManager();this.postDrawSeriesShadowHooks=new L.jqplot.HooksManager();this.colorGenerator=new L.jqplot.ColorGenerator();this.negativeColorGenerator=new L.jqplot.ColorGenerator();this.canvasManager=new L.jqplot.CanvasManager();this.themeEngine=new L.jqplot.ThemeEngine();var aj=0;this.init=function(av,ar,ay){ay=ay||{};for(var at=0;at<L.jqplot.preInitHooks.length;at++){L.jqplot.preInitHooks[at].call(this,av,ar,ay)}for(var at=0;at<this.preInitHooks.hooks.length;at++){this.preInitHooks.hooks[at].call(this,av,ar,ay)}this.targetId="#"+av;this.target=L("#"+av);if(this._addDomReference){this.target.data("jqplot",this)}this.target.removeClass("jqplot-error");if(!this.target.get(0)){throw new Error("No plot target specified")}if(this.target.css("position")=="static"){this.target.css("position","relative")}if(!this.target.hasClass("jqplot-target")){this.target.addClass("jqplot-target")}if(!this.target.height()){var au;if(ay&&ay.height){au=parseInt(ay.height,10)}else{if(this.target.attr("data-height")){au=parseInt(this.target.attr("data-height"),10)}else{au=parseInt(L.jqplot.config.defaultHeight,10)}}this._height=au;this.target.css("height",au+"px")}else{this._height=au=this.target.height()}if(!this.target.width()){var aw;if(ay&&ay.width){aw=parseInt(ay.width,10)}else{if(this.target.attr("data-width")){aw=parseInt(this.target.attr("data-width"),10)}else{aw=parseInt(L.jqplot.config.defaultWidth,10)}}this._width=aw;this.target.css("width",aw+"px")}else{this._width=aw=this.target.width()}for(var at=0,ap=U.length;at<ap;at++){this.axes[U[at]]=new w(U[at])}this._plotDimensions.height=this._height;this._plotDimensions.width=this._width;this.grid._plotDimensions=this._plotDimensions;this.title._plotDimensions=this._plotDimensions;this.baseCanvas._plotDimensions=this._plotDimensions;this.eventCanvas._plotDimensions=this._plotDimensions;this.legend._plotDimensions=this._plotDimensions;if(this._height<=0||this._width<=0||!this._height||!this._width){throw new Error("Canvas dimension not set")}if(ay.dataRenderer&&L.isFunction(ay.dataRenderer)){if(ay.dataRendererOptions){this.dataRendererOptions=ay.dataRendererOptions}this.dataRenderer=ay.dataRenderer;ar=this.dataRenderer(ar,this,this.dataRendererOptions)}if(ay.noDataIndicator&&L.isPlainObject(ay.noDataIndicator)){L.extend(true,this.noDataIndicator,ay.noDataIndicator)}if(ar==null||L.isArray(ar)==false||ar.length==0||L.isArray(ar[0])==false||ar[0].length==0){if(this.noDataIndicator.show==false){throw new Error("No data specified")}else{for(var al in this.noDataIndicator.axes){for(var an in this.noDataIndicator.axes[al]){this.axes[al][an]=this.noDataIndicator.axes[al][an]}}this.postDrawHooks.add(function(){var aD=this.eventCanvas.getHeight();var aA=this.eventCanvas.getWidth();var az=L('<div class="jqplot-noData-container" style="position:absolute;"></div>');this.target.append(az);az.height(aD);az.width(aA);az.css("top",this.eventCanvas._offsets.top);az.css("left",this.eventCanvas._offsets.left);var aC=L('<div class="jqplot-noData-contents" style="text-align:center; position:relative; margin-left:auto; margin-right:auto;"></div>');az.append(aC);aC.html(this.noDataIndicator.indicator);var aB=aC.height();var ax=aC.width();aC.height(aB);aC.width(ax);aC.css("top",(aD-aB)/2+"px")})}}this.data=L.extend(true,[],ar);this.parseOptions(ay);if(this.textColor){this.target.css("color",this.textColor)}if(this.fontFamily){this.target.css("font-family",this.fontFamily)}if(this.fontSize){this.target.css("font-size",this.fontSize)}this.title.init();this.legend.init();this._sumy=0;this._sumx=0;this.computePlotData();for(var at=0;at<this.series.length;at++){this.seriesStack.push(at);this.previousSeriesStack.push(at);this.series[at].shadowCanvas._plotDimensions=this._plotDimensions;this.series[at].canvas._plotDimensions=this._plotDimensions;for(var aq=0;aq<L.jqplot.preSeriesInitHooks.length;aq++){L.jqplot.preSeriesInitHooks[aq].call(this.series[at],av,this.data,this.options.seriesDefaults,this.options.series[at],this)}for(var aq=0;aq<this.preSeriesInitHooks.hooks.length;aq++){this.preSeriesInitHooks.hooks[aq].call(this.series[at],av,this.data,this.options.seriesDefaults,this.options.series[at],this)}this.series[at]._plotDimensions=this._plotDimensions;this.series[at].init(at,this.grid.borderWidth,this);for(var aq=0;aq<L.jqplot.postSeriesInitHooks.length;aq++){L.jqplot.postSeriesInitHooks[aq].call(this.series[at],av,this.data,this.options.seriesDefaults,this.options.series[at],this)}for(var aq=0;aq<this.postSeriesInitHooks.hooks.length;aq++){this.postSeriesInitHooks.hooks[aq].call(this.series[at],av,this.data,this.options.seriesDefaults,this.options.series[at],this)}this._sumy+=this.series[at]._sumy;this._sumx+=this.series[at]._sumx}var am,ao;for(var at=0,ap=U.length;at<ap;at++){am=U[at];ao=this.axes[am];ao._plotDimensions=this._plotDimensions;ao.init();if(this.axes[am].borderColor==null){if(am.charAt(0)!=="x"&&ao.useSeriesColor===true&&ao.show){ao.borderColor=ao._series[0].color}else{ao.borderColor=this.grid.borderColor}}}if(this.sortData){ah(this.series)}this.grid.init();this.grid._axes=this.axes;this.legend._series=this.series;for(var at=0;at<L.jqplot.postInitHooks.length;at++){L.jqplot.postInitHooks[at].call(this,av,this.data,ay)}for(var at=0;at<this.postInitHooks.hooks.length;at++){this.postInitHooks.hooks[at].call(this,av,this.data,ay)}};this.resetAxesScale=function(aq,am){var ao=am||{};var ap=aq||this.axes;if(ap===true){ap=this.axes}if(L.isArray(ap)){for(var an=0;an<ap.length;an++){this.axes[ap[an]].resetScale(ao[ap[an]])}}else{if(typeof(ap)==="object"){for(var al in ap){this.axes[al].resetScale(ao[al])}}}};this.reInitialize=function(au,al){var ay=L.extend(true,{},this.options,al);var aw=this.targetId.substr(1);var ar=(au==null)?this.data:au;for(var av=0;av<L.jqplot.preInitHooks.length;av++){L.jqplot.preInitHooks[av].call(this,aw,ar,ay)}for(var av=0;av<this.preInitHooks.hooks.length;av++){this.preInitHooks.hooks[av].call(this,aw,ar,ay)}this._height=this.target.height();this._width=this.target.width();if(this._height<=0||this._width<=0||!this._height||!this._width){throw new Error("Target dimension not set")}this._plotDimensions.height=this._height;this._plotDimensions.width=this._width;this.grid._plotDimensions=this._plotDimensions;this.title._plotDimensions=this._plotDimensions;this.baseCanvas._plotDimensions=this._plotDimensions;this.eventCanvas._plotDimensions=this._plotDimensions;this.legend._plotDimensions=this._plotDimensions;var am,ax,at,ao;for(var av=0,aq=U.length;av<aq;av++){am=U[av];ao=this.axes[am];ax=ao._ticks;for(var at=0,ap=ax.length;at<ap;at++){var an=ax[at]._elem;if(an){if(L.jqplot.use_excanvas&&window.G_vmlCanvasManager.uninitElement!==u){window.G_vmlCanvasManager.uninitElement(an.get(0))}an.emptyForce();an=null;ax._elem=null}}ax=null;delete ao.ticks;delete ao._ticks;this.axes[am]=new w(am);this.axes[am]._plotWidth=this._width;this.axes[am]._plotHeight=this._height}if(au){if(ay.dataRenderer&&L.isFunction(ay.dataRenderer)){if(ay.dataRendererOptions){this.dataRendererOptions=ay.dataRendererOptions}this.dataRenderer=ay.dataRenderer;au=this.dataRenderer(au,this,this.dataRendererOptions)}this.data=L.extend(true,[],au)}if(al){this.parseOptions(ay)}this.title._plotWidth=this._width;if(this.textColor){this.target.css("color",this.textColor)}if(this.fontFamily){this.target.css("font-family",this.fontFamily)}if(this.fontSize){this.target.css("font-size",this.fontSize)}this.title.init();this.legend.init();this._sumy=0;this._sumx=0;this.seriesStack=[];this.previousSeriesStack=[];this.computePlotData();for(var av=0,aq=this.series.length;av<aq;av++){this.seriesStack.push(av);this.previousSeriesStack.push(av);this.series[av].shadowCanvas._plotDimensions=this._plotDimensions;this.series[av].canvas._plotDimensions=this._plotDimensions;for(var at=0;at<L.jqplot.preSeriesInitHooks.length;at++){L.jqplot.preSeriesInitHooks[at].call(this.series[av],aw,this.data,this.options.seriesDefaults,this.options.series[av],this)}for(var at=0;at<this.preSeriesInitHooks.hooks.length;at++){this.preSeriesInitHooks.hooks[at].call(this.series[av],aw,this.data,this.options.seriesDefaults,this.options.series[av],this)}this.series[av]._plotDimensions=this._plotDimensions;this.series[av].init(av,this.grid.borderWidth,this);for(var at=0;at<L.jqplot.postSeriesInitHooks.length;at++){L.jqplot.postSeriesInitHooks[at].call(this.series[av],aw,this.data,this.options.seriesDefaults,this.options.series[av],this)}for(var at=0;at<this.postSeriesInitHooks.hooks.length;at++){this.postSeriesInitHooks.hooks[at].call(this.series[av],aw,this.data,this.options.seriesDefaults,this.options.series[av],this)}this._sumy+=this.series[av]._sumy;this._sumx+=this.series[av]._sumx}for(var av=0,aq=U.length;av<aq;av++){am=U[av];ao=this.axes[am];ao._plotDimensions=this._plotDimensions;ao.init();if(ao.borderColor==null){if(am.charAt(0)!=="x"&&ao.useSeriesColor===true&&ao.show){ao.borderColor=ao._series[0].color}else{ao.borderColor=this.grid.borderColor}}}if(this.sortData){ah(this.series)}this.grid.init();this.grid._axes=this.axes;this.legend._series=this.series;for(var av=0,aq=L.jqplot.postInitHooks.length;av<aq;av++){L.jqplot.postInitHooks[av].call(this,aw,this.data,ay)}for(var av=0,aq=this.postInitHooks.hooks.length;av<aq;av++){this.postInitHooks.hooks[av].call(this,aw,this.data,ay)}};this.quickInit=function(){this._height=this.target.height();this._width=this.target.width();if(this._height<=0||this._width<=0||!this._height||!this._width){throw new Error("Target dimension not set")}this._plotDimensions.height=this._height;this._plotDimensions.width=this._width;this.grid._plotDimensions=this._plotDimensions;this.title._plotDimensions=this._plotDimensions;this.baseCanvas._plotDimensions=this._plotDimensions;this.eventCanvas._plotDimensions=this._plotDimensions;this.legend._plotDimensions=this._plotDimensions;for(var aq in this.axes){this.axes[aq]._plotWidth=this._width;this.axes[aq]._plotHeight=this._height}this.title._plotWidth=this._width;if(this.textColor){this.target.css("color",this.textColor)}if(this.fontFamily){this.target.css("font-family",this.fontFamily)}if(this.fontSize){this.target.css("font-size",this.fontSize)}this._sumy=0;this._sumx=0;this.computePlotData();for(var ao=0;ao<this.series.length;ao++){if(this.series[ao]._type==="line"&&this.series[ao].renderer.bands.show){this.series[ao].renderer.initBands.call(this.series[ao],this.series[ao].renderer.options,this)}this.series[ao]._plotDimensions=this._plotDimensions;this.series[ao].canvas._plotDimensions=this._plotDimensions;this._sumy+=this.series[ao]._sumy;this._sumx+=this.series[ao]._sumx}var am;for(var al=0;al<12;al++){am=U[al];var an=this.axes[am]._ticks;for(var ao=0;ao<an.length;ao++){var ap=an[ao]._elem;if(ap){if(L.jqplot.use_excanvas&&window.G_vmlCanvasManager.uninitElement!==u){window.G_vmlCanvasManager.uninitElement(ap.get(0))}ap.emptyForce();ap=null;an._elem=null}}an=null;this.axes[am]._plotDimensions=this._plotDimensions;this.axes[am]._ticks=[]}if(this.sortData){ah(this.series)}this.grid._axes=this.axes;this.legend._series=this.series};function ah(ap){var au,av,aw,al,at;for(var aq=0;aq<ap.length;aq++){var am;var ar=[ap[aq].data,ap[aq]._stackData,ap[aq]._plotData,ap[aq]._prevPlotData];for(var an=0;an<4;an++){am=true;au=ar[an];if(ap[aq]._stackAxis=="x"){for(var ao=0;ao<au.length;ao++){if(typeof(au[ao][1])!="number"){am=false;break}}if(am){au.sort(function(ay,ax){return ay[1]-ax[1]})}}else{for(var ao=0;ao<au.length;ao++){if(typeof(au[ao][0])!="number"){am=false;break}}if(am){au.sort(function(ay,ax){return ay[0]-ax[0]})}}}}}this.computePlotData=function(){this._plotData=[];this._stackData=[];var at,au,ao;for(au=0,ao=this.series.length;au<ao;au++){at=this.series[au];this._plotData.push([]);this._stackData.push([]);var am=at.data;this._plotData[au]=L.extend(true,[],am);this._stackData[au]=L.extend(true,[],am);at._plotData=this._plotData[au];at._stackData=this._stackData[au];var ax={x:[],y:[]};if(this.stackSeries&&!at.disableStack){at._stack=true;var av=(at._stackAxis==="x")?0:1;for(var ap=0,al=am.length;ap<al;ap++){var aw=am[ap][av];if(aw==null){aw=0}this._plotData[au][ap][av]=aw;this._stackData[au][ap][av]=aw;if(au>0){for(var aq=au;aq--;){var an=this._plotData[aq][ap][av];if(aw*an>=0){this._plotData[au][ap][av]+=an;this._stackData[au][ap][av]+=an;break}}}}}else{for(var ar=0;ar<at.data.length;ar++){ax.x.push(at.data[ar][0]);ax.y.push(at.data[ar][1])}this._stackData.push(at.data);this.series[au]._stackData=at.data;this._plotData.push(at.data);at._plotData=at.data;at._plotValues=ax}if(au>0){at._prevPlotData=this.series[au-1]._plotData}at._sumy=0;at._sumx=0;for(ar=at.data.length-1;ar>-1;ar--){at._sumy+=at.data[ar][1];at._sumx+=at.data[ar][0]}}};this.populatePlotData=function(au,av){this._plotData=[];this._stackData=[];au._stackData=[];au._plotData=[];var ay={x:[],y:[]};if(this.stackSeries&&!au.disableStack){au._stack=true;var ax=(au._stackAxis==="x")?0:1;var az=L.extend(true,[],au.data);var aA=L.extend(true,[],au.data);var an,am,ao,aw,al;for(var ar=0;ar<av;ar++){var ap=this.series[ar].data;for(var aq=0;aq<ap.length;aq++){ao=ap[aq];an=(ao[0]!=null)?ao[0]:0;am=(ao[1]!=null)?ao[1]:0;az[aq][0]+=an;az[aq][1]+=am;aw=(ax)?am:an;if(au.data[aq][ax]*aw>=0){aA[aq][ax]+=aw}}}for(var at=0;at<aA.length;at++){ay.x.push(aA[at][0]);ay.y.push(aA[at][1])}this._plotData.push(aA);this._stackData.push(az);au._stackData=az;au._plotData=aA;au._plotValues=ay}else{for(var at=0;at<au.data.length;at++){ay.x.push(au.data[at][0]);ay.y.push(au.data[at][1])}this._stackData.push(au.data);this.series[av]._stackData=au.data;this._plotData.push(au.data);au._plotData=au.data;au._plotValues=ay}if(av>0){au._prevPlotData=this.series[av-1]._plotData}au._sumy=0;au._sumx=0;for(at=au.data.length-1;at>-1;at--){au._sumy+=au.data[at][1];au._sumx+=au.data[at][0]}};this.getNextSeriesColor=(function(am){var al=0;var an=am.seriesColors;return function(){if(al<an.length){return an[al++]}else{al=0;return an[al++]}}})(this);this.parseOptions=function(ay){for(var at=0;at<this.preParseOptionsHooks.hooks.length;at++){this.preParseOptionsHooks.hooks[at].call(this,ay)}for(var at=0;at<L.jqplot.preParseOptionsHooks.length;at++){L.jqplot.preParseOptionsHooks[at].call(this,ay)}this.options=L.extend(true,{},this.defaults,ay);var am=this.options;this.animate=am.animate;this.animateReplot=am.animateReplot;this.stackSeries=am.stackSeries;if(L.isPlainObject(am.fillBetween)){var ax=["series1","series2","color","baseSeries","fill"],au;for(var at=0,aq=ax.length;at<aq;at++){au=ax[at];if(am.fillBetween[au]!=null){this.fillBetween[au]=am.fillBetween[au]}}}if(am.seriesColors){this.seriesColors=am.seriesColors}if(am.negativeSeriesColors){this.negativeSeriesColors=am.negativeSeriesColors}if(am.captureRightClick){this.captureRightClick=am.captureRightClick}this.defaultAxisStart=(ay&&ay.defaultAxisStart!=null)?ay.defaultAxisStart:this.defaultAxisStart;this.colorGenerator.setColors(this.seriesColors);this.negativeColorGenerator.setColors(this.negativeSeriesColors);L.extend(true,this._gridPadding,am.gridPadding);this.sortData=(am.sortData!=null)?am.sortData:this.sortData;for(var at=0;at<12;at++){var an=U[at];var ap=this.axes[an];ap._options=L.extend(true,{},am.axesDefaults,am.axes[an]);L.extend(true,ap,am.axesDefaults,am.axes[an]);ap._plotWidth=this._width;ap._plotHeight=this._height}var aw=function(aD,aB,aE){var aA=[];var aC,az;aB=aB||"vertical";if(!L.isArray(aD[0])){for(aC=0,az=aD.length;aC<az;aC++){if(aB=="vertical"){aA.push([aE+aC,aD[aC]])}else{aA.push([aD[aC],aE+aC])}}}else{L.extend(true,aA,aD)}return aA};var av=0;this.series=[];for(var at=0;at<this.data.length;at++){var al=L.extend(true,{index:at},{seriesColors:this.seriesColors,negativeSeriesColors:this.negativeSeriesColors},this.options.seriesDefaults,this.options.series[at],{rendererOptions:{animation:{show:this.animate}}});var ax=new S(al);for(var ar=0;ar<L.jqplot.preParseSeriesOptionsHooks.length;ar++){L.jqplot.preParseSeriesOptionsHooks[ar].call(ax,this.options.seriesDefaults,this.options.series[at])}for(var ar=0;ar<this.preParseSeriesOptionsHooks.hooks.length;ar++){this.preParseSeriesOptionsHooks.hooks[ar].call(ax,this.options.seriesDefaults,this.options.series[at])}L.extend(true,ax,al);var ao="vertical";if(ax.renderer===L.jqplot.BarRenderer&&ax.rendererOptions&&ax.rendererOptions.barDirection=="horizontal"){ao="horizontal";ax._stackAxis="x";ax._primaryAxis="_yaxis"}ax.data=aw(this.data[at],ao,this.defaultAxisStart);switch(ax.xaxis){case"xaxis":ax._xaxis=this.axes.xaxis;break;case"x2axis":ax._xaxis=this.axes.x2axis;break;default:break}ax._yaxis=this.axes[ax.yaxis];ax._xaxis._series.push(ax);ax._yaxis._series.push(ax);if(ax.show){ax._xaxis.show=true;ax._yaxis.show=true}else{if(ax._xaxis.scaleToHiddenSeries){ax._xaxis.show=true}if(ax._yaxis.scaleToHiddenSeries){ax._yaxis.show=true}}if(!ax.label){ax.label="Series "+(at+1).toString()}this.series.push(ax);for(var ar=0;ar<L.jqplot.postParseSeriesOptionsHooks.length;ar++){L.jqplot.postParseSeriesOptionsHooks[ar].call(this.series[at],this.options.seriesDefaults,this.options.series[at])}for(var ar=0;ar<this.postParseSeriesOptionsHooks.hooks.length;ar++){this.postParseSeriesOptionsHooks.hooks[ar].call(this.series[at],this.options.seriesDefaults,this.options.series[at])}}L.extend(true,this.grid,this.options.grid);for(var at=0,aq=U.length;at<aq;at++){var an=U[at];var ap=this.axes[an];if(ap.borderWidth==null){ap.borderWidth=this.grid.borderWidth}}if(typeof this.options.title=="string"){this.title.text=this.options.title}else{if(typeof this.options.title=="object"){L.extend(true,this.title,this.options.title)}}this.title._plotWidth=this._width;this.legend.setOptions(this.options.legend);for(var at=0;at<L.jqplot.postParseOptionsHooks.length;at++){L.jqplot.postParseOptionsHooks[at].call(this,ay)}for(var at=0;at<this.postParseOptionsHooks.hooks.length;at++){this.postParseOptionsHooks.hooks[at].call(this,ay)}};this.destroy=function(){this.canvasManager.freeAllCanvases();if(this.eventCanvas&&this.eventCanvas._elem){this.eventCanvas._elem.unbind()}this.target.empty();this.target[0].innerHTML=""};this.replot=function(am){var an=am||{};var ap=an.data||null;var al=(an.clear===false)?false:true;var ao=an.resetAxes||false;delete an.data;delete an.clear;delete an.resetAxes;this.target.trigger("jqplotPreReplot");if(al){this.destroy()}if(ap||!L.isEmptyObject(an)){this.reInitialize(ap,an)}else{this.quickInit()}if(ao){this.resetAxesScale(ao,an.axes)}this.draw();this.target.trigger("jqplotPostReplot")};this.redraw=function(al){al=(al!=null)?al:true;this.target.trigger("jqplotPreRedraw");if(al){this.canvasManager.freeAllCanvases();this.eventCanvas._elem.unbind();this.target.empty()}for(var an in this.axes){this.axes[an]._ticks=[]}this.computePlotData();this._sumy=0;this._sumx=0;for(var am=0,ao=this.series.length;am<ao;am++){this._sumy+=this.series[am]._sumy;this._sumx+=this.series[am]._sumx}this.draw();this.target.trigger("jqplotPostRedraw")};this.draw=function(){if(this.drawIfHidden||this.target.is(":visible")){this.target.trigger("jqplotPreDraw");var aH,aF,aE,ao;for(aH=0,aE=L.jqplot.preDrawHooks.length;aH<aE;aH++){L.jqplot.preDrawHooks[aH].call(this)}for(aH=0,aE=this.preDrawHooks.hooks.length;aH<aE;aH++){this.preDrawHooks.hooks[aH].apply(this,this.preDrawSeriesHooks.args[aH])}this.target.append(this.baseCanvas.createElement({left:0,right:0,top:0,bottom:0},"jqplot-base-canvas",null,this));this.baseCanvas.setContext();this.target.append(this.title.draw());this.title.pack({top:0,left:0});var aL=this.legend.draw({},this);var al={top:0,left:0,bottom:0,right:0};if(this.legend.placement=="outsideGrid"){this.target.append(aL);switch(this.legend.location){case"n":al.top+=this.legend.getHeight();break;case"s":al.bottom+=this.legend.getHeight();break;case"ne":case"e":case"se":al.right+=this.legend.getWidth();break;case"nw":case"w":case"sw":al.left+=this.legend.getWidth();break;default:al.right+=this.legend.getWidth();break}aL=aL.detach()}var ar=this.axes;var aM;for(aH=0;aH<12;aH++){aM=U[aH];this.target.append(ar[aM].draw(this.baseCanvas._ctx,this));ar[aM].set()}if(ar.yaxis.show){al.left+=ar.yaxis.getWidth()}var aG=["y2axis","y3axis","y4axis","y5axis","y6axis","y7axis","y8axis","y9axis"];var az=[0,0,0,0,0,0,0,0];var aC=0;var aB;for(aB=0;aB<8;aB++){if(ar[aG[aB]].show){aC+=ar[aG[aB]].getWidth();az[aB]=aC}}al.right+=aC;if(ar.x2axis.show){al.top+=ar.x2axis.getHeight()}if(this.title.show){al.top+=this.title.getHeight()}if(ar.xaxis.show){al.bottom+=ar.xaxis.getHeight()}if(this.options.gridDimensions&&L.isPlainObject(this.options.gridDimensions)){var at=parseInt(this.options.gridDimensions.width,10)||0;var aI=parseInt(this.options.gridDimensions.height,10)||0;var an=(this._width-al.left-al.right-at)/2;var aK=(this._height-al.top-al.bottom-aI)/2;if(aK>=0&&an>=0){al.top+=aK;al.bottom+=aK;al.left+=an;al.right+=an}}var am=["top","bottom","left","right"];for(var aB in am){if(this._gridPadding[am[aB]]==null&&al[am[aB]]>0){this._gridPadding[am[aB]]=al[am[aB]]}else{if(this._gridPadding[am[aB]]==null){this._gridPadding[am[aB]]=this._defaultGridPadding[am[aB]]}}}var aA=this._gridPadding;if(this.legend.placement==="outsideGrid"){aA={top:this.title.getHeight(),left:0,right:0,bottom:0};if(this.legend.location==="s"){aA.left=this._gridPadding.left;aA.right=this._gridPadding.right}}ar.xaxis.pack({position:"absolute",bottom:this._gridPadding.bottom-ar.xaxis.getHeight(),left:0,width:this._width},{min:this._gridPadding.left,max:this._width-this._gridPadding.right});ar.yaxis.pack({position:"absolute",top:0,left:this._gridPadding.left-ar.yaxis.getWidth(),height:this._height},{min:this._height-this._gridPadding.bottom,max:this._gridPadding.top});ar.x2axis.pack({position:"absolute",top:this._gridPadding.top-ar.x2axis.getHeight(),left:0,width:this._width},{min:this._gridPadding.left,max:this._width-this._gridPadding.right});for(aH=8;aH>0;aH--){ar[aG[aH-1]].pack({position:"absolute",top:0,right:this._gridPadding.right-az[aH-1]},{min:this._height-this._gridPadding.bottom,max:this._gridPadding.top})}var au=(this._width-this._gridPadding.left-this._gridPadding.right)/2+this._gridPadding.left-ar.yMidAxis.getWidth()/2;ar.yMidAxis.pack({position:"absolute",top:0,left:au,zIndex:9,textAlign:"center"},{min:this._height-this._gridPadding.bottom,max:this._gridPadding.top});this.target.append(this.grid.createElement(this._gridPadding,this));this.grid.draw();var aq=this.series;var aJ=aq.length;for(aH=0,aE=aJ;aH<aE;aH++){aF=this.seriesStack[aH];this.target.append(aq[aF].shadowCanvas.createElement(this._gridPadding,"jqplot-series-shadowCanvas",null,this));aq[aF].shadowCanvas.setContext();aq[aF].shadowCanvas._elem.data("seriesIndex",aF)}for(aH=0,aE=aJ;aH<aE;aH++){aF=this.seriesStack[aH];this.target.append(aq[aF].canvas.createElement(this._gridPadding,"jqplot-series-canvas",null,this));aq[aF].canvas.setContext();aq[aF].canvas._elem.data("seriesIndex",aF)}this.target.append(this.eventCanvas.createElement(this._gridPadding,"jqplot-event-canvas",null,this));this.eventCanvas.setContext();this.eventCanvas._ctx.fillStyle="rgba(0,0,0,0)";this.eventCanvas._ctx.fillRect(0,0,this.eventCanvas._ctx.canvas.width,this.eventCanvas._ctx.canvas.height);this.bindCustomEvents();if(this.legend.preDraw){this.eventCanvas._elem.before(aL);this.legend.pack(aA);if(this.legend._elem){this.drawSeries({legendInfo:{location:this.legend.location,placement:this.legend.placement,width:this.legend.getWidth(),height:this.legend.getHeight(),xoffset:this.legend.xoffset,yoffset:this.legend.yoffset}})}else{this.drawSeries()}}else{this.drawSeries();if(aJ){L(aq[aJ-1].canvas._elem).after(aL)}this.legend.pack(aA)}for(var aH=0,aE=L.jqplot.eventListenerHooks.length;aH<aE;aH++){this.eventCanvas._elem.bind(L.jqplot.eventListenerHooks[aH][0],{plot:this},L.jqplot.eventListenerHooks[aH][1])}for(var aH=0,aE=this.eventListenerHooks.hooks.length;aH<aE;aH++){this.eventCanvas._elem.bind(this.eventListenerHooks.hooks[aH][0],{plot:this},this.eventListenerHooks.hooks[aH][1])}var ay=this.fillBetween;if(ay.fill&&ay.series1!==ay.series2&&ay.series1<aJ&&ay.series2<aJ&&aq[ay.series1]._type==="line"&&aq[ay.series2]._type==="line"){this.doFillBetweenLines()}for(var aH=0,aE=L.jqplot.postDrawHooks.length;aH<aE;aH++){L.jqplot.postDrawHooks[aH].call(this)}for(var aH=0,aE=this.postDrawHooks.hooks.length;aH<aE;aH++){this.postDrawHooks.hooks[aH].apply(this,this.postDrawHooks.args[aH])}if(this.target.is(":visible")){this._drawCount+=1}var av,aw,aD,ap;for(aH=0,aE=aJ;aH<aE;aH++){av=aq[aH];aw=av.renderer;aD=".jqplot-point-label.jqplot-series-"+aH;if(aw.animation&&aw.animation._supported&&aw.animation.show&&(this._drawCount<2||this.animateReplot)){ap=this.target.find(aD);ap.stop(true,true).hide();av.canvas._elem.stop(true,true).hide();av.shadowCanvas._elem.stop(true,true).hide();av.canvas._elem.jqplotEffect("blind",{mode:"show",direction:aw.animation.direction},aw.animation.speed);av.shadowCanvas._elem.jqplotEffect("blind",{mode:"show",direction:aw.animation.direction},aw.animation.speed);ap.fadeIn(aw.animation.speed*0.8)}}ap=null;this.target.trigger("jqplotPostDraw",[this])}};R.prototype.doFillBetweenLines=function(){var an=this.fillBetween;var ax=an.series1;var av=an.series2;var aw=(ax<av)?ax:av;var au=(av>ax)?av:ax;var ar=this.series[aw];var aq=this.series[au];if(aq.renderer.smooth){var ap=aq.renderer._smoothedData.slice(0).reverse()}else{var ap=aq.gridData.slice(0).reverse()}if(ar.renderer.smooth){var at=ar.renderer._smoothedData.concat(ap)}else{var at=ar.gridData.concat(ap)}var ao=(an.color!==null)?an.color:this.series[ax].fillColor;var ay=(an.baseSeries!==null)?an.baseSeries:aw;var am=this.series[ay].renderer.shapeRenderer;var al={fillStyle:ao,fill:true,closePath:true};am.draw(ar.shadowCanvas._ctx,at,al)};this.bindCustomEvents=function(){this.eventCanvas._elem.bind("click",{plot:this},this.onClick);this.eventCanvas._elem.bind("dblclick",{plot:this},this.onDblClick);this.eventCanvas._elem.bind("mousedown",{plot:this},this.onMouseDown);this.eventCanvas._elem.bind("mousemove",{plot:this},this.onMouseMove);this.eventCanvas._elem.bind("mouseenter",{plot:this},this.onMouseEnter);this.eventCanvas._elem.bind("mouseleave",{plot:this},this.onMouseLeave);if(this.captureRightClick){this.eventCanvas._elem.bind("mouseup",{plot:this},this.onRightClick);this.eventCanvas._elem.get(0).oncontextmenu=function(){return false}}else{this.eventCanvas._elem.bind("mouseup",{plot:this},this.onMouseUp)}};function ai(av){var au=av.data.plot;var ap=au.eventCanvas._elem.offset();var at={x:av.pageX-ap.left,y:av.pageY-ap.top};var aq={xaxis:null,yaxis:null,x2axis:null,y2axis:null,y3axis:null,y4axis:null,y5axis:null,y6axis:null,y7axis:null,y8axis:null,y9axis:null,yMidAxis:null};var ar=["xaxis","yaxis","x2axis","y2axis","y3axis","y4axis","y5axis","y6axis","y7axis","y8axis","y9axis","yMidAxis"];var al=au.axes;var am,ao;for(am=11;am>0;am--){ao=ar[am-1];if(al[ao].show){aq[ao]=al[ao].series_p2u(at[ao.charAt(0)])}}return{offsets:ap,gridPos:at,dataPos:aq}}function ak(al,am){var aq=am.series;var aW,aU,aT,aO,aP,aJ,aI,aw,au,az,aA,aK;var aS,aX,aQ,ar,aH,aM,aV;var an,aN;for(aT=am.seriesStack.length-1;aT>=0;aT--){aW=am.seriesStack[aT];aO=aq[aW];aV=aO._highlightThreshold;switch(aO.renderer.constructor){case L.jqplot.BarRenderer:aJ=al.x;aI=al.y;for(aU=0;aU<aO._barPoints.length;aU++){aH=aO._barPoints[aU];aQ=aO.gridData[aU];if(aJ>aH[0][0]&&aJ<aH[2][0]&&aI>aH[2][1]&&aI<aH[0][1]){return{seriesIndex:aO.index,pointIndex:aU,gridData:aQ,data:aO.data[aU],points:aO._barPoints[aU]}}}break;case L.jqplot.PyramidRenderer:aJ=al.x;aI=al.y;for(aU=0;aU<aO._barPoints.length;aU++){aH=aO._barPoints[aU];aQ=aO.gridData[aU];if(aJ>aH[0][0]+aV[0][0]&&aJ<aH[2][0]+aV[2][0]&&aI>aH[2][1]&&aI<aH[0][1]){return{seriesIndex:aO.index,pointIndex:aU,gridData:aQ,data:aO.data[aU],points:aO._barPoints[aU]}}}break;case L.jqplot.DonutRenderer:az=aO.startAngle/180*Math.PI;aJ=al.x-aO._center[0];aI=al.y-aO._center[1];aP=Math.sqrt(Math.pow(aJ,2)+Math.pow(aI,2));if(aJ>0&&-aI>=0){aw=2*Math.PI-Math.atan(-aI/aJ)}else{if(aJ>0&&-aI<0){aw=-Math.atan(-aI/aJ)}else{if(aJ<0){aw=Math.PI-Math.atan(-aI/aJ)}else{if(aJ==0&&-aI>0){aw=3*Math.PI/2}else{if(aJ==0&&-aI<0){aw=Math.PI/2}else{if(aJ==0&&aI==0){aw=0}}}}}}if(az){aw-=az;if(aw<0){aw+=2*Math.PI}else{if(aw>2*Math.PI){aw-=2*Math.PI}}}au=aO.sliceMargin/180*Math.PI;if(aP<aO._radius&&aP>aO._innerRadius){for(aU=0;aU<aO.gridData.length;aU++){aA=(aU>0)?aO.gridData[aU-1][1]+au:au;aK=aO.gridData[aU][1];if(aw>aA&&aw<aK){return{seriesIndex:aO.index,pointIndex:aU,gridData:[al.x,al.y],data:aO.data[aU]}}}}break;case L.jqplot.PieRenderer:az=aO.startAngle/180*Math.PI;aJ=al.x-aO._center[0];aI=al.y-aO._center[1];aP=Math.sqrt(Math.pow(aJ,2)+Math.pow(aI,2));if(aJ>0&&-aI>=0){aw=2*Math.PI-Math.atan(-aI/aJ)}else{if(aJ>0&&-aI<0){aw=-Math.atan(-aI/aJ)}else{if(aJ<0){aw=Math.PI-Math.atan(-aI/aJ)}else{if(aJ==0&&-aI>0){aw=3*Math.PI/2}else{if(aJ==0&&-aI<0){aw=Math.PI/2}else{if(aJ==0&&aI==0){aw=0}}}}}}if(az){aw-=az;if(aw<0){aw+=2*Math.PI}else{if(aw>2*Math.PI){aw-=2*Math.PI}}}au=aO.sliceMargin/180*Math.PI;if(aP<aO._radius){for(aU=0;aU<aO.gridData.length;aU++){aA=(aU>0)?aO.gridData[aU-1][1]+au:au;aK=aO.gridData[aU][1];if(aw>aA&&aw<aK){return{seriesIndex:aO.index,pointIndex:aU,gridData:[al.x,al.y],data:aO.data[aU]}}}}break;case L.jqplot.BubbleRenderer:aJ=al.x;aI=al.y;var aF=null;if(aO.show){for(var aU=0;aU<aO.gridData.length;aU++){aQ=aO.gridData[aU];aX=Math.sqrt((aJ-aQ[0])*(aJ-aQ[0])+(aI-aQ[1])*(aI-aQ[1]));if(aX<=aQ[2]&&(aX<=aS||aS==null)){aS=aX;aF={seriesIndex:aW,pointIndex:aU,gridData:aQ,data:aO.data[aU]}}}if(aF!=null){return aF}}break;case L.jqplot.FunnelRenderer:aJ=al.x;aI=al.y;var aL=aO._vertices,ap=aL[0],ao=aL[aL.length-1],at,aE,ay;function aR(a0,a2,a1){var aZ=(a2[1]-a1[1])/(a2[0]-a1[0]);var aY=a2[1]-aZ*a2[0];var a3=a0+a2[1];return[(a3-aY)/aZ,a3]}at=aR(aI,ap[0],ao[3]);aE=aR(aI,ap[1],ao[2]);for(aU=0;aU<aL.length;aU++){ay=aL[aU];if(aI>=ay[0][1]&&aI<=ay[3][1]&&aJ>=at[0]&&aJ<=aE[0]){return{seriesIndex:aO.index,pointIndex:aU,gridData:null,data:aO.data[aU]}}}break;case L.jqplot.LineRenderer:aJ=al.x;aI=al.y;aP=aO.renderer;if(aO.show){if((aO.fill||(aO.renderer.bands.show&&aO.renderer.bands.fill))&&(!am.plugins.highlighter||!am.plugins.highlighter.show)){var ax=false;if(aJ>aO._boundingBox[0][0]&&aJ<aO._boundingBox[1][0]&&aI>aO._boundingBox[1][1]&&aI<aO._boundingBox[0][1]){var aD=aO._areaPoints.length;var aG;var aU=aD-1;for(var aG=0;aG<aD;aG++){var aC=[aO._areaPoints[aG][0],aO._areaPoints[aG][1]];var aB=[aO._areaPoints[aU][0],aO._areaPoints[aU][1]];if(aC[1]<aI&&aB[1]>=aI||aB[1]<aI&&aC[1]>=aI){if(aC[0]+(aI-aC[1])/(aB[1]-aC[1])*(aB[0]-aC[0])<aJ){ax=!ax}}aU=aG}}if(ax){return{seriesIndex:aW,pointIndex:null,gridData:aO.gridData,data:aO.data,points:aO._areaPoints}}break}else{aN=aO.markerRenderer.size/2+aO.neighborThreshold;an=(aN>0)?aN:0;for(var aU=0;aU<aO.gridData.length;aU++){aQ=aO.gridData[aU];if(aP.constructor==L.jqplot.OHLCRenderer){if(aP.candleStick){var av=aO._yaxis.series_u2p;if(aJ>=aQ[0]-aP._bodyWidth/2&&aJ<=aQ[0]+aP._bodyWidth/2&&aI>=av(aO.data[aU][2])&&aI<=av(aO.data[aU][3])){return{seriesIndex:aW,pointIndex:aU,gridData:aQ,data:aO.data[aU]}}}else{if(!aP.hlc){var av=aO._yaxis.series_u2p;if(aJ>=aQ[0]-aP._tickLength&&aJ<=aQ[0]+aP._tickLength&&aI>=av(aO.data[aU][2])&&aI<=av(aO.data[aU][3])){return{seriesIndex:aW,pointIndex:aU,gridData:aQ,data:aO.data[aU]}}}else{var av=aO._yaxis.series_u2p;if(aJ>=aQ[0]-aP._tickLength&&aJ<=aQ[0]+aP._tickLength&&aI>=av(aO.data[aU][1])&&aI<=av(aO.data[aU][2])){return{seriesIndex:aW,pointIndex:aU,gridData:aQ,data:aO.data[aU]}}}}}else{if(aQ[0]!=null&&aQ[1]!=null){aX=Math.sqrt((aJ-aQ[0])*(aJ-aQ[0])+(aI-aQ[1])*(aI-aQ[1]));if(aX<=an&&(aX<=aS||aS==null)){aS=aX;return{seriesIndex:aW,pointIndex:aU,gridData:aQ,data:aO.data[aU]}}}}}}}break;default:aJ=al.x;aI=al.y;aP=aO.renderer;if(aO.show){aN=aO.markerRenderer.size/2+aO.neighborThreshold;an=(aN>0)?aN:0;for(var aU=0;aU<aO.gridData.length;aU++){aQ=aO.gridData[aU];if(aP.constructor==L.jqplot.OHLCRenderer){if(aP.candleStick){var av=aO._yaxis.series_u2p;if(aJ>=aQ[0]-aP._bodyWidth/2&&aJ<=aQ[0]+aP._bodyWidth/2&&aI>=av(aO.data[aU][2])&&aI<=av(aO.data[aU][3])){return{seriesIndex:aW,pointIndex:aU,gridData:aQ,data:aO.data[aU]}}}else{if(!aP.hlc){var av=aO._yaxis.series_u2p;if(aJ>=aQ[0]-aP._tickLength&&aJ<=aQ[0]+aP._tickLength&&aI>=av(aO.data[aU][2])&&aI<=av(aO.data[aU][3])){return{seriesIndex:aW,pointIndex:aU,gridData:aQ,data:aO.data[aU]}}}else{var av=aO._yaxis.series_u2p;if(aJ>=aQ[0]-aP._tickLength&&aJ<=aQ[0]+aP._tickLength&&aI>=av(aO.data[aU][1])&&aI<=av(aO.data[aU][2])){return{seriesIndex:aW,pointIndex:aU,gridData:aQ,data:aO.data[aU]}}}}}else{aX=Math.sqrt((aJ-aQ[0])*(aJ-aQ[0])+(aI-aQ[1])*(aI-aQ[1]));if(aX<=an&&(aX<=aS||aS==null)){aS=aX;return{seriesIndex:aW,pointIndex:aU,gridData:aQ,data:aO.data[aU]}}}}}break}}return null}this.onClick=function(an){var am=ai(an);var ap=an.data.plot;var ao=ak(am.gridPos,ap);var al=L.Event("jqplotClick");al.pageX=an.pageX;al.pageY=an.pageY;L(this).trigger(al,[am.gridPos,am.dataPos,ao,ap])};this.onDblClick=function(an){var am=ai(an);var ap=an.data.plot;var ao=ak(am.gridPos,ap);var al=L.Event("jqplotDblClick");al.pageX=an.pageX;al.pageY=an.pageY;L(this).trigger(al,[am.gridPos,am.dataPos,ao,ap])};this.onMouseDown=function(an){var am=ai(an);var ap=an.data.plot;var ao=ak(am.gridPos,ap);var al=L.Event("jqplotMouseDown");al.pageX=an.pageX;al.pageY=an.pageY;L(this).trigger(al,[am.gridPos,am.dataPos,ao,ap])};this.onMouseUp=function(an){var am=ai(an);var al=L.Event("jqplotMouseUp");al.pageX=an.pageX;al.pageY=an.pageY;L(this).trigger(al,[am.gridPos,am.dataPos,null,an.data.plot])};this.onRightClick=function(an){var am=ai(an);var ap=an.data.plot;var ao=ak(am.gridPos,ap);if(ap.captureRightClick){if(an.which==3){var al=L.Event("jqplotRightClick");al.pageX=an.pageX;al.pageY=an.pageY;L(this).trigger(al,[am.gridPos,am.dataPos,ao,ap])}else{var al=L.Event("jqplotMouseUp");al.pageX=an.pageX;al.pageY=an.pageY;L(this).trigger(al,[am.gridPos,am.dataPos,ao,ap])}}};this.onMouseMove=function(an){var am=ai(an);var ap=an.data.plot;var ao=ak(am.gridPos,ap);var al=L.Event("jqplotMouseMove");al.pageX=an.pageX;al.pageY=an.pageY;L(this).trigger(al,[am.gridPos,am.dataPos,ao,ap])};this.onMouseEnter=function(an){var am=ai(an);var ao=an.data.plot;var al=L.Event("jqplotMouseEnter");al.pageX=an.pageX;al.pageY=an.pageY;al.relatedTarget=an.relatedTarget;L(this).trigger(al,[am.gridPos,am.dataPos,null,ao])};this.onMouseLeave=function(an){var am=ai(an);var ao=an.data.plot;var al=L.Event("jqplotMouseLeave");al.pageX=an.pageX;al.pageY=an.pageY;al.relatedTarget=an.relatedTarget;L(this).trigger(al,[am.gridPos,am.dataPos,null,ao])};this.drawSeries=function(an,al){var ap,ao,am;al=(typeof(an)==="number"&&al==null)?an:al;an=(typeof(an)==="object")?an:{};if(al!=u){ao=this.series[al];am=ao.shadowCanvas._ctx;am.clearRect(0,0,am.canvas.width,am.canvas.height);ao.drawShadow(am,an,this);am=ao.canvas._ctx;am.clearRect(0,0,am.canvas.width,am.canvas.height);ao.draw(am,an,this);if(ao.renderer.constructor==L.jqplot.BezierCurveRenderer){if(al<this.series.length-1){this.drawSeries(al+1)}}}else{for(ap=0;ap<this.series.length;ap++){ao=this.series[ap];am=ao.shadowCanvas._ctx;am.clearRect(0,0,am.canvas.width,am.canvas.height);ao.drawShadow(am,an,this);am=ao.canvas._ctx;am.clearRect(0,0,am.canvas.width,am.canvas.height);ao.draw(am,an,this)}}an=al=ap=ao=am=null};this.moveSeriesToFront=function(am){am=parseInt(am,10);var ap=L.inArray(am,this.seriesStack);if(ap==-1){return}if(ap==this.seriesStack.length-1){this.previousSeriesStack=this.seriesStack.slice(0);return}var al=this.seriesStack[this.seriesStack.length-1];var ao=this.series[am].canvas._elem.detach();var an=this.series[am].shadowCanvas._elem.detach();this.series[al].shadowCanvas._elem.after(an);this.series[al].canvas._elem.after(ao);this.previousSeriesStack=this.seriesStack.slice(0);this.seriesStack.splice(ap,1);this.seriesStack.push(am)};this.moveSeriesToBack=function(am){am=parseInt(am,10);var ap=L.inArray(am,this.seriesStack);if(ap==0||ap==-1){return}var al=this.seriesStack[0];var ao=this.series[am].canvas._elem.detach();var an=this.series[am].shadowCanvas._elem.detach();this.series[al].shadowCanvas._elem.before(an);this.series[al].canvas._elem.before(ao);this.previousSeriesStack=this.seriesStack.slice(0);this.seriesStack.splice(ap,1);this.seriesStack.unshift(am)};this.restorePreviousSeriesOrder=function(){var ar,aq,ap,ao,an,al,am;if(this.seriesStack==this.previousSeriesStack){return}for(ar=1;ar<this.previousSeriesStack.length;ar++){al=this.previousSeriesStack[ar];am=this.previousSeriesStack[ar-1];ap=this.series[al].canvas._elem.detach();ao=this.series[al].shadowCanvas._elem.detach();this.series[am].shadowCanvas._elem.after(ao);this.series[am].canvas._elem.after(ap)}an=this.seriesStack.slice(0);this.seriesStack=this.previousSeriesStack.slice(0);this.previousSeriesStack=an};this.restoreOriginalSeriesOrder=function(){var ap,ao,al=[],an,am;for(ap=0;ap<this.series.length;ap++){al.push(ap)}if(this.seriesStack==al){return}this.previousSeriesStack=this.seriesStack.slice(0);this.seriesStack=al;for(ap=1;ap<this.seriesStack.length;ap++){an=this.series[ap].canvas._elem.detach();am=this.series[ap].shadowCanvas._elem.detach();this.series[ap-1].shadowCanvas._elem.after(am);this.series[ap-1].canvas._elem.after(an)}};this.activateTheme=function(al){this.themeEngine.activate(this,al)}}L.jqplot.computeHighlightColors=function(ai){var ak;if(L.isArray(ai)){ak=[];for(var am=0;am<ai.length;am++){var al=L.jqplot.getColorComponents(ai[am]);var ah=[al[0],al[1],al[2]];var an=ah[0]+ah[1]+ah[2];for(var aj=0;aj<3;aj++){ah[aj]=(an>660)?ah[aj]*0.85:0.73*ah[aj]+90;ah[aj]=parseInt(ah[aj],10);(ah[aj]>255)?255:ah[aj]}ah[3]=0.3+0.35*al[3];ak.push("rgba("+ah[0]+","+ah[1]+","+ah[2]+","+ah[3]+")")}}else{var al=L.jqplot.getColorComponents(ai);var ah=[al[0],al[1],al[2]];var an=ah[0]+ah[1]+ah[2];for(var aj=0;aj<3;aj++){ah[aj]=(an>660)?ah[aj]*0.85:0.73*ah[aj]+90;ah[aj]=parseInt(ah[aj],10);(ah[aj]>255)?255:ah[aj]}ah[3]=0.3+0.35*al[3];ak="rgba("+ah[0]+","+ah[1]+","+ah[2]+","+ah[3]+")"}return ak};L.jqplot.ColorGenerator=function(ai){ai=ai||L.jqplot.config.defaultColors;var ah=0;this.next=function(){if(ah<ai.length){return ai[ah++]}else{ah=0;return ai[ah++]}};this.previous=function(){if(ah>0){return ai[ah--]}else{ah=ai.length-1;return ai[ah]}};this.get=function(ak){var aj=ak-ai.length*Math.floor(ak/ai.length);return ai[aj]};this.setColors=function(aj){ai=aj};this.reset=function(){ah=0};this.getIndex=function(){return ah};this.setIndex=function(aj){ah=aj}};L.jqplot.hex2rgb=function(aj,ah){aj=aj.replace("#","");if(aj.length==3){aj=aj.charAt(0)+aj.charAt(0)+aj.charAt(1)+aj.charAt(1)+aj.charAt(2)+aj.charAt(2)}var ai;ai="rgba("+parseInt(aj.slice(0,2),16)+", "+parseInt(aj.slice(2,4),16)+", "+parseInt(aj.slice(4,6),16);if(ah){ai+=", "+ah}ai+=")";return ai};L.jqplot.rgb2hex=function(am){var aj=/rgba?\( *([0-9]{1,3}\.?[0-9]*%?) *, *([0-9]{1,3}\.?[0-9]*%?) *, *([0-9]{1,3}\.?[0-9]*%?) *(?:, *[0-9.]*)?\)/;var ah=am.match(aj);var al="#";for(var ak=1;ak<4;ak++){var ai;if(ah[ak].search(/%/)!=-1){ai=parseInt(255*ah[ak]/100,10).toString(16);if(ai.length==1){ai="0"+ai}}else{ai=parseInt(ah[ak],10).toString(16);if(ai.length==1){ai="0"+ai}}al+=ai}return al};L.jqplot.normalize2rgb=function(ai,ah){if(ai.search(/^ *rgba?\(/)!=-1){return ai}else{if(ai.search(/^ *#?[0-9a-fA-F]?[0-9a-fA-F]/)!=-1){return L.jqplot.hex2rgb(ai,ah)}else{throw new Error("Invalid color spec")}}};L.jqplot.getColorComponents=function(am){am=L.jqplot.colorKeywordMap[am]||am;var ak=L.jqplot.normalize2rgb(am);var aj=/rgba?\( *([0-9]{1,3}\.?[0-9]*%?) *, *([0-9]{1,3}\.?[0-9]*%?) *, *([0-9]{1,3}\.?[0-9]*%?) *,? *([0-9.]* *)?\)/;var ah=ak.match(aj);var ai=[];for(var al=1;al<4;al++){if(ah[al].search(/%/)!=-1){ai[al-1]=parseInt(255*ah[al]/100,10)}else{ai[al-1]=parseInt(ah[al],10)}}ai[3]=parseFloat(ah[4])?parseFloat(ah[4]):1;return ai};L.jqplot.colorKeywordMap={aliceblue:"rgb(240, 248, 255)",antiquewhite:"rgb(250, 235, 215)",aqua:"rgb( 0, 255, 255)",aquamarine:"rgb(127, 255, 212)",azure:"rgb(240, 255, 255)",beige:"rgb(245, 245, 220)",bisque:"rgb(255, 228, 196)",black:"rgb( 0, 0, 0)",blanchedalmond:"rgb(255, 235, 205)",blue:"rgb( 0, 0, 255)",blueviolet:"rgb(138, 43, 226)",brown:"rgb(165, 42, 42)",burlywood:"rgb(222, 184, 135)",cadetblue:"rgb( 95, 158, 160)",chartreuse:"rgb(127, 255, 0)",chocolate:"rgb(210, 105, 30)",coral:"rgb(255, 127, 80)",cornflowerblue:"rgb(100, 149, 237)",cornsilk:"rgb(255, 248, 220)",crimson:"rgb(220, 20, 60)",cyan:"rgb( 0, 255, 255)",darkblue:"rgb( 0, 0, 139)",darkcyan:"rgb( 0, 139, 139)",darkgoldenrod:"rgb(184, 134, 11)",darkgray:"rgb(169, 169, 169)",darkgreen:"rgb( 0, 100, 0)",darkgrey:"rgb(169, 169, 169)",darkkhaki:"rgb(189, 183, 107)",darkmagenta:"rgb(139, 0, 139)",darkolivegreen:"rgb( 85, 107, 47)",darkorange:"rgb(255, 140, 0)",darkorchid:"rgb(153, 50, 204)",darkred:"rgb(139, 0, 0)",darksalmon:"rgb(233, 150, 122)",darkseagreen:"rgb(143, 188, 143)",darkslateblue:"rgb( 72, 61, 139)",darkslategray:"rgb( 47, 79, 79)",darkslategrey:"rgb( 47, 79, 79)",darkturquoise:"rgb( 0, 206, 209)",darkviolet:"rgb(148, 0, 211)",deeppink:"rgb(255, 20, 147)",deepskyblue:"rgb( 0, 191, 255)",dimgray:"rgb(105, 105, 105)",dimgrey:"rgb(105, 105, 105)",dodgerblue:"rgb( 30, 144, 255)",firebrick:"rgb(178, 34, 34)",floralwhite:"rgb(255, 250, 240)",forestgreen:"rgb( 34, 139, 34)",fuchsia:"rgb(255, 0, 255)",gainsboro:"rgb(220, 220, 220)",ghostwhite:"rgb(248, 248, 255)",gold:"rgb(255, 215, 0)",goldenrod:"rgb(218, 165, 32)",gray:"rgb(128, 128, 128)",grey:"rgb(128, 128, 128)",green:"rgb( 0, 128, 0)",greenyellow:"rgb(173, 255, 47)",honeydew:"rgb(240, 255, 240)",hotpink:"rgb(255, 105, 180)",indianred:"rgb(205, 92, 92)",indigo:"rgb( 75, 0, 130)",ivory:"rgb(255, 255, 240)",khaki:"rgb(240, 230, 140)",lavender:"rgb(230, 230, 250)",lavenderblush:"rgb(255, 240, 245)",lawngreen:"rgb(124, 252, 0)",lemonchiffon:"rgb(255, 250, 205)",lightblue:"rgb(173, 216, 230)",lightcoral:"rgb(240, 128, 128)",lightcyan:"rgb(224, 255, 255)",lightgoldenrodyellow:"rgb(250, 250, 210)",lightgray:"rgb(211, 211, 211)",lightgreen:"rgb(144, 238, 144)",lightgrey:"rgb(211, 211, 211)",lightpink:"rgb(255, 182, 193)",lightsalmon:"rgb(255, 160, 122)",lightseagreen:"rgb( 32, 178, 170)",lightskyblue:"rgb(135, 206, 250)",lightslategray:"rgb(119, 136, 153)",lightslategrey:"rgb(119, 136, 153)",lightsteelblue:"rgb(176, 196, 222)",lightyellow:"rgb(255, 255, 224)",lime:"rgb( 0, 255, 0)",limegreen:"rgb( 50, 205, 50)",linen:"rgb(250, 240, 230)",magenta:"rgb(255, 0, 255)",maroon:"rgb(128, 0, 0)",mediumaquamarine:"rgb(102, 205, 170)",mediumblue:"rgb( 0, 0, 205)",mediumorchid:"rgb(186, 85, 211)",mediumpurple:"rgb(147, 112, 219)",mediumseagreen:"rgb( 60, 179, 113)",mediumslateblue:"rgb(123, 104, 238)",mediumspringgreen:"rgb( 0, 250, 154)",mediumturquoise:"rgb( 72, 209, 204)",mediumvioletred:"rgb(199, 21, 133)",midnightblue:"rgb( 25, 25, 112)",mintcream:"rgb(245, 255, 250)",mistyrose:"rgb(255, 228, 225)",moccasin:"rgb(255, 228, 181)",navajowhite:"rgb(255, 222, 173)",navy:"rgb( 0, 0, 128)",oldlace:"rgb(253, 245, 230)",olive:"rgb(128, 128, 0)",olivedrab:"rgb(107, 142, 35)",orange:"rgb(255, 165, 0)",orangered:"rgb(255, 69, 0)",orchid:"rgb(218, 112, 214)",palegoldenrod:"rgb(238, 232, 170)",palegreen:"rgb(152, 251, 152)",paleturquoise:"rgb(175, 238, 238)",palevioletred:"rgb(219, 112, 147)",papayawhip:"rgb(255, 239, 213)",peachpuff:"rgb(255, 218, 185)",peru:"rgb(205, 133, 63)",pink:"rgb(255, 192, 203)",plum:"rgb(221, 160, 221)",powderblue:"rgb(176, 224, 230)",purple:"rgb(128, 0, 128)",red:"rgb(255, 0, 0)",rosybrown:"rgb(188, 143, 143)",royalblue:"rgb( 65, 105, 225)",saddlebrown:"rgb(139, 69, 19)",salmon:"rgb(250, 128, 114)",sandybrown:"rgb(244, 164, 96)",seagreen:"rgb( 46, 139, 87)",seashell:"rgb(255, 245, 238)",sienna:"rgb(160, 82, 45)",silver:"rgb(192, 192, 192)",skyblue:"rgb(135, 206, 235)",slateblue:"rgb(106, 90, 205)",slategray:"rgb(112, 128, 144)",slategrey:"rgb(112, 128, 144)",snow:"rgb(255, 250, 250)",springgreen:"rgb( 0, 255, 127)",steelblue:"rgb( 70, 130, 180)",tan:"rgb(210, 180, 140)",teal:"rgb( 0, 128, 128)",thistle:"rgb(216, 191, 216)",tomato:"rgb(255, 99, 71)",turquoise:"rgb( 64, 224, 208)",violet:"rgb(238, 130, 238)",wheat:"rgb(245, 222, 179)",white:"rgb(255, 255, 255)",whitesmoke:"rgb(245, 245, 245)",yellow:"rgb(255, 255, 0)",yellowgreen:"rgb(154, 205, 50)"};L.jqplot.AxisLabelRenderer=function(ah){L.jqplot.ElemContainer.call(this);this.axis;this.show=true;this.label="";this.fontFamily=null;this.fontSize=null;this.textColor=null;this._elem;this.escapeHTML=false;L.extend(true,this,ah)};L.jqplot.AxisLabelRenderer.prototype=new L.jqplot.ElemContainer();L.jqplot.AxisLabelRenderer.prototype.constructor=L.jqplot.AxisLabelRenderer;L.jqplot.AxisLabelRenderer.prototype.init=function(ah){L.extend(true,this,ah)};L.jqplot.AxisLabelRenderer.prototype.draw=function(ah,ai){if(this._elem){this._elem.emptyForce();this._elem=null}this._elem=L('<div style="position:absolute;" class="jqplot-'+this.axis+'-label"></div>');if(Number(this.label)){this._elem.css("white-space","nowrap")}if(!this.escapeHTML){this._elem.html(this.label)}else{this._elem.text(this.label)}if(this.fontFamily){this._elem.css("font-family",this.fontFamily)}if(this.fontSize){this._elem.css("font-size",this.fontSize)}if(this.textColor){this._elem.css("color",this.textColor)}return this._elem};L.jqplot.AxisLabelRenderer.prototype.pack=function(){};L.jqplot.AxisTickRenderer=function(ah){L.jqplot.ElemContainer.call(this);this.mark="outside";this.axis;this.showMark=true;this.showGridline=true;this.isMinorTick=false;this.size=4;this.markSize=6;this.show=true;this.showLabel=true;this.label=null;this.value=null;this._styles={};this.formatter=L.jqplot.DefaultTickFormatter;this.prefix="";this.suffix="";this.formatString="";this.fontFamily;this.fontSize;this.textColor;this.escapeHTML=false;this._elem;this._breakTick=false;L.extend(true,this,ah)};L.jqplot.AxisTickRenderer.prototype.init=function(ah){L.extend(true,this,ah)};L.jqplot.AxisTickRenderer.prototype=new L.jqplot.ElemContainer();L.jqplot.AxisTickRenderer.prototype.constructor=L.jqplot.AxisTickRenderer;L.jqplot.AxisTickRenderer.prototype.setTick=function(ah,aj,ai){this.value=ah;this.axis=aj;if(ai){this.isMinorTick=true}return this};L.jqplot.AxisTickRenderer.prototype.draw=function(){if(this.label===null){this.label=this.prefix+this.formatter(this.formatString,this.value)+this.suffix}var ai={position:"absolute"};if(Number(this.label)){ai.whitSpace="nowrap"}if(this._elem){this._elem.emptyForce();this._elem=null}this._elem=L(document.createElement("div"));this._elem.addClass("jqplot-"+this.axis+"-tick");if(!this.escapeHTML){this._elem.html(this.label)}else{this._elem.text(this.label)}this._elem.css(ai);for(var ah in this._styles){this._elem.css(ah,this._styles[ah])}if(this.fontFamily){this._elem.css("font-family",this.fontFamily)}if(this.fontSize){this._elem.css("font-size",this.fontSize)}if(this.textColor){this._elem.css("color",this.textColor)}if(this._breakTick){this._elem.addClass("jqplot-breakTick")}return this._elem};L.jqplot.DefaultTickFormatter=function(ah,ai){if(typeof ai=="number"){if(!ah){ah=L.jqplot.config.defaultTickFormatString}return L.jqplot.sprintf(ah,ai)}else{return String(ai)}};L.jqplot.PercentTickFormatter=function(ah,ai){if(typeof ai=="number"){ai=100*ai;if(!ah){ah=L.jqplot.config.defaultTickFormatString}return L.jqplot.sprintf(ah,ai)}else{return String(ai)}};L.jqplot.AxisTickRenderer.prototype.pack=function(){};L.jqplot.CanvasGridRenderer=function(){this.shadowRenderer=new L.jqplot.ShadowRenderer()};L.jqplot.CanvasGridRenderer.prototype.init=function(ai){this._ctx;L.extend(true,this,ai);var ah={lineJoin:"miter",lineCap:"round",fill:false,isarc:false,angle:this.shadowAngle,offset:this.shadowOffset,alpha:this.shadowAlpha,depth:this.shadowDepth,lineWidth:this.shadowWidth,closePath:false,strokeStyle:this.shadowColor};this.renderer.shadowRenderer.init(ah)};L.jqplot.CanvasGridRenderer.prototype.createElement=function(ak){var aj;if(this._elem){if(L.jqplot.use_excanvas&&window.G_vmlCanvasManager.uninitElement!==u){aj=this._elem.get(0);window.G_vmlCanvasManager.uninitElement(aj);aj=null}this._elem.emptyForce();this._elem=null}aj=ak.canvasManager.getCanvas();var ah=this._plotDimensions.width;var ai=this._plotDimensions.height;aj.width=ah;aj.height=ai;this._elem=L(aj);this._elem.addClass("jqplot-grid-canvas");this._elem.css({position:"absolute",left:0,top:0});aj=ak.canvasManager.initCanvas(aj);this._top=this._offsets.top;this._bottom=ai-this._offsets.bottom;this._left=this._offsets.left;this._right=ah-this._offsets.right;this._width=this._right-this._left;this._height=this._bottom-this._top;aj=null;return this._elem};L.jqplot.CanvasGridRenderer.prototype.draw=function(){this._ctx=this._elem.get(0).getContext("2d");var at=this._ctx;var aw=this._axes;at.save();at.clearRect(0,0,this._plotDimensions.width,this._plotDimensions.height);at.fillStyle=this.backgroundColor||this.background;at.fillRect(this._left,this._top,this._width,this._height);at.save();at.lineJoin="miter";at.lineCap="butt";at.lineWidth=this.gridLineWidth;at.strokeStyle=this.gridLineColor;var aA,az,ap,aq;var am=["xaxis","yaxis","x2axis","y2axis"];for(var ay=4;ay>0;ay--){var aD=am[ay-1];var ah=aw[aD];var aB=ah._ticks;var ar=aB.length;if(ah.show){if(ah.drawBaseline){var aC={};if(ah.baselineWidth!==null){aC.lineWidth=ah.baselineWidth}if(ah.baselineColor!==null){aC.strokeStyle=ah.baselineColor}switch(aD){case"xaxis":ao(this._left,this._bottom,this._right,this._bottom,aC);break;case"yaxis":ao(this._left,this._bottom,this._left,this._top,aC);break;case"x2axis":ao(this._left,this._bottom,this._right,this._bottom,aC);break;case"y2axis":ao(this._right,this._bottom,this._right,this._top,aC);break}}for(var au=ar;au>0;au--){var an=aB[au-1];if(an.show){var ak=Math.round(ah.u2p(an.value))+0.5;switch(aD){case"xaxis":if(an.showGridline&&this.drawGridlines&&((!an.isMinorTick&&ah.drawMajorGridlines)||(an.isMinorTick&&ah.drawMinorGridlines))){ao(ak,this._top,ak,this._bottom)}if(an.showMark&&an.mark&&((!an.isMinorTick&&ah.drawMajorTickMarks)||(an.isMinorTick&&ah.drawMinorTickMarks))){ap=an.markSize;aq=an.mark;var ak=Math.round(ah.u2p(an.value))+0.5;switch(aq){case"outside":aA=this._bottom;az=this._bottom+ap;break;case"inside":aA=this._bottom-ap;az=this._bottom;break;case"cross":aA=this._bottom-ap;az=this._bottom+ap;break;default:aA=this._bottom;az=this._bottom+ap;break}if(this.shadow){this.renderer.shadowRenderer.draw(at,[[ak,aA],[ak,az]],{lineCap:"butt",lineWidth:this.gridLineWidth,offset:this.gridLineWidth*0.75,depth:2,fill:false,closePath:false})}ao(ak,aA,ak,az)}break;case"yaxis":if(an.showGridline&&this.drawGridlines&&((!an.isMinorTick&&ah.drawMajorGridlines)||(an.isMinorTick&&ah.drawMinorGridlines))){ao(this._right,ak,this._left,ak)}if(an.showMark&&an.mark&&((!an.isMinorTick&&ah.drawMajorTickMarks)||(an.isMinorTick&&ah.drawMinorTickMarks))){ap=an.markSize;aq=an.mark;var ak=Math.round(ah.u2p(an.value))+0.5;switch(aq){case"outside":aA=this._left-ap;az=this._left;break;case"inside":aA=this._left;az=this._left+ap;break;case"cross":aA=this._left-ap;az=this._left+ap;break;default:aA=this._left-ap;az=this._left;break}if(this.shadow){this.renderer.shadowRenderer.draw(at,[[aA,ak],[az,ak]],{lineCap:"butt",lineWidth:this.gridLineWidth*1.5,offset:this.gridLineWidth*0.75,fill:false,closePath:false})}ao(aA,ak,az,ak,{strokeStyle:ah.borderColor})}break;case"x2axis":if(an.showGridline&&this.drawGridlines&&((!an.isMinorTick&&ah.drawMajorGridlines)||(an.isMinorTick&&ah.drawMinorGridlines))){ao(ak,this._bottom,ak,this._top)}if(an.showMark&&an.mark&&((!an.isMinorTick&&ah.drawMajorTickMarks)||(an.isMinorTick&&ah.drawMinorTickMarks))){ap=an.markSize;aq=an.mark;var ak=Math.round(ah.u2p(an.value))+0.5;switch(aq){case"outside":aA=this._top-ap;az=this._top;break;case"inside":aA=this._top;az=this._top+ap;break;case"cross":aA=this._top-ap;az=this._top+ap;break;default:aA=this._top-ap;az=this._top;break}if(this.shadow){this.renderer.shadowRenderer.draw(at,[[ak,aA],[ak,az]],{lineCap:"butt",lineWidth:this.gridLineWidth,offset:this.gridLineWidth*0.75,depth:2,fill:false,closePath:false})}ao(ak,aA,ak,az)}break;case"y2axis":if(an.showGridline&&this.drawGridlines&&((!an.isMinorTick&&ah.drawMajorGridlines)||(an.isMinorTick&&ah.drawMinorGridlines))){ao(this._left,ak,this._right,ak)}if(an.showMark&&an.mark&&((!an.isMinorTick&&ah.drawMajorTickMarks)||(an.isMinorTick&&ah.drawMinorTickMarks))){ap=an.markSize;aq=an.mark;var ak=Math.round(ah.u2p(an.value))+0.5;switch(aq){case"outside":aA=this._right;az=this._right+ap;break;case"inside":aA=this._right-ap;az=this._right;break;case"cross":aA=this._right-ap;az=this._right+ap;break;default:aA=this._right;az=this._right+ap;break}if(this.shadow){this.renderer.shadowRenderer.draw(at,[[aA,ak],[az,ak]],{lineCap:"butt",lineWidth:this.gridLineWidth*1.5,offset:this.gridLineWidth*0.75,fill:false,closePath:false})}ao(aA,ak,az,ak,{strokeStyle:ah.borderColor})}break;default:break}}}an=null}ah=null;aB=null}am=["y3axis","y4axis","y5axis","y6axis","y7axis","y8axis","y9axis","yMidAxis"];for(var ay=7;ay>0;ay--){var ah=aw[am[ay-1]];var aB=ah._ticks;if(ah.show){var ai=aB[ah.numberTicks-1];var al=aB[0];var aj=ah.getLeft();var av=[[aj,ai.getTop()+ai.getHeight()/2],[aj,al.getTop()+al.getHeight()/2+1]];if(this.shadow){this.renderer.shadowRenderer.draw(at,av,{lineCap:"butt",fill:false,closePath:false})}ao(av[0][0],av[0][1],av[1][0],av[1][1],{lineCap:"butt",strokeStyle:ah.borderColor,lineWidth:ah.borderWidth});for(var au=aB.length;au>0;au--){var an=aB[au-1];ap=an.markSize;aq=an.mark;var ak=Math.round(ah.u2p(an.value))+0.5;if(an.showMark&&an.mark){switch(aq){case"outside":aA=aj;az=aj+ap;break;case"inside":aA=aj-ap;az=aj;break;case"cross":aA=aj-ap;az=aj+ap;break;default:aA=aj;az=aj+ap;break}av=[[aA,ak],[az,ak]];if(this.shadow){this.renderer.shadowRenderer.draw(at,av,{lineCap:"butt",lineWidth:this.gridLineWidth*1.5,offset:this.gridLineWidth*0.75,fill:false,closePath:false})}ao(aA,ak,az,ak,{strokeStyle:ah.borderColor})}an=null}al=null}ah=null;aB=null}at.restore();function ao(aH,aG,aE,ax,aF){at.save();aF=aF||{};if(aF.lineWidth==null||aF.lineWidth!=0){L.extend(true,at,aF);at.beginPath();at.moveTo(aH,aG);at.lineTo(aE,ax);at.stroke();at.restore()}}if(this.shadow){var av=[[this._left,this._bottom],[this._right,this._bottom],[this._right,this._top]];this.renderer.shadowRenderer.draw(at,av)}if(this.borderWidth!=0&&this.drawBorder){ao(this._left,this._top,this._right,this._top,{lineCap:"round",strokeStyle:aw.x2axis.borderColor,lineWidth:aw.x2axis.borderWidth});ao(this._right,this._top,this._right,this._bottom,{lineCap:"round",strokeStyle:aw.y2axis.borderColor,lineWidth:aw.y2axis.borderWidth});ao(this._right,this._bottom,this._left,this._bottom,{lineCap:"round",strokeStyle:aw.xaxis.borderColor,lineWidth:aw.xaxis.borderWidth});ao(this._left,this._bottom,this._left,this._top,{lineCap:"round",strokeStyle:aw.yaxis.borderColor,lineWidth:aw.yaxis.borderWidth})}at.restore();at=null;aw=null};L.jqplot.DivTitleRenderer=function(){};L.jqplot.DivTitleRenderer.prototype.init=function(ah){L.extend(true,this,ah)};L.jqplot.DivTitleRenderer.prototype.draw=function(){if(this._elem){this._elem.emptyForce();this._elem=null}var ak=this.renderer;var aj=document.createElement("div");this._elem=L(aj);this._elem.addClass("jqplot-title");if(!this.text){this.show=false;this._elem.height(0);this._elem.width(0)}else{if(this.text){var ah;if(this.color){ah=this.color}else{if(this.textColor){ah=this.textColor}}var ai={position:"absolute",top:"0px",left:"0px"};if(this._plotWidth){ai.width=this._plotWidth+"px"}if(this.fontSize){ai.fontSize=this.fontSize}if(typeof this.textAlign==="string"){ai.textAlign=this.textAlign}else{ai.textAlign="center"}if(ah){ai.color=ah}if(this.paddingBottom){ai.paddingBottom=this.paddingBottom}if(this.fontFamily){ai.fontFamily=this.fontFamily}this._elem.css(ai);if(this.escapeHtml){this._elem.text(this.text)}else{this._elem.html(this.text)}}}aj=null;return this._elem};L.jqplot.DivTitleRenderer.prototype.pack=function(){};var r=0.1;L.jqplot.LinePattern=function(aw,aq){var ap={dotted:[r,L.jqplot.config.dotGapLength],dashed:[L.jqplot.config.dashLength,L.jqplot.config.gapLength],solid:null};if(typeof aq==="string"){if(aq[0]==="."||aq[0]==="-"){var ax=aq;aq=[];for(var ao=0,al=ax.length;ao<al;ao++){if(ax[ao]==="."){aq.push(r)}else{if(ax[ao]==="-"){aq.push(L.jqplot.config.dashLength)}else{continue}}aq.push(L.jqplot.config.gapLength)}}else{aq=ap[aq]}}if(!(aq&&aq.length)){return aw}var ak=0;var ar=aq[0];var au=0;var at=0;var an=0;var ah=0;var av=function(ay,az){aw.moveTo(ay,az);au=ay;at=az;an=ay;ah=az};var aj=function(ay,aE){var aC=aw.lineWidth;var aA=ay-au;var az=aE-at;var aB=Math.sqrt(aA*aA+az*az);if((aB>0)&&(aC>0)){aA/=aB;az/=aB;while(true){var aD=aC*ar;if(aD<aB){au+=aD*aA;at+=aD*az;if((ak&1)==0){aw.lineTo(au,at)}else{aw.moveTo(au,at)}aB-=aD;ak++;if(ak>=aq.length){ak=0}ar=aq[ak]}else{au=ay;at=aE;if((ak&1)==0){aw.lineTo(au,at)}else{aw.moveTo(au,at)}ar-=aB/aC;break}}}};var ai=function(){aw.beginPath()};var am=function(){aj(an,ah)};return{moveTo:av,lineTo:aj,beginPath:ai,closePath:am}};L.jqplot.LineRenderer=function(){this.shapeRenderer=new L.jqplot.ShapeRenderer();this.shadowRenderer=new L.jqplot.ShadowRenderer()};L.jqplot.LineRenderer.prototype.init=function(ai,an){ai=ai||{};this._type="line";this.renderer.animation={show:false,direction:"left",speed:2500,_supported:true};this.renderer.smooth=false;this.renderer.tension=null;this.renderer.constrainSmoothing=true;this.renderer._smoothedData=[];this.renderer._smoothedPlotData=[];this.renderer._hiBandGridData=[];this.renderer._lowBandGridData=[];this.renderer._hiBandSmoothedData=[];this.renderer._lowBandSmoothedData=[];this.renderer.bandData=[];this.renderer.bands={show:false,hiData:[],lowData:[],color:this.color,showLines:false,fill:true,fillColor:null,_min:null,_max:null,interval:"3%"};var al={highlightMouseOver:ai.highlightMouseOver,highlightMouseDown:ai.highlightMouseDown,highlightColor:ai.highlightColor};delete (ai.highlightMouseOver);delete (ai.highlightMouseDown);delete (ai.highlightColor);L.extend(true,this.renderer,ai);this.renderer.options=ai;if(this.renderer.bandData.length>1&&(!ai.bands||ai.bands.show==null)){this.renderer.bands.show=true}else{if(ai.bands&&ai.bands.show==null&&ai.bands.interval!=null){this.renderer.bands.show=true}}if(this.fill){this.renderer.bands.show=false}if(this.renderer.bands.show){this.renderer.initBands.call(this,this.renderer.options,an)}if(this._stack){this.renderer.smooth=false}var am={lineJoin:this.lineJoin,lineCap:this.lineCap,fill:this.fill,isarc:false,strokeStyle:this.color,fillStyle:this.fillColor,lineWidth:this.lineWidth,linePattern:this.linePattern,closePath:this.fill};this.renderer.shapeRenderer.init(am);var aj=ai.shadowOffset;if(aj==null){if(this.lineWidth>2.5){aj=1.25*(1+(Math.atan((this.lineWidth/2.5))/0.785398163-1)*0.6)}else{aj=1.25*Math.atan((this.lineWidth/2.5))/0.785398163}}var ah={lineJoin:this.lineJoin,lineCap:this.lineCap,fill:this.fill,isarc:false,angle:this.shadowAngle,offset:aj,alpha:this.shadowAlpha,depth:this.shadowDepth,lineWidth:this.lineWidth,linePattern:this.linePattern,closePath:this.fill};this.renderer.shadowRenderer.init(ah);this._areaPoints=[];this._boundingBox=[[],[]];if(!this.isTrendline&&this.fill||this.renderer.bands.show){this.highlightMouseOver=true;this.highlightMouseDown=false;this.highlightColor=null;if(al.highlightMouseDown&&al.highlightMouseOver==null){al.highlightMouseOver=false}L.extend(true,this,{highlightMouseOver:al.highlightMouseOver,highlightMouseDown:al.highlightMouseDown,highlightColor:al.highlightColor});if(!this.highlightColor){var ak=(this.renderer.bands.show)?this.renderer.bands.fillColor:this.fillColor;this.highlightColor=L.jqplot.computeHighlightColors(ak)}if(this.highlighter){this.highlighter.show=false}}if(!this.isTrendline&&an){an.plugins.lineRenderer={};an.postInitHooks.addOnce(z);an.postDrawHooks.addOnce(af);an.eventListenerHooks.addOnce("jqplotMouseMove",h);an.eventListenerHooks.addOnce("jqplotMouseDown",e);an.eventListenerHooks.addOnce("jqplotMouseUp",ad);an.eventListenerHooks.addOnce("jqplotClick",g);an.eventListenerHooks.addOnce("jqplotRightClick",s)}};L.jqplot.LineRenderer.prototype.initBands=function(ak,av){var al=ak.bandData||[];var an=this.renderer.bands;an.hiData=[];an.lowData=[];var aB=this.data;an._max=null;an._min=null;if(al.length==2){if(L.isArray(al[0][0])){var ao;var ah=0,ar=0;for(var aw=0,at=al[0].length;aw<at;aw++){ao=al[0][aw];if((ao[1]!=null&&ao[1]>an._max)||an._max==null){an._max=ao[1]}if((ao[1]!=null&&ao[1]<an._min)||an._min==null){an._min=ao[1]}}for(var aw=0,at=al[1].length;aw<at;aw++){ao=al[1][aw];if((ao[1]!=null&&ao[1]>an._max)||an._max==null){an._max=ao[1];ar=1}if((ao[1]!=null&&ao[1]<an._min)||an._min==null){an._min=ao[1];ah=1}}if(ar===ah){an.show=false}an.hiData=al[ar];an.lowData=al[ah]}else{if(al[0].length===aB.length&&al[1].length===aB.length){var aj=(al[0][0]>al[1][0])?0:1;var aC=(aj)?0:1;for(var aw=0,at=aB.length;aw<at;aw++){an.hiData.push([aB[aw][0],al[aj][aw]]);an.lowData.push([aB[aw][0],al[aC][aw]])}}else{an.show=false}}}else{if(al.length>2&&!L.isArray(al[0][0])){var aj=(al[0][0]>al[0][1])?0:1;var aC=(aj)?0:1;for(var aw=0,at=al.length;aw<at;aw++){an.hiData.push([aB[aw][0],al[aw][aj]]);an.lowData.push([aB[aw][0],al[aw][aC]])}}else{var aq=an.interval;var aA=null;var az=null;var ai=null;var au=null;if(L.isArray(aq)){aA=aq[0];az=aq[1]}else{aA=aq}if(isNaN(aA)){if(aA.charAt(aA.length-1)==="%"){ai="multiply";aA=parseFloat(aA)/100+1}}else{aA=parseFloat(aA);ai="add"}if(az!==null&&isNaN(az)){if(az.charAt(az.length-1)==="%"){au="multiply";az=parseFloat(az)/100+1}}else{if(az!==null){az=parseFloat(az);au="add"}}if(aA!==null){if(az===null){az=-aA;au=ai;if(au==="multiply"){az+=2}}if(aA<az){var ax=aA;aA=az;az=ax;ax=ai;ai=au;au=ax}for(var aw=0,at=aB.length;aw<at;aw++){switch(ai){case"add":an.hiData.push([aB[aw][0],aB[aw][1]+aA]);break;case"multiply":an.hiData.push([aB[aw][0],aB[aw][1]*aA]);break}switch(au){case"add":an.lowData.push([aB[aw][0],aB[aw][1]+az]);break;case"multiply":an.lowData.push([aB[aw][0],aB[aw][1]*az]);break}}}else{an.show=false}}}var am=an.hiData;var ap=an.lowData;for(var aw=0,at=am.length;aw<at;aw++){if((am[aw][1]!=null&&am[aw][1]>an._max)||an._max==null){an._max=am[aw][1]}}for(var aw=0,at=ap.length;aw<at;aw++){if((ap[aw][1]!=null&&ap[aw][1]<an._min)||an._min==null){an._min=ap[aw][1]}}if(an.fillColor===null){var ay=L.jqplot.getColorComponents(an.color);ay[3]=ay[3]*0.5;an.fillColor="rgba("+ay[0]+", "+ay[1]+", "+ay[2]+", "+ay[3]+")"}};function K(ai,ah){return(3.4182054+ah)*Math.pow(ai,-0.3534992)}function n(aj,ai){var ah=Math.sqrt(Math.pow((ai[0]-aj[0]),2)+Math.pow((ai[1]-aj[1]),2));return 5.7648*Math.log(ah)+7.4456}function A(ah){var ai=(Math.exp(2*ah)-1)/(Math.exp(2*ah)+1);return ai}function J(aJ){var at=this.renderer.smooth;var aD=this.canvas.getWidth();var an=this._xaxis.series_p2u;var aG=this._yaxis.series_p2u;var aF=null;var am=null;var az=aJ.length/aD;var aj=[];var ay=[];if(!isNaN(parseFloat(at))){aF=parseFloat(at)}else{aF=K(az,0.5)}var aw=[];var ak=[];for(var aE=0,aA=aJ.length;aE<aA;aE++){aw.push(aJ[aE][1]);ak.push(aJ[aE][0])}function av(aK,aL){if(aK-aL==0){return Math.pow(10,10)}else{return aK-aL}}var ax,ar,aq,ap;var ah=aJ.length-1;for(var al=1,aB=aJ.length;al<aB;al++){var ai=[];var au=[];for(var aC=0;aC<2;aC++){var aE=al-1+aC;if(aE==0||aE==ah){ai[aC]=Math.pow(10,10)}else{if(aw[aE+1]-aw[aE]==0||aw[aE]-aw[aE-1]==0){ai[aC]=0}else{if(((ak[aE+1]-ak[aE])/(aw[aE+1]-aw[aE])+(ak[aE]-ak[aE-1])/(aw[aE]-aw[aE-1]))==0){ai[aC]=0}else{if((aw[aE+1]-aw[aE])*(aw[aE]-aw[aE-1])<0){ai[aC]=0}else{ai[aC]=2/(av(ak[aE+1],ak[aE])/(aw[aE+1]-aw[aE])+av(ak[aE],ak[aE-1])/(aw[aE]-aw[aE-1]))}}}}}if(al==1){ai[0]=3/2*(aw[1]-aw[0])/av(ak[1],ak[0])-ai[1]/2}else{if(al==ah){ai[1]=3/2*(aw[ah]-aw[ah-1])/av(ak[ah],ak[ah-1])-ai[0]/2}}au[0]=-2*(ai[1]+2*ai[0])/av(ak[al],ak[al-1])+6*(aw[al]-aw[al-1])/Math.pow(av(ak[al],ak[al-1]),2);au[1]=2*(2*ai[1]+ai[0])/av(ak[al],ak[al-1])-6*(aw[al]-aw[al-1])/Math.pow(av(ak[al],ak[al-1]),2);ap=1/6*(au[1]-au[0])/av(ak[al],ak[al-1]);aq=1/2*(ak[al]*au[0]-ak[al-1]*au[1])/av(ak[al],ak[al-1]);ar=(aw[al]-aw[al-1]-aq*(Math.pow(ak[al],2)-Math.pow(ak[al-1],2))-ap*(Math.pow(ak[al],3)-Math.pow(ak[al-1],3)))/av(ak[al],ak[al-1]);ax=aw[al-1]-ar*ak[al-1]-aq*Math.pow(ak[al-1],2)-ap*Math.pow(ak[al-1],3);var aI=(ak[al]-ak[al-1])/aF;var aH,ao;for(var aC=0,aA=aF;aC<aA;aC++){aH=[];ao=ak[al-1]+aC*aI;aH.push(ao);aH.push(ax+ar*ao+aq*Math.pow(ao,2)+ap*Math.pow(ao,3));aj.push(aH);ay.push([an(aH[0]),aG(aH[1])])}}aj.push(aJ[aE]);ay.push([an(aJ[aE][0]),aG(aJ[aE][1])]);return[aj,ay]}function F(ap){var ao=this.renderer.smooth;var aU=this.renderer.tension;var ah=this.canvas.getWidth();var aH=this._xaxis.series_p2u;var aq=this._yaxis.series_p2u;var aI=null;var aJ=null;var aT=null;var aO=null;var aM=null;var at=null;var aR=null;var am=null;var aK,aL,aD,aC,aA,ay;var ak,ai,av,au;var aB,az,aN;var aw=[];var aj=[];var al=ap.length/ah;var aS,ax,aF,aG,aE;var ar=[];var an=[];if(!isNaN(parseFloat(ao))){aI=parseFloat(ao)}else{aI=K(al,0.5)}if(!isNaN(parseFloat(aU))){aU=parseFloat(aU)}for(var aQ=0,aP=ap.length-1;aQ<aP;aQ++){if(aU===null){at=Math.abs((ap[aQ+1][1]-ap[aQ][1])/(ap[aQ+1][0]-ap[aQ][0]));aS=0.3;ax=0.6;aF=(ax-aS)/2;aG=2.5;aE=-1.4;am=at/aG+aE;aO=aF*A(am)-aF*A(aE)+aS;if(aQ>0){aR=Math.abs((ap[aQ][1]-ap[aQ-1][1])/(ap[aQ][0]-ap[aQ-1][0]))}am=aR/aG+aE;aM=aF*A(am)-aF*A(aE)+aS;aT=(aO+aM)/2}else{aT=aU}for(aK=0;aK<aI;aK++){aL=aK/aI;aD=(1+2*aL)*Math.pow((1-aL),2);aC=aL*Math.pow((1-aL),2);aA=Math.pow(aL,2)*(3-2*aL);ay=Math.pow(aL,2)*(aL-1);if(ap[aQ-1]){ak=aT*(ap[aQ+1][0]-ap[aQ-1][0]);ai=aT*(ap[aQ+1][1]-ap[aQ-1][1])}else{ak=aT*(ap[aQ+1][0]-ap[aQ][0]);ai=aT*(ap[aQ+1][1]-ap[aQ][1])}if(ap[aQ+2]){av=aT*(ap[aQ+2][0]-ap[aQ][0]);au=aT*(ap[aQ+2][1]-ap[aQ][1])}else{av=aT*(ap[aQ+1][0]-ap[aQ][0]);au=aT*(ap[aQ+1][1]-ap[aQ][1])}aB=aD*ap[aQ][0]+aA*ap[aQ+1][0]+aC*ak+ay*av;az=aD*ap[aQ][1]+aA*ap[aQ+1][1]+aC*ai+ay*au;aN=[aB,az];ar.push(aN);an.push([aH(aB),aq(az)])}}ar.push(ap[aP]);an.push([aH(ap[aP][0]),aq(ap[aP][1])]);return[ar,an]}L.jqplot.LineRenderer.prototype.setGridData=function(ap){var al=this._xaxis.series_u2p;var ah=this._yaxis.series_u2p;var am=this._plotData;var aq=this._prevPlotData;this.gridData=[];this._prevGridData=[];this.renderer._smoothedData=[];this.renderer._smoothedPlotData=[];this.renderer._hiBandGridData=[];this.renderer._lowBandGridData=[];this.renderer._hiBandSmoothedData=[];this.renderer._lowBandSmoothedData=[];var ak=this.renderer.bands;var ai=false;for(var an=0,aj=am.length;an<aj;an++){if(am[an][0]!=null&&am[an][1]!=null){this.gridData.push([al.call(this._xaxis,am[an][0]),ah.call(this._yaxis,am[an][1])])}else{if(am[an][0]==null){ai=true;this.gridData.push([null,ah.call(this._yaxis,am[an][1])])}else{if(am[an][1]==null){ai=true;this.gridData.push([al.call(this._xaxis,am[an][0]),null])}}}if(aq[an]!=null&&aq[an][0]!=null&&aq[an][1]!=null){this._prevGridData.push([al.call(this._xaxis,aq[an][0]),ah.call(this._yaxis,aq[an][1])])}else{if(aq[an]!=null&&aq[an][0]==null){this._prevGridData.push([null,ah.call(this._yaxis,aq[an][1])])}else{if(aq[an]!=null&&aq[an][0]!=null&&aq[an][1]==null){this._prevGridData.push([al.call(this._xaxis,aq[an][0]),null])}}}}if(ai){this.renderer.smooth=false;if(this._type==="line"){ak.show=false}}if(this._type==="line"&&ak.show){for(var an=0,aj=ak.hiData.length;an<aj;an++){this.renderer._hiBandGridData.push([al.call(this._xaxis,ak.hiData[an][0]),ah.call(this._yaxis,ak.hiData[an][1])])}for(var an=0,aj=ak.lowData.length;an<aj;an++){this.renderer._lowBandGridData.push([al.call(this._xaxis,ak.lowData[an][0]),ah.call(this._yaxis,ak.lowData[an][1])])}}if(this._type==="line"&&this.renderer.smooth&&this.gridData.length>2){var ao;if(this.renderer.constrainSmoothing){ao=J.call(this,this.gridData);this.renderer._smoothedData=ao[0];this.renderer._smoothedPlotData=ao[1];if(ak.show){ao=J.call(this,this.renderer._hiBandGridData);this.renderer._hiBandSmoothedData=ao[0];ao=J.call(this,this.renderer._lowBandGridData);this.renderer._lowBandSmoothedData=ao[0]}ao=null}else{ao=F.call(this,this.gridData);this.renderer._smoothedData=ao[0];this.renderer._smoothedPlotData=ao[1];if(ak.show){ao=F.call(this,this.renderer._hiBandGridData);this.renderer._hiBandSmoothedData=ao[0];ao=F.call(this,this.renderer._lowBandGridData);this.renderer._lowBandSmoothedData=ao[0]}ao=null}}};L.jqplot.LineRenderer.prototype.makeGridData=function(ao,aq){var am=this._xaxis.series_u2p;var ah=this._yaxis.series_u2p;var ar=[];var aj=[];this.renderer._smoothedData=[];this.renderer._smoothedPlotData=[];this.renderer._hiBandGridData=[];this.renderer._lowBandGridData=[];this.renderer._hiBandSmoothedData=[];this.renderer._lowBandSmoothedData=[];var al=this.renderer.bands;var ai=false;for(var an=0;an<ao.length;an++){if(ao[an][0]!=null&&ao[an][1]!=null){ar.push([am.call(this._xaxis,ao[an][0]),ah.call(this._yaxis,ao[an][1])])}else{if(ao[an][0]==null){ai=true;ar.push([null,ah.call(this._yaxis,ao[an][1])])}else{if(ao[an][1]==null){ai=true;ar.push([am.call(this._xaxis,ao[an][0]),null])}}}}if(ai){this.renderer.smooth=false;if(this._type==="line"){al.show=false}}if(this._type==="line"&&al.show){for(var an=0,ak=al.hiData.length;an<ak;an++){this.renderer._hiBandGridData.push([am.call(this._xaxis,al.hiData[an][0]),ah.call(this._yaxis,al.hiData[an][1])])}for(var an=0,ak=al.lowData.length;an<ak;an++){this.renderer._lowBandGridData.push([am.call(this._xaxis,al.lowData[an][0]),ah.call(this._yaxis,al.lowData[an][1])])}}if(this._type==="line"&&this.renderer.smooth&&ar.length>2){var ap;if(this.renderer.constrainSmoothing){ap=J.call(this,ar);this.renderer._smoothedData=ap[0];this.renderer._smoothedPlotData=ap[1];if(al.show){ap=J.call(this,this.renderer._hiBandGridData);this.renderer._hiBandSmoothedData=ap[0];ap=J.call(this,this.renderer._lowBandGridData);this.renderer._lowBandSmoothedData=ap[0]}ap=null}else{ap=F.call(this,ar);this.renderer._smoothedData=ap[0];this.renderer._smoothedPlotData=ap[1];if(al.show){ap=F.call(this,this.renderer._hiBandGridData);this.renderer._hiBandSmoothedData=ap[0];ap=F.call(this,this.renderer._lowBandGridData);this.renderer._lowBandSmoothedData=ap[0]}ap=null}}return ar};L.jqplot.LineRenderer.prototype.draw=function(ax,aI,ai,aB){var aC;var aq=L.extend(true,{},ai);var ak=(aq.shadow!=u)?aq.shadow:this.shadow;var aJ=(aq.showLine!=u)?aq.showLine:this.showLine;var aA=(aq.fill!=u)?aq.fill:this.fill;var ah=(aq.fillAndStroke!=u)?aq.fillAndStroke:this.fillAndStroke;var ar,ay,av,aE;ax.save();if(aI.length){if(aJ){if(aA){if(this.fillToZero){var aF=this.negativeColor;if(!this.useNegativeColors){aF=aq.fillStyle}var ao=false;var ap=aq.fillStyle;if(ah){var aH=aI.slice(0)}if(this.index==0||!this._stack){var aw=[];var aL=(this.renderer.smooth)?this.renderer._smoothedPlotData:this._plotData;this._areaPoints=[];var aG=this._yaxis.series_u2p(this.fillToValue);var aj=this._xaxis.series_u2p(this.fillToValue);aq.closePath=true;if(this.fillAxis=="y"){aw.push([aI[0][0],aG]);this._areaPoints.push([aI[0][0],aG]);for(var aC=0;aC<aI.length-1;aC++){aw.push(aI[aC]);this._areaPoints.push(aI[aC]);if(aL[aC][1]*aL[aC+1][1]<=0){if(aL[aC][1]<0){ao=true;aq.fillStyle=aF}else{ao=false;aq.fillStyle=ap}var an=aI[aC][0]+(aI[aC+1][0]-aI[aC][0])*(aG-aI[aC][1])/(aI[aC+1][1]-aI[aC][1]);aw.push([an,aG]);this._areaPoints.push([an,aG]);if(ak){this.renderer.shadowRenderer.draw(ax,aw,aq)}this.renderer.shapeRenderer.draw(ax,aw,aq);aw=[[an,aG]]}}if(aL[aI.length-1][1]<0){ao=true;aq.fillStyle=aF}else{ao=false;aq.fillStyle=ap}aw.push(aI[aI.length-1]);this._areaPoints.push(aI[aI.length-1]);aw.push([aI[aI.length-1][0],aG]);this._areaPoints.push([aI[aI.length-1][0],aG])}if(ak){this.renderer.shadowRenderer.draw(ax,aw,aq)}this.renderer.shapeRenderer.draw(ax,aw,aq)}else{var au=this._prevGridData;for(var aC=au.length;aC>0;aC--){aI.push(au[aC-1])}if(ak){this.renderer.shadowRenderer.draw(ax,aI,aq)}this._areaPoints=aI;this.renderer.shapeRenderer.draw(ax,aI,aq)}}else{if(ah){var aH=aI.slice(0)}if(this.index==0||!this._stack){var al=ax.canvas.height;aI.unshift([aI[0][0],al]);var aD=aI.length;aI.push([aI[aD-1][0],al])}else{var au=this._prevGridData;for(var aC=au.length;aC>0;aC--){aI.push(au[aC-1])}}this._areaPoints=aI;if(ak){this.renderer.shadowRenderer.draw(ax,aI,aq)}this.renderer.shapeRenderer.draw(ax,aI,aq)}if(ah){var az=L.extend(true,{},aq,{fill:false,closePath:false});this.renderer.shapeRenderer.draw(ax,aH,az);if(this.markerRenderer.show){if(this.renderer.smooth){aH=this.gridData}for(aC=0;aC<aH.length;aC++){this.markerRenderer.draw(aH[aC][0],aH[aC][1],ax,aq.markerOptions)}}}}else{if(this.renderer.bands.show){var am;var aK=L.extend(true,{},aq);if(this.renderer.bands.showLines){am=(this.renderer.smooth)?this.renderer._hiBandSmoothedData:this.renderer._hiBandGridData;this.renderer.shapeRenderer.draw(ax,am,aq);am=(this.renderer.smooth)?this.renderer._lowBandSmoothedData:this.renderer._lowBandGridData;this.renderer.shapeRenderer.draw(ax,am,aK)}if(this.renderer.bands.fill){if(this.renderer.smooth){am=this.renderer._hiBandSmoothedData.concat(this.renderer._lowBandSmoothedData.reverse())}else{am=this.renderer._hiBandGridData.concat(this.renderer._lowBandGridData.reverse())}this._areaPoints=am;aK.closePath=true;aK.fill=true;aK.fillStyle=this.renderer.bands.fillColor;this.renderer.shapeRenderer.draw(ax,am,aK)}}if(ak){this.renderer.shadowRenderer.draw(ax,aI,aq)}this.renderer.shapeRenderer.draw(ax,aI,aq)}}var ar=av=ay=aE=null;for(aC=0;aC<this._areaPoints.length;aC++){var at=this._areaPoints[aC];if(ar>at[0]||ar==null){ar=at[0]}if(aE<at[1]||aE==null){aE=at[1]}if(av<at[0]||av==null){av=at[0]}if(ay>at[1]||ay==null){ay=at[1]}}if(this.type==="line"&&this.renderer.bands.show){aE=this._yaxis.series_u2p(this.renderer.bands._min);ay=this._yaxis.series_u2p(this.renderer.bands._max)}this._boundingBox=[[ar,aE],[av,ay]];if(this.markerRenderer.show&&!aA){if(this.renderer.smooth){aI=this.gridData}for(aC=0;aC<aI.length;aC++){if(aI[aC][0]!=null&&aI[aC][1]!=null){this.markerRenderer.draw(aI[aC][0],aI[aC][1],ax,aq.markerOptions)}}}}ax.restore()};L.jqplot.LineRenderer.prototype.drawShadow=function(ah,aj,ai){};function z(ak,aj,ah){for(var ai=0;ai<this.series.length;ai++){if(this.series[ai].renderer.constructor==L.jqplot.LineRenderer){if(this.series[ai].highlightMouseOver){this.series[ai].highlightMouseDown=false}}}}function af(){if(this.plugins.lineRenderer&&this.plugins.lineRenderer.highlightCanvas){this.plugins.lineRenderer.highlightCanvas.resetCanvas();this.plugins.lineRenderer.highlightCanvas=null}this.plugins.lineRenderer.highlightedSeriesIndex=null;this.plugins.lineRenderer.highlightCanvas=new L.jqplot.GenericCanvas();this.eventCanvas._elem.before(this.plugins.lineRenderer.highlightCanvas.createElement(this._gridPadding,"jqplot-lineRenderer-highlight-canvas",this._plotDimensions,this));this.plugins.lineRenderer.highlightCanvas.setContext();this.eventCanvas._elem.bind("mouseleave",{plot:this},function(ah){aa(ah.data.plot)})}function ac(an,am,ak,aj){var ai=an.series[am];var ah=an.plugins.lineRenderer.highlightCanvas;ah._ctx.clearRect(0,0,ah._ctx.canvas.width,ah._ctx.canvas.height);ai._highlightedPoint=ak;an.plugins.lineRenderer.highlightedSeriesIndex=am;var al={fillStyle:ai.highlightColor};if(ai.type==="line"&&ai.renderer.bands.show){al.fill=true;al.closePath=true}ai.renderer.shapeRenderer.draw(ah._ctx,aj,al);ah=null}function aa(aj){var ah=aj.plugins.lineRenderer.highlightCanvas;ah._ctx.clearRect(0,0,ah._ctx.canvas.width,ah._ctx.canvas.height);for(var ai=0;ai<aj.series.length;ai++){aj.series[ai]._highlightedPoint=null}aj.plugins.lineRenderer.highlightedSeriesIndex=null;aj.target.trigger("jqplotDataUnhighlight");ah=null}function h(al,ak,ao,an,am){if(an){var aj=[an.seriesIndex,an.pointIndex,an.data];var ai=jQuery.Event("jqplotDataMouseOver");ai.pageX=al.pageX;ai.pageY=al.pageY;am.target.trigger(ai,aj);if(am.series[aj[0]].highlightMouseOver&&!(aj[0]==am.plugins.lineRenderer.highlightedSeriesIndex)){var ah=jQuery.Event("jqplotDataHighlight");ah.which=al.which;ah.pageX=al.pageX;ah.pageY=al.pageY;am.target.trigger(ah,aj);ac(am,an.seriesIndex,an.pointIndex,an.points)}}else{if(an==null){aa(am)}}}function e(ak,aj,an,am,al){if(am){var ai=[am.seriesIndex,am.pointIndex,am.data];if(al.series[ai[0]].highlightMouseDown&&!(ai[0]==al.plugins.lineRenderer.highlightedSeriesIndex)){var ah=jQuery.Event("jqplotDataHighlight");ah.which=ak.which;ah.pageX=ak.pageX;ah.pageY=ak.pageY;al.target.trigger(ah,ai);ac(al,am.seriesIndex,am.pointIndex,am.points)}}else{if(am==null){aa(al)}}}function ad(aj,ai,am,al,ak){var ah=ak.plugins.lineRenderer.highlightedSeriesIndex;if(ah!=null&&ak.series[ah].highlightMouseDown){aa(ak)}}function g(ak,aj,an,am,al){if(am){var ai=[am.seriesIndex,am.pointIndex,am.data];var ah=jQuery.Event("jqplotDataClick");ah.which=ak.which;ah.pageX=ak.pageX;ah.pageY=ak.pageY;al.target.trigger(ah,ai)}}function s(al,ak,ao,an,am){if(an){var aj=[an.seriesIndex,an.pointIndex,an.data];var ah=am.plugins.lineRenderer.highlightedSeriesIndex;if(ah!=null&&am.series[ah].highlightMouseDown){aa(am)}var ai=jQuery.Event("jqplotDataRightClick");ai.which=al.which;ai.pageX=al.pageX;ai.pageY=al.pageY;am.target.trigger(ai,aj)}}L.jqplot.LinearAxisRenderer=function(){};L.jqplot.LinearAxisRenderer.prototype.init=function(ah){this.breakPoints=null;this.breakTickLabel="&asymp;";this.drawBaseline=true;this.baselineWidth=null;this.baselineColor=null;this.forceTickAt0=false;this.forceTickAt100=false;this.tickInset=0;this.minorTicks=0;this.alignTicks=false;this._autoFormatString="";this._overrideFormatString=false;this._scalefact=1;L.extend(true,this,ah);if(this.breakPoints){if(!L.isArray(this.breakPoints)){this.breakPoints=null}else{if(this.breakPoints.length<2||this.breakPoints[1]<=this.breakPoints[0]){this.breakPoints=null}}}if(this.numberTicks!=null&&this.numberTicks<2){this.numberTicks=2}this.resetDataBounds()};L.jqplot.LinearAxisRenderer.prototype.draw=function(ah,ao){if(this.show){this.renderer.createTicks.call(this,ao);var an=0;var ai;if(this._elem){this._elem.emptyForce();this._elem=null}this._elem=L(document.createElement("div"));this._elem.addClass("jqplot-axis jqplot-"+this.name);this._elem.css("position","absolute");if(this.name=="xaxis"||this.name=="x2axis"){this._elem.width(this._plotDimensions.width)}else{this._elem.height(this._plotDimensions.height)}this.labelOptions.axis=this.name;this._label=new this.labelRenderer(this.labelOptions);if(this._label.show){var am=this._label.draw(ah,ao);am.appendTo(this._elem);am=null}var al=this._ticks;var ak;for(var aj=0;aj<al.length;aj++){ak=al[aj];if(ak.show&&ak.showLabel&&(!ak.isMinorTick||this.showMinorTicks)){this._elem.append(ak.draw(ah,ao))}}ak=null;al=null}return this._elem};L.jqplot.LinearAxisRenderer.prototype.reset=function(){this.min=this._options.min;this.max=this._options.max;this.tickInterval=this._options.tickInterval;this.numberTicks=this._options.numberTicks;this._autoFormatString="";if(this._overrideFormatString&&this.tickOptions&&this.tickOptions.formatString){this.tickOptions.formatString=""}};L.jqplot.LinearAxisRenderer.prototype.set=function(){var ao=0;var aj;var ai=0;var an=0;var ah=(this._label==null)?false:this._label.show;if(this.show){var am=this._ticks;var al;for(var ak=0;ak<am.length;ak++){al=am[ak];if(!al._breakTick&&al.show&&al.showLabel&&(!al.isMinorTick||this.showMinorTicks)){if(this.name=="xaxis"||this.name=="x2axis"){aj=al._elem.outerHeight(true)}else{aj=al._elem.outerWidth(true)}if(aj>ao){ao=aj}}}al=null;am=null;if(ah){ai=this._label._elem.outerWidth(true);an=this._label._elem.outerHeight(true)}if(this.name=="xaxis"){ao=ao+an;this._elem.css({height:ao+"px",left:"0px",bottom:"0px"})}else{if(this.name=="x2axis"){ao=ao+an;this._elem.css({height:ao+"px",left:"0px",top:"0px"})}else{if(this.name=="yaxis"){ao=ao+ai;this._elem.css({width:ao+"px",left:"0px",top:"0px"});if(ah&&this._label.constructor==L.jqplot.AxisLabelRenderer){this._label._elem.css("width",ai+"px")}}else{ao=ao+ai;this._elem.css({width:ao+"px",right:"0px",top:"0px"});if(ah&&this._label.constructor==L.jqplot.AxisLabelRenderer){this._label._elem.css("width",ai+"px")}}}}}};L.jqplot.LinearAxisRenderer.prototype.createTicks=function(aj){var aT=this._ticks;var aK=this.ticks;var az=this.name;var aB=this._dataBounds;var ah=(this.name.charAt(0)==="x")?this._plotDimensions.width:this._plotDimensions.height;var an;var a6,aI;var ap,ao;var a4,a0;var aH=this.min;var a5=this.max;var aW=this.numberTicks;var ba=this.tickInterval;var am=30;this._scalefact=(Math.max(ah,am+1)-am)/300;if(aK.length){for(a0=0;a0<aK.length;a0++){var aO=aK[a0];var aU=new this.tickRenderer(this.tickOptions);if(L.isArray(aO)){aU.value=aO[0];if(this.breakPoints){if(aO[0]==this.breakPoints[0]){aU.label=this.breakTickLabel;aU._breakTick=true;aU.showGridline=false;aU.showMark=false}else{if(aO[0]>this.breakPoints[0]&&aO[0]<=this.breakPoints[1]){aU.show=false;aU.showGridline=false;aU.label=aO[1]}else{aU.label=aO[1]}}}else{aU.label=aO[1]}aU.setTick(aO[0],this.name);this._ticks.push(aU)}else{if(L.isPlainObject(aO)){L.extend(true,aU,aO);aU.axis=this.name;this._ticks.push(aU)}else{aU.value=aO;if(this.breakPoints){if(aO==this.breakPoints[0]){aU.label=this.breakTickLabel;aU._breakTick=true;aU.showGridline=false;aU.showMark=false}else{if(aO>this.breakPoints[0]&&aO<=this.breakPoints[1]){aU.show=false;aU.showGridline=false}}}aU.setTick(aO,this.name);this._ticks.push(aU)}}}this.numberTicks=aK.length;this.min=this._ticks[0].value;this.max=this._ticks[this.numberTicks-1].value;this.tickInterval=(this.max-this.min)/(this.numberTicks-1)}else{if(az=="xaxis"||az=="x2axis"){ah=this._plotDimensions.width}else{ah=this._plotDimensions.height}var ax=this.numberTicks;if(this.alignTicks){if(this.name==="x2axis"&&aj.axes.xaxis.show){ax=aj.axes.xaxis.numberTicks}else{if(this.name.charAt(0)==="y"&&this.name!=="yaxis"&&this.name!=="yMidAxis"&&aj.axes.yaxis.show){ax=aj.axes.yaxis.numberTicks}}}a6=((this.min!=null)?this.min:aB.min);aI=((this.max!=null)?this.max:aB.max);var av=aI-a6;var aS,ay;var at;if(this.tickOptions==null||!this.tickOptions.formatString){this._overrideFormatString=true}if(this.min==null||this.max==null&&this.tickInterval==null&&!this.autoscale){if(this.forceTickAt0){if(a6>0){a6=0}if(aI<0){aI=0}}if(this.forceTickAt100){if(a6>100){a6=100}if(aI<100){aI=100}}var aE=false,a1=false;if(this.min!=null){aE=true}else{if(this.max!=null){a1=true}}var aP=L.jqplot.LinearTickGenerator(a6,aI,this._scalefact,ax,aE,a1);var aw=(this.min!=null)?a6:a6+av*(this.padMin-1);var aQ=(this.max!=null)?aI:aI-av*(this.padMax-1);if(a6<aw||aI>aQ){aw=(this.min!=null)?a6:a6-av*(this.padMin-1);aQ=(this.max!=null)?aI:aI+av*(this.padMax-1);aP=L.jqplot.LinearTickGenerator(aw,aQ,this._scalefact,ax,aE,a1)}this.min=aP[0];this.max=aP[1];this.numberTicks=aP[2];this._autoFormatString=aP[3];this.tickInterval=aP[4]}else{if(a6==aI){var ai=0.05;if(a6>0){ai=Math.max(Math.log(a6)/Math.LN10,0.05)}a6-=ai;aI+=ai}if(this.autoscale&&this.min==null&&this.max==null){var ak,al,ar;var aC=false;var aN=false;var aA={min:null,max:null,average:null,stddev:null};for(var a0=0;a0<this._series.length;a0++){var aV=this._series[a0];var aD=(aV.fillAxis=="x")?aV._xaxis.name:aV._yaxis.name;if(this.name==aD){var aR=aV._plotValues[aV.fillAxis];var aG=aR[0];var a2=aR[0];for(var aZ=1;aZ<aR.length;aZ++){if(aR[aZ]<aG){aG=aR[aZ]}else{if(aR[aZ]>a2){a2=aR[aZ]}}}var au=(a2-aG)/a2;if(aV.renderer.constructor==L.jqplot.BarRenderer){if(aG>=0&&(aV.fillToZero||au>0.1)){aC=true}else{aC=false;if(aV.fill&&aV.fillToZero&&aG<0&&a2>0){aN=true}else{aN=false}}}else{if(aV.fill){if(aG>=0&&(aV.fillToZero||au>0.1)){aC=true}else{if(aG<0&&a2>0&&aV.fillToZero){aC=false;aN=true}else{aC=false;aN=false}}}else{if(aG<0){aC=false}}}}}if(aC){this.numberTicks=2+Math.ceil((ah-(this.tickSpacing-1))/this.tickSpacing);this.min=0;aH=0;al=aI/(this.numberTicks-1);at=Math.pow(10,Math.abs(Math.floor(Math.log(al)/Math.LN10)));if(al/at==parseInt(al/at,10)){al+=at}this.tickInterval=Math.ceil(al/at)*at;this.max=this.tickInterval*(this.numberTicks-1)}else{if(aN){this.numberTicks=2+Math.ceil((ah-(this.tickSpacing-1))/this.tickSpacing);var aJ=Math.ceil(Math.abs(a6)/av*(this.numberTicks-1));var a9=this.numberTicks-1-aJ;al=Math.max(Math.abs(a6/aJ),Math.abs(aI/a9));at=Math.pow(10,Math.abs(Math.floor(Math.log(al)/Math.LN10)));this.tickInterval=Math.ceil(al/at)*at;this.max=this.tickInterval*a9;this.min=-this.tickInterval*aJ}else{if(this.numberTicks==null){if(this.tickInterval){this.numberTicks=3+Math.ceil(av/this.tickInterval)}else{this.numberTicks=2+Math.ceil((ah-(this.tickSpacing-1))/this.tickSpacing)}}if(this.tickInterval==null){al=av/(this.numberTicks-1);if(al<1){at=Math.pow(10,Math.abs(Math.floor(Math.log(al)/Math.LN10)))}else{at=1}this.tickInterval=Math.ceil(al*at*this.pad)/at}else{at=1/this.tickInterval}ak=this.tickInterval*(this.numberTicks-1);ar=(ak-av)/2;if(this.min==null){this.min=Math.floor(at*(a6-ar))/at}if(this.max==null){this.max=this.min+ak}}}var aF=L.jqplot.getSignificantFigures(this.tickInterval);var aM;if(aF.digitsLeft>=aF.significantDigits){aM="%d"}else{var at=Math.max(0,5-aF.digitsLeft);at=Math.min(at,aF.digitsRight);aM="%."+at+"f"}this._autoFormatString=aM}else{aS=(this.min!=null)?this.min:a6-av*(this.padMin-1);ay=(this.max!=null)?this.max:aI+av*(this.padMax-1);av=ay-aS;if(this.numberTicks==null){if(this.tickInterval!=null){this.numberTicks=Math.ceil((ay-aS)/this.tickInterval)+1}else{if(ah>100){this.numberTicks=parseInt(3+(ah-100)/75,10)}else{this.numberTicks=2}}}if(this.tickInterval==null){this.tickInterval=av/(this.numberTicks-1)}if(this.max==null){ay=aS+this.tickInterval*(this.numberTicks-1)}if(this.min==null){aS=ay-this.tickInterval*(this.numberTicks-1)}var aF=L.jqplot.getSignificantFigures(this.tickInterval);var aM;if(aF.digitsLeft>=aF.significantDigits){aM="%d"}else{var at=Math.max(0,5-aF.digitsLeft);at=Math.min(at,aF.digitsRight);aM="%."+at+"f"}this._autoFormatString=aM;this.min=aS;this.max=ay}if(this.renderer.constructor==L.jqplot.LinearAxisRenderer&&this._autoFormatString==""){av=this.max-this.min;var a7=new this.tickRenderer(this.tickOptions);var aL=a7.formatString||L.jqplot.config.defaultTickFormatString;var aL=aL.match(L.jqplot.sprintf.regex)[0];var a3=0;if(aL){if(aL.search(/[fFeEgGpP]/)>-1){var aY=aL.match(/\%\.(\d{0,})?[eEfFgGpP]/);if(aY){a3=parseInt(aY[1],10)}else{a3=6}}else{if(aL.search(/[di]/)>-1){a3=0}}var aq=Math.pow(10,-a3);if(this.tickInterval<aq){if(aW==null&&ba==null){this.tickInterval=aq;if(a5==null&&aH==null){this.min=Math.floor(this._dataBounds.min/aq)*aq;if(this.min==this._dataBounds.min){this.min=this._dataBounds.min-this.tickInterval}this.max=Math.ceil(this._dataBounds.max/aq)*aq;if(this.max==this._dataBounds.max){this.max=this._dataBounds.max+this.tickInterval}var aX=(this.max-this.min)/this.tickInterval;aX=aX.toFixed(11);aX=Math.ceil(aX);this.numberTicks=aX+1}else{if(a5==null){var aX=(this._dataBounds.max-this.min)/this.tickInterval;aX=aX.toFixed(11);this.numberTicks=Math.ceil(aX)+2;this.max=this.min+this.tickInterval*(this.numberTicks-1)}else{if(aH==null){var aX=(this.max-this._dataBounds.min)/this.tickInterval;aX=aX.toFixed(11);this.numberTicks=Math.ceil(aX)+2;this.min=this.max-this.tickInterval*(this.numberTicks-1)}else{this.numberTicks=Math.ceil((a5-aH)/this.tickInterval)+1;this.min=Math.floor(aH*Math.pow(10,a3))/Math.pow(10,a3);this.max=Math.ceil(a5*Math.pow(10,a3))/Math.pow(10,a3);this.numberTicks=Math.ceil((this.max-this.min)/this.tickInterval)+1}}}}}}}}if(this._overrideFormatString&&this._autoFormatString!=""){this.tickOptions=this.tickOptions||{};this.tickOptions.formatString=this._autoFormatString}var aU,a8;for(var a0=0;a0<this.numberTicks;a0++){a4=this.min+a0*this.tickInterval;aU=new this.tickRenderer(this.tickOptions);aU.setTick(a4,this.name);this._ticks.push(aU);if(a0<this.numberTicks-1){for(var aZ=0;aZ<this.minorTicks;aZ++){a4+=this.tickInterval/(this.minorTicks+1);a8=L.extend(true,{},this.tickOptions,{name:this.name,value:a4,label:"",isMinorTick:true});aU=new this.tickRenderer(a8);this._ticks.push(aU)}}aU=null}}if(this.tickInset){this.min=this.min-this.tickInset*this.tickInterval;this.max=this.max+this.tickInset*this.tickInterval}aT=null};L.jqplot.LinearAxisRenderer.prototype.resetTickValues=function(aj){if(L.isArray(aj)&&aj.length==this._ticks.length){var ai;for(var ah=0;ah<aj.length;ah++){ai=this._ticks[ah];ai.value=aj[ah];ai.label=ai.formatter(ai.formatString,aj[ah]);ai.label=ai.prefix+ai.label;ai._elem.html(ai.label)}ai=null;this.min=L.jqplot.arrayMin(aj);this.max=L.jqplot.arrayMax(aj);this.pack()}};L.jqplot.LinearAxisRenderer.prototype.pack=function(aj,ai){aj=aj||{};ai=ai||this._offsets;var ay=this._ticks;var au=this.max;var at=this.min;var ao=ai.max;var am=ai.min;var aq=(this._label==null)?false:this._label.show;for(var ar in aj){this._elem.css(ar,aj[ar])}this._offsets=ai;var ak=ao-am;var al=au-at;if(this.breakPoints){al=al-this.breakPoints[1]+this.breakPoints[0];this.p2u=function(aA){return(aA-am)*al/ak+at};this.u2p=function(aA){if(aA>this.breakPoints[0]&&aA<this.breakPoints[1]){aA=this.breakPoints[0]}if(aA<=this.breakPoints[0]){return(aA-at)*ak/al+am}else{return(aA-this.breakPoints[1]+this.breakPoints[0]-at)*ak/al+am}};if(this.name.charAt(0)=="x"){this.series_u2p=function(aA){if(aA>this.breakPoints[0]&&aA<this.breakPoints[1]){aA=this.breakPoints[0]}if(aA<=this.breakPoints[0]){return(aA-at)*ak/al}else{return(aA-this.breakPoints[1]+this.breakPoints[0]-at)*ak/al}};this.series_p2u=function(aA){return aA*al/ak+at}}else{this.series_u2p=function(aA){if(aA>this.breakPoints[0]&&aA<this.breakPoints[1]){aA=this.breakPoints[0]}if(aA>=this.breakPoints[1]){return(aA-au)*ak/al}else{return(aA+this.breakPoints[1]-this.breakPoints[0]-au)*ak/al}};this.series_p2u=function(aA){return aA*al/ak+au}}}else{this.p2u=function(aA){return(aA-am)*al/ak+at};this.u2p=function(aA){return(aA-at)*ak/al+am};if(this.name=="xaxis"||this.name=="x2axis"){this.series_u2p=function(aA){return(aA-at)*ak/al};this.series_p2u=function(aA){return aA*al/ak+at}}else{this.series_u2p=function(aA){return(aA-au)*ak/al};this.series_p2u=function(aA){return aA*al/ak+au}}}if(this.show){if(this.name=="xaxis"||this.name=="x2axis"){for(var av=0;av<ay.length;av++){var ap=ay[av];if(ap.show&&ap.showLabel){var ah;if(ap.constructor==L.jqplot.CanvasAxisTickRenderer&&ap.angle){var ax=(this.name=="xaxis")?1:-1;switch(ap.labelPosition){case"auto":if(ax*ap.angle<0){ah=-ap.getWidth()+ap._textRenderer.height*Math.sin(-ap._textRenderer.angle)/2}else{ah=-ap._textRenderer.height*Math.sin(ap._textRenderer.angle)/2}break;case"end":ah=-ap.getWidth()+ap._textRenderer.height*Math.sin(-ap._textRenderer.angle)/2;break;case"start":ah=-ap._textRenderer.height*Math.sin(ap._textRenderer.angle)/2;break;case"middle":ah=-ap.getWidth()/2+ap._textRenderer.height*Math.sin(-ap._textRenderer.angle)/2;break;default:ah=-ap.getWidth()/2+ap._textRenderer.height*Math.sin(-ap._textRenderer.angle)/2;break}}else{ah=-ap.getWidth()/2}var az=this.u2p(ap.value)+ah+"px";ap._elem.css("left",az);ap.pack()}}if(aq){var an=this._label._elem.outerWidth(true);this._label._elem.css("left",am+ak/2-an/2+"px");if(this.name=="xaxis"){this._label._elem.css("bottom","0px")}else{this._label._elem.css("top","0px")}this._label.pack()}}else{for(var av=0;av<ay.length;av++){var ap=ay[av];if(ap.show&&ap.showLabel){var ah;if(ap.constructor==L.jqplot.CanvasAxisTickRenderer&&ap.angle){var ax=(this.name=="yaxis")?1:-1;switch(ap.labelPosition){case"auto":case"end":if(ax*ap.angle<0){ah=-ap._textRenderer.height*Math.cos(-ap._textRenderer.angle)/2}else{ah=-ap.getHeight()+ap._textRenderer.height*Math.cos(ap._textRenderer.angle)/2}break;case"start":if(ap.angle>0){ah=-ap._textRenderer.height*Math.cos(-ap._textRenderer.angle)/2}else{ah=-ap.getHeight()+ap._textRenderer.height*Math.cos(ap._textRenderer.angle)/2}break;case"middle":ah=-ap.getHeight()/2;break;default:ah=-ap.getHeight()/2;break}}else{ah=-ap.getHeight()/2}var az=this.u2p(ap.value)+ah+"px";ap._elem.css("top",az);ap.pack()}}if(aq){var aw=this._label._elem.outerHeight(true);this._label._elem.css("top",ao-ak/2-aw/2+"px");if(this.name=="yaxis"){this._label._elem.css("left","0px")}else{this._label._elem.css("right","0px")}this._label.pack()}}}ay=null};function i(ai){var ah;ai=Math.abs(ai);if(ai>=10){ah="%d"}else{if(ai>1){if(ai===parseInt(ai,10)){ah="%d"}else{ah="%.1f"}}else{var aj=-Math.floor(Math.log(ai)/Math.LN10);ah="%."+aj+"f"}}return ah}var b=[0.1,0.2,0.3,0.4,0.5,0.8,1,2,3,4,5];var c=function(ai){var ah=b.indexOf(ai);if(ah>0){return b[ah-1]}else{return b[b.length-1]/100}};var k=function(ai){var ah=b.indexOf(ai);if(ah<b.length-1){return b[ah+1]}else{return b[0]*100}};function d(al,au,at){var aq=Math.floor(at/2);var ai=Math.ceil(at*1.5);var ak=Number.MAX_VALUE;var ah=(au-al);var ax;var ap;var ar;var ay=L.jqplot.getSignificantFigures;var aw;var an;var ao;var av;for(var am=0,aj=ai-aq+1;am<aj;am++){ao=aq+am;ax=ah/(ao-1);ap=ay(ax);ax=Math.abs(at-ao)+ap.digitsRight;if(ax<ak){ak=ax;ar=ao;av=ap.digitsRight}else{if(ax===ak){if(ap.digitsRight<av){ar=ao;av=ap.digitsRight}}}}aw=Math.max(av,Math.max(ay(al).digitsRight,ay(au).digitsRight));if(aw===0){an="%d"}else{an="%."+aw+"f"}ax=ah/(ar-1);return[al,au,ar,an,ax]}function W(ai,al){al=al||7;var ak=ai/(al-1);var aj=Math.pow(10,Math.floor(Math.log(ak)/Math.LN10));var am=ak/aj;var ah;if(aj<1){if(am>5){ah=10*aj}else{if(am>2){ah=5*aj}else{if(am>1){ah=2*aj}else{ah=aj}}}}else{if(am>5){ah=10*aj}else{if(am>4){ah=5*aj}else{if(am>3){ah=4*aj}else{if(am>2){ah=3*aj}else{if(am>1){ah=2*aj}else{ah=aj}}}}}}return ah}function Q(ai,ah){ah=ah||1;var ak=Math.floor(Math.log(ai)/Math.LN10);var am=Math.pow(10,ak);var al=ai/am;var aj;al=al/ah;if(al<=0.38){aj=0.1}else{if(al<=1.6){aj=0.2}else{if(al<=4){aj=0.5}else{if(al<=8){aj=1}else{if(al<=16){aj=2}else{aj=5}}}}}return aj*am}function x(aj,ai){var al=Math.floor(Math.log(aj)/Math.LN10);var an=Math.pow(10,al);var am=aj/an;var ah;var ak;am=am/ai;if(am<=0.38){ak=0.1}else{if(am<=1.6){ak=0.2}else{if(am<=4){ak=0.5}else{if(am<=8){ak=1}else{if(am<=16){ak=2}else{ak=5}}}}}ah=ak*an;return[ah,ak,an]}L.jqplot.LinearTickGenerator=function(an,aq,aj,ak,ao,ar){ao=(ao===null)?false:ao;ar=(ar===null||ao)?false:ar;if(an===aq){aq=(aq)?0:1}aj=aj||1;if(aq<an){var at=aq;aq=an;an=at}var ai=[];var aw=Q(aq-an,aj);var av=L.jqplot.getSignificantFigures;if(ak==null){if(!ao&&!ar){ai[0]=Math.floor(an/aw)*aw;ai[1]=Math.ceil(aq/aw)*aw;ai[2]=Math.round((ai[1]-ai[0])/aw+1);ai[3]=i(aw);ai[4]=aw}else{if(ao){ai[0]=an;ai[2]=Math.ceil((aq-an)/aw+1);ai[1]=an+(ai[2]-1)*aw;var au=av(an).digitsRight;var ap=av(aw).digitsRight;if(au<ap){ai[3]=i(aw)}else{ai[3]="%."+au+"f"}ai[4]=aw}else{if(ar){ai[1]=aq;ai[2]=Math.ceil((aq-an)/aw+1);ai[0]=aq-(ai[2]-1)*aw;var al=av(aq).digitsRight;var ap=av(aw).digitsRight;if(al<ap){ai[3]=i(aw)}else{ai[3]="%."+al+"f"}ai[4]=aw}}}}else{var am=[];am[0]=Math.floor(an/aw)*aw;am[1]=Math.ceil(aq/aw)*aw;am[2]=Math.round((am[1]-am[0])/aw+1);am[3]=i(aw);am[4]=aw;if(am[2]===ak){ai=am}else{var ah=W(am[1]-am[0],ak);ai[0]=am[0];ai[2]=ak;ai[4]=ah;ai[3]=i(ah);ai[1]=ai[0]+(ai[2]-1)*ai[4]}}return ai};L.jqplot.LinearTickGenerator.bestLinearInterval=Q;L.jqplot.LinearTickGenerator.bestInterval=W;L.jqplot.LinearTickGenerator.bestLinearComponents=x;L.jqplot.LinearTickGenerator.bestConstrainedInterval=d;L.jqplot.MarkerRenderer=function(ah){this.show=true;this.style="filledCircle";this.lineWidth=2;this.size=9;this.color="#666666";this.shadow=true;this.shadowAngle=45;this.shadowOffset=1;this.shadowDepth=3;this.shadowAlpha="0.07";this.shadowRenderer=new L.jqplot.ShadowRenderer();this.shapeRenderer=new L.jqplot.ShapeRenderer();L.extend(true,this,ah)};L.jqplot.MarkerRenderer.prototype.init=function(ah){L.extend(true,this,ah);var aj={angle:this.shadowAngle,offset:this.shadowOffset,alpha:this.shadowAlpha,lineWidth:this.lineWidth,depth:this.shadowDepth,closePath:true};if(this.style.indexOf("filled")!=-1){aj.fill=true}if(this.style.indexOf("ircle")!=-1){aj.isarc=true;aj.closePath=false}this.shadowRenderer.init(aj);var ai={fill:false,isarc:false,strokeStyle:this.color,fillStyle:this.color,lineWidth:this.lineWidth,closePath:true};if(this.style.indexOf("filled")!=-1){ai.fill=true}if(this.style.indexOf("ircle")!=-1){ai.isarc=true;ai.closePath=false}this.shapeRenderer.init(ai)};L.jqplot.MarkerRenderer.prototype.drawDiamond=function(aj,ai,am,al,ao){var ah=1.2;var ap=this.size/2/ah;var an=this.size/2*ah;var ak=[[aj-ap,ai],[aj,ai+an],[aj+ap,ai],[aj,ai-an]];if(this.shadow){this.shadowRenderer.draw(am,ak)}this.shapeRenderer.draw(am,ak,ao)};L.jqplot.MarkerRenderer.prototype.drawPlus=function(ak,aj,an,am,aq){var ai=1;var ar=this.size/2*ai;var ao=this.size/2*ai;var ap=[[ak,aj-ao],[ak,aj+ao]];var al=[[ak+ar,aj],[ak-ar,aj]];var ah=L.extend(true,{},this.options,{closePath:false});if(this.shadow){this.shadowRenderer.draw(an,ap,{closePath:false});this.shadowRenderer.draw(an,al,{closePath:false})}this.shapeRenderer.draw(an,ap,ah);this.shapeRenderer.draw(an,al,ah)};L.jqplot.MarkerRenderer.prototype.drawX=function(ak,aj,an,am,aq){var ai=1;var ar=this.size/2*ai;var ao=this.size/2*ai;var ah=L.extend(true,{},this.options,{closePath:false});var ap=[[ak-ar,aj-ao],[ak+ar,aj+ao]];var al=[[ak-ar,aj+ao],[ak+ar,aj-ao]];if(this.shadow){this.shadowRenderer.draw(an,ap,{closePath:false});this.shadowRenderer.draw(an,al,{closePath:false})}this.shapeRenderer.draw(an,ap,ah);this.shapeRenderer.draw(an,al,ah)};L.jqplot.MarkerRenderer.prototype.drawDash=function(aj,ai,am,al,ao){var ah=1;var ap=this.size/2*ah;var an=this.size/2*ah;var ak=[[aj-ap,ai],[aj+ap,ai]];if(this.shadow){this.shadowRenderer.draw(am,ak)}this.shapeRenderer.draw(am,ak,ao)};L.jqplot.MarkerRenderer.prototype.drawLine=function(am,al,ah,ak,ai){var aj=[am,al];if(this.shadow){this.shadowRenderer.draw(ah,aj)}this.shapeRenderer.draw(ah,aj,ai)};L.jqplot.MarkerRenderer.prototype.drawSquare=function(aj,ai,am,al,ao){var ah=1;var ap=this.size/2/ah;var an=this.size/2*ah;var ak=[[aj-ap,ai-an],[aj-ap,ai+an],[aj+ap,ai+an],[aj+ap,ai-an]];if(this.shadow){this.shadowRenderer.draw(am,ak)}this.shapeRenderer.draw(am,ak,ao)};L.jqplot.MarkerRenderer.prototype.drawCircle=function(ai,ao,ak,an,al){var ah=this.size/2;var aj=2*Math.PI;var am=[ai,ao,ah,0,aj,true];if(this.shadow){this.shadowRenderer.draw(ak,am)}this.shapeRenderer.draw(ak,am,al)};L.jqplot.MarkerRenderer.prototype.draw=function(ah,ak,ai,aj){aj=aj||{};if(aj.show==null||aj.show!=false){if(aj.color&&!aj.fillStyle){aj.fillStyle=aj.color}if(aj.color&&!aj.strokeStyle){aj.strokeStyle=aj.color}switch(this.style){case"diamond":this.drawDiamond(ah,ak,ai,false,aj);break;case"filledDiamond":this.drawDiamond(ah,ak,ai,true,aj);break;case"circle":this.drawCircle(ah,ak,ai,false,aj);break;case"filledCircle":this.drawCircle(ah,ak,ai,true,aj);break;case"square":this.drawSquare(ah,ak,ai,false,aj);break;case"filledSquare":this.drawSquare(ah,ak,ai,true,aj);break;case"x":this.drawX(ah,ak,ai,true,aj);break;case"plus":this.drawPlus(ah,ak,ai,true,aj);break;case"dash":this.drawDash(ah,ak,ai,true,aj);break;case"line":this.drawLine(ah,ak,ai,false,aj);break;default:this.drawDiamond(ah,ak,ai,false,aj);break}}};L.jqplot.ShadowRenderer=function(ah){this.angle=45;this.offset=1;this.alpha=0.07;this.lineWidth=1.5;this.lineJoin="miter";this.lineCap="round";this.closePath=false;this.fill=false;this.depth=3;this.strokeStyle="rgba(0,0,0,0.1)";this.isarc=false;L.extend(true,this,ah)};L.jqplot.ShadowRenderer.prototype.init=function(ah){L.extend(true,this,ah)};L.jqplot.ShadowRenderer.prototype.draw=function(av,at,ax){av.save();var ah=(ax!=null)?ax:{};var au=(ah.fill!=null)?ah.fill:this.fill;var ap=(ah.fillRect!=null)?ah.fillRect:this.fillRect;var ao=(ah.closePath!=null)?ah.closePath:this.closePath;var al=(ah.offset!=null)?ah.offset:this.offset;var aj=(ah.alpha!=null)?ah.alpha:this.alpha;var an=(ah.depth!=null)?ah.depth:this.depth;var aw=(ah.isarc!=null)?ah.isarc:this.isarc;var aq=(ah.linePattern!=null)?ah.linePattern:this.linePattern;av.lineWidth=(ah.lineWidth!=null)?ah.lineWidth:this.lineWidth;av.lineJoin=(ah.lineJoin!=null)?ah.lineJoin:this.lineJoin;av.lineCap=(ah.lineCap!=null)?ah.lineCap:this.lineCap;av.strokeStyle=ah.strokeStyle||this.strokeStyle||"rgba(0,0,0,"+aj+")";av.fillStyle=ah.fillStyle||this.fillStyle||"rgba(0,0,0,"+aj+")";for(var ak=0;ak<an;ak++){var ar=L.jqplot.LinePattern(av,aq);av.translate(Math.cos(this.angle*Math.PI/180)*al,Math.sin(this.angle*Math.PI/180)*al);ar.beginPath();if(aw){av.arc(at[0],at[1],at[2],at[3],at[4],true)}else{if(ap){if(ap){av.fillRect(at[0],at[1],at[2],at[3])}}else{if(at&&at.length){var ai=true;for(var am=0;am<at.length;am++){if(at[am][0]!=null&&at[am][1]!=null){if(ai){ar.moveTo(at[am][0],at[am][1]);ai=false}else{ar.lineTo(at[am][0],at[am][1])}}else{ai=true}}}}}if(ao){ar.closePath()}if(au){av.fill()}else{av.stroke()}}av.restore()};L.jqplot.ShapeRenderer=function(ah){this.lineWidth=1.5;this.linePattern="solid";this.lineJoin="miter";this.lineCap="round";this.closePath=false;this.fill=false;this.isarc=false;this.fillRect=false;this.strokeRect=false;this.clearRect=false;this.strokeStyle="#999999";this.fillStyle="#999999";L.extend(true,this,ah)};L.jqplot.ShapeRenderer.prototype.init=function(ah){L.extend(true,this,ah)};L.jqplot.ShapeRenderer.prototype.draw=function(at,aq,av){at.save();var ah=(av!=null)?av:{};var ar=(ah.fill!=null)?ah.fill:this.fill;var am=(ah.closePath!=null)?ah.closePath:this.closePath;var an=(ah.fillRect!=null)?ah.fillRect:this.fillRect;var ak=(ah.strokeRect!=null)?ah.strokeRect:this.strokeRect;var ai=(ah.clearRect!=null)?ah.clearRect:this.clearRect;var au=(ah.isarc!=null)?ah.isarc:this.isarc;var ao=(ah.linePattern!=null)?ah.linePattern:this.linePattern;var ap=L.jqplot.LinePattern(at,ao);at.lineWidth=ah.lineWidth||this.lineWidth;at.lineJoin=ah.lineJoin||this.lineJoin;at.lineCap=ah.lineCap||this.lineCap;at.strokeStyle=(ah.strokeStyle||ah.color)||this.strokeStyle;at.fillStyle=ah.fillStyle||this.fillStyle;at.beginPath();if(au){at.arc(aq[0],aq[1],aq[2],aq[3],aq[4],true);if(am){at.closePath()}if(ar){at.fill()}else{at.stroke()}at.restore();return}else{if(ai){at.clearRect(aq[0],aq[1],aq[2],aq[3]);at.restore();return}else{if(an||ak){if(an){at.fillRect(aq[0],aq[1],aq[2],aq[3])}if(ak){at.strokeRect(aq[0],aq[1],aq[2],aq[3]);at.restore();return}}else{if(aq&&aq.length){var aj=true;for(var al=0;al<aq.length;al++){if(aq[al][0]!=null&&aq[al][1]!=null){if(aj){ap.moveTo(aq[al][0],aq[al][1]);aj=false}else{ap.lineTo(aq[al][0],aq[al][1])}}else{aj=true}}if(am){ap.closePath()}if(ar){at.fill()}else{at.stroke()}}}}}at.restore()};L.jqplot.TableLegendRenderer=function(){};L.jqplot.TableLegendRenderer.prototype.init=function(ah){L.extend(true,this,ah)};L.jqplot.TableLegendRenderer.prototype.addrow=function(aq,ak,ah,ao){var al=(ah)?this.rowSpacing+"px":"0px";var ap;var aj;var ai;var an;var am;ai=document.createElement("tr");ap=L(ai);ap.addClass("jqplot-table-legend");ai=null;if(ao){ap.prependTo(this._elem)}else{ap.appendTo(this._elem)}if(this.showSwatches){aj=L(document.createElement("td"));aj.addClass("jqplot-table-legend jqplot-table-legend-swatch");aj.css({textAlign:"center",paddingTop:al});an=L(document.createElement("div"));an.addClass("jqplot-table-legend-swatch-outline");am=L(document.createElement("div"));am.addClass("jqplot-table-legend-swatch");am.css({backgroundColor:ak,borderColor:ak});ap.append(aj.append(an.append(am)))}if(this.showLabels){aj=L(document.createElement("td"));aj.addClass("jqplot-table-legend jqplot-table-legend-label");aj.css("paddingTop",al);ap.append(aj);if(this.escapeHtml){aj.text(aq)}else{aj.html(aq)}}aj=null;an=null;am=null;ap=null;ai=null};L.jqplot.TableLegendRenderer.prototype.draw=function(){if(this._elem){this._elem.emptyForce();this._elem=null}if(this.show){var am=this._series;var ai=document.createElement("table");this._elem=L(ai);this._elem.addClass("jqplot-table-legend");var ar={position:"absolute"};if(this.background){ar.background=this.background}if(this.border){ar.border=this.border}if(this.fontSize){ar.fontSize=this.fontSize}if(this.fontFamily){ar.fontFamily=this.fontFamily}if(this.textColor){ar.textColor=this.textColor}if(this.marginTop!=null){ar.marginTop=this.marginTop}if(this.marginBottom!=null){ar.marginBottom=this.marginBottom}if(this.marginLeft!=null){ar.marginLeft=this.marginLeft}if(this.marginRight!=null){ar.marginRight=this.marginRight}var ah=false,ao=false,aq;for(var an=0;an<am.length;an++){aq=am[an];if(aq._stack||aq.renderer.constructor==L.jqplot.BezierCurveRenderer){ao=true}if(aq.show&&aq.showLabel){var al=this.labels[an]||aq.label.toString();if(al){var aj=aq.color;if(ao&&an<am.length-1){ah=true}else{if(ao&&an==am.length-1){ah=false}}this.renderer.addrow.call(this,al,aj,ah,ao);ah=true}for(var ak=0;ak<L.jqplot.addLegendRowHooks.length;ak++){var ap=L.jqplot.addLegendRowHooks[ak].call(this,aq);if(ap){this.renderer.addrow.call(this,ap.label,ap.color,ah);ah=true}}al=null}}}return this._elem};L.jqplot.TableLegendRenderer.prototype.pack=function(aj){if(this.show){if(this.placement=="insideGrid"){switch(this.location){case"nw":var ai=aj.left;var ah=aj.top;this._elem.css("left",ai);this._elem.css("top",ah);break;case"n":var ai=(aj.left+(this._plotDimensions.width-aj.right))/2-this.getWidth()/2;var ah=aj.top;this._elem.css("left",ai);this._elem.css("top",ah);break;case"ne":var ai=aj.right;var ah=aj.top;this._elem.css({right:ai,top:ah});break;case"e":var ai=aj.right;var ah=(aj.top+(this._plotDimensions.height-aj.bottom))/2-this.getHeight()/2;this._elem.css({right:ai,top:ah});break;case"se":var ai=aj.right;var ah=aj.bottom;this._elem.css({right:ai,bottom:ah});break;case"s":var ai=(aj.left+(this._plotDimensions.width-aj.right))/2-this.getWidth()/2;var ah=aj.bottom;this._elem.css({left:ai,bottom:ah});break;case"sw":var ai=aj.left;var ah=aj.bottom;this._elem.css({left:ai,bottom:ah});break;case"w":var ai=aj.left;var ah=(aj.top+(this._plotDimensions.height-aj.bottom))/2-this.getHeight()/2;this._elem.css({left:ai,top:ah});break;default:var ai=aj.right;var ah=aj.bottom;this._elem.css({right:ai,bottom:ah});break}}else{if(this.placement=="outside"){switch(this.location){case"nw":var ai=this._plotDimensions.width-aj.left;var ah=aj.top;this._elem.css("right",ai);this._elem.css("top",ah);break;case"n":var ai=(aj.left+(this._plotDimensions.width-aj.right))/2-this.getWidth()/2;var ah=this._plotDimensions.height-aj.top;this._elem.css("left",ai);this._elem.css("bottom",ah);break;case"ne":var ai=this._plotDimensions.width-aj.right;var ah=aj.top;this._elem.css({left:ai,top:ah});break;case"e":var ai=this._plotDimensions.width-aj.right;var ah=(aj.top+(this._plotDimensions.height-aj.bottom))/2-this.getHeight()/2;this._elem.css({left:ai,top:ah});break;case"se":var ai=this._plotDimensions.width-aj.right;var ah=aj.bottom;this._elem.css({left:ai,bottom:ah});break;case"s":var ai=(aj.left+(this._plotDimensions.width-aj.right))/2-this.getWidth()/2;var ah=this._plotDimensions.height-aj.bottom;this._elem.css({left:ai,top:ah});break;case"sw":var ai=this._plotDimensions.width-aj.left;var ah=aj.bottom;this._elem.css({right:ai,bottom:ah});break;case"w":var ai=this._plotDimensions.width-aj.left;var ah=(aj.top+(this._plotDimensions.height-aj.bottom))/2-this.getHeight()/2;this._elem.css({right:ai,top:ah});break;default:var ai=aj.right;var ah=aj.bottom;this._elem.css({right:ai,bottom:ah});break}}else{switch(this.location){case"nw":this._elem.css({left:0,top:aj.top});break;case"n":var ai=(aj.left+(this._plotDimensions.width-aj.right))/2-this.getWidth()/2;this._elem.css({left:ai,top:aj.top});break;case"ne":this._elem.css({right:0,top:aj.top});break;case"e":var ah=(aj.top+(this._plotDimensions.height-aj.bottom))/2-this.getHeight()/2;this._elem.css({right:aj.right,top:ah});break;case"se":this._elem.css({right:aj.right,bottom:aj.bottom});break;case"s":var ai=(aj.left+(this._plotDimensions.width-aj.right))/2-this.getWidth()/2;this._elem.css({left:ai,bottom:aj.bottom});break;case"sw":this._elem.css({left:aj.left,bottom:aj.bottom});break;case"w":var ah=(aj.top+(this._plotDimensions.height-aj.bottom))/2-this.getHeight()/2;this._elem.css({left:aj.left,top:ah});break;default:this._elem.css({right:aj.right,bottom:aj.bottom});break}}}}};L.jqplot.ThemeEngine=function(){this.themes={};this.activeTheme=null};L.jqplot.ThemeEngine.prototype.init=function(){var ak=new L.jqplot.Theme({_name:"Default"});var an,ai,am;for(an in ak.target){if(an=="textColor"){ak.target[an]=this.target.css("color")}else{ak.target[an]=this.target.css(an)}}if(this.title.show&&this.title._elem){for(an in ak.title){if(an=="textColor"){ak.title[an]=this.title._elem.css("color")}else{ak.title[an]=this.title._elem.css(an)}}}for(an in ak.grid){ak.grid[an]=this.grid[an]}if(ak.grid.backgroundColor==null&&this.grid.background!=null){ak.grid.backgroundColor=this.grid.background}if(this.legend.show&&this.legend._elem){for(an in ak.legend){if(an=="textColor"){ak.legend[an]=this.legend._elem.css("color")}else{ak.legend[an]=this.legend._elem.css(an)}}}var aj;for(ai=0;ai<this.series.length;ai++){aj=this.series[ai];if(aj.renderer.constructor==L.jqplot.LineRenderer){ak.series.push(new p())}else{if(aj.renderer.constructor==L.jqplot.BarRenderer){ak.series.push(new T())}else{if(aj.renderer.constructor==L.jqplot.PieRenderer){ak.series.push(new f())}else{if(aj.renderer.constructor==L.jqplot.DonutRenderer){ak.series.push(new G())}else{if(aj.renderer.constructor==L.jqplot.FunnelRenderer){ak.series.push(new Z())}else{if(aj.renderer.constructor==L.jqplot.MeterGaugeRenderer){ak.series.push(new D())}else{ak.series.push({})}}}}}}for(an in ak.series[ai]){ak.series[ai][an]=aj[an]}}var ah,al;for(an in this.axes){al=this.axes[an];ah=ak.axes[an]=new P();ah.borderColor=al.borderColor;ah.borderWidth=al.borderWidth;if(al._ticks&&al._ticks[0]){for(am in ah.ticks){if(al._ticks[0].hasOwnProperty(am)){ah.ticks[am]=al._ticks[0][am]}else{if(al._ticks[0]._elem){ah.ticks[am]=al._ticks[0]._elem.css(am)}}}}if(al._label&&al._label.show){for(am in ah.label){if(al._label[am]){ah.label[am]=al._label[am]}else{if(al._label._elem){if(am=="textColor"){ah.label[am]=al._label._elem.css("color")}else{ah.label[am]=al._label._elem.css(am)}}}}}}this.themeEngine._add(ak);this.themeEngine.activeTheme=this.themeEngine.themes[ak._name]};L.jqplot.ThemeEngine.prototype.get=function(ah){if(!ah){return this.activeTheme}else{return this.themes[ah]}};function O(ai,ah){return ai-ah}L.jqplot.ThemeEngine.prototype.getThemeNames=function(){var ah=[];for(var ai in this.themes){ah.push(ai)}return ah.sort(O)};L.jqplot.ThemeEngine.prototype.getThemes=function(){var ai=[];var ah=[];for(var ak in this.themes){ai.push(ak)}ai.sort(O);for(var aj=0;aj<ai.length;aj++){ah.push(this.themes[ai[aj]])}return ah};L.jqplot.ThemeEngine.prototype.activate=function(av,aB){var ah=false;if(!aB&&this.activeTheme&&this.activeTheme._name){aB=this.activeTheme._name}if(!this.themes.hasOwnProperty(aB)){throw new Error("No theme of that name")}else{var am=this.themes[aB];this.activeTheme=am;var aA,at=false,ar=false;var ai=["xaxis","x2axis","yaxis","y2axis"];for(aw=0;aw<ai.length;aw++){var an=ai[aw];if(am.axesStyles.borderColor!=null){av.axes[an].borderColor=am.axesStyles.borderColor}if(am.axesStyles.borderWidth!=null){av.axes[an].borderWidth=am.axesStyles.borderWidth}}for(var az in av.axes){var ak=av.axes[az];if(ak.show){var aq=am.axes[az]||{};var ao=am.axesStyles;var al=L.jqplot.extend(true,{},aq,ao);aA=(am.axesStyles.borderColor!=null)?am.axesStyles.borderColor:al.borderColor;if(al.borderColor!=null){ak.borderColor=al.borderColor;ah=true}aA=(am.axesStyles.borderWidth!=null)?am.axesStyles.borderWidth:al.borderWidth;if(al.borderWidth!=null){ak.borderWidth=al.borderWidth;ah=true}if(ak._ticks&&ak._ticks[0]){for(var aj in al.ticks){aA=al.ticks[aj];if(aA!=null){ak.tickOptions[aj]=aA;ak._ticks=[];ah=true}}}if(ak._label&&ak._label.show){for(var aj in al.label){aA=al.label[aj];if(aA!=null){ak.labelOptions[aj]=aA;ah=true}}}}}for(var au in am.grid){if(am.grid[au]!=null){av.grid[au]=am.grid[au]}}if(!ah){av.grid.draw()}if(av.legend.show){for(au in am.legend){if(am.legend[au]!=null){av.legend[au]=am.legend[au]}}}if(av.title.show){for(au in am.title){if(am.title[au]!=null){av.title[au]=am.title[au]}}}var aw;for(aw=0;aw<am.series.length;aw++){var ap={};var ay=false;for(au in am.series[aw]){aA=(am.seriesStyles[au]!=null)?am.seriesStyles[au]:am.series[aw][au];if(aA!=null){ap[au]=aA;if(au=="color"){av.series[aw].renderer.shapeRenderer.fillStyle=aA;av.series[aw].renderer.shapeRenderer.strokeStyle=aA;av.series[aw][au]=aA}else{if((au=="lineWidth")||(au=="linePattern")){av.series[aw].renderer.shapeRenderer[au]=aA;av.series[aw][au]=aA}else{if(au=="markerOptions"){V(av.series[aw].markerOptions,aA);V(av.series[aw].markerRenderer,aA)}else{av.series[aw][au]=aA}}}ah=true}}}if(ah){av.target.empty();av.draw()}for(au in am.target){if(am.target[au]!=null){av.target.css(au,am.target[au])}}}};L.jqplot.ThemeEngine.prototype._add=function(ai,ah){if(ah){ai._name=ah}if(!ai._name){ai._name=Date.parse(new Date())}if(!this.themes.hasOwnProperty(ai._name)){this.themes[ai._name]=ai}else{throw new Error("jqplot.ThemeEngine Error: Theme already in use")}};L.jqplot.ThemeEngine.prototype.remove=function(ah){if(ah=="Default"){return false}return delete this.themes[ah]};L.jqplot.ThemeEngine.prototype.newTheme=function(ah,aj){if(typeof(ah)=="object"){aj=aj||ah;ah=null}if(aj&&aj._name){ah=aj._name}else{ah=ah||Date.parse(new Date())}var ai=this.copy(this.themes.Default._name,ah);L.jqplot.extend(ai,aj);return ai};function B(aj){if(aj==null||typeof(aj)!="object"){return aj}var ah=new aj.constructor();for(var ai in aj){ah[ai]=B(aj[ai])}return ah}L.jqplot.clone=B;function V(aj,ai){if(ai==null||typeof(ai)!="object"){return}for(var ah in ai){if(ah=="highlightColors"){aj[ah]=B(ai[ah])}if(ai[ah]!=null&&typeof(ai[ah])=="object"){if(!aj.hasOwnProperty(ah)){aj[ah]={}}V(aj[ah],ai[ah])}else{aj[ah]=ai[ah]}}}L.jqplot.merge=V;L.jqplot.extend=function(){var am=arguments[0]||{},ak=1,al=arguments.length,ah=false,aj;if(typeof am==="boolean"){ah=am;am=arguments[1]||{};ak=2}if(typeof am!=="object"&&!toString.call(am)==="[object Function]"){am={}}for(;ak<al;ak++){if((aj=arguments[ak])!=null){for(var ai in aj){var an=am[ai],ao=aj[ai];if(am===ao){continue}if(ah&&ao&&typeof ao==="object"&&!ao.nodeType){am[ai]=L.jqplot.extend(ah,an||(ao.length!=null?[]:{}),ao)}else{if(ao!==u){am[ai]=ao}}}}}return am};L.jqplot.ThemeEngine.prototype.rename=function(ai,ah){if(ai=="Default"||ah=="Default"){throw new Error("jqplot.ThemeEngine Error: Cannot rename from/to Default")}if(this.themes.hasOwnProperty(ah)){throw new Error("jqplot.ThemeEngine Error: New name already in use.")}else{if(this.themes.hasOwnProperty(ai)){var aj=this.copy(ai,ah);this.remove(ai);return aj}}throw new Error("jqplot.ThemeEngine Error: Old name or new name invalid")};L.jqplot.ThemeEngine.prototype.copy=function(ah,aj,al){if(aj=="Default"){throw new Error("jqplot.ThemeEngine Error: Cannot copy over Default theme")}if(!this.themes.hasOwnProperty(ah)){var ai="jqplot.ThemeEngine Error: Source name invalid";throw new Error(ai)}if(this.themes.hasOwnProperty(aj)){var ai="jqplot.ThemeEngine Error: Target name invalid";throw new Error(ai)}else{var ak=B(this.themes[ah]);ak._name=aj;L.jqplot.extend(true,ak,al);this._add(ak);return ak}};L.jqplot.Theme=function(ah,ai){if(typeof(ah)=="object"){ai=ai||ah;ah=null}ah=ah||Date.parse(new Date());this._name=ah;this.target={backgroundColor:null};this.legend={textColor:null,fontFamily:null,fontSize:null,border:null,background:null};this.title={textColor:null,fontFamily:null,fontSize:null,textAlign:null};this.seriesStyles={};this.series=[];this.grid={drawGridlines:null,gridLineColor:null,gridLineWidth:null,backgroundColor:null,borderColor:null,borderWidth:null,shadow:null};this.axesStyles={label:{},ticks:{}};this.axes={};if(typeof(ai)=="string"){this._name=ai}else{if(typeof(ai)=="object"){L.jqplot.extend(true,this,ai)}}};var P=function(){this.borderColor=null;this.borderWidth=null;this.ticks=new o();this.label=new t()};var o=function(){this.show=null;this.showGridline=null;this.showLabel=null;this.showMark=null;this.size=null;this.textColor=null;this.whiteSpace=null;this.fontSize=null;this.fontFamily=null};var t=function(){this.textColor=null;this.whiteSpace=null;this.fontSize=null;this.fontFamily=null;this.fontWeight=null};var p=function(){this.color=null;this.lineWidth=null;this.linePattern=null;this.shadow=null;this.fillColor=null;this.showMarker=null;this.markerOptions=new I()};var I=function(){this.show=null;this.style=null;this.lineWidth=null;this.size=null;this.color=null;this.shadow=null};var T=function(){this.color=null;this.seriesColors=null;this.lineWidth=null;this.shadow=null;this.barPadding=null;this.barMargin=null;this.barWidth=null;this.highlightColors=null};var f=function(){this.seriesColors=null;this.padding=null;this.sliceMargin=null;this.fill=null;this.shadow=null;this.startAngle=null;this.lineWidth=null;this.highlightColors=null};var G=function(){this.seriesColors=null;this.padding=null;this.sliceMargin=null;this.fill=null;this.shadow=null;this.startAngle=null;this.lineWidth=null;this.innerDiameter=null;this.thickness=null;this.ringMargin=null;this.highlightColors=null};var Z=function(){this.color=null;this.lineWidth=null;this.shadow=null;this.padding=null;this.sectionMargin=null;this.seriesColors=null;this.highlightColors=null};var D=function(){this.padding=null;this.backgroundColor=null;this.ringColor=null;this.tickColor=null;this.ringWidth=null;this.intervalColors=null;this.intervalInnerRadius=null;this.intervalOuterRadius=null;this.hubRadius=null;this.needleThickness=null;this.needlePad=null};L.fn.jqplotChildText=function(){return L(this).contents().filter(function(){return this.nodeType==3}).text()};L.fn.jqplotGetComputedFontStyle=function(){var ak=window.getComputedStyle?window.getComputedStyle(this[0],""):this[0].currentStyle;var ai=ak["font-style"]?["font-style","font-weight","font-size","font-family"]:["fontStyle","fontWeight","fontSize","fontFamily"];var al=[];for(var aj=0;aj<ai.length;++aj){var ah=String(ak[ai[aj]]);if(ah&&ah!="normal"){al.push(ah)}}return al.join(" ")};L.fn.jqplotToImageCanvas=function(aj){aj=aj||{};var av=(aj.x_offset==null)?0:aj.x_offset;var ax=(aj.y_offset==null)?0:aj.y_offset;var al=(aj.backgroundColor==null)?"rgb(255,255,255)":aj.backgroundColor;if(L(this).width()==0||L(this).height()==0){return null}if(L.jqplot.use_excanvas){return null}var an=document.createElement("canvas");var aA=L(this).outerHeight(true);var at=L(this).outerWidth(true);var am=L(this).offset();var ao=am.left;var aq=am.top;var au=0,ar=0;var ay=["jqplot-table-legend","jqplot-xaxis-tick","jqplot-x2axis-tick","jqplot-yaxis-tick","jqplot-y2axis-tick","jqplot-y3axis-tick","jqplot-y4axis-tick","jqplot-y5axis-tick","jqplot-y6axis-tick","jqplot-y7axis-tick","jqplot-y8axis-tick","jqplot-y9axis-tick","jqplot-xaxis-label","jqplot-x2axis-label","jqplot-yaxis-label","jqplot-y2axis-label","jqplot-y3axis-label","jqplot-y4axis-label","jqplot-y5axis-label","jqplot-y6axis-label","jqplot-y7axis-label","jqplot-y8axis-label","jqplot-y9axis-label"];var ap,ah,ai,aB;for(var az=0;az<ay.length;az++){L(this).find("."+ay[az]).each(function(){ap=L(this).offset().top-aq;ah=L(this).offset().left-ao;aB=ah+L(this).outerWidth(true)+au;ai=ap+L(this).outerHeight(true)+ar;if(ah<-au){at=at-au-ah;au=-ah}if(ap<-ar){aA=aA-ar-ap;ar=-ap}if(aB>at){at=aB}if(ai>aA){aA=ai}})}an.width=at+Number(av);an.height=aA+Number(ax);var ak=an.getContext("2d");ak.save();ak.fillStyle=al;ak.fillRect(0,0,an.width,an.height);ak.restore();ak.translate(au,ar);ak.textAlign="left";ak.textBaseline="top";function aC(aE){var aF=parseInt(L(aE).css("line-height"),10);if(isNaN(aF)){aF=parseInt(L(aE).css("font-size"),10)*1.2}return aF}function aD(aF,aE,aS,aG,aO,aH){var aQ=aC(aF);var aK=L(aF).innerWidth();var aL=L(aF).innerHeight();var aN=aS.split(/\s+/);var aR=aN.length;var aP="";var aM=[];var aU=aO;var aT=aG;for(var aJ=0;aJ<aR;aJ++){aP+=aN[aJ];if(aE.measureText(aP).width>aK){aM.push(aJ);aP="";aJ--}}if(aM.length===0){if(L(aF).css("textAlign")==="center"){aT=aG+(aH-aE.measureText(aP).width)/2-au}aE.fillText(aS,aT,aO)}else{aP=aN.slice(0,aM[0]).join(" ");if(L(aF).css("textAlign")==="center"){aT=aG+(aH-aE.measureText(aP).width)/2-au}aE.fillText(aP,aT,aU);aU+=aQ;for(var aJ=1,aI=aM.length;aJ<aI;aJ++){aP=aN.slice(aM[aJ-1],aM[aJ]).join(" ");if(L(aF).css("textAlign")==="center"){aT=aG+(aH-aE.measureText(aP).width)/2-au}aE.fillText(aP,aT,aU);aU+=aQ}aP=aN.slice(aM[aJ-1],aN.length).join(" ");if(L(aF).css("textAlign")==="center"){aT=aG+(aH-aE.measureText(aP).width)/2-au}aE.fillText(aP,aT,aU)}}function aw(aG,aJ,aE){var aN=aG.tagName.toLowerCase();var aF=L(aG).position();var aK=window.getComputedStyle?window.getComputedStyle(aG,""):aG.currentStyle;var aI=aJ+aF.left+parseInt(aK.marginLeft,10)+parseInt(aK.borderLeftWidth,10)+parseInt(aK.paddingLeft,10);var aL=aE+aF.top+parseInt(aK.marginTop,10)+parseInt(aK.borderTopWidth,10)+parseInt(aK.paddingTop,10);var aM=an.width;if((aN=="div"||aN=="span")&&!L(aG).hasClass("jqplot-highlighter-tooltip")){L(aG).children().each(function(){aw(this,aI,aL)});var aO=L(aG).jqplotChildText();if(aO){ak.font=L(aG).jqplotGetComputedFontStyle();ak.fillStyle=L(aG).css("color");aD(aG,ak,aO,aI,aL,aM)}}else{if(aN==="table"&&L(aG).hasClass("jqplot-table-legend")){ak.strokeStyle=L(aG).css("border-top-color");ak.fillStyle=L(aG).css("background-color");ak.fillRect(aI,aL,L(aG).innerWidth(),L(aG).innerHeight());if(parseInt(L(aG).css("border-top-width"),10)>0){ak.strokeRect(aI,aL,L(aG).innerWidth(),L(aG).innerHeight())}L(aG).find("div.jqplot-table-legend-swatch-outline").each(function(){var aU=L(this);ak.strokeStyle=aU.css("border-top-color");var aQ=aI+aU.position().left;var aR=aL+aU.position().top;ak.strokeRect(aQ,aR,aU.innerWidth(),aU.innerHeight());aQ+=parseInt(aU.css("padding-left"),10);aR+=parseInt(aU.css("padding-top"),10);var aT=aU.innerHeight()-2*parseInt(aU.css("padding-top"),10);var aP=aU.innerWidth()-2*parseInt(aU.css("padding-left"),10);var aS=aU.children("div.jqplot-table-legend-swatch");ak.fillStyle=aS.css("background-color");ak.fillRect(aQ,aR,aP,aT)});L(aG).find("td.jqplot-table-legend-label").each(function(){var aR=L(this);var aP=aI+aR.position().left;var aQ=aL+aR.position().top+parseInt(aR.css("padding-top"),10);ak.font=aR.jqplotGetComputedFontStyle();ak.fillStyle=aR.css("color");aD(aR,ak,aR.text(),aP,aQ,aM)});var aH=null}else{if(aN=="canvas"){ak.drawImage(aG,aI,aL)}}}}L(this).children().each(function(){aw(this,av,ax)});return an};L.fn.jqplotToImageStr=function(ai){var ah=L(this).jqplotToImageCanvas(ai);if(ah){return ah.toDataURL("image/png")}else{return null}};L.fn.jqplotToImageElem=function(ah){var ai=document.createElement("img");var aj=L(this).jqplotToImageStr(ah);ai.src=aj;return ai};L.fn.jqplotToImageElemStr=function(ah){var ai="<img src="+L(this).jqplotToImageStr(ah)+" />";return ai};L.fn.jqplotSaveImage=function(){var ah=L(this).jqplotToImageStr({});if(ah){window.location.href=ah.replace("image/png","image/octet-stream")}};L.fn.jqplotViewImage=function(){var ai=L(this).jqplotToImageElemStr({});var aj=L(this).jqplotToImageStr({});if(ai){var ah=window.open("");ah.document.open("image/png");ah.document.write(ai);ah.document.close();ah=null}};var ag=function(){this.syntax=ag.config.syntax;this._type="jsDate";this.proxy=new Date();this.options={};this.locale=ag.regional.getLocale();this.formatString="";this.defaultCentury=ag.config.defaultCentury;switch(arguments.length){case 0:break;case 1:if(l(arguments[0])=="[object Object]"&&arguments[0]._type!="jsDate"){var aj=this.options=arguments[0];this.syntax=aj.syntax||this.syntax;this.defaultCentury=aj.defaultCentury||this.defaultCentury;this.proxy=ag.createDate(aj.date)}else{this.proxy=ag.createDate(arguments[0])}break;default:var ah=[];for(var ai=0;ai<arguments.length;ai++){ah.push(arguments[ai])}this.proxy=new Date();this.proxy.setFullYear.apply(this.proxy,ah.slice(0,3));if(ah.slice(3).length){this.proxy.setHours.apply(this.proxy,ah.slice(3))}break}};ag.config={defaultLocale:"en",syntax:"perl",defaultCentury:1900};ag.prototype.add=function(aj,ai){var ah=E[ai]||E.day;if(typeof ah=="number"){this.proxy.setTime(this.proxy.getTime()+(ah*aj))}else{ah.add(this,aj)}return this};ag.prototype.clone=function(){return new ag(this.proxy.getTime())};ag.prototype.getUtcOffset=function(){return this.proxy.getTimezoneOffset()*60000};ag.prototype.diff=function(ai,al,ah){ai=new ag(ai);if(ai===null){return null}var aj=E[al]||E.day;if(typeof aj=="number"){var ak=(this.proxy.getTime()-ai.proxy.getTime())/aj}else{var ak=aj.diff(this.proxy,ai.proxy)}return(ah?ak:Math[ak>0?"floor":"ceil"](ak))};ag.prototype.getAbbrDayName=function(){return ag.regional[this.locale]["dayNamesShort"][this.proxy.getDay()]};ag.prototype.getAbbrMonthName=function(){return ag.regional[this.locale]["monthNamesShort"][this.proxy.getMonth()]};ag.prototype.getAMPM=function(){return this.proxy.getHours()>=12?"PM":"AM"};ag.prototype.getAmPm=function(){return this.proxy.getHours()>=12?"pm":"am"};ag.prototype.getCentury=function(){return parseInt(this.proxy.getFullYear()/100,10)};ag.prototype.getDate=function(){return this.proxy.getDate()};ag.prototype.getDay=function(){return this.proxy.getDay()};ag.prototype.getDayOfWeek=function(){var ah=this.proxy.getDay();return ah===0?7:ah};ag.prototype.getDayOfYear=function(){var ai=this.proxy;var ah=ai-new Date(""+ai.getFullYear()+"/1/1 GMT");ah+=ai.getTimezoneOffset()*60000;ai=null;return parseInt(ah/60000/60/24,10)+1};ag.prototype.getDayName=function(){return ag.regional[this.locale]["dayNames"][this.proxy.getDay()]};ag.prototype.getFullWeekOfYear=function(){var ak=this.proxy;var ah=this.getDayOfYear();var aj=6-ak.getDay();var ai=parseInt((ah+aj)/7,10);return ai};ag.prototype.getFullYear=function(){return this.proxy.getFullYear()};ag.prototype.getGmtOffset=function(){var ah=this.proxy.getTimezoneOffset()/60;var ai=ah<0?"+":"-";ah=Math.abs(ah);return ai+N(Math.floor(ah),2)+":"+N((ah%1)*60,2)};ag.prototype.getHours=function(){return this.proxy.getHours()};ag.prototype.getHours12=function(){var ah=this.proxy.getHours();return ah>12?ah-12:(ah==0?12:ah)};ag.prototype.getIsoWeek=function(){var ak=this.proxy;var aj=this.getWeekOfYear();var ah=(new Date(""+ak.getFullYear()+"/1/1")).getDay();var ai=aj+(ah>4||ah<=1?0:1);if(ai==53&&(new Date(""+ak.getFullYear()+"/12/31")).getDay()<4){ai=1}else{if(ai===0){ak=new ag(new Date(""+(ak.getFullYear()-1)+"/12/31"));ai=ak.getIsoWeek()}}ak=null;return ai};ag.prototype.getMilliseconds=function(){return this.proxy.getMilliseconds()};ag.prototype.getMinutes=function(){return this.proxy.getMinutes()};ag.prototype.getMonth=function(){return this.proxy.getMonth()};ag.prototype.getMonthName=function(){return ag.regional[this.locale]["monthNames"][this.proxy.getMonth()]};ag.prototype.getMonthNumber=function(){return this.proxy.getMonth()+1};ag.prototype.getSeconds=function(){return this.proxy.getSeconds()};ag.prototype.getShortYear=function(){return this.proxy.getYear()%100};ag.prototype.getTime=function(){return this.proxy.getTime()};ag.prototype.getTimezoneAbbr=function(){return this.proxy.toString().replace(/^.*\(([^)]+)\)$/,"$1")};ag.prototype.getTimezoneName=function(){var ah=/(?:\((.+)\)$| ([A-Z]{3}) )/.exec(this.toString());return ah[1]||ah[2]||"GMT"+this.getGmtOffset()};ag.prototype.getTimezoneOffset=function(){return this.proxy.getTimezoneOffset()};ag.prototype.getWeekOfYear=function(){var ah=this.getDayOfYear();var aj=7-this.getDayOfWeek();var ai=parseInt((ah+aj)/7,10);return ai};ag.prototype.getUnix=function(){return Math.round(this.proxy.getTime()/1000,0)};ag.prototype.getYear=function(){return this.proxy.getYear()};ag.prototype.next=function(ah){ah=ah||"day";return this.clone().add(1,ah)};ag.prototype.set=function(){switch(arguments.length){case 0:this.proxy=new Date();break;case 1:if(l(arguments[0])=="[object Object]"&&arguments[0]._type!="jsDate"){var aj=this.options=arguments[0];this.syntax=aj.syntax||this.syntax;this.defaultCentury=aj.defaultCentury||this.defaultCentury;this.proxy=ag.createDate(aj.date)}else{this.proxy=ag.createDate(arguments[0])}break;default:var ah=[];for(var ai=0;ai<arguments.length;ai++){ah.push(arguments[ai])}this.proxy=new Date();this.proxy.setFullYear.apply(this.proxy,ah.slice(0,3));if(ah.slice(3).length){this.proxy.setHours.apply(this.proxy,ah.slice(3))}break}return this};ag.prototype.setDate=function(ah){this.proxy.setDate(ah);return this};ag.prototype.setFullYear=function(){this.proxy.setFullYear.apply(this.proxy,arguments);return this};ag.prototype.setHours=function(){this.proxy.setHours.apply(this.proxy,arguments);return this};ag.prototype.setMilliseconds=function(ah){this.proxy.setMilliseconds(ah);return this};ag.prototype.setMinutes=function(){this.proxy.setMinutes.apply(this.proxy,arguments);return this};ag.prototype.setMonth=function(){this.proxy.setMonth.apply(this.proxy,arguments);return this};ag.prototype.setSeconds=function(){this.proxy.setSeconds.apply(this.proxy,arguments);return this};ag.prototype.setTime=function(ah){this.proxy.setTime(ah);return this};ag.prototype.setYear=function(){this.proxy.setYear.apply(this.proxy,arguments);return this};ag.prototype.strftime=function(ah){ah=ah||this.formatString||ag.regional[this.locale]["formatString"];return ag.strftime(this,ah,this.syntax)};ag.prototype.toString=function(){return this.proxy.toString()};ag.prototype.toYmdInt=function(){return(this.proxy.getFullYear()*10000)+(this.getMonthNumber()*100)+this.proxy.getDate()};ag.regional={en:{monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],formatString:"%Y-%m-%d %H:%M:%S"},fr:{monthNames:["Janvier","Février","Mars","Avril","Mai","Juin","Juillet","Août","Septembre","Octobre","Novembre","Décembre"],monthNamesShort:["Jan","Fév","Mar","Avr","Mai","Jun","Jul","Aoû","Sep","Oct","Nov","Déc"],dayNames:["Dimanche","Lundi","Mardi","Mercredi","Jeudi","Vendredi","Samedi"],dayNamesShort:["Dim","Lun","Mar","Mer","Jeu","Ven","Sam"],formatString:"%Y-%m-%d %H:%M:%S"},de:{monthNames:["Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],monthNamesShort:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],dayNames:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],dayNamesShort:["So","Mo","Di","Mi","Do","Fr","Sa"],formatString:"%Y-%m-%d %H:%M:%S"},es:{monthNames:["Enero","Febrero","Marzo","Abril","Mayo","Junio","Julio","Agosto","Septiembre","Octubre","Noviembre","Diciembre"],monthNamesShort:["Ene","Feb","Mar","Abr","May","Jun","Jul","Ago","Sep","Oct","Nov","Dic"],dayNames:["Domingo","Lunes","Martes","Mi&eacute;rcoles","Jueves","Viernes","S&aacute;bado"],dayNamesShort:["Dom","Lun","Mar","Mi&eacute;","Juv","Vie","S&aacute;b"],formatString:"%Y-%m-%d %H:%M:%S"},ru:{monthNames:["Январь","Февраль","Март","Апрель","Май","Июнь","Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь"],monthNamesShort:["Янв","Фев","Мар","Апр","Май","Июн","Июл","Авг","Сен","Окт","Ноя","Дек"],dayNames:["воскресенье","понедельник","вторник","среда","четверг","пятница","суббота"],dayNamesShort:["вск","пнд","втр","срд","чтв","птн","сбт"],formatString:"%Y-%m-%d %H:%M:%S"},ar:{monthNames:["كانون الثاني","شباط","آذار","نيسان","آذار","حزيران","تموز","آب","أيلول","تشرين الأول","تشرين الثاني","كانون الأول"],monthNamesShort:["1","2","3","4","5","6","7","8","9","10","11","12"],dayNames:["السبت","الأحد","الاثنين","الثلاثاء","الأربعاء","الخميس","الجمعة"],dayNamesShort:["سبت","أحد","اثنين","ثلاثاء","أربعاء","خميس","جمعة"],formatString:"%Y-%m-%d %H:%M:%S"},pt:{monthNames:["Janeiro","Fevereiro","Mar&ccedil;o","Abril","Maio","Junho","Julho","Agosto","Setembro","Outubro","Novembro","Dezembro"],monthNamesShort:["Jan","Fev","Mar","Abr","Mai","Jun","Jul","Ago","Set","Out","Nov","Dez"],dayNames:["Domingo","Segunda-feira","Ter&ccedil;a-feira","Quarta-feira","Quinta-feira","Sexta-feira","S&aacute;bado"],dayNamesShort:["Dom","Seg","Ter","Qua","Qui","Sex","S&aacute;b"],formatString:"%Y-%m-%d %H:%M:%S"},"pt-BR":{monthNames:["Janeiro","Fevereiro","Mar&ccedil;o","Abril","Maio","Junho","Julho","Agosto","Setembro","Outubro","Novembro","Dezembro"],monthNamesShort:["Jan","Fev","Mar","Abr","Mai","Jun","Jul","Ago","Set","Out","Nov","Dez"],dayNames:["Domingo","Segunda-feira","Ter&ccedil;a-feira","Quarta-feira","Quinta-feira","Sexta-feira","S&aacute;bado"],dayNamesShort:["Dom","Seg","Ter","Qua","Qui","Sex","S&aacute;b"],formatString:"%Y-%m-%d %H:%M:%S"},pl:{monthNames:["Styczeń","Luty","Marzec","Kwiecień","Maj","Czerwiec","Lipiec","Sierpień","Wrzesień","Październik","Listopad","Grudzień"],monthNamesShort:["Sty","Lut","Mar","Kwi","Maj","Cze","Lip","Sie","Wrz","Paź","Lis","Gru"],dayNames:["Niedziela","Poniedziałek","Wtorek","Środa","Czwartek","Piątek","Sobota"],dayNamesShort:["Ni","Pn","Wt","Śr","Cz","Pt","Sb"],formatString:"%Y-%m-%d %H:%M:%S"},nl:{monthNames:["Januari","Februari","Maart","April","Mei","Juni","July","Augustus","September","Oktober","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","Mei","Jun","Jul","Aug","Sep","Okt","Nov","Dec"],dayNames:","["Zondag","Maandag","Dinsdag","Woensdag","Donderdag","Vrijdag","Zaterdag"],dayNamesShort:["Zo","Ma","Di","Wo","Do","Vr","Za"],formatString:"%Y-%m-%d %H:%M:%S"},sv:{monthNames:["januari","februari","mars","april","maj","juni","juli","augusti","september","oktober","november","december"],monthNamesShort:["jan","feb","mar","apr","maj","jun","jul","aug","sep","okt","nov","dec"],dayNames:["söndag","måndag","tisdag","onsdag","torsdag","fredag","lördag"],dayNamesShort:["sön","mån","tis","ons","tor","fre","lör"],formatString:"%Y-%m-%d %H:%M:%S"}};ag.regional["en-US"]=ag.regional["en-GB"]=ag.regional.en;ag.regional.getLocale=function(){var ah=ag.config.defaultLocale;if(document&&document.getElementsByTagName("html")&&document.getElementsByTagName("html")[0].lang){ah=document.getElementsByTagName("html")[0].lang;if(!ag.regional.hasOwnProperty(ah)){ah=ag.config.defaultLocale}}return ah};var C=24*60*60*1000;var N=function(ah,ak){ah=String(ah);var ai=ak-ah.length;var aj=String(Math.pow(10,ai)).slice(1);return aj.concat(ah)};var E={millisecond:1,second:1000,minute:60*1000,hour:60*60*1000,day:C,week:7*C,month:{add:function(aj,ah){E.year.add(aj,Math[ah>0?"floor":"ceil"](ah/12));var ai=aj.getMonth()+(ah%12);if(ai==12){ai=0;aj.setYear(aj.getFullYear()+1)}else{if(ai==-1){ai=11;aj.setYear(aj.getFullYear()-1)}}aj.setMonth(ai)},diff:function(al,aj){var ah=al.getFullYear()-aj.getFullYear();var ai=al.getMonth()-aj.getMonth()+(ah*12);var ak=al.getDate()-aj.getDate();return ai+(ak/30)}},year:{add:function(ai,ah){ai.setYear(ai.getFullYear()+Math[ah>0?"floor":"ceil"](ah))},diff:function(ai,ah){return E.month.diff(ai,ah)/12}}};for(var Y in E){if(Y.substring(Y.length-1)!="s"){E[Y+"s"]=E[Y]}}var H=function(al,ak,ai){if(ag.formats[ai]["shortcuts"][ak]){return ag.strftime(al,ag.formats[ai]["shortcuts"][ak],ai)}else{var ah=(ag.formats[ai]["codes"][ak]||"").split(".");var aj=al["get"+ah[0]]?al["get"+ah[0]]():"";if(ah[1]){aj=N(aj,ah[1])}return aj}};ag.strftime=function(an,ak,aj,ao){var ai="perl";var am=ag.regional.getLocale();if(aj&&ag.formats.hasOwnProperty(aj)){ai=aj}else{if(aj&&ag.regional.hasOwnProperty(aj)){am=aj}}if(ao&&ag.formats.hasOwnProperty(ao)){ai=ao}else{if(ao&&ag.regional.hasOwnProperty(ao)){am=ao}}if(l(an)!="[object Object]"||an._type!="jsDate"){an=new ag(an);an.locale=am}if(!ak){ak=an.formatString||ag.regional[am]["formatString"]}var ah=ak||"%Y-%m-%d",ap="",al;while(ah.length>0){if(al=ah.match(ag.formats[ai].codes.matcher)){ap+=ah.slice(0,al.index);ap+=(al[1]||"")+H(an,al[2],ai);ah=ah.slice(al.index+al[0].length)}else{ap+=ah;ah=""}}return ap};ag.formats={ISO:"%Y-%m-%dT%H:%M:%S.%N%G",SQL:"%Y-%m-%d %H:%M:%S"};ag.formats.perl={codes:{matcher:/()%(#?(%|[a-z]))/i,Y:"FullYear",y:"ShortYear.2",m:"MonthNumber.2","#m":"MonthNumber",B:"MonthName",b:"AbbrMonthName",d:"Date.2","#d":"Date",e:"Date",A:"DayName",a:"AbbrDayName",w:"Day",H:"Hours.2","#H":"Hours",I:"Hours12.2","#I":"Hours12",p:"AMPM",M:"Minutes.2","#M":"Minutes",S:"Seconds.2","#S":"Seconds",s:"Unix",N:"Milliseconds.3","#N":"Milliseconds",O:"TimezoneOffset",Z:"TimezoneName",G:"GmtOffset"},shortcuts:{F:"%Y-%m-%d",T:"%H:%M:%S",X:"%H:%M:%S",x:"%m/%d/%y",D:"%m/%d/%y","#c":"%a %b %e %H:%M:%S %Y",v:"%e-%b-%Y",R:"%H:%M",r:"%I:%M:%S %p",t:"\t",n:"\n","%":"%"}};ag.formats.php={codes:{matcher:/()%((%|[a-z]))/i,a:"AbbrDayName",A:"DayName",d:"Date.2",e:"Date",j:"DayOfYear.3",u:"DayOfWeek",w:"Day",U:"FullWeekOfYear.2",V:"IsoWeek.2",W:"WeekOfYear.2",b:"AbbrMonthName",B:"MonthName",m:"MonthNumber.2",h:"AbbrMonthName",C:"Century.2",y:"ShortYear.2",Y:"FullYear",H:"Hours.2",I:"Hours12.2",l:"Hours12",p:"AMPM",P:"AmPm",M:"Minutes.2",S:"Seconds.2",s:"Unix",O:"TimezoneOffset",z:"GmtOffset",Z:"TimezoneAbbr"},shortcuts:{D:"%m/%d/%y",F:"%Y-%m-%d",T:"%H:%M:%S",X:"%H:%M:%S",x:"%m/%d/%y",R:"%H:%M",r:"%I:%M:%S %p",t:"\t",n:"\n","%":"%"}};ag.createDate=function(aj){if(aj==null){return new Date()}if(aj instanceof Date){return aj}if(typeof aj=="number"){return new Date(aj)}var ao=String(aj).replace(/^\s*(.+)\s*$/g,"$1");ao=ao.replace(/^([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,4})/,"$1/$2/$3");ao=ao.replace(/^(3[01]|[0-2]?\d)[-\/]([a-z]{3,})[-\/](\d{4})/i,"$1 $2 $3");var an=ao.match(/^(3[01]|[0-2]?\d)[-\/]([a-z]{3,})[-\/](\d{2})\D*/i);if(an&&an.length>3){var at=parseFloat(an[3]);var am=ag.config.defaultCentury+at;am=String(am);ao=ao.replace(/^(3[01]|[0-2]?\d)[-\/]([a-z]{3,})[-\/](\d{2})\D*/i,an[1]+" "+an[2]+" "+am)}an=ao.match(/^([0-9]{1,2})[-\/]([0-9]{1,2})[-\/]([0-9]{1,2})[^0-9]/);function ar(ax,aw){var aC=parseFloat(aw[1]);var aB=parseFloat(aw[2]);var aA=parseFloat(aw[3]);var az=ag.config.defaultCentury;var av,au,aD,ay;if(aC>31){au=aA;aD=aB;av=az+aC}else{au=aB;aD=aC;av=az+aA}ay=aD+"/"+au+"/"+av;return ax.replace(/^([0-9]{1,2})[-\/]([0-9]{1,2})[-\/]([0-9]{1,2})/,ay)}if(an&&an.length>3){ao=ar(ao,an)}var an=ao.match(/^([0-9]{1,2})[-\/]([0-9]{1,2})[-\/]([0-9]{1,2})$/);if(an&&an.length>3){ao=ar(ao,an)}var al=0;var ai=ag.matchers.length;var aq,ah,ap=ao,ak;while(al<ai){ah=Date.parse(ap);if(!isNaN(ah)){return new Date(ah)}aq=ag.matchers[al];if(typeof aq=="function"){ak=aq.call(ag,ap);if(ak instanceof Date){return ak}}else{ap=ao.replace(aq[0],aq[1])}al++}return NaN};ag.daysInMonth=function(ah,ai){if(ai==2){return new Date(ah,1,29).getDate()==29?29:28}return[u,31,u,31,30,31,30,31,31,30,31,30,31][ai]};ag.matchers=[[/(3[01]|[0-2]\d)\s*\.\s*(1[0-2]|0\d)\s*\.\s*([1-9]\d{3})/,"$2/$1/$3"],[/([1-9]\d{3})\s*-\s*(1[0-2]|0\d)\s*-\s*(3[01]|[0-2]\d)/,"$2/$3/$1"],function(ak){var ai=ak.match(/^(?:(.+)\s+)?([012]?\d)(?:\s*\:\s*(\d\d))?(?:\s*\:\s*(\d\d(\.\d*)?))?\s*(am|pm)?\s*$/i);if(ai){if(ai[1]){var aj=this.createDate(ai[1]);if(isNaN(aj)){return}}else{var aj=new Date();aj.setMilliseconds(0)}var ah=parseFloat(ai[2]);if(ai[6]){ah=ai[6].toLowerCase()=="am"?(ah==12?0:ah):(ah==12?12:ah+12)}aj.setHours(ah,parseInt(ai[3]||0,10),parseInt(ai[4]||0,10),((parseFloat(ai[5]||0))||0)*1000);return aj}else{return ak}},function(ak){var ai=ak.match(/^(?:(.+))[T|\s+]([012]\d)(?:\:(\d\d))(?:\:(\d\d))(?:\.\d+)([\+\-]\d\d\:\d\d)$/i);if(ai){if(ai[1]){var aj=this.createDate(ai[1]);if(isNaN(aj)){return}}else{var aj=new Date();aj.setMilliseconds(0)}var ah=parseFloat(ai[2]);aj.setHours(ah,parseInt(ai[3],10),parseInt(ai[4],10),parseFloat(ai[5])*1000);return aj}else{return ak}},function(al){var aj=al.match(/^([0-3]?\d)\s*[-\/.\s]{1}\s*([a-zA-Z]{3,9})\s*[-\/.\s]{1}\s*([0-3]?\d)$/);if(aj){var ak=new Date();var am=ag.config.defaultCentury;var ao=parseFloat(aj[1]);var an=parseFloat(aj[3]);var ai,ah,ap;if(ao>31){ah=an;ai=am+ao}else{ah=ao;ai=am+an}var ap=ab(aj[2],ag.regional[ag.regional.getLocale()]["monthNamesShort"]);if(ap==-1){ap=ab(aj[2],ag.regional[ag.regional.getLocale()]["monthNames"])}ak.setFullYear(ai,ap,ah);ak.setHours(0,0,0,0);return ak}else{return al}}];function ab(aj,ak){if(ak.indexOf){return ak.indexOf(aj)}for(var ah=0,ai=ak.length;ah<ai;ah++){if(ak[ah]===aj){return ah}}return -1}function l(ah){if(ah===null){return"[object Null]"}return Object.prototype.toString.call(ah)}L.jsDate=ag;L.jqplot.sprintf=function(){function an(au,ap,aq,at){var ar=(au.length>=ap)?"":Array(1+ap-au.length>>>0).join(aq);return at?au+ar:ar+au}function ak(ar){var aq=new String(ar);for(var ap=10;ap>0;ap--){if(aq==(aq=aq.replace(/^(\d+)(\d{3})/,"$1"+L.jqplot.sprintf.thousandsSeparator+"$2"))){break}}return aq}function aj(av,au,ax,ar,at,aq){var aw=ar-av.length;if(aw>0){var ap=" ";if(aq){ap="&nbsp;"}if(ax||!at){av=an(av,ar,ap,ax)}else{av=av.slice(0,au.length)+an("",aw,"0",true)+av.slice(au.length)}}return av}function ao(ay,aq,aw,ar,ap,av,ax,au){var at=ay>>>0;aw=aw&&at&&{"2":"0b","8":"0","16":"0x"}[aq]||"";ay=aw+an(at.toString(aq),av||0,"0",false);return aj(ay,aw,ar,ap,ax,au)}function ah(au,av,ar,ap,at,aq){if(ap!=null){au=au.slice(0,ap)}return aj(au,"",av,ar,at,aq)}var ai=arguments,al=0,am=ai[al++];return am.replace(L.jqplot.sprintf.regex,function(aM,ax,ay,aB,aO,aJ,av){if(aM=="%%"){return"%"}var aD=false,az="",aA=false,aL=false,aw=false,au=false;for(var aI=0;ay&&aI<ay.length;aI++){switch(ay.charAt(aI)){case" ":az=" ";break;case"+":az="+";break;case"-":aD=true;break;case"0":aA=true;break;case"#":aL=true;break;case"&":aw=true;break;case"'":au=true;break}}if(!aB){aB=0}else{if(aB=="*"){aB=+ai[al++]}else{if(aB.charAt(0)=="*"){aB=+ai[aB.slice(1,-1)]}else{aB=+aB}}}if(aB<0){aB=-aB;aD=true}if(!isFinite(aB)){throw new Error("$.jqplot.sprintf: (minimum-)width must be finite")}if(!aJ){aJ="fFeE".indexOf(av)>-1?6:(av=="d")?0:void (0)}else{if(aJ=="*"){aJ=+ai[al++]}else{if(aJ.charAt(0)=="*"){aJ=+ai[aJ.slice(1,-1)]}else{aJ=+aJ}}}var aF=ax?ai[ax.slice(0,-1)]:ai[al++];switch(av){case"s":if(aF==null){return""}return ah(String(aF),aD,aB,aJ,aA,aw);case"c":return ah(String.fromCharCode(+aF),aD,aB,aJ,aA,aw);case"b":return ao(aF,2,aL,aD,aB,aJ,aA,aw);case"o":return ao(aF,8,aL,aD,aB,aJ,aA,aw);case"x":return ao(aF,16,aL,aD,aB,aJ,aA,aw);case"X":return ao(aF,16,aL,aD,aB,aJ,aA,aw).toUpperCase();case"u":return ao(aF,10,aL,aD,aB,aJ,aA,aw);case"i":var ar=parseInt(+aF,10);if(isNaN(ar)){return""}var aH=ar<0?"-":az;var aK=au?ak(String(Math.abs(ar))):String(Math.abs(ar));aF=aH+an(aK,aJ,"0",false);return aj(aF,aH,aD,aB,aA,aw);case"d":var ar=Math.round(+aF);if(isNaN(ar)){return""}var aH=ar<0?"-":az;var aK=au?ak(String(Math.abs(ar))):String(Math.abs(ar));aF=aH+an(aK,aJ,"0",false);return aj(aF,aH,aD,aB,aA,aw);case"e":case"E":case"f":case"F":case"g":case"G":var ar=+aF;if(isNaN(ar)){return""}var aH=ar<0?"-":az;var at=["toExponential","toFixed","toPrecision"]["efg".indexOf(av.toLowerCase())];var aN=["toString","toUpperCase"]["eEfFgG".indexOf(av)%2];var aK=Math.abs(ar)[at](aJ);var aE=aK.toString().split(".");aE[0]=au?ak(aE[0]):aE[0];aK=aE.join(L.jqplot.sprintf.decimalMark);aF=aH+aK;var aC=aj(aF,aH,aD,aB,aA,aw)[aN]();return aC;case"p":case"P":var ar=+aF;if(isNaN(ar)){return""}var aH=ar<0?"-":az;var aE=String(Number(Math.abs(ar)).toExponential()).split(/e|E/);var aq=(aE[0].indexOf(".")!=-1)?aE[0].length-1:String(ar).length;var aG=(aE[1]<0)?-aE[1]-1:0;if(Math.abs(ar)<1){if(aq+aG<=aJ){aF=aH+Math.abs(ar).toPrecision(aq)}else{if(aq<=aJ-1){aF=aH+Math.abs(ar).toExponential(aq-1)}else{aF=aH+Math.abs(ar).toExponential(aJ-1)}}}else{var ap=(aq<=aJ)?aq:aJ;aF=aH+Math.abs(ar).toPrecision(ap)}var aN=["toString","toUpperCase"]["pP".indexOf(av)%2];return aj(aF,aH,aD,aB,aA,aw)[aN]();case"n":return"";default:return aM}})};L.jqplot.sprintf.thousandsSeparator=",";L.jqplot.sprintf.decimalMark=".";L.jqplot.sprintf.regex=/%%|%(\d+\$)?([-+#0&\' ]*)(\*\d+\$|\*|\d+)?(\.(\*\d+\$|\*|\d+))?([nAscboxXuidfegpEGP])/g;L.jqplot.getSignificantFigures=function(al){var an=String(Number(Math.abs(al)).toExponential()).split(/e|E/);var am=(an[0].indexOf(".")!=-1)?an[0].length-1:an[0].length;var ai=(an[1]<0)?-an[1]-1:0;var ah=parseInt(an[1],10);var aj=(ah+1>0)?ah+1:0;var ak=(am<=aj)?0:am-ah-1;return{significantDigits:am,digitsLeft:aj,digitsRight:ak,zeros:ai,exponent:ah}};L.jqplot.getPrecision=function(ah){return L.jqplot.getSignificantFigures(ah).digitsRight};var X=L.uiBackCompat!==false;L.jqplot.effects={effect:{}};var m="jqplot.storage.";L.extend(L.jqplot.effects,{version:"1.9pre",save:function(ai,aj){for(var ah=0;ah<aj.length;ah++){if(aj[ah]!==null){ai.data(m+aj[ah],ai[0].style[aj[ah]])}}},restore:function(ai,aj){for(var ah=0;ah<aj.length;ah++){if(aj[ah]!==null){ai.css(aj[ah],ai.data(m+aj[ah]))}}},setMode:function(ah,ai){if(ai==="toggle"){ai=ah.is(":hidden")?"show":"hide"}return ai},createWrapper:function(ai){if(ai.parent().is(".ui-effects-wrapper")){return ai.parent()}var aj={width:ai.outerWidth(true),height:ai.outerHeight(true),"float":ai.css("float")},al=L("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),ah={width:ai.width(),height:ai.height()},ak=document.activeElement;ai.wrap(al);if(ai[0]===ak||L.contains(ai[0],ak)){L(ak).focus()}al=ai.parent();if(ai.css("position")==="static"){al.css({position:"relative"});ai.css({position:"relative"})}else{L.extend(aj,{position:ai.css("position"),zIndex:ai.css("z-index")});L.each(["top","left","bottom","right"],function(am,an){aj[an]=ai.css(an);if(isNaN(parseInt(aj[an],10))){aj[an]="auto"}});ai.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}ai.css(ah);return al.css(aj).show()},removeWrapper:function(ah){var ai=document.activeElement;if(ah.parent().is(".ui-effects-wrapper")){ah.parent().replaceWith(ah);if(ah[0]===ai||L.contains(ah[0],ai)){L(ai).focus()}}return ah}});function j(ai,ah,aj,ak){if(L.isPlainObject(ai)){return ai}ai={effect:ai};if(ah===u){ah={}}if(L.isFunction(ah)){ak=ah;aj=null;ah={}}if(L.type(ah)==="number"||L.fx.speeds[ah]){ak=aj;aj=ah;ah={}}if(L.isFunction(aj)){ak=aj;aj=null}if(ah){L.extend(ai,ah)}aj=aj||ah.duration;ai.duration=L.fx.off?0:typeof aj==="number"?aj:aj in L.fx.speeds?L.fx.speeds[aj]:L.fx.speeds._default;ai.complete=ak||ah.complete;return ai}function ae(ah){if(!ah||typeof ah==="number"||L.fx.speeds[ah]){return true}if(typeof ah==="string"&&!L.jqplot.effects.effect[ah]){if(X&&L.jqplot.effects[ah]){return false}return true}return false}L.fn.extend({jqplotEffect:function(ap,aq,ai,ao){var an=j.apply(this,arguments),ak=an.mode,al=an.queue,am=L.jqplot.effects.effect[an.effect],ah=!am&&X&&L.jqplot.effects[an.effect];if(L.fx.off||!(am||ah)){if(ak){return this[ak](an.duration,an.complete)}else{return this.each(function(){if(an.complete){an.complete.call(this)}})}}function aj(au){var av=L(this),at=an.complete,aw=an.mode;function ar(){if(L.isFunction(at)){at.call(av[0])}if(L.isFunction(au)){au()}}if(av.is(":hidden")?aw==="hide":aw==="show"){ar()}else{am.call(av[0],an,ar)}}if(am){return al===false?this.each(aj):this.queue(al||"fx",aj)}else{return ah.call(this,{options:an,duration:an.duration,callback:an.complete,mode:an.mode})}}});var a=/up|down|vertical/,v=/up|left|vertical|horizontal/;L.jqplot.effects.effect.blind=function(aj,ao){var ak=L(this),ar=["position","top","bottom","left","right","height","width"],ap=L.jqplot.effects.setMode(ak,aj.mode||"hide"),au=aj.direction||"up",am=a.test(au),al=am?"height":"width",aq=am?"top":"left",aw=v.test(au),an={},av=ap==="show",ai,ah,at;if(ak.parent().is(".ui-effects-wrapper")){L.jqplot.effects.save(ak.parent(),ar)}else{L.jqplot.effects.save(ak,ar)}ak.show();at=parseInt(ak.css("top"),10);ai=L.jqplot.effects.createWrapper(ak).css({overflow:"hidden"});ah=am?ai[al]()+at:ai[al]();an[al]=av?String(ah):"0";if(!aw){ak.css(am?"bottom":"right",0).css(am?"top":"left","").css({position:"absolute"});an[aq]=av?"0":String(ah)}if(av){ai.css(al,0);if(!aw){ai.css(aq,ah)}}ai.animate(an,{duration:aj.duration,easing:aj.easing,queue:false,complete:function(){if(ap==="hide"){ak.hide()}L.jqplot.effects.restore(ak,ar);L.jqplot.effects.removeWrapper(ak);ao()}})}})(jQuery);
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/11-jqplot.donutRenderer.min.js b/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/11-jqplot.donutRenderer.min.js
deleted file mode 100644
index a0cb217..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/11-jqplot.donutRenderer.min.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/* jqPlot 1.0.8r1250 | (c) 2009-2013 Chris Leonello | jplot.com
-   jsDate | (c) 2010-2013 Chris Leonello
- */(function(e){e.jqplot.DonutRenderer=function(){e.jqplot.LineRenderer.call(this)};e.jqplot.DonutRenderer.prototype=new e.jqplot.LineRenderer();e.jqplot.DonutRenderer.prototype.constructor=e.jqplot.DonutRenderer;e.jqplot.DonutRenderer.prototype.init=function(p,t){this.diameter=null;this.innerDiameter=null;this.thickness=null;this.padding=20;this.sliceMargin=0;this.ringMargin=null;this.fill=true;this.shadowOffset=2;this.shadowAlpha=0.07;this.shadowDepth=5;this.highlightMouseOver=true;this.highlightMouseDown=false;this.highlightColors=[];this.dataLabels="percent";this.showDataLabels=false;this.dataLabelFormatString=null;this.dataLabelThreshold=3;this.dataLabelPositionFactor=0.4;this.dataLabelNudge=0;this.startAngle=0;this.tickRenderer=e.jqplot.DonutTickRenderer;this._drawData=true;this._type="donut";if(p.highlightMouseDown&&p.highlightMouseOver==null){p.highlightMouseOver=false}e.extend(true,this,p);if(this.diameter!=null){this.diameter=this.diameter-this.sliceMargin}this._diameter=null;this._innerDiameter=null;this._radius=null;this._innerRadius=null;this._thickness=null;this._previousSeries=[];this._numberSeries=1;this._sliceAngles=[];this._highlightedPoint=null;if(this.highlightColors.length==0){for(var r=0;r<this.seriesColors.length;r++){var q=e.jqplot.getColorComponents(this.seriesColors[r]);var n=[q[0],q[1],q[2]];var s=n[0]+n[1]+n[2];for(var o=0;o<3;o++){n[o]=(s>570)?n[o]*0.8:n[o]+0.3*(255-n[o]);n[o]=parseInt(n[o],10)}this.highlightColors.push("rgb("+n[0]+","+n[1]+","+n[2]+")")}}t.postParseOptionsHooks.addOnce(l);t.postInitHooks.addOnce(g);t.eventListenerHooks.addOnce("jqplotMouseMove",b);t.eventListenerHooks.addOnce("jqplotMouseDown",a);t.eventListenerHooks.addOnce("jqplotMouseUp",j);t.eventListenerHooks.addOnce("jqplotClick",f);t.eventListenerHooks.addOnce("jqplotRightClick",m);t.postDrawHooks.addOnce(h)};e.jqplot.DonutRenderer.prototype.setGridData=function(s){var o=[];var t=[];var n=this.startAngle/180*Math.PI;var r=0;this._drawData=false;for(var q=0;q<this.data.length;q++){if(this.data[q][1]!=0){this._drawData=true}o.push(this.data[q][1]);t.push([this.data[q][0]]);if(q>0){o[q]+=o[q-1]}r+=this.data[q][1]}var p=Math.PI*2/o[o.length-1];for(var q=0;q<o.length;q++){t[q][1]=o[q]*p;t[q][2]=this.data[q][1]/r}this.gridData=t};e.jqplot.DonutRenderer.prototype.makeGridData=function(s,t){var o=[];var u=[];var r=0;var n=this.startAngle/180*Math.PI;this._drawData=false;for(var q=0;q<s.length;q++){if(this.data[q][1]!=0){this._drawData=true}o.push(s[q][1]);u.push([s[q][0]]);if(q>0){o[q]+=o[q-1]}r+=s[q][1]}var p=Math.PI*2/o[o.length-1];for(var q=0;q<o.length;q++){u[q][1]=o[q]*p;u[q][2]=s[q][1]/r}return u};e.jqplot.DonutRenderer.prototype.drawSlice=function(x,u,t,p,s){var n=this._diameter/2;var v=n-this._thickness;var w=this.fill;x.save();x.translate(this._center[0],this._center[1]);if(s){for(var q=0;q<this.shadowDepth;q++){x.save();x.translate(this.shadowOffset*Math.cos(this.shadowAngle/180*Math.PI),this.shadowOffset*Math.sin(this.shadowAngle/180*Math.PI));o()}}else{o()}function o(){if(t>6.282+this.startAngle){t=6.282+this.startAngle;if(u>t){u=6.281+this.startAngle}}if(u>=t){return}x.beginPath();x.fillStyle=p;x.strokeStyle=p;x.arc(0,0,n,u,t,false);x.lineTo(v*Math.cos(t),v*Math.sin(t));x.arc(0,0,v,t,u,true);x.closePath();if(w){x.fill()}else{x.stroke()}}if(s){for(var q=0;q<this.shadowDepth;q++){x.restore()}}x.restore()};e.jqplot.DonutRenderer.prototype.draw=function(N,V,t,P){var Q;var J=(t!=undefined)?t:{};var q=0;var p=0;var u=1;if(t.legendInfo&&t.legendInfo.placement=="insideGrid"){var I=t.legendInfo;switch(I.location){case"nw":q=I.width+I.xoffset;break;case"w":q=I.width+I.xoffset;break;case"sw":q=I.width+I.xoffset;break;case"ne":q=I.width+I.xoffset;u=-1;break;case"e":q=I.width+I.xoffset;u=-1;break;case"se":q=I.width+I.xoffset;u=-1;break;case"n":p=I.height+I.yoffset;break;case"s":p=I.height+I.yoffset;u=-1;break;default:break}}var B=(J.shadow!=undefined)?J.shadow:this.shadow;var W=(J.showLine!=undefined)?J.showLine:this.showLine;var O=(J.fill!=undefined)?J.fill:this.fill;var s=N.canvas.width;var H=N.canvas.height;var G=s-q-2*this.padding;var R=H-p-2*this.padding;var v=Math.min(G,R);var T=v;var X=(this.ringMargin==null)?this.sliceMargin*2:this.ringMargin;for(var Q=0;Q<this._previousSeries.length;Q++){T-=2*this._previousSeries[Q]._thickness+2*X}this._diameter=this.diameter||T;if(this.innerDiameter!=null){var M=(this._numberSeries>1&&this.index>0)?this._previousSeries[0]._diameter:this._diameter;this._thickness=this.thickness||(M-this.innerDiameter-2*X*this._numberSeries)/this._numberSeries/2}else{this._thickness=this.thickness||v/2/(this._numberSeries+1)*0.85}var K=this._radius=this._diameter/2;this._innerRadius=this._radius-this._thickness;var o=this.startAngle/180*Math.PI;this._center=[(s-u*q)/2+u*q,(H-u*p)/2+u*p];if(this.shadow){var L="rgba(0,0,0,"+this.shadowAlpha+")";for(var Q=0;Q<V.length;Q++){var A=(Q==0)?o:V[Q-1][1]+o;A+=this.sliceMargin/180*Math.PI;this.renderer.drawSlice.call(this,N,A,V[Q][1]+o,L,true)}}for(var Q=0;Q<V.length;Q++){var A=(Q==0)?o:V[Q-1][1]+o;A+=this.sliceMargin/180*Math.PI;var z=V[Q][1]+o;this._sliceAngles.push([A,z]);this.renderer.drawSlice.call(this,N,A,z,this.seriesColors[Q],false);if(this.showDataLabels&&V[Q][2]*100>=this.dataLabelThreshold){var S,U=(A+z)/2,C;if(this.dataLabels=="label"){S=this.dataLabelFormatString||"%s";C=e.jqplot.sprintf(S,V[Q][0])}else{if(this.dataLabels=="value"){S=this.dataLabelFormatString||"%d";C=e.jqplot.sprintf(S,this.data[Q][1])}else{if(this.dataLabels=="percent"){S=this.dataLabelFormatString||"%d%%";C=e.jqplot.sprintf(S,V[Q][2]*100)}else{if(this.dataLabels.constructor==Array){S=this.dataLabelFormatString||"%s";C=e.jqplot.sprintf(S,this.dataLabels[Q])}}}}var n=this._innerRadius+this._thickness*this.dataLabelPositionFactor+this.sliceMargin+this.dataLabelNudge;var F=this._center[0]+Math.cos(U)*n+this.canvas._offsets.left;var E=this._center[1]+Math.sin(U)*n+this.canvas._offsets.top;var D=e('<span class="jqplot-donut-series jqplot-data-label" style="position:absolute;">'+C+"</span>").insertBefore(P.eventCanvas._elem);F-=D.width()/2;E-=D.height()/2;F=Math.round(F);E=Math.round(E);D.css({left:F,top:E})}}};e.jqplot.DonutAxisRenderer=function(){e.jqplot.LinearAxisRenderer.call(this)};e.jqplot.DonutAxisRenderer.prototype=new e.jqplot.LinearAxisRenderer();e.jqplot.DonutAxisRenderer.prototype.constructor=e.jqplot.DonutAxisRenderer;e.jqplot.DonutAxisRenderer.prototype.init=function(n){this.tickRenderer=e.jqplot.DonutTickRenderer;e.extend(true,this,n);this._dataBounds={min:0,max:100};this.min=0;this.max=100;this.showTicks=false;this.ticks=[];this.showMark=false;this.show=false};e.jqplot.DonutLegendRenderer=function(){e.jqplot.TableLegendRenderer.call(this)};e.jqplot.DonutLegendRenderer.prototype=new e.jqplot.TableLegendRenderer();e.jqplot.DonutLegendRenderer.prototype.constructor=e.jqplot.DonutLegendRenderer;e.jqplot.DonutLegendRenderer.prototype.init=function(n){this.numberRows=null;this.numberColumns=null;e.extend(true,this,n)};e.jqplot.DonutLegendRenderer.prototype.draw=function(){var q=this;if(this.show){var y=this._series;var B="position:absolute;";B+=(this.background)?"background:"+this.background+";":"";B+=(this.border)?"border:"+this.border+";":"";B+=(this.fontSize)?"font-size:"+this.fontSize+";":"";B+=(this.fontFamily)?"font-family:"+this.fontFamily+";":"";B+=(this.textColor)?"color:"+this.textColor+";":"";B+=(this.marginTop!=null)?"margin-top:"+this.marginTop+";":"";B+=(this.marginBottom!=null)?"margin-bottom:"+this.marginBottom+";":"";B+=(this.marginLeft!=null)?"margin-left:"+this.marginLeft+";":"";B+=(this.marginRight!=null)?"margin-right:"+this.marginRight+";":"";this._elem=e('<table class="jqplot-table-legend" style="'+B+'"></table>');var F=false,x=false,n,v;var z=y[0];var o=new e.jqplot.ColorGenerator(z.seriesColors);if(z.show){var G=z.data;if(this.numberRows){n=this.numberRows;if(!this.numberColumns){v=Math.ceil(G.length/n)}else{v=this.numberColumns}}else{if(this.numberColumns){v=this.numberColumns;n=Math.ceil(G.length/this.numberColumns)}else{n=G.length;v=1}}var E,D,p,t,r,u,w,C;var A=0;for(E=0;E<n;E++){if(x){p=e('<tr class="jqplot-table-legend"></tr>').prependTo(this._elem)}else{p=e('<tr class="jqplot-table-legend"></tr>').appendTo(this._elem)}for(D=0;D<v;D++){if(A<G.length){u=this.labels[A]||G[A][0].toString();C=o.next();if(!x){if(E>0){F=true}else{F=false}}else{if(E==n-1){F=false}else{F=true}}w=(F)?this.rowSpacing:"0";t=e('<td class="jqplot-table-legend" style="text-align:center;padding-top:'+w+';"><div><div class="jqplot-table-legend-swatch" style="border-color:'+C+';"></div></div></td>');r=e('<td class="jqplot-table-legend" style="padding-top:'+w+';"></td>');if(this.escapeHtml){r.text(u)}else{r.html(u)}if(x){r.prependTo(p);t.prependTo(p)}else{t.appendTo(p);r.appendTo(p)}F=true}A++}}}}return this._elem};function c(r,q,o){o=o||{};o.axesDefaults=o.axesDefaults||{};o.legend=o.legend||{};o.seriesDefaults=o.seriesDefaults||{};var n=false;if(o.seriesDefaults.renderer==e.jqplot.DonutRenderer){n=true}else{if(o.series){for(var p=0;p<o.series.length;p++){if(o.series[p].renderer==e.jqplot.DonutRenderer){n=true}}}}if(n){o.axesDefaults.renderer=e.jqplot.DonutAxisRenderer;o.legend.renderer=e.jqplot.DonutLegendRenderer;o.legend.preDraw=true;o.seriesDefaults.pointLabels={show:false}}}function g(r,q,o){for(var p=1;p<this.series.length;p++){if(!this.series[p]._previousSeries.length){for(var n=0;n<p;n++){if(this.series[p].renderer.constructor==e.jqplot.DonutRenderer&&this.series[n].renderer.constructor==e.jqplot.DonutRenderer){this.series[p]._previousSeries.push(this.series[n])}}}}for(p=0;p<this.series.length;p++){if(this.series[p].renderer.constructor==e.jqplot.DonutRenderer){this.series[p]._numberSeries=this.series.length;if(this.series[p].highlightMouseOver){this.series[p].highlightMouseDown=false}}}}var k=false;function l(n){for(var o=0;o<this.series.length;o++){this.series[o].seriesColors=this.seriesColors;this.series[o].colorGenerator=e.jqplot.colorGenerator}}function d(r,q,p){var o=r.series[q];var n=r.plugins.donutRenderer.highlightCanvas;n._ctx.clearRect(0,0,n._ctx.canvas.width,n._ctx.canvas.height);o._highlightedPoint=p;r.plugins.donutRenderer.highlightedSeriesIndex=q;o.renderer.drawSlice.call(o,n._ctx,o._sliceAngles[p][0],o._sliceAngles[p][1],o.highlightColors[p],false)}function i(p){var n=p.plugins.donutRenderer.highlightCanvas;n._ctx.clearRect(0,0,n._ctx.canvas.width,n._ctx.canvas.height);for(var o=0;o<p.series.length;o++){p.series[o]._highlightedPoint=null}p.plugins.donutRenderer.highlightedSeriesIndex=null;p.target.trigger("jqplotDataUnhighlight")}function b(r,q,u,t,s){if(t){var p=[t.seriesIndex,t.pointIndex,t.data];var o=jQuery.Event("jqplotDataMouseOver");o.pageX=r.pageX;o.pageY=r.pageY;s.target.trigger(o,p);if(s.series[p[0]].highlightMouseOver&&!(p[0]==s.plugins.donutRenderer.highlightedSeriesIndex&&p[1]==s.series[p[0]]._highlightedPoint)){var n=jQuery.Event("jqplotDataHighlight");n.which=r.which;n.pageX=r.pageX;n.pageY=r.pageY;s.target.trigger(n,p);d(s,p[0],p[1])}}else{if(t==null){i(s)}}}function a(q,p,t,s,r){if(s){var o=[s.seriesIndex,s.pointIndex,s.data];if(r.series[o[0]].highlightMouseDown&&!(o[0]==r.plugins.donutRenderer.highlightedSeriesIndex&&o[1]==r.series[o[0]]._highlightedPoint)){var n=jQuery.Event("jqplotDataHighlight");n.which=q.which;n.pageX=q.pageX;n.pageY=q.pageY;r.target.trigger(n,o);d(r,o[0],o[1])}}else{if(s==null){i(r)}}}function j(p,o,s,r,q){var n=q.plugins.donutRenderer.highlightedSeriesIndex;if(n!=null&&q.series[n].highlightMouseDown){i(q)}}function f(q,p,t,s,r){if(s){var o=[s.seriesIndex,s.pointIndex,s.data];var n=jQuery.Event("jqplotDataClick");n.which=q.which;n.pageX=q.pageX;n.pageY=q.pageY;r.target.trigger(n,o)}}function m(r,q,u,t,s){if(t){var p=[t.seriesIndex,t.pointIndex,t.data];var n=s.plugins.donutRenderer.highlightedSeriesIndex;if(n!=null&&s.series[n].highlightMouseDown){i(s)}var o=jQuery.Event("jqplotDataRightClick");o.which=r.which;o.pageX=r.pageX;o.pageY=r.pageY;s.target.trigger(o,p)}}function h(){if(this.plugins.donutRenderer&&this.plugins.donutRenderer.highlightCanvas){this.plugins.donutRenderer.highlightCanvas.resetCanvas();this.plugins.donutRenderer.highlightCanvas=null}this.plugins.donutRenderer={highlightedSeriesIndex:null};this.plugins.donutRenderer.highlightCanvas=new e.jqplot.GenericCanvas();var o=e(this.targetId+" .jqplot-data-label");if(o.length){e(o[0]).before(this.plugins.donutRenderer.highlightCanvas.createElement(this._gridPadding,"jqplot-donutRenderer-highlight-canvas",this._plotDimensions,this))}else{this.eventCanvas._elem.before(this.plugins.donutRenderer.highlightCanvas.createElement(this._gridPadding,"jqplot-donutRenderer-highlight-canvas",this._plotDimensions,this))}var n=this.plugins.donutRenderer.highlightCanvas.setContext();this.eventCanvas._elem.bind("mouseleave",{plot:this},function(p){i(p.data.plot)})}e.jqplot.preInitHooks.push(c);e.jqplot.DonutTickRenderer=function(){e.jqplot.AxisTickRenderer.call(this)};e.jqplot.DonutTickRenderer.prototype=new e.jqplot.AxisTickRenderer();e.jqplot.DonutTickRenderer.prototype.constructor=e.jqplot.DonutTickRenderer})(jQuery);
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/aa_server.js b/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/aa_server.js
deleted file mode 100644
index 72e226b..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/aa_server.js
+++ /dev/null
@@ -1,267 +0,0 @@
-/* handle IE missing map function */
-if (!Array.prototype.map)
-{
-	Array.prototype.map = function(fun)
-	{
-		var len = this.length;
-		if (typeof fun != "function")
-			throw new TypeError();
-		var res = new Array(len);
-		var thisp = arguments[1];
-		for (var i = 0; i < len; i++)
-		{
-			if (i in this)
-			res[i] = fun.call(thisp, this[i], i, this);
-		}
-		return res;
-	};
-}
-
-
-$(document).ready(function(){
-	
-	var seriesColors = [ "#82c782", "#f07109", "#769cd3", "#579575", "#839557", "#958c12", "#953579", "#4b5de4", "#d8b83f", "#ff5800", "#0085cc"];
-			
-	// options for dummy donut charts
-	var donutOptions = {
-		height: 200,
-		title: {
-			text: '',
-			textColor: '#353535'
-		},
-		seriesColors: seriesColors,
-		
-		seriesDefaults: {
-			renderer:$.jqplot.DonutRenderer,
-			rendererOptions:{
-				sliceMargin: 5,
-				shadow: false,
-				startAngle: -90,
-				showDataLabels: false
-			}
-		},
-		legend: { 
-			show: false
-		},
-		grid: {
-			drawGridLines: false,
-			background: '#ffffff',
-			borderWidth: 0,
-			shadow: false,
-			renderer: $.jqplot.CanvasGridRenderer,
-			rendererOptions: {}
-		}
-	};
-	
-
-	function renderDonutLegend(values) {
-		var legend = $('<ul>');
-		$.each(values, function(k,v) {
-			legend.append(
-				$('<li>').append(
-					$('<div>').addClass('legend-tile').attr('style', 'background:' + seriesColors[k])
-				).append( v[0] )
-			);
-		})
-		return legend;
-	}
-
-	/**
-	 * Build server donut chart. Does not use jqplots build-in 
-	 * legend due to lack of positioning options
-	 */
-	function server_donut() {
-		var server_list = openqrm.get_server_list();
-		var server_values = [];
-		var virtualization, virtualization_list = [];
-		var hist = {};
-		
-		if(server_list != false && $('#chartdiv-inventory-server').length) {
-			try{
-				// remove "no data" message
-				$('#chartdiv-inventory-server .no-data-available').remove();
-			
-				donutOptions.title.text = lang_inventory_servers;
-			
-				$.each(server_list, function(k,server){
-					virtualization_list.push(server['appliance_virtualization']);
-				});
-				virtualization_list.map( function (a) { if (a in hist) hist[a] ++; else hist[a] = 1; } );
-				$.each(hist, function(k,v){
-					server_values.push([k + ' (' +v+ ')',v]);
-				})
-				$.jqplot('chartdiv-inventory-server', [server_values], donutOptions);
-				var legend = renderDonutLegend(server_values);
-				$('#chartdiv-inventory-server-legend').append(legend);
-			} catch(e) { }
-		}
-	}
-
-	/**
-	 * Build storage donut chart. Does not use jqplots build-in 
-	 * legend due to lack of positioning options
-	 */
-	function storage_donut() {
-		var storage_list = openqrm.get_storage_list();
-		var storage_values = [];
-		var deploment, deployment_list = [];
-		var hist = {};
-		
-		if(storage_list != false && $('#chartdiv-inventory-storage').length) {
-			try{
-				// remove "no data" message
-				$('#chartdiv-inventory-storage .no-data-available').remove();
-
-				donutOptions.title.text = lang_inventory_storages;
-				donutOptions.seriesDefaults.rendererOptions.startAngle = 0;
-					
-				$.each(storage_list, function(k,storage){
-					deployment_list.push(storage['storage_type']);
-				});
-				deployment_list.map( function (a) { if (a in hist) hist[a] ++; else hist[a] = 1; } );
-				$.each(hist, function(k,v){
-					storage_values.push([k + ' (' +v+ ')',v]);
-				})
-				$.jqplot('chartdiv-inventory-storage', [storage_values], donutOptions);
-			
-				var legend = renderDonutLegend(storage_values);
-				$('#chartdiv-inventory-server-storage').append(legend);
-			} catch(e) { }
-		}
-	}
-	
-	/**
-	 *	Populate new laod data to load chart and redraw chart canvas
-	 */
-	function updateLoadChart() {
-		var stats = openqrm.get_datacenter_load();
-		var dc_load = [[],[],[]];	
-		var xaxis_labels = []; 
-		var idx;
-		
-		if(stats != null && $('#chartdiv-load').length) {
-			
-			$.each(stats, function(k,v) {
-				idx = parseInt(k)+1;
-				xaxis_labels.push(idx%5 > 0 ? (' ') : (parseInt(k)+1));
-				
-				dc_load[0].push( [idx, parseFloat(v['datacenter_load_overall'] )] );
-				dc_load[1].push( [idx, parseFloat(v['datacenter_load_server'] )] );
-				dc_load[2].push( [idx, parseFloat(v['datacenter_load_storage'] )] );
-			});
-	
-	
-			$('#chartdiv-load *').remove();
-			var plot1 = $.jqplot('chartdiv-load', dc_load, 
-				{
-					seriesColors: seriesColors,
-					showMarker:false,
-					seriesDefaults: {
-						linewidth: 1,
-						showMarker: false
-					},
-					axesDefaults: {
-						min: 0
-					},
-					axes:{
-						xaxis:{
-							ticks: xaxis_labels.reverse(),
-							renderer: $.jqplot.CategoryAxisRenderer,
-							tickOptions: {
-								showGridline: false
-							}
-						}
-					},
-					grid: {
-						drawGridLines: false,
-						gridLineColor: '#dddddd',
-						background: '#ffffff',
-						borderWidth: 0,
-						shadow: false,
-						renderer: $.jqplot.CanvasGridRenderer,
-						rendererOptions: {}
-					}
-				}
-			);
-		}
-	}
-
-
-	function updateEventSection() {
-		var events = openqrm.get_event_list();
-		
-		if(events) {
-			// delete tbody content 
-			$('.eventtable tbody').html('');
-			
-			// add updated events
-			$.each(events, function(k,event){
-				
-				var event_time = new Date((parseInt(event['event_time'])*1000));
-				$('.eventtable tbody').append(
-					$('<tr>')
-						.append($('<td>').html(openqrm.formatDate(event_time, '%Y/%M/%d %H:%m:%s')))
-						.append($('<td>').html(
-							$('<span>').attr('class','pill ' + openqrm.getEventStatus(event['event_priority']))
-						))
-						.append($('<td>').html(event['event_source']))
-						.append(
-							$('<td>')
-								.attr('title', event['event_description'])
-								.html(
-									openqrm.crop(event['event_description'], 50)
-								)
-						)
-				);
-			});
-		}
-	}
-
-	function updateLoadSection() {
-		var status = openqrm.get_datacenter_status();
-		
-		if(status != null) {
-			$('.bar-01 .bar').attr('style','width:' + (status[0]*10) + '%');
-			$('.bar-01 .bar label').html(status[0]);
-			
-			$('.bar-02 .bar').attr('style','width:' + (status[3]*10) + '%');
-			$('.bar-02 .bar label').html(status[3]);
-			$('.bar-02 .peak').attr({'style' : 'left: ' + (status[4]*10) + '%'});
-	
-			$('.bar-03 .bar').attr('style','width:' + (status[1]*10) + '%');
-			$('.bar-03 .bar label').html(status[1]);
-			$('.bar-03 .peak').attr({'style' : 'left: ' + (status[2]*10) + '%'});
-		}
-	}
-
-	server_donut();
-	storage_donut();
-
-	updateLoadChart();
-	updateLoadSection();
-	updateEventSection();
-
-	
-	// Init refresh interval for datacenter load section and chart, 
-	// event list section
-	
-	setInterval(function (){
-		updateLoadChart();
-		updateLoadSection();
-		updateEventSection();
-	}, 5000);
-	
-	
-	// add refresh events to widget buttons
-	$('.refresh-load-current').click( function() {
-		updateLoadSection();
-	});
-	$('.refresh-load-chart').click( function() {
-		updateLoadChart();
-	});
-	$('.refresh-events').click( function() {
-		updateEventSection();
-	});
-	
-	
-});
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/excanvas.min.js b/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/excanvas.min.js
deleted file mode 100644
index e699a26..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/excanvas.min.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/* jqPlot @VERSION | (c) 2009-2013 Chris Leonello | jplot.com
-   jsDate | (c) 2010-2013 Chris Leonello
- */if(!document.createElement("canvas").getContext){(function(){var ab=Math;var n=ab.round;var l=ab.sin;var A=ab.cos;var H=ab.abs;var N=ab.sqrt;var d=10;var f=d/2;var z=+navigator.userAgent.match(/MSIE ([\d.]+)?/)[1];function y(){return this.context_||(this.context_=new D(this))}var t=Array.prototype.slice;function g(j,m,p){var i=t.call(arguments,2);return function(){return j.apply(m,i.concat(t.call(arguments)))}}function af(i){return String(i).replace(/&/g,"&amp;").replace(/"/g,"&quot;")}function Y(m,j,i){if(!m.namespaces[j]){m.namespaces.add(j,i,"#default#VML")}}function R(j){Y(j,"g_vml_","urn:schemas-microsoft-com:vml");Y(j,"g_o_","urn:schemas-microsoft-com:office:office");if(!j.styleSheets.ex_canvas_){var i=j.createStyleSheet();i.owningElement.id="ex_canvas_";i.cssText="canvas{display:inline-block;overflow:hidden;text-align:left;width:300px;height:150px}"}}R(document);var e={init:function(i){var j=i||document;j.createElement("canvas");j.attachEvent("onreadystatechange",g(this.init_,this,j))},init_:function(p){var m=p.getElementsByTagName("canvas");for(var j=0;j<m.length;j++){this.initElement(m[j])}},initElement:function(j){if(!j.getContext){j.getContext=y;R(j.ownerDocument);j.innerHTML="";j.attachEvent("onpropertychange",x);j.attachEvent("onresize",W);var i=j.attributes;if(i.width&&i.width.specified){j.style.width=i.width.nodeValue+"px"}else{j.width=j.clientWidth}if(i.height&&i.height.specified){j.style.height=i.height.nodeValue+"px"}else{j.height=j.clientHeight}}return j},uninitElement:function(j){if(j.getContext){var i=j.getContext();delete i.element_;delete i.canvas;j.innerHTML="";j.context_=null;j.getContext=null;j.detachEvent("onpropertychange",x);j.detachEvent("onresize",W)}}};function x(j){var i=j.srcElement;switch(j.propertyName){case"width":i.getContext().clearRect();i.style.width=i.attributes.width.nodeValue+"px";i.firstChild.style.width=i.clientWidth+"px";break;case"height":i.getContext().clearRect();i.style.height=i.attributes.height.nodeValue+"px";i.firstChild.style.height=i.clientHeight+"px";break}}function W(j){var i=j.srcElement;if(i.firstChild){i.firstChild.style.width=i.clientWidth+"px";i.firstChild.style.height=i.clientHeight+"px"}}e.init();var k=[];for(var ae=0;ae<16;ae++){for(var ad=0;ad<16;ad++){k[ae*16+ad]=ae.toString(16)+ad.toString(16)}}function B(){return[[1,0,0],[0,1,0],[0,0,1]]}function J(p,m){var j=B();for(var i=0;i<3;i++){for(var ah=0;ah<3;ah++){var Z=0;for(var ag=0;ag<3;ag++){Z+=p[i][ag]*m[ag][ah]}j[i][ah]=Z}}return j}function v(j,i){i.fillStyle=j.fillStyle;i.lineCap=j.lineCap;i.lineJoin=j.lineJoin;i.lineWidth=j.lineWidth;i.miterLimit=j.miterLimit;i.shadowBlur=j.shadowBlur;i.shadowColor=j.shadowColor;i.shadowOffsetX=j.shadowOffsetX;i.shadowOffsetY=j.shadowOffsetY;i.strokeStyle=j.strokeStyle;i.globalAlpha=j.globalAlpha;i.font=j.font;i.textAlign=j.textAlign;i.textBaseline=j.textBaseline;i.arcScaleX_=j.arcScaleX_;i.arcScaleY_=j.arcScaleY_;i.lineScale_=j.lineScale_}var b={aliceblue:"#F0F8FF",antiquewhite:"#FAEBD7",aquamarine:"#7FFFD4",azure:"#F0FFFF",beige:"#F5F5DC",bisque:"#FFE4C4",black:"#000000",blanchedalmond:"#FFEBCD",blueviolet:"#8A2BE2",brown:"#A52A2A",burlywood:"#DEB887",cadetblue:"#5F9EA0",chartreuse:"#7FFF00",chocolate:"#D2691E",coral:"#FF7F50",cornflowerblue:"#6495ED",cornsilk:"#FFF8DC",crimson:"#DC143C",cyan:"#00FFFF",darkblue:"#00008B",darkcyan:"#008B8B",darkgoldenrod:"#B8860B",darkgray:"#A9A9A9",darkgreen:"#006400",darkgrey:"#A9A9A9",darkkhaki:"#BDB76B",darkmagenta:"#8B008B",darkolivegreen:"#556B2F",darkorange:"#FF8C00",darkorchid:"#9932CC",darkred:"#8B0000",darksalmon:"#E9967A",darkseagreen:"#8FBC8F",darkslateblue:"#483D8B",darkslategray:"#2F4F4F",darkslategrey:"#2F4F4F",darkturquoise:"#00CED1",darkviolet:"#9400D3",deeppink:"#FF1493",deepskyblue:"#00BFFF",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1E90FF",firebrick:"#B22222",floralwhite:"#FFFAF0",forestgreen:"#228B22",gainsboro:"#DCDCDC",ghostwhite:"#F8F8FF",gold:"#FFD700",goldenrod:"#DAA520",grey:"#808080",greenyellow:"#ADFF2F",honeydew:"#F0FFF0",hotpink:"#FF69B4",indianred:"#CD5C5C",indigo:"#4B0082",ivory:"#FFFFF0",khaki:"#F0E68C",lavender:"#E6E6FA",lavenderblush:"#FFF0F5",lawngreen:"#7CFC00",lemonchiffon:"#FFFACD",lightblue:"#ADD8E6",lightcoral:"#F08080",lightcyan:"#E0FFFF",lightgoldenrodyellow:"#FAFAD2",lightgreen:"#90EE90",lightgrey:"#D3D3D3",lightpink:"#FFB6C1",lightsalmon:"#FFA07A",lightseagreen:"#20B2AA",lightskyblue:"#87CEFA",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#B0C4DE",lightyellow:"#FFFFE0",limegreen:"#32CD32",linen:"#FAF0E6",magenta:"#FF00FF",mediumaquamarine:"#66CDAA",mediumblue:"#0000CD",mediumorchid:"#BA55D3",mediumpurple:"#9370DB",mediumseagreen:"#3CB371",mediumslateblue:"#7B68EE",mediumspringgreen:"#00FA9A",mediumturquoise:"#48D1CC",mediumvioletred:"#C71585",midnightblue:"#191970",mintcream:"#F5FFFA",mistyrose:"#FFE4E1",moccasin:"#FFE4B5",navajowhite:"#FFDEAD",oldlace:"#FDF5E6",olivedrab:"#6B8E23",orange:"#FFA500",orangered:"#FF4500",orchid:"#DA70D6",palegoldenrod:"#EEE8AA",palegreen:"#98FB98",paleturquoise:"#AFEEEE",palevioletred:"#DB7093",papayawhip:"#FFEFD5",peachpuff:"#FFDAB9",peru:"#CD853F",pink:"#FFC0CB",plum:"#DDA0DD",powderblue:"#B0E0E6",rosybrown:"#BC8F8F",royalblue:"#4169E1",saddlebrown:"#8B4513",salmon:"#FA8072",sandybrown:"#F4A460",seagreen:"#2E8B57",seashell:"#FFF5EE",sienna:"#A0522D",skyblue:"#87CEEB",slateblue:"#6A5ACD",slategray:"#708090",slategrey:"#708090",snow:"#FFFAFA",springgreen:"#00FF7F",steelblue:"#4682B4",tan:"#D2B48C",thistle:"#D8BFD8",tomato:"#FF6347",turquoise:"#40E0D0",violet:"#EE82EE",wheat:"#F5DEB3",whitesmoke:"#F5F5F5",yellowgreen:"#9ACD32"};function M(j){var p=j.indexOf("(",3);var i=j.indexOf(")",p+1);var m=j.substring(p+1,i).split(",");if(m.length!=4||j.charAt(3)!="a"){m[3]=1}return m}function c(i){return parseFloat(i)/100}function r(j,m,i){return Math.min(i,Math.max(m,j))}function I(ag){var i,ai,aj,ah,ak,Z;ah=parseFloat(ag[0])/360%360;if(ah<0){ah++}ak=r(c(ag[1]),0,1);Z=r(c(ag[2]),0,1);if(ak==0){i=ai=aj=Z}else{var j=Z<0.5?Z*(1+ak):Z+ak-Z*ak;var m=2*Z-j;i=a(m,j,ah+1/3);ai=a(m,j,ah);aj=a(m,j,ah-1/3)}return"#"+k[Math.floor(i*255)]+k[Math.floor(ai*255)]+k[Math.floor(aj*255)]}function a(j,i,m){if(m<0){m++}if(m>1){m--}if(6*m<1){return j+(i-j)*6*m}else{if(2*m<1){return i}else{if(3*m<2){return j+(i-j)*(2/3-m)*6}else{return j}}}}var C={};function F(j){if(j in C){return C[j]}var ag,Z=1;j=String(j);if(j.charAt(0)=="#"){ag=j}else{if(/^rgb/.test(j)){var p=M(j);var ag="#",ah;for(var m=0;m<3;m++){if(p[m].indexOf("%")!=-1){ah=Math.floor(c(p[m])*255)}else{ah=+p[m]}ag+=k[r(ah,0,255)]}Z=+p[3]}else{if(/^hsl/.test(j)){var p=M(j);ag=I(p);Z=p[3]}else{ag=b[j]||j}}}return C[j]={color:ag,alpha:Z}}var o={style:"normal",variant:"normal",weight:"normal",size:10,family:"sans-serif"};var L={};function E(i){if(L[i]){return L[i]}var p=document.createElement("div");var m=p.style;try{m.font=i}catch(j){}return L[i]={style:m.fontStyle||o.style,variant:m.fontVariant||o.variant,weight:m.fontWeight||o.weight,size:m.fontSize||o.size,family:m.fontFamily||o.family}}function u(m,j){var i={};for(var ah in m){i[ah]=m[ah]}var ag=parseFloat(j.currentStyle.fontSize),Z=parseFloat(m.size);if(typeof m.size=="number"){i.size=m.size}else{if(m.size.indexOf("px")!=-1){i.size=Z}else{if(m.size.indexOf("em")!=-1){i.size=ag*Z}else{if(m.size.indexOf("%")!=-1){i.size=(ag/100)*Z}else{if(m.size.indexOf("pt")!=-1){i.size=Z/0.75}else{i.size=ag}}}}}i.size*=0.981;i.family="'"+i.family.replace(/(\'|\")/g,"").replace(/\s*,\s*/g,"', '")+"'";return i}function ac(i){return i.style+" "+i.variant+" "+i.weight+" "+i.size+"px "+i.family}var s={butt:"flat",round:"round"};function S(i){return s[i]||"square"}function D(i){this.m_=B();this.mStack_=[];this.aStack_=[];this.currentPath_=[];this.strokeStyle="#000";this.fillStyle="#000";this.lineWidth=1;this.lineJoin="miter";this.lineCap="butt";this.miterLimit=d*1;this.globalAlpha=1;this.font="10px sans-serif";this.textAlign="left";this.textBaseline="alphabetic";this.canvas=i;var m="width:"+i.clientWidth+"px;height:"+i.clientHeight+"px;overflow:hidden;position:absolute";var j=i.ownerDocument.createElement("div");j.style.cssText=m;i.appendChild(j);var p=j.cloneNode(false);p.style.backgroundColor="red";p.style.filter="alpha(opacity=0)";i.appendChild(p);this.element_=j;this.arcScaleX_=1;this.arcScaleY_=1;this.lineScale_=1}var q=D.prototype;q.clearRect=function(){if(this.textMeasureEl_){this.textMeasureEl_.removeNode(true);this.textMeasureEl_=null}this.element_.innerHTML=""};q.beginPath=function(){this.currentPath_=[]};q.moveTo=function(j,i){var m=V(this,j,i);this.currentPath_.push({type:"moveTo",x:m.x,y:m.y});this.currentX_=m.x;this.currentY_=m.y};q.lineTo=function(j,i){var m=V(this,j,i);this.currentPath_.push({type:"lineTo",x:m.x,y:m.y});this.currentX_=m.x;this.currentY_=m.y};q.bezierCurveTo=function(m,j,ak,aj,ai,ag){var i=V(this,ai,ag);var ah=V(this,m,j);var Z=V(this,ak,aj);K(this,ah,Z,i)};function K(i,Z,m,j){i.currentPath_.push({type:"bezierCurveTo",cp1x:Z.x,cp1y:Z.y,cp2x:m.x,cp2y:m.y,x:j.x,y:j.y});i.currentX_=j.x;i.currentY_=j.y}q.quadraticCurveTo=function(ai,m,j,i){var ah=V(this,ai,m);var ag=V(this,j,i);var aj={x:this.currentX_+2/3*(ah.x-this.currentX_),y:this.currentY_+2/3*(ah.y-this.currentY_)};var Z={x:aj.x+(ag.x-this.currentX_)/3,y:aj.y+(ag.y-this.currentY_)/3};K(this,aj,Z,ag)};q.arc=function(al,aj,ak,ag,j,m){ak*=d;var ap=m?"at":"wa";var am=al+A(ag)*ak-f;var ao=aj+l(ag)*ak-f;var i=al+A(j)*ak-f;var an=aj+l(j)*ak-f;if(am==i&&!m){am+=0.125}var Z=V(this,al,aj);var ai=V(this,am,ao);var ah=V(this,i,an);this.currentPath_.push({type:ap,x:Z.x,y:Z.y,radius:ak,xStart:ai.x,yStart:ai.y,xEnd:ah.x,yEnd:ah.y})};q.rect=function(m,j,i,p){this.moveTo(m,j);this.lineTo(m+i,j);this.lineTo(m+i,j+p);this.lineTo(m,j+p);this.closePath()};q.strokeRect=function(m,j,i,p){var Z=this.currentPath_;this.beginPath();this.moveTo(m,j);this.lineTo(m+i,j);this.lineTo(m+i,j+p);this.lineTo(m,j+p);this.closePath();this.stroke();this.currentPath_=Z};q.fillRect=function(m,j,i,p){var Z=this.currentPath_;this.beginPath();this.moveTo(m,j);this.lineTo(m+i,j);this.lineTo(m+i,j+p);this.lineTo(m,j+p);this.closePath();this.fill();this.currentPath_=Z};q.createLinearGradient=function(j,p,i,m){var Z=new U("gradient");Z.x0_=j;Z.y0_=p;Z.x1_=i;Z.y1_=m;return Z};q.createRadialGradient=function(p,ag,m,j,Z,i){var ah=new U("gradientradial");ah.x0_=p;ah.y0_=ag;ah.r0_=m;ah.x1_=j;ah.y1_=Z;ah.r1_=i;return ah};q.drawImage=function(aq,m){var aj,ah,al,ay,ao,am,at,aA;var ak=aq.runtimeStyle.width;var ap=aq.runtimeStyle.height;aq.runtimeStyle.width="auto";aq.runtimeStyle.height="auto";var ai=aq.width;var aw=aq.height;aq.runtimeStyle.width=ak;aq.runtimeStyle.height=ap;if(arguments.length==3){aj=arguments[1];ah=arguments[2];ao=am=0;at=al=ai;aA=ay=aw}else{if(arguments.length==5){aj=arguments[1];ah=arguments[2];al=arguments[3];ay=arguments[4];ao=am=0;at=ai;aA=aw}else{if(arguments.length==9){ao=arguments[1];am=arguments[2];at=arguments[3];aA=arguments[4];aj=arguments[5];ah=arguments[6];al=arguments[7];ay=arguments[8]}else{throw Error("Invalid number of arguments")}}}var az=V(this,aj,ah);var p=at/2;var j=aA/2;var ax=[];var i=10;var ag=10;ax.push(" <g_vml_:group",' coordsize="',d*i,",",d*ag,'"',' coordorigin="0,0"',' style="width:',i,"px;height:",ag,"px;position:absolute;");if(this.m_[0][0]!=1||this.m_[0][1]||this.m_[1][1]!=1||this.m_[1][0]){var Z=[];Z.push("M11=",this.m_[0][0],",","M12=",this.m_[1][0],",","M21=",this.m_[0][1],",","M22=",this.m_[1][1],",","Dx=",n(az.x/d),",","Dy=",n(az.y/d),"");var av=az;var au=V(this,aj+al,ah);var ar=V(this,aj,ah+ay);var an=V(this,aj+al,ah+ay);av.x=ab.max(av.x,au.x,ar.x,an.x);av.y=ab.max(av.y,au.y,ar.y,an.y);ax.push("padding:0 ",n(av.x/d),"px ",n(av.y/d),"px 0;filter:progid:DXImageTransform.Microsoft.Matrix(",Z.join(""),", sizingmethod='clip');")}else{ax.push("top:",n(az.y/d),"px;left:",n(az.x/d),"px;")}ax.push(' ">','<g_vml_:image src="',aq.src,'"',' style="width:',d*al,"px;"," height:",d*ay,'px"',' cropleft="',ao/ai,'"',' croptop="',am/aw,'"',' cropright="',(ai-ao-at)/ai,'"',' cropbottom="',(aw-am-aA)/aw,'"'," />","</g_vml_:group>");this.element_.insertAdjacentHTML("BeforeEnd",ax.join(""))};q.stroke=function(al){var aj=[];var Z=false;var m=10;var am=10;aj.push("<g_vml_:shape",' filled="',!!al,'"',' style="position:absolute;width:',m,"px;height:",am,'px;"',' coordorigin="0,0"',' coordsize="',d*m,",",d*am,'"',' stroked="',!al,'"',' path="');var an=false;var ag={x:null,y:null};var ak={x:null,y:null};for(var ah=0;ah<this.currentPath_.length;ah++){var j=this.currentPath_[ah];var ai;switch(j.type){case"moveTo":ai=j;aj.push(" m ",n(j.x),",",n(j.y));break;case"lineTo":aj.push(" l ",n(j.x),",",n(j.y));break;case"close":aj.push(" x ");j=null;break;case"bezierCurveTo":aj.push(" c ",n(j.cp1x),",",n(j.cp1y),",",n(j.cp2x),",",n(j.cp2y),",",n(j.x),",",n(j.y));break;case"at":case"wa":aj.push(" ",j.type," ",n(j.x-this.arcScaleX_*j.radius),",",n(j.y-this.arcScaleY_*j.radius)," ",n(j.x+this.arcScaleX_*j.radius),",",n(j.y+this.arcScaleY_*j.radius)," ",n(j.xStart),",",n(j.yStart)," ",n(j.xEnd),",",n(j.yEnd));break}if(j){if(ag.x==null||j.x<ag.x){ag.x=j.x}if(ak.x==null||j.x>ak.x){ak.x=j.x}if(ag.y==null||j.y<ag.y){ag.y=j.y}if(ak.y==null||j.y>ak.y){ak.y=j.y}}}aj.push(' ">');if(!al){w(this,aj)}else{G(this,aj,ag,ak)}aj.push("</g_vml_:shape>");this.element_.insertAdjacentHTML("beforeEnd",aj.join(""))};function w(m,ag){var j=F(m.strokeStyle);var p=j.color;var Z=j.alpha*m.globalAlpha;var i=m.lineScale_*m.lineWidth;if(i<1){Z*=i}ag.push("<g_vml_:stroke",' opacity="',Z,'"',' joinstyle="',m.lineJoin,'"',' miterlimit="',m.miterLimit,'"',' endcap="',S(m.lineCap),'"',' weight="',i,'px"',' color="',p,'" />')}function G(aq,ai,aK,ar){var aj=aq.fillStyle;var aB=aq.arcScaleX_;var aA=aq.arcScaleY_;var j=ar.x-aK.x;var p=ar.y-aK.y;if(aj instanceof U){var an=0;var aF={x:0,y:0};var ax=0;var am=1;if(aj.type_=="gradient"){var al=aj.x0_/aB;var m=aj.y0_/aA;var ak=aj.x1_/aB;var aM=aj.y1_/aA;var aJ=V(aq,al,m);var aI=V(aq,ak,aM);var ag=aI.x-aJ.x;var Z=aI.y-aJ.y;an=Math.atan2(ag,Z)*180/Math.PI;if(an<0){an+=360}if(an<0.000001){an=0}}else{var aJ=V(aq,aj.x0_,aj.y0_);aF={x:(aJ.x-aK.x)/j,y:(aJ.y-aK.y)/p};j/=aB*d;p/=aA*d;var aD=ab.max(j,p);ax=2*aj.r0_/aD;am=2*aj.r1_/aD-ax}var av=aj.colors_;av.sort(function(aN,i){return aN.offset-i.offset});var ap=av.length;var au=av[0].color;var at=av[ap-1].color;var az=av[0].alpha*aq.globalAlpha;var ay=av[ap-1].alpha*aq.globalAlpha;var aE=[];for(var aH=0;aH<ap;aH++){var ao=av[aH];aE.push(ao.offset*am+ax+" "+ao.color)}ai.push('<g_vml_:fill type="',aj.type_,'"',' method="none" focus="100%"',' color="',au,'"',' color2="',at,'"',' colors="',aE.join(","),'"',' opacity="',ay,'"',' g_o_:opacity2="',az,'"',' angle="',an,'"',' focusposition="',aF.x,",",aF.y,'" />')}else{if(aj instanceof T){if(j&&p){var ah=-aK.x;var aC=-aK.y;ai.push("<g_vml_:fill",' position="',ah/j*aB*aB,",",aC/p*aA*aA,'"',' type="tile"',' src="',aj.src_,'" />')}}else{var aL=F(aq.fillStyle);var aw=aL.color;var aG=aL.alpha*aq.globalAlpha;ai.push('<g_vml_:fill color="',aw,'" opacity="',aG,'" />')}}}q.fill=function(){this.stroke(true)};q.closePath=function(){this.currentPath_.push({type:"close"})};function V(j,Z,p){var i=j.m_;return{x:d*(Z*i[0][0]+p*i[1][0]+i[2][0])-f,y:d*(Z*i[0][1]+p*i[1][1]+i[2][1])-f}}q.save=function(){var i={};v(this,i);this.aStack_.push(i);this.mStack_.push(this.m_);this.m_=J(B(),this.m_)};q.restore=function(){if(this.aStack_.length){v(this.aStack_.pop(),this);this.m_=this.mStack_.pop()}};function h(i){return isFinite(i[0][0])&&isFinite(i[0][1])&&isFinite(i[1][0])&&isFinite(i[1][1])&&isFinite(i[2][0])&&isFinite(i[2][1])}function aa(j,i,p){if(!h(i)){return}j.m_=i;if(p){var Z=i[0][0]*i[1][1]-i[0][1]*i[1][0];j.lineScale_=N(H(Z))}}q.translate=function(m,j){var i=[[1,0,0],[0,1,0],[m,j,1]];aa(this,J(i,this.m_),false)};q.rotate=function(j){var p=A(j);var m=l(j);var i=[[p,m,0],[-m,p,0],[0,0,1]];aa(this,J(i,this.m_),false)};q.scale=function(m,j){this.arcScaleX_*=m;this.arcScaleY_*=j;var i=[[m,0,0],[0,j,0],[0,0,1]];aa(this,J(i,this.m_),true)};q.transform=function(Z,p,ah,ag,j,i){var m=[[Z,p,0],[ah,ag,0],[j,i,1]];aa(this,J(m,this.m_),true)};q.setTransform=function(ag,Z,ai,ah,p,j){var i=[[ag,Z,0],[ai,ah,0],[p,j,1]];aa(this,i,true)};q.drawText_=function(am,ak,aj,ap,ai){var ao=this.m_,at=1000,j=0,ar=at,ah={x:0,y:0},ag=[];var i=u(E(this.font),this.element_);var p=ac(i);var au=this.element_.currentStyle;var Z=this.textAlign.toLowerCase();switch(Z){case"left":case"center":case"right":break;case"end":Z=au.direction=="ltr"?"right":"left";break;case"start":Z=au.direction=="rtl"?"right":"left";break;default:Z="left"}switch(this.textBaseline){case"hanging":case"top":ah.y=i.size/1.75;break;case"middle":break;default:case null:case"alphabetic":case"ideographic":case"bottom":ah.y=-i.size/2.25;break}switch(Z){case"right":j=at;ar=0.05;break;case"center":j=ar=at/2;break}var aq=V(this,ak+ah.x,aj+ah.y);ag.push('<g_vml_:line from="',-j,' 0" to="',ar,' 0.05" ',' coordsize="100 100" coordorigin="0 0"',' filled="',!ai,'" stroked="',!!ai,'" style="position:absolute;width:1px;height:1px;">');if(ai){w(this,ag)}else{G(this,ag,{x:-j,y:0},{x:ar,y:i.size})}var an=ao[0][0].toFixed(3)+","+ao[1][0].toFixed(3)+","+ao[0][1].toFixed(3)+","+ao[1][1].toFixed(3)+",0,0";var al=n(aq.x/d+1-ao[0][0])+","+n(aq.y/d-2*ao[1][0]);ag.push('<g_vml_:skew on="t" matrix="',an,'" ',' offset="',al,'" origin="',j,' 0" />','<g_vml_:path textpathok="true" />','<g_vml_:textpath on="true" string="',af(am),'" style="v-text-align:',Z,";font:",af(p),'" /></g_vml_:line>');this.element_.insertAdjacentHTML("beforeEnd",ag.join(""))};q.fillText=function(m,i,p,j){this.drawText_(m,i,p,j,false)};q.strokeText=function(m,i,p,j){this.drawText_(m,i,p,j,true)};q.measureText=function(m){if(!this.textMeasureEl_){var i='<span style="position:absolute;top:-20000px;left:0;padding:0;margin:0;border:none;white-space:pre;"></span>';this.element_.insertAdjacentHTML("beforeEnd",i);this.textMeasureEl_=this.element_.lastChild}var j=this.element_.ownerDocument;this.textMeasureEl_.innerHTML="";this.textMeasureEl_.style.font=this.font;this.textMeasureEl_.appendChild(j.createTextNode(m));return{width:this.textMeasureEl_.offsetWidth}};q.clip=function(){};q.arcTo=function(){};q.createPattern=function(j,i){return new T(j,i)};function U(i){this.type_=i;this.x0_=0;this.y0_=0;this.r0_=0;this.x1_=0;this.y1_=0;this.r1_=0;this.colors_=[]}U.prototype.addColorStop=function(j,i){i=F(i);this.colors_.push({offset:j,color:i.color,alpha:i.alpha})};function T(j,i){Q(j);switch(i){case"repeat":case null:case"":this.repetition_="repeat";break;case"repeat-x":case"repeat-y":case"no-repeat":this.repetition_=i;break;default:O("SYNTAX_ERR")}this.src_=j.src;this.width_=j.width;this.height_=j.height}function O(i){throw new P(i)}function Q(i){if(!i||i.nodeType!=1||i.tagName!="IMG"){O("TYPE_MISMATCH_ERR")}if(i.readyState!="complete"){O("INVALID_STATE_ERR")}}function P(i){this.code=this[i];this.message=i+": DOM Exception "+this.code}var X=P.prototype=new Error;X.INDEX_SIZE_ERR=1;X.DOMSTRING_SIZE_ERR=2;X.HIERARCHY_REQUEST_ERR=3;X.WRONG_DOCUMENT_ERR=4;X.INVALID_CHARACTER_ERR=5;X.NO_DATA_ALLOWED_ERR=6;X.NO_MODIFICATION_ALLOWED_ERR=7;X.NOT_FOUND_ERR=8;X.NOT_SUPPORTED_ERR=9;X.INUSE_ATTRIBUTE_ERR=10;X.INVALID_STATE_ERR=11;X.SYNTAX_ERR=12;X.INVALID_MODIFICATION_ERR=13;X.NAMESPACE_ERR=14;X.INVALID_ACCESS_ERR=15;X.VALIDATION_ERR=16;X.TYPE_MISMATCH_ERR=17;G_vmlCanvasManager=e;CanvasRenderingContext2D=D;CanvasGradient=U;CanvasPattern=T;DOMException=P;G_vmlCanvasManager._version=888})()};
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/jqplot.canvasTextRenderer.min.js b/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/jqplot.canvasTextRenderer.min.js
deleted file mode 100644
index 73e4f52..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/jqplot.canvasTextRenderer.min.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Copyright (c) 2009 - 2010 Chris Leonello
- * jqPlot is currently available for use in all personal or commercial projects 
- * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL 
- * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can 
- * choose the license that best suits your project and use it accordingly. 
- *
- * Although not required, the author would appreciate an email letting him 
- * know of any substantial use of jqPlot.  You can reach the author at: 
- * chris at jqplot  or see http://www.jqplot.com/info.php .
- *
- * If you are feeling kind and generous, consider supporting the project by
- * making a donation at: http://www.jqplot.com/donate.php .
- *
- * jqPlot includes date instance methods and printf/sprintf functions by other authors:
- *
- * Date instance methods contained in jqplot.dateMethods.js:
- *
- *     author Ken Snyder (ken d snyder at gmail dot com)
- *     date 2008-09-10
- *     version 2.0.2 (http://kendsnyder.com/sandbox/date/)     
- *     license Creative Commons Attribution License 3.0 (http://creativecommons.org/licenses/by/3.0/)
- *
- * JavaScript printf/sprintf functions contained in jqplot.sprintf.js:
- *
- *     version 2007.04.27
- *     author Ash Searle
- *     http://hexmen.com/blog/2007/03/printf-sprintf/
- *     http://hexmen.com/js/sprintf.js
- *     The author (Ash Searle) has placed this code in the public domain:
- *     "This code is unrestricted: you are free to use it however you like."
- * 
- */
-(function(a){a.jqplot.CanvasTextRenderer=function(b){this.fontStyle="normal";this.fontVariant="normal";this.fontWeight="normal";this.fontSize="10px";this.fontFamily="sans-serif";this.fontStretch=1;this.fillStyle="#666666";this.angle=0;this.textAlign="start";this.textBaseline="alphabetic";this.text;this.width;this.height;this.pt2px=1.28;a.extend(true,this,b);this.normalizedFontSize=this.normalizeFontSize(this.fontSize);this.setHeight()};a.jqplot.CanvasTextRenderer.prototype.init=function(b){a.extend(true,this,b);this.normalizedFontSize=this.normalizeFontSize(this.fontSize);this.setHeight()};a.jqplot.CanvasTextRenderer.prototype.normalizeFontSize=function(b){b=String(b);n=parseFloat(b);if(b.indexOf("px")>-1){return n/this.pt2px}else{if(b.indexOf("pt")>-1){return n}else{if(b.indexOf("em")>-1){return n*12}else{if(b.indexOf("%")>-1){return n*12/100}else{return n/this.pt2px}}}}};a.jqplot.CanvasTextRenderer.prototype.fontWeight2Float=function(b){if(Number(b)){return b/400}else{switch(b){case"normal":return 1;break;case"bold":return 1.75;break;case"bolder":return 2.25;break;case"lighter":return 0.75;break;default:return 1;break}}};a.jqplot.CanvasTextRenderer.prototype.getText=function(){return this.text};a.jqplot.CanvasTextRenderer.prototype.setText=function(c,b){this.text=c;this.setWidth(b);return this};a.jqplot.CanvasTextRenderer.prototype.getWidth=function(b){return this.width};a.jqplot.CanvasTextRenderer.prototype.setWidth=function(c,b){if(!b){this.width=this.measure(c,this.text)}else{this.width=b}return this};a.jqplot.CanvasTextRenderer.prototype.getHeight=function(b){return this.height};a.jqplot.CanvasTextRenderer.prototype.setHeight=function(b){if(!b){this.height=this.normalizedFontSize*this.pt2px}else{this.height=b}return this};a.jqplot.CanvasTextRenderer.prototype.letter=function(b){return this.letters[b]};a.jqplot.CanvasTextRenderer.prototype.ascent=function(){return this.normalizedFontSize};a.jqplot.CanvasTextRenderer.prototype.descent=function(){return 7*this.normalizedFontSize/25};a.jqplot.CanvasTextRenderer.prototype.measure=function(d,f){var e=0;var b=f.length;for(i=0;i<b;i++){var g=this.letter(f.charAt(i));if(g){e+=g.width*this.normalizedFontSize/25*this.fontStretch}}return e};a.jqplot.CanvasTextRenderer.prototype.draw=function(t,o){var s=0;var p=this.height*0.72;var q=0;var l=o.length;var k=this.normalizedFontSize/25;t.save();var h,f;if((-Math.PI/2<=this.angle&&this.angle<=0)||(Math.PI*3/2<=this.angle&&this.angle<=Math.PI*2)){h=0;f=-Math.sin(this.angle)*this.width}else{if((0<this.angle&&this.angle<=Math.PI/2)||(-Math.PI*2<=this.angle&&this.angle<=-Math.PI*3/2)){h=Math.sin(this.angle)*this.height;f=0}else{if((-Math.PI<this.angle&&this.angle<-Math.PI/2)||(Math.PI<=this.angle&&this.angle<=Math.PI*3/2)){h=-Math.cos(this.angle)*this.width;f=-Math.sin(this.angle)*this.width-Math.cos(this.angle)*this.height}else{if((-Math.PI*3/2<this.angle&&this.angle<Math.PI)||(Math.PI/2<this.angle&&this.angle<Math.PI)){h=Math.sin(this.angle)*this.height-Math.cos(this.angle)*this.width;f=-Math.cos(this.angle)*this.height}}}}t.strokeStyle=this.fillStyle;t.fillStyle=this.fillStyle;t.translate(h,f);t.rotate(this.angle);t.lineCap="round";var u=(this.normalizedFontSize>30)?2:2+(30-this.normalizedFontSize)/20;t.lineWidth=u*k*this.fontWeight2Float(this.fontWeight);for(var g=0;g<l;g++){var m=this.letter(o.charAt(g));if(!m){continue}t.beginPath();var e=1;var b=0;for(var d=0;d<m.points.length;d++){var r=m.points[d];if(r[0]==-1&&r[1]==-1){e=1;continue}if(e){t.moveTo(s+r[0]*k*this.fontStretch,p-r[1]*k);e=false}else{t.lineTo(s+r[0]*k*this.fontStretch,p-r[1]*k)}}t.stroke();s+=m.width*k*this.fontStretch}t.restore();return q};a.jqplot.CanvasTextRenderer.prototype.letters={" ":{width:16,points:[]},"!":{width:10,points:[[5,21],[5,7],[-1,-1],[5,2],[4,1],[5,0],[6,1],[5,2]]},'"':{width:16,points:[[4,21],[4,14],[-1,-1],[12,21],[12,14]]},"#":{width:21,points:[[11,25],[4,-7],[-1,-1],[17,25],[10,-7],[-1,-1],[4,12],[18,12],[-1,-1],[3,6],[17,6]]},"$":{width:20,points:[[8,25],[8,-4],[-1,-1],[12,25],[12,-4],[-1,-1],[17,18],[15,20],[12,21],[8,21],[5,20],[3,18],[3,16],[4,14],[5,13],[7,12],[13,10],[15,9],[16,8],[17,6],[17,3],[15,1],[12,0],[8,0],[5,1],[3,3]]},"%":{width:24,points:[[21,21],[3,0],[-1,-1],[8,21],[10,19],[10,17],[9,15],[7,14],[5,14],[3,16],[3,18],[4,20],[6,21],[8,21],[10,20],[13,19],[16,19],[19,20],[21,21],[-1,-1],[17,7],[15,6],[14,4],[14,2],[16,0],[18,0],[20,1],[21,3],[21,5],[19,7],[17,7]]},"&":{width:26,points:[[23,12],[23,13],[22,14],[21,14],[20,13],[19,11],[17,6],[15,3],[13,1],[11,0],[7,0],[5,1],[4,2],[3,4],[3,6],[4,8],[5,9],[12,13],[13,14],[14,16],[14,18],[13,20],[11,21],[9,20],[8,18],[8,16],[9,13],[11,10],[16,3],[18,1],[20,0],[22,0],[23,1],[23,2]]},"'":{width:10,points:[[5,19],[4,20],[5,21],[6,20],[6,18],[5,16],[4,15]]},"(":{width:14,points:[[11,25],[9,23],[7,20],[5,16],[4,11],[4,7],[5,2],[7,-2],[9,-5],[11,-7]]},")":{width:14,points:[[3,25],[5,23],[7,20],[9,16],[10,11],[10,7],[9,2],[7,-2],[5,-5],[3,-7]]},"*":{width:16,points:[[8,21],[8,9],[-1,-1],[3,18],[13,12],[-1,-1],[13,18],[3,12]]},"+":{width:26,points:[[13,18],[13,0],[-1,-1],[4,9],[22,9]]},",":{width:10,points:[[6,1],[5,0],[4,1],[5,2],[6,1],[6,-1],[5,-3],[4,-4]]},"-":{width:18,points:[[6,9],[12,9]]},".":{width:10,points:[[5,2],[4,1],[5,0],[6,1],[5,2]]},"/":{width:22,points:[[20,25],[2,-7]]},"0":{width:20,points:[[9,21],[6,20],[4,17],[3,12],[3,9],[4,4],[6,1],[9,0],[11,0],[14,1],[16,4],[17,9],[17,12],[16,17],[14,20],[11,21],[9,21]]},"1":{width:20,points:[[6,17],[8,18],[11,21],[11,0]]},"2":{width:20,points:[[4,16],[4,17],[5,19],[6,20],[8,21],[12,21],[14,20],[15,19],[16,17],[16,15],[15,13],[13,10],[3,0],[17,0]]},"3":{width:20,points:[[5,21],[16,21],[10,13],[13,13],[15,12],[16,11],[17,8],[17,6],[16,3],[14,1],[11,0],[8,0],[5,1],[4,2],[3,4]]},"4":{width:20,points:[[13,21],[3,7],[18,7],[-1,-1],[13,21],[13,0]]},"5":{width:20,points:[[15,21],[5,21],[4,12],[5,13],[8,14],[11,14],[14,13],[16,11],[17,8],[17,6],[16,3],[14,1],[11,0],[8,0],[5,1],[4,2],[3,4]]},"6":{width:20,points:[[16,18],[15,20],[12,21],[10,21],[7,20],[5,17],[4,12],[4,7],[5,3],[7,1],[10,0],[11,0],[14,1],[16,3],[17,6],[17,7],[16,10],[14,12],[11,13],[10,13],[7,12],[5,10],[4,7]]},"7":{width:20,points:[[17,21],[7,0],[-1,-1],[3,21],[17,21]]},"8":{width:20,points:[[8,21],[5,20],[4,18],[4,16],[5,14],[7,13],[11,12],[14,11],[16,9],[17,7],[17,4],[16,2],[15,1],[12,0],[8,0],[5,1],[4,2],[3,4],[3,7],[4,9],[6,11],[9,12],[13,13],[15,14],[16,16],[16,18],[15,20],[12,21],[8,21]]},"9":{width:20,points:[[16,14],[15,11],[13,9],[10,8],[9,8],[6,9],[4,11],[3,14],[3,15],[4,18],[6,20],[9,21],[10,21],[13,20],[15,18],[16,14],[16,9],[15,4],[13,1],[10,0],[8,0],[5,1],[4,3]]},":":{width:10,points:[[5,14],[4,13],[5,12],[6,13],[5,14],[-1,-1],[5,2],[4,1],[5,0],[6,1],[5,2]]},";":{width:10,points:[[5,14],[4,13],[5,12],[6,13],[5,14],[-1,-1],[6,1],[5,0],[4,1],[5,2],[6,1],[6,-1],[5,-3],[4,-4]]},"<":{width:24,points:[[20,18],[4,9],[20,0]]},"=":{width:26,points:[[4,12],[22,12],[-1,-1],[4,6],[22,6]]},">":{width:24,points:[[4,18],[20,9],[4,0]]},"?":{width:18,points:[[3,16],[3,17],[4,19],[5,20],[7,21],[11,21],[13,20],[14,19],[15,17],[15,15],[14,13],[13,12],[9,10],[9,7],[-1,-1],[9,2],[8,1],[9,0],[10,1],[9,2]]},"@":{width:27,points:[[18,13],[17,15],[15,16],[12,16],[10,15],[9,14],[8,11],[8,8],[9,6],[11,5],[14,5],[16,6],[17,8],[-1,-1],[12,16],[10,14],[9,11],[9,8],[10,6],[11,5],[-1,-1],[18,16],[17,8],[17,6],[19,5],[21,5],[23,7],[24,10],[24,12],[23,15],[22,17],[20,19],[18,20],[15,21],[12,21],[9,20],[7,19],[5,17],[4,15],[3,12],[3,9],[4,6],[5,4],[7,2],[9,1],[12,0],[15,0],[18,1],[20,2],[21,3],[-1,-1],[19,16],[18,8],[18,6],[19,5]]},A:{width:18,points:[[9,21],[1,0],[-1,-1],[9,21],[17,0],[-1,-1],[4,7],[14,7]]},B:{width:21,points:[[4,21],[4,0],[-1,-1],[4,21],[13,21],[16,20],[17,19],[18,17],[18,15],[17,13],[16,12],[13,11],[-1,-1],[4,11],[13,11],[16,10],[17,9],[18,7],[18,4],[17,2],[16,1],[13,0],[4,0]]},C:{width:21,points:[[18,16],[17,18],[15,20],[13,21],[9,21],[7,20],[5,18],[4,16],[3,13],[3,8],[4,5],[5,3],[7,1],[9,0],[13,0],[15,1],[17,3],[18,5]]},D:{width:21,points:[[4,21],[4,0],[-1,-1],[4,21],[11,21],[14,20],[16,18],[17,16],[18,13],[18,8],[17,5],[16,3],[14,1],[11,0],[4,0]]},E:{width:19,points:[[4,21],[4,0],[-1,-1],[4,21],[17,21],[-1,-1],[4,11],[12,11],[-1,-1],[4,0],[17,0]]},F:{width:18,points:[[4,21],[4,0],[-1,-1],[4,21],[17,21],[-1,-1],[4,11],[12,11]]},G:{width:21,points:[[18,16],[17,18],[15,20],[13,21],[9,21],[7,20],[5,18],[4,16],[3,13],[3,8],[4,5],[5,3],[7,1],[9,0],[13,0],[15,1],[17,3],[18,5],[18,8],[-1,-1],[13,8],[18,8]]},H:{width:22,points:[[4,21],[4,0],[-1,-1],[18,21],[18,0],[-1,-1],[4,11],[18,11]]},I:{width:8,points:[[4,21],[4,0]]},J:{width:16,points:[[12,21],[12,5],[11,2],[10,1],[8,0],[6,0],[4,1],[3,2],[2,5],[2,7]]},K:{width:21,points:[[4,21],[4,0],[-1,-1],[18,21],[4,7],[-1,-1],[9,12],[18,0]]},L:{width:17,points:[[4,21],[4,0],[-1,-1],[4,0],[16,0]]},M:{width:24,points:[[4,21],[4,0],[-1,-1],[4,21],[12,0],[-1,-1],[20,21],[12,0],[-1,-1],[20,21],[20,0]]},N:{width:22,points:[[4,21],[4,0],[-1,-1],[4,21],[18,0],[-1,-1],[18,21],[18,0]]},O:{width:22,points:[[9,21],[7,20],[5,18],[4,16],[3,13],[3,8],[4,5],[5,3],[7,1],[9,0],[13,0],[15,1],[17,3],[18,5],[19,8],[19,13],[18,16],[17,18],[15,20],[13,21],[9,21]]},P:{width:21,points:[[4,21],[4,0],[-1,-1],[4,21],[13,21],[16,20],[17,19],[18,17],[18,14],[17,12],[16,11],[13,10],[4,10]]},Q:{width:22,points:[[9,21],[7,20],[5,18],[4,16],[3,13],[3,8],[4,5],[5,3],[7,1],[9,0],[13,0],[15,1],[17,3],[18,5],[19,8],[19,13],[18,16],[17,18],[15,20],[13,21],[9,21],[-1,-1],[12,4],[18,-2]]},R:{width:21,points:[[4,21],[4,0],[-1,-1],[4,21],[13,21],[16,20],[17,19],[18,17],[18,15],[17,13],[16,12],[13,11],[4,11],[-1,-1],[11,11],[18,0]]},S:{width:20,points:[[17,18],[15,20],[12,21],[8,21],[5,20],[3,18],[3,16],[4,14],[5,13],[7,12],[13,10],[15,9],[16,8],[17,6],[17,3],[15,1],[12,0],[8,0],[5,1],[3,3]]},T:{width:16,points:[[8,21],[8,0],[-1,-1],[1,21],[15,21]]},U:{width:22,points:[[4,21],[4,6],[5,3],[7,1],[10,0],[12,0],[15,1],[17,3],[18,6],[18,21]]},V:{width:18,points:[[1,21],[9,0],[-1,-1],[17,21],[9,0]]},W:{width:24,points:[[2,21],[7,0],[-1,-1],[12,21],[7,0],[-1,-1],[12,21],[17,0],[-1,-1],[22,21],[17,0]]},X:{width:20,points:[[3,21],[17,0],[-1,-1],[17,21],[3,0]]},Y:{width:18,points:[[1,21],[9,11],[9,0],[-1,-1],[17,21],[9,11]]},Z:{width:20,points:[[17,21],[3,0],[-1,-1],[3,21],[17,21],[-1,-1],[3,0],[17,0]]},"[":{width:14,points:[[4,25],[4,-7],[-1,-1],[5,25],[5,-7],[-1,-1],[4,25],[11,25],[-1,-1],[4,-7],[11,-7]]},"\\":{width:14,points:[[0,21],[14,-3]]},"]":{width:14,points:[[9,25],[9,-7],[-1,-1],[10,25],[10,-7],[-1,-1],[3,25],[10,25],[-1,-1],[3,-7],[10,-7]]},"^":{width:16,points:[[6,15],[8,18],[10,15],[-1,-1],[3,12],[8,17],[13,12],[-1,-1],[8,17],[8,0]]},_:{width:16,points:[[0,-2],[16,-2]]},"`":{width:10,points:[[6,21],[5,20],[4,18],[4,16],[5,15],[6,16],[5,17]]},a:{width:19,points:[[15,14],[15,0],[-1,-1],[15,11],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]]},b:{width:19,points:[[4,21],[4,0],[-1,-1],[4,11],[6,13],[8,14],[11,14],[13,13],[15,11],[16,8],[16,6],[15,3],[13,1],[11,0],[8,0],[6,1],[4,3]]},c:{width:18,points:[[15,11],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]]},d:{width:19,points:[[15,21],[15,0],[-1,-1],[15,11],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]]},e:{width:18,points:[[3,8],[15,8],[15,10],[14,12],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]]},f:{width:12,points:[[10,21],[8,21],[6,20],[5,17],[5,0],[-1,-1],[2,14],[9,14]]},g:{width:19,points:[[15,14],[15,-2],[14,-5],[13,-6],[11,-7],[8,-7],[6,-6],[-1,-1],[15,11],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]]},h:{width:19,points:[[4,21],[4,0],[-1,-1],[4,10],[7,13],[9,14],[12,14],[14,13],[15,10],[15,0]]},i:{width:8,points:[[3,21],[4,20],[5,21],[4,22],[3,21],[-1,-1],[4,14],[4,0]]},j:{width:10,points:[[5,21],[6,20],[7,21],[6,22],[5,21],[-1,-1],[6,14],[6,-3],[5,-6],[3,-7],[1,-7]]},k:{width:17,points:[[4,21],[4,0],[-1,-1],[14,14],[4,4],[-1,-1],[8,8],[15,0]]},l:{width:8,points:[[4,21],[4,0]]},m:{width:30,points:[[4,14],[4,0],[-1,-1],[4,10],[7,13],[9,14],[12,14],[14,13],[15,10],[15,0],[-1,-1],[15,10],[18,13],[20,14],[23,14],[25,13],[26,10],[26,0]]},n:{width:19,points:[[4,14],[4,0],[-1,-1],[4,10],[7,13],[9,14],[12,14],[14,13],[15,10],[15,0]]},o:{width:19,points:[[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3],[16,6],[16,8],[15,11],[13,13],[11,14],[8,14]]},p:{width:19,points:[[4,14],[4,-7],[-1,-1],[4,11],[6,13],[8,14],[11,14],[13,13],[15,11],[16,8],[16,6],[15,3],[13,1],[11,0],[8,0],[6,1],[4,3]]},q:{width:19,points:[[15,14],[15,-7],[-1,-1],[15,11],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]]},r:{width:13,points:[[4,14],[4,0],[-1,-1],[4,8],[5,11],[7,13],[9,14],[12,14]]},s:{width:17,points:[[14,11],[13,13],[10,14],[7,14],[4,13],[3,11],[4,9],[6,8],[11,7],[13,6],[14,4],[14,3],[13,1],[10,0],[7,0],[4,1],[3,3]]},t:{width:12,points:[[5,21],[5,4],[6,1],[8,0],[10,0],[-1,-1],[2,14],[9,14]]},u:{width:19,points:[[4,14],[4,4],[5,1],[7,0],[10,0],[12,1],[15,4],[-1,-1],[15,14],[15,0]]},v:{width:16,points:[[2,14],[8,0],[-1,-1],[14,14],[8,0]]},w:{width:22,points:[[3,14],[7,0],[-1,-1],[11,14],[7,0],[-1,-1],[11,14],[15,0],[-1,-1],[19,14],[15,0]]},x:{width:17,points:[[3,14],[14,0],[-1,-1],[14,14],[3,0]]},y:{width:16,points:[[2,14],[8,0],[-1,-1],[14,14],[8,0],[6,-4],[4,-6],[2,-7],[1,-7]]},z:{width:17,points:[[14,14],[3,0],[-1,-1],[3,14],[14,14],[-1,-1],[3,0],[14,0]]},"{":{width:14,points:[[9,25],[7,24],[6,23],[5,21],[5,19],[6,17],[7,16],[8,14],[8,12],[6,10],[-1,-1],[7,24],[6,22],[6,20],[7,18],[8,17],[9,15],[9,13],[8,11],[4,9],[8,7],[9,5],[9,3],[8,1],[7,0],[6,-2],[6,-4],[7,-6],[-1,-1],[6,8],[8,6],[8,4],[7,2],[6,1],[5,-1],[5,-3],[6,-5],[7,-6],[9,-7]]},"|":{width:8,points:[[4,25],[4,-7]]},"}":{width:14,points:[[5,25],[7,24],[8,23],[9,21],[9,19],[8,17],[7,16],[6,14],[6,12],[8,10],[-1,-1],[7,24],[8,22],[8,20],[7,18],[6,17],[5,15],[5,13],[6,11],[10,9],[6,7],[5,5],[5,3],[6,1],[7,0],[8,-2],[8,-4],[7,-6],[-1,-1],[8,8],[6,6],[6,4],[7,2],[8,1],[9,-1],[9,-3],[8,-5],[7,-6],[5,-7]]},"~":{width:24,points:[[3,6],[3,8],[4,11],[6,12],[8,12],[10,11],[14,8],[16,7],[18,7],[20,8],[21,10],[-1,-1],[3,8],[4,10],[6,11],[8,11],[10,10],[14,7],[16,6],[18,6],[20,7],[21,10],[21,12]]}};a.jqplot.CanvasFontRenderer=function(b){b=b||{};if(!b.pt2px){b.pt2px=1.5}a.jqplot.CanvasTextRenderer.call(this,b)};a.jqplot.CanvasFontRenderer.prototype=new a.jqplot.CanvasTextRenderer({});a.jqplot.CanvasFontRenderer.prototype.constructor=a.jqplot.CanvasFontRenderer;a.jqplot.CanvasFontRenderer.prototype.measure=function(c,e){var d=this.fontSize+" "+this.fontFamily;c.save();c.font=d;var b=c.measureText(e).width;c.restore();return b};a.jqplot.CanvasFontRenderer.prototype.draw=function(e,g){var c=0;var h=this.height*0.72;e.save();var d,b;if((-Math.PI/2<=this.angle&&this.angle<=0)||(Math.PI*3/2<=this.angle&&this.angle<=Math.PI*2)){d=0;b=-Math.sin(this.angle)*this.width}else{if((0<this.angle&&this.angle<=Math.PI/2)||(-Math.PI*2<=this.angle&&this.angle<=-Math.PI*3/2)){d=Math.sin(this.angle)*this.height;b=0}else{if((-Math.PI<this.angle&&this.angle<-Math.PI/2)||(Math.PI<=this.angle&&this.angle<=Math.PI*3/2)){d=-Math.cos(this.angle)*this.width;b=-Math.sin(this.angle)*this.width-Math.cos(this.angle)*this.height}else{if((-Math.PI*3/2<this.angle&&this.angle<Math.PI)||(Math.PI/2<this.angle&&this.angle<Math.PI)){d=Math.sin(this.angle)*this.height-Math.cos(this.angle)*this.width;b=-Math.cos(this.angle)*this.height}}}}e.strokeStyle=this.fillStyle;e.fillStyle=this.fillStyle;var f=this.fontSize+" "+this.fontFamily;e.font=f;e.translate(d,b);e.rotate(this.angle);e.fillText(g,c,h);e.restore()}})(jQuery);
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/jqplot.categoryAxisRenderer.min.js b/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/jqplot.categoryAxisRenderer.min.js
deleted file mode 100644
index a0c3362..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/js/jqplot.categoryAxisRenderer.min.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Copyright (c) 2009 - 2010 Chris Leonello
- * jqPlot is currently available for use in all personal or commercial projects 
- * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL 
- * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can 
- * choose the license that best suits your project and use it accordingly. 
- *
- * Although not required, the author would appreciate an email letting him 
- * know of any substantial use of jqPlot.  You can reach the author at: 
- * chris at jqplot  or see http://www.jqplot.com/info.php .
- *
- * If you are feeling kind and generous, consider supporting the project by
- * making a donation at: http://www.jqplot.com/donate.php .
- *
- * jqPlot includes date instance methods and printf/sprintf functions by other authors:
- *
- * Date instance methods contained in jqplot.dateMethods.js:
- *
- *     author Ken Snyder (ken d snyder at gmail dot com)
- *     date 2008-09-10
- *     version 2.0.2 (http://kendsnyder.com/sandbox/date/)     
- *     license Creative Commons Attribution License 3.0 (http://creativecommons.org/licenses/by/3.0/)
- *
- * JavaScript printf/sprintf functions contained in jqplot.sprintf.js:
- *
- *     version 2007.04.27
- *     author Ash Searle
- *     http://hexmen.com/blog/2007/03/printf-sprintf/
- *     http://hexmen.com/js/sprintf.js
- *     The author (Ash Searle) has placed this code in the public domain:
- *     "This code is unrestricted: you are free to use it however you like."
- * 
- */
-(function(a){a.jqplot.CategoryAxisRenderer=function(b){a.jqplot.LinearAxisRenderer.call(this);this.sortMergedLabels=false};a.jqplot.CategoryAxisRenderer.prototype=new a.jqplot.LinearAxisRenderer();a.jqplot.CategoryAxisRenderer.prototype.constructor=a.jqplot.CategoryAxisRenderer;a.jqplot.CategoryAxisRenderer.prototype.init=function(e){this.groups=1;this.groupLabels=[];this._groupLabels=[];this._grouped=false;this._barsPerGroup=null;a.extend(true,this,{tickOptions:{formatString:"%d"}},e);var b=this._dataBounds;for(var f=0;f<this._series.length;f++){var g=this._series[f];if(g.groups){this.groups=g.groups}var h=g.data;for(var c=0;c<h.length;c++){if(this.name=="xaxis"||this.name=="x2axis"){if(h[c][0]<b.min||b.min==null){b.min=h[c][0]}if(h[c][0]>b.max||b.max==null){b.max=h[c][0]}}else{if(h[c][1]<b.min||b.min==null){b.min=h[c][1]}if(h[c][1]>b.max||b.max==null){b.max=h[c][1]}}}}if(this.groupLabels.length){this.groups=this.groupLabels.length}};a.jqplot.CategoryAxisRenderer.prototype.createTicks=function(){var D=this._ticks;var z=this.ticks;var F=this.name;var C=this._dataBounds;var v,A;var q,w;var d,c;var b,x;if(z.length){if(this.groups>1&&!this._grouped){var r=z.length;var p=parseInt(r/this.groups,10);var e=0;for(var x=p;x<r;x+=p){z.splice(x+e,0," ");e++}this._grouped=true}this.min=0.5;this.max=z.length+0.5;var m=this.max-this.min;this.numberTicks=2*z.length+1;for(x=0;x<z.length;x++){b=this.min+2*x*m/(this.numberTicks-1);var h=new this.tickRenderer(this.tickOptions);h.showLabel=false;h.setTick(b,this.name);this._ticks.push(h);var h=new this.tickRenderer(this.tickOptions);h.label=z[x];h.showMark=false;h.showGridline=false;h.setTick(b+0.5,this.name);this._ticks.push(h)}var h=new this.tickRenderer(this.tickOptions);h.showLabel=false;h.setTick(b+1,this.name);this._ticks.push(h)}else{if(F=="xaxis"||F=="x2axis"){v=this._plotDimensions.width}else{v=this._plotDimensions.height}if(this.min!=null&&this.max!=null&&this.numberTicks!=null){this.tickInterval=null}if(this.min!=null&&this.max!=null&&this.tickInterval!=null){if(parseInt((this.max-this.min)/this.tickInterval,10)!=(this.max-this.min)/this.tickInterval){this.tickInterval=null}}var y=[];var B=0;var q=0.5;var w,E;var f=false;for(var x=0;x<this._series.length;x++){var k=this._series[x];for(var u=0;u<k.data.length;u++){if(this.name=="xaxis"||this.name=="x2axis"){E=k.data[u][0]}else{E=k.data[u][1]}if(a.inArray(E,y)==-1){f=true;B+=1;y.push(E)}}}if(f&&this.sortMergedLabels){y.sort(function(l,j){return l-j})}this.ticks=y;for(var x=0;x<this._series.length;x++){var k=this._series[x];for(var u=0;u<k.data.length;u++){if(this.name=="xaxis"||this.name=="x2axis"){E=k.data[u][0]}else{E=k.data[u][1]}var n=a.inArray(E,y)+1;if(this.name=="xaxis"||this.name=="x2axis"){k.data[u][0]=n}else{k.data[u][1]=n}}}if(this.groups>1&&!this._grouped){var r=y.length;var p=parseInt(r/this.groups,10);var e=0;for(var x=p;x<r;x+=p+1){y[x]=" "}this._grouped=true}w=B+0.5;if(this.numberTicks==null){this.numberTicks=2*B+1}var m=w-q;this.min=q;this.max=w;var o=0;var g=parseInt(3+v/20,10);var p=parseInt(B/g,10);if(this.tickInterval==null){this.tickInterval=m/(this.numberTicks-1)}for(var x=0;x<this.numberTicks;x++){b=this.min+x*this.tickInterval;var h=new this.tickRenderer(this.tickOptions);if(x/2==parseInt(x/2,10)){h.showLabel=false;h.showMark=true}else{if(p>0&&o<p){h.showLabel=false;o+=1}else{h.showLabel=true;o=0}h.label=h.formatter(h.formatString,y[(x-1)/2]);h.showMark=false;h.showGridline=false}h.setTick(b,this.name);this._ticks.push(h)}}};a.jqplot.CategoryAxisRenderer.prototype.draw=function(b){if(this.show){this.renderer.createTicks.call(this);var h=0;var c;if(this._elem){this._elem.empty()}this._elem=this._elem||a('<div class="jqplot-axis jqplot-'+this.name+'" style="position:absolute;"></div>');if(this.name=="xaxis"||this.name=="x2axis"){this._elem.width(this._plotDimensions.width)}else{this._elem.height(this._plotDimensions.height)}this.labelOptions.axis=this.name;this._label=new this.labelRenderer(this.labelOptions);if(this._label.show){var g=this._label.draw(b);g.appendTo(this._elem)}var f=this._ticks;for(var e=0;e<f.length;e++){var d=f[e];if(d.showLabel&&(!d.isMinorTick||this.showMinorTicks)){var g=d.draw(b);g.appendTo(this._elem)}}this._groupLabels=[];for(var e=0;e<this.groupLabels.length;e++){var g=a('<div style="position:absolute;" class="jqplot-'+this.name+'-groupLabel"></div>');g.html(this.groupLabels[e]);this._groupLabels.push(g);g.appendTo(this._elem)}}return this._elem};a.jqplot.CategoryAxisRenderer.prototype.set=function(){var e=0;var m;var k=0;var f=0;var d=(this._label==null)?false:this._label.show;if(this.show){var n=this._ticks;for(var c=0;c<n.length;c++){var g=n[c];if(g.showLabel&&(!g.isMinorTick||this.showMinorTicks)){if(this.name=="xaxis"||this.name=="x2axis"){m=g._elem.outerHeight(true)}else{m=g._elem.outerWidth(true)}if(m>e){e=m}}}var j=0;for(var c=0;c<this._groupLabels.length;c++){var b=this._groupLabels[c];if(this.name=="xaxis"||this.name=="x2axis"){m=b.outerHeight(true)}else{m=b.outerWidth(true)}if(m>j){j=m}}if(d){k=this._label._elem.outerWidth(true);f=this._label._elem.outerHeight(true)}if(this.name=="xaxis"){e+=j+f;this._elem.css({height:e+"px",left:"0px",bottom:"0px"})}else{if(this.name=="x2axis"){e+=j+f;this._elem.css({height:e+"px",left:"0px",top:"0px"})}else{if(this.name=="yaxis"){e+=j+k;this._elem.css({width:e+"px",left:"0px",top:"0px"});if(d&&this._label.constructor==a.jqplot.AxisLabelRenderer){this._label._elem.css("width",k+"px")}}else{e+=j+k;this._elem.css({width:e+"px",right:"0px",top:"0px"});if(d&&this._label.constructor==a.jqplot.AxisLabelRenderer){this._label._elem.css("width",k+"px")}}}}}};a.jqplot.CategoryAxisRenderer.prototype.pack=function(e,c){var B=this._ticks;var v=this.max;var s=this.min;var n=c.max;var l=c.min;var q=(this._label==null)?false:this._label.show;for(var r in e){this._elem.css(r,e[r])}this._offsets=c;var g=n-l;var k=v-s;this.p2u=function(h){return(h-l)*k/g+s};this.u2p=function(h){return(h-s)*g/k+l};if(this.name=="xaxis"||this.name=="x2axis"){this.series_u2p=function(h){return(h-s)*g/k};this.series_p2u=function(h){return h*k/g+s}}else{this.series_u2p=function(h){return(h-v)*g/k};this.series_p2u=function(h){return h*k/g+v}}if(this.show){if(this.name=="xaxis"||this.name=="x2axis"){for(i=0;i<B.length;i++){var o=B[i];if(o.show&&o.showLabel){var b;if(o.constructor==a.jqplot.CanvasAxisTickRenderer&&o.angle){var z=(this.name=="xaxis")?1:-1;switch(o.labelPosition){case"auto":if(z*o.angle<0){b=-o.getWidth()+o._textRenderer.height*Math.sin(-o._textRenderer.angle)/2}else{b=-o._textRenderer.height*Math.sin(o._textRenderer.angle)/2}break;case"end":b=-o.getWidth()+o._textRenderer.height*Math.sin(-o._textRenderer.angle)/2;break;case"start":b=-o._textRenderer.height*Math.sin(o._textRenderer.angle)/2;break;case"middle":b=-o.getWidth()/2+o._textRenderer.height*Math.sin(-o._textRenderer.angle)/2;break;default:b=-o.getWidth()/2+o._textRenderer.height*Math.sin(-o._textRenderer.angle)/2;break}}else{b=-o.getWidth()/2}var C=this.u2p(o.value)+b+"px";o._elem.css("left",C);o.pack()}}var y=["bottom",0];if(q){var m=this._label._elem.outerWidth(true);this._label._elem.css("left",l+g/2-m/2+"px");if(this.name=="xaxis"){this._label._elem.css("bottom","0px");y=["bottom",this._label._elem.outerHeight(true)]}else{this._label._elem.css("top","0px");y=["top",this._label._elem.outerHeight(true)]}this._label.pack()}var d=parseInt(this._ticks.length/this.groups,10);for(i=0;i<this._groupLabels.length;i++){var A=0;var f=0;for(var u=i*d;u<=(i+1)*d;u++){if(this._ticks[u]._elem&&this._ticks[u].label!=" "){var o=this._ticks[u]._elem;var r=o.position();A+=r.left+o.outerWidth(true)/2;f++}}A=A/f;this._groupLabels[i].css({left:(A-this._groupLabels[i].outerWidth(true)/2)});this._groupLabels[i].css(y[0],y[1])}}else{for(i=0;i<B.length;i++){var o=B[i];if(o.show&&o.showLabel){var b;if(o.constructor==a.jqplot.CanvasAxisTickRenderer&&o.angle){var z=(this.name=="yaxis")?1:-1;switch(o.labelPosition){case"auto":case"end":if(z*o.angle<0){b=-o._textRenderer.height*Math.cos(-o._textRenderer.angle)/2}else{b=-o.getHeight()+o._textRenderer.height*Math.cos(o._textRenderer.angle)/2}break;case"start":if(o.angle>0){b=-o._textRenderer.height*Math.cos(-o._textRenderer.angle)/2}else{b=-o.getHeight()+o._textRenderer.height*Math.cos(o._textRenderer.angle)/2}break;case"middle":b=-o.getHeight()/2;break;default:b=-o.getHeight()/2;break}}else{b=-o.getHeight()/2}var C=this.u2p(o.value)+b+"px";o._elem.css("top",C);o.pack()}}var y=["left",0];if(q){var x=this._label._elem.outerHeight(true);this._label._elem.css("top",n-g/2-x/2+"px");if(this.name=="yaxis"){this._label._elem.css("left","0px");y=["left",this._label._elem.outerWidth(true)]}else{this._label._elem.css("right","0px");y=["right",this._label._elem.outerWidth(true)]}this._label.pack()}var d=parseInt(this._ticks.length/this.groups,10);for(i=0;i<this._groupLabels.length;i++){var A=0;var f=0;for(var u=i*d;u<=(i+1)*d;u++){if(this._ticks[u]._elem&&this._ticks[u].label!=" "){var o=this._ticks[u]._elem;var r=o.position();A+=r.top+o.outerHeight()/2;f++}}A=A/f;this._groupLabels[i].css({top:A-this._groupLabels[i].outerHeight()/2});this._groupLabels[i].css(y[0],y[1])}}}}})(jQuery);
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/lang/de.datacenter.ini b/openQRM-5.3.50-CE/src/web/base/server/aa_server/lang/de.datacenter.ini
deleted file mode 100644
index 11bcca3..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/lang/de.datacenter.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[dashboard]
-tab = "Rechenzentrum"
-label = "Rechenzentrum"
-title = "Dashboard"
-load_headline = "Rechenzentrum Auslastung"
-load_current = "Jetzt"
-load_last_hour = "Letzte Stunde"
-inventory_headline = "Inventar"
-inventory_servers = "Server nach Typ"
-inventory_storages = "Storage Pool"
-events_headline = "Ereignisse"
-events_date = "Datum"
-events_source = "Quelle"
-events_description = "Beschreibung"
-datacenter_load_overall = "Gesamt"
-appliance_load_overall = "Server"
-storage_load_overall = "Speichernetz"
-link_server_management = "Server Management"
-link_storage_management = "Storage Management"
-no_data_available = "Keine Daten vorhanden"
-please_wait = "Lade Dashboard. Bitte warten ..."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/lang/en.datacenter.ini b/openQRM-5.3.50-CE/src/web/base/server/aa_server/lang/en.datacenter.ini
deleted file mode 100644
index 4bc3cff..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/lang/en.datacenter.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[dashboard]
-tab = "Datacenters"
-label = "Datacenters"
-title = "Dashboard"
-load_headline = "Datacenter Load"
-load_current = "current"
-load_last_hour = "last hour"
-inventory_headline = "Inventory"
-inventory_servers = "Server by type"
-inventory_storages = "Storage Pool"
-events_headline = "Events"
-events_date = "Date"
-events_source = "Source"
-events_description = "Description"
-datacenter_load_overall = "Datacenter <small>(overall)</small>"
-storage_load_overall = "Storage network"
-appliance_load_overall = "Server"
-link_server_management = "Server Management"
-link_storage_management = "Storage Management"
-no_data_available = "No data available"
-please_wait = "Loading. Please wait ..."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/lang/es.datacenter.ini b/openQRM-5.3.50-CE/src/web/base/server/aa_server/lang/es.datacenter.ini
deleted file mode 100644
index fb80cd3..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/lang/es.datacenter.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[dashboard]
-tab = "Datacenters"
-label = "Datacenters"
-title = "openQRM - Panel de Control del Datacenter"
-datacenter_load_overall = "Nivel de Carga del Datacenter (total)"
-load_headline = "Datacenter carga"
-load_current = "corriente"
-load_last_hour = "última hora"
-inventory_headline = "Inventario"
-inventory_servers = "Servidor por tipo"
-inventory_storages = "Almacenajes"
-events_headline = "Eventos"
-events_date = "Fecha"
-events_source = "Fuente"
-events_description = "Descripción"
-datacenter_load_overall = "Datacenter <small>(total)</small>"
-storage_load_overall = "Almacenamiento de red"
-appliance_load_overall = "Servidor"
-link_server_management = "Servidor manejo"
-link_storage_management = "Almacenamiento manejo"
-no_data_available = "No hay datos disponibles"
-please_wait = "Cargando. Por favor espere .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/menu.txt b/openQRM-5.3.50-CE/src/web/base/server/aa_server/menu.txt
deleted file mode 100644
index 11db808..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/menu.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-# this is the root of the menu
-# syntax is :
-#	Title
-#	Href
-#	Alt
-#	IMG
-#	Target
-.|Datacenter
-.|Dashboard|index.php?base=aa_server&controller=datacenter|Datacenter Dashboard
-.|Server|index.php?base=appliance|List of Server
-.|Components
-..|Images|index.php?base=image|List of server images
-..|Kernels|index.php?base=kernel|List of OS kernels
-..|Resources|index.php?base=resource|Available computing resources in the Datacenter
-..|Storage|index.php?base=storage|List of storage servers
-.|Events|index.php?base=event|Events in the openQRM Server|
-#..|All Events|index.php?base=event|Events in the openQRM Server|active.png
-#..|Active|index.php?base=event&event_filter=active|Active Events|transition.png
-#..|Warning|index.php?base=event&event_filter=warning|Warning Events|unknown.png
-#..|Error|index.php?base=event&event_filter=error|Error Events!|error.png
-#..|Acknowledged|index.php?base=event&event_filter=acknowledge|Acknowledged Events|idle.png
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/appliance-summary.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/appliance-summary.tpl.php
deleted file mode 100644
index 4db8195..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/appliance-summary.tpl.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>openQRM Server Summary</h2>
-<br>
-All Server: {appliance_all}
-<br>
-Active Server:  {appliance_active}
-<br>
-Server in Error: {appliance_error}
-<br>
-<br>
-Top {max_show_appliance_} Most active Server:
-<br>
-<br>
-{appliance_table}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/cloud-summary.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/cloud-summary.tpl.php
deleted file mode 100644
index 3ecd732..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/cloud-summary.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>openQRM Cloud Summary</h2>
-<br>
-All Cloud Users: {cloud_users}<br>
-All Cloud Requests: {cr_all}<br>
-Active Cloud Requests:  {cr_active}<br>
-Cloud Errors: {cloud_errors}<br><br>
-Top {max_show_cr} Active Cloud Requests:<br><br>
-{cloud_table}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/datacenter-dashboard.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/datacenter-dashboard.tpl.php
deleted file mode 100644
index 9f41f62..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/datacenter-dashboard.tpl.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<script type="text/javascript">
-//<![CDATA[
-var lang_inventory_servers = "{lang_inventory_servers}";
-var lang_inventory_storages = "{lang_inventory_storages}";
-//]]>
-</script>
-
-
-<div class="row">
-	<div class="span4">
-		
-		<!-- Start: Quicklink section -->
-<!--
-		{quicklinks_headline}
-		{quicklinks}
-//-->
-		
-		<!-- Start: Datacenter load current -->		
-		<h2>
-			{load_headline}
-			<small>{load_current}</small>
-			<!--
-			<span class="pull-right">
-				<a class="widget-action refresh-load-current" href="#">
-					<span class="halflings-icon refresh"><i></i></span>
-				</a>
-			</span>
-			-->
-		</h2>
-		<table class="table table-condensed">
-			<tr>
-				<td class="span2">{datacenter_load_overall}</td>
-				<td>
-					<div class="bar-01 chart-bar">
-						<div class="bar">
-							<label>0.43</label>
-						</div>
-						
-					</div>
-				</td>
-			</tr>
-			<tr>
-				<td>{appliance_load_overall}</td>
-				<td>
-					<div class="bar-02 chart-bar">
-						<div class="peak"></div>
-						<div class="bar">
-							<label>0.43</label>
-						</div>
-					</div>
-				</td>
-			</tr>
-			<tr>
-				<td>{storage_load_overall}</td>
-				<td>
-					<div class="bar-03 chart-bar">
-						<div class="peak"></div>
-						<div class="bar">
-							<label>0.43</label>
-						</div>
-					</div>
-				</td>
-			</tr>
-		</table>
-				
-		<!-- Start: Inventory overview -->
-		<h2>{inventory_headline}</h2>
-		<div class="row">
-			<div class="span2" style="margin: 0 0 20px 60px;">
-				
-				<div id="chartdiv-inventory-server">
-					<div class="no-data-available">
-						<h3>{no_data_available}</h3>
-						{link_server_management}
-					</div>
-				</div>	
-				<div id="chartdiv-inventory-server-legend" class="donut-chart-legend"></div>
-			</div>
-
-			<div class="span2" style="margin: 0 0 20px 60px;">
-				<div id="chartdiv-inventory-storage">
-					<div class="no-data-available">
-						<h3>{no_data_available}</h3>
-						{link_storage_management}
-					</div>
-				</div>
-				<div id="chartdiv-inventory-server-storage" class="donut-chart-legend"></div>
-			</div>
-		</div>
-			
-		
-	</div>
-	<div class="span6">
-		<!-- Start: Datacenter load chart -->
-		<h2>{load_headline}
-			<small>{load_last_hour}</small>
-			<!--
-			<span class="pull-right">
-				<a class="widget-action refresh-load-chart" href="#">
-					<span class="halflings-icon refresh"><i></i></span>
-				</a>
-			</span>
-			-->
-		</h2>	
-		<div id="chartdiv-load" style="height:220px; width:585px;"></div>
-
-		<!-- Start: Event table -->
-		<h2>{events_headline}
-			<!--
-			<span class="pull-right">
-				<a class="widget-action refresh-events" href="#">
-					<span class="halflings-icon refresh"><i></i></span>
-				</a>&nbsp;
-				<a class="widget-action linkto-events" href="#">
-					<span class="halflings-icon log_in"><i></i></span>
-				</a>
-			</span>
-			-->
-		</h2>
-		<table class="table table-condensed table-striped eventtable">
-			<thead>
-				<tr>
-					<th>{events_date}</th>
-					<th></th>
-					<th>{events_source}</th>
-					<th>{events_description}</th>
-				</tr>
-			</thead>
-			<tbody>
-			</tbody>
-		</table>
-
-
-	</div>
-
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/events-summary.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/events-summary.tpl.php
deleted file mode 100644
index 4c04e66..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/events-summary.tpl.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>openQRM Event Summary</h2>
-<br>
-{events_all} events in the database
-<br>Errors:  {events_error}
-<br>
-<br>
-Top {max_show_error} Error Events:
-<br>
-<br>
-{events_error_table}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/resource-summary.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/resource-summary.tpl.php
deleted file mode 100644
index a18b771..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/resource-summary.tpl.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>openQRM Resources Summary</h2>
-<br>
-All Resources: {resource_all}
-<br>
-Available Resources:  {resource_available}
-<br>
-Active Resources: {resource_active}
-<br>
-Resources in Error state: {resource_error}
-<br>
-<br>
-Top {max_show_resources} Most active Resources:
-<br>
-<br>
-{resource_table}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/storage-summary.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/storage-summary.tpl.php
deleted file mode 100644
index a3f4077..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/aa_server/tpl/storage-summary.tpl.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>openQRM Storage Summary</h2>
-<br>
-All Storage Server: {storage_all}
-<br>
-Storage Server in Error: {storage_error}
-<br>
-<br>
-Top {max_show_storage} Most active Storage Servers:
-<br>
-<br>
-{storage_table}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.cli.class.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.cli.class.php
deleted file mode 100644
index 3656fb1..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.cli.class.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/**
- * Appliance cli
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class appliance_cli
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'appliance_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "appliance_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'appliance_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'appliance_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($controller) {
-		$this->controller = $controller;
-		$this->response   = $controller->response;
-		$this->openqrm    = $controller->openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$action = $this->response->html->request()->get($this->controller->actions_name);
-		switch( $action ) {
-			case 'stop':
-				$this->stop();
-			break;
-			case 'start':
-				$this->start();
-			break;
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Start
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function start() {
-		if($this->response->html->request()->get($this->controller->identifier_name) !== '') {
-			$_REQUEST[$this->response->id]['submit'] = 'submit';
-			echo 'Starting appliance(s)'."\n";
-			$this->response->redirect = false;
-			ob_start();
-			require_once($this->controller->rootdir.'/server/appliance/class/appliance.start.class.php');
-			$controller                  = new appliance_start($this->openqrm, $this->response);
-			$controller->actions_name    = $this->controller->actions_name;
-			$controller->tpldir          = $this->controller->tpldir;
-			$controller->message_param   = $this->controller->message_param;
-			$controller->identifier_name = $this->controller->identifier_name;
-			$controller->lang            = $this->controller->lang['start'];
-			$controller->rootdir         = $this->controller->rootdir;
-			$controller->prefix_tab      = $this->controller->prefix_tab;
-			$data = $controller->action();
-			ob_end_clean();
-			if(isset($_REQUEST[$this->controller->message_param])) {
-				$msg = str_replace('<br>', "\n", $_REQUEST[$this->controller->message_param]);
-				echo $msg."\n";
-			} else {
-				$msg = str_replace('<br>', "\n", $data->msg);
-				echo $msg."\n";
-			}
-		} else {
-			echo 'Missing param '.$this->controller->identifier_name."[]\n";
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Stop
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function stop() {
-		if($this->response->html->request()->get($this->controller->identifier_name) !== '') {
-			$_REQUEST[$this->response->id]['submit'] = 'submit';
-			echo 'Stopping appliance(s)'."\n";
-			$this->response->redirect = false;
-			ob_start();
-			require_once($this->controller->rootdir.'/server/appliance/class/appliance.stop.class.php');
-			$controller                  = new appliance_stop($this->openqrm, $this->response);
-			$controller->actions_name    = $this->controller->actions_name;
-			$controller->tpldir          = $this->controller->tpldir;
-			$controller->message_param   = $this->controller->message_param;
-			$controller->identifier_name = $this->controller->identifier_name;
-			$controller->lang            = $this->controller->lang['stop'];
-			$controller->rootdir         = $this->controller->rootdir;
-			$controller->prefix_tab      = $this->controller->prefix_tab;
-			$data = $controller->action();
-			ob_end_clean();
-			if(isset($_REQUEST[$this->controller->message_param])) {
-				$msg = str_replace('<br>', "\n", $_REQUEST[$this->controller->message_param]);
-				echo $msg."\n";
-			} else {
-				$msg = str_replace('<br>', "\n", $data->msg);
-				echo $msg."\n";
-			}
-		} else {
-			echo 'Missing param '.$this->controller->identifier_name."[]\n";
-		}
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.controller.class.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.controller.class.php
deleted file mode 100644
index 0be8d4a..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.controller.class.php
+++ /dev/null
@@ -1,812 +0,0 @@
-<?php
-/**
- * Server Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class appliance_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'appliance_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "appliance_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'appliance_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'appliance_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array (
-		'tab' => 'Server',
-		'label' => 'Server',
-		'action_remove' => 'remove',
-		'action_start' => 'start',
-		'action_stop' => 'stop',
-		'action_edit' => 'edit',
-		'action_release' => 'release',
-		'action_add' => 'Add a new Server',
-		'action_continue' => 'Continue setup',
-		'table_state' => 'State',
-		'table_id' => 'Id',
-		'table_name' => 'Name',
-		'table_type' => 'Type',
-		'table_kernel' => 'Kernel',
-		'table_image' => 'Image',
-		'table_resource' => 'Resource',
-		'table_deployment' => 'Deployment',
-		'appliance_create_in_progress' => 'Server create in progress by user %s',
-		'resource_release' => 'release resource',
-		'lang_filter' => 'Filter by Resource',
-		'lang_type_filter' => 'Filter by Resource Type',
-		'lang_filter_title' => 'Filter by Resource ID, Name or Mac. Use ? as single and * as multi wildcard.',
-		'please_wait' => 'Loading. Please wait ..',
-	),
-	'step1' => array (
-		'label' => 'Add Server (1/4)',
-		'title' => 'Add a new Server',
-		'msg' => 'Added Server %s',
-		'form_name' => 'Name',
-		'form_comment' => 'Comment',
-		'lang_name_generate' => 'generate name',
-		'error_name' => 'Name must be %s',
-		'error_comment' => 'Comment must be %s',
-		'appliance_create_in_progress_event' => 'Server %s create in progress (step %s) by user %s',
-		'info' => 'Adding a server is devided in up to four steps:<br><br>(1) Give a name and a description to your new server.<br>(2) Choose a Resource - either a Physical Machine or a Virtual.<br>(3) Add an Image - the &quot;disk&quot; for a Virtual Machine.<br>(4) Add the Kernel - needed to boot a Virtual Machine with pxe.',
-		'please_wait' => 'Loading. Please wait ..',
-		'error_exists' => 'Server %s is already in use.',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'step2' => array (
-		'label' => 'Add Server (2/4)',
-		'title' => 'Select a resource for Server %s',
-		'msg' => 'Added resource %s to Server %s',
-		'or' => 'or',
-		'action_add' => 'new resource',
-		'appliance_create_in_progress_event' => 'Server %s create in progress (step %s) by user %s',
-		'info' => 'Select a resource for your new server from the list below. If there is no suitable resource you can add a new one by selecting NEW RESOURCE. When done adding you will be redirected to this page to continue the setup. Depending on the type of your selected resource the following two steps of the setup might be skipped.',
-		'form_resource' => 'Resource',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'step3' => array (
-		'label' => 'Add Server  (3/4)',
-		'title' => 'Select an image for Server %s',
-		'msg' => 'Added image %s to Server %s',
-		'or' => 'or',
-		'action_add' => 'new image',
-		'info' => 'The image represents the &quot;disc&quot; of you servers resource. Please choose one from the list below. If there is no suitable image you can add a new one by selecting NEW IMAGE. When done adding you will be redirected to this page to continue the setup. The image can be configured right after selection by checking the checkbox below.',
-		'form_image' => 'Image',
-		'form_image_edit' => 'Edit Image details after selection',
-		'appliance_create_in_progress_event' => 'Server %s create in progress (step %s) by user %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'step4' => array (
-		'label' => 'Add Server  (4/4)',
-		'title' => 'Select a kernel for Server %s',
-		'msg' => 'Added kernel %s to Server %s',
-		'or' => 'or',
-		'action_add' => 'new kernel',
-		'form_kernel' => 'Kernel',
-		'info' => 'A kernel is needed for VMs of type networkboot and must fit the choosen image. Please select one from the list below. If there is no suitable kernel you can add a new one by selecting NEW KERNEL and reading the instructions carefully.',
-		'appliance_create_in_progress_event' => 'Server %s create in progress (step %s) by user %s',
-		'appliance_created' => 'Server %s created by user %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'remove' => array (
-		'label' => 'Remove Server',
-		'msg' => 'Removed Server %s',
-		'msg_still_active' => 'Not removing Server %s!<br>It is still active.',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'start' => array (
-		'label' => 'Start Server',
-		'msg' => 'Started Server %s',
-		'msg_no_resource' => 'Could not find any available resource for Server %s',
-		'msg_always_active' => 'An Server with the openQRM Server as resource is always active!',
-		'msg_already_active' => 'Not starting already aktive Server %s',
-		'msg_reource_not_idle' => 'Resource %s is not in idle state. Not starting Server %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'stop' => array (
-		'label' => 'Stop Server',
-		'msg' => 'Stopped Server %s',
-		'msg_always_active' => 'An Server with the openQRM Server as resource is always active!',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'release' => array (
-		'label' => 'Release Server resource',
-		'msg' => 'Released Server %s resource',
-		'msg_openqrm' => 'The openQRM Server resource cannot be released!',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'edit' => array (
-		'label' => 'Edit Server',
-		'title' => 'Edit Server %s',
-		'msg' => 'Updated Server %s',
-		'option_auto' => 'auto',
-		'lang_ha' => 'Ha',
-		'lang_misc' => 'Misc',
-		'lang_mgmt' => 'Management',
-		'lang_moni' => 'Monitoring',
-		'lang_net' => 'Network',
-		'lang_enter' => 'Enterprise',
-		'lang_dep' => 'Deployment',
-		'form_comment' => 'Comment',
-		'form_cpus' => 'Cpus',
-		'form_cpuspeed' => 'Cpuspeed',
-		'form_cpumodel' => 'Cpumodel',
-		'form_capabilities' => 'Capabilities',
-		'form_virtualization' => 'Virtualization',
-		'form_resource' => 'Resource',
-		'form_image' => 'Image',
-		'form_kernel' => 'Kernel',
-		'form_nics' => 'Nics',
-		'form_memory' => 'Memory',
-		'form_swap' => 'Swap',
-		'action_resource' => 'change resource %s',
-		'action_image' => 'change image %s',
-		'action_kernel' => 'change kernel %s',
-		'error_comment' => 'Comment must be %s only',
-		'no_plugin_available' => 'No action available',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->tpldir   = $this->rootdir.'/server/appliance/tpl';
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/server/appliance/lang", 'appliance.ini');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "select";
-		}
-
-		if($this->action !== 'select') {
-			if($this->response->html->request()->get('appliance_wizard_id') !== '') {
-				$this->response->add('appliance_wizard_id', $this->response->html->request()->get('appliance_wizard_id'));
-			}
-			else if($this->response->html->request()->get('appliance_id') !== '') {
-				$this->response->add('appliance_id', $this->response->html->request()->get('appliance_id'));
-			}
-		}
-		$this->response->add('resource_filter', $this->response->html->request()->get('resource_filter'));
-
-		// handle table params
-		#$vars = $this->response->html->request()->get('appliance');
-		#if($vars !== '') {
-		#	if(!isset($vars['action'])) {
-		#		foreach($vars as $k => $v) {
-		#			$this->response->add('appliance['.$k.']', $v);
-		#		}
-		#	} else {
-		#		foreach($vars as $k => $v) {
-		#			unset($this->response->params['appliance['.$k.']']);
-		#		}
-		#	}
-		#}
-
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'step1':
-				$content[] = $this->select(false);
-				$content[] = $this->step1(true);
-			break;
-			case 'step2':
-				$content[] = $this->select(false);
-				$content[] = $this->step2(true);
-			break;
-			case 'step3':
-				$content[] = $this->select(false);
-				$content[] = $this->step3(true);
-			break;
-			case 'step4':
-				$content[] = $this->select(false);
-				$content[] = $this->step4(true);
-			break;
-			case 'remove':
-				$content[] = $this->select(false);
-				$content[] = $this->remove(true);
-			break;
-			case 'start':
-				$content[] = $this->select(false);
-				$content[] = $this->start(true);
-			break;
-			case 'stop':
-				$content[] = $this->select(false);
-				$content[] = $this->stop(true);
-			break;
-			case 'release':
-				$content[] = $this->release(true);
-			break;
-			case 'edit':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-			break;
-			case 'redirect':
-				$this->__redirect(true);
-			break;
-			// select
-			case 'load_select':
-				$tmp           = $this->select(false);
-				$tmp['value']  = $this->__loader('select');
-				$tmp['active'] = true;
-				$content[]     = $tmp;
-			break;
-			// step2 resource add
-			case 'load_radd':
-				$content[]     = $this->select(false);
-				$tmp           = $this->step2(false);
-				$tmp['value']  = $this->__loader('radd');
-				$tmp['active'] = true;
-				$content[]     = $tmp;
-			break;
-			// step3 image add
-			case 'load_iadd':
-				$content[]     = $this->select(false);
-				$tmp           = $this->step3(false);
-				$tmp['value']  = $this->__loader('iadd');
-				$tmp['active'] = true;
-				$content[]     = $tmp;
-			break;
-			// step3 image edit
-			case 'load_iedit':
-				$content[]     = $this->select(false);
-				$tmp           = $this->step3(false);
-				$tmp['value']  = $this->__loader('iedit');
-				$tmp['active'] = true;
-				$content[]     = $tmp;
-			break;
-			// step4 kernel edit
-			case 'load_kadd':
-				$content[]     = $this->select(false);
-				$tmp           = $this->step4(false);
-				$tmp['value']  = $this->__loader('kadd');
-				$tmp['active'] = true;
-				$content[]     = $tmp;
-			break;
-			// server edit
-			case 'load_edit':
-				$content[]     = $this->select(false);
-				$tmp           = $this->edit(false);
-				$tmp['value']  = $this->__loader('edit');
-				$tmp['active'] = true;
-				$content[]     = $tmp;
-			break;
-		}
-
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->rootdir.'/server/appliance/class/appliance.api.class.php');
-		$controller = new appliance_api($this);
-		$controller->action();
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * CLI
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function cli() {
-		require_once($this->rootdir.'/server/appliance/class/appliance.cli.class.php');
-		$controller = new appliance_cli($this);
-		$controller->action();
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Select Server
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/appliance/class/appliance.select.class.php');
-			$controller = new appliance_select($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Add Server step 1 (Name)
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function step1( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/appliance/class/appliance.step1.class.php');
-			$controller                  = new appliance_step1($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['step1'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['step1']['label'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'step1' );
-		$content['onclick'] = false;
-		if($this->action === 'step1'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Add Server step 2 (Resource)
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function step2( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/appliance/class/appliance.step2.class.php');
-			$controller                  = new appliance_step2($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['step2'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['step2']['label'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'step2' );
-		$content['onclick'] = false;
-		if($this->action === 'step2'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add Server step 3 (Image)
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function step3( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/appliance/class/appliance.step3.class.php');
-			$controller                  = new appliance_step3($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['step3'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['step3']['label'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'step3' );
-		$content['onclick'] = false;
-		if($this->action === 'step3'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add Server step 4 (Kernel)
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function step4( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/appliance/class/appliance.step4.class.php');
-			$controller                  = new appliance_step4($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['step4'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['step4']['label'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'step4' );
-		$content['onclick'] = false;
-		if($this->action === 'step4'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Edit Server
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function edit( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/appliance/class/appliance.edit.class.php');
-			$controller                  = new appliance_edit($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['edit'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['edit']['label'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'edit' );
-		$content['onclick'] = false;
-		if($this->action === 'edit'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove Server
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function remove( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/appliance/class/appliance.remove.class.php');
-			$controller                  = new appliance_remove($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['remove'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Remove';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'remove' );
-		$content['onclick'] = false;
-		if($this->action === 'remove'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Start Server
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function start( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/appliance/class/appliance.start.class.php');
-			$controller                  = new appliance_start($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['start'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Start';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'start' );
-		$content['onclick'] = false;
-		if($this->action === 'start'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Stop Server
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function stop( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/appliance/class/appliance.stop.class.php');
-			$controller                  = new appliance_stop($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['stop'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Stop';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'stop' );
-		$content['onclick'] = false;
-		if($this->action === 'stop'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Release Server resource
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function release( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/appliance/class/appliance.release.class.php');
-			$controller                  = new appliance_release($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['release'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Release';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'release' );
-		$content['onclick'] = false;
-		if($this->action === 'release'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Redirect
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return null
-	 */
-	//--------------------------------------------
-	function __redirect( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/appliance/class/appliance.redirect.class.php');
-			$controller                  = new appliance_redirect($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = '';
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Load Plugin as new tab
-	 *
-	 * @access public
-	 * @param enum $mode [radd|iadd|iedit|edit|select]
-	 * @return object
-	 */
-	//--------------------------------------------
-	function __loader($mode) {
-
-		$modes = array();
-		$modes['radd']   = array('folder' => 'server');
-		$modes['iadd']   = array('folder' => 'server');
-		$modes['iedit']  = array('folder' => 'server');
-		$modes['kadd']   = array('folder' => 'server');
-		$modes['edit']   = array('folder' => 'plugins');
-		$modes['select'] = array('folder' => 'plugins');
-
-		$plugin = $this->response->html->request()->get('aplugin');
-		$name   = $plugin;
-		$class  = $plugin;
-		if($this->response->html->request()->get('acontroller') !== '') {
-			$class = $this->response->html->request()->get('acontroller');
-			$name  = $class;
-		}
-		$class  = str_replace('-', '_', $class).'_controller';
-
-		// handle new response object
-		$response = $this->response->response();
-		$response->id = 'aload';
-		unset($response->params['appliance[sort]']);
-		unset($response->params['appliance[order]']);
-		unset($response->params['appliance[limit]']);
-		unset($response->params['appliance[offset]']);
-		unset($response->params['appliance_filter']);
-		$response->add('aplugin', $plugin);
-		$response->add('acontroller', $name);
-		$response->add($this->actions_name, 'load_'.$mode);
-
-		$path    = $this->openqrm->get('webdir').'/'.$modes[$mode]['folder'].'/'.$plugin.'/class/'.$name.'.controller.class.php';
-		$role = $this->openqrm->role($response);
-		$data = $role->get_plugin($class, $path);
-		$data->pluginroot = '/'.$modes[$mode]['folder'].'/'.$plugin;
-		return $data;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.edit.class.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.edit.class.php
deleted file mode 100644
index 5b9f6e7..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.edit.class.php
+++ /dev/null
@@ -1,473 +0,0 @@
-<?php
-/**
- * Appliance edit
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class appliance_edit
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'appliance_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "appliance_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'appliance_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'appliance_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-		$this->user       = $openqrm->user();
-		$this->controller = $openqrm;
-
-
-
-		$wid = $this->response->html->request()->get('appliance_id');
-		if($wid === '' && $this->response->html->request()->get('appliance_wizard_id') !== '') {
-			$wid = $this->response->html->request()->get('appliance_wizard_id');
-		}
-		$this->apliance_id = $wid;
-		$this->appliance  = new appliance();
-		$this->appliance->get_instance_by_id($wid);
-		$this->response->add('appliance_id', $wid);
-
-
-		#$this->response->add('appliance_id', $this->response->html->request()->get('appliance_id'));
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->edit();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-
-		// get plugins
-		$plugins = $this->__plugins();
-
-		$t = $this->response->html->template($this->tpldir.'/appliance-edit.tpl.php');
-		$t->add(sprintf($this->lang['title'], $response->name), 'label');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		//$t->add($plugins);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($plugins, 'plugins');
-/*
-		$t->add($this->lang['lang_ha'], 'lang_ha');
-		$t->add($this->lang['lang_misc'], 'lang_misc');
-		$t->add($this->lang['lang_mgmt'], 'lang_mgmt');
-		$t->add($this->lang['lang_moni'], 'lang_moni');
-		$t->add($this->lang['lang_dep'], 'lang_dep');
-		$t->add($this->lang['lang_net'], 'lang_net');
-		$t->add($this->lang['lang_enter'], 'lang_enter');
-*/
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function edit() {
-		$response  = $this->get_response();
-		$form      = $response->form;
-		$id        = $this->apliance_id;
-		if($id !== '') {
-			$appliance = new appliance();
-			$appliance->get_instance_by_id($id);
-			if(!$form->get_errors() && $this->response->submit()) {
-				// update appliance
-				$appliance->update($id, $form->get_request());
-				$response->msg = sprintf($this->lang['msg'], $appliance->name);
-			} 
-			else if($form->get_errors()) {
-				$response->error = implode('<br>', $form->get_errors());
-			}
-			$response->name = $appliance->name;
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'edit');
-		$id = $this->apliance_id;
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$appliance  = new appliance();
-		$appliance->get_instance_by_id($id);
-
-		$resource = new resource();
-		$list     = $resource->get_list();
-
-		$cpus[0] = array( 0, $this->lang['option_auto']);
-		$cspe[0] = array( 0, $this->lang['option_auto']);
-		$cmod[0] = array( 0, $this->lang['option_auto']);
-		$nics[0] = array( 0, $this->lang['option_auto']);
-		$memt[0] = array( 0, $this->lang['option_auto']);
-		$swap[0] = array( 0, $this->lang['option_auto']);
-
-		foreach ($list as $v) {
-			$resource->get_instance_by_id($v['resource_id']);
-			$c  = $resource->cpunumber;
-			$cs = $resource->cpuspeed;
-			$cm = $resource->cpumodel;
-			$n  = $resource->nics;
-			$m  = $resource->memtotal;
-			$s  = $resource->swaptotal;
-			
-			if(isset($c) && $c  != '0')                { $cpus[$c]  = array($c, $c);   }
-			if(isset($cs) && $cs != '0')               { $cspe[$cs] = array($cs, $cs); }
-			if(isset($cm) && $cm != '0' && $cm !== '') { $cmod[$cm] = array($cm, $cm); }
-			if(isset($n) && $n  != '0')                { $nics[$n]  = array($n, $n);   }
-			if(isset($m) && $m  != '0')                { $memt[$m]  = array($m, $m);   }
-			if(isset($s) && $s != '0')                 { $swap[$s]  = array($s, $s);   }
-		}
-
-		ksort($cpus, SORT_NUMERIC);
-		ksort($cspe, SORT_NUMERIC);
-		ksort($cmod, SORT_STRING);
-		ksort($nics, SORT_NUMERIC);
-		ksort($memt, SORT_NUMERIC);
-		ksort($swap, SORT_NUMERIC);
-
-		$d['cpus']['label']                        = $this->lang['form_cpus'];
-		$d['cpus']['object']['type']               = 'htmlobject_select';
-		$d['cpus']['object']['attrib']['index']    = array(0, 1);
-		$d['cpus']['object']['attrib']['name']     = 'appliance_cpunumber';
-		$d['cpus']['object']['attrib']['options']  = $cpus;
-		$d['cpus']['object']['attrib']['selected'] = array($appliance->cpunumber);
-
-		$d['cpuspeed']['label']                        = $this->lang['form_cpuspeed'];
-		$d['cpuspeed']['object']['type']               = 'htmlobject_select';
-		$d['cpuspeed']['object']['attrib']['index']    = array(0, 1);
-		$d['cpuspeed']['object']['attrib']['name']     = 'appliance_cpuspeed';
-		$d['cpuspeed']['object']['attrib']['options']  = $cspe;
-		$d['cpuspeed']['object']['attrib']['selected'] = array($appliance->cpuspeed);
-
-		$d['cpumodel']['label']                        = $this->lang['form_cpumodel'];
-		$d['cpumodel']['object']['type']               = 'htmlobject_select';
-		$d['cpumodel']['object']['attrib']['index']    = array(0, 1);
-		$d['cpumodel']['object']['attrib']['name']     = 'appliance_cpumodel';
-		$d['cpumodel']['object']['attrib']['options']  = $cmod;
-		$d['cpumodel']['object']['attrib']['selected'] = array($appliance->cpumodel);
-
-		$d['nics']['label']                        = $this->lang['form_nics'];
-		$d['nics']['object']['type']               = 'htmlobject_select';
-		$d['nics']['object']['attrib']['index']    = array(0, 1);
-		$d['nics']['object']['attrib']['name']     = 'appliance_nics';
-		$d['nics']['object']['attrib']['options']  = $nics;
-		$d['nics']['object']['attrib']['selected'] = array($appliance->nics);
-
-		$d['memory']['label']                        = $this->lang['form_memory'];
-		$d['memory']['object']['type']               = 'htmlobject_select';
-		$d['memory']['object']['attrib']['index']    = array(0, 1);
-		$d['memory']['object']['attrib']['name']     = 'appliance_memtotal';
-		$d['memory']['object']['attrib']['options']  = $memt;
-		$d['memory']['object']['attrib']['selected'] = array($appliance->memtotal);
-
-		$d['swap']['label']                        = $this->lang['form_swap'];
-		$d['swap']['object']['type']               = 'htmlobject_select';
-		$d['swap']['object']['attrib']['index']    = array(0, 1);
-		$d['swap']['object']['attrib']['name']     = 'appliance_swaptotal';
-		$d['swap']['object']['attrib']['options']  = $swap;
-		$d['swap']['object']['attrib']['selected'] = array($appliance->swaptotal);
-
-		$resource = new resource();
-		$resource_hostname = '';
-		if(isset($appliance->resources) && $appliance->resources !== '') {
-			if ($appliance->resources >= 0) {
-				$res = $resource->get_instance_by_id($appliance->resources);
-				$resource_hostname = $res->hostname;
-			} else {
-				$resource_hostname = 'auto-select';
-			}
-		}
-
-		$a = $response->html->a();
-		$a->name  = '';
-		#$a->label = '<img src="'.$this->controller->get('baseurl').'/img/resource.png">&#160;'.sprintf($this->lang['action_resource'], $resource_hostname);
-		$a->label = $resource_hostname;
-		$a->css ="manage";
-		$a->title = sprintf($this->lang['action_resource'], $resource_hostname);
-		$a->href  = $response->get_url($this->actions_name, 'step2');
-		$d['resource']['label'] = $this->lang['form_resource'];
-		$d['resource']['object'] = $a;
-
-		$img = new image();
-		$img = $img->get_instance_by_id($appliance->imageid);
-		$a = $response->html->a();
-		$a->name  = '';
-		#$a->label = '<img src="'.$this->controller->get('baseurl').'/img/image.png">&#160;'.sprintf($this->lang['action_image'], $img->name) ;
-		$a->label = $img->name;
-		$a->css ="manage";
-		$a->title = sprintf($this->lang['action_image'], $img->name) ;
-		$a->href  = $response->get_url($this->actions_name, 'step3');
-		$d['image']['label'] = $this->lang['form_image'];
-		$d['image']['object'] = $a;
-
-		$kern = new kernel();
-		$kern = $kern->get_instance_by_id($appliance->kernelid);
-		$a = $response->html->a();
-		$a->name  = '';
-		#$a->label = '<img src="'.$this->controller->get('baseurl').'/img/image.png">&#160;'.sprintf($this->lang['action_image'], $img->name) ;
-		$a->label = $kern->name;
-		$a->css ="manage";
-		$a->title = sprintf($this->lang['action_kernel'], $kern->name) ;
-		$a->href  = $response->get_url($this->actions_name, 'step4');
-		$d['kernel']['label'] = $this->lang['form_kernel'];
-		$d['kernel']['object'] = $a;
-
-		$virtualization = new virtualization();
-		if(isset($appliance->resources) && $appliance->resources !== '') {
-			$resource->get_instance_by_id($appliance->resources);
-		}
-		$vl = array();
-		$list  = $virtualization->get_list();
-		foreach ($list as $v) {
-			if(strpos($v['label'], ' VM') === false) {
-				$vl[] = array($v['label'], $v['value']);
-			} else {
-				if($v['value'] === $resource->vtype) {
-					$hide_virtualization = true;
-					break;
-				}
-			}
-		}
-		asort($vl);
-
-		if(isset($hide_virtualization)) {
-			$virtualization->get_instance_by_id($resource->vtype);
-			$div = $this->response->html->div();
-			$div->name = '';
- 			$div->add($virtualization->name);
-			$d['virtualization']['label'] = $this->lang['form_virtualization'];
-			$d['virtualization']['object'] = $div;
-		} else {
-			$d['virtualization']['label']                        = $this->lang['form_virtualization'];
-			$d['virtualization']['object']['type']               = 'htmlobject_select';
-			$d['virtualization']['object']['attrib']['index']    = array(1,0);
-			$d['virtualization']['object']['attrib']['name']     = 'appliance_virtualization';
-			$d['virtualization']['object']['attrib']['options']  = $vl;
-			$d['virtualization']['object']['attrib']['selected'] = array($appliance->virtualization);
-		}
-
-		$d['capabilities']['label']                         = $this->lang['form_capabilities'];
-		$d['capabilities']['object']['type']                = 'htmlobject_input';
-		$d['capabilities']['object']['attrib']['type']      = 'text';
-		$d['capabilities']['object']['attrib']['name']      = 'appliance_capabilities';
-		$d['capabilities']['object']['attrib']['value']     = $appliance->capabilities;
-		$d['capabilities']['object']['attrib']['maxlength'] = 1000;
-
-		$d['comment']['label']                         = $this->lang['form_comment'];
-		$d['comment']['validate']['regex']             = $this->openqrm->regex['comment'];
-		$d['comment']['validate']['errormsg']          = sprintf($this->lang['error_comment'], $this->openqrm->regex['comment']);
-		$d['comment']['object']['type']                = 'htmlobject_textarea';
-		$d['comment']['object']['attrib']['name']      = 'appliance_comment';
-		$d['comment']['object']['attrib']['value']     = $appliance->comment;
-		$d['comment']['object']['attrib']['maxlength'] = 255;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Plugins
-	 *
-	 * @access protected
-	 * @return array
-	 */
-	//--------------------------------------------
-	function __plugins() {
-
-/*
-		$ha    = array();
-		$net   = array();
-		$mgmt  = array();
-		$moni  = array();
-		$misc  = array();
-		$dep   = array();
-		$enter = array();
-*/
-
-		$return = $this->response->html->div();
-		
-		$plugin = new plugin();
-		$plugins = $plugin->available();
-		foreach ($plugins as $k => $v) {
-			$p = $plugin->get_config($v);
-			$link = '';
-			$hook = $this->openqrm->get('webdir')."/plugins/".$v."/openqrm-".$v."-appliance-edit-hook.php";
-			if ($this->file->exists($hook)) {
-				require_once($hook);
-				$function = str_replace("-", "_", 'get_'.$v.'_appliance_edit');
-				if(function_exists($function)) {
-					$id = $this->apliance_id;
-					$link = $function($id, $this->openqrm, $this->response);
-					if(is_object($link)) {
-						$link->label = ucfirst($v);
-						$link->handler = 'onclick="wait();"';
-						$link->css ="edit";
-						$link->title = preg_replace('~(.*?)<a.*>(.*?)</a>(.*?)~i', '$1$2$3', $p['description']);
-					}
-				}
-			}
-			if(isset($link) && $link !== '') {
-				$return->add($link);
-			}
-		}
-		return $return;
-
-
-/*
-			if(isset($link) && $link !== '') {
-				switch($p['type']) {
-					case 'HA':
-						$ha[] = $link;
-					break;
-					case 'monitoring':
-						$moni[] = $link;
-					break;
-					case 'management':
-						$mgmt[] = $link;
-					break;
-					case 'misc':
-						$misc[] = $link;
-					break;
-					case 'network':
-						$net[] = $link;
-					break;
-					case 'deployment':
-						$dep[] = $link;
-					break;
-					case 'enterprise':
-						$enter[] = $link;
-					break;
-				}
-			}
-		}
-
-		if(count($ha) < 1) {
-			$ha[] = $this->lang['no_plugin_available'];
-		}
-		if(count($net) < 1) {
-			$net[] = $this->lang['no_plugin_available'];
-		}
-		if(count($mgmt) < 1) {
-			$mgmt[] = $this->lang['no_plugin_available'];
-		}
-		if(count($moni) < 1) {
-			$moni[] = $this->lang['no_plugin_available'];
-		}
-		if(count($misc) < 1) {
-			$misc[] = $this->lang['no_plugin_available'];
-		}
-		if(count($dep) < 1) {
-			$dep[] = $this->lang['no_plugin_available'];
-		}
-		if(count($enter) < 1) {
-			$enter[] = $this->lang['no_plugin_available'];
-		}
-
-
-		return array(
-				'plugin_ha' => $ha,
-				'plugin_net' => $net,
-				'plugin_mgmt' => $mgmt,
-				'plugin_moni' => $moni,
-				'plugin_dep' => $dep,
-				'plugin_misc' => $misc,
-				'plugin_enter' => $enter
-			);
-*/
-
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.redirect.class.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.redirect.class.php
deleted file mode 100644
index 7e980fb..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.redirect.class.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Appliance Redirect
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class appliance_redirect
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'appliance_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "appliance_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'appliance_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'appliance_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$plugin = $this->response->html->request()->get('target');
-		$class  = $this->openqrm->get('basedir').'/plugins/'.$plugin.'/class/'.$plugin.'.controller.class.php';
-		#echo $class;
-		if($this->file->exists($class)) {
-			$url = $this->response->html->thisfile.'?plugin='.$plugin;
-		} else {
-			$url = $this->response->html->thisfile.'?iframe='.$this->openqrm->get('baseurl').'/plugins/'.$plugin.'/'.$plugin.'-manager.php';
-		}
-		if(isset($url)) {
-			$this->response->redirect($url);
-		}
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.release.class.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.release.class.php
deleted file mode 100644
index d5a9ab6..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.release.class.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-/**
- * Appliance Release
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class appliance_release
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'appliance_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "appliance_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'appliance_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'appliance_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->release();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-
-		$t = $this->response->html->template($this->tpldir.'/appliance-release.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Release
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function release() {
-
-		$response = $this->get_response();
-		$id        = $this->response->html->request()->get('appliance_id');
-		$form     = $response->form;
-		$appliance = new appliance();
-		if( $id !== '' ) {
-		    $appliance = $appliance->get_instance_by_id($id);
-
-			// TODO only appliances which are not active
-
-
-		    // if resource != openqrm
-		    if ($appliance->resources === 0) {
-				$errors[] = sprintf($this->lang['msg_openqrm'], $id);
-//				continue;
-		    }
-		    
-		    $fields['appliance_resources'] = -1;
-		    $appliance->update($id, $fields);
-		    $form->remove($this->identifier_name.'['.$id.']');
-		    $message[] = sprintf($this->lang['msg'], $id);
-
-		    if(count(@$errors) === 0) {
-			    $response->msg = join('<br>', $message);
-		    } else {
-			    $msg = array_merge($errors, $message);
-			    $response->error = join('<br>', $msg);
-		    }
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		// add $this->identifier_name to response
-		$response->add($this->identifier_name.'[]', $response->html->request()->get($this->identifier_name));
-		$form = $response->get_form($this->actions_name, 'release');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.remove.class.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.remove.class.php
deleted file mode 100644
index 52369b3..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.remove.class.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/**
- * Remove appliance
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class appliance_remove
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'appliance_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "appliance_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'appliance_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'appliance_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->remove();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-
-		$t = $this->response->html->template($this->tpldir.'/appliance-remove.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function remove() {
-
-		$response = $this->get_response();
-		$appliances = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		$appliance = new appliance();
-		if( $appliances !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($appliances as $id) {
-				$appliance = $appliance->get_instance_by_id($id);
-				$d['param_f'.$i]['label']                       = $appliance->name;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $id;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;		
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$errors     = array();
-				$message    = array();
-				foreach($appliances as $key => $id) {
-					$appliance = $appliance->get_instance_by_id($id);
-					// allow removing active openQRM appliances
-					if ($appliance->resources != 0) {
-						// check that the appliance is stopped before
-						if ($appliance->state == 'active') {
-							$message[] = sprintf($this->lang['msg_still_active'], $id);
-							continue;
-						}
-					}
-					$appliance->remove($id);
-					$form->remove($this->identifier_name.'['.$key.']');
-					$message[] = sprintf($this->lang['msg'], $id);
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		// add $this->identifier_name to response
-		$response->add($this->identifier_name.'[]', $response->html->request()->get($this->identifier_name));
-		$form = $response->get_form($this->actions_name, 'remove');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.select.class.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.select.class.php
deleted file mode 100644
index 8cb7c82..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.select.class.php
+++ /dev/null
@@ -1,473 +0,0 @@
-<?php
-/**
- * Appliance Select
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class appliance_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'appliance_action';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'appliance_identifier';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "appliance_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'appliance_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-		$this->user     = $openqrm->user();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$data = $this->select();
-
-		$t = $this->response->html->template($this->tpldir.'/appliance-select.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($data);
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['lang_filter'], 'lang_filter');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select() {
-
-		$d = array();
-		$h = array();
-		$h['appliance_state']['title'] = $this->lang['table_state'];
-		$h['appliance_id']['title'] = $this->lang['table_id'];
-		$h['appliance_id']['hidden'] = true;
-		$h['appliance_name']['title'] = $this->lang['table_name'];
-		$h['appliance_name']['hidden'] = true;
-		$h['appliance_values']['title'] = '&#160;';
-		$h['appliance_values']['sortable'] = false;
-		$h['appliance_comment']['title'] ='&#160;';
-		$h['appliance_comment']['sortable'] = false;
-		$h['appliance_virtualization']['title'] ='Type';
-		$h['appliance_virtualization']['sortable'] = true;
-		$h['appliance_virtualization']['hidden'] = true;
-		$h['appliance_edit']['sortable'] = false;
-
-		$appliance = new appliance();
-		$params  = $this->response->get_array($this->actions_name, 'select');
-		$b       = array();
-
-		// unset unnecessary params
-		unset($params['resource_type_filter']);
-		unset($params['resource_filter']);
-		unset($params['appliance[sort]']);
-		unset($params['appliance[order]']);
-		unset($params['appliance[limit]']);
-		unset($params['appliance[offset]']);
-
-		$table = $this->response->html->tablebuilder('appliance', $params);
-		$table->offset = 0;
-		$table->sort = 'appliance_id';
-		$table->limit = 20;
-		$table->order = 'ASC';
-		$table->max = $appliance->get_count();
-		$table->init();
-
-		// handle table params
-		#$tps = $table->get_params();
-		$tp = '';
-		#foreach($tps['appliance'] as $k => $v) {
-		#	$tp .= '&appliance['.$k.']='.$v;
-		#}
-
-		$resource_filter = null;
-		if( $this->response->html->request()->get('resource_filter') !== '') {
-			$resource = $this->openqrm->resource();
-			$resource_filter = array();
-			$ar = $resource->find_resource($this->response->html->request()->get('resource_filter'));
-			if(count($ar) > 0) {
-				foreach($ar as $k => $v) {
-					$resource_filter[] = $v['resource_id'];
-				}
-			}
-		}
-
-		$disabled = array();
-		$appliances = $appliance->display_overview(0, 10000, $table->sort, $table->order);
-		foreach ($appliances as $index => $appliance_db) {
-			
-			$appliance = new appliance();
-			$appliance->get_instance_by_id($appliance_db["appliance_id"]);
-			$resource = new resource();
-			$resource->get_instance_by_id($appliance->resources);
-			$appliance_resources=$appliance_db["appliance_resources"];
-			$kernel = new kernel();
-			$kernel->get_instance_by_id($appliance_db["appliance_kernelid"]);
-			$image = new image();
-			$image->get_instance_by_id($appliance_db["appliance_imageid"]);
-			$virtualization = new virtualization();
-			$virtualization->get_instance_by_id($appliance_db["appliance_virtualization"]);
-			$appliance_virtualization_name = $virtualization->name;
-			$virtualization_plugin_name = $virtualization->get_plugin_name();
-			$resource_is_local_server = false;
-			$edit_resource_ip = '';
-
-			if ($this->response->html->request()->get('resource_type_filter') === '' || ($this->response->html->request()->get('resource_type_filter') == $resource->vtype )) {
-
-				// Skip all resources not in $resource_filter
-				if(isset($resource_filter)) {
-					if(!in_array($resource->id, $resource_filter)) {
-						continue;
-					}
-				}
-
-				if ($appliance_resources >=0) {
-					// an appliance with a pre-selected resource
-					$resource->get_instance_by_id($appliance_resources);
-					$resource_state_icon = '<span class="pill '.$resource->state.'">'.$resource->state.'</span>';
-					// idle ?
-					if (("$resource->imageid" == "1") && ("$resource->state" == "active")) {
-						$resource_state_icon = '<span class="pill idle">idle</span>';
-					}
-					// link to resource list
-					$virtualization_vm_action_name = $virtualization->name;
-					if (strstr($resource->capabilities, "TYPE=local-server")) {
-						$resource_is_local_server = true;
-					}
-					$appliance_resources_str = '';
-					if (strpos($virtualization->type, "-vm")) {
-						$host_resource = new resource();
-						if(isset($resource->vhostid) && $resource->vhostid !== '') {
-							$host_resource->get_instance_by_id($resource->vhostid);
-							$host_virtualization = new virtualization();
-							$host_virtualization_name = $virtualization->get_plugin_name();
-							$host_virtualization->get_instance_by_type($host_virtualization_name);
-							$host_appliance = new appliance();
-							$host_appliance->get_instance_by_virtualization_and_resource($host_virtualization->id, $resource->vhostid);
-							$link  = '?base=appliance&appliance_action=load_select';
-							$link .= '&aplugin='.$virtualization_plugin_name;
-							$link .= '&amp;acontroller='.$virtualization_plugin_name.'-vm';
-							$link .= '&amp;'.$virtualization_plugin_name.'_vm_action=update';
-							$link .= '&amp;appliance_id='.$host_appliance->id;
-							$link .= '&amp;vm='.$resource->hostname;
-							$appliance_resources_str = '<a href="'.$this->response->html->thisfile.$link.'" onclick="wait();">'.$resource->hostname.'</a> '.$resource_state_icon;
-						}
-					}
-					else {
-						$appliance_resources_str = $resource->hostname.' '.$resource_state_icon;
-					}
-					// check for local VMs without an IP 
-					$pos = strpos($virtualization->type, 'vm-local');
-					if ($pos !== false) {
-						$a = $this->response->html->a();
-						$a->title = $this->lang['action_edit'].' IP';
-						$a->label = $resource->ip;
-						$a->css   = 'edit';
-						$a->href  = '?base=resource&resource_filter=&resource_type_filter=&resource_action=edit&resource_id='.$resource->id;
-						$edit_resource_ip = $a->get_string();
-					 }
-					
-				} else {
-					// an appliance with resource auto-select enabled
-					$appliance_resources_str = "auto-select";
-				}
-
-				// active or inactive
-				$resource_icon_default="/openqrm/base/img/appliance.png";
-				$active_state_icon='<span class="pill active">active</span>';
-				$inactive_state_icon='<span class="pill inactive">inactive</span>';
-			
-				if ($appliance->stoptime == 0 || $appliance_resources == 0)  {
-					$state_icon=$active_state_icon;
-				} else {
-					$state_icon=$inactive_state_icon;
-				}
-				// no resource ip yet ?
-				if ($resource->ip == '0.0.0.0') {
-					$state_icon = '<span class="pill transition">transition</span>';
-				}
-
-				// link to image edit
-				if ($image->id > 0) {
-					$link  = '?base=image';
-					$link .= '&amp;image_action=edit';
-					$link .= '&amp;image_id='.$image->id;
-					$image_edit_link = '<a href="'.$this->response->html->thisfile.$link.'" onclick="wait();">'.substr($image->name, 0, 80).'</a>';
-				} else {
-					$image_edit_link = $image->name;
-				}
-
-				// release resource
-				$release_resource = '';
-				if ($appliance->stoptime == 0 || $appliance_resources == 0)  {
-					$release_resource = '';
-				} else {
-					if ($appliance->resources != -1) {
-						$a = $this->response->html->a();
-						$a->label = $this->lang['action_release'];
-						$a->title = $this->lang['resource_release'];
-						$a->css   = 'enable';
-						$a->href  = $this->response->get_url($this->actions_name, 'release').'&appliance_id='.$appliance->id.''.$tp;
-						$release_resource = $a->get_string();
-					}
-				}
-
-				$str = '<strong>'.$this->lang['table_id'].':</strong> '.$appliance_db["appliance_id"].'<br>
-						<strong>'.$this->lang['table_name'].':</strong> '.$appliance_db["appliance_name"].'<br>
-						<strong>Type:</strong> '.$appliance_virtualization_name.'<br>
-						<strong>Kernel:</strong> '.$kernel->name.'<br>
-						<strong>Image:</strong> '.$image_edit_link.'<br>
-						<strong>Resource:</strong> '.$appliance_resources_str.'<br>
-						<strong>IP:</strong> '.$resource->ip;
-
-				if(strpos($virtualization->type, "-vm") && isset($resource->vhostid) && ($resource->vhostid != '')) {
-					$happliance = new appliance();
-					$hresource = $happliance->get_ids_per_resource($resource->vhostid);
-					if(isset($hresource[0]['appliance_id'])) {
-						$happliance->get_instance_by_id($hresource[0]['appliance_id']);
-						$link  = '?base=appliance';
-						$link .= '&amp;appliance_action=edit';
-						$link .= '&amp;appliance_id='.$happliance->id;
-						$href  = '<a href="'.$this->response->html->thisfile.$link.'" onclick="wait();">'.$happliance->name.'</a>';
-						$str  .= '<br><strong>Host:</strong> '.$href;
-					}
-				}
-
-				// appliance edit
-				$a = $this->response->html->a();
-				$a->title   = $this->lang['action_edit'];
-				$a->label   = $this->lang['action_edit'];
-				$a->handler = 'onclick="wait();"';
-				$a->css     = 'edit';
-				$a->href    = $this->response->get_url($this->actions_name, 'edit').'&appliance_id='.$appliance->id.''.$tp;
-				$strEdit    = $a->get_string();
-
-				// appliance start
-				$strStart = '';
-				if($appliance_resources !== '0') {
-					$a = $this->response->html->a();
-					$a->handler = 'onclick="wait();"';
-					if ($appliance->stoptime == 0) {
-						$a->title = $this->lang['action_stop'];
-						$a->label = $this->lang['action_stop'];
-						$a->css   = 'disable';
-						$a->href  = $this->response->get_url($this->actions_name, 'stop').'&'.$this->identifier_name.'[]='.$appliance->id.''.$tp;
-					} else {
-						$a->title = $this->lang['action_start'];
-						$a->label = $this->lang['action_start'];
-						$a->css   = 'enable';
-						$a->href  = $this->response->get_url($this->actions_name, 'start').'&'.$this->identifier_name.'[]='.$appliance->id.''.$tp;
-					}
-					$strStart = $a->get_string();
-				}
-
-				// build the plugin link section
-				$appliance_link_section = '';
-				// add link to continue if appliance has unfinished wizard
-				$disabled = array();
-				if(isset($appliance->wizard) && strpos($appliance->wizard, 'wizard') !== false) {
-					$params = explode(',', $appliance->wizard);
-					$wizard_step = explode('=', $params[0]);
-					$wizard_user = explode('=', $params[1]);
-					if ($wizard_user[1] === $this->user->name) {
-						// continue button
-						$a = $this->response->html->a();
-						$a->title   = $this->lang['action_continue'];
-						$a->label   = $this->lang['action_continue'];
-						$a->handler = 'onclick="wait();"';
-						$a->css     = 'badge continue';
-						$a->href    = $this->response->get_url($this->actions_name, $wizard_step[1]).'&appliance_wizard_id='.$appliance->id.''.$tp;
-						$appliance_comment = $a->get_string();
-					} else {
-						$appliance_comment = sprintf($this->lang['appliance_create_in_progress'], $wizard_user[1]);
-					}
-					// disable all buttons
-					$disabled[] = $appliance->id;
-					$strEdit = '';
-					$strStart = '';
-					$strStop = '';
-					$release_resource = '';
-				} else {
-					$plugin = new plugin();
-					$enabled_plugins = $plugin->enabled();
-					foreach ($enabled_plugins as $index => $plugin_name) {
-						$plugin_appliance_link_section_hook = $this->openqrm->get('webdir')."/plugins/".$plugin_name."/openqrm-".$plugin_name."-appliance-link-hook.php";
-						if (file_exists($plugin_appliance_link_section_hook)) {
-							require_once "$plugin_appliance_link_section_hook";
-							$appliance_get_link_function = str_replace("-", "_", "get_"."$plugin_name"."_appliance_link");
-							if(function_exists($appliance_get_link_function)) {
-								$p = $plugin->get_config($plugin_name);
-								$alink = $appliance_get_link_function($appliance->id);
-								if(is_object($alink)) {
-								//	$alink->handler = $alink->handler.' onclick="wait();"';
-									$alink->css = 'enable';
-									$alink->title = preg_replace('~(.*?)<a.*>(.*?)</a>(.*?)~i', '$1$2$3', $p['description']);
-									$alink = $alink->get_string();
-								}
-								$appliance_link_section .= $alink;
-							}
-						}
-					}
-					$appliance_link_section = $edit_resource_ip.' '.$appliance_link_section;
-					if($appliance_db["appliance_comment"] !== '') {
-						$appliance_comment  = $appliance_db["appliance_comment"];
-						$appliance_comment .= "<hr>";
-						$appliance_comment .= $appliance_link_section;
-					} else {
-						$appliance_comment = $appliance_link_section;
-					}
-				}
-
-				$b[] = array(
-					'appliance_state' => $state_icon,
-					'appliance_id' => $appliance_db["appliance_id"],
-					'appliance_name' => $appliance_db["appliance_name"],
-					'appliance_values' => $str,
-					'appliance_comment' => $appliance_comment,
-					'appliance_virtualization' => $appliance_db["appliance_virtualization"],
-					'appliance_edit' => $strEdit.''.$strStart.''.$release_resource,
-				);
-			}
-
-		}
-
-		// Filter
-		$virtulization_types = new virtualization();
-		$list = $virtulization_types->get_list();
-		$filter = array();
-		$filter[] = array('', '');
-		foreach( $list as $l) {
-			$filter[] = array( $l['label'], $l['value']);
-		}
-		asort($filter);
-		$select = $this->response->html->select();
-		$select->add($filter, array(1,0));
-		$select->name = 'resource_type_filter';
-		$select->handler = 'onchange="wait();this.form.submit();return false;"';
-		$select->selected = array($this->response->html->request()->get('resource_type_filter'));
-		$box1 = $this->response->html->box();
-		$box1->add($select);
-		$box1->id = 'resource_type_filter';
-		$box1->css = 'htmlobject_box';
-		$box1->label = $this->lang['lang_type_filter'];
-
-		// Resource Filter
-		$input = $this->response->html->input();
-		$input->name = 'resource_filter';
-		$input->value = $this->response->html->request()->get('resource_filter');
-		$input->title = $this->lang['lang_filter_title'];
-		$box2 = $this->response->html->box();
-		$box2->add($input);
-		$box2->id = 'resource_filter';
-		$box2->css = 'htmlobject_box';
-		$box2->label = $this->lang['lang_filter'];
-
-		$add = $this->response->html->a();
-		$add->title   = $this->lang['action_add'];
-		$add->label   = $this->lang['action_add'];
-		$add->handler = 'onclick="wait();"';
-		$add->css     = 'add';
-		$add->href    = $this->response->get_url($this->actions_name, "step1").''.$tp;
-
-		$table->id = 'Tabelle';
-		$table->css = 'htmlobject_table';
-		$table->border = 1;
-		$table->cellspacing = 0;
-		$table->cellpadding = 3;
-		$table->autosort = true;
-		$table->sort_link = false;
-		$table->max = count($b);
-		$table->head = $h;
-		$table->body = $b;
-		#$table->form_action = $this->response->html->thisfile;
-		$table->actions_name = $this->actions_name;
-		$table->actions = array(
-			array('start' => $this->lang['action_start']),
-			array('stop' => $this->lang['action_stop']),
-			array('remove' => $this->lang['action_remove'])
-		);
-		$table->identifier = 'appliance_id';
-		$table->identifier_name = $this->identifier_name;
-		$table->identifier_disabled = $disabled;
-		#$table->limit_select = array(
-		#	array("value" => 10, "text" => 10),
-		#	array("value" => 20, "text" => 20),
-		#	array("value" => 30, "text" => 30),
-		#	array("value" => 50, "text" => 50),
-		#	array("value" => 100, "text" => 100),
-		#);
-
-		$d['form']   = $this->response->get_form($this->actions_name, 'select', false)->get_elements();
-		$d['add']    = $add->get_string();
-		$d['table']  = $table;
-		$d['resource_type_filter'] = $box1->get_string();
-		$d['resource_filter'] = $box2->get_string();
-		return $d;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.start.class.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.start.class.php
deleted file mode 100644
index e573e62..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.start.class.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/**
- * Appliance Start
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class appliance_start
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'appliance_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "appliance_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'appliance_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'appliance_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->start();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-			return $response;
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-
-		$t = $this->response->html->template($this->tpldir.'/appliance-start.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Start
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function start() {
-
-		$response = $this->get_response();
-		$appliances = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		$appliance = new appliance();
-		if( $appliances !== '' ) {
-
-			// auto submit
-			// $_REQUEST[$response->id]['submit'] = true;
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($appliances as $id) {
-				$appliance = $appliance->get_instance_by_id($id);
-				$d['param_f'.$i]['label']                       = $appliance->name;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $id;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$errors     = array();
-				$message    = array();
-				foreach($appliances as $key => $id) {
-					$appliance = $appliance->get_instance_by_id($id);
-
-					$resource = new resource();
-					if ($appliance->resources <0) {
-						// an appliance with resource auto-select enabled
-						$appliance_virtualization=$appliance->virtualization;
-						$appliance->find_resource($appliance_virtualization);
-						$appliance->get_instance_by_id($id);
-						if ($appliance->resources <0) {
-							$errors[] = sprintf($this->lang['msg_no_resource'], $id);
-							continue;
-						}
-					}
-					$resource->get_instance_by_id($appliance->resources);
-					if ($appliance->resources == 0) {
-						$errors[] = sprintf($this->lang['msg_always_active'], $id);
-						continue;
-					}
-					if (!strcmp($appliance->state, "active"))  {
-						$errors[] = sprintf($this->lang['msg_already_active'], $id);
-						continue;
-					}
-					// check that resource is idle
-					$app_resource = new resource();
-					$app_resource->get_instance_by_id($appliance->resources);
-					// resource has ip ?
-					if (!strcmp($app_resource->ip, "0.0.0.0")) {
-						$errors[] = sprintf($this->lang['msg_reource_no_ip'], $appliance->resources);
-						$response->redirect('?base=resource&resource_filter=&resource_type_filter=&resource_action=edit&resource_id='.$app_resource->id);
-						continue;
-					}
-					// resource assinged to imageid 1 ?
-					if ($app_resource->imageid != 1) {
-						$errors[] = sprintf($this->lang['msg_already_active'], $appliance->resources, $id);
-						continue;
-					}
-					// resource active
-					if (strcmp($app_resource->state, "active")) {
-						$app_resource_virtualization = new virtualization();
-						$app_resource_virtualization->get_instance_by_id($app_resource->vtype);
-						// allow waking up physical systems via out-of-band-management plugins
-						if (!strstr($app_resource_virtualization->name, "Host")) {
-							if ($app_resource_virtualization->id != 1) {
-								$errors[] = sprintf($this->lang['msg_already_active'], $appliance->resources, $id);
-								continue;
-							}
-						}
-					}
-					// if no errors then we start the appliance
-					$kernel = new kernel();
-					$kernel->get_instance_by_id($appliance->kernelid);
-					// send command to the openQRM-server
-					$resource->send_command("127.0.0.1", "openqrm_assign_kernel ".$resource->id." ".$resource->mac." ".$kernel->name);
-					$appliance->start();
-					$form->remove($this->identifier_name.'['.$key.']');
-					$message[] = sprintf($this->lang['msg'], $id);
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		// add $this->identifier_name to response
-		$response->add($this->identifier_name.'[]', $response->html->request()->get($this->identifier_name));
-		$form = $response->get_form($this->actions_name, 'start');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.step1.class.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.step1.class.php
deleted file mode 100644
index e172eab..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.step1.class.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
- * Appliance step1 (name)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class appliance_step1
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'appliance_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "appliance_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'appliance_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'appliance_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-		$this->user       = $openqrm->user();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->add();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'step2', $this->message_param, $response->msg).'&appliance_wizard_id='.$response->appliance_wizard_id
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-
-		$t = $this->response->html->template($this->tpldir.'/appliance-step1.tpl.php');
-		$t->add($this->lang['title'], 'label');
-		$t->add($this->lang['info'], 'info');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['lang_name_generate'], 'lang_name_generate');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function add() {
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			$name  = $form->get_request('name');
-			$comment  = $form->get_request('comment');
-			$check = new appliance();
-			$check->get_instance_by_name($name);
-			if ($check->id > 0) {
-				$error = sprintf($this->lang['error_exists'], $name);
-			}
-			if(isset($error)) {
-				$response->error = $error;
-			} else {
-				$appliance = new appliance();
-				$fields['appliance_id'] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$fields['appliance_name'] = $name;
-				$fields['appliance_resources'] = '-1';
-				$fields['appliance_kernelid'] = '1';
-				$fields['appliance_imageid'] = '1';
-				$fields["appliance_virtual"]= 0;
-				$fields["appliance_virtualization"]='1';
-				$fields['appliance_wizard'] = 'wizard=step2,user='.$this->user->name;
-				$fields['appliance_comment'] = $comment;
-				$appliance->add_no_hook($fields);
-				// wizard
-				$rs = $this->user->set_wizard($this->user->name, 'appliance', 2, $fields['appliance_id']);
-				// long term event
-				$event = new event();
-				$event_description = sprintf($this->lang['appliance_create_in_progress_event'], $name, 1, $this->user->name);
-				$event->log("appliance", $_SERVER['REQUEST_TIME'], 9, "add", $event_description, "", "", 0, 0, 0);
-
-				// set wizard id
-				$response->appliance_wizard_id = $fields['appliance_id'];
-				$response->msg = sprintf($this->lang['msg'], $name);
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'step1');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-	
-		$d['name']['label']                             = $this->lang['form_name'];
-		$d['name']['required']                          = true;
-		$d['name']['validate']['regex']                 = '/^[a-z0-9.-]+$/i';
-		$d['name']['validate']['errormsg']              = sprintf($this->lang['error_name'], 'a-z0-9.-');
-		$d['name']['object']['type']                    = 'htmlobject_input';
-		$d['name']['object']['attrib']['name']          = 'name';
-		$d['name']['object']['attrib']['id']            = 'name';
-		$d['name']['object']['attrib']['type']          = 'text';
-		$d['name']['object']['attrib']['css']           = 'namegen';
-		$d['name']['object']['attrib']['customattribs'] = 'data-prefix="app"';
-		$d['name']['object']['attrib']['value']         = '';
-		$d['name']['object']['attrib']['maxlength']     = 50;
-
-		$d['comment']['label']                         = $this->lang['form_comment'];
-		$d['comment']['validate']['regex']             = $this->openqrm->regex['comment'];
-		$d['comment']['validate']['errormsg']          = sprintf($this->lang['error_comment'], $this->openqrm->regex['comment']);
-		$d['comment']['object']['type']                = 'htmlobject_textarea';
-		$d['comment']['object']['attrib']['name']      = 'comment';
-		$d['comment']['object']['attrib']['id']        = 'comment';
-		$d['comment']['object']['attrib']['value']     = '';
-		$d['comment']['object']['attrib']['maxlength'] = 255;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.step2.class.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.step2.class.php
deleted file mode 100644
index d82c9fd..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.step2.class.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-/**
- * Appliance step2 (resource)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class appliance_step2
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'appliance_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "appliance_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'appliance_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'appliance_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-		$this->user       = $openqrm->user();
-
-		$wid = $this->response->html->request()->get('appliance_wizard_id');
-		if($wid === '' && $this->response->html->request()->get('appliance_id') !== '') {
-			$wid = $this->response->html->request()->get('appliance_id');
-		}
-		$this->apliance_wizard_id = $wid;
-		$this->appliance  = $this->openqrm->appliance($wid);
-		$this->appliance->get_instance_by_id($wid);
-		$this->response->add('appliance_wizard_id', $wid);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->add();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'step3', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-
-		$a = $this->response->html->a();
-		$a->title   = $this->lang['action_add'];
-		$a->label   = $this->lang['action_add'];
-		$a->handler = 'onclick="wait();"';
-		$a->css     = 'add';
-		$a->href    = $this->response->get_url($this->actions_name, 'load_radd').'&aplugin=resource&resource_action=add&appliance_id='.$this->apliance_wizard_id;
-
-		$t = $this->response->html->template($this->tpldir.'/appliance-step2.tpl.php');
-		$t->add(sprintf($this->lang['title'], $response->name), 'label');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add($this->lang['or'], 'or');
-		$t->add($a, 'add');
-		$t->add($this->lang['info'], 'info');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function add() {
-		$response  = $this->get_response();
-		$form      = $response->form;
-		$id        = $this->apliance_wizard_id;
-		$appliance = new appliance();
-		$appliance->get_instance_by_id($id);
-		if(!$form->get_errors() && $this->response->submit()) {
-			$resource  = $form->get_request('resource');
-			// special handling when openQRM itself is the resource
-			if ($resource == 0) {
-				$fields['appliance_virtualization'] = 1;
-			} else {
-				// get resource type -> virtualization type
-				$get_resource_type = new resource();
-				$get_resource_type->get_instance_by_id($resource);
-				// update appliance
-				$fields['appliance_virtualization'] = $get_resource_type->vtype;
-			}
-			$fields['appliance_resources'] = $resource;
-			$fields['appliance_wizard'] = 'wizard=step3,user='.$this->user->name;
-			$appliance->update($id, $fields);
-			// wizard
-			$rs = $this->user->set_wizard($this->user->name, 'appliance', 3, $id);
-			$response->msg = sprintf($this->lang['msg'], $resource, $appliance->name);
-			// update long term event, remove old event and add new one
-			$event = new event();
-			$event_description_step1 = sprintf($this->lang['appliance_create_in_progress_event'], $appliance->name, 1, $this->user->name);
-			$event_description_step2 = sprintf($this->lang['appliance_create_in_progress_event'], $appliance->name, 2, $this->user->name);
-			$event->log("appliance", $_SERVER['REQUEST_TIME'], 10, "add", $event_description_step1, "", "", 0, 0, 0);
-			$event->log("appliance", $_SERVER['REQUEST_TIME'], 9, "add", $event_description_step2, "", "", 0, 0, 0);
-		}
-		$response->name = $appliance->name;
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'step2');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$resource  = new resource();
-		$list      = $resource->get_list();
-		$resources = array();
-		foreach ($list as $value) {
-			$id = $value['resource_id'];
-			$resource->get_instance_by_id($id);
-                        $virtualization_id = $resource->vtype;
-                        if ($resource->id == 0) {
-                            $virtualization_id = 1;
-                        }
-			$virtualization = new virtualization();
-			$virtualization->get_instance_by_id($virtualization_id);
-			$resources[] = array($id, ''.$resource->id.' / '.$resource->ip.' '.$resource->hostname.' ('.$virtualization->name.')');
-		}
-		asort($resources);
-
-		// handle appliance is new or edited
-		$selected = $this->response->html->request()->get('resource_id');
-		if($selected === '' && isset($this->appliance->resources)) {
-			$selected = $this->appliance->resources;
-		}
-
-		$d['resource']['label']                        = $this->lang['form_resource'];
-		$d['resource']['required']                     = true;
-		$d['resource']['object']['type']               = 'htmlobject_select';
-		$d['resource']['object']['attrib']['index']    = array(0, 1);
-		$d['resource']['object']['attrib']['id']       = 'resource';
-		$d['resource']['object']['attrib']['name']     = 'resource';
-		$d['resource']['object']['attrib']['options']  = $resources;
-		$d['resource']['object']['attrib']['selected'] = array($selected);
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.step3.class.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.step3.class.php
deleted file mode 100644
index d23ee30..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.step3.class.php
+++ /dev/null
@@ -1,358 +0,0 @@
-<?php
-/**
- * Appliance step3 (image)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class appliance_step3
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'appliance_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "appliance_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'appliance_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'appliance_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-		$this->user       = $openqrm->user();
-
-		$wid = $this->response->html->request()->get('appliance_wizard_id');
-		if($wid === '' && $this->response->html->request()->get('appliance_id') !== '') {
-			$wid = $this->response->html->request()->get('appliance_id');
-		}
-		$this->apliance_wizard_id = $wid;
-		$this->appliance  = new appliance();
-		$this->appliance->get_instance_by_id($wid);
-		$this->response->add('appliance_wizard_id', $wid);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$direkt_redirect = false;
-
-		$resource = new resource();
-		$resource->get_instance_by_id($this->appliance->resources);
-                $virtualization_id = $resource->vtype;
-                if ($resource->id == 0) {
-                    $virtualization_id = 1;
-                }
-		$virtualization = new virtualization();
-		$virtualization->get_instance_by_id($virtualization_id);
-		$resourceinfo = '<b>Resource:</b> '.$resource->id.' / '.$resource->ip.' '.$resource->hostname.' - '.$virtualization->name;
-
-		$assign_image_id = 0;
-		if($resource->id == 0) {
-			$assign_image_id = 0;
-			$direkt_redirect = true;
-		} else if (strstr($resource->capabilities, "TYPE=local-server")) {
-			// local-server integrated resource
-			$assign_image = new image();
-			$assign_image->get_instance_by_id($resource->imageid);
-			$assign_image_id = $assign_image->id;
-			$direkt_redirect = true;
-		}
-		if ($direkt_redirect) {
-			$fields['appliance_imageid'] = $assign_image_id;
-			$fields['appliance_wizard'] = 'wizard=step4,user='.$this->user->name;
-			$this->appliance->update($this->appliance->id, $fields);
-			$response->msg = sprintf($this->lang['msg'], $assign_image_id, $this->appliance->name);
-			// wizard
-			$rs = $this->user->set_wizard($this->user->name, 'appliance', 3, $this->appliance->id);
-			// update long term event, remove old event and add new one
-			$event = new event();
-			$event_description_step2 = sprintf($this->lang['appliance_create_in_progress_event'], $this->appliance->name, 2, $this->user->name);
-			$event_description_step3 = sprintf($this->lang['appliance_create_in_progress_event'], $this->appliance->name, 3, $this->user->name);
-			$event->log("appliance", $_SERVER['REQUEST_TIME'], 10, "add", $event_description_step2, "", "", 0, 0, 0);
-			$event->log("appliance", $_SERVER['REQUEST_TIME'], 9, "add", $event_description_step3, "", "", 0, 0, 0);
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'step4', $this->message_param, $response->msg)
-			);
-		}		
-		
-		// provide the image select form
-		$response = $this->add();
-		if(isset($response->msg)) {
-			if(isset($response->image_edit)) {
-				$id        = $this->apliance_wizard_id;
-				$appliance = $this->appliance;
-				// image-edit
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'load_iedit').'&aplugin=image&image_action=edit&image_id='.$appliance->imageid
-				);
-			} else {
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'step4', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-
-		$a = $this->response->html->a();
-		$a->title   = $this->lang['action_add'];
-		$a->label   = $this->lang['action_add'];
-		$a->handler = 'onclick="wait();"';
-		$a->css     = 'add';
-		$a->href    = $this->response->get_url($this->actions_name, 'load_iadd').'&aplugin=image&image_action=add&appliance_id='.$this->appliance->id;
-
-		$t = $this->response->html->template($this->tpldir.'/appliance-step3.tpl.php');
-		$t->add(sprintf($this->lang['title'], $response->name), 'label');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add($this->lang['or'], 'or');
-		$t->add($a, 'add');
-		$t->add($this->lang['info'], 'info');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($resourceinfo, 'resource');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function add() {		
-		$response  = $this->get_response();
-		$form      = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			$image = $form->get_request('image');
-			$fields['appliance_imageid'] = $image;
-			$fields['appliance_wizard'] = 'wizard=step4,user='.$this->user->name;
-			$this->appliance->update($this->appliance->id, $fields);
-			$response->msg = sprintf($this->lang['msg'], $image, $this->appliance->name);
-			// wizard
-			$rs = $this->user->set_wizard($this->user->name, 'appliance', 3, $this->appliance->id);
-			// update long term event, remove old event and add new one
-			$event = new event();
-			$event_description_step2 = sprintf($this->lang['appliance_create_in_progress_event'], $this->appliance->name, 2, $this->user->name);
-			$event_description_step3 = sprintf($this->lang['appliance_create_in_progress_event'], $this->appliance->name, 3, $this->user->name);
-			$event->log("appliance", $_SERVER['REQUEST_TIME'], 10, "add", $event_description_step2, "", "", 0, 0, 0);
-			$event->log("appliance", $_SERVER['REQUEST_TIME'], 9, "add", $event_description_step3, "", "", 0, 0, 0);
-			if ($form->get_request('image_edit') === 'on') {
-				$response->image_edit = "step4";
-			}
-		}
-		$response->name = $this->appliance->name;
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'step3');
-		$resource = new resource();
-		$resource->get_instance_by_id($this->appliance->resources);
-		// if not openQRM resource
-		if($resource->id != 0) {
-			$virtualization = new virtualization();
-			$virtualization->get_instance_by_id($resource->vtype);
-		}
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		// prepare image list according to the resource capabilities + vtype
-		$image  = new image();
-		$list   = $image->get_list();
-		unset($list[0]);
-		unset($list[1]);
-
-		$images = array();
-		// openQRM
-		if($resource->id == 0) {
-			$images[] = array(0, 'Local openQRM Installation');
-
-		// local-server integrated resource
-		} else if (strstr($resource->capabilities, "TYPE=local-server")) {
-			$local_image = new image();
-			$local_image->get_instance_by_id($resource->imageid);
-			$images[] = array($local_image->id, 'Local OS Installation');
-
-		// local-deployment VMs
-		} else if (strstr($virtualization->type, "-vm-local")) {
-
-			$virtualization_plugin_name = $virtualization->get_plugin_name();
-			$deployment = new deployment();
-			$deployment_id_arr = $deployment->get_deployment_ids();
-			$possible_deployment_types_arr = '';
-			foreach ($deployment_id_arr as $deployment_id_db) {
-				$deployment_id = $deployment_id_db['deployment_id'];
-				$deployment->get_instance_by_id($deployment_id);
-				if ($deployment->storagetype === $virtualization_plugin_name) {
-					$possible_deployment_types_arr[] = $deployment->type;
-				}
-			}
-			// filter image list with only the images from the VM deployment type
-			foreach ($list as $value) {
-				$image_id = $value['value'];
-				$image->get_instance_by_id($image_id);
-				// is image active ? then do not show it here
-				if ($image->isactive == 1) {
-					continue;
-				}
-				if (!in_array($image->type, $possible_deployment_types_arr)) {
-					continue;
-				}
-				// filter local-server images
-				$images[] = array($image_id, $image->id.' / '.$image->name.' ('.$image->type.')');
-			}
-
-		// network-deployment - show only network-boot images
-		} else if (strstr($virtualization->type, "-vm-net")) {
-
-			foreach ($list as $value) {
-				$image_id = $value['value'];
-				$image->get_instance_by_id($image_id);
-				// is image active ? then do not show it here
-				if ($image->isactive == 1) {
-					continue;
-				}
-				// filter local-server images
-				if (strstr($image->capabilities, "TYPE=local-server")) {
-					continue;
-				}
-				$is_network_deployment = false;
-				if($image->is_network_deployment() === true) {
-					$is_network_deployment = true;
-				}
-
-				if ($is_network_deployment) {
-					$images[] = array($image_id, $image->id.' / '.$image->name.' ('.$image->type.')');
-				}
-			}
-
-		// network deployment - physical systems - show only network-boot images
-		} else {
-
-			foreach ($list as $value) {
-				$image_id = $value['value'];
-				$image->get_instance_by_id($image_id);
-				// is image active ? then do not show it here
-				if ($image->isactive == 1) {
-					continue;
-				}
-				// filter local-server images
-				if (strstr($image->capabilities, "TYPE=local-server")) {
-					continue;
-				}
-				$is_network_deployment = false;
-				if($image->is_network_deployment() === true) {
-					$is_network_deployment = true;
-				}
-
-				if ($is_network_deployment) {
-					$images[] = array($image_id, $image->id.' / '.$image->name.' ('.$image->type.')');
-				}
-			}
-		}
-
-		// handle appliance is new or edited
-		$selected = $this->response->html->request()->get('image_id');
-		if($selected === '' && isset($this->appliance->imageid)) {
-			$selected = $this->appliance->imageid;
-		}
-
-		$d['image']['label']                        = $this->lang['form_image'];
-		$d['image']['required']                     = true;
-		$d['image']['object']['type']               = 'htmlobject_select';
-		$d['image']['object']['attrib']['index']    = array(0, 1);
-		$d['image']['object']['attrib']['id']       = 'image';
-		$d['image']['object']['attrib']['name']     = 'image';
-		$d['image']['object']['attrib']['options']  = $images;
-		$d['image']['object']['attrib']['selected'] = array($selected);
-
-		$d['image_edit'] = [];
-		if($this->appliance->resources != 0) {
-			$d['image_edit']['label']                         = $this->lang['form_image_edit'];
-			$d['image_edit']['object']['type']                = 'htmlobject_input';
-			$d['image_edit']['object']['attrib']['type']      = 'checkbox';
-			$d['image_edit']['object']['attrib']['id']        = 'image_edit';
-			$d['image_edit']['object']['attrib']['name']      = 'image_edit';
-			$d['image_edit']['object']['attrib']['checked']   = true;
-		}
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.step4.class.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.step4.class.php
deleted file mode 100644
index 75ae9bb..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.step4.class.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-/**
- * Appliance step4 (Kernel)
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class appliance_step4
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'appliance_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "appliance_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'appliance_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'appliance_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-		$this->user       = $openqrm->user();
-
-		$wid = $this->response->html->request()->get('appliance_wizard_id');
-		if($wid === '' && $this->response->html->request()->get('appliance_id') !== '') {
-			$wid = $this->response->html->request()->get('appliance_id');
-		}
-		$this->apliance_wizard_id = $wid;
-		$this->appliance  = new appliance();
-		$this->appliance->get_instance_by_id($wid);
-		$this->response->add('appliance_wizard_id', $wid);
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$direkt_redirect = false;
-
-		$resource = new resource();
-		$resource->get_instance_by_id($this->appliance->resources);
-                $virtualization_id = $resource->vtype;
-                if ($resource->id == 0) {
-                    $virtualization_id = 1;
-                }
-		$virtualization = new virtualization();
-		$virtualization->get_instance_by_id($virtualization_id);
-		$image = new image();
-		$image->get_instance_by_id($this->appliance->imageid);
-
-		$resourceinfo = '<b>Resource:</b> '.$resource->id.' / '.$resource->ip.' '.$resource->hostname.' - '.$virtualization->name;
-		$imageinfo    = '<b>Image:</b> '.$image->id.' / '.$image->name.' ('.$image->type.')';
-
-		$assign_kernel_id = 0;
-		// if not openQRM resource
-		if($resource->id != 0) {
-			$virtualization = new virtualization();
-			$virtualization->get_instance_by_id($resource->vtype);
-		}
-		if($resource->id == 0) {
-			$assign_kernel_id = 0;
-			$direkt_redirect = true;
-		} else if (strstr($resource->capabilities, "TYPE=local-server")) {
-			$kernel = new kernel();
-			$kernel->get_instance_by_name("resource".$resource->id);
-			$assign_kernel_id = $kernel->id;
-			$direkt_redirect = true;
-		// local-deployment VMs
-		} else if (strstr($virtualization->type, "-vm-local")) {
-			$assign_kernel_id = 1;
-			$direkt_redirect = true;
-		}
-		if ($direkt_redirect) {
-			$fields['appliance_kernelid'] = $assign_kernel_id;
-			$fields['appliance_wizard'] = null;
-			$this->appliance->update($this->appliance->id, $fields);
-			// reset wizard
-			$rs = $this->user->set_wizard($this->user->name, 0,0,0);
-			// now we have to run the appliance add hook
-			$this->appliance->run_add_hook($this->appliance->id);
-			$response->msg = sprintf($this->lang['msg'], $assign_kernel_id, $this->appliance->name);
-			$event = new event();
-			$event_description_step3 = sprintf($this->lang['appliance_create_in_progress_event'], $this->appliance->name, 3, $this->user->name);
-			$event_description_step4 = sprintf($this->lang['appliance_created'], $this->appliance->name, $this->user->name);
-			$event->log("appliance", $_SERVER['REQUEST_TIME'], 10, "add", $event_description_step3, "", "", 0, 0, 0);
-			$event->log("appliance", $_SERVER['REQUEST_TIME'], 5, "add", $event_description_step4, "", "", 0, 0, 0);
-			// redirect
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		
-		// provide the kernel select form
-		$response = $this->add();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-
-		$a = $this->response->html->a();
-		$a->title   = $this->lang['action_add'];
-		$a->label   = $this->lang['action_add'];
-		$a->handler = 'onclick="wait();"';
-		$a->css     = 'add';
-		$a->href    = $this->response->get_url($this->actions_name, 'load_kadd').'&aplugin=kernel&kernel_action=add&appliance_id='.$this->appliance->id;
-
-		$t = $this->response->html->template($this->tpldir.'/appliance-step4.tpl.php');
-		$t->add(sprintf($this->lang['title'], $response->name), 'label');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add($this->lang['info'], 'info');
-		$t->add($this->lang['or'], 'or');
-		$t->add($a, 'add');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($resourceinfo, 'resource');
-		$t->add($imageinfo, 'image');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function add() {		
-		$response  = $this->get_response();
-		$form      = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			$kernel_id = $form->get_request('kernel');
-			$fields['appliance_kernelid'] = $kernel_id;
-			$fields['appliance_wizard'] = null;
-			$this->appliance->update($this->appliance->id, $fields);
-			// reset wizard
-			$rs = $this->user->set_wizard($this->user->name, 0,0,0);
-			// now we have to run the appliance add hook
-			$this->appliance->run_add_hook($this->appliance->id);
-			$response->msg = sprintf($this->lang['msg'], $kernel_id, $this->appliance->name);
-			$event = new event();
-			$event_description_step3 = sprintf($this->lang['appliance_create_in_progress_event'], $this->appliance->name, 3, $this->user->name);
-			$event_description_step4 = sprintf($this->lang['appliance_created'], $this->appliance->name, $this->user->name);
-			$event->log("appliance", $_SERVER['REQUEST_TIME'], 10, "add", $event_description_step3, "", "", 0, 0, 0);
-			$event->log("appliance", $_SERVER['REQUEST_TIME'], 5, "add", $event_description_step4, "", "", 0, 0, 0);
-		}
-		$response->name = $this->appliance->name;
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'step4');
-		$resource = new resource();
-		$resource->get_instance_by_id($this->appliance->resources);
-		// if not openQRM resource
-		if($resource->id != 0) {
-			$virtualization = new virtualization();
-			$virtualization->get_instance_by_id($resource->vtype);
-		}
-		$image = new image();
-		$image->get_instance_by_id($this->appliance->imageid);
-		$deployment = new deployment();
-		$deployment->get_instance_by_type($image->type);
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$kernel  = new kernel();
-		$list   = $kernel->get_list();
-		unset($list[0]);
-
-		$kernels = array();
-		if($resource->id == 0) {
-			$kernels[] = array(0, 'openQRM');
-
-		} else if (strstr($resource->capabilities, "TYPE=local-server")) {
-			$local_kernel = new kernel();
-			$local_kernel->get_instance_by_name("resource".$resource->id);
-			$kernels[] = array($local_kernel->id, 'Local OS Installation');
-
-		// local-deployment VMs
-		} else if (strstr($virtualization->type, "-vm-local")) {
-
-			$kernels[] = array(1, 'Local OS Installation');
-
-		// network-deployment - show only network-boot images
-		} else if (strstr($virtualization->type, "-vm-net")) {
-
-			foreach ($list as $value) {
-				$id = $value['value'];
-				$kernel->get_instance_by_id($id);
-				if (!strstr($kernel->capabilities, "TYPE=local-server")) {
-					$kernels[] = array($id, $kernel->id.' / '.$kernel->name.' ('.$kernel->version.')');
-				}
-			}
-
-		// network deployment - physical systems - show only network-boot images
-		} else {
-
-			foreach ($list as $value) {
-				$id = $value['value'];
-				$kernel->get_instance_by_id($id);
-				if (!strstr($kernel->capabilities, "TYPE=local-server")) {
-					$kernels[] = array($id, $kernel->id.' / '.$kernel->name.' ('.$kernel->version.')');
-				}
-			}
-
-		}
-
-
-		$d['kernel']['label']                          = $this->lang['form_kernel'];
-		$d['kernel']['required']                       = true;
-		$d['kernel']['object']['type']                 = 'htmlobject_select';
-		$d['kernel']['object']['attrib']['index']      = array(0, 1);
-		$d['kernel']['object']['attrib']['id']         = 'kernel';
-		$d['kernel']['object']['attrib']['name']       = 'kernel';
-		$d['kernel']['object']['attrib']['options']    = $kernels;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.stop.class.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.stop.class.php
deleted file mode 100644
index 7746aaf..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/class/appliance.stop.class.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/**
- * Appliance Stop
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class appliance_stop
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'appliance_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "appliance_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'appliance_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'appliance_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->stop();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-			return $response;
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-
-		$t = $this->response->html->template($this->tpldir.'/appliance-stop.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Stop
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function stop() {
-
-		$response = $this->get_response();
-		$appliances = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		$appliance = new appliance();
-		if( $appliances !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($appliances as $id) {
-				$appliance = $appliance->get_instance_by_id($id);
-				$d['param_f'.$i]['label']                       = $appliance->name;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $id;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$errors     = array();
-				$message    = array();
-				foreach($appliances as $key => $id) {
-					$appliance = $appliance->get_instance_by_id($id);
-					$resource = new resource();
-					$resource->get_instance_by_id($appliance->resources);
-					if ($appliance->resources == 0) {
-						$errors[] = sprintf($this->lang['msg_always_active'], $id);
-						continue;
-					}
-					// if no errors then we stop the appliance
-					$kernel = new kernel();
-					$kernel->get_instance_by_id($appliance->kernelid);
-					// send command to the openQRM-server
-					$resource->send_command("127.0.0.1", "openqrm_assign_kernel ".$resource->id." ".$resource->mac." default");
-					$appliance->stop();
-					$form->remove($this->identifier_name.'['.$key.']');
-					$message[] = sprintf($this->lang['msg'], $id);
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		// add $this->identifier_name to response
-		$response->add($this->identifier_name.'[]', $response->html->request()->get($this->identifier_name));
-		$form = $response->get_form($this->actions_name, 'stop');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/css/appliance.css b/openQRM-5.3.50-CE/src/web/base/server/appliance/css/appliance.css
deleted file mode 100644
index fd9dfca..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/css/appliance.css
+++ /dev/null
@@ -1,150 +0,0 @@
-img {
-	border:none;
-}
-
-.htmlobject_box textarea {
-	width: 350px;
-	height: 50px;
-}
-.htmlobject_box .right a {
-	text-decoration: none;
-}
-
-#step1 .htmlobject_box .left {
-	width: 80px;
-}
-#step1 #comment_box.htmlobject_box .left {
-	display: none;
-}
-#step1 #comment_box.htmlobject_box .right {
-	float: none;
-}
-#step1 #comment_box.htmlobject_box .right .errormsg {
-	text-align: center;
-}
-#step1 #comment_box.htmlobject_box .right textarea {
-	display: block;
-	width: 100%;
-	height: 80px;
-}
-#step2 .htmlobject_box .left {
-	width: 100px;
-}
-#step3 .htmlobject_box .left {
-	width: 100px;
-}
-#step4 .htmlobject_box .left {
-	width: 100px;
-}
-#step3 #image_edit_box.htmlobject_box .left {
-	width: 300px;
-	float: right;
-}
-#step3 #image_edit_box.htmlobject_box .right {
-	width: 30px;
-	float: right;
-	padding: 3px 0 0 0;
-}
-#or.span1 {
-	width: 60px;
-	text-align: center;
-	line-height: 20px;
-	margin: 0 0 0 0;
-}
-#info, #resource {
-	margin-top: 5px;
-	margin-bottom: 15px;
-}
-
-/* Edit */
-#appliance_edit .htmlobject_box .left {
-	float: left;
-	margin: 0;
-	padding: 0;
-	width: 180px;
-}
-#appliance_edit .htmlobject_box .right div {
-	line-height: 30px;
-}
-#appliance_edit.row {
-	margin: 0 0 0 10px;
-}
-#pluginsbox {
-	margin: 0 0 0 -30px;
-}
-#pluginsbox legend{
-	line-height: 18px;
-	padding: 0 0 8px 0;
-	margin: 0 0 10px 0;
-}
-#pluginsbox a {
-	display: block;
-	float: left;
-	clear: both;
-	text-decoration: none;
-	margin: 0 0 12px 0;
-}
-#pluginsbox a img{
-	float: left;
-	padding: 0 10px 0 0;
-	display: none;
-}
-#pluginsbox div{
-	border: 0px none;
-	height: 390px;
-	overflow: auto;
-}
-
-/* Select */
-.htmlobject_td.appliance_values {
-	text-align:left;
-	width:250px;
-	vertical-align:top;
-	white-space:nowrap;
-	line-height: 18px;
-}
-.htmlobject_td.appliance_values a {
-	text-decoration: none;
-	color: #4e4e4e;
-}
-.htmlobject_td.appliance_comment {
-	text-align:left;
-	vertical-align:top;
-}
-.htmlobject_td.appliance_comment img{
-	margin: 0 6px 0 0;
-}
-.htmlobject_td.appliance_comment hr{
-	margin: 10px 0;
-	color: #ccc;
-	background-color: #ccc;
-	border: 0 none;
-	height: 1px;
-}
-.htmlobject_td.identifier {
-	text-align:center;
-	vertical-align:top;
-	width: 20px;
-}
-.htmlobject_table .htmlobject_td.appliance_state {
-	width: 110px;
-	padding: 11px 0 0 8px;
-	text-align:left;
-	vertical-align:top;
-	width:90px;
-}
-.htmlobject_table .htmlobject_td.appliance_edit {
-	width: 100px;
-	vertical-align:top;
-}
-.htmlobject_table .htmlobject_td.appliance_edit a{
-	display: block;
-	text-align: left;
-}
-#resource_filter {
-	margin: 0 0 0 0 !important;
-}
-#resource_type_filter {
-	margin: 0 0 30px 0 !important;
-}
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/lang/de.appliance.ini b/openQRM-5.3.50-CE/src/web/base/server/appliance/lang/de.appliance.ini
deleted file mode 100644
index 72ea540..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/lang/de.appliance.ini
+++ /dev/null
@@ -1,141 +0,0 @@
-[select]
-tab = "Server"
-label = "Server"
-action_remove = "entfernen"
-action_edit = "bearbeiten"
-action_add = "Neuen Server hinzufügen"
-action_start = "starten"
-action_stop = "stoppen"
-action_release = "freigeben"
-action_continue = "Setup fortsetzen"
-table_state = "Status"
-table_id = "ID"
-table_name = "Name"
-table_type = "Typ"
-table_kernel = "Kernel"
-table_image = "Image"
-table_resource = "Ressource"
-table_deployment = "Deployment"
-appliance_create_in_progress = "Server wird von Benutzer %s hinzugefügt"
-resource_release = "Ressource freigeben"
-lang_filter = "Filtern nach Ressource"
-lang_type_filter = "Filtern nach Ressource Typ"
-lang_filter_title = "Filtern nach Resource ID, Name oder Mac. Verwenden Sie ? als einzel und * als mehrfach Platzhalter."
-please_wait = "Lade Server. Bitte warten .."
-
-[step1]
-label = "Neuer Server (1/4)"
-title = "Neuen Server hinzufügen"
-msg = "Neuen Server %s hinzugefügt."
-info = "Einen Server hinzufügen besteht aus bis zu vier Schritten:<br><br>(1) Vergeben Sie einen Namen und Beschreibung für den neuen Server.<br>(2) Ressource - entweder eine physikalische oder virtuelle Maschine.<br>(3) Image - die &quot;Festplatte&quot; einer virtuellen Maschine.<br>(4) Kernel - booten eine virtuellen Maschine per pxe."
-form_name = "Name"
-form_comment = "Kommentar"
-lang_name_generate = "Erzeuge Namen"
-error_name = "Name darf nur %s enthalten"
-error_comment = "Kommentar darf nur %s enthalten"
-please_wait = "Lade. Bitte warten .."
-error_exists = "Server %s wird bereits verwendet."
-appliance_create_in_progress_event = "Server wird von Benutzer %s hinzugefügt"
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[step2]
-label = "Neuer Server (2/4)"
-title = "Wähle eine Ressource für Server %s"
-msg = "Ressource %s zu Server %s hinzugefügt"
-or = "oder"
-action_add = "Neue Ressource"
-info = "Wählen Sie eine Ressource für den Server aus der Liste. Wenn keine geeignete Ressource vorhanden ist, wählen Sie NEUE RESSOURCE. Nach dem Hinzufügen werden Sie auf diese Seite zurückgeleitet um das Setup fort zu setzen. Abhänig von der gewählten Ressource werden eventuell die folgenden Schritte des Setups übersprungen."
-form_resource = "Ressource"
-appliance_create_in_progress_event = "Server wird von Benutzer %s hinzugefügt"
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[step3]
-label = "Neuer Server (3/4)"
-title = "Wähle ein Image für Server %s"
-msg = "Image %s zu Server %s hinzugefügt"
-or = "oder"
-action_add = "Neues Image"
-info = "Das Image repräsentiert die &quot;Festplatte&quot; der Ressource Ihres Servers. Bitte wählen Sie ein Image aus der Liste. Wenn kein geeignetes Image vorhanden ist, wählen Sie NEUES IMAGE. Nach dem Hinzufügen werden Sie auf diese Seite zurückgeleitet um das Setup fort zu setzen. Die Image Einstellungen können, durch anhaken der unten stehenden Checkbox, direkt nach Auswahl bearbeitet werden."
-form_image = "Image"
-form_image_edit = "Image Details nach Auswahl bearbeiten"
-appliance_create_in_progress_event = "Server wird von Benutzer %s hinzugefügt"
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[step4]
-label = "Neuer Server (4/4)"
-title = "Wähle einen Kernel für Server %s"
-msg = "Kernel %s zu Server %s hinzugefügt"
-or = "oder"
-action_add = "Neuer Kernel"
-info = "Ein Kernel wird von VMs Typ networkboot benötigt und muß zum gewählten Image passen. Bitte wählen Sie einen Kernel aus der Liste. Wenn kein geeigneter Kernel vorhanden ist, wählen Sie NEUER KERNEL und lesen Sie die Instruktionen sorgfälltig ."
-form_kernel = "Kernel"
-appliance_created = "Server %s wurde von Benutzer %s angelegt"
-appliance_create_in_progress_event = "Server wird von Benutzer %s hinzugefügt"
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[edit]
-label = "Server bearbeiten"
-title = "Bearbeitet Server %s"
-msg = "Server %s aktualisiert"
-option_auto = "auto"
-lang_ha = "Ha"
-lang_misc = "Misc"
-lang_mgmt = "Management"
-lang_moni = "Monitoring"
-lang_net = "Network"
-lang_enter = "Enterprise"
-form_comment = "Kommentar"
-form_cpus = "Prozessoren"
-form_cpuspeed = "Cpuspeed"
-form_cpumodel = "Prozessormodel"
-form_capabilities = "Capabilities"
-form_virtualization = "Virtualisierung"
-form_resource = "Resource"
-form_image = "Image"
-form_kernel = "Kernel"
-form_nics = "Nics"
-form_memory = "Memory"
-form_swap = "Swap"
-lang_dep = "Deployment"
-action_resource = "Resource %s wechseln"
-action_image = "Image %s wechseln"
-action_kernel = "Kernel %s wechseln"
-no_plugin_available = "Keine Aktion verfügbar"
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-error_comment = "Kommentar darf nur %s enthalten"
-
-[start]
-label = "Starte Server"
-msg = "Server %s gestartet"
-msg_no_resource = "Konnte keine freie resource für Server %s finden"
-msg_always_active = "Eine Server mit dem openQRM Server als resource ist immer aktiv!"
-msg_already_active = "Server %s ist bereits gestartet"
-msg_reource_not_idle = "Resource %s ist nicht idle. Server %s wird nicht gestartet"
-msg_reource_no_ip = "Resource %s hat noch keine IP Adresse!"
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[stop]
-label = "Stoppe Server"
-msg = "Server %s gestoppt"
-msg_always_active = "Eine Server mit dem openQRM Server als resource ist immer aktiv!"
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[remove]
-label = "Server entfernen"
-msg = "Server %s entfernt"
-msg_still_active = "Server %s ist aktiv und kann nicht entfernt werden."
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
-
-[release]
-label = "Server Ressource freigeben"
-msg = "Server %s Ressource freigegeben"
-msg_openqrm = "Die Ressource einer openQRM Server kann nicht freigegeben werden!"
-please_wait = "Lade Server. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/lang/en.appliance.ini b/openQRM-5.3.50-CE/src/web/base/server/appliance/lang/en.appliance.ini
deleted file mode 100644
index 6c16b0b..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/lang/en.appliance.ini
+++ /dev/null
@@ -1,141 +0,0 @@
-[select]
-tab = "Server"
-label = "Server"
-action_remove = "remove"
-action_start = "start"
-action_stop = "stop"
-action_edit = "edit"
-action_release = "release"
-action_add = "Add a new Server"
-action_continue = "Continue setup"
-table_state = "State"
-table_id = "Id"
-table_name = "Name"
-table_type = "Type"
-table_kernel = "Kernel"
-table_image = "Image"
-table_resource = "Resource"
-table_deployment = "Deployment"
-appliance_create_in_progress = "Server create in progress by user %s"
-resource_release = "release resource"
-lang_type_filter = "Filter by Resource Type"
-lang_filter = "Filter by Resource"
-lang_filter_title = "Filter by Resource ID, Name or Mac. Use ? as single and * as multi wildcard."
-please_wait = "Loading. Please wait .."
-
-[step1]
-label = "Add Server (1/4)"
-title = "Add a new Server"
-msg = "Added Server %s"
-info = "Adding a server is devided in up to four steps:<br><br>(1) Give a name and a description to your new server.<br>(2) Choose a Resource - either a Physical Machine or a Virtual.<br>(3) Add an Image - the &quot;disk&quot; for a Virtual Machine.<br>(4) Add the Kernel - needed to boot a Virtual Machine with pxe."
-form_name = "Name"
-form_comment = "Comment"
-lang_name_generate = "generate name"
-error_name = "Name must be %s"
-error_comment = "Comment must be %s"
-appliance_create_in_progress_event = "Server %s create in progress (step %s) by user %s"
-please_wait = "Loading. Please wait .."
-error_exists = "Server %s is already in use."
-canceled = "Operation canceled. Please wait .."
-
-[step2]
-label = "Add Server (2/4)"
-title = "Select a resource for Server %s"
-msg = "Added resource %s to Server %s"
-or = "or"
-action_add = "new resource"
-info = "Select a resource for your new server from the list below . If there is no suitable resource you can add a new one by selecting NEW RESOURCE. When done adding you will be redirected to this page to continue the setup. Depending on the type of your selected resource the following two steps of the setup might be skipped."
-appliance_create_in_progress_event = "Server %s create in progress (step %s) by user %s"
-form_resource = "Resource"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[step3]
-label = "Add Server (3/4)"
-title = "Select an image for Server %s"
-msg = "Added image %s to Server %s"
-or = "or"
-action_add = "new image"
-info = "The image represents the &quot;disc&quot; of you servers resource. Please choose one from the list below. If there is no suitable image you can add a new one by selecting NEW IMAGE. When done adding you will be redirected to this page to continue the setup. The image can be configured right after selection by checking the checkbox below."
-form_image = "Image"
-form_image_edit = "Edit Image details after selection"
-appliance_create_in_progress_event = "Server %s create in progress (step %s) by user %s"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[step4]
-label = "Add Server (4/4)"
-title = "Select a kernel for Server %s"
-msg = "Added kernel %s to Server %s"
-or = "or"
-action_add = "new kernel"
-info = "A kernel is needed for VMs of type networkboot and must fit the choosen image. Please select one from the list below. If there is no suitable kernel you can add a new one by selecting NEW KERNEL and reading the instructions carefully."
-form_kernel = "Kernel"
-appliance_create_in_progress_event = "Server %s create in progress (step %s) by user %s"
-appliance_created = "Server %s created by user %s"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[edit]
-label = "Edit Server"
-title = "Edit Server %s"
-msg = "Updated Server %s"
-option_auto = "auto"
-lang_ha = "Ha"
-lang_misc = "Misc"
-lang_mgmt = "Management"
-lang_moni = "Monitoring"
-lang_net = "Network"
-lang_enter = "Enterprise"
-lang_dep = "Deployment"
-form_comment = "Comment"
-form_cpus = "Cpus"
-form_cpuspeed = "Cpuspeed"
-form_cpumodel = "Cpumodel"
-form_capabilities = "Capabilities"
-form_virtualization = "Virtualization"
-form_resource = "Resource"
-form_image = "Image"
-form_kernel = "Kernel"
-form_nics = "Nics"
-form_memory = "Memory"
-form_swap = "Swap"
-action_resource = "change resource %s"
-action_image = "change image %s"
-action_kernel = "change kernel %s"
-no_plugin_available = "No action available"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-error_comment = "Comment must contain %s only"
-
-[start]
-label = "Start Server"
-msg = "Started Server %s"
-msg_no_resource = "Could not find any available resource for Server %s"
-msg_always_active = "An Server with the openQRM Server as resource is always active!"
-msg_already_active = "Not starting already aktive Server %s"
-msg_reource_not_idle = "Resource %s is not in idle state. Not starting Server %s"
-msg_reource_no_ip = "Resource %s has no ip address yet!"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[stop]
-label = "Stop Server"
-msg = "Stopped Server %s"
-msg_always_active = "An Server with the openQRM Server as resource is always active!"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[remove]
-label = "Remove Server"
-msg = "Removed Server %s"
-msg_still_active = "Not removing Server %s!<br>It is still active."
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[release]
-label = "Release Server resource"
-msg = "Released Server %s resource"
-msg_openqrm = "The openQRM Server resource cannot be released!"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/lang/es.appliance.ini b/openQRM-5.3.50-CE/src/web/base/server/appliance/lang/es.appliance.ini
deleted file mode 100644
index 619ae9a..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/lang/es.appliance.ini
+++ /dev/null
@@ -1,140 +0,0 @@
-[select]
-tab = "Servidor"
-label = "Servidor"
-action_remove = "quitar"
-action_start = "iniciar"
-action_stop = "parar"
-action_edit = "editar"
-action_release = "liberar"
-action_add = "Agregar un nuevo servidor"
-action_continue = "Continuar la instalación"
-table_state = "Estado"
-table_id = "Id"
-table_name = "Nombre"
-table_type = "Tipo"
-table_kernel = "Kernel"
-table_image = "Imagen"
-table_resource = "Recurso"
-table_deployment = "Implementación"
-appliance_create_in_progress = "Se está generando el servidor por el usuario %s"
-resource_release = "Liberar recurso"
-lang_filter = "Filtrar por servidor"
-lang_type_filter = "Filtrar por tipo de servidor"
-please_wait = "Cargando. Por favor espere .."
-
-[step1]
-label = "Añadir Servidor (1/4)"
-title = "Añadir un nuevo Servidor"
-msg = "Se ha añadido el servidor %s"
-info = "Adición de un servidor se divide en un máximo de cuatro pasos:<br><br>(1) Dé un nombre y una descripción a tu nuevo servidor.<br>(2) Elegir un recurso - ya sea una máquina física o virtual.<br>(3) Añadir una imagen - el &quot;disco&quot; de una máquina virtual.<br>(4) Añadir el Kernel - necesaria para arrancar una máquina virtual con PXE."
-form_name = "Nombre"
-form_comment = "Comentario"
-lang_name_generate = "generar nombre"
-error_name = "El nombre debe ser %s"
-error_comment = "El comentario debe ser %s"
-appliance_create_in_progress_event = "La generación del servidor %s esta en progreso (paso %s) por el usuario %s"
-please_wait = "Cargando. Por favor espere .."
-error_exists = "El servidor %s esta actualmente en uso."
-canceled = "Cancelado. Por favor espere .."
-
-[step2]
-label = "Añadir Servidor (2/4)"
-title = "Seleccione un recurso para el Servidor %s"
-msg = "Recurso %s agregado para el Servidor %s"
-or = "o"
-action_add = "nuevo recurso"
-info = "Seleccione un recurso para su nuevo servidor de la lista a continuación. Si no hay recursos adecuados se puede añadir uno nuevo seleccionando NUEVO RECURSO. Cuando haya terminado de añadir serás redirigido a esta página para continuar con la configuración. Dependiendo del tipo de su recurso seleccionado los dos pasos de la configuración siguientes pueden ser omitidos."
-appliance_create_in_progress_event = "La generación del servidor %s está en progreso (paso %s) por el usuario %s"
-form_resource = "Recurso"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[step3]
-label = "Añadir Servidor  (3/4)"
-title = "Seleccione una imagen para el servidor %s"
-msg = "Imagen %s añadida al servidor %s"
-or = "o"
-info = "La imagen representa el &quot;disco&quot; de que los servidores de recursos. Por favor, elija uno de la lista a continuación. Si no hay ninguna imagen adecuada puede agregar uno nuevo seleccionando NUEVA IMAGEN. Cuando haya terminado de añadir serás redirigido a esta página para continuar con la configuración. La imagen se puede configurar después de la selección marcando la casilla de abajo."
-action_add = "nueva imagen"
-form_image = "Imagen"
-form_image_edit = "Detalles de la imagen después de la selección"
-appliance_create_in_progress_event = "La generación del servidor %s está en progreso (paso %s) por el usuario %s" 
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[step4]
-label = "Añadir servidor (4/4)"
-title = "Seleccione un kernel para el servidor %s"
-msg = "Agregar kernel %s para el servidor %s"
-or = "o"
-info = "Se necesita un Kernel para máquinas virtuales de tipo networkboot y debe ajustar la imagen elegida. Por favor, elija uno de la lista a continuación. Si no hay un kernel adecuado puede agregar uno nuevo seleccionando nuevo kernel y leer las instrucciones cuidadosamente."
-action_add = "Nuevo Kernel"
-form_kernel = "Kernel"
-appliance_create_in_progress_event = "La generación del servidor %s está en progreso (paso %s) por el usuario %s"
-appliance_created = "El servidor %s se ha añadido por el usuario %s"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[edit]
-label = "Editar Servidor"
-title = "Editar Servidor %s"
-msg = "Actualizar servidor %s"
-option_auto = "automático"
-lang_ha = "Ha"
-lang_misc = "Misc"
-lang_mgmt = "Management"
-lang_moni = "Monitorización"
-lang_net = "Red"
-lang_enter = "Enterprise"
-lang_dep = "Implementación"
-form_comment = "Comentario"
-form_cpus = "CPUs"
-form_cpuspeed = "Velocidad CPU"
-form_cpumodel = "Modelo CPU"
-form_capabilities = "Capacidad"
-form_virtualization = "Virtualización"
-form_resource = "recurso"
-form_image = "Imagen"
-form_kernel = "Kernel"
-form_nics = "Tarjeta de red"
-form_memory = "Memoria"
-form_swap = "Memoria Swap"
-action_resource = "cambiar recurso %s"
-action_image = "cambiar imagen %s"
-action_kernel = "cambiar kernel %s"
-no_plugin_available = "Acción no disponible"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-error_comment = "Comentario debe contener sólo %s"
-
-[start]
-label = "Iniciar Servidor"
-msg = "Servidor %s iniciado"
-msg_no_resource = "No se encontro ningun recurso disponible para el servidor %s"
-msg_always_active = "Un servidor que usa un servidor openQRM como recurso esta siempre activo!"
-msg_already_active = "No se inició. El servidor %s ya esta activo"
-msg_reource_not_idle = "El recurso %s está ocupado. No se inició el servidor %s"
-msg_reource_no_ip = "Resource %s has no ip address yet!"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[stop]
-label = "Parar servidor"
-msg = "Servidor parado %s"
-msg_always_active = "Un servidor que usa un servidor openQRM como recurso esta siempre activo!"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[remove]
-label = "Quitar servidor"
-msg = "Quitar servidor %s"
-msg_still_active = "No se ha quitado el servidor %s!<br>Está activo todavía."
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[release]
-label = "Liberar recurso del servidor"
-msg = "Liberar recurso del servidor %s"
-msg_openqrm = "El recurso del servidor openQRM no puede ser liberado!"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-edit.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-edit.tpl.php
deleted file mode 100644
index 4bdc642..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-edit.tpl.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div id="appliance_edit" class="row">
-	<form action="{thisfile}" method="POST">
-	<div class="span6">
-		{form}
-		{virtualization}
-		{resource}
-		{image}
-		{kernel}
-
-		{cpus}
-		{cpuspeed}
-		{cpumodel}
-		{nics}
-		{memory}
-		{swap}
-		{capabilities}
-		{comment}
-	</div>
-
-	<div id="pluginsbox" class="span2">
-		<fieldset>
-			<legend>Plugins</legend>
-			{plugins}
-		</fieldset>
-	</div>
-
-	<div class="floatbreaker">&#160;</div>
-	<div id="buttons">{submit}&#160;{cancel}</div>
-
-</div>
-
-<!--
-
-	<div class="dirbox span3">
-		<h3 onclick="$('#list1').slideToggle('slow');"><img src="{baseurl}/img/ha.png" alt="ha"> {lang_ha}</h3>
-		<div class="dirlist" id="list1">
-			{plugin_ha}
-		</div>
-		<script type="text/javascript">$('#list1').slideToggle('fast');</script>
-
-		<h3 onclick="$('#list2').slideToggle('slow');"><img src="{baseurl}/img/datacenter.png" alt="network"> {lang_net}</h3>
-		<div class="dirlist" id="list2">
-			{plugin_net}
-		</div>
-		<script type="text/javascript">$('#list2').slideToggle('fast');</script>
-
-		<h3 onclick="$('#list3').slideToggle('slow');"><img src="{baseurl}/img/user.png" alt="management"> {lang_mgmt}</h3>
-		<div class="dirlist" id="list3">
-			{plugin_mgmt}
-		</div>
-		<script type="text/javascript">$('#list3').slideToggle('fast');</script>
-
-		<h3 onclick="$('#list4').slideToggle('slow');"><img src="{baseurl}/img/monitoring.png" alt="monitoring"> {lang_moni}</h3>
-		<div class="dirlist" id="list4">
-			{plugin_moni}
-		</div>
-		<script type="text/javascript">$('#list4').slideToggle('fast');</script>
-
-		<h3 onclick="$('#list5').slideToggle('slow');"><img src="{baseurl}/img/manage.png" alt="misc"> {lang_dep}</h3>
-		<div class="dirlist" id="list5">
-			{plugin_dep}
-		</div>
-		<script type="text/javascript">$('#list5').slideToggle('fast');</script>
-
-		<h3 onclick="$('#list6').slideToggle('slow');"><img src="{baseurl}/img/manage.png" alt="misc"> {lang_misc}</h3>
-		<div class="dirlist" id="list6">
-			{plugin_misc}
-		</div>
-		<script type="text/javascript">$('#list6').slideToggle('fast');</script>
-
-		<h3 onclick="$('#list7').slideToggle('slow');"><img src="{baseurl}/img/enterprise.png" alt="misc"> {lang_enter}</h3>
-		<div class="dirlist" id="list7">
-			{plugin_enter}
-		</div>
-		<script type="text/javascript">$('#list7').slideToggle('fast');</script>
-	</div>
-
-//-->
-
-
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-release.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-release.tpl.php
deleted file mode 100644
index a2e691b..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-release.tpl.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}">
-
-	<div id="form">
-	{form}
-	</div>
-
-	<div id="buttons">
-	{submit}
-	{cancel}
-	</div>
-
-</form>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-remove.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-remove.tpl.php
deleted file mode 100644
index 5a582aa..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-remove.tpl.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}" method="POST">
-	<div id="form">
-		{form}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-select.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-select.tpl.php
deleted file mode 100644
index b6a9a83..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-select.tpl.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-
-<h2>{label}<span class="pull-right">{add}</span></h2>
-<div id="form">
-	<form action="{thisfile}" method="POST">
-		{form}
-		{resource_filter}
-		{resource_type_filter}
-		{table}
-	</form>
-</div>
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-start.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-start.tpl.php
deleted file mode 100644
index 5a582aa..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-start.tpl.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}" method="POST">
-	<div id="form">
-		{form}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-step1.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-step1.tpl.php
deleted file mode 100644
index b8c37ec..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-step1.tpl.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div id="step1">
-<form action="{thisfile}" method="GET">
-
-	<div id="info" class="span5">
-		{info}
-	</div>
-	<div class="floatbreaker">&#160;</div>
-	<div id="form" class="span5">
-		{form}
-		{name}
-		{comment}
-	</div>
-	<div class="floatbreaker">&#160;</div>
-
-	<div id="buttons">{submit}&#160;{cancel}</div>
-</form>
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-step2.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-step2.tpl.php
deleted file mode 100644
index a56e233..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-step2.tpl.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div id="step2">
-<form action="{thisfile}" method="GET">
-
-	<div id="info" class="span5">
-		{info}
-	</div>
-	<div class="floatbreaker">&#160;</div>
-	<div id="form" class="span3">
-		{form}
-		{resource}
-	</div>
-	<div id="or" class="span1">{or}</div>
-	<div id="add" class="span2">{add}</div>
-	<div class="floatbreaker">&#160;</div>
-
-	<div id="buttons">{submit}&#160;{cancel}</div>
-</form>
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-step3.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-step3.tpl.php
deleted file mode 100644
index ad7831d..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-step3.tpl.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div id="step3">
-<form action="{thisfile}" method="GET">
-
-	<div id="resource" class="span6">
-		{resource}
-	</div>
-
-	<div class="floatbreaker">&#160;</div>
-
-	<div id="info" class="span5">
-		{info}
-	</div>
-
-	<div class="floatbreaker">&#160;</div>
-
-	<div id="form" class="span3">
-		{form}
-		{image}
-	</div>
-
-	<div id="or" class="span1">{or}</div>
-
-	<div id="add" class="span2">{add}</div>
-
-	<div class="floatbreaker">&#160;</div>
-
-	<div class="span3">
-		{image_edit}
-	</div>
-
-	<div class="floatbreaker">&#160;</div>
-
-	<div id="buttons">{submit}&#160;{cancel}</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-step4.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-step4.tpl.php
deleted file mode 100644
index a316c2d..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-step4.tpl.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div id="step4">
-<form action="{thisfile}" method="GET">
-
-	<div id="resource" class="span6">
-		{resource}<br>
-		{image}
-	</div>
-	<div class="floatbreaker">&#160;</div>
-	<div id="info" class="span5">
-		{info}
-	</div>
-	<div class="floatbreaker">&#160;</div>
-	<div id="form" class="span3">
-		{form}
-		{kernel}
-	</div>
-	<div id="or" class="span1">{or}</div>
-	<div id="add" class="span2">{add}</div>
-	<div class="floatbreaker">&#160;</div>
-
-	<div id="buttons">{submit}&#160;{cancel}</div>
-
-</form>
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-stop.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-stop.tpl.php
deleted file mode 100644
index 5a582aa..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/appliance/tpl/appliance-stop.tpl.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}" method="POST">
-	<div id="form">
-		{form}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/event/class/event.acknowledge.class.php b/openQRM-5.3.50-CE/src/web/base/server/event/class/event.acknowledge.class.php
deleted file mode 100644
index 78d1e11..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/event/class/event.acknowledge.class.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Acknowledge event
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class event_acknowledge
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'event_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "event_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'event_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'event_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param htmlobject_response $response
-	 * @param file $file
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$event = new event();
-		$identifier = $this->response->html->request()->get($this->identifier_name);
-		$msg = '';
-		if($identifier !== '') {
-			foreach($identifier as $id) {
-				$event->get_instance_by_id($id);
-				if ($event->priority == 9 && $event->source === 'License') {
-					continue;
-				}
-				$fields = array();
-				$fields["event_status"] = 1;
-				$event->update($id, $fields);
-				$msg .= sprintf($this->lang['msg'], $id).'<br>';
-			}
-		}
-		$this->response->redirect(
-			$this->response->get_url($this->actions_name, 'select', $this->message_param, $msg)
-		);
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/event/class/event.controller.class.php b/openQRM-5.3.50-CE/src/web/base/server/event/class/event.controller.class.php
deleted file mode 100644
index 69e2407..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/event/class/event.controller.class.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-/**
- * Event Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class event_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'event_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "event_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'event_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'event_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array (
-		'tab' => 'Events',
-		'label' => 'Events',
-		'action_remove' => 'remove',
-		'action_rerun' => 're-run command',
-		'action_acknowledge' => 'acknowledge',
-		'table_state' => 'State',
-		'table_id' => 'Id',
-		'table_date' => 'Date',
-		'table_source' => 'Source',
-		'table_description' => 'Description',
-		'lang_filter' => 'Filter by state',
-		'filter_error' => 'Error',
-		'filter_active' => 'Active',
-		'filter_warning' => 'Warning',
-		'filter_acknowledge' => 'Acknowledged',
-		'please_wait' => 'Loading. Please wait ..',
-	), 
-	'remove' => array (
-		'label' => 'Remove Events(s)',
-		'msg' => 'Removed event %s',
-		'error_timeout' => 'Timeout while trying to remove event %s',
-		'error_start' => 'Could not remove event %s',
-	),
-	'acknowledge' => array (
-		'label' => 'Acknowledge Events(s)',
-		'msg' => 'Acknowledged Event %s',
-	),
-	'rerun' => array (
-		'label' => 'Rerun Events(s)',
-		'msg' => 'Rerun Event %s',
-	)
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param user $user
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->tpldir   = $this->rootdir.'/server/event/tpl';
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/server/event/lang", 'event.ini');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "select";
-		}
-		$this->response->params['event_filter'] = $this->response->html->request()->get('event_filter');
-
-		// handle table params
-		$vars = $this->response->html->request()->get('events');
-		if($vars !== '') {
-			if(!isset($vars['action'])) {
-				foreach($vars as $k => $v) {
-					$this->response->add('events['.$k.']', $v);
-				}
-			} else {
-				foreach($vars as $k => $v) {
-					unset($this->response->params['events['.$k.']']);
-				}
-			}
-		}
-
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'remove':
-				$content[] = $this->remove(true);
-			break;
-			case 'acknowledge':
-				$content[] = $this->acknowledge(true);
-			break;
-			case 'rerun':
-				$content[] = $this->rerun(true);
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->rootdir.'/server/event/class/event.api.class.php');
-		$controller = new event_api($this);
-		$controller->action();
-	}
-
-	
-	//--------------------------------------------
-	/**
-	 * Select event
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/event/class/event.select.class.php');
-			$controller = new event_select($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}	
-	
-	//--------------------------------------------
-	/**
-	 * Remove event
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function remove( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/event/class/event.remove.class.php');
-			$controller                  = new event_remove($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['remove'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Remove';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'remove' );
-		$content['onclick'] = false;
-		if($this->action === 'remove'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Acknowledge Event
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function acknowledge( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/event/class/event.acknowledge.class.php');
-			$controller                  = new event_acknowledge($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['acknowledge'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Acknowledge';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'acknowledge' );
-		$content['onclick'] = false;
-		if($this->action === 'acknowledge'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Rerun Event
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function rerun( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/event/class/event.rerun.class.php');
-			$controller                  = new event_rerun($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['rerun'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Rerun';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'rerun' );
-		$content['onclick'] = false;
-		if($this->action === 'rerun'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/event/class/event.remove.class.php b/openQRM-5.3.50-CE/src/web/base/server/event/class/event.remove.class.php
deleted file mode 100644
index ce332af..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/event/class/event.remove.class.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * Remove event
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class event_remove
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'event_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "event_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'event_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'event_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param htmlobject_response $response
-	 * @param file $file
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-		$identifiers = $this->response->html->request()->get($this->identifier_name);
-		$msg = '';
-		if($identifiers !== '') {
-			foreach($identifiers as $id) {
-				$event = new event();
-				$event->get_instance_by_id($id);
-				if (strstr($event->description, "ERROR running token")) {
-					$error_token = str_replace("ERROR running token ", "", $event->description);
-					$cmd_file = $RootDir."/server/event/errors/".$error_token.".cmd";
-					$error_file = $RootDir."/server/event/errors/".$error_token.".out";
-					if ($this->file->exists($cmd_file)) {
-						$error = $this->file->remove($cmd_file);
-						if($error !== '') {
-							$msg .= $error.'<br>';
-						}
-					}
-					if ($this->file->exists($error_file)) {
-						$error = $this->file->remove($error_file);
-						if($error !== '') {
-							$msg .= $error.'<br>';
-						}
-					}
-				}
-				$event->remove($id);
-				$msg .= sprintf($this->lang['msg'], $id).'<br>';
-			}
-		}
-		$this->response->redirect(
-			$this->response->get_url($this->actions_name, 'select', $this->message_param, $msg)
-		);
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/event/class/event.rerun.class.php b/openQRM-5.3.50-CE/src/web/base/server/event/class/event.rerun.class.php
deleted file mode 100644
index 1473f35..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/event/class/event.rerun.class.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Rerun event
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class event_rerun
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'event_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "event_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'event_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'event_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param htmlobject_response $response
-	 * @param file $file
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		global $OPENQRM_SERVER_BASE_DIR;
-		$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-		$token = $this->response->html->request()->get('token');
-		$event_id = $this->response->html->request()->get('event_id');
-		$msg = '';
-		if($token !== '' && $event_id !== '') {
-			$event = new event();
-			$event->get_instance_by_id($event_id);
-			$event->log("event-action", $_SERVER['REQUEST_TIME'], 5, "event-overview.php", "Re-Running command $token", "", "", 0, 0, 0);
-			$command = "mv -f ".$OPENQRM_SERVER_BASE_DIR."/openqrm/web/base/server/event/errors/".$token.".cmd ".$OPENQRM_SERVER_BASE_DIR."/openqrm/var/spool/openqrm-queue.".$token." && rm -f ".$OPENQRM_SERVER_BASE_DIR."/openqrm/web/base/server/event/errors/".$token.".out";
-			shell_exec($command);
-			$fields = array();
-			$fields["event_priority"] = 4;
-			$event->update($event_id, $fields);
-			$msg .= "Re-running token ".$token." / Event ID ".$event_id."<br>";
-		}
-		$this->response->redirect(
-			$this->response->get_url($this->actions_name, 'select', $this->message_param, $msg)
-		);
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/event/class/event.select.class.php b/openQRM-5.3.50-CE/src/web/base/server/event/class/event.select.class.php
deleted file mode 100644
index bd99dc8..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/event/class/event.select.class.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/**
- * Event Select
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class event_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'event_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "event_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'event_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'event_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param htmlobject_response $response
-	 * @param file $file
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-		$this->rootdir  = $this->openqrm->get('webdir');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$table = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/event-select.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($table, 'table');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['lang_filter'], 'lang_filter');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return htmlobject_tablebulider
-	 */
-	//--------------------------------------------
-	function select() {
-		$h = array();
-		$h['event_id']['title'] = $this->lang['table_id'];
-		$h['event_id']['hidden'] = true;
-		$h['event_id']['sortable'] = false;
-		$h['event_priority']['title'] = $this->lang['table_state'];
-		$h['event_time']['title'] = $this->lang['table_date'];
-		$h['event_source']['title'] = $this->lang['table_source'];
-		$h['event_description']['title'] = $this->lang['table_description'];
-		$h['event_description']['sortable'] = false;
-
-		$event = new event();
-		$b     = array();
-
-		$table = $this->response->html->tablebuilder('events', $this->response->get_array($this->actions_name, 'select'));
-		$table->offset = 0;
-		$table->limit = 100;
-		$table->sort = 'event_time';
-		$table->order = 'DESC';
-
-		switch ($this->response->html->request()->get('event_filter')) {
-			case '':
-			case 'all':
-				$table->max = $event->get_count();
-				break;
-			case 'active':
-				$table->max = $event->get_count('active');
-				break;
-			case 'error':
-				$table->max = $event->get_count('error');
-				break;
-			case 'acknowledge':
-				$table->max = $event->get_count('acknowledge');
-				break;
-			case 'warning':
-				$table->max = $event->get_count('warning');
-				break;
-		}
-
-		$table->init();
-		switch ($this->response->html->request()->get('event_filter')) {
-			case '':
-			case 'all':
-				$events = $event->display_overview($table->offset, $table->limit, $table->sort, $table->order);
-				break;
-			case 'active':
-				$events = $event->display_overview($table->offset, $table->limit, $table->sort, $table->order, 'active');
-				break;
-			case 'error':
-				$events = $event->display_overview($table->offset, $table->limit, $table->sort, $table->order, 'error');
-				break;
-			case 'acknowledge':
-				$events = $event->display_overview($table->offset, $table->limit, $table->sort, $table->order, 'acknowledge');
-				break;
-			case 'warning':
-				$events = $event->display_overview($table->offset, $table->limit, $table->sort, $table->order, 'warning');
-				break;
-		}
-		
-		$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-		$i = 0;
-		foreach ($events as $key => $value) {
-			$icon="transition.png";
-			switch ($value['event_priority']) {
-					case 0:
-						$icon = '<span class="pill off">off</span>'; break;
-					case 1:
-					case 2:
-					case 3:
-						$icon = '<span class="pill red">error</span>'; break; // error event
-					case 4:
-					case 5:
-					case 6:
-					case 7:
-					case 8:
-						$icon = '<span class="pill green">notice</span>'; break; // undefined event
-					case 9:	
-						$icon = '<span class="pill yellow">running</span>'; break; // active event
-					case 10:
-						$icon = '<span class="pill green">ok</span>'; break; // notice event
-			}
-			if ($value['event_status'] === '1') {
-					$icon = '<span class="pill green">ack</span>'; // acknowledged event
-			}
-			$description = '';
-			if (strstr($value['event_description'], "ERROR running token")) {
-				$error_token = str_replace("ERROR running token ", "", $value['event_description']);
-				$cmd_file = $this->rootdir."/server/event/errors/".$error_token.".cmd";
-				$error_file = $this->rootdir."/server/event/errors/".$error_token.".out";
-
-				// get command and error strings
-				if (($this->file->exists($cmd_file)) && ($this->file->exists($error_file))) {
-					$oq_cmd = $this->file->get_contents($cmd_file);
-					$oq_cmd = str_replace('"','', $oq_cmd);
-					$oq_cmd_error = $this->file->get_contents($error_file);
-					$oq_cmd_error = str_replace('"','', $oq_cmd_error);
-					// set the event to error in any way
-					$event_fields = array();
-					$event_fields["event_priority"] = 1;
-					$event->update($value['event_id'], $event_fields);
-					$event->get_instance_by_id($value['event_id']);
-					$icon = '<span class="pill red">error</span>';
-					// set the description
-					$description  = "<a href=\"/openqrm/base/server/event/errors/".$error_token.".out\" title=\"".$oq_cmd_error."\" target=\"_BLANK\">Error</a> running openQRM <a href=\"/openqrm/base/server/event/errors/".$error_token.".cmd\" title=\"".$oq_cmd."\"target=\"_BLANK\">command</a>";
-					
-					$a = $this->response->html->a();
-					$a->title   = $this->lang['action_rerun'];
-					$a->label   = $this->lang['action_rerun'];
-					$a->handler = 'onclick="wait();"';
-					$a->css     = 'start pull-right';
-					$a->href    = $this->response->get_url($this->actions_name, 'rerun').'&token='.$error_token.'&event_id='.$event->id;
-					$rerun = $a->get_string();
-					$description .= $rerun;
-				} else {
-					// we are currently re-running the token, do not show the links
-					$description = "Error running openQRM command<br><strong>Currently re-running token $error_token</strong>";
-				}
-			} else {
-				$description = $value['event_description'];
-			}
-			$b[$i]['event_id'] = $value['event_id'];
-			$b[$i]['event_priority'] = $icon;
-			$b[$i]['event_time'] = date('Y/m/d H:i:s', $value['event_time']);
-			$b[$i]['event_source'] = $value['event_source'];
-			$b[$i]['event_description'] = $description;
-			$i++;
-		}
-
-		$filter = array();
-		$filter[] = array('', 'all');
-		$filter[] = array($this->lang['filter_active'], 'active');
-		$filter[] = array($this->lang['filter_warning'], 'warning');
-		$filter[] = array($this->lang['filter_error'], 'error');
-		$filter[] = array($this->lang['filter_acknowledge'], 'acknowledge');
-		asort($filter);
-
-		$select = $this->response->html->select();
-		$select->add($filter, array(1,0));
-		$select->name = 'event_filter';
-		$select->handler = 'onchange="wait();this.form.submit();return false;"';
-		$select->selected = array($this->response->html->request()->get('event_filter'));
-		$box = $this->response->html->box();
-		$box->add($select);
-		$box->id = 'events_filter';
-		$box->css = 'htmlobject_box';
-		$box->label = $this->lang['lang_filter'];
-
-		$table->add_headrow($box->get_string());
-
-		$table->id = 'Tabelle';
-		$table->css = 'htmlobject_table';
-		$table->border = 1;
-		$table->cellspacing = 0;
-		$table->form_action = $this->response->html->thisfile;
-		$table->cellpadding = 3;
-		$table->autosort = false;
-		$table->sort_link = false;
-		$table->head = $h;
-		$table->body = $b;
-		$table->actions_name = $this->actions_name;
-		$table->actions = array(
-							array('remove' => $this->lang['action_remove']),
-							array('acknowledge' => $this->lang['action_acknowledge'])
-						);
-		$table->identifier = 'event_id';
-		$table->identifier_name = $this->identifier_name;
-		$table->limit_select = array(
-			array("value" => 100, "text" => 100),
-			array("value" => 200, "text" => 200),
-			array("value" => 400, "text" => 400),
-			array("value" => 500, "text" => 500)
-		);
-		return $table;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/event/css/event.css b/openQRM-5.3.50-CE/src/web/base/server/event/css/event.css
deleted file mode 100644
index c71ea21..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/event/css/event.css
+++ /dev/null
@@ -1,3 +0,0 @@
-td.event_priority {
-	text-align: center;
-}
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/web/base/server/event/lang/de.event-content.ini b/openQRM-5.3.50-CE/src/web/base/server/event/lang/de.event-content.ini
deleted file mode 100644
index 97dcee0..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/event/lang/de.event-content.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[event]
-ltimeout = "Die openQRM Enterprise Client Lizenz ist nicht mehr gültig. Bitte die Lizenz erneuern!"
-lclients = "Mehr openQRM Enterprise Clients als lizensiert. Bitte die Lizenz erneuern!"
diff --git a/openQRM-5.3.50-CE/src/web/base/server/event/lang/de.event.ini b/openQRM-5.3.50-CE/src/web/base/server/event/lang/de.event.ini
deleted file mode 100644
index 75fbf85..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/event/lang/de.event.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[select]
-tab = "Ereignisse"
-label = "Ereignis"
-action_remove = "remove"
-action_rerun = "Nochmals ausführen"
-action_acknowledge = "acknowledge"
-table_state = "Status"
-table_id = "Id"
-table_date = "Datum"
-table_source = "Quelle"
-table_description = "Beschreibung"
-lang_filter = "Filter nach Ereignis Typ"
-filter_error = "Fehler"
-filter_active = "Aktiv"
-filter_warning = "Warnung"
-filter_acknowledge = "Acknowledged"
-please_wait = "Lade Events. Bitte warten ..."
-
-[remove]
-label = "Entferne Ereignis(se)"
-msg = "Ereignis %s entfernt"
-error_timeout = "Timeout beim entfernen von Ereignis %s"
-error_start = "Ereignis %s konnte nicht entfernt werden"
-
-[acknowledge]
-label = "Acknowledge Ereignis(se)"
-msg = "Acknowledged Ereignis %s"
-
-[rerun]
-label = "Wiederhole Ereignis(se)"
-msg = "Wiederhole Ereignis %s"
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/event/lang/en.event-content.ini b/openQRM-5.3.50-CE/src/web/base/server/event/lang/en.event-content.ini
deleted file mode 100644
index c4df0f2..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/event/lang/en.event-content.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[event]
-ltimeout = "Your openQRM Enterprise Client License is not valid any more. Please renew the license!"
-lclients = "You are running more openQRM Enterprise Clients than licenced. Please renew the license!"
diff --git a/openQRM-5.3.50-CE/src/web/base/server/event/lang/en.event.ini b/openQRM-5.3.50-CE/src/web/base/server/event/lang/en.event.ini
deleted file mode 100644
index 347d4e1..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/event/lang/en.event.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[select]
-tab = "Events"
-label = "Events"
-action_remove = "remove"
-action_rerun = "re-run command"
-action_acknowledge = "acknowledge"
-table_state = "State"
-table_id = "Id"
-table_date = "Date"
-table_source = "Source"
-table_description = "Description"
-lang_filter = "Filter by state"
-filter_error = "Error"
-filter_active = "Active"
-filter_warning = "Warning"
-filter_acknowledge = "Acknowledged"
-please_wait = "Loading. Please wait .."
-
-[remove]
-label = "Remove Events(s)"
-msg = "Removed event %s"
-error_timeout = "Timeout while trying to remove event %s"
-error_start = "Could not remove event %s"
-
-[acknowledge]
-label = "Acknowledge Events(s)"
-msg = "Acknowledged Event %s"
-
-[rerun]
-label = "Rerun Events(s)"
-msg = "Rerun Event %s"
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/event/lang/es.event.ini b/openQRM-5.3.50-CE/src/web/base/server/event/lang/es.event.ini
deleted file mode 100644
index 53a2692..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/event/lang/es.event.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[select]
-tab = "Eventos"
-label = "Eventos"
-action_remove = "quitar"
-action_rerun = "Volver a ejecutar el comando"
-action_acknowledge = "Acusar recibo"
-table_state = "Estado"
-table_id = "Id"
-table_date = "Fecha"
-table_source = "Origen"
-table_description = "Descripción"
-lang_filter = "Filtrar por estado"
-filter_error = "Error"
-filter_active = "Activo"
-filter_warning = "Precaución"
-filter_acknowledge = "Acusar recibo"
-please_wait = "Cargando. Por favor espere .."
-
-[remove]
-label = "Quitar Evento(s)"
-msg = "Se ha eliminado el evento %s"
-error_timeout = "Se ha alcanzado el tiempo límite mientras se intentaba eliminar el evento %s"
-error_start = "No se pudo eliminar el evento %s"
-
-[acknowledge]
-label = "Confirmación de Evento(s)"
-msg = "Evento %s confirmado"
-
-[rerun]
-label = "Volver a ejecutar Evento(s)"
-msg = "El evento %s ha sido ejecutado de nuevo"
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/event/tpl/event-select.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/event/tpl/event-select.tpl.php
deleted file mode 100644
index b72d038..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/event/tpl/event-select.tpl.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-
-<h2>{label}</h2>
-{table}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/class/image.add.class.php b/openQRM-5.3.50-CE/src/web/base/server/image/class/image.add.class.php
deleted file mode 100644
index 0ba0a43..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/class/image.add.class.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/**
- * Image Add
- *
-    openQRM Enterprise developed by openQRM Enterprise GmbH.
-
-    All source code and content (c) Copyright 2014, openQRM Enterprise GmbH unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with openQRM Enterprise GmbH.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2014, openQRM Enterprise GmbH <info@openqrm-enterprise.com>
- */
-
-class image_add
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'image_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "image_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'image_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'image_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-		$id = $this->response->html->request()->get('appliance_id');
-		if($id !== '') {
-			$this->response->add('appliance_id', $id);
-			$this->appliance = new appliance();
-			$this->appliance->get_instance_by_id($id);
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-
-		$deployment = new deployment();
-		$deployment_id_array = $deployment->get_deployment_ids();
-		$info = '<div class="infotext">'.$this->lang['info'].'</div>';
-
-		$storage_link_section = '';
-		if(isset($this->appliance)) {
-			$resource = new resource();
-			$resource->get_instance_by_id($this->appliance->resources);
-			$virtualization = new virtualization();
-			$virtualization->get_instance_by_id($resource->vtype);
-			#$resourceinfo  = '<b>Server:</b> '.$this->appliance->id.' / '.$this->appliance->name.'<br>';
-			$info = '<b>Resource:</b> '.$resource->id.' / '.$resource->ip.' '.$resource->hostname.' - '.$virtualization->name.'<br><br>'.$info;
-			foreach($deployment_id_array as $id) {
-				$new_image_link = '';
-				$deployment->get_instance_by_id($id['deployment_id']);
-				if (($deployment->storagetype != 'none') && ($deployment->storagetype != 'local-server')) {
-					if (strstr($resource->capabilities, "TYPE=local-server")) {
-						// disable - local-server already has an image and cannot be re-deployed with a differenet one
-						continue;
-					}
-					else if (strstr($virtualization->type, "-vm-local")) {
-						// get virt plugin name, check if deployment->storagetype == virt plugin name
-						if ($deployment->storagetype === $virtualization->get_plugin_name()) {
-							$new_image_link = $this->response->get_url($this->actions_name, 'load').'&iplugin='.$deployment->storagetype;
-
-						}
-					}
-					else if (strstr($virtualization->type, "-vm-net")) {
-						// find with image-deployment type hook if deployment is network-deployment
-						$is_network_deployment = false;
-						$rootdevice_identifier_hook = $this->openqrm->get('basedir')."/web/boot-service/image.".$deployment->type.".php";
-						if (file_exists($rootdevice_identifier_hook)) {
-							require_once "$rootdevice_identifier_hook";
-							$image_is_network_deployment_function="get_".$deployment->type."_is_network_deployment";
-							$image_is_network_deployment_function=str_replace("-", "_", $image_is_network_deployment_function);
-							if($image_is_network_deployment_function()) {
-								$new_image_link = $this->response->get_url($this->actions_name, 'load').'&iplugin='.$deployment->storagetype;
-							}
-						}
-					} else {
-						// $new_image_link = "/openqrm/base/index.php?plugin=".$deployment->storagetype;
-						// same as vm-net
-						// all network deployment types
-					}
-					if($new_image_link !== '') {
-						$storage_link_section .= "<a href='".$new_image_link."' style='text-decoration: none'><img title='".sprintf($this->lang['create_image'], $deployment->description)."' alt='".sprintf($this->lang['create_image'], $deployment->description)."' src='/openqrm/base/plugins/".$deployment->storagetype."/img/plugin.png' border=0> ".$deployment->description."</a><br>";
-					}
-				}
-			}
-		} else {
-			foreach ($deployment_id_array as $deployment_id) {
-				$deployment->get_instance_by_id($deployment_id['deployment_id']);
-				if (($deployment->storagetype != 'none') && ($deployment->storagetype != 'local-server')) {
-					#$new_image_link = "/openqrm/base/index.php?plugin=".$deployment->storagetype;
-					$new_image_link = $this->response->get_url($this->actions_name, 'load').'&iplugin='.$deployment->storagetype;
-					switch ($deployment->storagetype) {
-						case 'coraid-storage':
-						case 'equallogic-storage':
-						case 'netapp-storage':
-							$new_image_link = "/openqrm/base/index.php?iframe=/openqrm/base/plugins/".$deployment->storagetype."/".$deployment->storagetype."-manager.php";
-							break;
-					}
-					$storage_link_section .= "<a href='".$new_image_link."' style='text-decoration: none'><img title='".sprintf($this->lang['create_image'], $deployment->description)."' alt='".sprintf($this->lang['create_image'], $deployment->description)."' src='/openqrm/base/plugins/".$deployment->storagetype."/img/plugin.png' border=0> ".$deployment->description."</a><br>";
-				}
-			}
-		}
-
-		if (!strlen($storage_link_section)) {
-			$storage_link_section = $this->lang['start_storage_plugin'];
-		}
-
-		$t = $this->response->html->template($this->tpldir.'/image-add.tpl.php');
-		$t->add($storage_link_section, 'image_new');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['title'], 'title');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->lang['canceled'], 'canceled');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->add($info, 'info');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-
-}
-?>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/class/image.controller.class.php b/openQRM-5.3.50-CE/src/web/base/server/image/class/image.controller.class.php
deleted file mode 100644
index 9befdff..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/class/image.controller.class.php
+++ /dev/null
@@ -1,504 +0,0 @@
-<?php
-/**
- * Image Controller
- *
-    openQRM Enterprise developed by openQRM Enterprise GmbH.
-
-    All source code and content (c) Copyright 2014, openQRM Enterprise GmbH unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with openQRM Enterprise GmbH.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2014, openQRM Enterprise GmbH <info@openqrm-enterprise.com>
- */
-
-class image_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'image_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "image_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'image_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'image_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array (
-		'tab' => 'Images',
-		'label' => 'Images',
-		'action_remove' => 'remove',
-		'action_mgmt' => 'manage',
-		'action_edit' => 'edit',
-		'action_add' => 'Add a new Image',
-		'action_install1' => 'install1',
-		'action_install2' => 'install2',
-		'table_name' => 'Name',
-		'table_id' => 'ID',
-		'table_version' => 'Version',
-		'table_deployment' => 'Deployment',
-		'table_isactive' => 'State',
-		'table_comment' => 'Comment',
-		'table_storage' => 'Storage',
-		'table_edit' => 'Edit',
-		'table_name' => 'Name',
-		'table_capabilities' => 'Capabilities',
-		'table_image' => 'Image',
-		'table_root' => 'Root',
-		'lang_active' => 'active',
-		'lang_inactive' => 'inactive',
-		'lang_filter' => 'Filter by Deployment',
-		'please_wait' => 'Loading. Please wait ..',
-	),
-	'add' => array (
-		'tab' => 'Add Image',
-		'label' => 'Add Image',
-		'title' => 'Adding a new Image as',
-		'start_storage_plugin' => 'Please enable and start one of the storage plugins!',
-		'info' => 'The image represents the &quot;disk&quot; for a virtual machine. Dependent on the virtuallization technology it can be a blockfile (either in a directory on a local HDD or a network directory provided by e.g. NFS) and/or an empty partition (either a partition on a local HDD or network e.g. Iscsi), manged with LVM as partiotion manager.',
-		'create_image' => 'a Volume from Storage type %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'remove' => array (
-		'tab' => 'Remove Image',
-		'label' => 'Remove Images(s)',
-		'msg' => 'Removed Image %s',
-		'msg_not_removing_active' => 'Not removing Image %s!<br>It is still in use by Server %s !',
-		'msg_not_removing' => 'Force-removal not set! Not removing Image %s!',
-		'msg_force_remove' => 'Force removal of Image',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'edit' => array (
-		'tab' => 'Edit Image',
-		'label' => 'Edit Image %s',
-		'msg' => 'Edited Image %s',
-		'form_comment' => 'Comment',
-		'form_install_from_nfs' => 'Install from NAS/NFS',
-		'form_transfer_to_nfs' => 'Transfer to NAS/NFS',
-		'form_install_from_local' => 'Install from local disk',
-		'form_transfer_to_local' => 'Transfer to local disk',
-		'form_install_from_template' => 'Automatic Installation',
-		'form_image_password' => 'Password',
-		'form_image_password_repeat' => 'Password (repeat)',
-		'form_image_version' => 'Version',
-		'lang_password_generate' => 'generate password',
-		'lang_password_show' => 'show password',
-		'lang_password_hide' => 'hide password',
-		'please_wait' => 'Loading. Please wait ..',
-		'error_password' => 'Password (repeat) does not match Password',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'install1' => array (
-		'tab' => 'Install Image (1/2)',
-		'label' => 'Select Install Server for image %s on storage %s',
-		'title' => 'Select Install Server',
-		'form_install_server' => 'Select Install Server',
-		'msg' => 'Selected Install Server for Image %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'install2' => array (
-		'tab' => 'Install Image (2/2)',
-		'label' => 'Select Install Template for image %s on storage %s',
-		'title' => 'Select Install Template',
-		'msg' => 'Selected Install Template %s for Image %s',
-		'form_install_template' => 'Selected Install Template',
-		'form_install_persistent' => 'Persistent Installation',
-		'form_install_parameter' => 'Installation Parameter',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->tpldir   = $this->rootdir.'/server/image/tpl';
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/server/image/lang", 'image.ini');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "select";
-		}
-
-		// handle table params
-		$vars = $this->response->html->request()->get('image');
-		if($vars !== '') {
-			if(!isset($vars['action'])) {
-				foreach($vars as $k => $v) {
-					$this->response->add('image['.$k.']', $v);
-				}
-			} else {
-				foreach($vars as $k => $v) {
-					unset($this->response->params['image['.$k.']']);
-				}
-			}
-		}
-
-
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'add':
-				$content[] = $this->select(false);
-				$content[] = $this->add(true);
-			break;
-			case 'remove':
-				$content[] = $this->select(false);
-				$content[] = $this->remove(true);
-			break;
-			case 'edit':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-			break;
-			case 'install1':
-				$content[] = $this->select(false);
-				$content[] = $this->install1(true);
-			break;
-			case 'install2':
-				$content[] = $this->select(false);
-				$content[] = $this->install2(true);
-			break;
-			case 'load':
-				$content[]     = $this->select(false);
-				$tmp           = $this->add(false);
-				$tmp['value']  = $this->__loader();
-				$tmp['active'] = true;
-				$content[]     = $tmp;
-			break;
-		}
-
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->rootdir.'/server/image/class/image.api.class.php');
-		$controller = new image_api($this);
-		$controller->action();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select image
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/image/class/image.select.class.php');
-			$controller = new image_select($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Add image
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function add( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/image/class/image.add.class.php');
-			$controller                  = new image_add($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['add'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['add']['label'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'add' );
-		$content['onclick'] = false;
-		if($this->action === 'add' || $this->action === $this->lang['select']['action_add']){
-			$content['active']  = true;
-		}
-		return $content;
-	}	
-
-	//--------------------------------------------
-	/**
-	 * Remove image
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function remove( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/image/class/image.remove.class.php');
-			$controller                  = new image_remove($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['remove'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['remove']['tab'];
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'remove' );
-		$content['onclick'] = false;
-		if($this->action === 'remove' || $this->action === $this->lang['select']['action_remove']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit image
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function edit( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/image/class/image.edit.class.php');
-			$controller                  = new image_edit($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['edit'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['edit']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'edit' );
-		$content['onclick'] = false;
-		if($this->action === 'edit' || $this->action === $this->lang['select']['action_edit']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Install image from template step1
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function install1( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/image/class/image.install1.class.php');
-			$controller                  = new image_install1($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['install1'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['install1']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'install1' );
-		$content['onclick'] = false;
-		if($this->action === 'install1' || $this->action === $this->lang['select']['action_install1']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Install image from template step2
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function install2( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/image/class/image.install2.class.php');
-			$controller                  = new image_install2($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['install2'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['install2']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'install2' );
-		$content['onclick'] = false;
-		if($this->action === 'install2' || $this->action === $this->lang['select']['action_install2']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Load Plugin as new tab
-	 *
-	 * @access public
-	 * @return object
-	 */
-	//--------------------------------------------
-	function __loader() {
-
-		$plugin = $this->response->html->request()->get('iplugin');
-		$name   = $plugin;
-		$class  = $plugin;
-		if($this->response->html->request()->get('icontroller') !== '') {
-			$class = $this->response->html->request()->get('icontroller');
-			$name  = $class;
-		}
-		$class  = str_replace('-', '_', $class).'_controller';
-
-		// handle new response object
-		$response = $this->response->response();
-		$response->id = 'iload';
-		unset($response->params['image[sort]']);
-		unset($response->params['image[order]']);
-		unset($response->params['image[limit]']);
-		unset($response->params['image[offset]']);
-		unset($response->params['image_filter']);
-		$response->add('iplugin', $plugin);
-		$response->add('icontroller', $name);
-		$response->add($this->actions_name, 'load');
-
-		$path   = $this->openqrm->get('webdir').'/plugins/'.$plugin.'/class/'.$name.'.controller.class.php';
-		$role = $this->openqrm->role($response);
-		$data = $role->get_plugin($class, $path);
-		$data->pluginroot = '/plugins/'.$plugin;
-		return $data;
-	}
-
-
-
-}
-?>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/class/image.edit.class.php b/openQRM-5.3.50-CE/src/web/base/server/image/class/image.edit.class.php
deleted file mode 100644
index e683d4d..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/class/image.edit.class.php
+++ /dev/null
@@ -1,467 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-class image_edit
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'image_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "image_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'image_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'image_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-		$this->user       = $openqrm->user();
-		$this->response->params['image_id'] = $this->response->html->request()->get('image_id');
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->edit();
-		if(isset($response->msg)) {
-			if ($response->msg === 'install-from-template') {
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=image&image_action=install1&image_id='.$response->image_id.'&install_from_template='.$response->install_from_template
-				);
-			} else {
-				// check if we are in the appliance wizard
-				if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 3) {
-					// only if this is the image of the appliance in the wizard
-					$wizard_appliance = new appliance();
-					$wizard_appliance->get_instance_by_id($this->user->wizard_id);
-					if ($wizard_appliance->imageid == $response->image_id) {
-						// this is our image redirect to step 4
-						$this->response->redirect(
-							$this->response->html->thisfile.'?base=appliance&appliance_action=step4&appliance_id='.$this->user->wizard_id.'&image_id='.$response->image_id
-						);
-					} else {
-						// regular select redir
-						$this->response->redirect(
-							$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-						);
-					}
-
-				} else {
-					$this->response->redirect(
-						$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-					);
-				}
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-
-		$t = $this->response->html->template($this->tpldir.'/image-edit.tpl.php');
-		$t->add(sprintf($this->lang['label'], $response->name), 'label');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['lang_password_generate'], 'lang_password_generate');
-		$t->add($this->lang['lang_password_show'], 'lang_password_show');
-		$t->add($this->lang['lang_password_hide'], 'lang_password_hide');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->lang['canceled'], 'canceled');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function edit() {
-		$response  = $this->get_response();
-		$form      = $response->form;
-		$id        = $this->response->html->request()->get('image_id');
-
-		if($id !== '') {
-
-			// check password
-			$pass = $form->get_request('image_password');
-			if($pass !== '' && $pass !== $form->get_request('image_password_2')) {
-				$form->set_error('image_password_2', $this->lang['error_password']);
-			}
-
-			$image = new image();
-			$image->get_instance_by_id($id);
-			if(!$form->get_errors() && $this->response->submit()) {
-				$image_password			= $this->response->html->request()->get('image_password');
-				$install_from_local		= $this->response->html->request()->get('install_from_local');
-				$transfer_to_local		= $this->response->html->request()->get('transfer_to_local');
-				$install_from_nfs		= $this->response->html->request()->get('install_from_nfs');
-				$transfer_to_nfs		= $this->response->html->request()->get('transfer_to_nfs');
-				$install_from_template	= $this->response->html->request()->get('install_from_template');
-				$image_comment			= $this->response->html->request()->get('image_comment');
-				$image_version			= $this->response->html->request()->get('image_version');
-				// update image
-				$fields['image_comment'] = $image_comment;
-				$fields['image_version'] = $image_version;
-				$image->update($id, $fields);
-				$image->get_instance_by_id($id);
-				# set password if given
-				if(strlen($image_password)) {
-					$image->set_root_password($id, $image_password);
-				} else {
-					$CMD="rm -f ".$this->openqrm->get('basedir')."/web/action/image-auth/iauth.".$id.".php";
-					exec($CMD);
-				}
-				// install-from-nfs
-				if(strlen($install_from_nfs)) {
-					$install_from_nfs_image = new image();
-					$install_from_nfs_image->get_instance_by_id($install_from_nfs);
-					$install_from_nfs_storage = new storage();
-					$install_from_nfs_storage->get_instance_by_id($install_from_nfs_image->storageid);
-					$install_from_nfs_storage_resource = new resource();
-					$install_from_nfs_storage_resource->get_instance_by_id($install_from_nfs_storage->resource_id);
-					$install_from_nfs_storage_ip=$install_from_nfs_storage_resource->ip;
-					$install_from_nfs_storage_path=$install_from_nfs_image->rootdevice;
-					$install_from_nfs_path = $install_from_nfs_image->storageid.":".$install_from_nfs_storage_ip.":".$install_from_nfs_storage_path;
-					$image->set_deployment_parameters("IMAGE_INSTALL_FROM_NFS", $install_from_nfs_path);
-				} else {
-					$image->set_deployment_parameters("IMAGE_INSTALL_FROM_NFS", "");
-				}
-				// transfer-to-nfs, we have to refresh the image object here
-				$image->get_instance_by_id($id);
-				if(strlen($transfer_to_nfs)) {
-					$transfer_to_nfs_image = new image();
-					$transfer_to_nfs_image->get_instance_by_id($transfer_to_nfs);
-					$transfer_to_nfs_storage = new storage();
-					$transfer_to_nfs_storage->get_instance_by_id($transfer_to_nfs_image->storageid);
-					$transfer_to_nfs_storage_resource = new resource();
-					$transfer_to_nfs_storage_resource->get_instance_by_id($transfer_to_nfs_storage->resource_id);
-					$transfer_to_nfs_storage_ip=$transfer_to_nfs_storage_resource->ip;
-					$transfer_to_nfs_storage_path=$transfer_to_nfs_image->rootdevice;
-					$transfer_to_nfs_path = $transfer_to_nfs_image->storageid.":".$transfer_to_nfs_storage_ip.":".$transfer_to_nfs_storage_path;
-					$image->set_deployment_parameters("IMAGE_TRANSFER_TO_NFS", $transfer_to_nfs_path);
-				} else {
-					$image->set_deployment_parameters("IMAGE_TRANSFER_TO_NFS", "");
-				}
-				// install-from-local, we have to refresh the image object again
-				$image->get_instance_by_id($id);
-				if(strlen($install_from_local)) {
-					$image->set_deployment_parameters("IMAGE_INSTALL_FROM_LOCAL", $install_from_local);
-				} else {
-					$image->set_deployment_parameters("IMAGE_INSTALL_FROM_LOCAL", "");
-				}
-				// transfer-to-local, we have to refresh the image object again
-				$image->get_instance_by_id($id);
-				if(strlen($transfer_to_local)) {
-					$image->set_deployment_parameters("IMAGE_TRANSFER_TO_LOCAL", $transfer_to_local);
-				} else {
-					$image->set_deployment_parameters("IMAGE_TRANSFER_TO_LOCAL", "");
-				}
-				// reset deployment parameter INSTALL_CONFIG
-				$image->set_deployment_parameters("INSTALL_CONFIG", "");
-				if (strlen($install_from_template)) {
-					// redirect to install-from-template step1
-					$response->msg = 'install-from-template';
-					$response->install_from_template = $install_from_template;
-
-				} else {
-					$response->msg = sprintf($this->lang['msg'], $image->name);
-				}
-
-			
-				$response->image_id = $id;
-			}
-			$response->name = $image->name;
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'edit');
-		$id = $this->response->html->request()->get('image_id');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$image  = $this->openqrm->image();
-		$image->get_instance_by_id($id);
-		$storage = $this->openqrm->storage();
-		$storage->get_instance_by_id($image->storageid);
-		$deployment = $this->openqrm->deployment();
-		$deployment->get_instance_by_id($storage->type);
-		$storage_resource = $this->openqrm->resource();
-		$storage_resource->get_instance_by_id($storage->resource_id);
-
-		// making the deployment parameters plugg-able
-		$rootdevice_identifier_hook = $this->openqrm->get('basedir')."/web/boot-service/image.".$deployment->type.".php";
-		if (file_exists($rootdevice_identifier_hook)) {
-			require_once "$rootdevice_identifier_hook";
-			// run function returning rootdevice array
-			$get_rootfs_transfer_methods_function = "get_".$deployment->type."_rootfs_transfer_methods";
-			$get_rootfs_transfer_methods_function = str_replace("-", "_", $get_rootfs_transfer_methods_function);
-			$rootfs_transfer_methods = $get_rootfs_transfer_methods_function();
-
-			$get_rootfs_set_password_method_function = "get_".$deployment->type."_rootfs_set_password_method";
-			$get_rootfs_set_password_method_function = str_replace("-", "_", $get_rootfs_set_password_method_function);
-			$rootfs_set_password_method = $get_rootfs_set_password_method_function();
-
-			$get_rootfs_local_deployment_enabled_function = "get_".$deployment->type."_local_deployment_enabled";
-			$get_rootfs_local_deployment_enabled_function = str_replace("-", "_", $get_rootfs_local_deployment_enabled_function);
-			$rootfs_local_deployment_enabled = $get_rootfs_local_deployment_enabled_function();
-		} else {
-			$rootfs_transfer_methods = false;
-			$rootfs_set_password_method = false;
-			$rootfs_local_deployment_enabled = false;
-		}
-
-		// making the local deployment parameter plugg-able
-		$local_deployment_methods_input = "";
-		if ($rootfs_local_deployment_enabled) {
-			$local_deployment_methods_arr[] = array("value" => "", "label" => "");
-			$local_deployment = new deployment();
-			$deployment_id_arr = $local_deployment->get_deployment_ids();
-			foreach($deployment_id_arr as $deployment_id) {
-				$local_deployment->get_instance_by_id($deployment_id['deployment_id']);
-				$local_deployment_templates_identifier_hook = $this->openqrm->get('basedir')."/web/boot-service/template.".$local_deployment->type.".php";
-				if (file_exists($local_deployment_templates_identifier_hook)) {
-					require_once "$local_deployment_templates_identifier_hook";
-					$deployment_function="get_"."$local_deployment->type"."_methods";
-					$deployment_function=str_replace("-", "_", $deployment_function);
-					$local_deployment_methods_arr[] = $deployment_function();
-				}
-			}
-		}
-
-		// in case the deployment method provides the rootfs-transfer options
-		$nfs_image_identifier_array = array();
-		if ($rootfs_transfer_methods) {
-			// prepare the install-from and transfer-to selects
-			$nfs_image_identifier_array[] = array("value" => "", "label" => "");
-			$nfs_image = new image();
-			$image_arr = $nfs_image->get_ids();
-			foreach ($image_arr as $id) {
-				$i_id = $id['image_id'];
-				$timage = new image();
-				$timage->get_instance_by_id($i_id);
-				if (strstr($timage->type, "nfs")) {
-					$timage_name = $timage->name;
-					$nfs_image_identifier_array[] = array("value" => "$i_id", "label" => "$timage_name");
-				}
-			}
-		}
-
-
-		$html = new htmlobject_div();
-		$html->text = '<a href="../../plugins/'.$deployment->storagetype.'/'.$deployment->storagetype.'-about.php" target="_blank" class="doculink">'.$deployment->description.'</a>';
-		$html->id = 'htmlobject_image_type';
-
-		$storage_deploy_box = new htmlobject_box();
-		$storage_deploy_box->id = 'htmlobject_box_image_deploy';
-		$storage_deploy_box->css = 'htmlobject_box';
-		$storage_deploy_box->label = 'Deployment';
-		$storage_deploy_box->content = $html;
-
-		$html = new htmlobject_div();
-		$html->text = $deployment->storagedescription;
-		$html->id = 'htmlobject_storage_type';
-
-		$storage_type_box = new htmlobject_box();
-		$storage_type_box->id = 'htmlobject_box_storage_type';
-		$storage_type_box->css = 'htmlobject_box';
-		$storage_type_box->label = 'Storage';
-		$storage_type_box->content = $html;
-
-		#$storage_resource->id /
-		$html = new htmlobject_div();
-		$html->text = "$storage_resource->ip";
-		$html->id = 'htmlobject_storage_resource';
-
-		$storage_resource_box = new htmlobject_box();
-		$storage_resource_box->id = 'htmlobject_box_storage_resource';
-		$storage_resource_box->css = 'htmlobject_box';
-		$storage_resource_box->label = 'Resource';
-		$storage_resource_box->content = $html;
-
-
-
-		// in case the deployment type allows to set the password in the image
-		if ($rootfs_set_password_method) {
-			$d['image_password']['label']                    = $this->lang['form_image_password'];
-			$d['image_password']['required']                 = false;
-			$d['image_password']['object']['type']           = 'htmlobject_input';
-			$d['image_password']['object']['attrib']['id']   = 'pass_1';
-			$d['image_password']['object']['attrib']['type'] = 'password';
-			$d['image_password']['object']['attrib']['name'] = 'image_password';
-
-			$d['image_password_2']['label']                    = $this->lang['form_image_password_repeat'];
-			$d['image_password_2']['required']                 = false;
-			$d['image_password_2']['object']['type']           = 'htmlobject_input';
-			$d['image_password_2']['object']['attrib']['id']   = 'pass_2';
-			$d['image_password_2']['object']['attrib']['type'] = 'password';
-			$d['image_password_2']['object']['attrib']['name'] = 'image_password_2';
-		} else {
-			$d['image_password']   = '';
-			$d['image_password_2'] = '';
-		}
-
-
-		if ($rootfs_transfer_methods) {
-
-			$d['install_from_local']['label']                          = $this->lang['form_install_from_local'];
-			$d['install_from_local']['required']                       = false;
-			$d['install_from_local']['object']['type']                 = 'htmlobject_input';
-			$d['install_from_local']['object']['attrib']['id']         = 'install_from_local';
-			$d['install_from_local']['object']['attrib']['name']       = 'install_from_local';
-
-			$d['transfer_to_local']['label']                          = $this->lang['form_transfer_to_local'];
-			$d['transfer_to_local']['required']                       = false;
-			$d['transfer_to_local']['object']['type']                 = 'htmlobject_input';
-			$d['transfer_to_local']['object']['attrib']['id']         = 'transfer_to_local';
-			$d['transfer_to_local']['object']['attrib']['name']       = 'transfer_to_local';
-
-
-			$d['install_from_nfs']['label']                          = $this->lang['form_install_from_nfs'];
-			$d['install_from_nfs']['required']                       = false;
-			$d['install_from_nfs']['object']['type']                 = 'htmlobject_select';
-			$d['install_from_nfs']['object']['attrib']['index']      = array('value', 'label');
-			$d['install_from_nfs']['object']['attrib']['id']         = 'install_from_nfs';
-			$d['install_from_nfs']['object']['attrib']['name']       = 'install_from_nfs';
-			$d['install_from_nfs']['object']['attrib']['options']    = $nfs_image_identifier_array;
-
-			$d['transfer_to_nfs']['label']                          = $this->lang['form_transfer_to_nfs'];
-			$d['transfer_to_nfs']['required']                       = false;
-			$d['transfer_to_nfs']['object']['type']                 = 'htmlobject_select';
-			$d['transfer_to_nfs']['object']['attrib']['index']      = array('value', 'label');
-			$d['transfer_to_nfs']['object']['attrib']['id']         = 'transfer_to_nfs';
-			$d['transfer_to_nfs']['object']['attrib']['name']       = 'transfer_to_nfs';
-			$d['transfer_to_nfs']['object']['attrib']['options']    = $nfs_image_identifier_array;
-
-		} else {
-
-			$d['install_from_local'] = '';
-			$d['transfer_to_local'] = '';
-			$d['install_from_nfs'] = '';
-			$d['transfer_to_nfs'] = '';
-		}
-
-
-		if ($rootfs_local_deployment_enabled) {
-
-			$d['install_from_template']['label']                          = $this->lang['form_install_from_template'];
-			$d['install_from_template']['required']                       = false;
-			$d['install_from_template']['object']['type']                 = 'htmlobject_select';
-			$d['install_from_template']['object']['attrib']['index']      = array('value', 'label');
-			$d['install_from_template']['object']['attrib']['id']         = 'install_from_template';
-			$d['install_from_template']['object']['attrib']['name']       = 'install_from_template';
-			$d['install_from_template']['object']['attrib']['options']    = $local_deployment_methods_arr;
-
-		} else {
-			$d['install_from_template'] = '';
-		}
-		$image_version_arr = $image->get_os_version();
-		$d['image_version']['label']                          = $this->lang['form_image_version'];
-		$d['image_version']['required']                       = false;
-		$d['image_version']['object']['type']                 = 'htmlobject_select';
-		$d['image_version']['object']['attrib']['index']      = array('value', 'label');
-		$d['image_version']['object']['attrib']['id']         = 'image_version';
-		$d['image_version']['object']['attrib']['name']       = 'image_version';
-		$d['image_version']['object']['attrib']['options']    = $image_version_arr;
-		$d['image_version']['object']['attrib']['selected']   = array($image->version);
-		
-		$d['image_comment']['label']                     = $this->lang['form_comment'];
-		$d['image_comment']['object']['type']            = 'htmlobject_textarea';
-		$d['image_comment']['object']['attrib']['id']    = 'comment';
-		$d['image_comment']['object']['attrib']['name']  = 'image_comment';
-		$d['image_comment']['object']['attrib']['value'] = $image->comment;
-
-                $d['image_dp']['label']                     = 'Deployment parameter';
-                $d['image_dp']['object']['type']            = 'htmlobject_textarea';
-                $d['image_dp']['object']['attrib']['id']    = 'deployment_parameter';
-                $d['image_dp']['object']['attrib']['name']  = 'deployment_parameter';
-                $d['image_dp']['object']['attrib']['value'] = $image->deployment_parameter;
-                $d['image_dp']['object']['attrib']['readonly'] = true;		
-
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/class/image.install1.class.php b/openQRM-5.3.50-CE/src/web/base/server/image/class/image.install1.class.php
deleted file mode 100644
index c5b6be2..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/class/image.install1.class.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/**
- * Image install-from-template step1
- *
-    openQRM Enterprise developed by openQRM Enterprise GmbH.
-
-    All source code and content (c) Copyright 2014, openQRM Enterprise GmbH unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with openQRM Enterprise GmbH.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2014, openQRM Enterprise GmbH <info@openqrm-enterprise.com>
- */
-
-class image_install1
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'image_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "image_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'image_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'image_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-		$this->user       = $openqrm->user();
-
-		$this->response->add('image_id', $this->response->html->request()->get('image_id'));
-		$this->response->add('install_from_template', $this->response->html->request()->get('install_from_template'));
-
-		$image = new image();
-		$image->get_instance_by_id($this->response->html->request()->get('image_id'));
-		$this->image = $image;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-
-
-
-		$response = $this->install1();
-		if(isset($response->install_server)) {
-
-			// redirect to install-from-template step2
-//			$this->response->redirect(
-//				$this->response->get_url($this->actions_name, 'install2', $this->message_param, $response->msg)
-//			);
-
-			$this->response->redirect(
-				$this->response->html->thisfile.'?base=image&image_action=install2&image_id='.$response->image_id.'&install_server='.$response->install_server
-			);
-
-
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-
-		$t = $this->response->html->template($this->tpldir.'/image-install1.tpl.php');
-		$t->add(sprintf($this->lang['label'], $this->image->name, $this->image->storageid), 'label');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->lang['canceled'], 'canceled');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function install1() {
-		$response  = $this->get_response();
-		$form      = $response->form;
-		$install_server			= $this->response->html->request()->get('install_server');
-		$id						= $this->response->html->request()->get('image_id');
-		if($install_server !== '') {
-			if(!$form->get_errors() && $this->response->submit()) {
-
-				$image = $this->image;
-				$response->msg = sprintf($this->lang['msg'], $image->name);
-				$response->image_id = $id;
-				$response->install_server = $install_server;
-
-			}
-			$response->name = $image->name;
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'install1');
-		$id = $this->response->html->request()->get('image_id');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$image  = new image();
-		$image->get_instance_by_id($id);
-		$storage = new storage();
-		$deployment = new deployment();
-
-		$install_template_type = $this->response->html->request()->get('install_from_template');
-		if (strlen($install_template_type)) {
-			$deployment->get_instance_by_type($install_template_type);
-			$storage_select_arr = $storage->get_ids_by_storage_type($deployment->id);
-		} else {
-			$storage_select_arr = array();
-		}
-		$storage_select = array();
-		foreach($storage_select_arr as $storage_db) {
-			$storage_id = $storage_db['storage_id'];
-			$storage->get_instance_by_id($storage_id);
-			$storage_select[] = array("value" => $storage_id, "label" => $storage_id." - ".$storage->name);
-		}
-
-		$d['install_server']['label']                          = $this->lang['form_install_server'];
-		$d['install_server']['required']                       = true;
-		$d['install_server']['object']['type']                 = 'htmlobject_select';
-		$d['install_server']['object']['attrib']['index']      = array('value', 'label');
-		$d['install_server']['object']['attrib']['id']         = 'install_server';
-		$d['install_server']['object']['attrib']['name']       = 'install_server';
-		$d['install_server']['object']['attrib']['options']    = $storage_select;
-
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-}
-?>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/class/image.install2.class.php b/openQRM-5.3.50-CE/src/web/base/server/image/class/image.install2.class.php
deleted file mode 100644
index 8a86d87..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/class/image.install2.class.php
+++ /dev/null
@@ -1,269 +0,0 @@
-<?php
-/**
- * Image install-from-template step2
- *
-    openQRM Enterprise developed by openQRM Enterprise GmbH.
-
-    All source code and content (c) Copyright 2014, openQRM Enterprise GmbH unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with openQRM Enterprise GmbH.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2014, openQRM Enterprise GmbH <info@openqrm-enterprise.com>
- */
-
-class image_install2
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'image_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "image_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'image_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'image_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-		$this->user       = $openqrm->user();
-		$this->response->add('image_id', $this->response->html->request()->get('image_id'));
-		$this->response->add('install_server', $this->response->html->request()->get('install_server'));
-
-		$image = new image();
-		$image->get_instance_by_id($this->response->html->request()->get('image_id'));
-		$this->image = $image;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->install2();
-		if(isset($response->local_deployment_templates_select)) {
-
-			// check if we are in the appliance wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 4) {
-				// only if this is the image of the appliance in the wizard
-				$wizard_appliance = new appliance();
-				$wizard_appliance->get_instance_by_id($this->user->wizard_id);
-				if ($wizard_appliance->imageid == $response->image_id) {
-					// this is our image
-					$this->response->redirect(
-						$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&image_id='.$response->image_id
-					);
-				} else {
-					$this->response->redirect(
-						$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-					);
-				}
-			} else {
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-
-		$t = $this->response->html->template($this->tpldir.'/image-install2.tpl.php');
-		$t->add(sprintf($this->lang['label'], $this->image->name, $this->image->storageid), 'label');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->lang['canceled'], 'canceled');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function install2() {
-		$response  = $this->get_response();
-		$form      = $response->form;
-		$install_server			= $this->response->html->request()->get('install_server');
-		$id						= $this->response->html->request()->get('image_id');
-		$template		= $this->response->html->request()->get('template');
-		$persistent		= $this->response->html->request()->get('persistent');
-		$parameter1		= $this->response->html->request()->get('parameter1');
-		$parameter2		= $this->response->html->request()->get('parameter2');
-		$parameter3		= $this->response->html->request()->get('parameter3');
-		$parameter4		= $this->response->html->request()->get('parameter4');
-		if(!$form->get_errors() && $this->response->submit()) {
-			$image = $this->image;
-			$template_arr = explode(':', $template);
-			$response->msg = sprintf($this->lang['msg'], $template_arr[2], $image->name);
-			$response->image_id = $id;
-			$response->install_server = $install_server;
-			$response->name = $image->name;
-			$response->local_deployment_templates_select = 'jo';
-
-			// plugable addtional parameters
-			if (strlen($parameter1)) {
-				$template = $template.":".$parameter1;
-			}
-			if (strlen($parameter2)) {
-				$template = $template.":".$parameter2;
-			}
-			if (strlen($parameter3)) {
-				$template = $template.":".$parameter3;
-			}
-			if (strlen($parameter4)) {
-				$template = $template.":".$parameter4;
-			}
-			// add mode at the beginning
-			$local_deployment_template = $persistent.":".$template;
-			$image->set_deployment_parameters("INSTALL_CONFIG", $local_deployment_template);
-
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'install2');
-		$id = $this->response->html->request()->get('image_id');
-		$install_server = $this->response->html->request()->get('install_server');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$image  = new image();
-		$image->get_instance_by_id($id);
-
-		$storage = new storage();
-		$storage->get_instance_by_id($install_server);
-
-		$deployment = new deployment();
-		$deployment->get_instance_by_id($storage->type);
-
-		// require template-deployment file
-		$local_deployment_templates_identifier_hook = $this->openqrm->get('basedir')."/web/boot-service/template.".$deployment->type.".php";
-		if($this->file->exists($local_deployment_templates_identifier_hook)) {
-			require_once "$local_deployment_templates_identifier_hook";
-			$get_deployment_templates_function="get_"."$deployment->type"."_templates";
-			$get_deployment_templates_function=str_replace("-", "_", $get_deployment_templates_function);
-			$local_deployment_templates_arr = $get_deployment_templates_function($install_server);
-
-			// get additional optional local-deployment parameters from the template hook
-			$get_additional_parameters_function="get_"."$deployment->type"."_additional_parameters";
-			$get_additional_parameters_function=str_replace("-", "_", $get_additional_parameters_function);
-			$additional_local_deployment_parameter = $get_additional_parameters_function();
-		}
-
-		// persistent deployment ?
-		$local_deployment_persistent_arr = array();
-		$local_deployment_persistent_arr[] = array("value" => "0", "label" => "First boot");
-		$local_deployment_persistent_arr[] = array("value" => "1", "label" => "Persistent");
-
-
-		$d['template']['label']                          = $this->lang['form_install_template'];
-		$d['template']['required']                       = false;
-		$d['template']['object']['type']                 = 'htmlobject_select';
-		$d['template']['object']['attrib']['index']      = array('value', 'label');
-		$d['template']['object']['attrib']['id']         = 'template';
-		$d['template']['object']['attrib']['name']       = 'template';
-		$d['template']['object']['attrib']['options']    = $local_deployment_templates_arr;
-
-		$d['persistent']['label']                          = $this->lang['form_install_persistent'];
-		$d['persistent']['required']                       = false;
-		$d['persistent']['object']['type']                 = 'htmlobject_select';
-		$d['persistent']['object']['attrib']['index']      = array('value', 'label');
-		$d['persistent']['object']['attrib']['id']         = 'persistent';
-		$d['persistent']['object']['attrib']['name']       = 'persistent';
-		$d['persistent']['object']['attrib']['options']    = $local_deployment_persistent_arr;
-
-		$n = 1;
-		foreach ($additional_local_deployment_parameter as $paramters) {
-			if (!isset($paramters['label'])) {
-				continue;
-			}
-			$d['parameter'.$n]['label']                          = $paramters['label'];
-			$d['parameter'.$n]['required']                       = false;
-			$d['parameter'.$n]['object']['type']                 = 'htmlobject_input';
-			$d['parameter'.$n]['object']['attrib']['id']         = 'parameter'.$n;
-			$d['parameter'.$n]['object']['attrib']['name']       = 'parameter'.$n;
-			$n++;
-		}
-		for ($j=$n; $j<=4; $j++) {
-			$d['parameter'.$j] = '';
-		}
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-}
-?>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/class/image.remove.class.php b/openQRM-5.3.50-CE/src/web/base/server/image/class/image.remove.class.php
deleted file mode 100644
index ea61caf..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/class/image.remove.class.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-/**
- * Remove image
- *
-    openQRM Enterprise developed by openQRM Enterprise GmbH.
-
-    All source code and content (c) Copyright 2014, openQRM Enterprise GmbH unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with openQRM Enterprise GmbH.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2014, openQRM Enterprise GmbH <info@openqrm-enterprise.com>
- */
-
-class image_remove
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'image_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "image_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'image_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'image_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->remove();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/image-remove.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->lang['canceled'], 'canceled');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function remove() {
-
-		$response = $this->get_response();
-		$remove_image_id = $this->response->html->request()->get($this->identifier_name);
-		$force_remove = $response->html->request()->get('force_remove');
-
-		$form     = $response->form;
-		$image = new image();
-		if( $remove_image_id !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-
-			$image->get_instance_by_id($remove_image_id);
-
-			$d['param_f'.$remove_image_id]['label']                       = $image->name;
-			$d['param_f'.$remove_image_id]['object']['type']              = 'htmlobject_input';
-			$d['param_f'.$remove_image_id]['object']['attrib']['type']    = 'checkbox';
-			$d['param_f'.$remove_image_id]['object']['attrib']['name']    = $this->identifier_name;
-			$d['param_f'.$remove_image_id]['object']['attrib']['value']   = $remove_image_id;
-			$d['param_f'.$remove_image_id]['object']['attrib']['checked'] = true;
-
-			$d['force_remove']['label']                       = $this->lang['msg_force_remove'];
-			$d['force_remove']['object']['type']              = 'htmlobject_input';
-			$d['force_remove']['object']['attrib']['type']    = 'checkbox';
-			$d['force_remove']['object']['attrib']['name']    = 'force_remove';
-			$d['force_remove']['object']['attrib']['value']   = 1;
-			$d['force_remove']['object']['attrib']['checked'] = false;
-
-			$form->add($d);
-			
-			if(!$form->get_errors() && $response->submit()) {
-				$errors     = array();
-				$message    = array();
-
-				if ($force_remove == 1) {
-
-					$image->get_instance_by_id($remove_image_id);
-					$image_is_used_by_appliance = "";
-					$remove_error = 0;
-					$appliance = new appliance();
-					$appliance_id_list = $appliance->get_all_ids();
-					foreach($appliance_id_list as $appliance_list) {
-						$appliance_id = $appliance_list['appliance_id'];
-						$app_image_remove_check = new appliance();
-						$app_image_remove_check->get_instance_by_id($appliance_id);
-						if ($app_image_remove_check->imageid == $remove_image_id) {
-							$image_is_used_by_appliance .= $appliance_id." ";
-							$remove_error = 1;
-						}
-					}
-					if ($remove_error == 1) {
-						$message[] = sprintf($this->lang['msg_not_removing_active'], $remove_image_id, $image_is_used_by_appliance);
-					} else {
-						$image_name = $image->name;
-						$image->remove($remove_image_id);
-						$form->remove($this->identifier_name.'['.$remove_image_id.']');
-						$message[] = sprintf($this->lang['msg'], $image_name);
-					}
-				} else {
-					$message[] = sprintf($this->lang['msg_not_removing'], $image->name);
-				}
-				
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'remove');
-		$response->form = $form;
-		return $response;
-	}
-
-}
-?>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/class/image.select.class.php b/openQRM-5.3.50-CE/src/web/base/server/image/class/image.select.class.php
deleted file mode 100644
index a5c397f..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/class/image.select.class.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-/**
- * Image Select
- *
-    openQRM Enterprise developed by openQRM Enterprise GmbH.
-
-    All source code and content (c) Copyright 2014, openQRM Enterprise GmbH unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with openQRM Enterprise GmbH.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2014, openQRM Enterprise GmbH <info@openqrm-enterprise.com>
- */
-
-class image_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'image_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "image_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'image_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'image_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-		$this->response->add('image_filter', $this->response->html->request()->get('image_filter'));
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$data = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/image-select.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($data);
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select() {
-
-		$d = array();
-
-		$h = array();
-		$h['image_isactive']['title'] = $this->lang['table_isactive'];
-		
-		$h['image_id']['title'] = $this->lang['table_id'];
-		$h['image_id']['hidden'] = true;
-		
-		$h['image_name']['title'] = $this->lang['table_name'];
-		$h['image_name']['hidden'] = true;
-
-		$h['image_type']['title'] = $this->lang['table_deployment'];
-		$h['image_type']['hidden'] = true;
-
-		$h['image_rootdevice']['title'] = $this->lang['table_root'];
-		$h['image_rootdevice']['hidden'] = true;
-
-		$h['image_version']['title'] = $this->lang['table_version'];
-		$h['image_version']['hidden'] = true;
-
-		$h['image_capabilities']['title'] = $this->lang['table_capabilities'];
-		$h['image_capabilities']['hidden'] = true;
-
-		$h['image_data']['title'] = '&#160;';
-		$h['image_data']['sortable'] = false;
-
-		$h['image_comment']['title'] = '&#160;';
-		$h['image_comment']['sortable'] = false;
-		
-		$h['image_edit']['title'] = '&#160;';
-		$h['image_edit']['sortable'] = false;
-
-		$image = new image();
-		$params  = $this->response->get_array($this->actions_name, 'select');
-		$b       = array();
-
-		// unset unnecessary params
-		unset($params['image[sort]']);
-		unset($params['image[order]']);
-		unset($params['image[limit]']);
-		unset($params['image[offset]']);
-		unset($params['image_filter']);
-
-		$table = $this->response->html->tablebuilder('image', $params);
-		$table->offset = 0;
-		$table->sort = 'image_id';
-		$table->limit = 20;
-		$table->order = 'ASC';
-		$table->max = $image->get_count();
-
-		$table->init();
-
-		// handle table params
-		$tps = $table->get_params();
-		$tp = '';
-		foreach($tps['image'] as $k => $v) {
-			$tp .= '&image['.$k.']='.$v;
-		}
-
-
-		$image_arr = $image->display_overview(0, 10000, $table->sort, $table->order);
-		$image_icon = "/openqrm/base/img/image.png";
-		foreach ($image_arr as $index => $image_db) {
-
-			if ($this->response->html->request()->get('image_filter') === '' || ($this->response->html->request()->get('image_filter') == $image_db["image_type"] )) {
-
-				// prepare the values for the array
-				$image = new image();
-				$image->get_instance_by_id($image_db["image_id"]);
-				// edit
-				$a = $this->response->html->a();
-				$a->title   = $this->lang['action_edit'];
-				$a->label = $this->lang['action_edit'];
-			//	$a->handler = 'onclick="wait();"';
-				$a->css     = 'edit';
-				$a->href    = $this->response->get_url($this->actions_name, 'edit').'&image_id='.$image->id.''.$tp;
-				$image_edit = $a->get_string();
-
-				// force remove
-				$a = $this->response->html->a();
-				$a->title   = $this->lang['action_remove'];
-				$a->label = $this->lang['action_remove'];
-				$a->css     = 'remove';
-				$a->href    = $this->response->get_url($this->actions_name, 'remove').'&image_identifier='.$image->id.''.$tp;
-				$image_remove = $a->get_string();
-				$image_actions = $image_edit;
-
-				// set the active icon
-				$isactive_icon = '<span class="pill inactive">'.$this->lang['lang_inactive'].'</span>';
-				if ($image_db["image_isactive"] == 1) {
-					$isactive_icon = '<span class="pill active">'.$this->lang['lang_active'].'</span>';
-				} else {
-					$image_actions .= $image_remove;
-				}
-
-				// infos
-				$storage = new storage();
-				$storage->get_instance_by_id($image_db['image_storageid']);
-				$deployment = new deployment();
-				$deployment->get_instance_by_id($storage->type);
-				$link = $storage->name;
-				if($deployment->storagetype !== 'local-server') {
-					$a = $this->response->html->a();
-					$a->label   = $storage->name;
-					$a->handler = 'onclick="wait();"';
-					$a->href    = $this->response->html->thisfile.'?plugin='.$deployment->storagetype.'&'.str_replace('-', '_',$deployment->storagetype).'_action=edit&storage_id='.$storage->id;
-					$link = $a->get_string();
-				}
-
-				$data  = '<div class="data">';
-				$data .= '<b>'.$this->lang['table_id'].'</b>: '.$image_db["image_id"].'<br>';
-				$data .= '<b>'.$this->lang['table_name'].'</b>: '.$image_db["image_name"].'<br>';
-				$data .= '<b>'.$this->lang['table_deployment'].'</b>: '.$image_db["image_type"].'<br>';
-				$data .= '<b>'.$this->lang['table_storage'].'</b>: '.$link.'<br>';
-				if(isset($image_db["image_rootdevice"])) {
-					$root = $image_db["image_rootdevice"];
-					if ($image_db["image_type"] == "esx-deployment") {
-						// vmware
-						$root = str_replace($image_db["image_name"], '',$image_db["image_rootdevice"]);
-						$root = str_replace(':/.vmdk', '', $root);
-					}
-					$data .= '<b>'.$this->lang['table_root'].'</b>: '.$root.'<br>';
-				}
-				if(isset($image_db["image_version"])) {
-					$data .= '<b>'.$this->lang['table_version'].'</b>: '.$image_db["image_version"].'<br>';
-				}
-				if(isset($image_db["image_capabilities"])) {
-					$data .= '<b>'.$this->lang['table_capabilities'].'</b>: '.$image_db["image_capabilities"];
-				}
-				$data .= '</div>';
-
-				$b[] = array(
-					'image_isactive' => $isactive_icon,
-					'image_id' => $image_db["image_id"],
-					'image_name' => $image_db["image_name"],
-					'image_rootdevice' => $image_db["image_rootdevice"],
-					'image_version' => $image_db["image_version"],
-					'image_capabilities' => $image_db["image_capabilities"],
-					'image_data' => $data,
-					'image_comment' => $image_db["image_comment"],
-					'image_edit' => $image_actions,
-				);
-			}
-		}
-
-		// Filter
-		$types = $this->openqrm->deployment();
-		$list = $types->get_list();
-		$filter = array();
-		foreach( $list as $l) {
-			$filter[] = array( $l['label']);
-		}
-		asort($filter);
-		array_unshift($filter, array('',''));
-		$select = $this->response->html->select();
-		$select->add($filter, array(0,0));
-		$select->name = 'image_filter';
-		$select->handler = 'onchange="wait();this.form.submit();return false;"';
-		$select->selected = array($this->response->html->request()->get('image_filter'));
-		$box = $this->response->html->box();
-		$box->add($select);
-		$box->id = 'image_filter_box';
-		$box->css = 'htmlobject_box';
-		$box->label = $this->lang['lang_filter'];
-
-		$add = $this->response->html->a();
-		$add->title   = $this->lang['action_add'];
-		$add->label   = $this->lang['action_add'];
-		$add->handler = 'onclick="wait();"';
-		$add->css     = 'add';
-		$add->href    = $this->response->get_url($this->actions_name, "add").''.$tp;
-
-		$table->id = 'Tabelle';
-		$table->css = 'htmlobject_table';
-		$table->border = 1;
-		$table->cellspacing = 0;
-		$table->cellpadding = 3;
-		$table->autosort = false;
-		$table->sort_link = false;
-		if ($this->response->html->request()->get('image_filter') !== '') {
-			$table->max = count($b);
-		} else {
-			$table->max = $image->get_count()-2;
-		}
-		$table->head = $h;
-		$table->body = $b;
-		$table->form_action = $this->response->html->thisfile;
-
-		$d['form']   = $this->response->get_form($this->actions_name, 'select', false)->get_elements();
-		$d['add']    = $add->get_string();
-		$d['table']  = $table;
-		$d['filter'] = $box->get_string();
-		return $d;
-	}
-
-}
-?>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/css/image.css b/openQRM-5.3.50-CE/src/web/base/server/image/css/image.css
deleted file mode 100644
index fc78737..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/css/image.css
+++ /dev/null
@@ -1,58 +0,0 @@
-.htmlobject_td.image_icon {
-	text-align:center;
-	width:25px;
-	vertical-align:top;
-}
-.htmlobject_td.image_id {
-	text-align:center;
-	width:25px;
-	vertical-align:top;
-}
-.htmlobject_td.image_name {
-	text-align:left;
-	width:200px;
-	vertical-align:top;
-}
-.htmlobject_td.image_isactive {
-	text-align:center;
-	width:40px;
-	vertical-align:top;
-}
-.htmlobject_td.image_edit {
-	text-align:center;
-	width:100px;
-	vertical-align:top;
-}
-.htmlobject_box textarea {
-	width: 600px;
-	height: 50px;
-}
-
-.htmlobject_td.image_data {
-	width: 320px;
-}
-.htmlobject_td.image_data .data{
-	height: 107px;
-}
-.htmlobject_td.image_data a{
-	text-decoration: none;
-}
-
-.htmlobject_table .htmlobject_td.image_edit a{
-	display: block;
-	text-align: left;
-}
-
-#image_add .infotext {
-	width: 350px;
-}
-#image_add a {
-	line-height: 32px;
-}
-#image_add a img {
-	float: left;
-	margin: 0 5px 0 0;
-}
-
-
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/image-action.php b/openQRM-5.3.50-CE/src/web/base/server/image/image-action.php
deleted file mode 100644
index bfa7fa4..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/image-action.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/deployment.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/event.class.php";
-// filter inputs
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-
-global $IMAGE_INFO_TABLE;
-global $DEPLOYMENT_INFO_TABLE;
-
-$event = new event();
-
-// user/role authentication
-if (!strstr($OPENQRM_USER->role, "administrator")) {
-	$event->log("authorization", $_SERVER['REQUEST_TIME'], 1, "image-action", "Un-Authorized access to image-actions from $OPENQRM_USER->name", "", "", 0, 0, 0);
-	exit();
-}
-
-$image_command = $request->get('image_command');
-$image_id = $request->get('image_id');
-$image_name = $request->get('image_name');
-$image_type = $request->get('image_type');
-$image_fields = array();
-foreach ($_REQUEST as $key => $value) {
-	if (strncmp($key, "image_", 6) == 0) {
-		$image_fields[$key] = $value;
-	}
-}
-unset($image_fields["image_command"]);
-
-$deployment_id = $request->get('deployment_id');
-$deployment_name = $request->get('deployment_name');
-$deployment_type = $request->get('deployment_type');
-$deployment_description = $request->get('deployment_description');
-$deployment_storagetype = $request->get('deployment_storagetype');
-$deployment_storagedescription = $request->get('deployment_storagedescription');
-$deployment_mapping = $request->get('deployment_mapping');
-$deployment_fields = array();
-foreach ($_REQUEST as $key => $value) {
-	if (strncmp($key, "deployment_", 11) == 0) {
-		$deployment_fields[$key] = $value;
-	}
-}
-
-
-// parse the identifier array to get the id
-if($request->get('action') != '') {
-	switch ($request->get('action')) {
-		case 'add':
-			foreach($_REQUEST['identifier'] as $id) {
-				if(!strlen($image_fields["image_storageid"])) {
-					$image_fields["image_storageid"]=$id;
-				}
-				continue;
-			}
-			break;
-		case 'update':
-			foreach($_REQUEST['identifier'] as $id) {
-				if(!strlen($image_fields["image_storageid"])) {
-					$image_fields["image_storageid"]=$id;
-				}
-				continue;
-			}
-			break;
-	}
-}
-
-
-
-$event->log("$image_command", $_SERVER['REQUEST_TIME'], 5, "image-action", "Processing image $image_command on Image $image_name", "", "", 0, 0, 0);
-switch ($image_command) {
-	case 'new_image':
-		$image = new image();
-		$image_fields["image_id"]=(int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-		# switch deployment_id to deyployment_type
-		$deployment_switch = new deployment();
-		$deployment_switch->get_instance_by_id($image_type);
-		$image_fields["image_type"] = $deployment_switch->type;
-		// unquote
-		$image_deployment_parameter = $image_fields["image_deployment_parameter"];
-		$image_fields["image_deployment_parameter"] = stripslashes($image_deployment_parameter);
-		$image->add($image_fields);
-		break;
-
-	case 'update_image':
-		$image = new image();
-		if(!strlen($image_fields["image_isshared"])) {
-			$image_fields["image_isshared"]="0";
-		}
-		// unquote
-		$image_deployment_parameter = $image_fields["image_deployment_parameter"];
-		$image_fields["image_deployment_parameter"] = stripslashes($image_deployment_parameter);
-		$image->update($image_id, $image_fields);
-		break;
-
-	case 'remove':
-		$image = new image();
-		$image->remove($image_id);
-		break;
-
-	case 'remove_by_name':
-		$image = new image();
-		$image->remove_by_name($image_name);
-		break;
-
-	case 'add_deployment_type':
-		$deployment = new deployment();
-		$deployment_fields["deployment_id"]=(int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-		$deployment->add($deployment_fields);
-		break;
-
-	case 'remove_deployment_type':
-		$deployment = new deployment();
-		$deployment->remove_by_type($deployment_name);
-		break;
-
-	default:
-		$event->log("$image_command", $_SERVER['REQUEST_TIME'], 3, "image-action", "No such image command ($image_command)", "", "", 0, 0, 0);
-		break;
-
-
-}
-?>
-
-</body>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/lang/de.image.ini b/openQRM-5.3.50-CE/src/web/base/server/image/lang/de.image.ini
deleted file mode 100644
index 361ff0f..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/lang/de.image.ini
+++ /dev/null
@@ -1,85 +0,0 @@
-[select]
-tab = "Images"
-label = "Images"
-action_remove = "entfernen"
-action_mgmt = "manage"
-action_edit = "edit"
-action_add = "Neues Image hinzufügen"
-action_install1 = "install1"
-action_install2 = "install2"
-table_id = "ID"
-table_name = "Name"
-table_version = "Version"
-table_comment = "Kommentar"
-table_deployment = "Deployment"
-table_isactive = "Status"
-table_storage = "Storage"
-table_edit = "Bearbeiten"
-table_name = "Name"
-table_capabilities = "Capabilities"
-table_root = "Root"
-table_image = "Image"
-lang_active = "aktiv"
-lang_inactive = "inaktiv"
-lang_filter = "Filtern nach Deployment"
-please_wait = "Lade Images. Bitte warten .."
-
-[edit]
-tab = "Bearbeite Image"
-label = "Bearbeite Image %s"
-msg = "Image %s erfolgreich bearbeitet"
-form_comment = "Kommentar"
-form_install_from_nfs = "Installiere von NAS/NFS"
-form_transfer_to_nfs = "Übertrage nach NAS/NFS"
-form_install_from_local = "Installiere von Lokaler Disk"
-form_transfer_to_local = "Übertrage auf Lokale Disk"
-form_install_from_template = "Automatische Installation"
-form_image_password = "Passwort"
-form_image_password_repeat = "Passwort (wiederholen)"
-form_image_version = "Version"
-lang_password_generate = "Passwort generieren"
-lang_password_show = "Passwort anzeigen"
-lang_password_hide = "Passwort verbergen"
-please_wait = "Lade Images. Bitte warten .."
-error_password = "Eingegebene Passwörter sind nicht gleich!"
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
-
-[add]
-tab = "Neues Image"
-label = "Neues Image"
-title = "Neues Image hinzufügen als"
-start_storage_plugin = "Bitte starten Sie eines der Storage Plugins!"
-info = "Das Image repräsentiert die &quot;Festplatte&quot; einer virtuellen Maschine. Abhänig von der Virtuallisierungs Technik handelt es sich um ein Blockfile (entweder in einem Verzeichnis auf einer lokalen Festplatte oder einem Verzeichnis verwaltet mit z.B. NFS) und/oder eine leere Partition (entweder auf einer lokalen Festplatte oder z.B. Iscsi), verwaltet mit LVM als Partiotion Manager."
-create_image = "Volumen vom Storage Typ %s"
-please_wait = "Lade Images. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
-
-[remove]
-tab = "Entferne Image(s)"
-label = "Entferne Image(s)"
-msg = "Image %s entfernt"
-msg_not_removing_active = "Image %s wird noch von Server %s genutzt!<br>Enfernen des Images abgebrochen."
-msg_not_removing = "Forciertes entfernen nicht gesetzt! Enfernen des Images %s abgebrochen!"
-msg_force_remove = "Image forciert entfernen"
-please_wait = "Lade Images. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
-
-[install1]
-tab = "Image installieren (1/2)"
-label = "Installations Server für image %s auf storage %s auswählen"
-title = "Installations Server auswählen"
-form_install_server = "Installations Server auswählen"
-msg = "Installations Server für Image %s ausgewählt"
-please_wait = "Lade. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
-
-[install2]
-tab = "Image installieren (2/2)"
-label = "Template zur Installation von image %s auf storage %s auswählen"
-title = "Wähle Template zur Installation"
-msg = "Template %s für Image %s ausgewählt"
-form_install_template = "Zur Installation ausgewähltes Template"
-form_install_persistent = "Ständige Installation"
-form_install_parameter = "Installations Parameter"
-please_wait = "Lade. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/lang/en.image.ini b/openQRM-5.3.50-CE/src/web/base/server/image/lang/en.image.ini
deleted file mode 100644
index 72de82f..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/lang/en.image.ini
+++ /dev/null
@@ -1,86 +0,0 @@
-[select]
-tab = "Images"
-label = "Images"
-action_remove = "remove"
-action_mgmt = "manage"
-action_edit = "edit"
-action_add = "Add a new Image"
-action_install1 = "install1"
-action_install2 = "install2"
-table_name = "Name"
-table_id = "ID"
-table_version = "Version"
-table_deployment = "Deployment"
-table_isactive = "State"
-table_comment = "Comment"
-table_storage = "Storage"
-table_edit = "Edit"
-table_name = "Name"
-table_capabilities = "Capabilities"
-table_root = "Root"
-table_image = "Image"
-lang_active = "active"
-lang_inactive = "inactive"
-lang_filter = "Filter by Deployment"
-please_wait = "Loading. Please wait .."
-
-[edit]
-tab = "Edit Image"
-label = "Edit Image %s"
-msg = "Edited Image %s"
-form_comment = "Comment"
-form_install_from_nfs = "Install from NAS/NFS"
-form_transfer_to_nfs = "Transfer to NAS/NFS"
-form_install_from_local = "Install from local disk"
-form_transfer_to_local = "Transfer to local disk"
-form_install_from_template = "Automatic Installation"
-form_image_password = "Password"
-form_image_password_repeat = "Password (repeat)"
-form_image_version = "Version"
-lang_password_generate = "generate password"
-lang_password_show = "show password"
-lang_password_hide = "hide password"
-please_wait = "Loading. Please wait .."
-error_password = "Password (repeat) does not match Password"
-canceled = "Operation canceled. Please wait .."
-
-[add]
-tab = "Add Image"
-label = "Add Image"
-title = "Adding a new Image as"
-start_storage_plugin = "Please enable and start one of the storage plugins!"
-info = "The image represents the &quot;disk&quot; for a virtual machine. Dependent on the virtuallization technology it can be a blockfile (either in a directory on a local HDD or a network directory provided by e.g. NFS) and/or an empty partition (either a partition on a local HDD or network e.g. Iscsi), manged with LVM as partiotion manager."
-create_image = "a Volume from Storage type %s"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[remove]
-tab = "Remove Image"
-label = "Remove Images(s)"
-msg = "Removed Image %s"
-msg_not_removing_active = "Not removing Image %s!<br>It is still in use by Server %s !"
-msg_not_removing = "Force-removal not set! Not removing Image %s!"
-msg_force_remove = "Force removal of Image"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[install1]
-tab = "Install Image (1/2)"
-label = "Select Install Server for image %s on storage %s"
-title = "Select Install Server"
-form_install_server = "Select Install Server"
-msg = "Selected Install Server for Image %s"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[install2]
-tab = "Install Image (2/2)"
-label = "Select Install Template for image %s on storage %s"
-title = "Select Install Template"
-msg = "Selected Install Template %s for Image %s"
-form_install_template = "Selected Install Template"
-form_install_persistent = "Persistent Installation"
-form_install_parameter = "Installation Parameter"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/lang/es.image.ini b/openQRM-5.3.50-CE/src/web/base/server/image/lang/es.image.ini
deleted file mode 100644
index 48b6573..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/lang/es.image.ini
+++ /dev/null
@@ -1,85 +0,0 @@
-[select]
-tab = "Imagen"
-label = "Imagen"
-action_remove = "Eliminar"
-action_mgmt = "administrar"
-action_edit = "editar"
-action_add = "Añadir una nueva Imagen"
-action_install1 = "instalar1"
-action_install2 = "instalar2"
-table_name = "Nombre"
-table_id = "ID"
-table_version = "Versión"
-table_deployment = "Implementación"
-table_isactive = "Estado"
-table_comment = "Comentario"
-table_storage = "Almacenamiento"
-table_edit = "Editar"
-table_name = "Nombre"
-table_image = "Imagen"
-table_capabilities = "Capabilities"
-table_root = "Root"
-lang_active = "activo"
-lang_inactive = "inactivo"
-please_wait = "Cargando. Por favor espere .."
-
-[edit]
-tab = "Editar Imagen"
-label = "Editar Imagen %s"
-msg = "Editar Imagen %s"
-form_comment = "Comentario"
-form_install_from_nfs = "Instalar desde NAS/NFS"
-form_transfer_to_nfs = "Transferir a NAS/NFS"
-form_install_from_local = "Instalar desde un disco local"
-form_transfer_to_local = "Transferir a un disco local"
-form_install_from_template = "Instalación automatica"
-form_image_password = "Clave"
-form_image_password_repeat = "Clave (repetir)"
-form_image_version = "Versión"
-lang_password_generate = "generar clave"
-lang_password_show = "Mostrar clave"
-lang_password_hide = "Ocultar clave"
-please_wait = "Cargando. Por favor espere .."
-error_password = "La claves no coinciden"
-canceled = "Cancelado. Por favor espere .."
-
-[add]
-tab = "Agregar Imagen"
-label = "Agregar Imagen"
-title = "Agregando una nueva Imagen como"
-start_storage_plugin = "Por favor habilite  e inicie uno de los plugins de almacenamiento!"
-info = "La imagen representa el &quot;disco&quot; de una máquina virtual. Dependiendo de la tecnología virtuallization puede ser un blockfile (ya sea en un directorio en un disco duro local o en un directorio de red proporcionada por ejemplo NFS) y / o una partición vacía (ya sea una partición en un disco duro local o de red por ejemplo, iSCSI), manejadas con LVM como gerente partiotion."
-create_image = "un Volumen desde el tipo de Almacenamiento %s"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[remove]
-tab = "Quitar Imagen"
-label = "Quitar Imagen(es)"
-msg = "Quitar Imagen %s"
-msg_not_removing_active = "No se puede quitar la Imagen %s!<br>Se está usando en el Servidor %s !"
-msg_not_removing = "Force-removal not set! Not removing Image %s!"
-msg_force_remove = "Force removal of Image"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[install1]
-tab = "Instalación de Imagen (1/2)"
-label = "Seleccione el servidor a instalar para la imagen %s en el almacenamiento %s"
-title = "Seleccione el servidor a instalar"
-form_install_server = "Seleccione el servidor a instalar"
-msg = "Se ha seleccionado el servidor para instalar la imagen %s"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[install2]
-tab = "Instalar Imagen (2/2)"
-label = "Seleccione la plantilla a instalar para la Imagen %s en el almacenamiento %s"
-title = "Seleccione la plantilla a instalar"
-msg = "Se ha seleccionado la plantilla %s para la Imagen %s"
-form_install_template = "Plantilla seleccionada para la instalación"
-form_install_persistent = "Instalación persistente"
-form_install_parameter = "Parámetros de Instalación"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-add.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-add.tpl.php
deleted file mode 100644
index 1651e32..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-add.tpl.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div id="image_add">
-	<div class="span3">
-		{image_new}
-	</div>
-	<div id="info" class="span5">
-		{info}
-	</div>
-	<div class="floatbreaker">&#160;</div>
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-edit.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-edit.tpl.php
deleted file mode 100644
index be5da49..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-edit.tpl.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div id="form">
-	<form action="{thisfile}" method="GET">
-	{form}
-
-	<div style="float:left;">
-	{image_password}
-	{image_password_2}
-	</div>
-	<div style="float:left; margin: 0 0 0 20px;">
-		<input type="button" id="passgenerate" onclick="passgen.generate(); return false;" class="password-button" value="{lang_password_generate}" style="display:none;"><br>
-		<input type="button" id="passtoggle" onclick="passgen.toggle(); return false;" class="password-button" value="{lang_password_show}" style="display:none;">
-	</div>
-	<div class="floatbreaker" style="line-height:0px;height:0px;clear:both;">&nbsp;</div>
-
-	{install_from_local}
-	{transfer_to_local}
-	{install_from_nfs}
-	{image_dp}
-	{transfer_to_nfs}
-
-	<br>
-
-	{install_from_template}
-	{image_version}
-	{image_comment}
-	<div id="buttons">
-	{submit}
-	{cancel}
-	</div>
-</div>
-</form>
-
-<script type="text/javascript">
-var passgen = {
-	generate : function() {
-		pass = GeneratePassword();
-		document.getElementById('pass_1').value = pass;
-		document.getElementById('pass_2').value = pass;
-	},
-	toggle : function() {
-		vnc = document.getElementById('pass_1');
-		but = document.getElementById('passtoggle');
-		if(vnc.type == 'password') {
-			but.value = "{lang_password_hide}";
-			np = vnc.cloneNode(true);
-			np.type='text';
-			vnc.parentNode.replaceChild(np,vnc);
-		}
-		if(vnc.type == 'text') {
-			but.value = "{lang_password_show}";
-			np = vnc.cloneNode(true);
-			np.type='password';
-			vnc.parentNode.replaceChild(np,vnc);
-		}
-	}
-}
-tmp = document.getElementById('pass_1');
-if(tmp) {
-	document.getElementById('passgenerate').style.display = 'inline';
-	document.getElementById('passtoggle').style.display = 'inline';
-}
-</script>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-install1.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-install1.tpl.php
deleted file mode 100644
index da40a12..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-install1.tpl.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div id="form">
-	<form action="{thisfile}" method="GET">
-	{form}
-
-	{install_server}
-
-	<div id="buttons">
-	{submit}
-	{cancel}
-	</div>
-	</form>
-</div>
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-install2.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-install2.tpl.php
deleted file mode 100644
index fdaa7f0..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-install2.tpl.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div id="form">
-	<form action="{thisfile}" method="GET">
-	{form}
-
-	{template}
-
-	{persistent}
-
-	{parameter1}
-	{parameter2}
-	{parameter3}
-	{parameter4}
-
-	<div id="buttons">
-	{submit}
-	{cancel}
-	</div>
-</div>
-
-</form>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-remove.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-remove.tpl.php
deleted file mode 100644
index bda0b34..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-remove.tpl.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}">
-
-	<div id="form">
-	{form}
-	</div>
-
-	<div id="buttons">
-	<hr>
-	<br>
-	{force_remove}
-	<br>
-	{submit}
-	{cancel}
-	</div>
-
-</form>
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-select.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-select.tpl.php
deleted file mode 100644
index 8664ac2..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/image/tpl/image-select.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label} <span class="pull-right">{add}</span></h2>
-<div id="form">
-	<form action="{thisfile}" method="POST">
-		{form}
-		{filter}
-		{table}
-	</form>
-</div>
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.add.class.php b/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.add.class.php
deleted file mode 100644
index fa8fc17..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.add.class.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Kernel Add
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kernel_add
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kernel_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "kernel_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kernel_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kernel_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/kernel-add.tpl.php');
-		$t->add($this->lang['title'], 'title');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['kernel_add'], 'kernel_add');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->lang['canceled'], 'canceled');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.controller.class.php b/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.controller.class.php
deleted file mode 100644
index b2d2a20..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.controller.class.php
+++ /dev/null
@@ -1,399 +0,0 @@
-<?php
-/**
- * Kernel Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kernel_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kernel_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "kernel_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kernel_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kernel_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array (
-		'tab' => 'Kernels',
-		'label' => 'Kernels',
-		'action_remove' => 'remove',
-		'action_edit' => 'edit',
-		'action_add' => 'Add a new kernel',
-		'action_setdefault' => 'Set kernel %s as default',
-		'table_name' => 'Name',
-		'table_id' => 'ID',
-		'table_version' => 'Version',
-		'table_comment' => 'Comment',
-		'table_name' => 'Name',
-		'table_type' => 'Type',
-		'table_kernel' => 'Kernel',
-		'please_wait' => 'Loading. Please wait ..',
-	),
-	'add' => array (
-		'label' => 'Add kernel',
-		'title' => 'Adding a new kernel to openQRM',
-		'kernel_add' => '<b>New kernels should be added on the openqrm server with the following command:</b><br>
-			<br>
-			<br>/usr/share/openqrm/bin/openqrm kernel add -n name -v version -u username -p password [-l location] [-i initramfs/ext2] [-t path-to-initrd-template-file]<br>
-			<br>
-			<b>name</b> can be any identifier as long as it has no spaces or other special characters; it is used as part of the filename.<br>
-			<b>version</b> should be the version for the kernel you want to install. If the filenames are called vmlinuz-2.6.26-2-amd64 then 2.6.26-2-amd64 is the version of this kernel.<br>
-			<b>username</b> and <b>password</b> are the credentials to openqrm itself.<br>
-			<b>location</b> is the root directory for the kernel you want to install. The files that are used are \${location}/boot/vmlinuz-\${version}, \${location}/boot/initrd.img-\${version} and \${location}/lib/modules/\${version}/*<br>
-			<b>initramfs/ext2</b> should specify the type of initrd image you want to generate. Most people want to use <b>initramfs</b> here.<br>
-			<b>path-to-initrd-template-file</b> should point to an openqrm initrd template. These can be found in the openqrm base dir under etc/templates.<br>
-			<br>
-			Example:<br>
-			/usr/share/openqrm/bin/openqrm kernel add -n openqrm-kernel-1 -v 2.6.29 -u openqrm -p openqrm -i initramfs -l / -t /usr/share/openqrm/etc/templates/openqrm-initrd-template.debian.x86_64.tgz<br>
-			<br>',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'remove' => array (
-		'label' => 'Remove kernel(s)',
-		'msg' => 'Removed kernel %s',
-		'msg_not_removing_default' => 'Not removing default kernel!',
-		'msg_not_removing_active' => 'Not removing kernel %s!<br>It is still in use by Server %s !',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'setdefault' => array (
-		'label' => 'Set default kernel',
-		'msg' => 'Set default kernel to %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'edit' => array (
-		'label' => 'Edit kernels',
-		'comment' => 'Comment',
-		'msg' => 'Edited kernel %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->tpldir   = $this->rootdir.'/server/kernel/tpl';
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/server/kernel/lang", 'kernel.ini');
-//		$response->html->debug();
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "select";
-		}
-
-		// handle table params
-		$vars = $this->response->html->request()->get('kernel');
-		if($vars !== '') {
-			if(!isset($vars['action'])) {
-				foreach($vars as $k => $v) {
-					$this->response->add('kernel['.$k.']', $v);
-				}
-			} else {
-				foreach($vars as $k => $v) {
-					unset($this->response->params['kernel['.$k.']']);
-				}
-			}
-		}
-
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'add':
-				$content[] = $this->select(false);
-				$content[] = $this->add(true);
-			break;
-			case 'edit':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-			break;
-			case $this->lang['select']['action_remove']:
-			case 'remove':
-				$content[] = $this->select(false);
-				$content[] = $this->remove(true);
-			break;
-			case 'setdefault':
-				$content[] = $this->select(false);
-				$content[] = $this->setdefault(true);
-			break;
-		}
-
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->rootdir.'/server/kernel/class/kernel.api.class.php');
-		$controller = new kernel_api($this);
-		$controller->action();
-	}
-
-	
-	//--------------------------------------------
-	/**
-	 * Select kernel
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/kernel/class/kernel.select.class.php');
-			$controller = new kernel_select($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Add kernel
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function add( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/kernel/class/kernel.add.class.php');
-			$controller                  = new kernel_add($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['add'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['add']['label'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'add' );
-		$content['onclick'] = false;
-		if($this->action === 'add' || $this->action === $this->lang['select']['action_add']){
-			$content['active']  = true;
-		}
-		return $content;
-	}	
-
-
-	//--------------------------------------------
-	/**
-	 * Remove kernel
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function remove( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/kernel/class/kernel.remove.class.php');
-			$controller                  = new kernel_remove($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['remove'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Remove';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'remove' );
-		$content['onclick'] = false;
-		if($this->action === 'remove' || $this->action === $this->lang['select']['action_remove']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-
-	//--------------------------------------------
-	/**
-	 * Edit kernel
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function edit( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/kernel/class/kernel.edit.class.php');
-			$controller                  = new kernel_edit($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['edit'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['edit']['label'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'edit' );
-		$content['onclick'] = false;
-		if($this->action === 'edit' || $this->action === $this->lang['select']['action_edit']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Set default kernel
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function setdefault( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/kernel/class/kernel.setdefault.class.php');
-			$controller                  = new kernel_setdefault($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['setdefault'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'setdefault';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'setdefault' );
-		$content['onclick'] = false;
-		if($this->action === 'setdefault' || $this->action === $this->lang['select']['action_setdefault']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.edit.class.php b/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.edit.class.php
deleted file mode 100644
index 9b430cb..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.edit.class.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-/**
- * Edit kernel
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kernel_edit
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kernel_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "kernel_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kernel_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kernel_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-
-		$kernel_id = $response->html->request()->get($this->identifier_name);
-		$kernel = $this->openqrm->kernel();
-		$kernel->get_instance_by_id($kernel_id);
-		$this->kernel_id = $kernel_id;
-		$this->kernel_name = $kernel->name;
-		$this->response->params[$this->identifier_name] = $this->response->html->request()->get($this->identifier_name);
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-
-		$response = $this->edit();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/kernel-edit.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->kernel_name, 'kernel_name');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->lang['canceled'], 'canceled');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function edit() {
-
-		$response = $this->get_response();
-		$form     = $response->form;
-
-		if(!$form->get_errors() && $response->submit()) {
-			$errors     = array();
-			$message    = array();
-
-			$kernel_id		= $this->response->html->request()->get($this->identifier_name);
-			$kernel_comment		= $this->response->html->request()->get('kernel_comment');
-
-			$kernel = new kernel();
-			$kernel->get_instance_by_id($kernel_id);
-
-			$kernel_comment = $response->html->request()->get('kernel_comment');
-			$fields['kernel_comment'] = htmlspecialchars($kernel_comment);
-			$kernel->update($kernel_id, $fields);
-			$response->msg = sprintf($this->lang['msg'], $kernel->name);
-		}
-		return $response;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'edit');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$kernel = $this->openqrm->kernel();
-		$kernel->get_instance_by_id($this->kernel_id);
-
-		$d['kernel_comment']['label']                     = $this->lang['comment'];
-		$d['kernel_comment']['object']['type']            = 'htmlobject_textarea';
-		$d['kernel_comment']['object']['attrib']['name']  = 'kernel_comment';
-		$d['kernel_comment']['object']['attrib']['value'] = $kernel->comment;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.remove.class.php b/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.remove.class.php
deleted file mode 100644
index 97f7dac..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.remove.class.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/**
- * Remove kernel
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kernel_remove
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kernel_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "kernel_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kernel_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kernel_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->remove();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/kernel-remove.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->lang['canceled'], 'canceled');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function remove() {
-
-		$response = $this->get_response();
-		$kernels = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		$kernel = new kernel();
-		if( $kernels !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($kernels as $id) {
-
-				$kernel = $kernel->get_instance_by_id($id);
-
-				$d['param_f'.$i]['label']                       = $kernel->name;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $id;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;		
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$errors     = array();
-				$message    = array();
-				foreach($kernels as $key => $id) {
-					$kernel = $kernel->get_instance_by_id($id);
-					// check that this is not the default kernel
-					if ($id == 1) {
-						$message[] = sprintf($this->lang['msg_not_removing_default']);
-						continue;
-					}
-					// check that this kernel is not in use any more
-					$kernel_is_used_by_appliance = "";
-					$remove_error = 0;
-					$appliance = new appliance();
-					$appliance_id_list = $appliance->get_all_ids();
-					foreach($appliance_id_list as $appliance_list) {
-						$appliance_id = $appliance_list['appliance_id'];
-						$app_kernel_remove_check = new appliance();
-						$app_kernel_remove_check->get_instance_by_id($appliance_id);
-						if ($app_kernel_remove_check->kernelid == $id) {
-							$kernel_is_used_by_appliance .= $appliance_id." ";
-							$remove_error = 1;
-						}
-					}
-					if ($remove_error == 1) {
-						$message[] = sprintf($this->lang['msg_not_removing_active'], $id, $kernel_is_used_by_appliance);
-						continue;
-					}
-					$kernel_name = $kernel->name;
-					$kernel->remove($id);
-					$form->remove($this->identifier_name.'['.$key.']');
-					$message[] = sprintf($this->lang['msg'], $kernel_name);
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'remove');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.select.class.php b/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.select.class.php
deleted file mode 100644
index 9f5bebe..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.select.class.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-/**
- * Kernel Select
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kernel_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kernel_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "kernel_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kernel_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kernel_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$data = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/kernel-select.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($data);
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select() {
-
-		$d = array();
-
-		$h = array();
-/*
-		$h['kernel_icon']['title'] ='&#160;';
-		$h['kernel_icon']['sortable'] = false;
-*/
-		$h['kernel_id']['title'] = $this->lang['table_id'];
-		$h['kernel_name']['title'] = $this->lang['table_name'];
-		$h['kernel_version']['title'] = $this->lang['table_version'];
-		$h['kernel_comment']['title'] = $this->lang['table_comment'];
-		$h['kernel_comment']['sortable'] = false;
-		$h['edit']['title'] ='&#160;';
-		$h['edit']['sortable'] = false;
-		$h['default']['title'] ='&#160;';
-		$h['default']['sortable'] = false;
-
-		$kernel = new kernel();
-		$params  = $this->response->get_array($this->actions_name, 'select');
-		$b       = array();
-
-		$table = $this->response->html->tablebuilder('kernel', $params);
-		$table->offset = 0;
-		$table->sort = 'kernel_id';
-		$table->limit = 10;
-		$table->order = 'ASC';
-		$table->max = $kernel->get_count();
-
-		$table->init();
-
-		// handle table params
-		$tps = $table->get_params();
-		$tp = '';
-		foreach($tps['kernel'] as $k => $v) {
-			$tp .= '&kernel['.$k.']='.$v;
-		}
-
-		$kernel_arr = $kernel->display_overview($table->offset, $table->limit, $table->sort, $table->order);
-		$kernel_icon = "/openqrm/base/img/kernel.png";
-		foreach ($kernel_arr as $index => $kernel_db) {
-			// prepare the values for the array
-			$kernel = new kernel();
-			$kernel->get_instance_by_id($kernel_db["kernel_id"]);
-			$kernel_comment = $kernel_db["kernel_comment"];
-			if (!strlen($kernel_comment)) {
-				$kernel_comment = "&#160;";
-			}
-			$default = '';
-			// setdefault
-			if ($kernel_db["kernel_id"] != 1) {
-				if ((strncmp($kernel->name, "resource", 7)) && (!strstr($kernel->capabilities, "local-server"))){
-					$a = $this->response->html->a();
-					$a->title   = sprintf($this->lang['action_setdefault'], $kernel_db["kernel_id"]);
-					$a->handler = 'onclick="wait();"';
-					$a->css     = 'default';
-					$a->href    = $this->response->get_url($this->actions_name, 'setdefault').'&'.$this->identifier_name.'[]='.$kernel->id.''.$tp;
-					$default    = $a->get_string();
-				}
-			}
-
-			// edit
-			$a = $this->response->html->a();
-			$a->label   = $this->lang['action_edit'];
-			$a->handler = 'onclick="wait();"';
-			$a->css     = 'edit';
-			$a->href    = $this->response->get_url($this->actions_name, 'edit').'&'.$this->identifier_name.'='.$kernel->id.''.$tp;
-			$edit = $a->get_string();
-
-			$b[] = array(
-			//	'kernel_icon' => "<img width='24' height='24' src='".$kernel_icon."'>",
-				'kernel_id' => $kernel_db["kernel_id"],
-				'kernel_name' => $kernel_db["kernel_name"],
-				'kernel_version' => $kernel_db["kernel_version"],
-				'kernel_comment' => $kernel_comment,
-				'edit' => $edit,
-				'default' => $default,
-			);
-		}
-
-		$add = $this->response->html->a();
-		$add->title   = $this->lang['action_add'];
-		$add->label   = $this->lang['action_add'];
-		$add->handler = 'onclick="wait();"';
-		$add->css     = 'add';
-		$add->href    = $this->response->get_url($this->actions_name, "add").''.$tp;
-		$table->id = 'Tabelle';
-		$table->css = 'htmlobject_table';
-		$table->border = 1;
-		$table->cellspacing = 0;
-		$table->cellpadding = 3;
-		$table->autosort = false;
-		$table->sort_link = false;
-		$table->max = $kernel->get_count() - 1;
-		$table->head = $h;
-		$table->body = $b;
-		$table->form_action = $this->response->html->thisfile;
-		$table->actions_name = $this->actions_name;
-		$table->actions = array(array('remove' => $this->lang['action_remove']));
-		$table->identifier = 'kernel_id';
-		$table->identifier_name = $this->identifier_name;
-		$table->identifier_disabled = array(0);
-		$table->limit_select = array(
-			array("value" => 10, "text" => 10),
-			array("value" => 20, "text" => 20),
-			array("value" => 30, "text" => 30),
-			array("value" => 50, "text" => 50),
-			array("value" => 100, "text" => 100),
-		);
-
-		$d['add']    = $add->get_string();
-		$d['table']  = $table;
-		return $d;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.setdefault.class.php b/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.setdefault.class.php
deleted file mode 100644
index 6099689..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/kernel/class/kernel.setdefault.class.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-/**
- * SetDefault kernel
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class kernel_setdefault
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'kernel_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "kernel_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'kernel_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'kernel_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->setdefault();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/kernel-setdefault.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->lang['canceled'], 'canceled');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * SetDefault
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function setdefault() {
-
-		$response = $this->get_response();
-		$kernels = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		$kernel = new kernel();
-
-		if( $kernels !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($kernels as $id) {
-
-				$kernel = $kernel->get_instance_by_id($id);
-
-				$d['param_f'.$i]['label']                       = $kernel->name;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $id;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;		
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$errors     = array();
-				$message    = array();
-				foreach($kernels as $id) {
-					$kernel = $kernel->get_instance_by_id($id);
-					$kernel_name = $kernel->name;
-					$ar_kernel_update = array(
-						'kernel_name' => "default",
-						'kernel_version' => $kernel->version,
-						'kernel_capabilities' => $kernel->capabilities,
-					);
-					$kernel->update(1, $ar_kernel_update);
-					// send set-default kernel command to openQRM
-					$openqrm_server = new openqrm_server();
-					$openqrm_server->send_command("openqrm_server_set_default_kernel $kernel->name");
-					$form->remove($this->identifier_name.'['.$id.']');
-					$message[] = sprintf($this->lang['msg'], $kernel_name);
-					// exit after the first kernel
-					break;
-					
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'setdefault');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/kernel/css/kernel.css b/openQRM-5.3.50-CE/src/web/base/server/kernel/css/kernel.css
deleted file mode 100644
index 3ecf76e..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/kernel/css/kernel.css
+++ /dev/null
@@ -1,44 +0,0 @@
-.htmlobject_td.kernel_icon {
-	text-align:center;
-	width:25px;
-}
-.htmlobject_td.kernel_id {
-	text-align:center;
-	width:25px;
-}
-.htmlobject_td.kernel_name {
-	text-align:left;
-	width:220px;
-}
-.htmlobject_td.kernel_version {
-	text-align:left;
-	width:140px;
-}
-.htmlobject_td.kernel_comment {
-	text-align:left;
-}
-.htmlobject_td.identifier {
-	text-align:center;
-}
-.htmlobject_td.edit {
-	text-align:center;
-}
-.htmlobject_td.default {
-	text-align:center;
-	width:40px;
-}
-
-a.default {
-	padding: 0;
-	border: 0px none;
-	width: 32px;
-	height: 32px;
-	display:block;
-	text-align: center;
-	text-decoration: none;
-	line-height: 0px;
-	overflow: hidden;
-	color: transparent;
-	background: url('../../../img/snapshot.png') no-repeat center top;
-}
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/kernel/kernel-action.php b/openQRM-5.3.50-CE/src/web/base/server/kernel/kernel-action.php
deleted file mode 100644
index 78f3b50..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/kernel/kernel-action.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/kernel.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-// filter inputs
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-global $KERNEL_INFO_TABLE;
-
-$event = new event();
-
-// user/role authentication
-if (!strstr($OPENQRM_USER->role, "administrator")) {
-	$event->log("authorization", $_SERVER['REQUEST_TIME'], 1, "kernel-action", "Un-Authorized access to kernel-actions from $OPENQRM_USER->name", "", "", 0, 0, 0);
-	exit();
-}
-
-$kernel_command=$request->get('kernel_command');
-$kernel_name=$request->get('kernel_name');
-$kernel_id=$request->get('kernel_id');
-$kernel_name=$request->get('kernel_name');
-$kernel_version=$request->get('kernel_version');
-$kernel_fields = array();
-foreach ($_REQUEST as $key => $value) {
-	if (strncmp($key, "kernel_", 7) == 0) {
-		$kernel_fields[$key] = $value;
-	}
-}
-unset($kernel_fields["kernel_command"]);
-
-
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-
-global $OPENQRM_SERVER_IP_ADDRESS;
-
-$event->log("$kernel_command", $_SERVER['REQUEST_TIME'], 5, "kernel-action", "Processing command $kernel_command for kernel $kernel_name", "", "", 0, 0, 0);
-switch ($kernel_command) {
-	case 'new_kernel':
-		$kernel = new kernel();
-		// check that name is unique
-		$kernel->get_instance_by_name($kernel_name);
-		if ($kernel->id > 0) {
-			$event->log("$kernel_command", $_SERVER['REQUEST_TIME'], 5, "kernel-action", "Kernel name must be unique! Not adding new kernel ".$kernel_name, "", "", 0, 0, 0);
-		} else {
-                        if ($kernel_name == 'default') {
-                            $kernel_fields["kernel_id"]=1;
-                        } else {
-                            $kernel_fields["kernel_id"]=(int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-                        }
-			$kernel->add($kernel_fields);
-		}
-		break;
-
-	case 'update':
-		$kernel = new kernel();
-		$kernel->update($kernel_id, $kernel_fields);
-		break;
-
-	case 'remove':
-		$kernel = new kernel();
-		$kernel->remove($kernel_id);
-		break;
-
-	case 'remove_by_name':
-		$kernel = new kernel();
-		$kernel->remove_by_name($kernel_name);
-		break;
-
-	default:
-		$event->log("$kernel_command", $_SERVER['REQUEST_TIME'], 3, "kernel-action", "No such kernel command ($kernel_command)", "", "", 0, 0, 0);
-		break;
-
-
-}
-?>
-
-</body>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/kernel/lang/de.kernel.ini b/openQRM-5.3.50-CE/src/web/base/server/kernel/lang/de.kernel.ini
deleted file mode 100644
index 8b8a155..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/kernel/lang/de.kernel.ini
+++ /dev/null
@@ -1,58 +0,0 @@
-[select]
-tab = "Kernels"
-label = "Kernels"
-action_remove = "entfernen"
-action_edit = "bearbeiten"
-action_add = "Neuen Kernel hinzufügen"
-action_setdefault = "Setze Kernel %s als default"
-table_id = "ID"
-table_name = "Name"
-table_type = "Typ"
-table_version = "Version"
-table_comment = "Kommentar"
-table_name = "Name"
-table_type = "Typ"
-table_kernel = "Kernel"
-please_wait = "Lade Kernels. Bitte warten .."
-
-[add]
-label = "Neuer Kernel"
-title = "Neuen Kernel hinzufügen"
-kernel_add = "<b>Neue Kernels können dem openQRM Server mit dem folgendem Kommando hinzugefügt werden:</b><br>
-<br>
-<br>/usr/share/openqrm/bin/openqrm kernel add -n name -v version -u username -p password [-l location] [-i initramfs/ext2] [-t path-to-initrd-template-file]<br>
-<br>
-<b>name</b> Name für den neuen Kernel (keine Sonderzeichen)<br>
-<b>version</b> Kernel Versionsnummer<br>
-<b>username</b> und <b>password</b> openQRM Username und Password <br>
-<b>location</b> Das Root Verzeichnis von dem der neue kernel erstellt wird (z.b. /myimages/debian64/<br>
-<b>initramfs/ext2</b> Typ der Initrd<br>
-<b>path-to-initrd-template-file</b> Pfad zu einem der Initrd-Templates z.b. /usr/share/openqrm/etc/templates/openqrm-initrd-template.debian.x86_64.tgz<br>
-<br>
-Beispiel:<br>
-/usr/share/openqrm/bin/openqrm kernel add -n openqrm-kernel-1 -v 2.6.29 -u openqrm -p openqrm -i initramfs -l / -t /usr/share/openqrm/etc/templates/openqrm-initrd-template.debian.x86_64.tgz<br>
-<br>"
-
-please_wait = "Lade Kernels. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
-
-[remove]
-label = "Entferne Kernel(s)"
-msg = "Kernel %s entfernt"
-msg_not_removing_default = "Der default Kernel kann nicht entfernt werden!"
-msg_not_removing_active = "Kernel %s wird noch von Server %s genutzt!<br>Enfernen des Kernels abgebrochen."
-please_wait = "Lade Kernels. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
-
-[setdefault]
-label = "Setze default Kernel"
-msg = "Kernel %s ist nun der default Kernel"
-please_wait = "Lade Kernels. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
-
-[edit]
-label = "Editiere Kernel"
-msg = "Kernel %s editiert"
-comment = "Kommentar"
-please_wait = "Lade Kernels. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/kernel/lang/en.kernel.ini b/openQRM-5.3.50-CE/src/web/base/server/kernel/lang/en.kernel.ini
deleted file mode 100644
index 72425e2..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/kernel/lang/en.kernel.ini
+++ /dev/null
@@ -1,56 +0,0 @@
-[select]
-tab = "Kernels"
-label = "Kernels"
-action_remove = "remove"
-action_edit = "edit"
-action_add = "Add a new kernel"
-action_setdefault = "Set kernel %s as default"
-table_name = "Name"
-table_id = "ID"
-table_version = "Version"
-table_comment = "Comment"
-table_name = "Name"
-table_type = "Type"
-table_kernel = "Kernel"
-please_wait = "Loading. Please wait .."
-
-[add]
-label = "Add kernel"
-title = "Adding a new kernel to openQRM"
-kernel_add = "<b>New kernels should be added on the openqrm server with the following command:</b><br>
-			<br>
-			<br>/usr/share/openqrm/bin/openqrm kernel add -n name -v version -u username -p password [-l location] [-i initramfs/ext2] [-t path-to-initrd-template-file]<br>
-			<br>
-			<b>name</b> can be any identifier as long as it has no spaces or other special characters; it is used as part of the filename.<br>
-			<b>version</b> should be the version for the kernel you want to install. If the filenames are called vmlinuz-2.6.26-2-amd64 then 2.6.26-2-amd64 is the version of this kernel.<br>
-			<b>username</b> and <b>password</b> are the credentials to openqrm itself.<br>
-			<b>location</b> is the root directory for the kernel you want to install. The files that are used are \${location}/boot/vmlinuz-\${version}, \${location}/boot/initrd.img-\${version} and \${location}/lib/modules/\${version}/*<br>
-			<b>initramfs/ext2</b> should specify the type of initrd image you want to generate. Most people want to use <b>initramfs</b> here.<br>
-			<b>path-to-initrd-template-file</b> should point to an openqrm initrd template. These can be found in the openqrm base dir under etc/templates.<br>
-			<br>
-			Example:<br>
-			/usr/share/openqrm/bin/openqrm kernel add -n openqrm-kernel-1 -v 2.6.29 -u openqrm -p openqrm -i initramfs -l / -t /usr/share/openqrm/etc/templates/openqrm-initrd-template.debian.x86_64.tgz<br>
-			<br>"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[remove]
-label = "Remove kernel(s)"
-msg = "Removed kernel %s"
-msg_not_removing_default = "Not removing default kernel!"
-msg_not_removing_active = "Not removing kernel %s!<br>It is still in use by Server %s !"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[setdefault]
-label = "Set default kernel"
-msg = "Set default kernel to %s"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[edit]
-label = "Edit kernels"
-comment = "Comment"
-msg = "Edited kernel %s"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/kernel/lang/es.kernel.ini b/openQRM-5.3.50-CE/src/web/base/server/kernel/lang/es.kernel.ini
deleted file mode 100644
index 6ae98e4..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/kernel/lang/es.kernel.ini
+++ /dev/null
@@ -1,56 +0,0 @@
-[select]
-tab = "Kernels"
-label = "Kernels"
-action_remove = "quitar"
-action_edit = "editar"
-action_add = "Añadir un nuevo kernel"
-action_setdefault = "Asignar kernel %s como predeterminado"
-table_name = "Nombre"
-table_id = "ID"
-table_version = "Versión"
-table_comment = "Comentario"
-table_name = "Nombre"
-table_type = "Tipo"
-table_kernel = "Kernel"
-please_wait = "Cargando. Por favor espere .."
-
-[add]
-label = "Añadir kernel"
-title = "Añadiendo un nuevo kernel a openQRM"
-kernel_add = "<b>Los kernels nuevos se añaden al servidor openQRM con el siguiente comando:</b><br>
-			<br>
-			<br>/usr/share/openqrm/bin/openqrm kernel add -n name -v version -u username -p password [-l location] [-i initramfs/ext2] [-t path-to-initrd-template-file]<br>
-			<br>
-			<b>nombre</b> Puede ser cualquier tipo de indentificación siempre y cuando este no contenga espacios u otros caracteres especiales; Este es usado como parte del nombre del archivo.<br>
-			<b>version</b> Debería ser la versión del kernel que ud. quiere instalar. Si los archivos son nombrados vmlinuz-2.6.26-2-amd64 entonces 2.6.26-2-amd64 es la versión de este kernel.<br>
-			<b>username</b> y <b>password</b> son las credenciales para openQRM.<br>
-			<b>location</b> es el directorio raiz para el kernel a instalar. Los ficheros usados son \${location}/boot/vmlinuz-\${version}, \${location}/boot/initrd.img-\${version} y \${location}/lib/modules/\${version}/*<br>
-			<b>initramfs/ext2</b> debería especificar el tipo de imagen initrd quiere generar. La mayoría de la gente utiliza <b>initramfs</b> aquí.<br>
-			<b>path-to-initrd-template-file</b> Debería apuntar a una plantilla de tipo initrd de openqrm. Estas se encuentran en el directorio base de openqrm en etc/templates.<br>
-			<br>
-			Ejemplo:<br>
-			/usr/share/openqrm/bin/openqrm kernel add -n openqrm-kernel-1 -v 2.6.29 -u openqrm -p openqrm -i initramfs -l / -t /usr/share/openqrm/etc/templates/openqrm-initrd-template.debian.x86_64.tgz<br>
-			<br>"
-please_wait = "Cargando. Por favor espere  .."
-canceled = "Cancelado. Por favor espere .."
-
-[remove]
-label = "Quitar kernel(s)"
-msg = "Quitar kernel %s"
-msg_not_removing_default = "No se ha quitado el kernel prediterminado!"
-msg_not_removing_active = "No se quita el kernel %s!<br>Ya se está en uso por el servidor %s !"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[setdefault]
-label = "Asignar un kernel predeterminado"
-msg = "Asignar un kernel predeterminado a %s"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[edit]
-label = "Editar kernels"
-comment = "Comentario"
-msg = "Editar kernel %s"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/kernel/tpl/kernel-add.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/kernel/tpl/kernel-add.tpl.php
deleted file mode 100644
index 2b01738..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/kernel/tpl/kernel-add.tpl.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div class="pull-left">
-	<h3>{title}</h3>
-	{kernel_add}
-
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/kernel/tpl/kernel-edit.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/kernel/tpl/kernel-edit.tpl.php
deleted file mode 100644
index 5e16706..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/kernel/tpl/kernel-edit.tpl.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label} "{kernel_name}"</h2>
-<form action="{thisfile}">
-
-	<div id="form">
-	{form}
-	{kernel_comment}
-		<div id="buttons">
-		{submit}
-		{cancel}
-		</div>
-	</div>
-
-</form>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/kernel/tpl/kernel-remove.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/kernel/tpl/kernel-remove.tpl.php
deleted file mode 100644
index a2e691b..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/kernel/tpl/kernel-remove.tpl.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}">
-
-	<div id="form">
-	{form}
-	</div>
-
-	<div id="buttons">
-	{submit}
-	{cancel}
-	</div>
-
-</form>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/kernel/tpl/kernel-select.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/kernel/tpl/kernel-select.tpl.php
deleted file mode 100644
index a32bde5..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/kernel/tpl/kernel-select.tpl.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-
-<h2>{label}<span class="pull-right">{add}</span></h2>
-<div id="form">
-	{table}
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/kernel/tpl/kernel-setdefault.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/kernel/tpl/kernel-setdefault.tpl.php
deleted file mode 100644
index a2e691b..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/kernel/tpl/kernel-setdefault.tpl.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}">
-
-	<div id="form">
-	{form}
-	</div>
-
-	<div id="buttons">
-	{submit}
-	{cancel}
-	</div>
-
-</form>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.add.class.php b/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.add.class.php
deleted file mode 100644
index 21dcd13..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.add.class.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/**
- * Resource Add
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class resource_add
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'resource_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "resource_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'resource_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'resource_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$virtualization = new virtualization();
-		$virtualization_list = array();
-		$virtualization_list = $virtualization->get_list();
-		$virtualization_link_section = "";
-		// filter out the virtualization hosts
-		foreach ($virtualization_list as $id => $virt) {
-			$virtualization_id = $virt['value'];
-			$available_virtualization = new virtualization();
-			$available_virtualization->get_instance_by_id($virtualization_id);
-			if (strstr($available_virtualization->type, "-vm")) {
-				$virtualization_plugin_name = $available_virtualization->get_plugin_name();
-				$virtualization_name = str_replace(" VM", "", $available_virtualization->name);
-
-				$a = $this->response->html->a();
-				$a->href = $this->response->get_url($this->actions_name, 'load').'&rplugin='.$virtualization_plugin_name.'&rcontroller='.$virtualization_plugin_name."-vm";
-				$a->label = '<img title="'.sprintf($this->lang['create_vm'], $virtualization_plugin_name).'" alt="'.sprintf($this->lang['create_vm'], $virtualization_plugin_name).'" src="/openqrm/base/plugins/'.$virtualization_plugin_name.'/img/plugin.png" border=0>'.$virtualization_name.' '.$this->lang['vm'];
-
-				#$new_vm_link = "/openqrm/base/index.php?plugin=".$virtualization_plugin_name."&controller=".$virtualization_plugin_name."-vm";
-				#$virtualization_link_section .= "<a href='".$new_vm_link."' style='text-decoration: none'><img title='".sprintf($this->lang['create_vm'], $virtualization_plugin_name)."' alt='".sprintf($this->lang['create_vm'], $virtualization_plugin_name)."' src='/openqrm/base/plugins/".$virtualization_plugin_name."/img/plugin.png' border=0> ".$virtualization_name." ".$this->lang['vm']."</a><br>";
-				$virtualization_link_section .= $a->get_string().'<br>';
-
-			}
-		}
-		if (!strlen($virtualization_link_section)) {
-			$virtualization_link_section = $this->lang['start_vm_plugin'];
-		}
-		// local-server plugin enabled and started
-		if (file_exists($_SERVER["DOCUMENT_ROOT"]."/openqrm/base/plugins/local-server/.running")) {
-			$a = $this->response->html->a();
-			$a->href = $this->response->get_url($this->actions_name, 'load').'&rplugin=local-server&rcontroller=local-server-about&local_server_about_action=usage';
-			$a->label = '<img title="'.$this->lang['integrate_local_server'].'" alt="'.$this->lang['integrate_local_server'].'" src="/openqrm/base/plugins/local-server/img/plugin.png" border="0">'.$this->lang['integrate_local_server'];
-			$local_server_plugin_link = $a->get_string().'<br>';
-			#$local_server_plugin_link = "<a href='/openqrm/base/index.php?plugin=local-server&controller=local-server-about&local_server_about_action=usage' style='text-decoration: none'><img title='".$this->lang['integrate_local_server']."' alt='".$this->lang['integrate_local_server']."' src='/openqrm/base/plugins/local-server/img/plugin.png' border=0> ".$this->lang['integrate_local_server']."</a>";
-		} else {
-			$local_server_plugin_link = $this->lang['start_local_server'];
-		}
-
-		// manual add new resource
-		$manual_new_resource_link = "<a href='/openqrm/base/index.php?base=resource&resource_action=new' style='text-decoration: none'><img title='".$this->lang['manual_new_resource']."' alt='".$this->lang['manual_new_resource']."' src='/openqrm/base/img/resource.png' border=0> ".$this->lang['manual_new_resource']."</a>";
-		
-
-
-		$t = $this->response->html->template($this->tpldir.'/resource-add.tpl.php');
-		$t->add($virtualization_link_section, 'resource_virtual');
-		$t->add($local_server_plugin_link, 'resource_local');
-		$t->add($manual_new_resource_link, 'resource_new');
-		$t->add($this->lang['title'], 'label');
-		$t->add($this->lang['vm_type'], 'vm_type');
-		$t->add($this->lang['local'], 'local');
-		$t->add($this->lang['unmanaged'], 'unmanaged');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->lang['canceled'], 'canceled');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.controller.class.php b/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.controller.class.php
deleted file mode 100644
index d1880ea..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.controller.class.php
+++ /dev/null
@@ -1,568 +0,0 @@
-<?php
-/**
- * Resource Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class resource_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'resource_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "resource_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'resource_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'resource_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array (
-		'tab' => 'Resources',
-		'label' => 'Resources',
-		'action_remove' => 'remove',
-		'action_reboot' => 'reboot',
-		'action_poweroff' => 'poweroff',
-		'action_mgmt' => 'manage',
-		'action_edit' => 'edit',
-		'action_add' => 'Add a new resource',
-		'action_new' => 'new',
-		'table_state' => 'State',
-		'table_id' => 'Id',
-		'table_name' => 'Name',
-		'table_type' => 'Type',
-		'table_mac' => 'Mac',
-		'table_ip' => 'IP',
-		'table_cpu' => 'CPU',
-		'table_nics' => 'NIC',
-		'table_memory' => 'RAM',
-		'table_load' => 'Load',
-		'table_resource' => 'Resource',
-		'table_deployment' => 'Deployment',
-		'table_uptime' => 'Uptime',
-		'lang_type_filter' => 'Filter by Resource Type',
-		'lang_filter' => 'Filter by Resource',
-		'lang_filter_title' => 'Filter by Resource ID, Name or Mac. Use ? as single and * as multi wildcard.',
-		'please_wait' => 'Loading. Please wait ..',
-	),
-	'add' => array (
-		'label' => 'Add resource',
-		'title' => 'Add a new resource as ',
-		'vm_type' => 'a Virtual Machine from type',
-		'local' => 'or by integrating an existing, local-installed server',
-		'unmanaged' => 'Manual add an un-managed system',
-		'manual_new_resource' => 'or manual add an un-managed system',
-		'start_local_server' => 'Please enable and start the "local-server" plugin!',
-		'integrate_local_server' => 'Integrate an existing local installed Server',
-		'start_vm_plugin' => 'Please enable and start one of the virtualization plugins!',
-		'create_vm' => 'Create a %s Virtual Machine',
-		'vm' => 'Virtual Machine',
-		'msg' => 'Added resource %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'remove' => array (
-		'label' => 'Remove resources(s)',
-		'msg' => 'Removed resource %s',
-		'msg_not_removing' => 'Not removing resource %s!<br>It is still in use by Server %s !',
-		'msg_not_removing_vm' => 'Not removing VM resource %s!<br> Please remove it through the %s Manager!',
-		'msg_still_active' => 'Not removing resource %s!<br>It is still active or in transition.',
-		'msg_force_remove' => 'Force removal of resources',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'reboot' => array (
-		'label' => 'Reboot resources(s)',
-		'msg' => 'Rebooted resource %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'poweroff' => array (
-		'label' => 'Power-off resources(s)',
-		'msg' => 'Powered-off resource %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'new' => array (
-		'label' => 'New resource',
-		'form_docu' => 'This form is to manually create a new resource which openQRM cannot directly monitor<br>
-			via the openQRM-client e.g. NetApp Filers or EqualLogig Storages.<br>
-			The resource then can still be used as Storage Server managed by openQRM.',
-		'form_auto_resource' => 'Resources (physical systems and virtual machines) intended for rapid deployment<br>
-			 are automatically added to openQRM by setting their bios to PXE/Net-Boot.<br>
-			 Just have the "dhcpd" and "tftpd" plugin enabled and started.',
-		'form_add_resource' => 'Add new Resource (not monitored)',
-		'form_name' => 'Hostname',
-		'form_ip' => 'IP-Adress',
-		'form_mac' => 'MAC-Adress',
-		'error_name' => 'Hostname must be %s',
-		'error_ip' => 'IP-Adress must be %s',
-		'error_mac' => 'MAC-Adress must be %s',
-		'msg_mac_in_use' => 'MAC-Adress already in use! Not adding resource',
-		'msg_ip_in_use' => 'IP Adress already in use! Not adding resource',
-		'msg' => 'Added resource %s',
-		'msg_add_failed' => 'Failed adding resource',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'edit' => array (
-		'label' => 'Edit resource %s',
-		'form_docu' => 'This form allows to manually set the IP address for a local booting VM<br>
-			if this is not automatically provided e.g. by the "dhcpd plugin".',
-		'form_edit_resource' => 'Edit Resource IP address of local booting VM',
-		'form_ip' => 'IP-Adress',
-		'error_ip' => 'IP-Adress must be %s',
-		'msg_ip_in_use' => 'IP Adress already in use! Not adding resource',
-		'msg' => 'Edited resource %s',
-		'msg_add_failed' => 'Failed editing resource',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	)
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->tpldir   = $this->rootdir.'/server/resource/tpl';
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/server/resource/lang", 'resource.ini');
-//		$response->html->debug();
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "select";
-		}
-		$this->response->params['resource_filter'] = $this->response->html->request()->get('resource_filter');
-
-		// handle table params
-		$vars = $this->response->html->request()->get('resource');
-		if($vars !== '') {
-			if(!isset($vars['action'])) {
-				foreach($vars as $k => $v) {
-					$this->response->add('resource['.$k.']', $v);
-				}
-			} else {
-				foreach($vars as $k => $v) {
-					unset($this->response->params['resource['.$k.']']);
-				}
-			}
-		}
-
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'add':
-				$content[] = $this->select(false);
-				$content[] = $this->add(true);
-			break;
-			case $this->lang['select']['action_new']:
-			case 'new':
-				$content[] = $this->select(false);
-				$content[] = $this->resource_new(true);
-			break;
-			case 'edit':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-			break;
-			case 'remove':
-				$content[] = $this->select(false);
-				$content[] = $this->remove(true);
-			break;
-			case 'reboot':
-				$content[] = $this->select(false);
-				$content[] = $this->reboot(true);
-			break;
-			case 'poweroff':
-				$content[] = $this->select(false);
-				$content[] = $this->poweroff(true);
-			break;
-			case 'load':
-				$content[]     = $this->select(false);
-				$tmp           = $this->add(false);
-				$tmp['value']  = $this->__loader();
-				$tmp['active'] = true;
-				$content[]     = $tmp;
-			break;
-		}
-
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->rootdir.'/server/resource/class/resource.api.class.php');
-		$controller = new resource_api($this);
-		$controller->action();
-	}
-
-	
-	//--------------------------------------------
-	/**
-	 * Select resource
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/resource/class/resource.select.class.php');
-			$controller = new resource_select($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Add resource
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function add( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/resource/class/resource.add.class.php');
-			$controller                  = new resource_add($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['add'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['add']['label'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'add' );
-		$content['onclick'] = false;
-		if($this->action === 'add' || $this->action === $this->lang['select']['action_add']){
-			$content['active']  = true;
-		}
-		return $content;
-	}	
-
-
-	//--------------------------------------------
-	/**
-	 * New resource
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function resource_new( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/resource/class/resource.new.class.php');
-			$controller                  = new resource_new($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['new'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['new']['label'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'new' );
-		$content['onclick'] = false;
-		if($this->action === 'new' || $this->action === $this->lang['select']['action_new']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Remove resource
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function remove( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/resource/class/resource.remove.class.php');
-			$controller                  = new resource_remove($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['remove'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Remove';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'remove' );
-		$content['onclick'] = false;
-		if($this->action === 'remove' || $this->action === $this->lang['select']['action_remove']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-
-	//--------------------------------------------
-	/**
-	 * Reboot resource
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function reboot( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/resource/class/resource.reboot.class.php');
-			$controller                  = new resource_reboot($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['reboot'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Reboot';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'reboot' );
-		$content['onclick'] = false;
-		if($this->action === 'reboot' || $this->action === $this->lang['select']['action_reboot']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-
-	//--------------------------------------------
-	/**
-	 * Poweroff resource
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function poweroff( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/resource/class/resource.poweroff.class.php');
-			$controller                  = new resource_poweroff($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['poweroff'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Poweroff';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'poweroff' );
-		$content['onclick'] = false;
-		if($this->action === 'poweroff' || $this->action === $this->lang['select']['action_poweroff']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	
-
-	//--------------------------------------------
-	/**
-	 * Edit resource
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function edit( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/resource/class/resource.edit.class.php');
-			$controller                  = new resource_edit($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['edit'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['edit']['label'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'edit' );
-		$content['onclick'] = false;
-		if($this->action === 'edit' || $this->action === $this->lang['select']['action_edit']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	
-	//--------------------------------------------
-	/**
-	 * Load Plugin as new tab
-	 *
-	 * @access public
-	 * @return object
-	 */
-	//--------------------------------------------
-	function __loader() {
-
-		$plugin = $this->response->html->request()->get('rplugin');
-		$name   = $plugin;
-		$class  = $plugin;
-		if($this->response->html->request()->get('rcontroller') !== '') {
-			$class = $this->response->html->request()->get('rcontroller');
-			$name  = $class;
-		}
-		$class  = str_replace('-', '_', $class).'_controller';
-
-		// handle new response object
-		$response = $this->response->response();
-		$response->id = 'rload';
-		unset($response->params['resource[sort]']);
-		unset($response->params['resource[order]']);
-		unset($response->params['resource[limit]']);
-		unset($response->params['resource[offset]']);
-		unset($response->params['resource_filter']);
-		$response->add('rplugin', $plugin);
-		$response->add('rcontroller', $name);
-		$response->add($this->actions_name, 'load');
-
-		$path   = $this->openqrm->get('webdir').'/plugins/'.$plugin.'/class/'.$name.'.controller.class.php';
-		$role = $this->openqrm->role($response);
-		$data = $role->get_plugin($class, $path);
-		$data->pluginroot = '/plugins/'.$plugin;
-		return $data;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.edit.class.php b/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.edit.class.php
deleted file mode 100644
index a01e253..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.edit.class.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
- * Resource Update
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class resource_edit
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'resource_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "resource_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'resource_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'resource_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-		$this->user	  = $openqrm->user();
-		$this->basedir = $this->openqrm->get('basedir');
-		$this->response->params['resource_id'] = $this->response->html->request()->get('resource_id');
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->edit();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/resource-edit.tpl.php');
-		$t->add(sprintf($this->lang['label'], $this->response->html->request()->get('resource_id')), 'label');
-		$t->add($this->lang['form_docu'], 'form_docu');
-		$t->add($this->lang['form_edit_resource'], 'form_edit_resource');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->lang['canceled'], 'canceled');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * New
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function edit() {
-		$response = $this->get_response();
-		$form	= $response->form;
-		$id		= $this->response->html->request()->get('resource_id');
-		$ip		= $form->get_request('ip');
-		if (strlen($ip)) {
-			if(!$form->get_errors() && $this->response->submit()) {
-				$resource = new resource();
-				// ip in use already ?
-				$resource->get_instance_by_ip($ip);
-				if (strlen($resource->id)) {
-					$response->error = sprintf($this->lang['msg_ip_in_use']);
-					return $response;
-				}
-				$resource->get_instance_by_id($id);
-
-				// check for plugins which needs ip change
-				$openqrm_server = new openqrm_server();
-				$plugin = new plugin();
-				$enabled_plugins = $plugin->enabled();
-				if (in_array('dhcpd', $enabled_plugins)) {
-					// adjust dhcpd ip if dhcpd plugin is enabled
-					$openqrm_server->send_command($this->basedir."/plugins/dhcpd/bin/openqrm-dhcpd-manager remove -d ".$resource->id." -m ".$resource->mac." -i ".$resource->ip." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background");
-					sleep(4);
-					$openqrm_server->send_command($this->basedir."/plugins/dhcpd/bin/openqrm-dhcpd-manager add -d ".$resource->id." -m ".$resource->mac." -i ".$ip." -u ".$openqrm_admin_user->name." -p ".$openqrm_admin_user->password." --openqrm-cmd-mode background");
-				}
-				if (in_array('dns', $enabled_plugins)) {
-					// adjust dns ip if dns plugin is enabled
-					$appliance = new appliance();
-					$appliance_list = $appliance->get_ids_per_resource($resource->id);
-					
-					foreach ($appliance_list as $app) {
-						$appliance->get_instance_by_id($app['appliance_id']);
-						// adjust dns entry
-						$openqrm_server->send_command($this->basedir."/plugins/dns/bin/openqrm-dns-manager stop ".$appliance->id." ".$appliance->name." ".$resource->ip." --openqrm-cmd-mode background");
-						sleep(4);
-						$openqrm_server->send_command($this->basedir."/plugins/dns/bin/openqrm-dns-manager start ".$appliance->id." ".$appliance->name." ".$ip." --openqrm-cmd-mode background");
-					}
-				}
-
-				// update resource
-				$fields["resource_ip"] = $ip;
-				$resource->update_info($id, $fields);
-				$response->msg = sprintf($this->lang['msg'], $id);
-				$response->resource_id = $id;
-                                
-                                
-			} else {
-				$response->error = sprintf($this->lang['msg_edit_failed']);
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'edit');
-
-		$resource = new resource();
-		$resource->get_instance_by_id($this->response->html->request()->get('resource_id'));
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$d['ip']['label']                         = $this->lang['form_ip'];
-		$d['ip']['required']                      = true;
-		$d['ip']['validate']['regex']             = '/^[a-z0-9._]+$/i';
-		$d['ip']['validate']['errormsg']          = sprintf($this->lang['error_ip'], 'a-z0-9._');
-		$d['ip']['object']['type']                = 'htmlobject_input';
-		$d['ip']['object']['attrib']['name']      = 'ip';
-		$d['ip']['object']['attrib']['type']      = 'text';
-		$d['ip']['object']['attrib']['value']     = $resource->ip;
-		$d['ip']['object']['attrib']['maxlength'] = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.new.class.php b/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.new.class.php
deleted file mode 100644
index e36e8f6..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.new.class.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-/**
- * Resource New
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class resource_new
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'resource_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "resource_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'resource_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'resource_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-		$this->user	  = $openqrm->user();
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->resource_new();
-		if(isset($response->msg)) {
-			// wizard
-			if(isset($this->user->wizard_name) && $this->user->wizard_name === 'appliance' && $this->user->wizard_step == 2) {
-				sleep(4);
-				$this->response->redirect(
-					$this->response->html->thisfile.'?base=appliance&appliance_action=step'.$this->user->wizard_step.'&appliance_id='.$this->user->wizard_id.'&resource_id='.$response->resource_id
-				);
-			} else {
-				$this->response->redirect(
-					$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-				);
-			}
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/resource-new.tpl.php');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->lang['form_docu'], 'form_docu');
-		$t->add($this->lang['form_auto_resource'], 'form_auto_resource');
-		$t->add($this->lang['form_add_resource'], 'form_add_resource');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->lang['canceled'], 'canceled');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * New
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function resource_new() {
-
-		$response = $this->get_response();
-		$form     = $response->form;
-		$name	= $form->get_request('name');
-		$ip		= $form->get_request('ip');
-		$mac	= $form->get_request('mac');
-
-		if (strlen($name)) {
-			if(!$form->get_errors() && $this->response->submit()) {
-
-				// check that mac adress + ip does not yet exists
-				$resource = new resource();
-				$resource->get_instance_by_mac($mac);
-				if (strlen($resource->id)) {
-					$response->error = sprintf($this->lang['msg_mac_in_use']);
-					return $response;
-				}
-				$resource->get_instance_by_ip($ip);
-				if (strlen($resource->id)) {
-					$response->error = sprintf($this->lang['msg_ip_in_use']);
-					return $response;
-				}
-
-				$tables = $this->openqrm->get('table');
-				$id = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$mac = strtolower($mac);
-				// send command to the openQRM-server
-				$openqrm = new openqrm_server();
-				$openqrm->send_command('openqrm_server_add_resource '.$id.' '.$mac.' '.$ip);
-				// add to openQRM database
-				$fields["resource_id"] = $id;
-				$fields["resource_hostname"] = $name;
-				$fields["resource_ip"] = $ip;
-				$fields["resource_mac"] = $mac;
-				$fields["resource_localboot"]=0;
-				$fields["resource_vtype"]=1;
-				$fields["resource_vhostid"]=$id;
-				$fields["resource_state"]='unknown';
-				$fields["resource_lastgood"]='-1';
-				$resource->add($fields);
-				// set lastgood to -1 to prevent automatic checking the state
-				$resource->update_info($id, $fields);
-				$response->msg = sprintf($this->lang['msg'], $name);
-				$response->resource_id = $id;
-			} else {
-				$response->error = sprintf($this->lang['msg_add_failed']);
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'new');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$d['name']['label']                         = $this->lang['form_name'];
-		$d['name']['required']                      = true;
-		$d['name']['validate']['regex']             = '/^[a-z0-9._]+$/i';
-		$d['name']['validate']['errormsg']          = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                = 'htmlobject_input';
-		$d['name']['object']['attrib']['name']      = 'name';
-		$d['name']['object']['attrib']['type']      = 'text';
-		$d['name']['object']['attrib']['value']     = '';
-		$d['name']['object']['attrib']['maxlength'] = 50;
-
-		$d['ip']['label']                         = $this->lang['form_ip'];
-		$d['ip']['required']                      = true;
-		$d['ip']['validate']['regex']             = '/^[a-z0-9._]+$/i';
-		$d['ip']['validate']['errormsg']          = sprintf($this->lang['error_ip'], 'a-z0-9._');
-		$d['ip']['object']['type']                = 'htmlobject_input';
-		$d['ip']['object']['attrib']['name']      = 'ip';
-		$d['ip']['object']['attrib']['type']      = 'text';
-		$d['ip']['object']['attrib']['value']     = '';
-		$d['ip']['object']['attrib']['maxlength'] = 50;
-
-		$d['mac']['label']                         = $this->lang['form_mac'];
-		$d['mac']['required']                      = true;
-		$d['mac']['validate']['regex']             = '/^[a-z0-9._:]+$/i';
-		$d['mac']['validate']['errormsg']          = sprintf($this->lang['error_mac'], 'a-z0-9._');
-		$d['mac']['object']['type']                = 'htmlobject_input';
-		$d['mac']['object']['attrib']['name']      = 'mac';
-		$d['mac']['object']['attrib']['type']      = 'text';
-		$d['mac']['object']['attrib']['value']     = '';
-		$d['mac']['object']['attrib']['maxlength'] = 50;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.poweroff.class.php b/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.poweroff.class.php
deleted file mode 100644
index 49602e9..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.poweroff.class.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/**
- * Resource Poweroff
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class resource_poweroff
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'resource_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "resource_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'resource_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'resource_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->poweroff();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/resource-poweroff.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->lang['canceled'], 'canceled');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Reboot
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function poweroff() {
-
-		$response = $this->get_response();
-		$resources = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		$resource = new resource();
-		if( $resources !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($resources as $id) {
-				$resource = $resource->get_instance_by_id($id);
-				$d['param_f'.$i]['label']                       = $resource->hostname;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $id;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$errors     = array();
-				$message    = array();
-				foreach($resources as $key => $id) {
-					$resource = $resource->get_instance_by_id($id);
-					$resource->send_command($resource->ip, "halt");
-					// set state to transition
-					$resource_fields=array();
-					$resource_fields["resource_state"]="off";
-					$resource->update_info($id, $resource_fields);
-					$form->remove($this->identifier_name.'['.$key.']');
-					$message[] = sprintf($this->lang['msg'], $id);
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'poweroff');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.reboot.class.php b/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.reboot.class.php
deleted file mode 100644
index 76dbead..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.reboot.class.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/**
- * Resource Reboot
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class resource_reboot
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'resource_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "resource_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'resource_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'resource_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->reboot();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/resource-reboot.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->lang['canceled'], 'canceled');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Reboot
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function reboot() {
-
-		$response = $this->get_response();
-		$resources = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		$resource = new resource();
-		if( $resources !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($resources as $id) {
-				$resource = $resource->get_instance_by_id($id);
-				$d['param_f'.$i]['label']                       = $resource->hostname;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $id;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$errors     = array();
-				$message    = array();
-				foreach($resources as $key => $id) {
-					$resource = $resource->get_instance_by_id($id);
-					$resource->send_command($resource->ip, "reboot");
-					// set state to transition
-					$resource_fields=array();
-					$resource_fields["resource_state"]="transition";
-					$resource->update_info($id, $resource_fields);
-					$form->remove($this->identifier_name.'['.$key.']');
-					$message[] = sprintf($this->lang['msg'], $id);
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'reboot');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.remove.class.php b/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.remove.class.php
deleted file mode 100644
index f5f1715..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.remove.class.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-/**
- * Remove resource
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class resource_remove
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'resource_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "resource_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'resource_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'resource_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->remove();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/resource-remove.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->lang['canceled'], 'canceled');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function remove() {
-
-		$response = $this->get_response();
-		$resources = $response->html->request()->get($this->identifier_name);
-		$force_remove = $response->html->request()->get('force_remove');
-		$form     = $response->form;
-		$resource = new resource();
-		if( $resources !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($resources as $id) {
-				$resource = $resource->get_instance_by_id($id);
-				$d['param_f'.$i]['label']                       = $resource->hostname;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $id;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;		
-				$i++;
-			}
-			
-			$d['force_remove']['label']                       = $this->lang['msg_force_remove'];
-			$d['force_remove']['object']['type']              = 'htmlobject_input';
-			$d['force_remove']['object']['attrib']['type']    = 'checkbox';
-			$d['force_remove']['object']['attrib']['name']    = 'force_remove';
-			$d['force_remove']['object']['attrib']['value']   = 1;
-			$d['force_remove']['object']['attrib']['checked'] = false;
-			
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$errors     = array();
-				$message    = array();
-				foreach($resources as $key => $id) {
-					$resource = $resource->get_instance_by_id($id);
-					if ($force_remove != 1) {
-						// check that the state is poweroff or error
-						if (($resource->state != 'error') && ($resource->state != 'off') && ($resource->state != 'unknown')) {
-							$message[] = sprintf($this->lang['msg_still_active'], $id);
-							continue;
-						}
-						// check that resource is not still used by an appliance
-						$resource_is_used_by_appliance = "";
-						$remove_error = 0;
-						$appliance = new appliance();
-						$appliance_id_list = $appliance->get_all_ids();
-						foreach($appliance_id_list as $appliance_list) {
-							$appliance_id = $appliance_list['appliance_id'];
-							$app_resource_remove_check = new appliance();
-							$app_resource_remove_check->get_instance_by_id($appliance_id);
-							if ($app_resource_remove_check->resources == $id) {
-								$resource_is_used_by_appliance .= $appliance_id." ";
-								$remove_error = 1;
-							}
-						}
-						if ($remove_error == 1) {
-							$message[] = sprintf($this->lang['msg_not_removing'], $id, $resource_is_used_by_appliance);
-							continue;
-						}
-						// check that this is a physical resource, VMs are removed through their VM Manager
-						if ($resource->vtype != 1) {
-							$virtualization = new virtualization();
-							$virtualization->get_instance_by_id($resource->vtype);
-							$virtualization_name = str_replace('-vm', '', $virtualization->type);
-							$message[] = sprintf($this->lang['msg_not_removing_vm'], $id, $virtualization_name);
-							continue;
-						}
-					}
-					$resource->remove($id, $resource->mac);
-					$form->remove($this->identifier_name.'['.$key.']');
-					$message[] = sprintf($this->lang['msg'], $id);
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'remove');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.select.class.php b/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.select.class.php
deleted file mode 100644
index 216d113..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.select.class.php
+++ /dev/null
@@ -1,408 +0,0 @@
-<?php
-/**
- * Resource Select
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class resource_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'resource_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "resource_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'resource_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'resource_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-		$this->response->add('resource_filter', $this->response->html->request()->get('resource_filter'));
-		$this->response->add('resource_type_filter', $this->response->html->request()->get('resource_type_filter'));
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$data = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/resource-select.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($data);
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['lang_filter'], 'lang_filter');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select() {
-
-		$d = array();
-
-		$h = array();
-		$h['resource_state']['title'] = $this->lang['table_state'];
-		$h['resource_state']['sortable'] = false;
-
-		$h['resource_id']['title'] = $this->lang['table_id'];
-		$h['resource_id']['hidden'] = true;
-
-		$h['resource_hostname']['title'] = $this->lang['table_name'];
-		$h['resource_hostname']['hidden'] = true;
-
-		$h['resource_mac']['title'] = $this->lang['table_mac'];
-		$h['resource_mac']['hidden'] = true;
-
-		$h['resource_ip']['title'] = $this->lang['table_ip'];
-		$h['resource_ip']['hidden'] = true;
-
-		$h['resource_type']['title'] = $this->lang['table_type'];
-		$h['resource_type']['sortable'] = false;
-		$h['resource_type']['hidden'] = true;
-
-		$h['resource_memtotal']['title'] = $this->lang['table_memory'];
-		$h['resource_memtotal']['hidden'] = true;
-
-		$h['resource_cpunumber']['title'] = $this->lang['table_cpu'];
-		$h['resource_cpunumber']['hidden'] = true;
-
-		$h['resource_nics']['title'] = $this->lang['table_nics'];
-		$h['resource_nics']['hidden'] = true;
-
-		$h['resource_load']['title'] = $this->lang['table_load'];
-		$h['resource_load']['hidden'] = true;
-
-		$h['data']['title'] = '&#160;';
-		$h['data']['sortable'] = false;
-
-		$h['hw']['title'] = '&#160;';
-		$h['hw']['sortable'] = false;
-
-		$resource = new resource();
-		$params  = $this->response->get_array($this->actions_name, 'select');
-		$b       = array();
-
-#$this->response->html->help($resource->find_resource('00:e0:53:13'));
-
-		// unset unnecessary params
-		unset($params['resource_type_filter']);
-		unset($params['resource_filter']);
-		unset($params['resource[sort]']);
-		unset($params['resource[order]']);
-		unset($params['resource[limit]']);
-		unset($params['resource[offset]']);
-
-		$table = $this->response->html->tablebuilder('resource', $params);
-		$table->offset = 0;
-		$table->sort = 'resource_id';
-		$table->limit = 20;
-		$table->order = 'ASC';
-		$table->max = $resource->get_count('all');
-
-		$table->init();
-
-		// handle table params
-		$tps = $table->get_params();
-		$tp = '';
-		foreach($tps['resource'] as $k => $v) {
-			$tp .= '&resource['.$k.']='.$v;
-		}
-
-		$resource_filter = null;
-		if( $this->response->html->request()->get('resource_filter') !== '') {
-			$resource_filter = array();
-			$ar = $resource->find_resource($this->response->html->request()->get('resource_filter'));
-			if(count($ar) > 0) {
-				foreach($ar as $k => $v) {
-					$resource_filter[] = $v['resource_id'];
-				}
-			}
-		}
-
-		$resources = $resource->display_overview(0, 10000, $table->sort, $table->order);
-		foreach ($resources as $index => $resource_db) {
-
-			// prepare the values for the array
-			$resource = new resource();
-			$resource->get_instance_by_id($resource_db["resource_id"]);
-			$res_id = $resource->id;
-
-			if ($this->response->html->request()->get('resource_type_filter') === '' || ($this->response->html->request()->get('resource_type_filter') == $resource->vtype )) {
-
-				// Skip all resources not in $resource_filter
-				if(isset($resource_filter)) {
-					if(!in_array($resource->id, $resource_filter)) {
-						continue;
-					}
-				}
-
-				$mem_total = $resource_db['resource_memtotal'];
-				$mem_used = $resource_db['resource_memused'];
-				$mem = "$mem_used/$mem_total";
-				$swap_total = $resource_db['resource_swaptotal'];
-				$swap_used = $resource_db['resource_swapused'];
-				$swap = "$swap_used/$swap_total";
-				$resource_mac = $resource_db["resource_mac"];
-
-				#$uptime = $resource_db["resource_uptime"];
-				$uptime = ($resource_db["resource_uptime"] > 0) ? $resource_db["resource_uptime"] : 0;
-
-
-#				$dtF = new \DateTime();
-                                $dtF = @new \DateTime('@0');
-
-#                               $dtT = new \DateTime("@$uptime");
-				$dtT = new \DateTime("@".$uptime);
-				
-				
-
-				$uptime_formatted = $dtF->diff($dtT)->format('%a '.$this->lang['days'].', %H:%i:%S');
-
-
-				// the resource_type
-				$link = '';
-				if ((strlen($resource->vtype)) && (!strstr($resource->vtype, "NULL"))){
-					// find out what should be preselected
-					$virtualization = new virtualization();
-					$virtualization->get_instance_by_id($resource->vtype);
-					$virtualization_plugin_name = $virtualization->get_plugin_name();
-					$virtualization_vm_action_name = str_replace("-", "_", $virtualization_plugin_name);
-					if ($virtualization->id == 1) {
-						$resource_type = $virtualization->name;
-					} else {
-						$resource_type_link_text = $virtualization->name;
-						if ($resource->id == $resource->vhostid) {
-							// physical system or host
-							$host_appliance = new appliance();
-							$host_appliance->get_instance_by_virtualization_and_resource($virtualization->id, $resource->id);
-							if (($virtualization->id > 0) && ($resource->id > 0)) {
-								$link = '?plugin='.$virtualization_plugin_name.'&controller='.$virtualization_plugin_name.'-vm&'.$virtualization_vm_action_name.'_vm_action=edit&appliance_id='.$host_appliance->id;
-								$resource_type_link_text = "<nobr>".$virtualization->name." Server ".$host_appliance->name."</nobr>";
-							}
-						} else {
-							// vm
-							$host_virtualization = new virtualization();
-							$host_virtualization->get_instance_by_type($virtualization_plugin_name);
-							$host_appliance = new appliance();
-							if ($host_virtualization->id > 0) {
-								$host_appliance->get_instance_by_virtualization_and_resource($host_virtualization->id, $resource->vhostid);
-								$host_resource = new resource();
-								$host_resource->get_instance_by_id($resource->vhostid);
-								$link = '?plugin='.$virtualization_plugin_name.'&controller='.$virtualization_plugin_name.'-vm&'.$virtualization_vm_action_name.'_vm_action=edit&appliance_id='.$host_appliance->id;
-								$resource_type_link_text = "<nobr>".$virtualization->name." on Res. ".$host_resource->hostname."</nobr>";
-							}
-						}
-						$resource_type = $resource_type_link_text;
-					}
-				} else {
-					$resource_type = "Unknown";
-				}
-				// openQRM resource ?
-				if ($resource->id == 0) {
-					$resource_icon_default="/openqrm/base/img/logo.png";
-				} else {
-					$resource_icon_default="/openqrm/base/img/resource.png";
-				}
-				$state_icon = '<span class="pill '.$resource->state.'">'.$resource->state.'</span>';
-				// idle ?
-				if (("$resource->imageid" == "1") && ("$resource->state" == "active")) {
-					$state_icon='<span class="pill idle">idle</span>';
-				}
-			
-				$resource_cpus = $resource_db["resource_cpunumber"];
-				if (!strlen($resource_cpus)) {
-					$resource_cpus = '?';
-				}
-				$resource_nics = $resource_db["resource_nics"];
-				if (!strlen($resource_nics)) {
-					$resource_nics = '?';
-				}
-				isset($resource_db["resource_hostname"]) ? $name = $resource_db["resource_hostname"] : $name = '&#160;';
-				isset($resource_db["resource_nics"]) ? $nics = $resource_db["resource_nics"] : $nics = '&#160;';
-				isset($resource_db["resource_load"]) ? $load = $resource_db["resource_load"] : $load = '&#160;';
-
-				// check for local VMs without an IP 
-				$resip = $resource_db["resource_ip"];
-				$resid = $resource_db["resource_id"];
-				if ($resip == '0.0.0.0') {
-					$state_icon = '<span class="pill transition">transition</span>';
-				}
-				$pos = strpos($virtualization->type, 'vm-local');
-				if ($pos !== false) {
-					$a = $this->response->html->a();
-					$a->title = $this->lang['action_edit'].' IP';
-					$a->label = $resip;
-					$a->css   = 'edit';
-					$a->href  = $this->response->get_url($this->actions_name, 'edit').'&resource_id='.$resid;
-					$resip = $a->get_string();
-				 }
-				
-				$data  = '<b>'.$this->lang['table_id'].'</b>: '.$resource_db["resource_id"].'<br>';
-				$data .= '<b>'.$this->lang['table_name'].'</b>: '.$name.'<br>';
-				$data .= '<b>'.$this->lang['table_mac'].'</b>: '.$resource_mac.'<br>';
-				$data .= '<b>'.$this->lang['table_ip'].'</b>: '.$resip.'<br>';
-				$data .= '<b>'.$this->lang['table_type'].'</b>: '.$resource_type;
-
-				$hw  = '<b>'.$this->lang['table_cpu'].'</b>: '.$resource_cpus.'<br>';
-				$hw .= '<b>'.$this->lang['table_memory'].'</b>: '.$mem.'<br>';
-				$hw .= '<b>'.$this->lang['table_nics'].'</b>: '.$nics.'<br>';
-				$hw .= '<b>'.$this->lang['table_load'].'</b>: '.$load.'<br>';
-				$hw .= '<b>'.$this->lang['table_uptime'].'</b>: '.$uptime_formatted;
-
-				$b[] = array(
-					'resource_state' => $state_icon,
-					'resource_id' => $resource_db["resource_id"],
-					'resource_hostname' => $name,
-					'resource_mac' => $resource_mac,
-					'resource_ip' => $resip,
-					'resource_type' => $resource_type,
-					'resource_memtotal' => $mem,
-					'resource_cpunumber' => $resource_cpus,
-					'resource_nics' => $nics,
-					'resource_load' => $load,
-					'resource_uptime' => $uptime,
-					'data' => $data,
-					'hw' => $hw,
-				);
-			}
-		}
-
-		// Type Filter
-		$virtulization_types = new virtualization();
-		$list = $virtulization_types->get_list();
-		$filter = array();
-		$filter[] = array('', '');
-		foreach( $list as $l) {
-			$filter[] = array( $l['label'], $l['value']);
-		}
-		asort($filter);
-		$select = $this->response->html->select();
-		$select->add($filter, array(1,0));
-		$select->name = 'resource_type_filter';
-		$select->handler = 'onchange="wait();this.form.submit();return false;"';
-		$select->selected = array($this->response->html->request()->get('resource_type_filter'));
-		$box1 = $this->response->html->box();
-		$box1->add($select);
-		$box1->id = 'resource_type_filter';
-		$box1->css = 'htmlobject_box';
-		$box1->label = $this->lang['lang_type_filter'];
-
-		// Resource Filter
-		$input = $this->response->html->input();
-		$input->name = 'resource_filter';
-		$input->value = $this->response->html->request()->get('resource_filter');
-		$input->title = $this->lang['lang_filter_title'];
-		$box2 = $this->response->html->box();
-		$box2->add($input);
-		$box2->id = 'resource_filter';
-		$box2->css = 'htmlobject_box';
-		$box2->label = $this->lang['lang_filter'];
-
-		$add = $this->response->html->a();
-		$add->title   = $this->lang['action_add'];
-		$add->label   = $this->lang['action_add'];
-		$add->handler = 'onclick="wait();"';
-		$add->css     = 'add';
-		$add->href    = $this->response->get_url($this->actions_name, "add").''.$tp;
-
-		$table->id = 'Tabelle';
-		$table->css = 'htmlobject_table';
-		$table->border = 1;
-		$table->cellspacing = 0;
-		$table->cellpadding = 3;
-		$table->autosort = false;
-		$table->sort_link = false;
-		$table->head = $h;
-		$table->body = $b;
-		$table->max = count($b);
-		$table->actions_name = $this->actions_name;
-		$table->actions = array(
-			array('reboot' => $this->lang['action_reboot']),
-			array('poweroff' => $this->lang['action_poweroff']),
-			array('remove' =>  $this->lang['action_remove'])
-		);
-		$table->identifier = 'resource_id';
-		$table->identifier_name = $this->identifier_name;
-		$table->identifier_disabled = array(0);
-		$table->limit_select = array(
-			array("value" => 10, "text" => 10),
-			array("value" => 20, "text" => 20),
-			array("value" => 30, "text" => 30),
-			array("value" => 50, "text" => 50),
-			array("value" => 100, "text" => 100),
-		);
-
-		$d['form']   = $this->response->get_form($this->actions_name, 'select', false)->get_elements();
-		$d['add']    = $add->get_string();
-		$d['resource_type_filter'] = $box1->get_string();
-		$d['resource_filter'] = $box2->get_string();
-		$d['table']  = $table;
-		return $d;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.select.class.php~ b/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.select.class.php~
deleted file mode 100644
index 5cf48e6..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/class/resource.select.class.php~
+++ /dev/null
@@ -1,408 +0,0 @@
-<?php
-/**
- * Resource Select
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class resource_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'resource_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "resource_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'resource_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'resource_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-		$this->response->add('resource_filter', $this->response->html->request()->get('resource_filter'));
-		$this->response->add('resource_type_filter', $this->response->html->request()->get('resource_type_filter'));
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$data = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/resource-select.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($data);
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['lang_filter'], 'lang_filter');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select() {
-
-		$d = array();
-
-		$h = array();
-		$h['resource_state']['title'] = $this->lang['table_state'];
-		$h['resource_state']['sortable'] = false;
-
-		$h['resource_id']['title'] = $this->lang['table_id'];
-		$h['resource_id']['hidden'] = true;
-
-		$h['resource_hostname']['title'] = $this->lang['table_name'];
-		$h['resource_hostname']['hidden'] = true;
-
-		$h['resource_mac']['title'] = $this->lang['table_mac'];
-		$h['resource_mac']['hidden'] = true;
-
-		$h['resource_ip']['title'] = $this->lang['table_ip'];
-		$h['resource_ip']['hidden'] = true;
-
-		$h['resource_type']['title'] = $this->lang['table_type'];
-		$h['resource_type']['sortable'] = false;
-		$h['resource_type']['hidden'] = true;
-
-		$h['resource_memtotal']['title'] = $this->lang['table_memory'];
-		$h['resource_memtotal']['hidden'] = true;
-
-		$h['resource_cpunumber']['title'] = $this->lang['table_cpu'];
-		$h['resource_cpunumber']['hidden'] = true;
-
-		$h['resource_nics']['title'] = $this->lang['table_nics'];
-		$h['resource_nics']['hidden'] = true;
-
-		$h['resource_load']['title'] = $this->lang['table_load'];
-		$h['resource_load']['hidden'] = true;
-
-		$h['data']['title'] = '&#160;';
-		$h['data']['sortable'] = false;
-
-		$h['hw']['title'] = '&#160;';
-		$h['hw']['sortable'] = false;
-
-		$resource = new resource();
-		$params  = $this->response->get_array($this->actions_name, 'select');
-		$b       = array();
-
-#$this->response->html->help($resource->find_resource('00:e0:53:13'));
-
-		// unset unnecessary params
-		unset($params['resource_type_filter']);
-		unset($params['resource_filter']);
-		unset($params['resource[sort]']);
-		unset($params['resource[order]']);
-		unset($params['resource[limit]']);
-		unset($params['resource[offset]']);
-
-		$table = $this->response->html->tablebuilder('resource', $params);
-		$table->offset = 0;
-		$table->sort = 'resource_id';
-		$table->limit = 20;
-		$table->order = 'ASC';
-		$table->max = $resource->get_count('all');
-
-		$table->init();
-
-		// handle table params
-		$tps = $table->get_params();
-		$tp = '';
-		foreach($tps['resource'] as $k => $v) {
-			$tp .= '&resource['.$k.']='.$v;
-		}
-
-		$resource_filter = null;
-		if( $this->response->html->request()->get('resource_filter') !== '') {
-			$resource_filter = array();
-			$ar = $resource->find_resource($this->response->html->request()->get('resource_filter'));
-			if(count($ar) > 0) {
-				foreach($ar as $k => $v) {
-					$resource_filter[] = $v['resource_id'];
-				}
-			}
-		}
-
-		$resources = $resource->display_overview(0, 10000, $table->sort, $table->order);
-		foreach ($resources as $index => $resource_db) {
-
-			// prepare the values for the array
-			$resource = new resource();
-			$resource->get_instance_by_id($resource_db["resource_id"]);
-			$res_id = $resource->id;
-
-			if ($this->response->html->request()->get('resource_type_filter') === '' || ($this->response->html->request()->get('resource_type_filter') == $resource->vtype )) {
-
-				// Skip all resources not in $resource_filter
-				if(isset($resource_filter)) {
-					if(!in_array($resource->id, $resource_filter)) {
-						continue;
-					}
-				}
-
-				$mem_total = $resource_db['resource_memtotal'];
-				$mem_used = $resource_db['resource_memused'];
-				$mem = "$mem_used/$mem_total";
-				$swap_total = $resource_db['resource_swaptotal'];
-				$swap_used = $resource_db['resource_swapused'];
-				$swap = "$swap_used/$swap_total";
-				$resource_mac = $resource_db["resource_mac"];
-
-				#$uptime = $resource_db["resource_uptime"];
-				$uptime = ($resource_db["resource_uptime"] > 0) ? $resource_db["resource_uptime"] : false;
-
-
-#				$dtF = new \DateTime();
-                                $dtF = @new \DateTime('@0');
-
-#                               $dtT = new \DateTime("@$uptime");
-				$dtT = new \DateTime("@".$uptime);
-				
-				
-
-				$uptime_formatted = $dtF->diff($dtT)->format('%a '.$this->lang['days'].', %H:%i:%S');
-
-
-				// the resource_type
-				$link = '';
-				if ((strlen($resource->vtype)) && (!strstr($resource->vtype, "NULL"))){
-					// find out what should be preselected
-					$virtualization = new virtualization();
-					$virtualization->get_instance_by_id($resource->vtype);
-					$virtualization_plugin_name = $virtualization->get_plugin_name();
-					$virtualization_vm_action_name = str_replace("-", "_", $virtualization_plugin_name);
-					if ($virtualization->id == 1) {
-						$resource_type = $virtualization->name;
-					} else {
-						$resource_type_link_text = $virtualization->name;
-						if ($resource->id == $resource->vhostid) {
-							// physical system or host
-							$host_appliance = new appliance();
-							$host_appliance->get_instance_by_virtualization_and_resource($virtualization->id, $resource->id);
-							if (($virtualization->id > 0) && ($resource->id > 0)) {
-								$link = '?plugin='.$virtualization_plugin_name.'&controller='.$virtualization_plugin_name.'-vm&'.$virtualization_vm_action_name.'_vm_action=edit&appliance_id='.$host_appliance->id;
-								$resource_type_link_text = "<nobr>".$virtualization->name." Server ".$host_appliance->name."</nobr>";
-							}
-						} else {
-							// vm
-							$host_virtualization = new virtualization();
-							$host_virtualization->get_instance_by_type($virtualization_plugin_name);
-							$host_appliance = new appliance();
-							if ($host_virtualization->id > 0) {
-								$host_appliance->get_instance_by_virtualization_and_resource($host_virtualization->id, $resource->vhostid);
-								$host_resource = new resource();
-								$host_resource->get_instance_by_id($resource->vhostid);
-								$link = '?plugin='.$virtualization_plugin_name.'&controller='.$virtualization_plugin_name.'-vm&'.$virtualization_vm_action_name.'_vm_action=edit&appliance_id='.$host_appliance->id;
-								$resource_type_link_text = "<nobr>".$virtualization->name." on Res. ".$host_resource->hostname."</nobr>";
-							}
-						}
-						$resource_type = $resource_type_link_text;
-					}
-				} else {
-					$resource_type = "Unknown";
-				}
-				// openQRM resource ?
-				if ($resource->id == 0) {
-					$resource_icon_default="/openqrm/base/img/logo.png";
-				} else {
-					$resource_icon_default="/openqrm/base/img/resource.png";
-				}
-				$state_icon = '<span class="pill '.$resource->state.'">'.$resource->state.'</span>';
-				// idle ?
-				if (("$resource->imageid" == "1") && ("$resource->state" == "active")) {
-					$state_icon='<span class="pill idle">idle</span>';
-				}
-			
-				$resource_cpus = $resource_db["resource_cpunumber"];
-				if (!strlen($resource_cpus)) {
-					$resource_cpus = '?';
-				}
-				$resource_nics = $resource_db["resource_nics"];
-				if (!strlen($resource_nics)) {
-					$resource_nics = '?';
-				}
-				isset($resource_db["resource_hostname"]) ? $name = $resource_db["resource_hostname"] : $name = '&#160;';
-				isset($resource_db["resource_nics"]) ? $nics = $resource_db["resource_nics"] : $nics = '&#160;';
-				isset($resource_db["resource_load"]) ? $load = $resource_db["resource_load"] : $load = '&#160;';
-
-				// check for local VMs without an IP 
-				$resip = $resource_db["resource_ip"];
-				$resid = $resource_db["resource_id"];
-				if ($resip == '0.0.0.0') {
-					$state_icon = '<span class="pill transition">transition</span>';
-				}
-				$pos = strpos($virtualization->type, 'vm-local');
-				if ($pos !== false) {
-					$a = $this->response->html->a();
-					$a->title = $this->lang['action_edit'].' IP';
-					$a->label = $resip;
-					$a->css   = 'edit';
-					$a->href  = $this->response->get_url($this->actions_name, 'edit').'&resource_id='.$resid;
-					$resip = $a->get_string();
-				 }
-				
-				$data  = '<b>'.$this->lang['table_id'].'</b>: '.$resource_db["resource_id"].'<br>';
-				$data .= '<b>'.$this->lang['table_name'].'</b>: '.$name.'<br>';
-				$data .= '<b>'.$this->lang['table_mac'].'</b>: '.$resource_mac.'<br>';
-				$data .= '<b>'.$this->lang['table_ip'].'</b>: '.$resip.'<br>';
-				$data .= '<b>'.$this->lang['table_type'].'</b>: '.$resource_type;
-
-				$hw  = '<b>'.$this->lang['table_cpu'].'</b>: '.$resource_cpus.'<br>';
-				$hw .= '<b>'.$this->lang['table_memory'].'</b>: '.$mem.'<br>';
-				$hw .= '<b>'.$this->lang['table_nics'].'</b>: '.$nics.'<br>';
-				$hw .= '<b>'.$this->lang['table_load'].'</b>: '.$load.'<br>';
-				$hw .= '<b>'.$this->lang['table_uptime'].'</b>: '.$uptime_formatted;
-
-				$b[] = array(
-					'resource_state' => $state_icon,
-					'resource_id' => $resource_db["resource_id"],
-					'resource_hostname' => $name,
-					'resource_mac' => $resource_mac,
-					'resource_ip' => $resip,
-					'resource_type' => $resource_type,
-					'resource_memtotal' => $mem,
-					'resource_cpunumber' => $resource_cpus,
-					'resource_nics' => $nics,
-					'resource_load' => $load,
-					'resource_uptime' => $uptime,
-					'data' => $data,
-					'hw' => $hw,
-				);
-			}
-		}
-
-		// Type Filter
-		$virtulization_types = new virtualization();
-		$list = $virtulization_types->get_list();
-		$filter = array();
-		$filter[] = array('', '');
-		foreach( $list as $l) {
-			$filter[] = array( $l['label'], $l['value']);
-		}
-		asort($filter);
-		$select = $this->response->html->select();
-		$select->add($filter, array(1,0));
-		$select->name = 'resource_type_filter';
-		$select->handler = 'onchange="wait();this.form.submit();return false;"';
-		$select->selected = array($this->response->html->request()->get('resource_type_filter'));
-		$box1 = $this->response->html->box();
-		$box1->add($select);
-		$box1->id = 'resource_type_filter';
-		$box1->css = 'htmlobject_box';
-		$box1->label = $this->lang['lang_type_filter'];
-
-		// Resource Filter
-		$input = $this->response->html->input();
-		$input->name = 'resource_filter';
-		$input->value = $this->response->html->request()->get('resource_filter');
-		$input->title = $this->lang['lang_filter_title'];
-		$box2 = $this->response->html->box();
-		$box2->add($input);
-		$box2->id = 'resource_filter';
-		$box2->css = 'htmlobject_box';
-		$box2->label = $this->lang['lang_filter'];
-
-		$add = $this->response->html->a();
-		$add->title   = $this->lang['action_add'];
-		$add->label   = $this->lang['action_add'];
-		$add->handler = 'onclick="wait();"';
-		$add->css     = 'add';
-		$add->href    = $this->response->get_url($this->actions_name, "add").''.$tp;
-
-		$table->id = 'Tabelle';
-		$table->css = 'htmlobject_table';
-		$table->border = 1;
-		$table->cellspacing = 0;
-		$table->cellpadding = 3;
-		$table->autosort = false;
-		$table->sort_link = false;
-		$table->head = $h;
-		$table->body = $b;
-		$table->max = count($b);
-		$table->actions_name = $this->actions_name;
-		$table->actions = array(
-			array('reboot' => $this->lang['action_reboot']),
-			array('poweroff' => $this->lang['action_poweroff']),
-			array('remove' =>  $this->lang['action_remove'])
-		);
-		$table->identifier = 'resource_id';
-		$table->identifier_name = $this->identifier_name;
-		$table->identifier_disabled = array(0);
-		$table->limit_select = array(
-			array("value" => 10, "text" => 10),
-			array("value" => 20, "text" => 20),
-			array("value" => 30, "text" => 30),
-			array("value" => 50, "text" => 50),
-			array("value" => 100, "text" => 100),
-		);
-
-		$d['form']   = $this->response->get_form($this->actions_name, 'select', false)->get_elements();
-		$d['add']    = $add->get_string();
-		$d['resource_type_filter'] = $box1->get_string();
-		$d['resource_filter'] = $box2->get_string();
-		$d['table']  = $table;
-		return $d;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/css/resource.css b/openQRM-5.3.50-CE/src/web/base/server/resource/css/resource.css
deleted file mode 100644
index 8c53d81..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/css/resource.css
+++ /dev/null
@@ -1,17 +0,0 @@
-.htmlobject_td.resource_id,
-.htmlobject_td.resource_icon,
-.htmlobject_td.resource_state {
-	text-align:center;
-	width:25px;
-}
-.htmlobject_td.data {
-	text-align:left;
-	width:400px;
-}
-
-#resource_filter {
-	margin: 0 0 0 0 !important;
-}
-#resource_type_filter {
-	margin: 0 0 30px 0 !important;
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/lang/de.resource.ini b/openQRM-5.3.50-CE/src/web/base/server/resource/lang/de.resource.ini
deleted file mode 100644
index b7cad6e..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/lang/de.resource.ini
+++ /dev/null
@@ -1,102 +0,0 @@
-[select]
-tab = "Ressourcen"
-label = "Ressourcen"
-action_remove = "entfernen"
-action_reboot = "restarten"
-action_poweroff = "ausschalten"
-action_mgmt = "manage"
-action_edit = "edit"
-action_add = "Neue Ressource hinzufügen"
-action_new = "neu"
-table_state = "Status"
-table_id = "ID"
-table_name = "Name"
-table_type = "Typ"
-table_resource = "Ressource"
-table_deployment = "Deployment"
-table_mac = "Mac"
-table_ip = "IP"
-table_cpu = "CPU"
-table_nics = "NIC"
-table_memory = "RAM"
-table_uptime = "Betriebszeit"
-table_load = "Last"
-lang_filter = "Filtern nach Ressource"
-lang_type_filter = "Filtern nach Ressource Typ"
-lang_filter_title = "Filtern nach Resource ID, Name oder Mac. Verwenden Sie ? als einzel und * als mehrfach Platzhalter."
-please_wait = "Lade Ressources. Bitte warten .."
-days = "tage"
-
-[add]
-label = "Neue Ressource"
-title = "Neue Ressource hinzufügen als"
-vm_type = "Virtuelle Maschine vom Typ"
-local = "oder integrieren Sie einen bereits existierenden, lokal installierten Server"
-unmanaged = "oder fügen Sie ein beschränkt verwaltetes System manuell hinzu"
-manual_new_resource = "Manuel ein beschränkt verwaltetes System hinzufügen"
-start_local_server ="Bitte starten Sie das 'local-server' Plugin!"
-integrate_local_server = "Integration eines existierenden, lokal installierten Server"
-start_vm_plugin = "Bitte starten Sie eines der Virtualization Plugins!"
-create_vm = "Neue %s Virtuelle Maschine"
-vm = "Virtuelle Maschine"
-msg = "Ressource %s hinzugefügt"
-please_wait = "Lade Ressources. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
-
-[remove]
-label = "Entferne Ressources(s)"
-msg = "Ressource %s entfernt"
-msg_not_removing = "Ressource %s wird von Server %s genutzt!<br>Enfernen der Ressource abgebrochen."
-msg_not_removing_vm = "Enfernen der VM Ressource %s abgebrochen.<br>Bitte entfernen Sie diese Ressource mittels der %s Verwaltung"
-msg_still_active = "Ressource %s ist noch aktiv!<br>Enfernen der Ressource abgebrochen."
-msg_force_remove = "Ressource forciert entfernen"
-please_wait = "Lade Ressources. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
-
-[reboot]
-label = "Restarte Ressources(s)"
-msg = "Ressource %s neu gestartet"
-please_wait = "Lade Ressources. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
-
-[poweroff]
-label = "Ressources(s) ausschalten"
-msg = "Ressource %s ausgeschaltet"
-please_wait = "Lade Ressources. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
-
-[new]
-label = "Neue Ressource"
-form_docu = "Mit diesem Formular werden Ressourcen manuell erstellt, die openQRM nicht direkt<br>
-mittels des openQRM-Clients überwachen kann z.b. NetApp Filers oder EqualLogig Storage Server.<br>
-Die Ressource kann dann dennoch in openQRM als Storage Server verwaltet werden."
-form_auto_resource = "Ressourcen (Physikalische Systems und Virtuelle Maschinen) die für 'rapid deployment' vorgesehen sind<br>
-werden openQRM automatisch per PXE/Netzwerk-Boot hinzugefügt.<br>
-Dazu muss nur das 'dhcpd' und das 'tftpd' Plugin gestartet sein."
-form_add_resource = "Neue, beschränkt verwaltete Ressource hinzufügen"
-form_name = "Hostname"
-form_ip = "IP-Addresse"
-form_mac = "MAC-Addresse"
-error_name = "Hostname darf nur %s beinhalten"
-error_ip = "IP-Addresse darf nur %s beinhalten"
-error_mac = "MAC-Addresse darf nur %s beinhalten"
-msg = "Ressource %s hinzugefügt"
-msg_mac_in_use = "MAC Addresse ist schon in Benutzung!"
-msg_ip_in_use = "IP Addresse ist schon in Benutzung!"
-msg_add_failed = "Resource konnte nicht hinzugefügt werden"
-please_wait = "Lade Ressources. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
-
-[edit]
-label = "Edit Ressource %s"
-form_docu = "Mit diesem Formular kann manuell die IP Adresse einer lokal bootenden VM eingetragen werden<br>
-wenn diese nicht über das 'dhcpd plugin' bereitgestellt wird.<br>"
-form_edit_resource = "IP Adresse der lokal bootenden VM eintragen"
-form_ip = "IP-Addresse"
-error_ip = "IP-Addresse darf nur %s beinhalten"
-msg = "Ressource %s editiert"
-msg_ip_in_use = "IP Addresse ist schon in Benutzung!"
-msg_add_failed = "Resource konnte nicht editiert werden"
-please_wait = "Lade Ressources. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/lang/en.resource.ini b/openQRM-5.3.50-CE/src/web/base/server/resource/lang/en.resource.ini
deleted file mode 100644
index b98ed5f..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/lang/en.resource.ini
+++ /dev/null
@@ -1,101 +0,0 @@
-[select]
-tab = "Resources"
-label = "Resources"
-action_remove = "remove"
-action_reboot = "reboot"
-action_poweroff = "poweroff"
-action_mgmt = "manage"
-action_edit = "edit"
-action_add = "Add a new resource"
-action_new = "new"
-table_state = "State"
-table_id = "Id"
-table_name = "Name"
-table_type = "Type"
-table_mac = "Mac"
-table_ip = "IP"
-table_cpu = "CPU"
-table_nics = "NIC"
-table_memory = "RAM"
-table_uptime = "Uptime"
-table_load = "Load"
-table_resource = "Resource"
-table_deployment = "Deployment"
-lang_filter = "Filter by Resource"
-lang_type_filter = "Filter by Resource Type"
-lang_filter_title = "Filter by Resource ID, Name or Mac. Use ? as single and * as multi wildcard."
-please_wait = "Loading. Please wait .."
-days = "days"
-
-[add]
-label = "Add resource"
-title = "Add a new resource as "
-vm_type = "a Virtual Machine from type"
-local = "or by integrating an existing, local-installed server"
-unmanaged = "Manual add an un-managed system"
-manual_new_resource = "or manual add an un-managed system"
-start_local_server = "Please enable and start the local-server plugin!"
-integrate_local_server = "Integrate an existing local installed Server"
-start_vm_plugin = "Please enable and start one of the virtualization plugins!"
-create_vm = "Create a %s Virtual Machine"
-vm = "Virtual Machine"
-msg = "Added resource %s"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[remove]
-label = "Remove resources(s)"
-msg = "Removed resource %s"
-msg_not_removing = "Not removing resource %s!<br>It is still in use by Server %s !"
-msg_not_removing_vm = "Not removing VM resource %s!<br> Please remove it through the %s Manager!"
-msg_still_active = "Not removing resource %s!<br>It is still active or in transition."
-msg_force_remove = "Force removal of resources"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[reboot]
-label = "Reboot resources(s)"
-msg = "Rebooted resource %s"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[poweroff]
-label = "Power-off resources(s)"
-msg = "Powered-off resource %s"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[new]
-label = "New resource"
-form_docu = "This form is to manually create a new resource which openQRM cannot directly monitor<br>
-			via the openQRM-client e.g. NetApp Filers or EqualLogig Storages.<br>
-			The resource then can still be used as Storage Server managed by openQRM."
-form_auto_resource = "Resources (physical systems and virtual machines) intended for rapid deployment<br>
-			 are automatically added to openQRM by setting their bios to PXE/Net-Boot.<br>
-			 Just have the dhcpd and tftpd plugin enabled and started."
-form_add_resource = "Add new Resource (not monitored)"
-form_name = "Hostname"
-form_ip = "IP-Adress"
-form_mac = "MAC-Adress"
-error_name = "Hostname must be %s"
-error_ip = "IP-Adress must be %s"
-error_mac = "MAC-Adress must be %s"
-msg_mac_in_use = "MAC-Adress already in use! Not adding resource"
-msg_ip_in_use = "IP Adress already in use! Not adding resource"
-msg = "Added resource %s"
-msg_add_failed = "Failed adding resource"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[edit]
-label = "Edit resource %s"
-form_docu = "This form allows to manually set the IP address for a local booting VM<br>
-			if this is not automatically provided e.g. by the 'dhcpd plugin'.<br>"
-form_edit_resource = "Edit resources IP address of localbooting VM"
-form_ip = "IP-Adress"
-error_ip = "IP-Adress must be %s"
-msg_ip_in_use = "IP Adress already in use! Not adding resource"
-msg = "Edited resource %s"
-msg_add_failed = "Failed editing resource"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/lang/es.resource.ini b/openQRM-5.3.50-CE/src/web/base/server/resource/lang/es.resource.ini
deleted file mode 100644
index a00123d..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/lang/es.resource.ini
+++ /dev/null
@@ -1,100 +0,0 @@
-[select]
-tab = "Recursos"
-label = "Recursos"
-action_remove = "quitar"
-action_reboot = "reiniciar"
-action_poweroff = "apagar"
-action_mgmt = "administrar"
-action_edit = "editar"
-action_add = "Añadir un nuevo recurso"
-action_new = "nuevo"
-table_state = "Estado"
-table_id = "Id"
-table_name = "Nombre"
-table_type = "Tipo"
-table_mac = "Mac"
-table_ip = "IP"
-table_cpu = "CPU"
-table_nics = "NIC"
-table_memory = "RAM"
-table_uptime = "Tiempo de actividad"
-table_load = "Carga"
-table_resource = "Recurso"
-table_deployment = "Implementación"
-lang_filter = "Filtrar por recurso"
-lang_type_filter = "Filtrar por tipo de recurso"
-please_wait = "Cargando. Por favor espere .."
-days = "dias"
-
-[add]
-label = "Añadir nuevo recurso"
-title = "Añadir un nuevo recurso como "
-vm_type = "una maquina virtual del tipo"
-local = "o integrando una existente, un servidor instalado de forma local"
-unmanaged = "Añadir manualmente un sistema no integrado"
-manual_new_resource = "o añadir manualmente un sistema no integrado"
-start_local_server = "Por favor habilite e inicie el plugin local-server!"
-integrate_local_server = "Integrar un servidor existente instalado de forma local"
-start_vm_plugin = "Por favor habilite e inicie uno de los plugins de virtualizacion!"
-create_vm = "Crear una maquina virtual %s"
-vm = "Maquina virtual"
-msg = "Recurso %s añadido"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[remove]
-label = "Quitar recurso(s)"
-msg = "El recurso(s) %s se ha eliminado"
-msg_not_removing = "El recurso %s no se ha eliminado!<br>Se encuentra en uso en el servidor %s !"
-msg_not_removing_vm = "El recurso %s de la VM no se ha eliminado!<br> Por favor elimínelo con el administrador %s !"
-msg_still_active = "El recurso %s no se ha eliminado!<br>Se encuentra en uso o en transición."
-msg_force_remove = "La eliminación de la Fuerza de los recursos"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[reboot]
-label = "Reinciar recurso(s)"
-msg = "Reiniciar recurso %s"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[poweroff]
-label = "Apagar recurso(s)"
-msg = "Apagar recurso %s"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[new]
-label = "Recurso nuevo"
-form_docu = "Este formulario es para crear manualmente nuevos recursos que no están monitorizados por openQRM<br>
-			via openQRM-client Ejemplo: NetApp Filers o EqualLogic Storages.<br>
-			El recurso podrá ser utilizado como servidor de almacenamiento administrado por openQRM>"
-form_auto_resource = "Recursos (sistemas físicos y virtuales) destinados a implementaciones rápidas<br>
-			 Son añadidos automaticamente a openQRM configurando el servicio PXE/NET-Boot en la BIOS de los servidores.<br>
-			 Solo es necesario tener habilitados e iniciados los plugins: dhcpd y tftpd."
-form_add_resource = "Añadir un nuevo recurso (no monitorizado)"
-form_name = "Nombre Host"
-form_ip = "Dirección IP"
-form_mac = "Dirección MAC"
-error_name = "El nombre Host debe ser %s"
-error_ip = "La dirección IP debe ser %s"
-error_mac = "La direción MAC debe ser %s"
-msg_mac_in_use = "La dirección MAC está en uso! No se puede añadir el recurso!"
-msg_ip_in_use = "La dirección IP está en uso! No se puede añadir el recurso"
-msg = "Recurso %s añadido"
-msg_add_failed = "No se ha añadido el recurso"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[edit]
-label = "Edit resource %s"
-form_docu = "This form allows to manually set the IP address for a local booting VM<br>
-			if this is not automatically provided e.g. by the 'dhcpd plugin'.<br>"
-form_edit_resource = "Edit resources IP address of localbooting VM"
-form_ip = "IP-Adress"
-error_ip = "IP-Adress must be %s"
-msg_ip_in_use = "IP Adress already in use! Not adding resource"
-msg = "Edited resource %s"
-msg_add_failed = "Failed editing resource"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/resource-action.php b/openQRM-5.3.50-CE/src/web/base/server/resource/resource-action.php
deleted file mode 100644
index 7d619f1..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/resource-action.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once "$RootDir/include/openqrm-database-functions.php";
-require_once "$RootDir/include/user.inc.php";
-require_once "$RootDir/class/resource.class.php";
-require_once "$RootDir/class/image.class.php";
-require_once "$RootDir/class/kernel.class.php";
-require_once "$RootDir/class/event.class.php";
-require_once "$RootDir/class/openqrm_server.class.php";
-require_once "$RootDir/class/virtualization.class.php";
-// filter inputs
-require_once $RootDir.'/class/htmlobjects/htmlobject.class.php';
-require_once $RootDir.'/include/requestfilter.inc.php';
-$html = new htmlobject($RootDir.'/class/htmlobjects/');
-$request = $html->request();
-$request->filter = $requestfilter;
-
-global $RESOURCE_INFO_TABLE;
-
-$event = new event();
-
-// user/role authentication
-if (!strstr($OPENQRM_USER->role, "administrator")) {
-	$event->log("authorization", $_SERVER['REQUEST_TIME'], 1, "resource-action", "Un-Authorized access to resource-actions from $OPENQRM_USER->name", "", "", 0, 0, 0);
-	exit();
-}
-
-$resource_command = $request->get('resource_command');
-$resource_id = $request->get('resource_id');
-$resource_hostname = $request->get('resource_hostname');
-$resource_mac = strtolower($request->get('resource_mac'));
-$resource_ip = $request->get('resource_ip');
-$resource_state = $request->get('resource_state');
-$resource_event = $request->get('resource_event');
-foreach ($_REQUEST as $key => $value) {
-	if (strncmp($key, "resource_", 9) == 0) {
-		$resource_fields[$key] = $request->get($key);
-	}
-}
-unset($resource_fields["resource_command"]);
-// add mac address always in lowercase
-$macl = strtolower($resource_fields["resource_mac"]);
-$resource_fields["resource_mac"] = $macl;
-
-$virtualization_id = $request->get('virtualization_id');
-$virtualization_name = $request->get('virtualization_name');
-$virtualization_type = $request->get('virtualization_type');
-$virtualization_fields = array();
-foreach ($_REQUEST as $key => $value) {
-	if (strncmp($key, "virtualization_", 15) == 0) {
-		$virtualization_fields[$key] = $value;
-	}
-}
-
-
-function res_new_redirect($strMsg) {
-	global $thisfile;
-	$url = 'resource-new.php?strMsg='.urlencode($strMsg).'&currenttab=tab0';
-	echo "<meta http-equiv=\"refresh\" content=\"0; URL=$url\">";
-	exit;
-}
-
-
-$openqrm_server = new openqrm_server();
-$OPENQRM_SERVER_IP_ADDRESS=$openqrm_server->get_ip_address();
-
-global $OPENQRM_SERVER_IP_ADDRESS;
-
-$event->log("$resource_command", $_SERVER['REQUEST_TIME'], 5, "resource-action", "Processing command $resource_command on $resource_id", "", "", 0, 0, 0);
-switch ($resource_command) {
-
-	// new_resource needs :
-	// resource_mac
-	// resource_ip
-	case 'new_resource':
-		$strMsg = '';
-		$resource = new resource();
-		if ($resource->exists($resource_mac)) {
-			$strMsg = "Resource ".$resource_mac." already exist in the openQRM-database!";
-			res_new_redirect($strMsg);
-		}
-		if ("$resource_id" == "-1") {
-			$new_resource_id=(int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-			$resource->id = $new_resource_id;
-		} else {
-		// 	check if resource_id is free
-			if ($resource->is_id_free($resource_id)) {
-				$new_resource_id=$resource_id;
-			} else {
-				$strMsg = "Given resource id ".$resource_id." is already in use!";
-				res_new_redirect($strMsg);
-			}
-		}
-		// check name
-		if($resource_hostname != '') {
-			if (!preg_match('#^[A-Za-z0-9_.-]*$#', $resource_hostname)) {
-				$strMsg .= 'Hostname name must be [A-Za-z0-9_.-]<br/>';
-				res_new_redirect($strMsg);
-			}
-		} else {
-			$strMsg .= "Hostname can not be empty<br/>";
-			res_new_redirect($strMsg);
-		}
-
-		// send command to the openQRM-server
-		$openqrm_server->send_command("openqrm_server_add_resource $new_resource_id $resource_mac $resource_ip");
-		// add to openQRM database
-		$resource_fields["resource_id"]=$new_resource_id;
-		$resource_fields["resource_localboot"]=0;
-		$resource_fields["resource_vtype"]=1;
-		$resource_fields["resource_vhostid"]=$new_resource_id;
-		$resource->add($resource_fields);
-		// set lastgood to -1 to prevent automatic checking the state
-		$resource_fields["resource_lastgood"]=-1;
-		$resource->update_info($new_resource_id, $resource_fields);
-		// $resource->get_parameter($new_resource_id);
-
-		break;
-
-	// remove requires :
-	// resource_id
-	// resource_mac
-	case 'remove':
-		// remove from openQRM database
-		$resource = new resource();
-		$resource->remove($resource_id, $resource_mac);
-		break;
-
-	// localboot requires :
-	// resource_id
-	// resource_mac
-	// resource_ip
-	case 'localboot':
-		$openqrm_server->send_command("openqrm_server_set_boot local $resource_id $resource_mac $resource_ip");
-		// update db
-		$resource = new resource();
-		$resource->set_localboot($resource_id, 1);
-		break;
-
-	// netboot requires :
-	// resource_id
-	// resource_mac
-	// resource_ip
-	case 'netboot':
-		$openqrm_server->send_command("openqrm_server_set_boot net $resource_id $resource_mac $resource_ip");
-		// update db
-		$resource = new resource();
-		$resource->set_localboot($resource_id, 0);
-		break;
-
-	// assign requires :
-	// resource_id
-	// resource_mac
-	// resource_ip
-	// kernel_id
-	// kernel_name
-	// image_id
-	// image_name
-	// appliance_id
-
-	case 'assign':
-
-		$kernel_id=($_REQUEST["resource_kernelid"]);
-		$kernel = new kernel();
-		$kernel->get_instance_by_id($kernel_id);
-		$kernel_name = $kernel->name;
-
-		$image_id=($_REQUEST["resource_imageid"]);
-		$image = new image();
-		$image->get_instance_by_id($image_id);
-		$image_name = $image->name;
-
-		// send command to the openQRM-server
-		$openqrm_server->send_command("openqrm_assign_kernel $resource_id $resource_mac $kernel_name");
-		// update openQRM database
-		$resource = new resource();
-		$resource->assign($resource_id, $kernel_id, $kernel_name, $image_id, $image_name);
-		$resource->send_command($resource_ip, "reboot");
-		break;
-
-	// reboot requires :
-	// resource_ip
-	case 'reboot':
-		$resource = new resource();
-		$resource->send_command("$resource_ip", "reboot");
-		// set state to transition
-		$resource_fields=array();
-		$resource_fields["resource_state"]="transition";
-		$resource = new resource();
-		$resource->get_instance_by_ip($resource_ip);
-		$resource->update_info($resource->id, $resource_fields);
-		break;
-
-
-	// halt requires :
-	// resource_ip
-	case 'halt':
-		$resource = new resource();
-		$resource->send_command("$resource_ip", "halt");
-		// set state to off
-		$resource_fields=array();
-		$resource_fields["resource_state"]="off";
-		$resource = new resource();
-		$resource->get_instance_by_ip($resource_ip);
-		$resource->update_info($resource->id, $resource_fields);
-		break;
-
-	// list requires :
-	// nothing
-	case 'list':
-		$resource = new resource();
-		$resource_list = $resource->get_resource_list();
-		foreach ($resource_list as $resource_l) {
-			foreach ($resource_l as $key => $val) {
-				print "$key=$val ";
-			}
-			print "\n";
-		}
-		exit(0); // nothing more to do
-		break;
-
-	case 'add_virtualization_type':
-		$virtualization = new virtualization();
-		$virtualization_fields["virtualization_id"]=(int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-		$virtualization->add($virtualization_fields);
-		break;
-
-	case 'remove_virtualization_type':
-		$virtualization = new virtualization();
-		$virtualization->remove_by_type($virtualization_type);
-		break;
-
-
-	default:
-		$event->log("$resource_command", $_SERVER['REQUEST_TIME'], 3, "resource-action", "No such resource command ($resource_command)", "", "", 0, 0, 0);
-		break;
-}
-
-?>
-
-</body>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-add.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-add.tpl.php
deleted file mode 100644
index 52a4caf..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-add.tpl.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div id="form">
-	<div>
-		<h3>{vm_type}</h3>
-		<b>{resource_virtual}</b>
-		<br>
-		<h3>{local}</h3>
-		<b>{resource_local}</b>
-		<br>
-		<h3>{unmanaged}</h3>
-		<b>{resource_new}</b>
-		<br>
-	</div>
-</div>
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-edit.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-edit.tpl.php
deleted file mode 100644
index 42ffac3..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-edit.tpl.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-{form_docu}
-<br>
-<br>
-
-<form action="{thisfile}" method="GET">
-<div>
-	<h3>{form_edit_resource}</h3>
-	{form}
-	{ip}
-</div>
-<div>{submit}&#160;{cancel}</div>
-</form>
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-new.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-new.tpl.php
deleted file mode 100644
index ad8e345..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-new.tpl.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-{form_docu}
-<br>
-<br>
-<b>{form_auto_resource}</b>
-<br>
-<br>
-
-<form action="{thisfile}" method="GET">
-<div>
-	<h3>{form_add_resource}</h3>
-	{form}
-	{name}
-	{ip}
-	{mac}
-</div>
-<div>{submit}&#160;{cancel}</div>
-</form>
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-poweroff.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-poweroff.tpl.php
deleted file mode 100644
index d38627c..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-poweroff.tpl.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}">
-
-	<div id="form">
-	{form}
-	</div>
-
-	<div id="buttons">
-	{submit}
-	{cancel}
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-reboot.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-reboot.tpl.php
deleted file mode 100644
index a2e691b..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-reboot.tpl.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}">
-
-	<div id="form">
-	{form}
-	</div>
-
-	<div id="buttons">
-	{submit}
-	{cancel}
-	</div>
-
-</form>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-remove.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-remove.tpl.php
deleted file mode 100644
index 7224fff..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-remove.tpl.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}">
-
-	<div id="form">
-	{form}
-	</div>
-
-	<div id="buttons">
-	<hr>
-	<br>
-	{force_remove}
-	<br>
-	{submit}
-	{cancel}
-	</div>
-
-</form>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-select.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-select.tpl.php
deleted file mode 100644
index 72fda6c..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/resource/tpl/resource-select.tpl.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-
-<h2>{label} <span class="pull-right">{add}</span></h2>
-<div id="form">
-
-	<form action="{thisfile}" method="POST">
-		{form}
-		{resource_filter}
-		{resource_type_filter}
-		{table}
-	</form>
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/storage/class/storage.add.class.php b/openQRM-5.3.50-CE/src/web/base/server/storage/class/storage.add.class.php
deleted file mode 100644
index 32faa7e..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/storage/class/storage.add.class.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-/**
- * Storage Add
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class storage_add
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'storage_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'storage_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->add();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/storage-add.tpl.php');
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($response->form);
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['label'], 'form_add');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Add
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function add() {
-		
-		$response = $this->get_response();
-		$form     = $response->form;
-		if(!$form->get_errors() && $this->response->submit()) {
-			$name     = $form->get_request('name');
-			$storage_type     = $form->get_request('type');
-			$storge_capabilities = $form->get_request('capabilities');
-			$resource_id     = $form->get_request('resource');
-			$comment     = $form->get_request('comment');
-
-			// check if name already exists
-			// check that name is unique
-			$storage_name_check = new storage();
-			$storage_name_check->get_instance_by_name($name);
-			if ($storage_name_check->id > 0) {
-				$error = sprintf($this->lang['error_exists'], $name);
-			}
-			if(isset($error)) {
-				$response->error = $error;
-			} else {
-				$storage = new storage();
-				$storage_fields['storage_id']=(int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-				$storage_fields['storage_name']=$name;
-				$storage_fields['storage_type']=$storage_type;
-				$storage_fields['storage_comment']=$comment;
-				$storage_fields['storage_resource_id']=$resource_id;
-				// unqote capabilities
-				$storage_fields['storage_capabilities'] = stripslashes($storge_capabilities);
-				$storage->add($storage_fields);
-				$response->msg = sprintf($this->lang['msg'], $name);
-			}
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'add');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		// select boxes
-		$deployment_type_select = array();
-		$deployment = $this->openqrm->deployment();
-		$list = $deployment->get_list();
-		foreach($list as $v) {
-			$deployment_type_select[] = array($v['label'], $v['value']);
-		}
-		array_splice($deployment_type_select, 0, 1);
-		asort($deployment_type_select);
-
-		$resource = $this->openqrm->resource();
-		$resource_arr = $resource->get_list();
-		$resource_select = array();
-		foreach ($resource_arr as $index => $resource_db) {
-			$res_id = $resource_db['resource_id'];
-			$storage_resource = $this->openqrm->resource();
-			$storage_resource->get_instance_by_id($res_id);
-			$resource_select[] = array( $res_id, 'ID '.$res_id.' / '.$storage_resource->ip.' '.$storage_resource->hostname);
-		}
-		asort($resource_select);
-	
-		$d['name']['label']                             = $this->lang['form_name'];
-		$d['name']['required']                          = true;
-		$d['name']['validate']['regex']                 = '/^[a-z0-9._-]+$/i';
-		$d['name']['validate']['errormsg']              = sprintf($this->lang['error_name'], 'a-z0-9._');
-		$d['name']['object']['type']                    = 'htmlobject_input';
-		$d['name']['object']['attrib']['name']          = 'name';
-		$d['name']['object']['attrib']['id']            = 'name';
-		$d['name']['object']['attrib']['type']          = 'text';
-		$d['name']['object']['attrib']['css']           = 'namegen';
-		$d['name']['object']['attrib']['customattribs'] = 'data-prefix="storage_"';
-		$d['name']['object']['attrib']['value']         = '';
-		$d['name']['object']['attrib']['maxlength']     = 50;
-
-		$d['capabilities']['label']                         = $this->lang['form_capabilities'];
-		$d['capabilities']['validate']['regex']             = '/^[a-z0-9._ =-]+$/i';
-		$d['capabilities']['validate']['errormsg']          = sprintf($this->lang['error_capabilities'], 'a-z0-9._ =-');
-		$d['capabilities']['object']['type']                = 'htmlobject_textarea';
-		$d['capabilities']['object']['attrib']['name']      = 'capabilities';
-		$d['capabilities']['object']['attrib']['type']      = 'text';
-		$d['capabilities']['object']['attrib']['value']     = '';
-		$d['capabilities']['object']['attrib']['maxlength'] = 255;
-
-		$d['comment']['label']                         = $this->lang['form_comment'];
-		$d['comment']['validate']['regex']             = '/^[a-z0-9._ -]+$/i';
-		$d['comment']['validate']['errormsg']          = sprintf($this->lang['error_comment'], 'a-z0-9._ -');
-		$d['comment']['object']['type']                = 'htmlobject_textarea';
-		$d['comment']['object']['attrib']['name']      = 'comment';
-		$d['comment']['object']['attrib']['type']      = 'text';
-		$d['comment']['object']['attrib']['value']     = '';
-		$d['comment']['object']['attrib']['maxlength'] = 255;
-
-		// deployment type select
-		$d['type']['label']                       = $this->lang['form_deployment'];
-		$d['type']['object']['type']              = 'htmlobject_select';
-		$d['type']['object']['attrib']['index']   = array(1,0);
-		$d['type']['object']['attrib']['id']      = 'form_deployment';
-		$d['type']['object']['attrib']['name']    = 'type';
-		$d['type']['object']['attrib']['options'] = $deployment_type_select;
-
-		// resource select
-		$d['resource']['label']                       = $this->lang['form_resource'];
-		$d['resource']['object']['type']              = 'htmlobject_select';
-		$d['resource']['object']['attrib']['index']   = array(0, 1);
-		$d['resource']['object']['attrib']['id']      = 'form_deployment';
-		$d['resource']['object']['attrib']['name']    = 'resource';
-		$d['resource']['object']['attrib']['options'] = $resource_select;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/storage/class/storage.controller.class.php b/openQRM-5.3.50-CE/src/web/base/server/storage/class/storage.controller.class.php
deleted file mode 100644
index 79a6aa3..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/storage/class/storage.controller.class.php
+++ /dev/null
@@ -1,389 +0,0 @@
-<?php
-/**
- * Storage Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class storage_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'storage_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'storage_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'select' => array (
-		'tab' => 'Storage',
-		'label' => 'Storage',
-		'action_remove' => 'remove',
-		'action_mgmt' => 'manage',
-		'action_edit' => 'edit',
-		'action_add' => 'Add new storage',
-		'table_state' => 'State',
-		'table_id' => 'Id',
-		'table_name' => 'Name',
-		'table_type' => 'Type',
-		'table_resource' => 'Resource',
-		'table_deployment' => 'Deployment',
-		'lang_filter' => 'Filter by Storage type',
-		'please_wait' => 'Loading. Please wait ..',
-	),
-	'add' => array (
-		'label' => 'Add Storage',
-		'msg' => 'Added Storage %s',
-		'form_name' => 'Name',
-		'error_name' => 'Storage name must be %s',
-		'form_capabilities' => 'Capabilities',
-		'lang_name_generate' => 'generate name',
-		'error_capabilities' => 'Capabilities name must be %s',
-		'form_deployment' => 'Deployment Type',
-		'form_resource' => 'Resource',
-		'form_comment' => 'Comment',
-		'error_comment' => 'Comment must be %s',
-		'error_exists' => 'Storage name must be unique!',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'remove' => array (
-		'label' => 'Remove Storage',
-		'msg' => 'Removed storage %s',
-		'msg_not_removing_active' => 'Not removing Storage %s!<br>Image %s are still located on it!',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-	'edit' => array (
-		'tab' => 'Edit Storage',
-		'label' => 'Edit Storage %s',
-		'msg' => 'Edited storage %s',
-		'comment' => 'Comment',
-		'form_comment' => 'Comment',
-		'error_comment' => 'Comment must be %s',
-		'please_wait' => 'Loading. Please wait ..',
-		'canceled' => 'Operation canceled. Please wait ..',
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->tpldir   = $this->rootdir.'/server/storage/tpl';
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/server/storage/lang", 'storage.ini');
-//		$response->html->debug();
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			if(is_array($ar)) {
-				$this->action = key($ar);
-			} else {
-				$this->action = $ar;
-			}
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "select";
-		}
-		$this->response->params['storage_filter'] = $this->response->html->request()->get('storage_filter');
-
-		// handle table params
-		$vars = $this->response->html->request()->get('storage');
-		if($vars !== '') {
-			if(!isset($vars['action'])) {
-				foreach($vars as $k => $v) {
-					$this->response->add('storage['.$k.']', $v);
-				}
-			} else {
-				foreach($vars as $k => $v) {
-					unset($this->response->params['storage['.$k.']']);
-				}
-			}
-		}
-
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'select':
-				$content[] = $this->select(true);
-			break;
-			case 'add':
-				$content[] = $this->select(false);
-				$content[] = $this->add(true);
-			break;
-			case 'edit':
-				$content[] = $this->select(false);
-				$content[] = $this->edit(true);
-			break;
-			case 'remove':
-				$content[] = $this->select(false);
-				$content[] = $this->remove(true);
-			break;
-			case 'load':
-				$tmp           = $this->select(false);
-				$tmp['value']  = $this->__loader();
-				$tmp['active'] = true;
-				$content[]     = $tmp;
-			break;
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->rootdir.'/server/storage/class/storage.api.class.php');
-		$controller = new storage_api($this);
-		$controller->action();
-	}
-
-	
-	//--------------------------------------------
-	/**
-	 * Select storage
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/storage/class/storage.select.class.php');
-			$controller = new storage_select($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['select'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['select']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'select' );
-		$content['onclick'] = false;
-		if($this->action === 'select'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Add storage
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function add( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/storage/class/storage.add.class.php');
-			$controller                  = new storage_add($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['add'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['add']['label'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'add' );
-		$content['onclick'] = false;
-		if($this->action === 'add' || $this->action === $this->lang['select']['action_add']){
-			$content['active']  = true;
-		}
-		return $content;
-	}	
-
-	//--------------------------------------------
-	/**
-	 * Edit storage
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function edit( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/storage/class/storage.edit.class.php');
-			$controller                  = new storage_edit($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['edit'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['edit']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'edit' );
-		$content['onclick'] = false;
-		if($this->action === 'edit' || $this->action === $this->lang['select']['action_edit']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-	
-	//--------------------------------------------
-	/**
-	 * Remove storage
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function remove( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/storage/class/storage.remove.class.php');
-			$controller                  = new storage_remove($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['remove'];
-			$controller->rootdir         = $this->rootdir;
-			$controller->prefix_tab      = $this->prefix_tab;
-			$data = $controller->action();
-		}
-		$content['label']   = 'Remove';
-		$content['hidden']  = true;
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'remove' );
-		$content['onclick'] = false;
-		if($this->action === 'remove' || $this->action === $this->lang['select']['action_remove']){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Load Plugin as new tab
-	 *
-	 * @access public
-	 * @return object
-	 */
-	//--------------------------------------------
-	function __loader() {
-
-		$plugin = $this->response->html->request()->get('splugin');
-		$name   = $plugin;
-		$class  = $plugin;
-		if($this->response->html->request()->get('scontroller') !== '') {
-			$class = $this->response->html->request()->get('scontroller');
-			$name  = $class;
-		}
-		$class  = str_replace('-', '_', $class).'_controller';
-
-		// handle new response object
-		$response = $this->response->response();
-		$response->id = 'sload';
-		#unset($response->params['storage[sort]']);
-		#unset($response->params['storage[order]']);
-		#unset($response->params['storage[limit]']);
-		#unset($response->params['storage[offset]']);
-		#unset($response->params['storage_filter']);
-		$response->add('splugin', $plugin);
-		$response->add('scontroller', $name);
-		$response->add($this->actions_name, 'load');
-
-		$path   = $this->openqrm->get('webdir').'/plugins/'.$plugin.'/class/'.$name.'.controller.class.php';
-		$role = $this->openqrm->role($response);
-		$data = $role->get_plugin($class, $path);
-		$data->pluginroot = '/plugins/'.$plugin;
-		return $data;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/storage/class/storage.edit.class.php b/openQRM-5.3.50-CE/src/web/base/server/storage/class/storage.edit.class.php
deleted file mode 100644
index 79da7d3..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/storage/class/storage.edit.class.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-/**
- * Edit Storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class storage_edit
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'storage_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'storage_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-
-		$storage_id = $response->html->request()->get('storage_id');
-		$storage = new storage();
-		$storage->get_instance_by_id($storage_id);
-		$this->storage_id = $storage_id;
-		$this->storage_name = $storage->name;
-		$this->response->params['storage_id'] = $this->response->html->request()->get('storage_id');
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-
-		$response = $this->edit();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/storage-edit.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['comment'], 'comment');
-		$t->add(sprintf($this->lang['label'], $this->storage_name), 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Edit
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function edit() {
-
-		$response = $this->get_response();
-		$form     = $response->form;
-
-		if(!$form->get_errors() && $response->submit()) {
-			$errors     = array();
-			$message    = array();
-
-			$storage_id		= $this->response->html->request()->get('storage_id');
-			$storage_comment		= $this->response->html->request()->get('storage_comment');
-
-			$storage = new storage();
-			$storage->get_instance_by_id($storage_id);
-
-			$storage_comment = $response->html->request()->get('storage_comment');
-			$fields['storage_comment'] = htmlspecialchars($storage_comment);
-			$storage->update($storage_id, $fields);
-			$response->msg = sprintf($this->lang['msg'], $storage->name);
-		}
-		return $response;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'edit');
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		$storage = new storage();
-		$storage->get_instance_by_id($this->storage_id);
-
-		$d['storage_comment']['label']                     = $this->lang['form_comment'];
-		$d['storage_comment']['validate']['regex']         = '/^[a-z0-9._ -]+$/i';
-		$d['storage_comment']['validate']['errormsg']      = sprintf($this->lang['error_comment'], 'a-z0-9._ -');
-		$d['storage_comment']['object']['type']            = 'htmlobject_textarea';
-		$d['storage_comment']['object']['attrib']['name']  = 'storage_comment';
-		$d['storage_comment']['object']['attrib']['value'] = $storage->comment;
-
-		$form->add($d);
-		$response->form = $form;
-		return $response;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/storage/class/storage.remove.class.php b/openQRM-5.3.50-CE/src/web/base/server/storage/class/storage.remove.class.php
deleted file mode 100644
index 5ff2776..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/storage/class/storage.remove.class.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-/**
- * Remove storage
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class storage_remove
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'storage_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'storage_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$response = $this->remove();
-		if(isset($response->msg)) {
-			$this->response->redirect(
-				$this->response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-			);
-		}
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		$t = $this->response->html->template($this->tpldir.'/storage-remove.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->lang['canceled'], 'canceled');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->add($response->form);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Remove
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function remove() {
-
-		$response = $this->get_response();
-		$storages = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		$storage = new storage();
-
-		if( $storages !== '' ) {
-
-			$submit = $form->get_elements('submit');
-			$submit->handler = 'onclick="wait();"';
-			$form->add($submit, 'submit');
-
-			$submit = $form->get_elements('cancel');
-			$submit->handler = 'onclick="cancel();"';
-			$form->add($submit, 'cancel');
-
-			$i = 0;
-			foreach($storages as $id) {
-
-				$storage = $storage->get_instance_by_id($id);
-
-				$d['param_f'.$i]['label']                       = $storage->name;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'['.$i.']';
-				$d['param_f'.$i]['object']['attrib']['value']   = $id;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;		
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$errors     = array();
-				$message    = array();
-				foreach($storages as $key => $id) {
-					$storage = $storage->get_instance_by_id($id);
-					$storage_name = $storage->name;
-					$image_is_used_by_storage = "";
-					$remove_error = 0;
-					$image_remove_check = new image();
-					$image_remove_id_list = $image_remove_check->get_ids_by_storage($id);
-					foreach($image_remove_id_list as $image_list) {
-						$image_id = $image_list['image_id'];
-						$image_is_used_by_storage .= $image_id." ";
-						$remove_error = 1;
-					}
-					if ($remove_error == 1) {
-						$message[] = sprintf($this->lang['msg_not_removing_active'], $id, $image_is_used_by_storage);
-						continue;
-					}
-
-					$storage->remove($id);
-					$form->remove($this->identifier_name.'['.$key.']');
-					$message[] = sprintf($this->lang['msg_removed'], $storage_name);
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param string $mode
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response() {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, 'remove');
-		$response->form = $form;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/storage/class/storage.select.class.php b/openQRM-5.3.50-CE/src/web/base/server/storage/class/storage.select.class.php
deleted file mode 100644
index 2ae7ae1..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/storage/class/storage.select.class.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-/**
- * Storage Select
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class storage_select
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'storage_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "storage_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'storage_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'storage_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response = $response;
-		$this->file     = $openqrm->file();
-		$this->openqrm  = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-
-		$data = $this->select();
-		$t = $this->response->html->template($this->tpldir.'/storage-select.tpl.php');
-		$t->add($this->response->html->thisfile, "thisfile");
-		$t->add($data);
-		$t->add($this->response->get_array());
-		$t->add($this->lang['label'], 'label');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['lang_filter'], 'lang_filter');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return array
-	 */
-	//--------------------------------------------
-	function select() {
-
-		$d = array();
-
-
-		$h = array();
-		$h['storage_state']['title'] = $this->lang['table_state'];
-		$h['storage_state']['sortable'] = false;
-
-		$h['storage_id']['title'] = $this->lang['table_id'];
-		$h['storage_id']['hidden'] = true;
-
-		$h['storage_name']['title'] = $this->lang['table_name'];
-		$h['storage_name']['hidden'] = true;
-
-		$h['storage_resource_id']['title'] = $this->lang['table_resource'];
-		$h['storage_resource_id']['hidden'] = true;
-
-		$h['storage_type']['title'] = $this->lang['table_type'];
-		$h['storage_type']['hidden'] = true;
-
-		$h['data']['title'] = '&#160;';
-		$h['data']['sortable'] = false;
-
-		$h['storage_comment']['title'] = '&#160;';
-		$h['storage_comment']['sortable'] = false;
-
-		$h['storage_edit']['title'] ='&#160;';
-		$h['storage_edit']['sortable'] = false;
-
-		$storage = new storage();
-		$params  = $this->response->get_array($this->actions_name, 'select');
-		$b       = array();
-
-		unset($params['storage_filter']);
-
-		$table = $this->response->html->tablebuilder('storage', $params);
-		$table->offset = 0;
-		$table->sort = 'storage_id';
-		$table->limit = 20;
-		$table->order = 'ASC';
-		$table->max = $storage->get_count();
-		$table->init();
-
-		$storages = $storage->display_overview(0, 10000, $table->sort, $table->order);
-
-		// handle table params
-		$tps = $table->get_params();
-		$tp = '';
-		foreach($tps['storage'] as $k => $v) {
-			$tp .= '&storage['.$k.']='.$v;
-		}
-
-		$i = 0;
-		$deployment = new deployment();
-		foreach ($storages as $key => $value) {
-			$storage = new storage();
-			$storage->get_instance_by_id($value["storage_id"]);
-			
-			$resource = new resource();
-			$resource->get_instance_by_id($storage->resource_id);
-			
-			$deployment = new deployment();
-			$deployment->get_instance_by_id($storage->type);
-			
-			$resource_icon_default = "/img/resource.png";
-			$storage_icon = '/plugins/'.$deployment->storagetype.'/img/plugin.png';
-			$state_icon = '<span class="pill '.$resource->state.'">'.$resource->state.'</span>';
-			
-			if ($this->file->exists($this->openqrm->get('webdir').$storage_icon)) {
-				$resource_icon_default = $storage_icon;
-			}
-			$resource_icon_default = $this->openqrm->get('baseurl').$resource_icon_default;
-
-			$data  = '<b>'.$this->lang['table_id'].':</b> '.$value["storage_id"].'<br>';
-			$data .= '<b>'.$this->lang['table_name'].':</b> '.$value["storage_name"].'<br>';
-			$data .= '<b>'.$this->lang['table_resource'].':</b> '.$resource->id.' / '.$resource->ip.'<br>';
-			$data .= '<b>'.$this->lang['table_type'].':</b> '.$deployment->storagetype.'<br>';
-			$data .= '<b>'.$this->lang['table_deployment'].':</b> '.$deployment->storagedescription;
-
-			$a = $this->response->html->a();
-			$a->title   = $this->lang['action_edit'];
-			$a->label   = $this->lang['action_edit'];
-			$a->handler = 'onclick="wait();"';
-			$a->css     = 'edit';
-			$a->href    = $this->response->get_url($this->actions_name, "edit").'&storage_id='.$storage->id.''.$tp;
-			$edit       = $a->get_string();
-
-			#$url  = $this->openqrm->get('baseurl').'/index.php?plugin='.$deployment->storagetype.'&'.str_replace('-', '_',$deployment->storagetype).'_action=edit&storage_id='.$value["storage_id"];
-
-			$url = $this->response->get_url($this->actions_name, 'load').'&splugin='.$deployment->storagetype.'&'.str_replace('-', '_',$deployment->storagetype).'_action=edit&storage_id='.$value["storage_id"];
-			if( $deployment->storagetype === 'equallogic-storage' ||
-				$deployment->storagetype === 'netapp-storage' ||
-				$deployment->storagetype === 'vbox'
-			) {
-				$url = $this->openqrm->get('baseurl').'/index.php?plugin='.$deployment->storagetype.'&currenttab=tab0&action=select&identifier[]='.$storage->id;
-			}
-			$a = $this->response->html->a();
-			$a->title   = $this->lang['action_mgmt'];
-			$a->label   = $this->lang['action_mgmt'];
-			$a->handler = 'onclick="wait();"';
-			$a->css     = 'manage';
-			$a->href    = $url;
-			// no mgmt for local-server resources
-			if (strstr($storage->capabilities, "TYPE=local-server")) {
-				$mgmt = '&#160;';
-			} else {
-				$mgmt = $a->get_string();
-			}
-			if (
-				$this->response->html->request()->get('storage_filter') === '' ||
-				strstr($this->response->html->request()->get('storage_filter'), $deployment->storagetype )
-			) {
-				$b[] = array(
-					'storage_state' => $state_icon,
-					'storage_id' => $value["storage_id"],
-					'storage_name' => $value["storage_name"],
-					'storage_type' => '',
-					'storage_resource_id' => "",
-					'data' => $data,
-					'storage_comment' => $value["storage_comment"],
-					'storage_edit' => $edit.$mgmt,
-				);
-			}
-			$i++;
-		}
-
-		
-		$list = $deployment->get_storagetype_list();
-		$filter = array();
-		$filter[] = array('', '');
-		foreach( $list as $l) {
-			$filter[] = array( $l['value'], ucfirst($l['label']));
-
-		}
-		asort($filter);
-
-		$select = $this->response->html->select();
-		$select->add($filter, array(0,1));
-		$select->name = 'storage_filter';
-		$select->handler = 'onchange="wait();this.form.submit();return false;"';
-		$select->selected = array($this->response->html->request()->get('storage_filter'));
-		$box = $this->response->html->box();
-		$box->add($select);
-		$box->id = 'storages_filter';
-		$box->css = 'htmlobject_box';
-		$box->label = $this->lang['lang_filter'];
-
-		$add = $this->response->html->a();
-		$add->title   = $this->lang['action_add'];
-		$add->label   = $this->lang['action_add'];
-	//	$add->handler = 'onclick="wait();"';
-		$add->css     = 'add';
-		$add->href    = $this->response->get_url($this->actions_name, "add").''.$tp;
-		
-		$table->id = 'Tabelle';
-		$table->css = 'htmlobject_table';
-		$table->border = 1;
-		$table->cellspacing = 0;
-		$table->cellpadding = 3;
-		$table->autosort = false;
-		$table->sort_link = false;
-		$table->head = $h;
-		$table->body = $b;
-		$table->max = count($b);
-		$table->actions_name = $this->actions_name;
-		$table->actions = array(array('remove' => $this->lang['action_remove']));
-		$table->identifier = 'storage_id';
-		$table->identifier_name = $this->identifier_name;
-		$table->limit_select = array(
-			array("value" => 10, "text" => 10),
-			array("value" => 20, "text" => 20),
-			array("value" => 30, "text" => 30),
-			array("value" => 50, "text" => 50),
-			array("value" => 100, "text" => 100),
-		);
-
-		$d['form']   = $this->response->get_form($this->actions_name, 'select', false)->get_elements();
-		$d['add']    = $add->get_string();
-		$d['filter'] = $box->get_string();
-		$d['table']  = $table;
-		return $d;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/storage/css/storage.css b/openQRM-5.3.50-CE/src/web/base/server/storage/css/storage.css
deleted file mode 100644
index 3605677..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/storage/css/storage.css
+++ /dev/null
@@ -1,32 +0,0 @@
-.htmlobject_td.storage_state {
-	text-align:center;
-	width:25px;
-}
-
-.htmlobject_th.storage_edit,
-.htmlobject_td.storage_edit {
-	text-align:center;
-	width:100px;
-}
-.htmlobject_table .htmlobject_td.storage_edit a{
-	display: block;
-	text-align: left;
-}
-
-.htmlobject_td.head {
-	border: 0px none;
-}
-
-.htmlobject_box textarea {
-	width: 600px;
-	height: 50px;
-}
-
-fieldset {
-	border: 1px solid #91A7B4;
-	padding: 5px 10px;
-}
-fieldset legend {
-	padding: 5px;
-	font-weight: bold;
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/storage/lang/de.storage.ini b/openQRM-5.3.50-CE/src/web/base/server/storage/lang/de.storage.ini
deleted file mode 100644
index 2b70faf..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/storage/lang/de.storage.ini
+++ /dev/null
@@ -1,48 +0,0 @@
-[select]
-tab = "Storage"
-label = "Storage"
-action_remove = "entfernen"
-action_mgmt = "manage"
-action_edit = "edit"
-action_add = "Neue Storage hinzufügen"
-table_state = "Status"
-table_id = "ID"
-table_name = "Name"
-table_type = "Typ"
-table_resource = "Ressource"
-table_deployment = "Deployment"
-lang_filter = "Filter nach Storage Typ"
-please_wait = "Lade Storage. Bitte warten .."
-
-[add]
-label = "Neue Storage"
-msg = "Storage %s hinzufügt"
-form_name = "Name"
-error_name = "Storage Name darf nur %s beinhalten"
-form_capabilities = "Capabilities"
-lang_name_generate = "Name generieren"
-error_capabilities = "Capabilities darf nur %s beinhalten"
-form_deployment = "Deployment Type"
-form_resource = "Ressource"
-form_comment = "Kommentar"
-error_comment = "Kommentar darf nur %s beinhalten"
-error_exists = "Storage Name existiert bereits!"
-please_wait = "Lade Storage. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
-
-[remove]
-label = "Entferne Storage"
-msg = "Storage %s entfernt"
-msg_not_removing_active = "Storage %s beinhaltet noch die folgenden Images %s !<br>Enfernen der Storage abgebrochen."
-please_wait = "Lade Storage. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
-
-[edit]
-tab = "Editiere Storage"
-label = "Editiere Storage %s"
-msg = "Storage %s editiert"
-comment = "Kommentar"
-form_comment = "Kommentar"
-error_comment = "Kommentar darf nur %s beinhalten"
-please_wait = "Lade Storages. Bitte warten .."
-canceled = "Bearbeitung abgebrochen. Bitte warten .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/storage/lang/en.storage.ini b/openQRM-5.3.50-CE/src/web/base/server/storage/lang/en.storage.ini
deleted file mode 100644
index e4acb91..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/storage/lang/en.storage.ini
+++ /dev/null
@@ -1,48 +0,0 @@
-[select]
-tab = "Storage"
-label = "Storage"
-action_remove = "remove"
-action_mgmt = "manage"
-action_edit = "edit"
-action_add = "Add new storage"
-table_state = "State"
-table_id = "Id"
-table_name = "Name"
-table_type = "Type"
-table_resource = "Resource"
-table_deployment = "Deployment"
-lang_filter = "Filter by Storage type"
-please_wait = "Loading. Please wait .."
-
-[add]
-label = "Add Storage"
-msg = "Added Storage %s"
-form_name = "Name"
-error_name = "Storage name must be %s"
-form_capabilities = "Capabilities"
-lang_name_generate = "generate name"
-error_capabilities = "Capabilities name must be %s"
-form_deployment = "Deployment Type"
-form_resource = "Resource"
-form_comment = "Comment"
-error_comment = "Comment must be %s"
-error_exists = "Storage name must be unique!"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[remove]
-label = "Remove Storage"
-msg = "Removed storage %s"
-msg_not_removing_active = "Not removing Storage %s!<br>Image %s are still located on it!"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
-
-[edit]
-tab = "Edit Storage"
-label = "Edit Storage %s"
-msg = "Edited storage %s"
-comment = "Comment"
-form_comment = "Comment"
-error_comment = "Comment must be %s"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/storage/lang/es.storage.ini b/openQRM-5.3.50-CE/src/web/base/server/storage/lang/es.storage.ini
deleted file mode 100644
index 3bd81dc..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/storage/lang/es.storage.ini
+++ /dev/null
@@ -1,48 +0,0 @@
-[select]
-tab = "Almacenamiento"
-label = "Almacenamiento"
-action_remove = "quitar"
-action_mgmt = "administrar"
-action_edit = "editar"
-action_add = "Añadir un nuevo almacenamiento"
-table_state = "Estado"
-table_id = "Id"
-table_name = "Nombre"
-table_type = "Tipo"
-table_resource = "Recurso"
-table_deployment = "Implementación"
-lang_filter = "Filtrar por tipo de almacenamiento"
-please_wait = "Cargando. Por favor espere .."
-
-[add]
-label = "Añadir almacenamiento"
-msg = "Almacenamiento %s añadido"
-form_name = "Nombre"
-error_name = "El nombre del almacenamiento debe ser %s"
-form_capabilities = "Capacidad"
-lang_name_generate = "generar nombre"
-error_capabilities = "El nombre de la capacidad debe ser %s"
-form_deployment = "Tipo de implementación"
-form_resource = "Recurso"
-form_comment = "Comentario"
-error_comment = "El comentario debe ser %s"
-error_exists = "El nombre del almacenamiento debe ser único!"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[remove]
-label = "Quitar almacenamiento"
-msg = "Quitar almacenamiento %s"
-msg_not_removing_active = "No se ha eliminado el almacenamiento %s!<br>La imagen %s se encuentra aún en este almacenamiento !"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
-
-[edit]
-tab = "Editar almacenamiento"
-label = "Editar almacenamiento"
-msg = "Almacenamiento %s editado"
-comment = "Comentario"
-form_comment = "Comentario"
-error_comment = "Comentario debe ser %s"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/storage/tpl/storage-add.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/storage/tpl/storage-add.tpl.php
deleted file mode 100644
index b5a2cbf..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/storage/tpl/storage-add.tpl.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div id="form">
-	<form action="{thisfile}" method="GET">
-		{form}
-		{name}
-		{capabilities}
-		{comment}
-		{type}
-		{resource}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</form>
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/storage/tpl/storage-edit.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/storage/tpl/storage-edit.tpl.php
deleted file mode 100644
index f0d6fa7..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/storage/tpl/storage-edit.tpl.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-
-<div id="form">
-	<form action="{thisfile}">
-		{form}
-		{storage_comment}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-	</form>
-</div>
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/storage/tpl/storage-remove.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/storage/tpl/storage-remove.tpl.php
deleted file mode 100644
index d38627c..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/storage/tpl/storage-remove.tpl.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<form action="{thisfile}">
-
-	<div id="form">
-	{form}
-	</div>
-
-	<div id="buttons">
-	{submit}
-	{cancel}
-	</div>
-</form>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/storage/tpl/storage-select.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/storage/tpl/storage-select.tpl.php
deleted file mode 100644
index 61af0ad..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/storage/tpl/storage-select.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-
-<h2>{label}<span class="pull-right">{add}</span></h2>
-<div id="form">
-	<form action="{thisfile}" method="POST">
-		{form}
-		{filter}
-		{table}
-	</form>
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/user/class/user.controller.class.php b/openQRM-5.3.50-CE/src/web/base/server/user/class/user.controller.class.php
deleted file mode 100644
index 123152a..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/user/class/user.controller.class.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/**
- * User Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class user_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'user_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = 'user_msg';
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'user_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-
-/**
-* lang
-* @access public
-* @var string
-*/
-var $lang = array(
-	'label' => 'User Administration',
-	'label_users' => 'Users',
-	'label_account' => 'Account',
-	'label_edit' => 'Edit %s',
-	'label_delete' => 'Delete user(s)',
-	'name' => 'Name',
-	'role' => 'Role',
-	'lang' => 'Lang',
-	'forename' => 'Forename',
-	'lastname' => 'Surname',
-	'gender' => 'Gender',
-	'male' => 'male',
-	'female' => 'female',
-	'state' => 'State',
-	'activated' => 'activated',
-	'deactivated' => 'deactivated',
-	'state' => 'State',
-	'office' => 'Office',
-	'department' => 'Department',
-	'description' => 'Description',
-	'capabilities' => 'Capabilities',
-	'password' => 'Password',
-	'password_repeat' => 'Password (repeat)',
-	'action_delete' => 'delete',
-	'action_edit' => 'edit',
-	'action_new' => 'New User',
-	'msg_saved' => 'User %s has been saved',
-	'msg_deleted' => 'User %s has been deleted',
-	'error_no_match' => '%s does not match %s',
-	'error_user_exists' => 'User %s already exists',
-	'error_name' => 'string must be a-z0-9_-',
-	'please_wait' => 'Loading. Please wait ...',
-	'canceled' => 'Operation canceled. Please wait ...',
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param phppublisher $phppublisher
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->user     = $openqrm->get('user');
-		$this->file     = $openqrm->get('file');
-		$this->response = $response;
-		$this->classdir = $openqrm->get('webdir').'/server/user/class/';
-		$this->tpldir   = $openqrm->get('webdir').'/server/user/tpl/';
-		$this->lang     = $this->user->translate($this->lang, $openqrm->get('webdir')."/server/user/lang", 'user.ini');
-		$this->openqrm = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->action === '' || $this->user->isAdmin() === false ) {
-			$this->action = 'account';
-		}
-
-		$this->response->params[$this->actions_name] = $this->action;
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			default:
-			case 'account':
-				$content[] = $this->account();
-				if($this->user->isAdmin() === true) {
-					$content[] = $this->users(true);
-				}
-			break;
-			case 'users':
-				$content[] = $this->account(true);
-				if($this->user->isAdmin() === true) {
-					$content[] = $this->users();
-				}
-			break;
-
-		}
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Users
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function users( $hidden = false ) {
-		$data = '';
-		if( $hidden === false && (strtolower($this->user->role) === 'administrator' || $this->user->role === 0) ) {
-			require_once($this->classdir.'/user.users.class.php');
-			$controller = new user_users($this->openqrm, $this->response);
-			$controller->actions_name = 'users_action';
-			$controller->message_param = $this->message_param;
-			$controller->tpldir = $this->tpldir;
-			$controller->prefix_tab = $this->prefix_tab;
-			$controller->lang = $this->lang;
-			$data = $controller->action();	
-		}
-		$content['label']   = $this->lang['label_users'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'users' );
-		$content['onclick'] = false;
-		if($this->action === 'users'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Account
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function account( $hidden = false ) {
-		$data = '';
-		if( $hidden === false ) {
-			require_once($this->classdir.'/user.users.class.php');
-			$controller = new user_users($this->openqrm, $this->response);
-			$controller->actions_name = 'users_action';
-			$controller->message_param = $this->message_param;
-			$controller->tpldir = $this->tpldir;
-			$controller->prefix_tab = $this->prefix_tab;
-			$controller->lang = $this->lang;
-			$data = $controller->account();	
-		}
-		$content['label']   = $this->lang['label_account'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'account' );
-		$content['onclick'] = false;
-		if($this->action === 'account'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/user/class/user.users.class.php b/openQRM-5.3.50-CE/src/web/base/server/user/class/user.users.class.php
deleted file mode 100644
index f72da13..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/user/class/user.users.class.php
+++ /dev/null
@@ -1,664 +0,0 @@
-<?php
-/**
- * User Users
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class user_users
-{
-/**
-* name for selected values
-* @access public
-* @var string
-*/
-var $identifier_name = 'admin_id';
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'admin_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param;
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $lang = array();
-	
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param object $user
-	 * @param object $file
-	 * @param object $response
-	 */
-	//--------------------------------------------
-	function __construct( $openqrm, $response ) {
-		$this->user     = $openqrm->get('user');
-		$this->response = $response;
-                $this->openqrm = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action( $action = null ) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = 'select';
-		}
-
-		switch( $this->action ) {
-			// SELECT
-			case '':
-			case 'select':
-				$response      = $this->select();
-				$data['label'] = $this->lang['label'];
-				$data['table'] = $response->table;
-				$href          = $response->html->a();
-				$href->href    = $response->html->thisfile.$response->get_string($this->actions_name, 'insert', '?', true );
-				$href->label   = $this->lang['action_new'];
-				$href->css     = 'add';
-				$href->handler = 'onclick="wait();"';
-				$data['new']   = $href;
-				$data['canceled'] = $this->lang['canceled'];
-				$data['wait'] = $this->lang['please_wait'];
-				$data['prefix_tab'] = $this->prefix_tab;
-				$vars = array_merge(
-					$data, 
-					array(
-						'thisfile' => $response->html->thisfile,
-				));
-				$t = $response->html->template($this->tpldir.'/user_select.tpl.php');
-				$t->add($vars);
-				$t->add($response->form);
-				$t->group_elements(array('param_' => 'form'));
-				return $t;
-			break;
-			// INSERT
-			case 'insert':
-				$response = $this->insert();
-				if(isset($response->error)) {
-					if(!isset($_REQUEST['nomsg'])) {
-						$_REQUEST[$this->message_param] = $response->error;
-					}
-				}
-				if(isset($response->msg)) {
-					$response->redirect(
-							$response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-					);
-				}
-				$data['canceled'] = $this->lang['canceled'];
-				$data['wait'] = $this->lang['please_wait'];
-				$data['prefix_tab'] = $this->prefix_tab;
-				$data['label'] = $this->lang['action_new'];
-				$data['name'] = '';
-				$vars = array_merge(
-					$data, 
-					array(
-						'thisfile' => $response->html->thisfile,
-				));
-				$t = $response->html->template($this->tpldir.'/user_insert.tpl.php');
-				$t->add($vars);
-				$t->add($response->form);
-				$t->group_elements(array('param_' => 'form'));
-				return $t;
-			break;
-			// edit
-			case 'edit':
-				$response = $this->edit();
-				if(isset($response->error)) {
-					$_REQUEST[$this->message_param] = $response->error;
-				}
-				if(isset($response->msg)) {
-					$response->redirect(
-							$response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-					);
-				}
-				$data['canceled'] = $this->lang['canceled'];
-				$data['wait'] = $this->lang['please_wait'];
-				$data['prefix_tab'] = $this->prefix_tab;
-				$data['label'] = sprintf($this->lang['label_edit'], $response->html->request()->get('user[user_name]'));
-				$data['name'] = '';
-				$vars = array_merge(
-					$data, 
-					array(
-						'thisfile' => $response->html->thisfile,
-				));
-				$t = $response->html->template($this->tpldir.'/user_insert.tpl.php');
-				$t->add($vars);
-				$t->add($response->form);
-				$t->group_elements(array('param_' => 'form'));
-				return $t;
-			break;
-			// DELETE
-			case $this->lang['action_delete']:
-			case 'delete':
-				$response = $this->delete();
-				if(isset($response->error)) {
-					$_REQUEST[$this->message_param] = $response->error;
-				}
-				if(isset($response->msg)) {
-					$response->redirect(
-							$response->get_url($this->actions_name, 'select', $this->message_param, $response->msg)
-					);
-				}
-				$data['canceled'] = $this->lang['canceled'];
-				$data['wait'] = $this->lang['please_wait'];
-				$data['prefix_tab'] = $this->prefix_tab;
-				$vars = array('thisfile' => $response->html->thisfile);
-				$t = $response->html->template($this->tpldir.'/user_delete.tpl.php');
-				$t->add($vars);
-				$t->add($this->lang['label_delete'], 'label');
-				$t->add($response->form);
-				$t->add($data);
-				$t->group_elements(array('param_' => 'form'));
-				return $t;
-			break;
-		}
-	}
-
-	//--------------------------------------------
-	/**
-	 * Select
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function select() {
-		$response = $this->get_response('select');
-
-		$h['name']['title']    = $this->lang['name'];
-		$h['name']['sortable'] = true;
-		$h['role']['title']    = $this->lang['role'];
-		$h['role']['sortable'] = true;
-		$h['func']['title']    = '&#160;';
-		$h['func']['sortable'] = false;
-
-		$result = $this->user->get_users();
-		$b = array();
-		foreach($result as $k => $v) {
-			if($k !== 0) {
-				$tmp = array();
-				foreach($v as $value) {
-					if($value['label'] === 'user_name') {
-						$tmp['name'] = $value['value'];
-						$params  = '?user[user_name]='.$value['value'];
-						$params .= $response->get_string($this->actions_name, 'edit', '&', true );
-						$a = $response->html->a();
-						$a->href = $response->html->thisfile.$params;
-						$a->label = $this->lang['action_edit'];
-						$a->title = $this->lang['action_edit'];
-						$a->css   = 'edit';
-						$a->handler = 'onclick="wait();"';
-						$tmp['func'] =  $a->get_string();
-					}
-					if($value['label'] === 'role_name') {
-						$tmp['role'] = $value['value'];
-					}
-				}
-				$b[] = $tmp;
-			}
-		}
-
-		$table                      = $response->html->tablebuilder( 'ut', $response->params );
-		$table->sort                = 'name';
-		$table->css                 = 'htmlobject_table';
-		$table->border              = 0;
-		$table->id                  = 'Tabelle';
-		$table->head                = $h;
-		$table->body                = $b;
-		$table->sort_params         = $response->get_string( $this->actions_name, 'select' );
-		$table->sort_form           = true;
-		$table->sort_link           = false;
-		$table->autosort            = true;
-		$table->identifier          = 'name';
-		$table->identifier_name     = $this->identifier_name;
-		$table->identifier_disabled = array( 'openqrm' );
-		$table->actions             = array($this->lang['action_delete']);
-		$table->actions_name        = $this->actions_name;
-		$table->max                 = count( $b );
-
-		$response->table = $table;
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Insert
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function insert() {
-		$response = $this->get_response('insert');
-		$form     = $response->form;
-		if(!$form->get_errors() && $response->submit()) {
-			$user = $form->get_request('user');
-			$ini  = $user;
-			unset($ini['pass2']);	
-			if(
-				(isset($user['user_password']) && !isset($user['pass2'])) ||
-				(isset($user['user_password']) && $user['user_password'] !== $user['pass2'])
-			) {
-				$form->set_error('user[pass2]', sprintf($this->lang['error_no_match'], $this->lang['password_repeat'], $this->lang['password']));
-			}
-			if(!$form->get_errors()) {
-				$check = new user ($user['user_name']);
-				// Check user exists
-				if(!$check->check_user_exists()) {
-					global $USER_INFO_TABLE;
-					$ini['user_id'] = (int)str_replace(".", "", str_pad(microtime(true), 15, "0"));
-					$check->add($ini);
-					$pass = new user($ini['user_name']);
-					$pass->change_htpasswd('insert');
-				} else {
-					$form->set_error('user[user_name]', sprintf($this->lang['error_user_exists'], $user['user_name']));
-					$error = sprintf($this->lang['error_user_exists'], $user['user_name']);
-				}
-				if(!isset($error) || $error === '') {
-					$response->msg = sprintf($this->lang['msg_saved'], $user['user_name']);
-				} else {
-					$response->error = $error;
-				}
- 			} else {
-				$response->error = join('<br>', $form->get_errors());
-			}
-		}		
-		if($form->get_errors()) {
-			$response->error = join('<br>', $form->get_errors());
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * edit
-	 *
-	 * @access public
-	 * @param enum $mode [edit|account]
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function edit( $mode = 'edit' ) {
-		$response = $this->get_response( $mode );
-		$form     = $response->form;
-		if($mode === 'account') {
-			$username = $this->user->name;
-		}
-		else if ($mode === 'edit') {
-			$username = $response->html->request()->get('user[user_name]');
-		}
-		if(!$form->get_errors() && $this->response->submit()) {
-			$user = $form->get_request('user');
-			$ini  = $user;
-			unset($ini['pass2']);
-			if(
-				$mode === 'account' ||
-				($mode === 'edit' && $username === 'openqrm')				
-			) {
-				unset($ini['user_role']);
-				unset($ini['user_state']);
-			}
-			if(
-				(isset($user['user_password']) && !isset($user['pass2'])) ||
-				(isset($user['user_password']) && $user['user_password'] !== $user['pass2'])
-			) {
-				$form->set_error('user[pass2]', sprintf($this->lang['error_no_match'], $this->lang['password_repeat'], $this->lang['password']));
-			}
-			if(!$form->get_errors()) {
-				$error = '';
-				$update = new user($username);
-				$update->get_instance_by_name($username);
-				foreach($ini as $k => $v) {
-					$arg = str_replace('user_', '', $k);
-					$update->$arg = $v;
-				}
-				$update->query_update();
-				if($error === '') {
-					$response->msg = sprintf($this->lang['msg_saved'], $username);
-				} else {
-					$response->error = $error;
-				}
-			} else {
-				$response->error = join('<br>', $form->get_errors());
-			}
-		}
-		if($form->get_errors()) {
-			$response->error = join('<br>', $form->get_errors());
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Account
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function account() {
-		$response = $this->edit('account');
-		if(isset($response->error)) {
-			$_REQUEST[$this->message_param] = $response->error;
-		}
-		if(isset($response->msg)) {
-			$response->redirect(
-				$response->get_url($this->actions_name, 'account', $this->message_param, $response->msg)
-			);
-		}
-		$data['canceled'] = $this->lang['canceled'];
-		$data['wait'] = $this->lang['please_wait'];
-		$data['prefix_tab'] = $this->prefix_tab;
-		$data['label'] = $this->lang['label_account'];
-		$data['cancel'] = '';
-		$data['role']  = '';
-		$data['name']   = $response->form->get_elements('user')->value;
-		$vars = array_merge(
-			$data, 
-			array(
-				'thisfile' => $response->html->thisfile,
-			));
-		$t = $response->html->template($this->tpldir.'/user_insert.tpl.php');
-		$t->add($response->form);
-		$t->add($vars);
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Delete
-	 *
-	 * @access public
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function delete() {
-		$response = $this->get_response('delete');
-		$folders  = $response->html->request()->get($this->identifier_name);
-		$form     = $response->form;
-		if( $folders !== '' ) {
-			$i = 0;
-			foreach($folders as $folder) {
-				$d['param_f'.$i]['label']                       = $folder;
-				$d['param_f'.$i]['object']['type']              = 'htmlobject_input';
-				$d['param_f'.$i]['object']['attrib']['type']    = 'checkbox';
-				$d['param_f'.$i]['object']['attrib']['name']    = $this->identifier_name.'[]';
-				$d['param_f'.$i]['object']['attrib']['value']   = $folder;
-				$d['param_f'.$i]['object']['attrib']['checked'] = true;		
-				$i++;
-			}
-			$form->add($d);
-			if(!$form->get_errors() && $response->submit()) {
-				$errors  = array();
-				$message = array();
-				foreach($folders as $key => $user) {
-					// protect user openqrm
-					if($user !== 'openqrm') {
-						$del = new user($user);
-						$del->set_user();
-						$error = $del->query_delete();
-						if(is_array($error) && count($error) > 1 ) {
-							$errors[] = $error;
-						} else {
-							$form->remove($this->identifier_name.'['.$key.']');
-							$message[] = sprintf($this->lang['msg_deleted'], $user);
-						}
-					}
-					else if($user === 'openqrm') {
-						$form->remove($this->identifier_name.'['.$key.']');
-					}
-				}
-				if(count($errors) === 0) {
-					$response->msg = join('<br>', $message);
-				} else {
-					$msg = array_merge($errors, $message);
-					$response->error = join('<br>', $msg);
-				}
-			}
-			if($form->get_errors()) {
-				$response->error = join('<br>', $form->get_errors());
-			}
-		} else {
-			$response->msg = '';
-		}
-		return $response;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Get Response
-	 *
-	 * @access public
-	 * @param enum $mode [select|insert|edit|account|delete]
-	 * @return htmlobject_response
-	 */
-	//--------------------------------------------
-	function get_response($mode) {
-		$response = $this->response;
-		$form = $response->get_form($this->actions_name, $mode);
-
-		$submit = $form->get_elements('submit');
-		$submit->handler = 'onclick="wait();"';
-		$form->add($submit, 'submit');
-
-		$submit = $form->get_elements('cancel');
-		$submit->handler = 'onclick="cancel();"';
-		$form->add($submit, 'cancel');
-
-		if( $mode !== 'select' && $mode !== 'delete') {	
-			if( $mode === 'edit' ) {
-				$user = $this->response->html->request()->get( 'user[user_name]' );
-				$ini  = new user($user);
-				$d['user']['static']                    = true;
-				$d['user']['object']['type']            = 'htmlobject_input';
-				$d['user']['object']['attrib']['name']  = 'user[user_name]';
-				$d['user']['object']['attrib']['type']  = 'hidden';
-				$d['user']['object']['attrib']['value'] = $ini->name;
-				$pass_required = false;
-			}
-			if( $mode === 'account' ) {
-				// get logged in user
-				$ini = $this->user;
-				$d['user']['static']                    = true;
-				$d['user']['object']['type']            = 'htmlobject_input';
-				$d['user']['object']['attrib']['name']  = 'user[user_name]';
-				$d['user']['object']['attrib']['type']  = 'hidden';
-				$d['user']['object']['attrib']['value'] = $ini->name;
-				$pass_required = false;
-			}
-			if( $mode === 'insert' ) {
-				$ini  = array();
-				$ini['lang']  = 'en';
-				$d['user']['label']                     = $this->lang['name'];
-				$d['user']['required']                  = true;
-				$d['user']['validate']['regex']         = '/^[a-z0-9_-]+$/i';
-				$d['user']['validate']['errormsg']      = $this->lang['error_name'];
-				$d['user']['object']['type']            = 'htmlobject_input';
-				$d['user']['object']['attrib']['name']  = 'user[user_name]';
-				$d['user']['object']['attrib']['type']  = 'text';
-				$d['user']['object']['attrib']['value'] = '';
-				$pass_required = true;
-			}
-
-			$lang = array();
-			$files = $this->openqrm->file()->get_files($this->openqrm->get('basedir').'/web/base/lang/', '', '*.htmlobjects.ini');
-			foreach($files as $v) {
-				$tmp = explode('.', $v['name']);
-				$lang[] = array($tmp[0]);
-			}
-
-			$d['lang']['label']                        = $this->lang['lang'];
-			$d['lang']['object']['type']               = 'htmlobject_select';
-			$d['lang']['object']['attrib']['name']     = 'user[user_lang]';
-			$d['lang']['object']['attrib']['index']    = array(0,0);
-			$d['lang']['object']['attrib']['options']  = $lang;
-			if(isset($ini->lang)) {
-				$d['lang']['object']['attrib']['selected'] = array( $ini->lang );
-			}
-
-			$d['forename']['label']                     = $this->lang['forename'];
-			$d['forename']['object']['type']            = 'htmlobject_input';
-			$d['forename']['object']['attrib']['type']  = 'text';
-			$d['forename']['object']['attrib']['name']  = 'user[user_first_name]';
-			if(isset($ini->first_name)) {
-				$d['forename']['object']['attrib']['value'] = $ini->first_name;
-			}
-
-			$d['lastname']['label']                     = $this->lang['lastname'];
-			$d['lastname']['object']['type']            = 'htmlobject_input';
-			$d['lastname']['object']['attrib']['type']  = 'text';
-			$d['lastname']['object']['attrib']['name']  = 'user[user_last_name]';
-			if(isset($ini->last_name)) {
-				$d['lastname']['object']['attrib']['value'] = $ini->last_name;
-			}
-
-			$gender = array();
-			$gender[] = array( '', '' );
-			$gender[] = array( 'm', $this->lang['male'] );
-			$gender[] = array( 'f', $this->lang['female'] );
-
-			$d['gender']['label']                        = $this->lang['gender'];
-			$d['gender']['object']['type']               = 'htmlobject_select';
-			$d['gender']['object']['attrib']['name']     = 'user[user_gender]';
-			$d['gender']['object']['attrib']['index']    = array(0,1);
-			$d['gender']['object']['attrib']['options']  = $gender;
-			if(isset($ini->gender)) {
-				$d['gender']['object']['attrib']['selected'] = array( $ini->gender );
-			}
-
-			$d['department']['label']                     = $this->lang['department'];
-			$d['department']['object']['type']            = 'htmlobject_input';
-			$d['department']['object']['attrib']['type']  = 'text';
-			$d['department']['object']['attrib']['name']  = 'user[user_department]';
-			if(isset($ini->department)) {
-				$d['department']['object']['attrib']['value'] = $ini->department;
-			}
-
-			$d['office']['label']                     = $this->lang['office'];
-			$d['office']['object']['type']            = 'htmlobject_input';
-			$d['office']['object']['attrib']['type']  = 'text';
-			$d['office']['object']['attrib']['name']  = 'user[user_office]';
-			if(isset($ini->office)) {
-				$d['office']['object']['attrib']['value'] = $ini->office;
-			}
-
-			$d['state'] = '';
-			if(
-				$mode === 'insert' ||
-				($mode === 'edit' && $ini->name !== 'openqrm')
-			) {
-				$state[] = array('activated', $this->lang['activated']);
-				$state[] = array('deactivated', $this->lang['deactivated']);
-				$d['state']['label']                     = $this->lang['state'];
-				$d['state']['object']['type']            = 'htmlobject_select';
-				$d['state']['object']['attrib']['index']  = array(0,1);
-				$d['state']['object']['attrib']['options'] = $state;
-				$d['state']['object']['attrib']['name']  = 'user[user_state]';
-				if(isset($ini->state)) {
-					$d['state']['object']['attrib']['selected'] = array($ini->state);
-				}
-			}
-
-			$d['description']['label']                     = $this->lang['description'];
-			$d['description']['object']['type']            = 'htmlobject_textarea';
-			$d['description']['object']['attrib']['name']  = 'user[user_description]';
-			if(isset($ini->description)) {
-				$d['description']['object']['attrib']['value'] = $ini->description;
-			}
-
-			$d['capabilities']['label']                     = $this->lang['capabilities'];
-			$d['capabilities']['object']['type']            = 'htmlobject_textarea';
-			$d['capabilities']['object']['attrib']['name']  = 'user[user_capabilities]';
-			if(isset($ini->capabilities)) {
-				$d['capabilities']['object']['attrib']['value'] = $ini->capabilities;
-			}
-
-			$d['role'] = '';
-			if(
-				$mode === 'insert' ||
-				($mode === 'edit' && $ini->name !== 'openqrm')
-			) {
-				$roles = $this->user->get_role_list();
-				if(is_array($roles)) {
-					$d['role']['label']                        = $this->lang['role'];
-					$d['role']['required']                     = true;
-					$d['role']['object']['type']               = 'htmlobject_select';
-					$d['role']['object']['attrib']['name']     = 'user[user_role]';
-					$d['role']['object']['attrib']['css']      = 'users2groups';
-					$d['role']['object']['attrib']['index']    = array('value', 'label');
-					$d['role']['object']['attrib']['options']  = $roles;
-					$d['role']['object']['attrib']['id']       = 'role_select';
-					if($mode === 'edit') {
-						if(isset($ini->role)) {
-							$d['role']['object']['attrib']['selected'] = array($ini->role);
-						}
-					}
-				}
-			}                        
-                        // if ldap is enabled do not allow access the the openQRM user administration
-			if (file_exists($this->openqrm->get('basedir').'/plugins/ldap/web/.running')) {
-				$d['pass1'] = '';
-				$d['pass2'] = '';
-			} else {
-				$d['pass1']['label']                     = $this->lang['password'];
-				$d['pass1']['required']                  = $pass_required;
-				$d['pass1']['object']['type']            = 'htmlobject_input';
-				$d['pass1']['object']['attrib']['name']  = 'user[user_password]';
-				$d['pass1']['object']['attrib']['type']  = 'password';
-				$d['pass1']['object']['attrib']['value'] = '';
-
-				$d['pass2']['label']                     = $this->lang['password_repeat'];
-				$d['pass2']['required']                  = $pass_required;
-				$d['pass2']['object']['type']            = 'htmlobject_input';
-				$d['pass2']['object']['attrib']['name']  = 'user[pass2]';
-				$d['pass2']['object']['attrib']['type']  = 'password';
-				$d['pass2']['object']['attrib']['value'] = '';
-			}
-         
-			$form->add($d);
-		}
-		$response->form = $form;
-		$response->form->display_errors = false;
-		return $response;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/user/css/user.css b/openQRM-5.3.50-CE/src/web/base/server/user/css/user.css
deleted file mode 100644
index 1f15ef0..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/user/css/user.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.htmlobject_td.func {
-	text-align: center;
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/user/lang/de.user.ini b/openQRM-5.3.50-CE/src/web/base/server/user/lang/de.user.ini
deleted file mode 100644
index 2eb6d17..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/user/lang/de.user.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-label = "Benutzer Administration"
-label_users = "Benutzer"
-label_account = "Benutzerkonto"
-label_edit = "Berabeite %s"
-label_delete = "Lösche Benutzer"
-name = "Name"
-role = "Rolle"
-lang = "Sprache"
-forename = "Vorname"
-lastname = "Nachname"
-gender = "Geschlecht"
-male = "männlich"
-female = "weiblich"
-state = "Status"
-activated = "aktiviert"
-deactivated = "deaktiviert"
-office = "Büro"
-department = "Abteilung"
-description = "Beschreibung"
-capabilities = "Capabilities"
-password = "Passwort"
-password_repeat = "Passwort (wiederholen)"
-action_delete = "löschen"
-action_edit = "bearbeiten"
-action_new = "Neuer Benutzer"
-msg_saved = "Benutzer %s wurde gespeichert"
-msg_deleted = "Benutzer %s wurde gelöscht"
-error_no_match = "%s entspricht nicht %s"
-error_user_exists = "Benutzer %s besteht bereits"
-error_name = "Inhalt darf nur a-z0-9_- enthalten"
-please_wait = "Lade. Bitte warten .."
-canceled = "Operation abgebrochen. Bitte warten .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/user/lang/en.user.ini b/openQRM-5.3.50-CE/src/web/base/server/user/lang/en.user.ini
deleted file mode 100644
index 9d9e7ff..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/user/lang/en.user.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-label = "User Administration"
-label_users = "Users"
-label_account = "Account"
-label_edit = "Edit %s"
-label_delete = "Delete user(s)"
-name = "Name"
-role = "Role"
-lang = "Lang"
-forename = "Forename"
-lastname = "Surname"
-gender = "Gender"
-male = "male"
-female = "female"
-state = "State"
-activated = "activated"
-deactivated = "deactivated"
-state = "State"
-office = "Office"
-department = "Department"
-description = "Description"
-capabilities = "Capabilities"
-password = "Password"
-password_repeat = "Password (repeat)"
-action_delete = "delete"
-action_edit = "edit"
-action_new = "New User"
-msg_saved = "User %s has been saved"
-msg_deleted = "User %s has been deleted"
-error_no_match = "%s does not match %s"
-error_user_exists = "User %s already exists"
-error_name = "string must be a-z0-9_-"
-please_wait = "Loading. Please wait .."
-canceled = "Operation canceled. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/user/lang/es.user.ini b/openQRM-5.3.50-CE/src/web/base/server/user/lang/es.user.ini
deleted file mode 100644
index 1dce6d2..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/user/lang/es.user.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-label = "Administración de usuarios"
-label_users = "Usuarios"
-label_account = "Cuenta"
-label_edit = "Editar %s"
-label_delete = "Borrar usuario(s)"
-name = "Nombre"
-role = "Rol"
-lang = "Idioma"
-forename = "Nombre"
-lastname = "Apellidos"
-gender = "Genero"
-male = "masculino"
-female = "femenino"
-state = "Estado"
-activated = "activado"
-deactivated = "desactivar"
-state = "Estado"
-office = "Oficina"
-department = "Departamento"
-description = "Descripción"
-capabilities = "Capacidades"
-password = "Clave"
-password_repeat = "Clave (repetir)"
-action_delete = "borrar"
-action_edit = "editar"
-action_new = "Usuario nuevo"
-msg_saved = "El usuario %s se ha guardado"
-msg_deleted = "El usuario %s se ha borrado"
-error_no_match = "%s no coincide con %s"
-error_user_exists = "El usuario %s ya existe"
-error_name = "los caracteres deben ser: a-z 0-9_-"
-please_wait = "Cargando. Por favor espere .."
-canceled = "Cancelado. Por favor espere .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/user/tpl/user_delete.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/user/tpl/user_delete.tpl.php
deleted file mode 100644
index d235cf4..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/user/tpl/user_delete.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}</h2>
-<div id="form">
-<form action="{thisfile}" method="POST">
-{form}
-<br>
-{submit}
-{cancel}
-</form>
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/user/tpl/user_insert.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/user/tpl/user_insert.tpl.php
deleted file mode 100644
index 58c0e6e..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/user/tpl/user_insert.tpl.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label} "{name}"</h2>
-<div id="form">
-	<form action="{thisfile}" method="POST">
-		{form}
-		{user}
-		
-		<div class="row">
-			<fieldset class="span5">
-				<legend>Account</legend>
-				{lang}
-				{role}
-				{pass1}
-				{pass2}
-			</fieldset>
-		
-			<fieldset class="span5">
-				<legend>Personal information</legend>
-				{gender}
-				{forename}
-				{lastname}
-			</fieldset>
-		</div>
-
-		
-		<fieldset>
-			<legend>Company information</legend>
-			{office}
-			{department}
-			{state}
-			{description}
-			{capabilities}
-		</fieldset>
-		{submit}{cancel}
-			
-	</form>
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/user/tpl/user_select.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/user/tpl/user_select.tpl.php
deleted file mode 100644
index e27afc7..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/user/tpl/user_select.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-//-->
-<h2>{label}<span class="pull-right">{new}</span></h2>
-
-<div id="form">
-	<form action="{thisfile}" method="POST">
-		{form}
-		{table}
-	</form>
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/class/documentation.controller.class.php b/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/class/documentation.controller.class.php
deleted file mode 100644
index 688cc97..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/class/documentation.controller.class.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-/**
- * Documentation Controller
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class documentation_controller
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'documentation_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "documentation_msg";
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'documentation_tab';
-/**
-* identifier name
-* @access public
-* @var string
-*/
-var $identifier_name = 'documentation_identifier';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array(
-	'main' => array (
-		'tab' => 'Documentation',
-		'label' => 'Documentation',
-		'title' => 'openQRM Documentation',
-		'technical' => 'Technical Documentation',
-		'technical_description' => 'Please find the Technical Documentation of openQRM at:',
-		'technical_url' => 'http://www.openqrm-enterprise.com/news/details/article/in-depth-documentation-of-openqrm-available.html',
-		'howtos' => 'openQRM Howtos & Use Cases',
-		'howto1_title' => 'Setup your own openQRM Cloud with KVM on Ubuntu',
-		'howto1_url' => 'http://www.openqrm-enterprise.com/news/details/article/howto-setup-your-own-openqrm-cloud-with-kvm-on-ubuntu-lucid-lynx.html',
-		'howto2_title' => 'Integrate Ubuntu Enterprise Cloud, Amazon EC2 and Eucalyptus with openQRM',
-		'howto2_url' => 'http://www.openqrm-enterprise.com/news/details/article/integrate-ubuntu-enterprise-cloud-amazon-ec2-and-eucalyptus-with-openqrm.html',
-		'howto3_title' => 'Setup openQRM Cloud deploying physical Windows Systems on CentOS',
-		'howto3_url' => 'http://www.openqrm-enterprise.com/news/details/article/howto-setup-openqrm-cloud-deploying-physical-windows-systems-on-centos-55.html',
-		'api' => 'openQRM Cloud SOAP API Documentation',
-		'api_description' => 'Please find the API of openQRM at:',
-		'api_url' => 'http://support.openqrm-enterprise.com/documentation/openQRM-SOAP-API/',
-		'please_wait' => 'Loading. Please wait ..',
-
-	    
-	),
-);
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->openqrm  = $openqrm;
-		$this->user     = $this->openqrm->user();
-		$this->rootdir  = $this->openqrm->get('webdir');
-		$this->tpldir   = $this->rootdir.'/server/zz_documentation/tpl';
-		$this->response = $response;
-		$this->file     = $this->openqrm->file();
-		$this->lang     = $this->user->translate($this->lang, $this->rootdir."/server/zz_documentation/lang", 'documentation.ini');
-//		$response->html->debug();
-
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @param string $action
-	 * @return htmlobject_tabmenu
-	 */
-	//--------------------------------------------
-	function action($action = null) {
-		$this->action = '';
-		$ar = $this->response->html->request()->get($this->actions_name);
-		if($ar !== '') {
-			$this->action = $ar;
-		} 
-		else if(isset($action)) {
-			$this->action = $action;
-		}
-		if($this->response->cancel()) {
-			$this->action = "main";
-		}
-
-		$content = array();
-		switch( $this->action ) {
-			case '':
-			case 'main':
-				$content[] = $this->main(true);
-			break;
-		}
-
-		$tab = $this->response->html->tabmenu($this->prefix_tab);
-		$tab->message_param = $this->message_param;
-		$tab->css = 'htmlobject_tabs';
-		$tab->add($content);
-		return $tab;
-	}
-
-	//--------------------------------------------
-	/**
-	 * API
-	 *
-	 * @access public
-	 */
-	//--------------------------------------------
-	function api() {
-		require_once($this->rootdir.'/server/documentation/class/documentation.api.class.php');
-		$controller = new documentation_api($this);
-		$controller->action();
-	}
-
-	
-	//--------------------------------------------
-	/**
-	 * Documentation Main
-	 *
-	 * @access public
-	 * @param bool $hidden
-	 * @return array
-	 */
-	//--------------------------------------------
-	function main( $hidden = true ) {
-		$data = '';
-		if( $hidden === true ) {
-			require_once($this->rootdir.'/server/zz_documentation/class/documentation.main.class.php');
-			$controller = new documentation_main($this->openqrm, $this->response);
-			$controller->actions_name    = $this->actions_name;
-			$controller->tpldir          = $this->tpldir;
-			$controller->message_param   = $this->message_param;
-			$controller->identifier_name = $this->identifier_name;
-			$controller->lang            = $this->lang['main'];
-			$data = $controller->action();
-		}
-		$content['label']   = $this->lang['main']['tab'];
-		$content['value']   = $data;
-		$content['target']  = $this->response->html->thisfile;
-		$content['request'] = $this->response->get_array($this->actions_name, 'main' );
-		$content['onclick'] = false;
-		if($this->action === 'main'){
-			$content['active']  = true;
-		}
-		return $content;
-	}
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/class/documentation.main.class.php b/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/class/documentation.main.class.php
deleted file mode 100644
index 8629f3e..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/class/documentation.main.class.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Documentation Main
- *
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
- */
-
-class documentation_main
-{
-/**
-* name of action buttons
-* @access public
-* @var string
-*/
-var $actions_name = 'documentation_action';
-/**
-* message param
-* @access public
-* @var string
-*/
-var $message_param = "documentation_msg";
-
-/**
-* id for tabs
-* @access public
-* @var string
-*/
-var $prefix_tab = 'documentation_tab';
-/**
-* path to templates
-* @access public
-* @var string
-*/
-var $tpldir;
-/**
-* translation
-* @access public
-* @var array
-*/
-var $lang = array();
-
-	//--------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param openqrm $openqrm
-	 * @param htmlobject_response $response
-	 */
-	//--------------------------------------------
-	function __construct($openqrm, $response) {
-		$this->response   = $response;
-		$this->file       = $openqrm->file();
-		$this->openqrm    = $openqrm;
-	}
-
-	//--------------------------------------------
-	/**
-	 * Action
-	 *
-	 * @access public
-	 * @return htmlobject_template
-	 */
-	//--------------------------------------------
-	function action() {
-		$t = $this->response->html->template($this->tpldir.'/documentation-main.tpl.php');
-		$t->add($this->lang['title'], 'title');
-		$t->add($this->lang['technical'], 'technical');
-		$t->add($this->lang['technical_description'], 'technical_description');
-		$t->add($this->lang['technical_url'], 'technical_url');
-		$t->add($this->lang['howtos'], 'howtos');
-		$t->add($this->lang['howto1_title'], 'howto1_title');
-		$t->add($this->lang['howto1_url'], 'howto1_url');
-		$t->add($this->lang['howto2_title'], 'howto2_title');
-		$t->add($this->lang['howto2_url'], 'howto2_url');
-		$t->add($this->lang['howto3_title'], 'howto3_title');
-		$t->add($this->lang['howto3_url'], 'howto3_url');
-		$t->add($this->lang['api'], 'api');
-		$t->add($this->lang['api_description'], 'api_description');
-		$t->add($this->lang['api_url'], 'api_url');
-		$t->add($this->openqrm->get('baseurl'), 'baseurl');
-		$t->add($this->lang['please_wait'], 'please_wait');
-		$t->add($this->prefix_tab, 'prefix_tab');
-		$t->group_elements(array('param_' => 'form'));
-		return $t;
-	}
-
-
-}
diff --git a/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/css/documentation.css b/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/css/documentation.css
deleted file mode 100644
index 48f4376..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/css/documentation.css
+++ /dev/null
@@ -1,8 +0,0 @@
-fieldset {
-	border: 1px solid #91A7B4;
-	padding: 5px 10px;
-}
-fieldset legend {
-	padding: 5px;
-	font-weight: bold;
-}
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/lang/de.documentation.ini b/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/lang/de.documentation.ini
deleted file mode 100644
index 9e14894..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/lang/de.documentation.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[main]
-tab = "Dokumentation"
-label = "Dokumentation"
-title = "openQRM Dokumentation"
-technical = "Technische Dokumentation"
-technical_description = "Die technische Dokumentation von openQRM ist erhältlich unter:"
-technical_url = "http://www.openqrm-enterprise.com/news/article/article/the-administrator-guide-for-openqrm-5.html"
-howtos = "openQRM Howtos & Use Cases"
-howto1_title = "Konfiguration einer openQRM Cloud mit KVM auf Ubuntu"
-howto1_url = "http://www.openqrm-enterprise.com/news/article/article/howto-setup-your-own-openqrm-cloud-with-kvm-on-ubuntu-lucid-lynx.html"
-howto2_title = "Integration von Ubuntu Enterprise Cloud, Amazon EC2 and Eucalyptus in openQRM"
-howto2_url = "http://www.openqrm-enterprise.com/news/article/article/integrate-ubuntu-enterprise-cloud-amazon-ec2-and-eucalyptus-with-openqrm.html"
-howto3_title = "openQRM Cloud Deployment für physikalische Windows Server auf CentOS"
-howto3_url = "http://www.openqrm-enterprise.com/news/article/article/howto-setup-openqrm-cloud-deploying-physical-windows-systems-on-centos-55.html"
-api = "openQRM Cloud SOAP API Dokumentation"
-api_description = "Die API (Programmierschnittstellen) von openQRM ist erhältlich unter:"
-api_url = "http://support.openqrm-enterprise.com/documentation/openQRM-SOAP-API/"
-please_wait = "Lade Dokumentation. Bitte warten .."
-
diff --git a/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/lang/en.documentation.ini b/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/lang/en.documentation.ini
deleted file mode 100644
index 9904754..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/lang/en.documentation.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[main]
-tab = "Documentation"
-label = "Documentation"
-title = "openQRM Documentation"
-technical = "Technical Documentation"
-technical_description = "Please find the Technical Documentation of openQRM at:"
-technical_url = "http://www.openqrm-enterprise.com/news/article/article/in-depth-documentation-of-openqrm-available.html"
-howtos = "openQRM Howtos & Use Cases"
-howto1_title = "Setup your own openQRM Cloud with KVM on Ubuntu"
-howto1_url = "http://www.openqrm-enterprise.com/news/article/article/howto-setup-your-own-openqrm-cloud-with-kvm-on-ubuntu-lucid-lynx.html"
-howto2_title = "Integrate Ubuntu Enterprise Cloud, Amazon EC2 and Eucalyptus with openQRM"
-howto2_url = "http://www.openqrm-enterprise.com/news/article/article/integrate-ubuntu-enterprise-cloud-amazon-ec2-and-eucalyptus-with-openqrm.html"
-howto3_title = "Setup openQRM Cloud deploying physical Windows Systems on CentOS"
-howto3_url = "http://www.openqrm-enterprise.com/news/article/article/howto-setup-openqrm-cloud-deploying-physical-windows-systems-on-centos-55.html"
-api = "openQRM Cloud SOAP API Documentation"
-api_description = "Please find the API of openQRM at:"
-api_url = "http://support.openqrm-enterprise.com/documentation/openQRM-SOAP-API/"
-please_wait = "Loading. Please wait .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/lang/es.documentation.ini b/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/lang/es.documentation.ini
deleted file mode 100644
index 535d4a1..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/lang/es.documentation.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[main]
-tab = "Documentación"
-label = "Documentación"
-title = "Documentación de openQRM"
-technical = "Documentación Técnica"
-technical_description = "Revise la documentación Técnica de openQRM en:"
-technical_url = "http://www.openqrm-enterprise.com/news/article/article/in-depth-documentation-of-openqrm-available.html"
-howtos = "Cómo usar openQRM 'how-to'"
-howto1_title = "Instala tu propio Cloud openQRM con KVM usando Ubuntu"
-howto1_url = "http://www.openqrm-enterprise.com/news/article/article/howto-setup-your-own-openqrm-cloud-with-kvm-on-ubuntu-lucid-lynx.html"
-howto2_title = "Integración de Ubuntu Enterprise Cloud, Amazon EC2 and Eucalyptus con openQRM"
-howto2_url = "http://www.openqrm-enterprise.com/news/article/article/integrate-ubuntu-enterprise-cloud-amazon-ec2-and-eucalyptus-with-openqrm.html"
-howto3_title = "Integrar Sistemas Windows físicos en CentOS con openQRM Cloud"
-howto3_url = "http://www.openqrm-enterprise.com/news/article/article/howto-setup-openqrm-cloud-deploying-physical-windows-systems-on-centos-55.html"
-api = "Documentación sobre openQRM Cloud SOAP API"
-api_description = "Por favor busque las API de openQRM en:"
-api_url = "http://support.openqrm-enterprise.com/documentation/openQRM-SOAP-API/"
-please_wait = "Cargando. Por favor espere .."
diff --git a/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/tpl/documentation-main.tpl.php b/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/tpl/documentation-main.tpl.php
deleted file mode 100644
index 40df448..0000000
--- a/openQRM-5.3.50-CE/src/web/base/server/zz_documentation/tpl/documentation-main.tpl.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{title}</h2>
-
-<div class="row">
-	<div class="span7">
-		<h3>{technical}</h3>
-		<p>
-			{technical_description}
-			<a href="{technical_url}" target="_blank">{technical_url}</a>
-		</p>
-		
-		<h3>{howtos}</h3>
-		<p>
-			<ul>
-				<li>{howto1_title}<br>
-					<a href="{howto1_url}" target="_blank">{howto1_url}</a>
-				</li>
-				<li>
-					{howto2_title}<br>
-					<a href="{howto2_url}" target="_blank">{howto2_url}</a>
-				</li>
-				<li>
-					{howto3_title}<br>
-					<a href="{howto3_url}" target="_blank">{howto3_url}</a>
-				</li>
-			</ul>
-		</p>
-		
-		<h3>{api}</h3>
-		<p>
-			{api_description}
-			<a href="{api_url}" target="_blank">{api_url}</a>
-		</p>
-	</div>
-</div>
-
diff --git a/openQRM-5.3.50-CE/src/web/base/tpl/configure1.tpl.php b/openQRM-5.3.50-CE/src/web/base/tpl/configure1.tpl.php
deleted file mode 100644
index 15e481f..0000000
--- a/openQRM-5.3.50-CE/src/web/base/tpl/configure1.tpl.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-/*
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2013, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2013, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-
-<div class="row">
-
-	<div id="form" class="span4">
-		<form action="{thisfile}" method="GET">
-		{form}
-			<div id="buttons">{submit}</div>
-		</form>
-	</div>
-
-	<div class="span3">
-	{howto}
-	</div>
-
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/tpl/configure2.tpl.php b/openQRM-5.3.50-CE/src/web/base/tpl/configure2.tpl.php
deleted file mode 100644
index fd0a65b..0000000
--- a/openQRM-5.3.50-CE/src/web/base/tpl/configure2.tpl.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-/*
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-
-<div class="row">
-
-	<div id="form" class="span4">
-		<form action="{thisfile}" method="GET">
-			{form}
-			<div id="buttons">{submit}&#160;{cancel}</div>
-		</form>
-	</div>
-
-	<div class="span3">
-	{howto}
-	</div>
-
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/tpl/configure3.tpl.php b/openQRM-5.3.50-CE/src/web/base/tpl/configure3.tpl.php
deleted file mode 100644
index ab4c1c9..0000000
--- a/openQRM-5.3.50-CE/src/web/base/tpl/configure3.tpl.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-/*
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2013, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2013, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{label}</h2>
-
-<div class="row">
-
-	<div id="form" class="span5">
-		<form action="{thisfile}" method="GET">
-		{form}
-		<div id="buttons">{submit}&#160;{cancel}</div>
-		</form>
-	</div>
-
-	<div class="span2">
-	{howto}
-	</div>
-
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/tpl/index.tpl.php b/openQRM-5.3.50-CE/src/web/base/tpl/index.tpl.php
deleted file mode 100644
index 2b8505c..0000000
--- a/openQRM-5.3.50-CE/src/web/base/tpl/index.tpl.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>openQRM Enterprise Server</title>
-	<meta http-equiv="content-type" content="text/html; charset=utf-8">
-
-	<link rel="icon" href="{baseurl}/img/favicon.ico" type="image/x-icon">
-	<link rel="shortcut icon" href="{baseurl}/img/favicon.ico" type="image/x-icon">
-	<link rel="stylesheet" href="{baseurl}/css/bootstrap/normalize.css" type="text/css" media="all">
-	<link rel="stylesheet" href="{baseurl}/css/bootstrap/bootstrap.css" type="text/css" media="all">
-	<link rel="stylesheet" href="{baseurl}/css/bootstrap/glyphicons.css" type="text/css" media="all">
-	<link rel="stylesheet" href="{baseurl}/css/bootstrap/halflings.css" type="text/css" media="all">
-
-	<link rel="stylesheet" href="{baseurl}/css/htmlobject.css" type="text/css" media="all">
-	<link rel="stylesheet" href="{baseurl}/css/default.css" type="text/css" media="all">
-	
-	<link rel="stylesheet" href="{baseurl}/css/menu.css" type="text/css" media="all">
-	<!-- following stylesheet is used by progressbars in DC dashboard -->
-	<link rel="stylesheet" href="{baseurl}/js/jquery/development-bundle/themes/smoothness/ui.all.css" type="text/css" media="all">
-	<link rel="stylesheet" href="{baseurl}/css/openqrm-ui.css" type="text/css" media="all">
-	{style}
-
-	{jstranslation}
-	
-	<script src="{baseurl}/js/jquery/js/jquery-1.3.2.min.js" type="text/javascript"></script>
-	<script src="{baseurl}/js/jquery/js/jquery-ui-1.7.1.custom.min.js" type="text/javascript"></script>
-	<script src="{baseurl}/js/interface/interface.js" type="text/javascript"></script>
-	<script src="{baseurl}/js/menu.js" type="text/javascript"></script>
-	<script src="{baseurl}/js/helpers.js" type="text/javascript"></script>
-	{script}
-
-</head>
-<body lang="{lang}">
-
-	<div id="page">
-		<div id="wrapper">
-			<div id="head">{top}</div>
-		
-			<div class="container">
-				<div class="row">
-					<div class="span2 menu">{menu}</div>
-					<div class="span10 middle">{content}</div>
-				</div>
-			</div>
-		
-			<div id="footer">
-				<div id="performance-stats" class="pull-left">
-					<small>{memory}<br>{time}</small>
-				</div>
-				<div id="openqrm_enterprise_footer" class="pull-right">
-					<a href="http://www.openqrm-enterprise.com/" target="_blank">openQRM Community Edition | &copy; 2012 - {currentyear} OPENQRM AUSTRALIA PTY LTD</a>
-				</div>
-			</div>
-		</div>
-	</div>
-	
-	<script src="{baseurl}/js/openqrm-ui.js" type="text/javascript"></script>
-</body>
-</html>
diff --git a/openQRM-5.3.50-CE/src/web/base/tpl/index_content.tpl.php b/openQRM-5.3.50-CE/src/web/base/tpl/index_content.tpl.php
deleted file mode 100644
index b99317c..0000000
--- a/openQRM-5.3.50-CE/src/web/base/tpl/index_content.tpl.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="{contentclass}">
-	{content}
-</div>
\ No newline at end of file
diff --git a/openQRM-5.3.50-CE/src/web/base/tpl/index_menu.tpl.php b/openQRM-5.3.50-CE/src/web/base/tpl/index_menu.tpl.php
deleted file mode 100644
index 3582159..0000000
--- a/openQRM-5.3.50-CE/src/web/base/tpl/index_menu.tpl.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<div id="menuSection_1"  class="menuSection first">
-	{menu_1}
-</div>
-
-<div class="menuSection" id="menuSection_queue" style="margin-bottom:20px;">
-
-	<div class="treemenudiv" id="menuSection_queue_1">
-		<img class="imgs" alt="|-" src="/openqrm/base/img/menu/tree_split.png">
-		<a class="phplmnormal" style="padding-left: 4px;" >Activities</a>
-	</div>
-
-	<div style="margin: 12px 0 0 30px;">
-		<div style="float:left;padding:0 0 3px 0;">
-			<span class="phplm">Events</span>
-		</div>
-		<div id="Event_messages">
-			<a id="Event_box" href="index.php?base=event&amp;event_filter=error" style="visibility:hidden;" title="Error Events"><span class="pill error" id="events_critical">0</span></a>
-			<a id="Event_active_box" href="index.php?base=event&amp;event_filter=active" style="visibility:hidden;" title="Active Events"><span class="pill orange" id="events_active">0</span></a>
-		</div>
-		<div class="floatbreaker">&#160;</div>
-	</div>
-
-	<div style="margin: 4px 0 12px 30px;">
-		<div style="float:left;padding:0 0 3px 0;">
-			<span class="phplm">Commands</span>
-		</div>
-		<div id="Queue_messages">
-			<a title="Running Commands" style="visibility:hidden;cursor:pointer;" onclick="show_queue_commands();"><span class="pill active" id="queue_running">1</span></a>
-			<a title="Queued Commands" style="visibility:hidden;"><span class="pill idle" id="queue_waiting" style="cursor:default;">&#160;</span></a>
-		</div>
-		<div class="floatbreaker">&#160;</div>
-	</div>
-
-</div>
-
-<div id="queue_command" style="display:none;position:absolute;top:15;left:15px;z-index:10; width:330px;" class="function-box">
-	<div class="functionbox-capation-box" 
-			id="caption"
-			onclick="MousePosition.init();"
-			onmousedown="Drag.init(document.getElementById('queue_command'));"
-			onmouseup="document.getElementById('queue_command').onmousedown = null;">
-		<div class="functionbox-capation" style="text-align:right;padding:3px;">
-			<input type="button" id ="close" class="functionbox-closebutton" value="X" onclick="show_queue_commands();">
-		</div>
-	</div>
-	<div id="queue_command_box"
-		style="
-			width:300px;
-			background-color: #FFFFE0;
-			padding: 14px;
-			text-align:left;
-			border-left: solid 1px #aaaaaa;
-			border-right: solid 1px #aaaaaa;
-			border-bottom: solid 1px #aaaaaa;"
-		></div>
-	<div id="queue_command_history" 
-		style="
-			display:none;
-			width:300px;
-			background-color: #FFFFE0;
-			padding: 14px;
-			text-align:left;
-			border-left: solid 1px #aaaaaa;
-			border-right: solid 1px #aaaaaa;
-			border-bottom: solid 1px #aaaaaa;
-			height:100px;
-			overflow-y:auto;"
-		></div>
-</div>
-
-
-<div id="menuSection_2" class="menuSection first">
-{menu_2}
-</div>
-
-<script type="text/javascript">
-
-function get_queue_status() {
-	$.ajax({
-		url: "api.php?action=get_queue_status",
-		cache: false,
-		async: false,
-		dataType: "text",
-		success: function(response) {
-			if(response != '') {
-				var status = response.split(";;");
-				var queue_waiting = parseInt(status[0]);
-				var queue_running = parseInt(status[1]);
-				var queue_command = status[2];
-				$("#queue_waiting").html(queue_waiting);
-				if(queue_waiting > 0) {
-					$("#queue_waiting").html(queue_waiting);
-					document.getElementById('queue_waiting').style.visibility = 'visible';
-				} else {
-					document.getElementById('queue_waiting').style.visibility = 'hidden';
-				}
-				if(queue_running > 0) {
-
-					$("#queue_running").html(queue_running);
-					if($("#queue_command_box").html() != '') {
-						tmp1 = $("#queue_command_box").html().split('<br>');
-						tmp2 = queue_command.split('<br>');
-						if(tmp1[1] != tmp2[1]) {
-							if($("#queue_command_history").html() == '') {
-								document.getElementById('queue_command_history').style.display = 'block';
-								$("#queue_command_history").html($("#queue_command_box").html());
-							} else {
-								$("#queue_command_history").html($("#queue_command_box").html() + '<hr>' + $("#queue_command_history").html());
-							}
-						}
-					}
-
-					$("#queue_command_box").html(queue_command);
-					document.getElementById('queue_running').style.visibility = 'visible';
-				} else {
-					document.getElementById('queue_running').style.visibility = 'hidden';
-				}
-			}
-		}
-	});
-	setTimeout("get_queue_status()", 2000);
-}
-
-function show_queue_commands() {
-	elem = document.getElementById('queue_command');
-	mode = elem.style.display;
-	if(mode == 'block') {
-		elem.style.display = 'none';
-		$("#queue_command_history").html('');
-		$("#queue_command_history").style.display = 'none';
-	} else {
-		mouse = MousePosition.get();
-		elem.style.left = (mouse.x + -210)+'px';
-		elem.style.top  = (mouse.y - 270)+'px';
-		elem.style.display = 'block';
-	}
-}
-
-function get_event_status() {
-	$.ajax({
-		url: "api.php?action=get_event_status",
-		cache: false,
-		async: true,
-		dataType: "text",
-		success: function(response) {
-			if(response != '') {
-				var status_array = response.split("@");
-				var event_error = parseInt(status_array[6]);
-				var event_active = parseInt(status_array[7]);
-				$("#events_critical").html(event_error);
-				if(event_error > 0) {
-					document.getElementById('Event_box').style.visibility = 'visible';
-				} else {
-					document.getElementById('Event_box').style.visibility = 'hidden';
-				}
-
-				if(event_active > 0) {
-					$("#events_active").html(event_active);
-					document.getElementById('Event_active_box').style.visibility = 'visible';
-				} else {
-					document.getElementById('Event_active_box').style.visibility = 'hidden';
-				}
-			}
-		}
-	});
-	setTimeout("get_event_status()", 5000);
-}
-
-MousePosition.init();
-get_event_status();
-get_queue_status();
-</script>
diff --git a/openQRM-5.3.50-CE/src/web/base/tpl/index_top.tpl.php b/openQRM-5.3.50-CE/src/web/base/tpl/index_top.tpl.php
deleted file mode 100644
index 641e6fe..0000000
--- a/openQRM-5.3.50-CE/src/web/base/tpl/index_top.tpl.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<div class="logo">
-	<a href="{thisfile}"><img src="img/logo.png" alt="openQRM logo" width="110"></a>
-	<div class="openqrmVersion"></div>
-</div>
-
-
-<div class="top">
-	<form>
-		<input id="username" type="hidden" value="{username}">
-		<input id="userlang" type="hidden" value="{userlang}">
-		{language_select}
-		<a id="Login_box" href="index.php?base=user" onclick="wait();">{account}</a>
-		<a id="Support_box" href="https://openqrm-enterprise.com?s=oqbe" target="_blank">{support}</a>
-		<a id="Docu_box" href="https://wiki.openqrm-enterprise.com/view/Main_Page?s=oqbe" target="_blank">{documentation}</a>
-		<a id="Info_box" href="javascript:openPopup()">{info}</a>
-		<div class="floatbreaker">&#160;</div>
-	</form>
-</div>
-<div class="floatbreaker">&#160;</div>
-
-<div id="popupInfo">
-	<a id="popupInfoClose">x</a>
-	<h1><img src="img/logo.png" alt="openQRM logo"> openQRM Enterprise {version}</h1>
-		<p id="infoArea"></p>
-</div>
-<div id="backgroundPopup"></div>
-
-
-<div style="position: absolute;left: 310px;top: 15px;">
-<script type='text/javascript' src='//storage.ko-fi.com/cdn/widget/Widget_2.js'></script><script type='text/javascript'>kofiwidget2.init('Buy us a Coffee', '#9e9e9e', 'A08116CR');kofiwidget2.draw();</script>
-</div>
-
-
-<script type="text/javascript">
-$(document).ready(function(){
-	$("#popupInfoClose").click(function(){
-		disablePopup();
-	});
-	$("#backgroundPopup").click(function(){
-		disablePopup();
-	});
-});
-
-function set_language() {
-	var username = $("#username").val();
-	var selected_lang = $("#Language_select").val();
-
-	$.ajax({
-		url: "api.php?action=set_language&user=" + username + "&lang=" + selected_lang,
-		cache: false,
-		async: false,
-		dataType: "text",
-		success: function(response) {
-			window.location.reload();
-		}
-	});
-
-}
-
-var popupStatus = 0;
-function loadPopup(){
-	if(popupStatus==0){
-		$("#backgroundPopup").css({ "opacity": "0.3" });
-		$("#backgroundPopup").fadeIn();
-		$("#popupInfo").fadeIn();
-		popupStatus = 1;
-	}
-}
-
-function disablePopup(){
-	if(popupStatus==1){
-		$("#backgroundPopup").fadeOut();
-		$("#popupInfo").fadeOut();
-		popupStatus = 0;
-	}
-}
-
-function centerPopup(){
-	var windowWidth = document.documentElement.clientWidth;
-	var windowHeight = document.documentElement.clientHeight;
-	var popupHeight = $("#popupInfo").height();
-	var popupWidth = $("#popupInfo").width();
-	$("#popupInfo").css({
-		"position": "absolute",
-		"top": "120px",
-		"left": "400px" 
-	});
-	$("#backgroundPopup").css({
-		"height": windowHeight
-	});
-}
-
-
-function openPopup() {
-	centerPopup();
-	loadPopup();
-	get_info_box();
-}
-
-function get_info_box() {
-	$.ajax({
-		url: "api.php?action=get_info_box",
-		cache: false,
-		async: false,
-		dataType: "text",
-		success: function(response) {
-			$("#infoArea").html(response);
-		}
-	});
-}
-</script>
diff --git a/openQRM-5.3.50-CE/src/web/base/tpl/permission_denied.tpl.php b/openQRM-5.3.50-CE/src/web/base/tpl/permission_denied.tpl.php
deleted file mode 100644
index f2d222b..0000000
--- a/openQRM-5.3.50-CE/src/web/base/tpl/permission_denied.tpl.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<div style="margin: 50px  0 0 50px;">
-	<strong style="font-size: 14px;">Permission denied!</strong>
-	<div style="margin: 5px 0 0 0;">
-		You dont have permissions for action <i>{action}</i> on controller <i>{controller}</i>.<br>
-	</div>
-</div>
diff --git a/openQRM-5.3.50-CE/src/web/base/tpl/plugin_not_found.tpl.php b/openQRM-5.3.50-CE/src/web/base/tpl/plugin_not_found.tpl.php
deleted file mode 100644
index 9e4f3f0..0000000
--- a/openQRM-5.3.50-CE/src/web/base/tpl/plugin_not_found.tpl.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div style="margin: 50px  0 0 50px;">
-	<strong style="font-size: 14px;">Error:</strong> Plugin or controller <i>{plugin}</i> not found.<br>
-</div> 
diff --git a/openQRM-5.3.50-CE/src/web/base/tpl/upload.tpl.php b/openQRM-5.3.50-CE/src/web/base/tpl/upload.tpl.php
deleted file mode 100644
index f2976c7..0000000
--- a/openQRM-5.3.50-CE/src/web/base/tpl/upload.tpl.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-/*
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2013, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2013, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
-<h2>{welcome}</h2>
-<div class="row">
-	<div class="span7">
-
-		<p>{explanation}</p>
-		
-		<h3>{label}</h3>
-
-		<form action="{thisfile}" enctype="multipart/form-data" method="POST">
-			{form}
-			{upload_1}<br>
-			{upload_2}<br>
-			{upload_3}
-			<br><br>
-			{submit}
-		</form>
-
-	</div>
-	<div class="span2 offset1">
-	
-	</div>
-</div>
-
diff --git a/openQRM-5.3.50-CE/src/web/base/upload.php b/openQRM-5.3.50-CE/src/web/base/upload.php
deleted file mode 100644
index bcead27..0000000
--- a/openQRM-5.3.50-CE/src/web/base/upload.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
-// check if configured already
-if (file_exists("./unconfigured")) {
-    header("Location: configure.php");
-}
-$RootDir = $_SERVER["DOCUMENT_ROOT"].'/openqrm/base/';
-require_once($RootDir.'class/htmlobjects/htmlobject.class.php');
-require_once($RootDir.'class/openqrm.class.php');
-require_once($RootDir.'class/resource.class.php');
-global $OPENQRM_SERVER_BASE_DIR;
-global $OPENQRM_EXECUTION_LAYER;
-global $OPENQRM_WEB_PROTOCOL;
-
-
-$lang = array(
-	'label' => 'License upload',
-	'upload' => 'Please select the openQRM Enterprise Server License File and Public Key from your local computer and submit',
-	'msg' => 'Uploaded License file %s',
-);
-
-
-$html = new htmlobject($RootDir.'class/htmlobjects/');
-
-$response = $html->response();
-$form = $response->get_form();
-$form->box_css = 'htmlobject_box';
-$form->display_errors = true;
-
-$d['upload']['label'] = $lang['upload'];
-$d['upload']['object']['type']           = 'input';
-$d['upload']['object']['attrib']['type'] = 'file';
-$d['upload']['object']['attrib']['name'] = 'upload';
-$d['upload']['object']['attrib']['size'] = 30;
-
-$form->add($html->thisfile, 'thisfile');
-$form->add($d);
-
-if(!$form->get_errors() && $response->submit()) {
-	require_once($RootDir.'class/file.handler.class.php');
-	require_once($RootDir.'class/file.upload.class.php');
-	$file = new file_handler();
-	$upload = new file_upload($file);
-	$error = $upload->upload('upload', $RootDir.'tmp');
-	if($error !== '') {
-		$form->set_error('upload', $error['msg']);
-	} else {
-		$resource_command = $OPENQRM_SERVER_BASE_DIR."/openqrm/bin/openqrm license -l ".$OPENQRM_SERVER_BASE_DIR."/openqrm/web/base/tmp/".$_FILES['upload']['name']." --openqrm-cmd-mode background";
-		$resource = new resource();
-		$resource->get_instance_by_id(0);
-		$resource->send_command($resource->ip, $resource_command);
-		$response_msg = sprintf($lang['msg'], $_FILES['upload']['name']);
-		sleep(4);
-		$response->redirect('/openqrm/base/index.php?datacenter_msg='.$response_msg);
-	}
-}
-$tpl = $html->template($RootDir.'tpl/upload.tpl.php');
-$tpl->add($html->thisurl, 'baseurl');
-$tpl->add($lang['label'], 'label');
-$tpl->add($form->get_elements());
-echo $tpl->get_string();
diff --git a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/bin/openqrm-cmd b/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/bin/openqrm-cmd
deleted file mode 100644
index 4eda647..0000000
--- a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/bin/openqrm-cmd
+++ /dev/null
@@ -1,219 +0,0 @@
-#!/bin/bash
-# this is the openQRM commandline client
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../..
-	OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-fi
-export OPENQRM_SERVER_BASE_DIR
-# check if running on the server or on a managed resource
-if [ -f "$OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions" ]; then
-	# we are running on the server
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-	openqrm_server_get_config
-	OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-	resource_id=0
-	resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-else
-	# we are running on a managed resource
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-fi
-WHOAMI=`whoami`
-FULL_COMMAND=`echo $@ | sed -e 's/-u [^ ]* /-u xxxxxxxx /g' -e 's/-p [^ ]*/-p xxxxxxxx /g'`
-export LANGUAGE=C
-export LANG=C
-export LC_ALL=C
-
-function stop_openqrm_monitord() {
-	killall openqrm-monitord 1>/dev/null 2>&1
-	# in case we do not have killall (e.g. on debian-minimal install) be sure to stop the openqrm-agents anyway
-	for OPENQRM_PID in `ps ax 2>/dev/null | grep openqrm-monitord | grep -v grep | awk {' print $1 '}`; do
-		kill $OPENQRM_PID
-	done
-}
-
-
-
-# check which command queue to use
-# ui-queue : all commands running on behalf of a ui user
-# bg-queue : all commands initiated from the plugins or the base engine
-
-UI_CMD_QUEUE="ui-cmd-queue"
-BG_CMD_QUEUE="bg-cmd-queue"
-CMD_QUEUE=$BG_CMD_QUEUE
-if echo $@ | grep "\-\-openqrm\-ui\-user" 1>/dev/null; then
-	CMD_QUEUE=$UI_CMD_QUEUE
-fi
-
-# check the command mode to use
-# raw
-#    - shell command executed by the receiver in foreground
-#    - receiver queue waits until command finished
-#    - output is set to stdout
-#    - good for commands with a short execution time
-#
-# regular (or not set)
-#    - shell command executed by the receiver in foreground
-#    - receiver queue waits until command finished
-#    - good for commands with a short execution time
-#
-# background
-#    - shell command executed by the receiver in background (with &)
-#    - receiver queue does not wait until command finished
-#    - good for commands with a medium to long to execution time (and using screen themselves)
-#
-# fork
-#    - shell command executed by the receiver in background (with a detached screen)
-#    - receiver queue does not wait until command finished
-#    - good for commands with a medium to long to execution time (and not using screen themselves)
-
-CMD_EXEC_MODE_DEFAULT="regular"
-if echo $@ | grep "\-\-openqrm\-cmd\-mode" 1>/dev/null; then
-	CMD_MODE=`echo $@ | sed -e "s#.*--openqrm-cmd-mode##g" | awk '{ print $1 }' 2>/dev/null`
-	if [ "$CMD_MODE" == "" ]; then
-		CMD_MODE=$CMD_EXEC_MODE_DEFAULT
-	fi
-else
-	CMD_MODE=$CMD_EXEC_MODE_DEFAULT
-fi
-
-# aquire lock for the global receiver command bg queue
-LOCK_TIME=`openqrm_lock_queue aquire $CMD_QUEUE`
-trap "openqrm_lock_queue release $CMD_QUEUE $LOCK_TIME" EXIT
-# aquire global command-starting-lock, scripts have 10 sec. to
-# eventually fork and aquire a lock on their subsection
-lockfile -s 1 -r 1 -l 10 $OPENQRM_CMD_QUEUE_STARTING_LOCK.$CMD_QUEUE
-echo "$FULL_COMMAND" > $OPENQRM_CMD_QUEUE_STARTING_LOCK.$CMD_QUEUE
-echo "openQRM engine: Running exec mode $CMD_MODE: $FULL_COMMAND" | logger
-
-################################################################################
-# special handling for reboot + halt
-################################################################################
-case "$@" in
-	reboot)
-		rm -f $OPENQRM_CMD_QUEUE_STARTING_LOCK.$CMD_QUEUE
-		openqrm_lock_queue release $CMD_QUEUE $LOCK_TIME
-		trap '' EXIT
-		stop_openqrm_monitord
-		sleep 2 && /sbin/reboot &
-		exit 0
-		;;
-	halt)
-		rm -f $OPENQRM_CMD_QUEUE_STARTING_LOCK.$CMD_QUEUE
-		openqrm_lock_queue release $CMD_QUEUE $LOCK_TIME
-		trap '' EXIT
-		stop_openqrm_monitord
-		sleep 2 && /sbin/poweroff &
-		exit 0
-		;;
-esac
-
-
-################################################################################
-# run openqrm functions in foreground
-################################################################################
-if [ ! -x "$1" ]; then
-	CMD_OUTPUT=$($@ 2>&1)
-	CMD_RESULT=$?
-	sleep 0.5
-	# if we ran a function remove the starting lock now
-	rm -f $OPENQRM_CMD_QUEUE_STARTING_LOCK.$CMD_QUEUE
-
-else
-
-	################################################################################
-	# run commands according their exec-mode
-	################################################################################
-
-	case "$CMD_MODE" in
-		# regular mode
-		raw)
-			$@
-			CMD_RESULT=$?
-			sleep 0.5
-			;;
-
-		# regular mode
-		regular)
-			CMD_OUTPUT=$($@ 2>&1)
-			CMD_RESULT=$?
-			sleep 0.5
-			;;
-
-		# background mode
-		background)
-			$@ 1>/dev/null 2>/dev/null  &
-			CMD_OUTPUT=""
-			CMD_RESULT=0
-			sleep 0.5
-			;;
-
-		# fork mode
-		fork)
-			if [ -x /usr/bin/screen.real ]; then
-				RUNSCREEN="/usr/bin/screen.real"
-			else
-				RUNSCREEN=`which screen`
-			fi
-			SCREEN_NAME=`date +%s%N`
-			$RUNSCREEN -dmS $SCREEN_NAME "$@"
-			CMD_OUTPUT=""
-			CMD_RESULT=0
-			sleep 0.5
-			;;
-	esac
-
-fi
-
-################################################################################
-# releaselock for the global receiver command bg queue
-openqrm_lock_queue release $CMD_QUEUE $LOCK_TIME
-trap '' EXIT
-
-
-# error reporting
-if [ "$CMD_RESULT" != "0" ]; then
-	if [ ! -d /var/log/openqrm ]; then
-		mkdir -p /var/log/openqrm
-	fi
-	FORMAT_COMMAND=`echo $FULL_COMMAND | cut -b1-100`".."
-	FORMAT_COMMAND_OUTPUT=`openqrm_format_error_msg $CMD_OUTPUT`
-	rm -f /var/log/openqrm/$$.log
-	echo "ERROR: openqrm-cmd failed with $CMD_OUTPUT while running: $FULL_COMMAND" | logger
-	openqrm_post_event 0 "base-engine" 2 "openqrm-cmd" "ERROR $FORMAT_COMMAND_OUTPUT on resource $resource_id running: $FORMAT_COMMAND"
-	exit 1
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/bin/openqrm-rabbitmq-cmd-queue-ctl b/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/bin/openqrm-rabbitmq-cmd-queue-ctl
deleted file mode 100644
index a087652..0000000
--- a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/bin/openqrm-rabbitmq-cmd-queue-ctl
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/bash
-# this script automatically manages the lvm volumes for the kvm virtual machines
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../..
-OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-	eval appliance_capabilities
-	export RABBITMQ_SERVER="$resource_openqrmserver"
-	export RABBITMQ_PASSWORD="$RABBITMQ_PASSWORD"
-	export RABBITMQ_QUEUE_NAME="$resource_ip"
-	export OPENQRM_EXECUTION_LAYER=$openqrm_execution_layer
-elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-	. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-	openqrm_server_get_config
-	export RABBITMQ_SERVER="$OPENQRM_SERVER_IP_ADDRESS"
-	export RABBITMQ_PASSWORD="$OPENQRM_RABBITMQ_PASSWORD"
-	export RABBITMQ_QUEUE_NAME="$OPENQRM_SERVER_IP_ADDRESS"
-fi
-export LANG=C
-
-if [ -x /usr/bin/screen.real ]; then
-	RUNSCREEN="/usr/bin/screen.real"
-else
-	RUNSCREEN=`which screen`
-fi
-if [ "$RUNSCREEN" == "" ]; then
-	echo "ERROR: screen utility not installed! Please install screen"
-	exit 1
-fi
-if [ "$OPENQRM_EXECUTION_LAYER" != "rabbitmq" ]; then
-	echo "ERROR: Only useful for RabbitMQ command layer!"
-	exit 1
-fi
-if [ "$RABBITMQ_PASSWORD" == "" ]; then
-	echo "ERROR: RABBITMQ_PASSWORD not set!"
-	exit 1
-fi
-if [ "$RABBITMQ_SERVER" == "" ]; then
-	echo "ERROR: RABBITMQ_SERVER not set!"
-	exit 1
-fi
-if [ "$RABBITMQ_QUEUE_NAME" == "" ]; then
-	echo "ERROR: RABBITMQ_QUEUE_NAME not set!"
-	exit 1
-fi
-
-function openqrm_rabbitmq_client_start() {
-	$RUNSCREEN -dmS cmdqueue $OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-rabbitmq-cmd-queue
-	echo "Started openqrm-rabbitmq-cmd-queue client"
-}
-
-
-function openqrm_rabbitmq_client_stop() {
-	kill `ps ax | grep openqrm-rabbitmq-cmd-queue | grep python | awk '{ print $1 }'`
-	echo "Stopped openqrm-rabbitmq-cmd-queue client"
-}
-
-
-function openqrm_rabbitmq_client_status() {
-	if ps ax | grep -w openqrm-rabbitmq-cmd-queue | grep python 1>/dev/null; then
-		echo "openqrm-rabbitmq-cmd-queue client running"
-	else
-		echo "openqrm-rabbitmq-cmd-queue client stopped"
-	fi
-}
-
-
-
-case "$1" in
-	start)
-		openqrm_rabbitmq_client_start
-		;;
-	stop)
-		openqrm_rabbitmq_client_stop
-		;;
-	status)
-		openqrm_rabbitmq_client_status
-		;;
-	restart)
-		openqrm_rabbitmq_client_stop
-		sleep 1
-		openqrm_rabbitmq_client_start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|status|restart}"
-		exit 1
-
-esac
diff --git a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/etc/init.d/openqrm-client b/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/etc/init.d/openqrm-client
deleted file mode 100644
index 23e3f81..0000000
--- a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/etc/init.d/openqrm-client
+++ /dev/null
@@ -1,385 +0,0 @@
-#!/bin/bash
-# openqrm-client	openQRM init script for the managed resources
-#
-# chkconfig: 2345 98 19
-# description: openQRM is the next generation Linux Data Center management
-
-# support for LSB init scripts
-### BEGIN INIT INFO
-# Provides: openqrm-client
-# Required-Start: $all
-# Required-Stop: $all
-# Default-Start:  2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: openQRM init script for the managed resources
-# Description: openQRM init script for the managed resources
-### END INIT INFO
-
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-export LANG=C
-PATH=/usr/bin:/sbin:/bin:/usr/sbin
-export PATH
-LOCKFILE=/var/lock/subsys/openqrm
-mkdir -p $(dirname $LOCKFILE)
-
-export `eval cat /proc/cmdline`	2>/dev/null
-. /var/openqrm/openqrm-resource.conf
-# make sure to have a valid backup of the parameters, at least including the openQRM server ip
-if [ ! -f /var/openqrm/openqrm-resource.conf.last ]; then
-	/bin/cp -f /var/openqrm/openqrm-resource.conf /var/openqrm/openqrm-resource.conf.last
-fi
-if [ "$resource_mac" == "" ]; then
-	/bin/cp -f /var/openqrm/openqrm-resource.conf.last /var/openqrm/openqrm-resource.conf
-	. /var/openqrm/openqrm-resource.conf
-fi
-export OPENQRM_SERVER_BASE_DIR=$resource_basedir
-export OPENQRM_SOURCE_DIR=$resource_basedir/openqrm
-. $resource_basedir/openqrm/include/openqrm-functions
-. $resource_basedir/openqrm/include/openqrm-package-functions
-
-
-# define max-start-retries
-MAX_START_RETRY=120
-
-# define wget to use with https
-if [ "$openqrm_web_protocol" == "https" ]; then
-	WGET="wget -q --no-check-certificate"
-else
-	WGET="wget -q"
-fi
-
-# gets/starts/stops enabled boot-services for the resources
-function openqrm_boot_service() {
-	local BOOT_SERVICE=$1
-	local BOOT_SERVICE_CMD=$2
-	local CURRENT=`pwd`
-
-	# get + install the package during start
-	if [ "$BOOT_SERVICE_CMD" == "start" ]; then
-		echo "Getting boot-service package $BOOT_SERVICE"
-		mkdir -p  $resource_basedir/openqrm/plugins/$BOOT_SERVICE
-		cd $resource_basedir/openqrm/plugins/$BOOT_SERVICE
-		if ! $WGET $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/boot-service-$BOOT_SERVICE.tgz; then
-			echo "ERROR: Could not get boot-service package for boot-service $BOOT_SERVICE !"
-			return 1
-		fi
-		tar -xzf boot-service-$BOOT_SERVICE.tgz
-		rm -f boot-service-$BOOT_SERVICE.tgz
-		# get optional custom appliance config
-		if [ "$appliance_name" != "" ]; then
-			if [ ! -d $resource_basedir/openqrm/plugins/$BOOT_SERVICE/etc/ ]; then
-				mkdir -p $resource_basedir/openqrm/plugins/$BOOT_SERVICE/etc/
-			fi
-			if $WGET -O $resource_basedir/openqrm/plugins/$BOOT_SERVICE/etc/openqrm-plugin-$BOOT_SERVICE.conf.$appliance_name.conf $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/plugins/$BOOT_SERVICE/openqrm-plugin-$BOOT_SERVICE.$appliance_name.conf; then
-				echo "- applying custom $BOOT_SERVICE boot-service configuration for appliance $appliance_name"
-				/bin/cp -f $resource_basedir/openqrm/plugins/$BOOT_SERVICE/etc/openqrm-plugin-$BOOT_SERVICE.conf $resource_basedir/openqrm/plugins/$BOOT_SERVICE/etc/openqrm-plugin-$BOOT_SERVICE.conf.default
-				/bin/cp -f $resource_basedir/openqrm/plugins/$BOOT_SERVICE/etc/openqrm-plugin-$BOOT_SERVICE.conf.$appliance_name.conf $resource_basedir/openqrm/plugins/$BOOT_SERVICE/etc/openqrm-plugin-$BOOT_SERVICE.conf
-			fi
-		fi
-	fi
-	# run the boot-service cmd
-	BOOT_SERVICE_INIT="$resource_basedir/openqrm/plugins/$BOOT_SERVICE/etc/init.d/$BOOT_SERVICE"
-	if [ -x $BOOT_SERVICE_INIT ]; then
-		echo "Running $BOOT_SERVICE_CMD on boot-service $BOOT_SERVICE"
-		$BOOT_SERVICE_INIT $BOOT_SERVICE_CMD
-	fi
-	cd $CURRENT
-}
-
-
-
-
-
-function openqrm_client_start() {
-
-	echo "Starting openQRM-client"
-	openqrm_client_stop 1>/dev/null 2>&1
-	START_RETRY=0
-	LOOP_CONNECT=0
-	MAX_CONNECT=10
-
-	# checks
-	umount /initrd/lib/modules 1>/dev/null 2>&1
-	umount /initrd/boot 1>/dev/null 2>&1
-	umount /initrd/ 1>/dev/null 2>&1
-
-	grep -q "/initrd" /proc/mounts && umount /initrd
-
-	chmod 666 /dev/null
-
-	if [ ! -e /dev/tty ]; then
-		cd /dev
-		mknod tty c 5 0
-		cd
-	fi
-
-	# network up ?
-	echo "NOTICE: Checking connection to openQRM server at $resource_openqrmserver"
-	while ! $WGET -q -t 1 -T 4 -O /dev/null "$openqrm_web_protocol://$resource_openqrmserver/openqrm/action/resource-monitor.php"; do
-		echo -n "."
-		sleep 2
-		LOOP_CONNECT=$(( LOOP_CONNECT + 1 ))
-		if [ "$LOOP_CONNECT" == "$MAX_CONNECT" ]; then
-			echo "WARNING: Could not connect to openQRM server at $resource_openqrmserver! Trying to continue ..."
-			break
-		fi
-	done
-
-	# check if we have resource_mac, if not try to find the right interface integrated in openQRM
-	if ip a s | grep "link/ether" | awk '{ print $2 }' | cut -d'/' -f1 | grep -i $resource_mac &>/dev/null; then
-		# if not in the initrd try to refresh the resource parameters
-		if [ ! -f /etc/initrd-devices.conf ]; then
-			if ! $WGET -q -t 1 -T 4 -O /var/openqrm/openqrm-resource.conf "$openqrm_web_protocol://$resource_openqrmserver/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_mac=$resource_mac"; then
-				# restore
-				/bin/cp -f /var/openqrm/openqrm-resource.conf.last /var/openqrm/openqrm-resource.conf
-				echo "NOTICE: Could not refresh resource-parameters. Using previous one."
-			else
-				. /var/openqrm/openqrm-resource.conf
-			fi
-		fi
-	else
-		# here we do not found the resource_mac on one of the systems network cards
-		# assuming auto-install or clone to local-disk
-		/bin/cp -f /var/openqrm/openqrm-resource.conf /var/openqrm/openqrm-resource.conf.previous_res
-		for RESOURCE_MAC in `ip a s | grep "link/ether" | awk '{ print $2 }' | cut -d'/' -f1`; do
-			echo "NOTICE: Refreshing resource-parameters. Trying $RESOURCE_MAC."
-			if $WGET -q -t 1 -T 4 -O /var/openqrm/openqrm-resource.conf "$openqrm_web_protocol://$resource_openqrmserver/openqrm/action/resource-monitor.php?resource_command=get_parameter&resource_mac=$RESOURCE_MAC"; then
-				if grep -i $RESOURCE_MAC /var/openqrm/openqrm-resource.conf &>/dev/null; then
-					. /var/openqrm/openqrm-resource.conf
-					break
-				fi
-			fi
-		done
-	fi
-
-	# do some extra checks for redhat/centos regarding firewall
-	if [ -f /etc/redhat-release ]; then
-		# iptables ?
-		if which iptables 1>/dev/null; then
-			if iptables -L | grep REJECT 1>/dev/null; then
-				echo "NOTICE: Found iptables firewall enabled!"
-				echo "NOTICE: Inserting rule to allow access to the openQRM management port $resource_execdport"
-				iptables -I INPUT -m state --state NEW -m tcp -p tcp --dport $resource_execdport -j ACCEPT
-			fi
-		fi
-	fi
-
-	case "$openqrm_execution_layer" in
-		dropbear)
-			# install and use the distro dropbear package
-			DROPBEAR=`which dropbear`
-			if test -z $DROPBEAR; then
-				FORCE_INSTALL=true openqrm_install_os_dependency dropbear
-				# on debian and ubuntu, lets make sure it is not started as a service due to our install
-				if test -e /etc/default/dropbear; then
-					if grep '^NO_START=0' /etc/default/dropbear 1>/dev/null|| ! grep 'NO_START' /etc/default/dropbear 1>/dev/null; then
-						# looks like it has been set to start by default; let's revert that
-						/etc/init.d/dropbear stop
-						sed -i -e "s/^NO_START=0/NO_START=1/g" /etc/default/dropbear
-						# just in case it was never there in the first place
-						echo "NO_START=1" >> /etc/default/dropbear
-					fi
-				fi
-			fi
-			# start dropbear as openqrm-execd
-			/bin/rm -rf $resource_basedir/openqrm/etc/dropbear
-			mkdir -p $resource_basedir/openqrm/etc/dropbear/
-			if ! dropbearkey -t rsa -f $resource_basedir/openqrm/etc/dropbear/dropbear_rsa_host_key; then
-				echo "ERROR: Could not create host key with dropbearkey. Please check to have dropbear installed correctly!"
-				return 1
-			fi
-			# get the public key of the openQRM server
-			while (true); do
-				if ! $WGET $openqrm_web_protocol://$resource_openqrmserver/openqrm/boot-service/openqrm-server-public-rsa-key; then
-					if [ "$START_RETRY" == "$MAX_START_RETRY" ]; then
-						echo "ERROR: Could not get the public key of the openQRM-server at $resource_openqrmserver ! Please check the certificates !"
-						return 1
-					fi
-					START_RETRY=$(( START_RETRY + 1 ))
-					sleep 1
-				else
-					break
-				fi
-			done
-			if [ ! -d /root/.ssh ]; then
-				mkdir -p /root/.ssh
-				chmod 700 /root/.ssh
-			fi
-			if [ ! -f /root/.ssh/authorized_keys ]; then
-				mv -f openqrm-server-public-rsa-key /root/.ssh/authorized_keys
-				chmod 600 /root/.ssh/authorized_keys
-			else
-				OPENQRM_HOST=`cat openqrm-server-public-rsa-key | awk {' print $3 '}`
-				if grep $OPENQRM_HOST /root/.ssh/authorized_keys 1>/dev/null; then
-					sed -i -e "s#.*$OPENQRM_HOST.*##g" /root/.ssh/authorized_keys
-				fi
-				cat openqrm-server-public-rsa-key >> /root/.ssh/authorized_keys
-				rm -f openqrm-server-public-rsa-key
-				chmod 600 /root/.ssh/authorized_keys
-			fi
-			# start dropbear
-			killall dropbear 1>/dev/null 2>&1
-			for OPENQRM_PID in `ps ax 2>/dev/null | grep dropbear | grep -v grep | awk {' print $1 '}`; do
-				kill $OPENQRM_PID
-			done
-			dropbear -p $resource_execdport -r $resource_basedir/openqrm/etc/dropbear/dropbear_rsa_host_key
-			;;
-
-
-		rabbitmq)
-			RUNSCREEN=`which screen`
-			if test -z $RUNSCREEN; then
-				FORCE_INSTALL=true openqrm_install_os_dependency screen
-			fi
-			if [ -x /usr/bin/screen.real ]; then
-				RUNSCREEN="/usr/bin/screen.real"
-			else
-				RUNSCREEN=`which screen`
-			fi
-			echo "- installing python pip installer"
-			if ! openqrm_full_fill_os_dependency pip python3-pip; then
-				echo "ERROR: Failed to install python3-pip!"
-				exit 1
-			fi
-			echo "- installing python pika"
-			if ! pip install pika==0.9.8; then
-				echo "ERROR: Failed to install python pika!"
-				exit 1
-			fi
-			# export RABBITMQ_PASSWORD="$OPENQRM_PASSWORD"
-			eval $appliance_capabilities
-			export RABBITMQ_PASSWORD
-			export RABBITMQ_SERVER="$resource_openqrmserver"
-			export RABBITMQ_QUEUE_NAME="$resource_ip"
-			$RUNSCREEN -dmS cmdqueue $resource_basedir/openqrm/sbin/openqrm-rabbitmq-cmd-queue
-			;;
-
-		*)
-			echo "ERROR: Un-supported command execution layer $openqrm_execution_layer ! Exiting."
-			return 1
-			;;
-	esac
-
-	# start openqrm-monitord
-	if [ ! -d /tmp ]; then mkdir -p /tmp; fi
-	nohup $resource_basedir/openqrm/sbin/openqrm-monitord 1>/tmp/openqrm-monitord.out 2>&1 &
-	rm -f /tmp/openqrm-monitord.out
-
-	# allow to overwrite the resource-configuration e.g. for cluster-resources
-	if [ -f /var/openqrm/openqrm-resource.conf.static ]; then
-		cat /var/openqrm/openqrm-resource.conf.static >> /var/openqrm/openqrm-resource.conf
-	fi
-
-	# set the image password - if not in the initrd
-	if [ ! -f /etc/initrd-devices.conf ]; then
-#		if  $WGET -O /tmp/iauth.$image_id $openqrm_web_protocol://$resource_openqrmserver/openqrm/action/image-auth/iauth.$image_id.php 2>/tmp/iauth.log; then
-		if  $WGET -O /tmp/iauth.$image_id $openqrm_web_protocol://$resource_openqrmserver/openqrm/action/image-auth/iauth.php?id=$image_id 2>/tmp/iauth.log; then
-			cryptedpassword=`cat /tmp/iauth.$image_id`
-			rm -f /tmp/iauth.$image_id /tmp/iauth.log
-			if [ "$cryptedpassword" != "" ]; then
-				sed -i "s#^root:[^:]*#root:$cryptedpassword#" /etc/shadow
-				sed -i "s#^root:[^:]*#root:$cryptedpassword#" /etc/shadow-
-			fi
-		fi
-
-		# upate package manager, the boot-services may want to install additional os-deps, disabled for now
-		# openqrm_update_package_manager
-		# start boot-services from enabled plugins
-		for boot_service in $openqrm_boot_services; do
-			openqrm_boot_service $boot_service start
-		done
-	fi
-
-	openqrm_post_event $resource_id "openqrm-client" 5 openqrm_client_start "Resource $resource_id fully started"
-	touch ${LOCKFILE}
-
-}
-
-
-function openqrm_client_stop() {
-	echo "Stopping openQRM-client"
-
-	if [ ! -f /linuxrc ]; then
-		# stop boot-services from enabled plugins
-		for boot_service in $openqrm_boot_services; do
-			openqrm_boot_service $boot_service stop
-		done
-	fi
-	# stop openqrm-execd
-	case "$openqrm_execution_layer" in
-		dropbear)
-			killall dropbear 1>/dev/null 2>&1
-			for OPENQRM_PID in `ps ax 2>/dev/null | grep dropbear | grep -v grep | awk {' print $1 '}`; do
-				kill $OPENQRM_PID
-			done
-			;;
-		rabbitmq)
-			kill `ps ax | grep openqrm-rabbitmq-cmd-queue | grep -v grep | awk {' print $1 '}` 2>/dev/null || true
-			;;
-		*)
-			echo "ERROR: Un-supported command execution layer $openqrm_execution_layer ! Exiting."
-			return 1
-			;;
-	esac
-	killall openqrm-monitord 1>/dev/null 2>&1
-	# in case we do not have killall (e.g. on debian-minimal install) be sure to stop the openqrm-agents anyway
-	for OPENQRM_PID in `ps ax 2>/dev/null | grep openqrm-monitord | grep -v grep | awk {' print $1 '}`; do
-		kill $OPENQRM_PID
-	done
-
-	# remove firewall rule for exec port
-	if [ -f /etc/redhat-release ]; then
-		# iptables ?
-		if which iptables 1>/dev/null; then
-			if iptables -L | grep REJECT 1>/dev/null; then
-				iptables -D INPUT -m state --state NEW -m tcp -p tcp --dport $resource_execdport -j ACCEPT 2>/dev/null
-			fi
-		fi
-	fi
-	/bin/rm -f ${LOCKFILE}
-}
-
-function openqrm_client_status() {
-	if [ -f ${LOCKFILE} ]; then
-		echo "openQRM-client service is running"
-	else
-		echo "openQRM-client service is not running"
-	fi
-}
-
-
-
-case "$1" in
-	start)
-		openqrm_client_start
-		;;
-	stop)
-		openqrm_client_stop
-		;;
-	status)
-		openqrm_client_status
-		;;
-	restart)
-		openqrm_client_stop
-		openqrm_client_start
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|status|restart}"
-		exit 1
-		;;
-esac
-
diff --git a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/etc/systemd/system/openqrm-client.service b/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/etc/systemd/system/openqrm-client.service
deleted file mode 100644
index 5cf1ce0..0000000
--- a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/etc/systemd/system/openqrm-client.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=openQRM is the next generation Linux Data Center management
-After=network-online.target
-Wants=network-online.target
-#After=network.target
-# chrony.service
-#Requires=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/share/openqrm/etc/init.d/openqrm-client start
-ExecStop=/usr/share/openqrm/etc/init.d/openqrm-client stop
-TimeoutSec=120
-#StandardOutput=tty
-
-[Install]
-Alias=openqrm-client.service
-WantedBy=multi-user.target
-##WantedBy=network.target
diff --git a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/include/openqrm-functions b/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/include/openqrm-functions
deleted file mode 100644
index ae3547a..0000000
--- a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/include/openqrm-functions
+++ /dev/null
@@ -1,813 +0,0 @@
-#!/bin/bash
-# this is the main function file for openQRM
-# only general + generic functions should go in here
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	echo "ERROR: Please export OPENQRM_SERVER_BASE_DIR before sourcing $0"
-	exit 1
-fi
-# some static defines
-OPENQRM_RESOURCE_PARAMETER_FILE="/var/openqrm/openqrm-resource.conf"
-OPENQRM_CMD_QUEUE_STARTING_LOCK="/var/run/openqrm/starting-queue-command.lock"
-
-# be sure cmd output is english
-export LANGUAGE=C
-export LANG=C
-export LC_ALL=C
-
-# A more portable "chkconfig".
-# Uses chkconfig or rc.d-update as found, if not then "manual".
-function openqrm_chkconfig() {
-	action="$1"
-	service="$2"
-
-	if [ $action != "add" ] && [ $action != "del" ] ; then
-		echo "openqrm_chkconfig: action must be either \"add\" or \"del\""
-		return 1
-	fi
-	if [ -z "${service}" ] ; then
-		echo "openqrm_chkconfig: service must be valid service name"
-		return 1
-	fi
-
-
-
-#	# For systemd
-	if [ -x /bin/systemd ] || [ -x /usr/bin/systemd ] ; then
-
-		case $action in
-			add)
-				if [ ! -d /etc/systemd/system/ ] ; then
-					mkdir -p /etc/systemd/system/
-				fi
-				if [ "${service}" == "openqrm-client" ] ; then
-					cp $OPENQRM_SERVER_BASE_DIR/openqrm/etc/systemd/system/openqrm-client.service /etc/systemd/system/openqrm-client.service
-				fi
-				/bin/systemctl enable ${service} 
-				/bin/systemctl daemon-reload
-				;;
-			del)
-				/bin/systemctl disable ${service}
-				/bin/systemctl daemon-reload
-				;;
-		esac
-
-#	# For Redhat/SuSe
-	elif [ -x /sbin/chkconfig ] ; then
-		ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d/openqrm-client /etc/init.d/openqrm-client
-	
-		case $action in
-			add)
-				local do_chkconfig=1
-				# check if the init is not configured
-				chkconfig --list ${service} > /dev/null 2>&1 && do_chkconfig=
-
-				# maybe it is configured, but for our runlevel not (tam)
-				if [ -z "$do_chkconfig" ]; then
-					do_chkconfig=1
-					local runlevel=$(grep initdefault /etc/inittab | grep id |cut -d ':' -f2)
-					for f in /etc/rc${runlevel}.d/S??${service} /etc/init.d/rc${runlevel}.d/S??${service}; do
-						[ -e $f ] && do_chkconfig=
-					done
-				fi
-				if [ $do_chkconfig ]; then
-					chkconfig --add ${service}
-					if [ ! -f /etc/UnitedLinux-release ]; then
-						chkconfig ${service} on
-					else
-						chkconfig --add ${service}
-					fi
-				fi
-				;;
-			del)
-				#check if service exists
-				if chkconfig --list ${service} > /dev/null 2>&1 ; then
-					chkconfig --del ${service}
-				fi
-				;;
-
-		esac
-	# For Debian/Ubuntu
-	elif [ -x /usr/sbin/update-rc.d ] ; then
-		# according to manuals, update-rc.d does nothing if links already exist
-		
-		ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d/openqrm-client /etc/init.d/openqrm-client
-		
-		if [ $action == "add" ] ; then
-			# check for start + stop leven
-			start_l=`grep chkconfig /etc/init.d/${service} | grep ^'#' | awk {' print $4 '}`
-			stop_l=`grep chkconfig /etc/init.d/${service} | grep ^'#' | awk {' print $5 '}`
-			update-rc.d ${service}  defaults $start_l $stop_l
-			# check for upstart
-			if [ "$service" == "openqrm" ]; then
-				# debian 6 using insserv, be sure to start in rc 2
-				/bin/cp -a /etc/rc3.d/S*openqrm /etc/rc2.d/
-				if [ -d /etc/init/ ]; then
-					echo '# openQRM - starts openQRM' > /etc/init/openqrm.conf
-					echo 'description       "openQRM Server"' >> /etc/init/openqrm.conf
-					echo 'start on net-device-up' >> /etc/init/openqrm.conf
-					echo 'exec /etc/init.d/openqrm start' >> /etc/init/openqrm.conf
-				fi
-			fi
-			if [ "$service" == "openqrm-client" ]; then
-				# debian 6 using insserv, be sure to start in rc 2
-				/bin/cp -a /etc/rc3.d/S*openqrm-client /etc/rc2.d/
-				if [ -d /etc/init/ ]; then
-					echo '# openQRM Client - starts openQRM Client' > /etc/init/openqrm-client.conf
-					echo 'description       "openQRM Client"' >> /etc/init/openqrm-client.conf
-					echo 'start on net-device-up' >> /etc/init/openqrm-client.conf
-					echo 'exec /etc/init.d/openqrm-client start' >> /etc/init/openqrm-client.conf
-				fi
-			fi
-			if [ "$service" == "openqrm-local-vm-client" ]; then
-				# debian 6 using insserv, be sure to start in rc 2
-				/bin/cp -a /etc/rc3.d/S*openqrm-local-vm-client /etc/rc2.d/
-				if [ -d /etc/init/ ]; then
-					echo '# openQRM Client - starts openQRM Client' > /etc/init/openqrm-local-vm-client.conf
-					echo 'description       "openQRM Client"' >> /etc/init/openqrm-local-vm-client.conf
-					echo 'start on net-device-up' >> /etc/init/openqrm-local-vm-client.conf
-					echo 'exec /etc/init.d/openqrm-local-vm-client start' >> /etc/init/openqrm-local-vm-client.conf
-				fi
-			fi
-		elif [ $action == "del" ] ; then
-			update-rc.d -f ${service} remove 1>/dev/null 2>&1
-			# check for upstart
-			if [ "$service" == "openqrm-client" ]; then
-				# debian 6 using insserv, remove from rc 2
-				rm -f /etc/rc2.d/S*openqrm-client
-				if [ -e /etc/init/openqrm-client.conf ]; then
-					rm -f /etc/init/openqrm-client.conf
-				fi
-			fi
-			if [ "$service" == "openqrm" ]; then
-				rm -f /etc/rc2.d/S*openqrm
-				if [ -e /etc/init/openqrm.conf ]; then
-					rm -f /etc/init/openqrm.conf
-				fi
-			fi
-			if [ "$service" == "openqrm-local-vm-client" ]; then
-				rm -f /etc/rc2.d/S*openqrm-local-vm-client
-				if [ -e /etc/init/openqrm-local-vm-client.conf ]; then
-					rm -f /etc/init/openqrm-local-vm-client.conf
-				fi
-			fi
-		fi
-	# "Manual".  Uses S91 by default
-	else
-		ln -sf $OPENQRM_SERVER_BASE_DIR/openqrm/etc/init.d/openqrm-client /etc/init.d/openqrm-client
-	
-		# Get default runlevel
-		runlevel=$( grep default /etc/inittab | grep ^id: | cut -f 2 -d: )
-
-		# Find directory for script links
-		if [ -d /etc/rc.d/ ] ; then
-				rcdir=/etc/rc.d/rc${runlevel}.d
-		else
-				rcdir=/etc/rc${runlevel}.d
-		fi
-
-		if [ $action == "add" ] ; then
-			if [ ! -f $rcdir/S??${service} ] && [ -f /etc/init.d/${service} ] ; then
-				   ln -s /etc/init.d/${service} $rcdir/S91${service}
-			fi
-		elif [ $action == "del" ] ; then
-			if [ -f $rcdir/S??${service} ] ; then
-				   rm $rcdir/S??${service}
-			fi
-		fi
-	fi
-	return 0
-}
-
-
-
-# create short name for distro for the package stage
-function openqrm_get_distro() {
-	# find out which distribution it is
-	# find out which version it is
-	# give the ROOT_DIR as the first cmdline param
-	local ROOT_DIR=${1:-/}
-	if [ -f $ROOT_DIR/etc/fedora-release ]; then
-		RELEASE=$(cat $ROOT_DIR/etc/fedora-release | head -1)
-			case $RELEASE in
-				*Fedora*9*)
-					echo "fedora9"
-					;;
-				*Fedora*10*)
-					echo "fedora10"
-					;;
-				*)
-					echo "fedora"
-					;;
-			esac
-	elif [ -f $ROOT_DIR/etc/redhat-release ]; then
-		RELEASE=$(cat $ROOT_DIR/etc/redhat-release | head -1)
-		case $RELEASE in
-			*Werewolf*)
-				echo "fc8"
-				;;
-			*Moonshine*)
-				echo "fc7"
-				;;
-			*Zod*)
-				echo "fc6"
-				;;
-			*Bordeaux*)
-				echo "fc5"
-				;;
-			*Stentz*)
-				echo "fc4"
-				;;
-			*Nahant*)
-				echo "el4"
-				;;
-			*Shrike*)
-				echo "rh9"
-				;;
-			*Psyche*)
-				echo "rh8"
-				;;
-			*Valhalla*)
-				echo "rh73"
-				;;
-			*Taroon*)
-				echo "el3"
-				;;
-			*CentOS*5*)
-				echo "centos5"
-				;;
-			*CentOS*6*)
-				echo "centos6"
-				;;
-			*CentOS*7*)
-				echo "centos7"
-				;;
-			*)
-				echo "rh"
-				;;
-		esac
-	elif [ -f $ROOT_DIR/etc/UnitedLinux-release ]; then
-		RELEASE=$(cat $ROOT_DIR/etc/UnitedLinux-release | head -1)
-		case $RELEASE in
-			*UnitedLinux*)
-				echo "suse8"
-				;;
-			*)
-				echo "suse"
-				;;
-		esac
-	elif [ -f $ROOT_DIR/etc/SuSE-release ]; then
-		RELEASE=$(cat $ROOT_DIR/etc/SuSE-release | head -1)
-		case $RELEASE in
-			*openSUSE*10*)
-				echo "opensuse10"
-				;;
-			*SUSE*9*)
-				echo "suse9"
-				;;
-			*SUSE*10*)
-				echo "suse10"
-				;;
-			*SUSE*11*)
-				echo "suse11"
-				;;
-			*)
-				echo "suse"
-				;;
-		esac
-
-	elif [ -f $ROOT_DIR/etc/debian_version ]; then
-		RELEASE=$(cat $ROOT_DIR/etc/debian_version | head -1)
-		case $RELEASE in
-			*3.1*)
-				echo "debian31"
-				;;
-			*4.0*)
-				echo "debian40"
-				;;
-			*5.0*)
-				echo "debian50"
-				;;
-			*lenny/sid*)
-				if [ -f $ROOT_DIR/etc/lsb-release ]; then
-					if grep hardy $ROOT_DIR/etc/lsb-release 1>/dev/null; then
-						echo "ubuntu804"
-					elif grep intrepid $ROOT_DIR/etc/lsb-release 1>/dev/null; then
-						echo "ubuntu810"
-					else
-						echo "ubuntu804"
-					fi
-				else
-					echo "ubuntu804"
-				fi
-				;;
-			*)
-				echo "debian"
-				;;
-		esac
-	else
-		echo "generic"
-	fi
-}
-
-#
-# get the distribution name
-# $1:      root directory of the installation (optional; default is "/")
-# returns: one of fedora|rhel|suse|ubuntu|debian|unknown
-#
-function openqrm_get_distro_name() {
-	local ROOT_DIR=${1:-/}
-	if [-f "$ROOT_DIR/etc/fedora-release" ]; then
-		echo "fedora"
-	elif [ -f "$ROOT_DIR/etc/redhat-release" ]; then
-		# CentOS uses /etc/redhat-release, too
-		echo 'rhel';
-	elif [ -f "$ROOT_DIR/etc/UnitedLinux-release" ]; then
-		echo "suse"
-	elif [ -f "$ROOT_DIR/etc/SuSE-release" ]; then
-		echo "suse"
-	elif [ -f "$ROOT_DIR/etc/ubuntu_version" ]; then
-		echo "ubuntu"
-	elif [ -f "$ROOT_DIR/etc/debian_version" ]; then
-		echo "debian"
-	else
-		echo "unknown"
-	fi
-}
-
-#
-# get the distribution's version
-#
-# you can choose to get the result as integer or as string. Use the integer
-# output if you want to have a condition like distro_version > 100 (equals 10.0)
-# Use string output for user-visible display. Default is "string".
-#
-# Note one Debian specific feature: if testing/unstable is installed (there is no 
-# version number for these), "string" will return "testing/unstable", "integer" 
-# returns -1!
-# 
-# Note that old Redhat releases (before 2003, ending with Redhat 9) are NOT
-# supported. There is only RedHat Enterprise (RHEL) and Fedora.
-#
-# integer will return 
-# - version * 10 (e.g. 103 instead of 10.3) for Debian and SUSE
-# - version for RHEL/CentOS and Fedora
-#
-# FIXME: use lsb_release as soon as it is usable by many distributions 
-# (required since LSB 3.0, but not installed by default on RHEL/CentOS)
-# 
-#
-# $1:      string|integer return as integer or as string (optional; default is string)
-# $2:      root directory of the installation (optional; default is "/")
-# returns: the distribution's version number
-#
-function openqrm_get_distro_version() {
-	local RETURN_AS=$1
-	if [ "$1" == '' ]; then
-		RETURN_AS=string
-	fi
-
-	case `openqrm_get_distro_name()` in
-		"suse")
-			# tested with: openSUSE 10.3
-			# XXX: This is not tested for SLES/SLED yet
-			if [ $RETURN_AS == 'string' ]; then
-				local VERSION=$(cat "$ROOT_DIR/etc/SuSE-release" | tail -1 | sed 's/VERSION = \([0-9]\+\.[0-9]\)/\1/')
-				echo $VERSION
-			elif [ $RETURN_AS == 'integer' ]; then
-				local VERSION=$(cat "$ROOT_DIR/etc/SuSE-release" | tail -1 | sed 's/VERSION = \([0-9]\+\)\.\([0-9]\)/\1\2/')
-				echo $VERSION
-			fi
-		;;
-		"rhel")
-			# tested with: CentOS 5.1
-			# XXX: RHEL/CentOS does not give us the service release number (e.g. only 5 instead of 5.1)
-			local VERSION=$(cat "$ROOT_DIR/etc/redhat-release" | head -n1 | sed 's/.*release \([0-9]\+\).*/\1/')
-						echo $VERSION
-		;;
-		"fedora")
-			# tested with: Fedora Core 3, Fedora Core 6, Fedora 8
-						local VERSION=$(cat "$ROOT_DIR/etc/fedora-release" | head -n1 | sed 's/.*release \([0-9]\+\) .*/\1/')
-						echo $VERSION
-		;;
-		"debian")
-			# tested with: 4.0 (etch), unstable/testing
-			if [ $RETURN_AS == 'string' ]; then
-								local VERSION=$(cat "$ROOT_DIR/etc/debian_version")
-								echo $VERSION
-						elif [ $RETURN_AS == 'integer' ]; then
-				if [ `cat "$ROOT_DIR/etc/debian_version"` == 'testing/unstable' ]; then
-					echo -1
-				else
-									local VERSION=$(cat "$ROOT_DIR/etc/debian_version" | sed 's/\([0-9]\+\)\.\([0-9]\)/\1\2/')
-									echo $VERSION
-				fi
-			fi
-			;;
-			*)
-			echo 0
-			;;
-	esac
-}
-
-
-
-# function to send events to the openQRM-server
-# param 1 = resource_id
-# param 2 = event_name
-# param 3 = event_priority
-# param 4 = event_source
-# param 5 = event_description
-function openqrm_post_event() {
-	resource_id=`urlencodestring $1`
-	event_name=`urlencodestring $2`
-	event_priority=`urlencodestring $3`
-	event_source=`urlencodestring $4`
-	event_description=`urlencodestring $5`
-	# are we on the openQRM server or on a resource ?
-	if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-		. $OPENQRM_RESOURCE_PARAMETER_FILE
-	elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-		. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-		. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-		openqrm_server_get_config
-		resource_id=0
-		resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-		openqrm_web_protocol=$OPENQRM_WEB_PROTOCOL
-	fi
-	# define wget to use with https
-	if [ "$openqrm_web_protocol" == "https" ]; then
-		WGET_NO_CERT_CHECK="--no-check-certificate"
-	fi
-	MESSAGEDATA="resource_id=$resource_id&event_name=$event_name&event_priority=$event_priority&event_source=$event_source&event_description=$event_description";
-	OPENQRM_RESOURCE_EVENT_URL="$openqrm_web_protocol://$resource_openqrmserver/openqrm/action/resource-monitor.php?resource_command=post_event&$MESSAGEDATA"
-	wget -q $WGET_NO_CERT_CHECK -O /dev/null --tries=200 --retry-connrefused -T 10 --random-wait --no-proxy "$OPENQRM_RESOURCE_EVENT_URL" &
-}
-
-
-
-# a generic function to start portmap
-# -> on some systems (e.g. fedora) we need to start rpcbind
-function openqrm_portmap_start() {
-	if which rpcbind 1>/dev/null; then
-		rpcbind
-		rpc.statd
-	else
-		portmap
-	fi
-}
-
-
-
-# a generic function to stop portmap
-# -> on some systems (e.g. fedora) we need to stop rpcbind
-function openqrm_portmap_stop() {
-	if which rpcbind 1>/dev/null; then
-		killall rpc.statd
-		killall rpcbind
-	else
-		killall portmap
-	fi
-}
-
-
-
-
-# a function to validate an ip address
-function openqrm_validate_ip() {
-	IP_A=$1
-	OLDIFS=$IFS
-	IFS=.
-	set -- $IP_A
-	if [ "$#" -ne "4" ]; then
-		IFS=$OLDIFS
-		return 1
-	fi
-
-	for oct in $1 $2 $3 $4; do
-		echo $oct | egrep "^[0-9]+$" >/dev/null 2>&1
-		if [ "$?" -ne "0" ]; then
-			IFS=$OLDIFS
-			return 1
-		else
-			if [ "$oct" -lt "0" -o "$oct" -gt "255" ]; then
-				IFS=$OLDIFS
-				return 1
-			fi
-		fi
-	done
-	echo "$IP_A" | grep "\.$" >/dev/null 2>&1
-	if [ "$?" -eq "0" ]; then
-		IFS=$OLDIFS
-		return 1
-	fi
-	IFS=$OLDIFS
-	return 0
-}
-
-
-
-
-# a generic function to get the LVM volumes paths
-# newer version of lvdisplay (>=2.02.95 in Ubuntu 12.10) output "LV Path"  instead of "LV Name"
-# https://github.com/stevenshiau/clonezilla/blob/master/sbin/ocs-lvm2-stop
-function openqrm_get_lvm_volume_paths() {
-	if lvdisplay | grep -E "LV Path" 1>/dev/null; then
-		LVM_VOLME_GREP="LV Path"
-	else
-		LVM_VOLME_GREP="LV Name"
-	fi
-	lvdisplay | grep "$LVM_VOLME_GREP" | awk {' print $3 '}
-}
-
-
-
-# reciever command queue locking function, one queue per <sub-section-name>
-# use like :
-# LOCK_TIME=`openqrm_lock_queue aquire <sub-section-name>`
-# run-locked-commands
-# openqrm_lock_queue release <sub-section-name> $LOCK_TIME
-#
-function openqrm_lock_queue() {
-	local COMMAND=$1
-	local SUBSECTION=$2
-	local OPENQRM_CMD_LOCK_FILE=/var/run/openqrm/lock-$SUBSECTION.lock
-	local OPENQRM_CMD_LOCK_DELAY=2
-	local OPENQRM_CMD_LOCK_RETRY=1200
-	local OPENQRM_CMD_LOCK_TIMEOUT=240
-	local OPENQRM_CMD_QUEUE_WARNING_1=30
-	local OPENQRM_CMD_QUEUE_WARNING_2=60
-	local OPENQRM_CMD_QUEUE_WARNING_3=90
-
-	local OPENQRM_CMD_QUEUE_WARNING_LIMIT_1=10
-	local OPENQRM_CMD_QUEUE_WARNING_LIMIT_2=50
-	local OPENQRM_CMD_QUEUE_WARNING_LIMIT_3=100
-
-	if [ -f "$OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions" ]; then
-		resource_id=0
-	else
-		. $OPENQRM_RESOURCE_PARAMETER_FILE
-	fi
-	local LOCK_FILE_DIR=`dirname $OPENQRM_CMD_LOCK_FILE`
-	if [ ! -d "$LOCK_FILE_DIR" ]; then
-		mkdir -p "$LOCK_FILE_DIR"
-	fi
-	case "$COMMAND" in
-		aquire)
-			local EXACTNOW=`date +%s%N`
-			trap "rm -f $OPENQRM_CMD_LOCK_FILE.$EXACTNOW" EXIT
-			lockfile -s $OPENQRM_CMD_LOCK_DELAY -r $OPENQRM_CMD_LOCK_RETRY -l $OPENQRM_CMD_LOCK_TIMEOUT $OPENQRM_CMD_LOCK_FILE.$EXACTNOW
-			echo $$ > $OPENQRM_CMD_LOCK_FILE.$EXACTNOW
-			local LOOP_TIMEOUT=0
-			local LOCK_TIMESTAMP_LAST=""
-			while (:); do
-				LOCK_TIMESTAMP_NEXT=`ls $OPENQRM_CMD_LOCK_FILE.* 2>/dev/null | cut -d '.' -f3 | sort -g | head -n1 2>/dev/null | grep -v $EXACTNOW`
-				if [ "$LOCK_TIMESTAMP_NEXT" == "" ]; then
-					openqrm_post_event $resource_id "aquire $SUBSECTION" 5 "openqrm_lock_queue" "NOTICE: Resource $resource_id running cmd $0 - $EXACTNOW" 1>/dev/null 2>&1
-					break
-				else
-					if [ "$EXACTNOW" == "$LOCK_TIMESTAMP_NEXT" ]; then
-						openqrm_post_event $resource_id "aquire $SUBSECTION" 5 "openqrm_lock_queue" "NOTICE: Resource $resource_id running cmd $0 running now - $EXACTNOW == $LOCK_TIMESTAMP_NEXT" 1>/dev/null 2>&1
-						break
-					else
-						# debug + reporting
-						if [ "$LOOP_TIMEOUT" == "$OPENQRM_CMD_QUEUE_WARNING_1" ] || [ "$LOOP_TIMEOUT" == "$OPENQRM_CMD_QUEUE_WARNING_2" ] || [ "$LOOP_TIMEOUT" == "$OPENQRM_CMD_QUEUE_WARNING_3" ]; then
-							BLOCK_PID=`cat $OPENQRM_CMD_LOCK_FILE.$LOCK_TIMESTAMP_NEXT 2>/dev/null`
-							openqrm_post_event $resource_id "aquire $SUBSECTION" 5 "openqrm_lock_queue" "NOTICE: Resource $resource_id cmd $0 waiting for PID $BLOCK_PID to finish - $EXACTNOW != $LOCK_TIMESTAMP_NEXT - $LOOP_TIMEOUT" 1>/dev/null 2>&1
-							WAITING_COMMANDS=`ls $OPENQRM_CMD_LOCK_FILE.* 2>/dev/null | wc -l`
-							if [ "$WAITING_COMMANDS" != "" ]; then
-								if [ $WAITING_COMMANDS -gt $OPENQRM_CMD_QUEUE_WARNING_LIMIT_3 ];  then
-									openqrm_post_event $resource_id "aquire $SUBSECTION" 9 "openqrm_lock_queue" "ERROR: Resource $resource_id cmd $0 reporting $WAITING_COMMANDS waiting commands in $SUBSECTION queue" 1>/dev/null 2>&1
-								elif [ $WAITING_COMMANDS -gt $OPENQRM_CMD_QUEUE_WARNING_LIMIT_2 ];  then
-									openqrm_post_event $resource_id "aquire $SUBSECTION" 9 "openqrm_lock_queue" "ERROR: Resource $resource_id cmd $0 reporting $WAITING_COMMANDS waiting commands in $SUBSECTION queue" 1>/dev/null 2>&1
-								elif [ $WAITING_COMMANDS -gt $OPENQRM_CMD_QUEUE_WARNING_LIMIT_1 ];  then
-									openqrm_post_event $resource_id "aquire $SUBSECTION" 9 "openqrm_lock_queue" "WARNING: Resource $resource_id cmd $0 reporting $WAITING_COMMANDS waiting commands in $SUBSECTION queue" 1>/dev/null 2>&1
-								else
-									openqrm_post_event $resource_id "aquire $SUBSECTION" 5 "openqrm_lock_queue" "NOTICE: Resource $resource_id cmd $0 reporting $WAITING_COMMANDS waiting commands in $SUBSECTION queue" 1>/dev/null 2>&1
-								fi
-							else
-								openqrm_post_event $resource_id "aquire $SUBSECTION" 5 "openqrm_lock_queue" "NOTICE: Resource $resource_id cmd $0 reporting no waiting commands in $SUBSECTION queue" 1>/dev/null 2>&1
-							fi
-						fi
-					fi
-				fi
-
-				if [ "$LOCK_TIMESTAMP_NEXT" == "$LOCK_TIMESTAMP_LAST" ]; then
-					LOOP_TIMEOUT=$(( LOOP_TIMEOUT + 1 ))
-				else
-					# new command, reset loop counter
-					LOOP_TIMEOUT=0
-				fi
-				if [ "$OPENQRM_CMD_LOCK_RETRY" == "$LOOP_TIMEOUT" ]; then
-					BLOCK_PID=`cat $OPENQRM_CMD_LOCK_FILE.$LOCK_TIMESTAMP_NEXT 2>/dev/null`
-					kill $BLOCK_PID 2>/dev/null
-					rm -f $OPENQRM_CMD_LOCK_FILE.$LOCK_TIMESTAMP_NEXT
-					LOCK_TIMESTAMP_LAST=$LOCK_TIMESTAMP_NEXT
-					openqrm_post_event $resource_id "aquire $SUBSECTION" 3 "openqrm_lock_queue" "ERROR: Resource $resource_id cmd $0 could not get lock after $OPENQRM_CMD_LOCK_RETRY retries!" 1>/dev/null 2>&1
-					openqrm_post_event $resource_id "aquire $SUBSECTION" 3 "openqrm_lock_queue" "ERROR: Resource $resource_id cmd $0 stopped blocking process $BLOCK_PID" 1>/dev/null 2>&1
-					openqrm_post_event $resource_id "aquire $SUBSECTION" 9 "openqrm_lock_queue" "WARNING: Resource $resource_id force removed lock $OPENQRM_CMD_LOCK_FILE.$LOCK_TIMESTAMP_NEXT" 1>/dev/null 2>&1
-					break
-				fi
-				LOCK_TIMESTAMP_LAST=$LOCK_TIMESTAMP_NEXT
-				sleep $OPENQRM_CMD_LOCK_DELAY
-			done
-			# output timestamp
-			echo $EXACTNOW
-			trap '' EXIT
-			return 0
-			;;
-		release)
-			local LOCKFILE_TIMESTAMP=$3
-			if [ "$LOCKFILE_TIMESTAMP" == "" ]; then
-				openqrm_post_event $resource_id "release $SUBSECTION" 3 "openqrm_lock_queue" "ERROR: Resource $resource_id cmd $0 lock parameter wrong" 1>/dev/null 2>&1
-				return 1
-			fi
-			if [ ! -f "$OPENQRM_CMD_LOCK_FILE.$LOCKFILE_TIMESTAMP" ]; then
-				return 1
-			fi
-			/bin/rm -f $OPENQRM_CMD_LOCK_FILE.$LOCKFILE_TIMESTAMP
-			openqrm_post_event $resource_id "release $SUBSECTION" 5 "openqrm_lock_queue" "NOTICE: Resource $resource_id cmd $0 released the lock $OPENQRM_CMD_LOCK_FILE.$LOCKFILE_TIMESTAMP" 1>/dev/null 2>&1
-			return 0
-			;;
-		*)
-			openqrm_post_event $resource_id "release $SUBSECTION" 3 "openqrm_lock_queue" "ERROR: Resource $resource_id cmd $0 command parameter wrong" 1>/dev/null 2>&1
-			return 1
-			;;
-	esac
-}
-
-
-# function to unblock the starting command queue
-function openqrm_unblock_starting_queue() {
-	if ! echo $@ | grep "\-\-openqrm\-internal\-cmd" 1>/dev/null; then
-		if echo $@ | grep "\-\-openqrm\-ui\-user" 1>/dev/null; then
-			rm -f /var/run/openqrm/starting-queue-command.lock.ui-cmd-queue
-		else
-			rm -f /var/run/openqrm/starting-queue-command.lock.bg-cmd-queue
-		fi
-	fi
-}
-
-
-
-function openqrm_format_error_msg() {
-	ERROR_MSG=$@
-	if [ ! -d /var/log/openqrm/ ]; then
-		mkdir -p /var/log/openqrm/
-	fi
-	echo "openQRM command error: "$ERROR_MSG | logger
-	echo $ERROR_MSG | cut -b1-200 > /var/log/openqrm/$$.log
-	sed -i -e "s/\"//g" /var/log/openqrm/$$.log
-	sed -i -e "s/\'//g" /var/log/openqrm/$$.log
-	sed -i -e "s/\`//g" /var/log/openqrm/$$.log
-	sed -i -e "s/'//g" /var/log/openqrm/$$.log
-	FORMAT_ERROR_MSG=`cat /var/log/openqrm/$$.log`
-	FORMAT_ERROR_MSG=`urlencodestring $FORMAT_ERROR_MSG`
-	rm -f /var/log/openqrm/$$.log
-	echo $FORMAT_ERROR_MSG
-}
-
-
-
-function openqrm_global_lock() {
-	local LOCK_CMD=$1
-	local SECTION=$2
-	local OPENQRM_USER=$3
-	local OPENQRM_PASSWORD=$4
-	local TOKEN=$5
-	local DESCRIPTION=`urlencodestring $6`
-	local GB_TIMEOUT=120
-	local GB_LOOP=0
-
-	# are we on the openQRM server or on a resource ?
-	if [ -f $OPENQRM_RESOURCE_PARAMETER_FILE ]; then
-		. $OPENQRM_RESOURCE_PARAMETER_FILE
-	elif [ -f $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf ]; then
-		. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-		. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-		openqrm_server_get_config
-		resource_id=0
-		resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-		openqrm_web_protocol=$OPENQRM_WEB_PROTOCOL
-	fi
-	# define wget to use with https
-	if [ "$openqrm_web_protocol" == "https" ]; then
-		WGET_NO_CERT_CHECK="--no-check-certificate"
-	fi
-	if [ "$LOCK_CMD" != "aquire" ] && [ "$LOCK_CMD" != "release" ]; then
-		openqrm_post_event $resource_id "lock" 3 "aquire_global_lock" "Wrong lock command parameter! Use aquire and release." 1>/dev/null 2>&1
-		return 1
-	fi
-
-	OPENQRM_GLOBAL_LOCK_URL="$openqrm_web_protocol://$resource_openqrmserver/openqrm/base/api.php?action=lock&lock=$LOCK_CMD&resource_id=$resource_id&section=$SECTION&token=$TOKEN&description=$DESCRIPTION"
-	while (:); do
-		unset GLOBAL_LOCK_ID
-		GLOBAL_LOCK_ID=`wget -q $WGET_NO_CERT_CHECK --http-user=$OPENQRM_USER --http-passwd=$OPENQRM_PASSWORD -O - "$OPENQRM_GLOBAL_LOCK_URL"`
-		if [ "$?" != 0 ]; then
-			echo "ERROR: Could not post global lock to the openQRM-server at $resource_openqrmserver !" | logger
-			return 1
-		fi
-		if [ "$GLOBAL_LOCK_ID" != "" ]; then
-			if [[ $GLOBAL_LOCK_ID = *[[:digit:]]* ]]; then
-				openqrm_post_event $resource_id "lock" 5 "aquire_global_lock" "$LOCK_CMD global lock $GLOBAL_LOCK_ID for section $SECTION." 1>/dev/null 2>&1
-				return 0
-			fi
-		else
-			if [ "$LOCK_CMD" == "release" ]; then
-				return 0
-			fi
-		fi
-		if [ "$GB_TIMEOUT" == "$GB_LOOP" ]; then
-			openqrm_post_event $resource_id "lock" 3 "aquire_global_lock" "Giving up $LOCK_CMD global lock $GLOBAL_LOCK_ID for section $SECTION after $GB_TIMEOUT secs." 1>/dev/null 2>&1
-			return 1
-		fi
-		sleep 1
-	done
-	return 0
-}
-
-
-
-
-function urlencodechar() {
-	# notice : "%", "*" and "\" are not supported
-	UCHAR=$1
-	UCHAR=${UCHAR/\~/%7E}
-	UCHAR=${UCHAR/\!/%21}
-	UCHAR=${UCHAR/\@/%40}
-	UCHAR=${UCHAR/\\#/%23}
-	UCHAR=${UCHAR/\\$/%24}
-	#UCHAR=${UCHAR/\%/%25}
-	UCHAR=${UCHAR/\^/%5E}
-	UCHAR=${UCHAR/\&/%26}
-	#UCHAR=${UCHAR/\\*/%2A}
-	UCHAR=${UCHAR/\(/%28}
-	UCHAR=${UCHAR/\)/%29}
-	UCHAR=${UCHAR/\+/%2B}
-	UCHAR=${UCHAR/\|/%7C}
-	UCHAR=${UCHAR/\{/%7B}
-	UCHAR=${UCHAR/\}/%7D}
-	UCHAR=${UCHAR/\:/%3A}
-	UCHAR=${UCHAR/\"/%22}
-	UCHAR=${UCHAR/\</%3C}
-	UCHAR=${UCHAR/\>/%3E}
-	UCHAR=${UCHAR/\\?/%3F}
-	UCHAR=${UCHAR/\`/%60}
-	UCHAR=${UCHAR/\=/%3D}
-	#UCHAR=${UCHAR/\\/%5C}
-	UCHAR=${UCHAR/\[/%5B}
-	UCHAR=${UCHAR/\]/%5D}
-	UCHAR=${UCHAR/\;/%3B}
-	UCHAR=${UCHAR/\'/%27}
-	UCHAR=${UCHAR/\,/%2C}
-	UCHAR=${UCHAR/\//%2F}
-	# whitespace
-	if [ -z $UCHAR ]; then
-			UCHAR=%20
-	fi
-	echo "$UCHAR"
-}
-
-
-function urlencodestring() {
-	USERINPUT=$@
-	LENGTH=${#USERINPUT}
-	for (( LOOP=0; LOOP<$LENGTH; LOOP++ )); do
-		TESTCHAR=`echo ${USERINPUT:$LOOP:1}`
-		TESTCHAR=`urlencodechar $TESTCHAR`
-		echo -n $TESTCHAR
-	done
-}
-
-
-# a generic function to manage the openQRM webserver
-function openqrm_webserver() {
-	local ACTION=$1
-	if [ -f /etc/debian_version ]; then
-		/etc/init.d/apache2 $ACTION
-	elif [ -f /etc/redhat-release ]; then
-		if [ -f /etc/centos-release ]; then
-			systemctl $ACTION httpd
-		else
-			/etc/init.d/httpd $ACTION
-		fi
-	elif [ -f /etc/SuSE-release ]; then
-		/etc/init.d/apache2 $ACTION
-	fi
-
-}
-
diff --git a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/include/openqrm-package-functions b/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/include/openqrm-package-functions
deleted file mode 100644
index 2efed88..0000000
--- a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/include/openqrm-package-functions
+++ /dev/null
@@ -1,776 +0,0 @@
-#!/bin/bash
-# this is the package function file for openQRM
-# only functions needed for packaging should go in here
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	echo "ERROR: Please export OPENQRM_SERVER_BASE_DIR before sourcing $0"
-	exit 1
-fi
-if [ "$OPENQRM_SOURCE_DIR" == "" ]; then
-	echo "ERROR: Please export OPENQRM_SOURCE_DIR before sourcing $0"
-	exit 1
-fi
-
-# get the openqrm-server configuration + functions
-if [ -f $OPENQRM_SOURCE_DIR/etc/openqrm-server.conf ]; then
-	. $OPENQRM_SOURCE_DIR/etc/openqrm-server.conf
-	. $OPENQRM_SOURCE_DIR/include/openqrm-functions
-	for VAR in `cat $OPENQRM_SOURCE_DIR/etc/openqrm-server.conf | grep -v ^# | grep OPENQRM | cut -d'=' -f1`; do
-		eval `export $VAR`
-	done
-	PACKAGE_MANAGER_TIME_OUT=3600
-else
-	PACKAGE_MANAGER_TIME_OUT=30
-fi
-# get distribution
-export OPENQRM_PACKAGE_DISTRIBUTION=`openqrm_get_distro`
-
-
-# runs a command with a timeout
-function openqrm_cmd_timeout() {
-	sleep_time=$PACKAGE_MANAGER_TIME_OUT
-	command=$@
-	$command &
-	cmd_pid=$!
-	( sleep $sleep_time && kill $cmd_pid &>/dev/null && echo "Stopped $command due to timeout $sleep_time exceeded" ) &
-	killer_pid=$!
-	wait $cmd_pid &> /dev/null
-	wait_status=$?
-	if [ $wait_status == 0 ]; then
-		disown $killer_pid
-		kill $killer_pid &>/dev/null
-	fi
-	return $wait_status
-}
-
-
-
-
-
-#
-# updates the system's package manager
-#
-# returns the return code of the package manager; the only reliable check is
-# to check for a non-zero returncode (which means an error has occurred).
-#
-function openqrm_update_package_manager() {
-	local PACKAGE=$1
-	# check which dependencies to use
-	if [ -f /etc/debian_version ]; then
-		WHOAMI=`whoami`
-		if [ "$WHOAMI" != "root" ]; then
-			export SUDO="sudo"
-		fi
-		openqrm_cmd_timeout $SUDO apt-get update
-	fi
-}
-
-
-#
-# Install a system dependency using the system's package manager
-#
-# $1: package name
-# returns the return code of the package manager; the only reliable check is
-# to check for a non-zero returncode (which means an error has occurred).
-#
-function openqrm_install_os_dependency() {
-	local PACKAGE=$1
-	# check which dependencies to use
-	if [ -f /etc/debian_version ]; then
-		WHOAMI=`whoami`
-		if [ "$WHOAMI" != "root" ]; then
-			export SUDO="sudo"
-		fi
-
-		# support different php versions on debian/ubuntu
-		ADAPT_PACKAGE=false
-		if echo $PACKAGE | grep ^php 1>/dev/null; then
-		    ADAPT_PACKAGE=true
-		fi
-		if [ "$PACKAGE" == "libapache2-mod-php" ]; then
-		    ADAPT_PACKAGE=true
-		fi
-		if [ "$ADAPT_PACKAGE" == "true" ]; then
-		    PHP_VERSION=`apt-cache search php | grep ^'php[0-9].* ' | awk {' print $1 '} | grep -v '-' | grep -v cc | head -n1 | sed -e "s/php//g"`
-		    if [ "$PHP_VERSION" == "" ]; then
-			echo "ERROR: Could not find PHP version to install!"
-			echo "-> please install $PACKAGE manually!"
-			return 1
-		    fi
-		    # php-xml does not exists in php version 5
-		    if [ "$PACKAGE" == "php-xml" ]; then
-			if echo $PHP_VERSION | grep ^5 1>/dev/null; then
-			    return 0
-			fi
-		    fi
-		    # php modules
-		    if echo $PACKAGE | grep ^php-* 1>/dev/null; then
-			PACKAGE=`echo $PACKAGE | sed -e "s/php-/php$PHP_VERSION-/"g`
-		    fi
-		    # php main
-		    if [ "$PACKAGE" == "php" ] ; then
-			PACKAGE=$PACKAGE""$PHP_VERSION
-		    fi
-		    # libapache2-mod-php5
-		    if [ "$PACKAGE" == "libapache2-mod-php" ] ; then
-			PACKAGE=$PACKAGE""$PHP_VERSION
-		    fi
-
-		fi
-
-
-		# if we already have the package installed, don't install it
-		local PACKAGESTATE=`dpkg -s $PACKAGE | grep '^Status' | awk '{print $4}'`
-		if [ "$PACKAGESTATE" != "installed" ]; then
-			if [ "$FORCE_INSTALL" == "true" ]; then
-				$SUDO apt-get -y install $PACKAGE
-			else
-				$SUDO apt-get install $PACKAGE
-			fi
-		fi
-	elif [ -f /etc/redhat-release ]; then
-		if [ "$FORCE_INSTALL" == "true" ]; then
-			su - root -c "yum -y install $PACKAGE"
-		else
-			su - root -c "yum install $PACKAGE"
-		fi
-
-	elif [ -f /etc/SuSE-release ]; then
-		if [ "$FORCE_INSTALL" == "true" ]; then
-			su - root -c "rpm -e --nodeps $PACKAGE"
-		fi
-		# special handling for SUSE and zypper. We get a 0 return code,
-		# even if the requested package is not available. This wrapper
-		# returns 1 if the package is not found.
-		local TMPFILE=$OPENQRM_BUILD_TMP_DIR/$(basename $0).$RANDOM.txt
-		LC_ALL=C su - root -c "zypper --non-interactive install $PACKAGE" 2>&1 | tee "$TMPFILE"
-		local RETURNCODE=${PIPESTATUS[0]}
-		if cat "$TMPFILE" | grep -c "not found" >/dev/null ; then
-			rm "$TMPFILE"
-			return 1;
-		else
-			rm "$TMPFILE"
-			return $RETURNCODE
-		fi
-	fi
-}
-
-
-
-#
-# Install a system dependency using openqrm_install_os_dependency
-#
-# $1: binary name
-# $2: package name
-# returns 0 in case of success, post an error in case of failue
-function openqrm_full_fill_os_dependency() {
-	local BINARY_DEP=$1
-	local PACKAGE_DEP=$2
-	export FORCE_INSTALL=true
-	if ! which $BINARY_DEP 1>/dev/null; then
-		openqrm_install_os_dependency $PACKAGE_DEP
-	else
-		return 0
-	fi
-	if ! which $BINARY_DEP 1>/dev/null; then
-		openqrm_post_event 0 "dependency" 2 "openqrm-package-functions" "Could not auto-install $PACKAGE_DEP on resource $resource_id!"
-		openqrm_post_event 0 "dependency" 2 "openqrm-package-functions" "Please manually install $PACKAGE_DEP on resource $resource_id!"
-		return 1
-	else
-		return 0
-	fi
-
-}
-
-
-
-function openqrm_check_requirements() {
-	if [ ! -d "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins" ]; then
-		print_error "$OPENQRM_SERVER_BASE_DIR/openqrm/plugins does not exist. Run make check after installing openQRM!"
-		return 1
-	fi
-	export FORCE_INSTALL=true
-	# check which dependencies to use
-	if [ -f /etc/debian_version ]; then
-		print_message "Checking the requirements for Debian/Ubuntu based systems ..."
-	elif [ -f /etc/redhat-release ]; then
-		print_message "Checking the requirements for RedHat based systems ..."
-		# check for epel-release
-		echo "Checking for epel-release repository ..."
-		if rpm -qa | grep epel-release 1>/dev/null; then
-			echo "-> found epel-release repository available"
-		else
-			echo "ERROR: Please enable the epel-release repository!"
-			return 1
-		fi
-	elif [ -f /etc/SuSE-release ]; then
-		print_message "Checking the requirements for SUSE based systems ..."
-	else
-		print_notice "NOTICE: Could not find out which dependencies to use" \
-			"Please make sure to have all needed components installed!"
-		sleep 4
-		print_message "... Continuing anyway"
-		return 0
-	fi
-
-	print_message "openqrm-server requires: $OPENQRM_SERVER_DEPENDENCIES"
-	for DEP in `echo $OPENQRM_SERVER_DEPENDENCIES | sed -e "s/,//g"`; do
-		openqrm_install_os_dependency $DEP
-		if [ $? != 0 ]; then
-			print_error "$DEP could not be installed. Please install manually to continue"
-			return 1
-		fi
-	done
-
-
-	# get a list of plugins for checking their dependencies
-	OPENQRM_PACKAGE_COMPONENT_LIST=`ls $OPENQRM_SERVER_BASE_DIR/openqrm/plugins`
-	for OPENQRM_PLUGIN in $OPENQRM_PACKAGE_COMPONENT_LIST; do
-		PLUGIN_CONF=$OPENQRM_SOURCE_DIR/plugins/$OPENQRM_PLUGIN/etc/openqrm-plugin-$OPENQRM_PLUGIN"".conf
-		if [ -f $PLUGIN_CONF ]; then
-			. $PLUGIN_CONF
-		else
-			print_notice "openqrm-plugin-$OPENQRM_PLUGIN has no config file. Unable to check dependencies!"
-			continue
-		fi
-		print_message "openqrm-plugin-$OPENQRM_PLUGIN requires: `echo $OPENQRM_PLUGIN_DEPENDENCIES | sed -e "s/openqrm-server//g"`"
-		for DEP in `echo $OPENQRM_PLUGIN_DEPENDENCIES | sed -e "s/,//g" | sed -e "s/openqrm-server//g"`; do
-			openqrm_install_os_dependency $DEP
-			if [ $? != 0 ]; then
-				print_error "$DEP could not be installed. Please install manually to continue"
-				return 1
-			fi
-		done
-	done
-	print_message "Checking for required components finished successfully"
-}
-
-
-
-function openqrm_rpm_package() {
-	CDIR=`pwd`
-	# make sure to have some additional deps installed
-	if [ -f /etc/SuSE-release ]; then
-		export FORCE_INSTALL=true
-		openqrm_install_os_dependency rpm-build
-	else
-		export FORCE_INSTALL=true
-		openqrm_install_os_dependency redhat-rpm-config
-		openqrm_install_os_dependency rpm-build
-		openqrm_install_os_dependency rpmdevtools
-		openqrm_install_os_dependency rpm-devel
-
-		# check for epel-release
-		echo "Checking for epel-release repository ..."
-		if rpm -qa | grep epel-release 1>/dev/null; then
-			echo "-> found epel-release repository available"
-		else
-			echo "ERROR: Please enable the epel-release repository!"
-			return 1
-		fi
-	fi
-
-	# this is only rpm packaging, debian package are build with the standard debian package tools
-	OPENQRM_PACKAGE_ARCHITECTURE=` uname -i`
-	if [ -f /etc/redhat-release ]; then
-		OPENQRM_PACKAGE_SUB_DIR="redhat"
-	elif [ -f /etc/SuSE-release ]; then
-		OPENQRM_PACKAGE_SUB_DIR="packages"
-	fi
-	# check where our build root is. Centos 6 puts it in /root/rpmbuild
-	if [ ! -d "/usr/src/$OPENQRM_PACKAGE_SUB_DIR" ]; then
-		if [ -d /root/rpmbuild ]; then
-			ln -sf /root/rpmbuild /usr/src/$OPENQRM_PACKAGE_SUB_DIR
-		else
-			# here we have just installed rpm-build and no ~/rpmbuild exists yet
-			# we create one by running rpmbuild on a non-existin dummy spec
-			rpmbuild dummy.spec 1>/dev/null 2>&1
-			if [ -d /root/rpmbuild ]; then
-				ln -sf /root/rpmbuild /usr/src/$OPENQRM_PACKAGE_SUB_DIR
-			else
-				echo "ERROR: Could not find nor create the ~/rpmbuild directory!"
-				return 1
-			fi
-		fi
-	fi
-
-	# openqrm package ##########################################################
-
-	# enterprise or community ?
-	if [ -d plugins/cloud-zones ]; then
-		OPENQRM_PACKAGE_NAME="openqrm-enterprise"
-		OPENQRM_PACKAGE_LICENSE="GNU General Public License version 2"
-		OPENQRM_PACKAGE_CONFLICTS="openqrm"
-	else
-		OPENQRM_PACKAGE_NAME="openqrm"
-		OPENQRM_PACKAGE_LICENSE="GPL"
-		OPENQRM_PACKAGE_CONFLICTS="openqrm-enterprise"
-	fi
-	# set postinst + prerm
-	OPENQRM_PACKAGE_PREINSTALL="sh /usr/share/openqrm/etc/init.d/openqrm-server.preinstall"
-	OPENQRM_PACKAGE_PREINSTALL_SCRIPT="/usr/share/openqrm/etc/init.d/openqrm-server.preinstall"
-	OPENQRM_PACKAGE_POSTINSTALL="sh /usr/share/openqrm/etc/init.d/openqrm-server.postinstall"
-	OPENQRM_PACKAGE_PREREMOVE="sh /usr/share/openqrm/etc/init.d/openqrm-server.preremove"
-	# get a list of plugins for checking their dependencies
-	. etc/openqrm-server.conf
-	OPENQRM_PACKAGE_DEPENDENCIES="$OPENQRM_SERVER_DEPENDENCIES"
-	OPENQRM_PACKAGE_COMPONENT_LIST=`ls plugins`
-	for OPENQRM_PLUGIN in $OPENQRM_PACKAGE_COMPONENT_LIST; do
-		PLUGIN_CONF="plugins/$OPENQRM_PLUGIN/etc/openqrm-plugin-$OPENQRM_PLUGIN"".conf"
-		if [ -f $PLUGIN_CONF ]; then
-			. $PLUGIN_CONF
-		fi
-		for DEP in `echo $OPENQRM_PLUGIN_DEPENDENCIES | sed -e "s/,//g" | sed -e "s/openqrm-server//g"`; do
-			if ! echo $OPENQRM_PACKAGE_DEPENDENCIES | grep -w $DEP 1>/dev/null; then
-				OPENQRM_PACKAGE_DEPENDENCIES="$OPENQRM_PACKAGE_DEPENDENCIES, $DEP"
-			fi
-		done
-	done
-	if [ "$OPENQRM_MINOR_RELEASE_VERSION" != "" ]; then
-		export OPENQRM_SERVER_VERSION="$OPENQRM_SERVER_VERSION"."$OPENQRM_MINOR_RELEASE_VERSION"
-	fi
-	# clean up
-	rm -rf /usr/src/$OPENQRM_PACKAGE_SUB_DIR/BUILD/buildtmp /usr/src/$OPENQRM_PACKAGE_SUB_DIR/BUILD/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION
-	# create the source package
-	rm -rf $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION-$OPENQRM_PACKAGE_DISTRIBUTION.$OPENQRM_PACKAGE_ARCHITECTURE/source/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION
-	mkdir -p $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION-$OPENQRM_PACKAGE_DISTRIBUTION.$OPENQRM_PACKAGE_ARCHITECTURE/source/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION
-	cp -aR * $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION-$OPENQRM_PACKAGE_DISTRIBUTION.$OPENQRM_PACKAGE_ARCHITECTURE/source/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION/
-	rm -rf `find $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION-$OPENQRM_PACKAGE_DISTRIBUTION.$OPENQRM_PACKAGE_ARCHITECTURE/source/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION/ -name .svn`
-	# include the thirdparty source packages
-	if [ -d $CDIR/../buildtmp/openqrm-build ]; then
-		cp -aR $CDIR/../buildtmp $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION-$OPENQRM_PACKAGE_DISTRIBUTION.$OPENQRM_PACKAGE_ARCHITECTURE/source/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION/thirdparty
-	else
-		if [ ! -d ~/openqrm-thirdparty-cache ]; then
-			./fill-build-cache
-			cp -aR ../buildtmp $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION-$OPENQRM_PACKAGE_DISTRIBUTION.$OPENQRM_PACKAGE_ARCHITECTURE/source/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION/thirdparty
-		else
-			cp -aR ~/openqrm-thirdparty-cache $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION-$OPENQRM_PACKAGE_DISTRIBUTION.$OPENQRM_PACKAGE_ARCHITECTURE/source/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION/thirdparty
-		fi
-	fi
-	rm -f /usr/src/$OPENQRM_PACKAGE_SUB_DIR/SOURCES/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION.tgz
-	tar -C $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION-$OPENQRM_PACKAGE_DISTRIBUTION.$OPENQRM_PACKAGE_ARCHITECTURE/source/ -czf /usr/src/$OPENQRM_PACKAGE_SUB_DIR/SOURCES/$OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION.tgz $OPENQRM_PACKAGE_NAME-$OPENQRM_SERVER_VERSION/
-
-	# create spec file from template
-	cat rpm/openqrm.spec |	\
-		sed -e "s/OPENQRM_PACKAGE_NAME/$OPENQRM_PACKAGE_NAME/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_VERSION/$OPENQRM_SERVER_VERSION/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_LICENSE/$OPENQRM_PACKAGE_LICENSE/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_ARCHITECTURE/$OPENQRM_PACKAGE_ARCHITECTURE/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_DISTRIBUTION/$OPENQRM_PACKAGE_DISTRIBUTION/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_DEPENDENCIES/$OPENQRM_PACKAGE_DEPENDENCIES/g" |	\
-		sed -e "s/OPENQRM_SERVER_BUILD_REQUIREMENTS/$OPENQRM_SERVER_BUILD_REQUIREMENTS/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_CONFLICTS/$OPENQRM_PACKAGE_CONFLICTS/g" |	\
-		sed -e "s#OPENQRM_BUILD_POSTINSTALL#$OPENQRM_BUILD_POSTINSTALL#g" |	\
-		sed -e "s#OPENQRM_PACKAGE_PREINSTALL_SCRIPT#$OPENQRM_PACKAGE_PREINSTALL_SCRIPT#g" |	\
-		sed -e "s#OPENQRM_PACKAGE_PREINSTALL#$OPENQRM_PACKAGE_PREINSTALL#g" |	\
-		sed -e "s#OPENQRM_PACKAGE_POSTINSTALL#$OPENQRM_PACKAGE_POSTINSTALL#g" |	\
-		sed -e "s#OPENQRM_PACKAGE_PREREMOVE#$OPENQRM_PACKAGE_PREREMOVE#g"	\
-		> /usr/src/$OPENQRM_PACKAGE_SUB_DIR/SOURCES/$OPENQRM_PACKAGE_NAME.spec
-
-	rm -rf $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging
-	mkdir -p $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging/$OPENQRM_PACKAGE_NAME
-	# build the rpm package
-	rpmbuild -ba /usr/src/$OPENQRM_PACKAGE_SUB_DIR/SOURCES/$OPENQRM_PACKAGE_NAME.spec
-	rm -rf $OPENQRM_PACKAGE_TMP_DIR/openqrm-packaging
-}
-
-
-
-
-
-
-# function to create a debian/ubuntu source package
-function openqrm_create_deb_source() {
-	# find out the short distri name
-	if [ -f /etc/debian_version ]; then
-		# debian or ubuntu, try to find out without lsb-release which may not be installed
-		if grep -i ubuntu /etc/apt/sources.list 1>/dev/null; then
-			OPENQRM_SHORT_DISTRI_NAME="ubuntu"
-		else
-			OPENQRM_SHORT_DISTRI_NAME="debian"
-		fi
-	fi
-	# make sure to have some additional deps installed
-	export FORCE_INSTALL=true
-	openqrm_install_os_dependency build-essential
-	openqrm_install_os_dependency pbuilder
-	openqrm_install_os_dependency fakeroot
-	openqrm_install_os_dependency debhelper
-	openqrm_install_os_dependency rpcbind
-	openqrm_install_os_dependency zlib1g-dev
-	openqrm_install_os_dependency lvm2
-	openqrm_install_os_dependency rsync
-	openqrm_install_os_dependency ethtool
-
-	CDIR=`pwd`
-	TMPBUILD_DIR=`mktemp -d /tmp/deb_source.XXXXXXXXXX` || exit 1
-	if [ "$OPENQRM_MINOR_RELEASE_VERSION" != "" ]; then
-		export OPENQRM_SERVER_VERSION="$OPENQRM_SERVER_VERSION"."$OPENQRM_MINOR_RELEASE_VERSION"
-	fi
-	OPENQRM_UBUNTU_VERSION="$OPENQRM_SERVER_VERSION"
-	export OPENQRM_PACKAGE_NAME="openqrm-enterprise"
-	export OPENQRM_PACKAGE_CONFLICTS="openqrm"
-	mkdir -p $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION
-#	tar cf - . --exclude=".svn" | ( cd $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/; tar xfp -)
-	tar cf - . | ( cd $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/; tar xfp -)
-	cd $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/
-
-	#create deps
-	OPENQRM_PACKAGE_DEPENDENCIES="$OPENQRM_SERVER_DEPENDENCIES"
-	OPENQRM_PACKAGE_COMPONENT_LIST=`ls plugins | grep -v Makefile`
-	for OPENQRM_PLUGIN in $OPENQRM_PACKAGE_COMPONENT_LIST; do
-		rm -rf plugins/$OPENQRM_PLUGIN
-	done
-
-	# copy changelog for package naming
-	cp -f debian/changelog.$OPENQRM_SHORT_DISTRI_NAME debian/changelog
-	sed -i -e "s/^openqrm/openqrm-enterprise/g" debian/changelog
-	for F in `ls debian/openqrm.*`; do
-		FNEW=`echo $F | sed -e "s/openqrm/openqrm-enterprise/g"`
-		mv -f $F $FNEW
-	done
-	# use the enterprise copyright
-	if [ -f debian/copyright.enterprise ]; then
-		mv -f debian/copyright.enterprise debian/copyright
-	fi
-	# create spec file from template
-	cat debian/control |	\
-		sed -e "s/OPENQRM_PACKAGE_NAME/$OPENQRM_PACKAGE_NAME/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_DEPENDENCIES/$OPENQRM_PACKAGE_DEPENDENCIES/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_CONFLICTS/$OPENQRM_PACKAGE_CONFLICTS/g" \
-		> debian/control.configured
-	mv -f debian/control.configured debian/control
-	# remove svn dirs
-	rm -rf `find -name .svn `
-	# avoid the following build confs.
-	rm -f etc/build.conf/adodb.conf
-	rm -f etc/build.conf/busybox.conf
-	rm -f etc/build.conf/dropbear.conf
-	rm -f etc/build.conf/initrd-devices.conf
-	rm -f etc/build.conf/pciutils.conf
-
-	TPDIR=""
-	if [ -d $CDIR/../buildtmp/openqrm-build ]; then
-		TPDIR="$CDIR/../buildtmp"
-	else
-		if [ ! -d ~/openqrm-thirdparty-cache ]; then
-			./fill-build-cache
-			TPDIR="../buildtmp"
-		else
-			TPDIR="~/openqrm-thirdparty-cache"
-		fi
-	fi
-	if [ "$TPDIR" != "" ]; then
-		mkdir -p thirdparty/openqrm-build
-		cp -aR $TPDIR/openqrm-build/htmlobjects thirdparty/openqrm-build/
-		cp -aR $TPDIR/openqrm-build/jqclock thirdparty/openqrm-build/
-		cp -aR $TPDIR/openqrm-build/jquery thirdparty/openqrm-build/
-		cp -aR $TPDIR/openqrm-build/js-interface thirdparty/openqrm-build/
-		cp -aR $TPDIR/openqrm-build/jsmin thirdparty/openqrm-build/
-		cp -aR $TPDIR/openqrm-build/phplib thirdparty/openqrm-build/
-		cp -aR $TPDIR/openqrm-build/treemenuicons thirdparty/openqrm-build/
-		cp -aR $TPDIR/openqrm-build/treemenujs thirdparty/openqrm-build/
-		cp -aR $TPDIR/openqrm-build/openqrm-initrd-template.* thirdparty/openqrm-build/
-	fi
-
-	# prepare openqrm_[version].orig.tar.gz
-	cd $TMPBUILD_DIR/
-	mv $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/debian .
-	tar -czf $OPENQRM_PACKAGE_NAME"_"$OPENQRM_UBUNTU_VERSION.orig.tar.gz $OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION
-	mv $TMPBUILD_DIR/debian $OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/
-	# build the source package
-	cd $OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION
-	if [ "$GPGKEY" != "" ]; then
-		dpkg-buildpackage -S -sa -rfakeroot -k$GPGKEY
-	else
-		dpkg-buildpackage -S -sa -rfakeroot
-	fi
-	cd $CDIR
-	mv -f $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME"_"* ../
-	rm -rf $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION
-	rm -rf $TMPBUILD_DIR/buildtmp
-	rmdir $TMPBUILD_DIR
-}
-
-
-# function to create a debian/ubuntu binary package via pbuilder
-function openqrm_pbuilder() {
-	CDIR=`pwd`
-	# find out the short distri name
-	if [ -f /etc/debian_version ]; then
-		# debian or ubuntu, try to find out without lsb-release which may not be installed
-		if grep -i ubuntu /etc/apt/sources.list 1>/dev/null; then
-			OPENQRM_SHORT_DISTRI_NAME="ubuntu"
-		else
-			OPENQRM_SHORT_DISTRI_NAME="debian"
-		fi
-	fi
-	# make sure to have some additional deps installed
-	export FORCE_INSTALL=true
-	openqrm_install_os_dependency build-essential
-	openqrm_install_os_dependency pbuilder
-	openqrm_install_os_dependency fakeroot
-	openqrm_install_os_dependency debhelper
-	openqrm_install_os_dependency rpcbind
-	openqrm_install_os_dependency zlib1g-dev
-	openqrm_install_os_dependency lvm2
-
-	OPENQRM_UBUNTU_VERSION=`cat debian/changelog.$OPENQRM_SHORT_DISTRI_NAME | head -n1 | cut -d'(' -f2 | cut -d')' -f1`
-	DISTRIBUTION_VERSION=`cat debian/changelog.$OPENQRM_SHORT_DISTRI_NAME  | head -n1 | cut -d';' -f1 | awk '{ print $3 }'`
-	OPENQRM_PACKAGE_NAME="openqrm-enterprise"
-	PACKAGE_DESCRIPTION=$OPENQRM_PACKAGE_NAME"_"$OPENQRM_UBUNTU_VERSION.dsc
-	if [ ! -f "../$PACKAGE_DESCRIPTION" ]; then
-		openqrm_create_deb_source
-	fi
-	cd ..
-	# set proxy env for pbuilder if needed
-	PBUILDER_PROXY=""
-	if grep http_proxy /root/.bashrc 1>/dev/null 2>/dev/null; then
-		PBUILDER_PROXY=`grep http_proxy /root/.bashrc | head -n1 | sed -e "s/.*=//g" | sed -e 's/"//g'`
-		export PBUILDER_PROXY_PARAMETER=" --http-proxy $PBUILDER_PROXY"
-	fi
-	# check if to init pbuilder
-	if [ ! -f /var/cache/pbuilder/base.tgz ]; then
-		pbuilder create --distribution $DISTRIBUTION_VERSION $PBUILDER_PROXY_PARAMETER
-	fi
-	# run pbuilder
-	pbuilder build $PACKAGE_DESCRIPTION $PBUILDER_PROXY_PARAMETER
-	echo
-	echo "Packaging finished. Please find the created packages in /var/cache/pbuilder/result"
-	ls -lh /var/cache/pbuilder/result/openqrm*
-	cd $CDIR
-}
-
-
-
-
-
-
-
-# function to create a debian/ubuntu plugin source package
-function openqrm_plugin_create_deb_source() {
-
-	PLUGIN_NAME=$1
-	echo "- building plugin package $PLUGIN_NAME"
-	# find out the short distri name
-	if [ -f /etc/debian_version ]; then
-		# debian or ubuntu, try to find out without lsb-release which may not be installed
-		if grep -i ubuntu /etc/apt/sources.list 1>/dev/null; then
-			OPENQRM_SHORT_DISTRI_NAME="ubuntu"
-		else
-			OPENQRM_SHORT_DISTRI_NAME="debian"
-		fi
-	fi
-	# make sure to have some additional deps installed
-	export FORCE_INSTALL=true
-	openqrm_install_os_dependency build-essential
-	openqrm_install_os_dependency pbuilder
-	openqrm_install_os_dependency fakeroot
-	openqrm_install_os_dependency debhelper
-	openqrm_install_os_dependency rpcbind
-	openqrm_install_os_dependency zlib1g-dev
-	openqrm_install_os_dependency lvm2
-
-	CDIR=`pwd`
-	TMPBUILD_DIR=`mktemp -d /tmp/deb_source.XXXXXXXXXX` || exit 1
-
-	. plugins/$PLUGIN_NAME/etc/openqrm-plugin-$PLUGIN_NAME.conf
-	OPENQRM_UBUNTU_VERSION="$OPENQRM_PLUGIN_VERSION"
-	export OPENQRM_PACKAGE_NAME="openqrm-enterprise-plugin-$PLUGIN_NAME"
-	export OPENQRM_PACKAGE_CONFLICTS="openqrm"
-	mkdir -p $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION
-#	tar cf - . --exclude=".svn" | ( cd $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/; tar xfp -)
-	tar cf - . | ( cd $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/; tar xfp -)
-	cd $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/
-
-	#create deps
-	OPENQRM_PACKAGE_DEPENDENCIES=`echo $OPENQRM_PLUGIN_DEPENDENCIES | sed -e "s/openqrm-server/openqrm-enterprise/g"`
-
-	# copy changelog for package naming
-	cp -f debian/changelog.$OPENQRM_SHORT_DISTRI_NAME debian/changelog
-	sed -i -e "s/^openqrm/openqrm-enterprise-plugin-$PLUGIN_NAME/g" debian/changelog
-	for F in `ls debian/openqrm.*`; do
-		FNEW=`echo $F | sed -e "s/openqrm/openqrm-enterprise-plugin-$PLUGIN_NAME/g"`
-		mv -f $F $FNEW
-	done
-
-	# adapt rules, not copying docs
-	cp -f debian/rules.plugin debian/rules
-	rm -f debian/rules.plugin
-	# remove postinst, postrm and preinst
-	rm -f debian/openqrm*.postinst
-	rm -f debian/openqrm*.postrm
-	rm -f debian/openqrm*.preinst
-	rm -f debian/openqrm*.prerm
-
-	# use the enterprise copyright
-	if [ -f debian/copyright.enterprise ]; then
-		mv -f debian/copyright.enterprise debian/copyright
-	fi
-	# create spec file from template
-	cat debian/control |	\
-		sed -e "s/OPENQRM_PACKAGE_NAME/$OPENQRM_PACKAGE_NAME/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_DEPENDENCIES/$OPENQRM_PACKAGE_DEPENDENCIES/g" |	\
-		sed -e "s/OPENQRM_PACKAGE_CONFLICTS/$OPENQRM_PACKAGE_CONFLICTS/g" \
-		> debian/control.configured
-	mv -f debian/control.configured debian/control
-	# remove svn dirs
-	rm -rf `find -name .svn `
-
-	# remove base
-	rm -rf bin doc rpm sbin tftpboot web
-	# re-create empty Makefile for etc
-	rm -rf etc/build.conf etc/db etc/enterprise etc/httpd etc/init.d etc/templates
-	rm -f etc/Makefile
-	echo "all:" > etc/Makefile
-	echo "install:" >> etc/Makefile
-	echo "clean:" >> etc/Makefile
-	echo "realclean:" >> etc/Makefile
-	echo "uninstall:" >> etc/Makefile
-	echo "configure:" >> etc/Makefile
-	echo "compile:" >> etc/Makefile
-	# re-create empty Makefile for include
-	rm -f include/Makefile
-	echo "all:" > include/Makefile
-	echo "install:" >> include/Makefile
-	echo "clean:" >> include/Makefile
-	echo "realclean:" >> include/Makefile
-	echo "uninstall:" >> include/Makefile
-	echo "configure:" >> include/Makefile
-	echo "compile:" >> include/Makefile
-
-	# remove all other plugins
-	OPENQRM_PACKAGE_COMPONENT_LIST=`ls plugins | grep -v Makefile | grep -v ^$PLUGIN_NAME$`
-	for OPENQRM_PLUGIN in $OPENQRM_PACKAGE_COMPONENT_LIST; do
-		rm -rf plugins/$OPENQRM_PLUGIN
-	done
-
-	TPDIR=""
-	if [ -d $CDIR/../buildtmp/openqrm-build ]; then
-		TPDIR="$CDIR/../buildtmp"
-	else
-		if [ ! -d ~/openqrm-thirdparty-cache ]; then
-			./fill-build-cache
-			TPDIR="../buildtmp"
-		else
-			TPDIR="~/openqrm-thirdparty-cache"
-		fi
-	fi
-	if [ "$TPDIR" != "" ]; then
-		mkdir -p thirdparty/openqrm-build
-
-		if [ -d plugins/$PLUGIN_NAME/etc/build.conf ]; then
-			echo "- configuring build cache for plugin $PLUGIN_NAME"
-			for BUILD_CONF in `ls plugins/$PLUGIN_NAME/etc/build.conf/ | sed -e "s/\.conf//g"`; do
-				echo "- copying $BUILD_CONF to build cache"
-				cp -aR $TPDIR/openqrm-build/$BUILD_CONF thirdparty/openqrm-build/
-			done
-		fi
-	fi
-
-	# prepare openqrm_[version].orig.tar.gz
-	cd $TMPBUILD_DIR/
-	mv $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/debian .
-	tar -czf $OPENQRM_PACKAGE_NAME"_"$OPENQRM_UBUNTU_VERSION.orig.tar.gz $OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION
-	mv $TMPBUILD_DIR/debian $OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION/
-	# build the source package
-	cd $OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION
-	if [ "$GPGKEY" != "" ]; then
-		dpkg-buildpackage -S -sa -rfakeroot -k$GPGKEY
-	else
-		dpkg-buildpackage -S -sa -rfakeroot
-	fi
-	cd $CDIR
-	mv -f $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME"_"* ../
-	rm -rf $TMPBUILD_DIR/$OPENQRM_PACKAGE_NAME-$OPENQRM_UBUNTU_VERSION
-	rm -rf $TMPBUILD_DIR/buildtmp
-	rmdir $TMPBUILD_DIR
-}
-
-
-
-
-# function to create a debian/ubuntu plugin binary package via pbuilder
-function openqrm_plugin_pbuilder() {
-
-	PLUGIN_NAME=$1
-	CDIR=`pwd`
-	# find out the short distri name
-	if [ -f /etc/debian_version ]; then
-		# debian or ubuntu, try to find out without lsb-release which may not be installed
-		if grep -i ubuntu /etc/apt/sources.list 1>/dev/null; then
-			OPENQRM_SHORT_DISTRI_NAME="ubuntu"
-		else
-			OPENQRM_SHORT_DISTRI_NAME="debian"
-		fi
-	fi
-	# make sure to have some additional deps installed
-	export FORCE_INSTALL=true
-	openqrm_install_os_dependency build-essential
-	openqrm_install_os_dependency pbuilder
-	openqrm_install_os_dependency fakeroot
-	openqrm_install_os_dependency debhelper
-	openqrm_install_os_dependency rpcbind
-	openqrm_install_os_dependency zlib1g-dev
-	openqrm_install_os_dependency lvm2
-
-	OPENQRM_UBUNTU_VERSION=`cat debian/changelog.$OPENQRM_SHORT_DISTRI_NAME | head -n1 | cut -d'(' -f2 | cut -d')' -f1`
-	DISTRIBUTION_VERSION=`cat debian/changelog.$OPENQRM_SHORT_DISTRI_NAME  | head -n1 | cut -d';' -f1 | awk '{ print $3 }'`
-	OPENQRM_PACKAGE_NAME="openqrm-enterprise-plugin-$PLUGIN_NAME"
-	PACKAGE_DESCRIPTION=$OPENQRM_PACKAGE_NAME"_"$OPENQRM_UBUNTU_VERSION.dsc
-	if [ ! -f "../$PACKAGE_DESCRIPTION" ]; then
-		openqrm_plugin_create_deb_source $PLUGIN_NAME
-	fi
-	cd ..
-	# set proxy env for pbuilder if needed
-	PBUILDER_PROXY=""
-	if grep http_proxy /root/.bashrc 1>/dev/null 2>/dev/null; then
-		PBUILDER_PROXY=`grep http_proxy /root/.bashrc | head -n1 | sed -e "s/.*=//g" | sed -e 's/"//g'`
-		export PBUILDER_PROXY_PARAMETER=" --http-proxy $PBUILDER_PROXY"
-	fi
-	# check if to init pbuilder
-	if [ ! -f /var/cache/pbuilder/base.tgz ]; then
-		pbuilder create --distribution $DISTRIBUTION_VERSION $PBUILDER_PROXY_PARAMETER
-	fi
-	# run pbuilder
-	pbuilder build $PACKAGE_DESCRIPTION $PBUILDER_PROXY_PARAMETER
-	echo
-	echo "Packaging finished. Please find the created packages in /var/cache/pbuilder/result"
-	ls -lh /var/cache/pbuilder/result/openqrm*
-	cd $CDIR
-}
-
-
-
-
-# function to create a debian/ubuntu plugin binary package via pbuilder
-function openqrm_packages() {
-	clear
-	echo "building base"
-	sleep 5
-	openqrm_create_deb_source
-	openqrm_pbuilder
-
-	for PLUGIN in `ls plugins | grep -v Makefile`; do
-		clear
-		echo "building plugin $PLUGIN"
-		sleep 5
-		openqrm_plugin_create_deb_source $PLUGIN
-		openqrm_plugin_pbuilder $PLUGIN
-	done
-	
-}
diff --git a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-cmd-queue b/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-cmd-queue
deleted file mode 100644
index ce6f86e..0000000
--- a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-cmd-queue
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/bin/bash
-#  openQRM-cmd-queue read queued commands and runs them
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../..
-	OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-fi
-export OPENQRM_SERVER_BASE_DIR
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-OPENQRM_COMMAND_QUEUE="$OPENQRM_SERVER_BASE_DIR/openqrm/var/spool/"
-# get config for posting events
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-functions
-. $OPENQRM_SERVER_BASE_DIR/openqrm/include/openqrm-server-functions
-openqrm_server_get_config
-OPENQRM_SERVER_IP=$OPENQRM_SERVER_IP_ADDRESS
-resource_id=0
-resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-OPENQRM_QUEUEING_DELAY=0.5
-SEQ=1
-RETRY=3
-RETRY_DELAY=10
-# defines how long commands are allowed to run
-DEFAULT_CMD_TIMEOUT=$OPENQRM_DEFAULT_CMD_TIMEOUT
-
-function cmd_queue_log() {
-	local PRIO=$1
-	shift
-	local CQLOG=$@
-	echo "openQRM-cmd-queu $PRIO : $CQLOG" | logger
-}
-
-
-function cmd_timeout() {
-	[ $# -eq 2 ] || cmd_queue_log ERROR "cmd_timeout takes 2 arguments"
-	sleep_time=$1
-	command=$2
-	$command &
-	cmd_pid=$!
-	( sleep $sleep_time && kill $cmd_pid && cmd_queue_log ERROR "Killed $command due to timeout $sleep_time exceeded" ) &
-	killer_pid=$!
-	wait $cmd_pid &> /dev/null
-	wait_status=$?
-	if [ $wait_status == 0 ]; then
-		disown $killer_pid
-		kill $killer_pid &> /dev/null
-	else
-		kill `ps ax | grep dbclient | grep dropbear_rsa_host_key | awk {' print $1 '}` 2>/dev/null
-	fi
-	return $wait_status
-}
-
-# dir to store the failed cmds for the ui
-if [ ! -d "$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors" ]; then
-	mkdir -p $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors
-	chmod -R 777 $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors
-fi
-
-cd $OPENQRM_COMMAND_QUEUE
-while (true); do
-	for OPENQRM_COMMAND_FILE in `ls -tr --time-style=full-iso openqrm-queue* 2>/dev/null`; do
-		chmod +x $OPENQRM_COMMAND_FILE
-		COMMAND_TOKEN=`echo $OPENQRM_COMMAND_FILE | cut -d'.' -f2`
-		TIMEOUT_TOKEN=`echo $OPENQRM_COMMAND_FILE | cut -d'.' -f3`
-		if [ "$TIMEOUT_TOKEN" == "" ]; then
-			CMD_TIMEOUT=$DEFAULT_CMD_TIMEOUT
-			cmd_queue_log NOTICE "Running $COMMAND_TOKEN with default cmd-timeout $CMD_TIMEOUT"
-		else
-			CMD_TIMEOUT=$TIMEOUT_TOKEN
-			cmd_queue_log NOTICE "Running $COMMAND_TOKEN with custom cmd-timeout $CMD_TIMEOUT"
-		fi
-		OPENQRM_COMMAND=`cat $OPENQRM_COMMAND_FILE | sed -e 's/-u [^ ]* /-u xxxxxxxx /g' -e 's/-p [^ ]*/-p xxxxxxxx /g'`
-		cmd_queue_log NOTICE "Running $COMMAND_TOKEN : $OPENQRM_COMMAND"
-		cmd_timeout $CMD_TIMEOUT ./$OPENQRM_COMMAND_FILE 2>ouput.$COMMAND_TOKEN
-		COMMAND_RES=$?
-		if [ "$COMMAND_RES" != "0" ]; then
-			# check if we should retry
-			if [ "$OPENQRM_CMD_QUEUE_RETRY" == "true" ]; then
-				# put it in the failed queue
-				mv -f $OPENQRM_COMMAND_FILE failed-cmd.1.$COMMAND_TOKEN
-				OPENQRM_COMMAND_OUTPUT=`cat ouput.$COMMAND_TOKEN`
-				cmd_queue_log WARNING "Command with token $FAILED_COMMAND_TOKEN failed : $OPENQRM_COMMAND  ----- $OPENQRM_COMMAND_OUTPUT"
-			else
-				cmd_queue_log ERROR "Command with token $COMMAND_TOKEN failed : $OPENQRM_COMMAND  ----- $OPENQRM_COMMAND_OUTPUT"
-				openqrm_post_event 0 "base-engine" 2 "openqrm-cmd-queue" "ERROR running token $COMMAND_TOKEN"
-				# move to event errors for debug
-				mv -f $OPENQRM_COMMAND_FILE $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors/$COMMAND_TOKEN.cmd
-				mv -f ouput.$COMMAND_TOKEN $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors/$COMMAND_TOKEN.out
-				chmod -R 777 $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors/$COMMAND_TOKEN.*
-			fi
-		else
-			rm -f $OPENQRM_COMMAND_FILE
-		fi
-		rm -f ouput.$COMMAND_TOKEN
-	done
-	SEQ=$(( SEQ + 1 ))
-
-	# check the failed queue
-	if [ "$SEQ" == "$RETRY_DELAY" ]; then
-		for FAILED_OPENQRM_COMMAND_FILE in `ls -tr --time-style=full-iso failed-cmd* 2>/dev/null`; do
-			chmod +x $FAILED_OPENQRM_COMMAND_FILE
-			FAILED_COMMAND_RETRY_COUNT=`echo $FAILED_OPENQRM_COMMAND_FILE | cut -d'.' -f2`
-			FAILED_COMMAND_TOKEN=`echo $FAILED_OPENQRM_COMMAND_FILE | cut -d'.' -f3`
-			FAILED_TIMEOUT_TOKEN=`echo $FAILED_OPENQRM_COMMAND_FILE | cut -d'.' -f4`
-			if [ "$FAILED_TIMEOUT_TOKEN" == "" ]; then
-				CMD_TIMEOUT=$DEFAULT_CMD_TIMEOUT
-				cmd_queue_log NOTICE "Running failed $COMMAND_TOKEN with default cmd-timeout $CMD_TIMEOUT"
-			else
-				CMD_TIMEOUT=$FAILED_TIMEOUT_TOKEN
-				cmd_queue_log NOTICE "Running failed $COMMAND_TOKEN with custom cmd-timeout $CMD_TIMEOUT"
-			fi
-			FAILED_OPENQRM_COMMAND=`cat $FAILED_OPENQRM_COMMAND_FILE | sed -e 's/-u [^ ]* /-u xxxxxxxx /g' -e 's/-p [^ ]*/-p xxxxxxxx /g'`
-			cmd_queue_log NOTICE "$FAILED_COMMAND_RETRY_COUNT. retry for Command $FAILED_COMMAND_TOKEN : $FAILED_OPENQRM_COMMAND"
-			cmd_timeout $CMD_TIMEOUT ./$FAILED_OPENQRM_COMMAND_FILE 2>ouput.$FAILED_COMMAND_TOKEN
-			FAILED_COMMAND_RES=$?
-			if [ "$FAILED_COMMAND_RES" != "0" ]; then
-				FAILED_OPENQRM_COMMAND_OUTPUT=`cat ouput.$FAILED_COMMAND_TOKEN`
-				if [ "$FAILED_COMMAND_RETRY_COUNT" == "$RETRY" ]; then
-					# too many retries, remove the cmd and log the error + debug
-					cmd_queue_log ERROR "Command $FAILED_COMMAND_TOKEN failed for $RETRY. retries : $FAILED_OPENQRM_COMMAND"
-					openqrm_post_event 0 "base-engine" 2 "openqrm-cmd-queue" "ERROR running token $FAILED_COMMAND_TOKEN"
-					# move to event errors for debug
-					mv -f $FAILED_OPENQRM_COMMAND_FILE $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors/$FAILED_COMMAND_TOKEN.cmd
-					mv -f ouput.$FAILED_COMMAND_TOKEN $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors/$FAILED_COMMAND_TOKEN.out
-					chmod -R 777 $OPENQRM_SERVER_BASE_DIR/openqrm/web/base/server/event/errors/$FAILED_COMMAND_TOKEN.*
-				else
-					# put it in the failed queue again
-					NEXT_FAILED_COMMAND_RETRY_COUNT=$(( FAILED_COMMAND_RETRY_COUNT + 1 ))
-					mv -f $FAILED_OPENQRM_COMMAND_FILE failed-cmd.$NEXT_FAILED_COMMAND_RETRY_COUNT.$FAILED_COMMAND_TOKEN
-					cmd_queue_log WARNING "$FAILED_COMMAND_RETRY_COUNT. retry failed for Command $FAILED_COMMAND_TOKEN : $FAILED_OPENQRM_COMMAND ----- $FAILED_OPENQRM_COMMAND_OUTPUT"
-				fi
-			else
-				rm -f $FAILED_OPENQRM_COMMAND_FILE
-			fi
-			rm -f ouput.$FAILED_COMMAND_TOKEN
-		done
-		SEQ=1
-	fi
-	sleep $OPENQRM_QUEUEING_DELAY
-done
-
diff --git a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-crypt b/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-crypt
deleted file mode 100644
index 870d896..0000000
--- a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-crypt
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/perl -w
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-use strict;
-my ($plain) = @ARGV;
-my $itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-my $salt;
-for (1..2) { $salt .= substr $itoa64, rand(length($itoa64)), 1; }
-my $password = crypt($plain, $salt);
-
-print "<\?php\n";
-print "\$thisfile = basename(\$_SERVER['PHP_SELF']);\n";
-print "echo \"$password\";\n";
-print "unlink(\$thisfile);\n";
-print "\?>\n";
-
-
-
-
diff --git a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-exec b/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-exec
deleted file mode 100644
index 022bbb7..0000000
--- a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-exec
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/bash
-#  openQRM-exec, an openQRM-util for remote exection of openQRM-commands
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-if [ "$OPENQRM_SERVER_BASE_DIR" == "" ]; then
-	OPENQRM_SERVER_BASE_DIR=$(dirname $0)/../..
-	OPENQRM_SERVER_BASE_DIR=$(pushd $OPENQRM_SERVER_BASE_DIR > /dev/null && echo $PWD && popd > /dev/null)
-fi
-export OPENQRM_SERVER_BASE_DIR
-. $OPENQRM_SERVER_BASE_DIR/openqrm/etc/openqrm-server.conf
-DB_IDLE=0
-DB_TIMEOUT=10
-OPENQRM_COMMAND_QUEUE="$OPENQRM_SERVER_BASE_DIR/openqrm/var/spool/openqrm-queue"
-WHOAMI=`whoami`
-OQLOCKFILE="$OPENQRM_SERVER_BASE_DIR/openqrm/var/lock/openqrm-queue"
-
-
-
-function lockit() {
-	LOCKLOOP=0
-	MAXLOCKLOOP=4
-	while (:); do
-		if ( set -o noclobber; echo "locked" > "$OQLOCKFILE") 2> /dev/null; then
-			trap 'rm -f "$OQLOCKFILE"; exit $?' INT TERM EXIT
-			break
-		else
-			LOCKLOOP=$(( LOCKLOOP + 1 ))
-			if (( $LOCKLOOP > $MAXLOCKLOOP )); then
-				unlockit
-			fi
-		fi
-		sleep 1
-	done
-}
-
-function unlockit() {
-	rm -f "$OQLOCKFILE"
-}
-
-
-
-# parse commandline args
-while [ $# -ne 0 ]; do
-	case "$1" in
-		-i)
-			RESOURCE_IP=$2
-			shift
-			;;
-		-t)
-			COMMAND_TOKEN=$2
-			shift
-			;;
-		-l)
-			COMMAND_LOCAL=$2
-			shift
-			;;
-		-c)
-			shift
-			OPENQRM_COMMAND=$@
-			shift
-			;;
-	esac
-	shift
-done
-# checks
-if [ "$RESOURCE_IP" == "0.0.0.0" ]; then
-	echo "openQRM-exec ERROR: Not running command on invalid ip address 0.0.0.0" | logger
-	exit 0
-fi
-if [ "$RESOURCE_IP" == "" ]; then
-	echo "openQRM-exec ERROR: Not running command on empty ip address" | logger
-	exit 0
-fi
-# run
-if [ "$COMMAND_LOCAL" == "true" ]; then
-	FULL_COMMAND="$OPENQRM_SERVER_BASE_DIR/openqrm/bin/openqrm-cmd $OPENQRM_COMMAND"
-else
-	FULL_COMMAND="dbclient -K $DB_TIMEOUT -y -i $OPENQRM_SERVER_BASE_DIR/openqrm/etc/dropbear/dropbear_rsa_host_key -p $OPENQRM_EXEC_PORT root@$RESOURCE_IP \"$OPENQRM_SERVER_BASE_DIR/openqrm/bin/openqrm-cmd $OPENQRM_COMMAND\""
-fi
-# echo "openQRM engine (as $WHOAMI) queuing : $FULL_COMMAND" | logger
-lockit
-echo "$FULL_COMMAND" >> $OPENQRM_COMMAND_QUEUE.$COMMAND_TOKEN
-sleep 0.1
-unlockit
-
diff --git a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-monitord b/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-monitord
deleted file mode 100644
index ad3f9ec..0000000
--- a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-monitord
+++ /dev/null
@@ -1,249 +0,0 @@
-#!/bin/bash
-# openqrm-monitord, a openQRM daemon for gathering system statistics
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-OPENQRM_SBIN_DIR=`dirname $0`
-OPENQRM_BASE_DIR=`pushd $OPENQRM_SBIN_DIR/.. 1>/dev/null && pwd && popd 1>/dev/null`
-OPENQRM_EVENT="statistics"
-OPENQRM_ACTIVE_STATE="active"
-OPENQRM_STARTING_STATE="starting"
-
-# check if running on the server or on a managed resource
-if [ -f "$OPENQRM_BASE_DIR/include/openqrm-server-functions" ]; then
-	# we are running on the server
-	. $OPENQRM_BASE_DIR/include/openqrm-functions
-	. $OPENQRM_BASE_DIR/include/openqrm-server-functions
-	export resource_id=0
-	export resource_senddelay=10
-	export resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS
-	export SERVER_PROTOCOL=$OPENQRM_WEB_PROTOCOL
-	export resource_mac=`ip a s $OPENQRM_SERVER_INTERFACE | grep -w $OPENQRM_SERVER_INTERFACE$ | grep "link/ether" | awk '{ print $2 }'`
-else
-	# we are running on a managed resource
-	export OPENQRM_SERVER_BASE_DIR=$OPENQRM_BASE_DIR
-	. $OPENQRM_BASE_DIR/include/openqrm-functions
-	. $OPENQRM_RESOURCE_PARAMETER_FILE
-	export SERVER_PROTOCOL=$openqrm_web_protocol
-fi
-# define wget to use with https
-if [ "$SERVER_PROTOCOL" == "https" ]; then
-	export WGET="wget --no-check-certificate -q -O /dev/null"
-	if [ "$resource_id" == "0" ]; then
-		export WGET="wget --bind-address=$OPENQRM_SERVER_IP_ADDRESS --no-check-certificate -q -O /dev/null"
-	fi
-else
-	export WGET="wget -q -O /dev/null"
-	if [ "$resource_id" == "0" ]; then
-		export WGET="wget --bind-address=$OPENQRM_SERVER_IP_ADDRESS -q -O /dev/null"
-	fi
-fi
-# set timeout
-export WGET="$WGET -T 300 -t 1"
-
-
-# local used functions
-function send_info() {
-	if [ -f /etc/initrd-devices.conf ] && [ "$image_type" != "ram" ]; then
-		current_state=`urlencodestring $OPENQRM_STARTING_STATE`
-	else
-		current_state=`urlencodestring $OPENQRM_ACTIVE_STATE`
-	fi
-
-	current_event=`urlencodestring $OPENQRM_EVENT`
-	MESSAGEDATA="resource_id=$resource_id&resource_uptime=$current_uptime&resource_cpunumber=$current_cpu_number&resource_cpuspeed=$current_cpu_speed&resource_cpumodel=$current_cpu_model&resource_memtotal=$current_mem_total&resource_memused=$current_mem_used&resource_swaptotal=$current_swap_total&resource_swapused=$current_swap_used&resource_hostname=$current_hostname&resource_load=$current_cpu_load&resource_nics=$current_nic_count&resource_state=$current_state&resource_event=$current_event";
-	# add mac of openQRM to messagedata
-	if [ "$resource_id" == "0" ]; then
-		MESSAGEDATA=$MESSAGEDATA"&resource_mac=$resource_mac"
-	fi
-	OPENQRM_RESOURCE_INFO_URL="$SERVER_PROTOCOL://$resource_openqrmserver/openqrm/action/resource-monitor.php?resource_command=update_info&$MESSAGEDATA"
-	$WGET "$OPENQRM_RESOURCE_INFO_URL"
-}
-
-
-# converts bytes to mega-bytes
-function bytes_to_mega() {
-	echo $1 | awk '{printf("%.0f",  $1 /  1024/ 1024)}'
-}
-
-
-# statistic gathering functions
-
-# uptime
-function find_uptime() {
-	if [ -f /proc/uptime ]; then
-		current_uptime=`cat /proc/uptime | cut -d'.' -f 1`
-	fi
-	if [ -z "$current_uptime" ]; then
-		current_uptime=0
-	fi
-}
-
-
-
-# cpu_number
-function find_cpu_number() {
-	if [ -f /proc/stat ]; then
-		current_cpu_number=`grep '^cpu[0-9]' /proc/stat | wc -l`
-		current_cpu_number=${current_cpu_number// /}
-	fi
-	if [ -z "$current_cpu_number" ]; then
-		current_cpu_number=0
-	fi
-}
-
-# cpu_speed
-function find_cpu_speed() {
-	if [ -f /proc/cpuinfo ]; then
-		current_cpu_speed=(`cat /proc/cpuinfo | grep "cpu.*MHz"`)
-		current_cpu_speed=${current_cpu_speed[3]/\.*/}
-	fi
-	if [ -z "$current_cpu_speed" ]; then
-		current_cpu_speed=0
-	fi
-}
-
-
-# cpu_model
-function find_cpu_model() {
-	if [ -f /proc/cpuinfo ]; then
-		current_cpu_model=`cat /proc/cpuinfo | grep "model.*name" | head -n 1 | tr -s ' ' | cut -d' ' -f 3-`
-		current_cpu_model=`urlencodestring $current_cpu_model`
-	fi
-	if [ -z "$current_cpu_model" ]; then
-		current_cpu_model=0
-	fi
-}
-
-# how many nics we have
-function find_nics() {
-	local BR=""
-	for b in `brctl show | grep -v STP | awk {' print $1 '}`; do BR="$BR $b"; done
-	for i in `ip a s | grep ^[0-9] | cut -d':' -f2 | awk '{ print $1 }' | grep -v lo | grep -v tap`; do
-		if ! echo $BR | grep $i 1>/dev/null; then
-				current_nic_count=$(( current_nic_count + 1 ))
-		fi
-	done
-	if [ -z "$current_nic_count" ]; then
-			current_nic_count=0
-	fi
-}
-
-# mem_total
-function find_mem_total() {
-	if [ -f /proc/meminfo ]; then
-		current_mem_total=`cat /proc/meminfo | awk '/MemTotal:/ { print int($2/1024) };'`
-	fi
-}
-
-# mem_used
-function find_mem_used() {
-	if [ -f /proc/meminfo ]; then
-		if [ -z "$current_mem_total" ]; then
-			current_mem_total=`cat /proc/meminfo | awk '/MemTotal:/ { print int($2/1024) };'`
-		fi
-		current_mem_free=`cat /proc/meminfo | awk '/MemFree:/ { print int($2/1024) };'`
-		current_mem_used=$((current_mem_total - current_mem_free))
-	fi
-	if [ -z "$current_mem_used" ]; then
-		current_mem_used=0
-	fi
-}
-
-
-# swap_total
-function find_swap_total() {
-	if [ -f /proc/meminfo ]; then
-		current_swap_total=`cat /proc/meminfo | awk '/SwapTotal:/ { print int($2/1024) };'`
-	fi
-}
-
-# swap_used
-function find_swap_used() {
-	if [ -f /proc/meminfo ]; then
-		if [ -z "$current_swap_total" ]; then
-			current_swap_total=`cat /proc/meminfo | awk '/SwapTotal:/ { print int($2/1024) };'`
-		fi
-		current_swap_free=`cat /proc/meminfo | awk '/SwapFree:/ { print int($2/1024) };'`
-		current_swap_used=$((current_swap_total - current_swap_free))
-	fi
-	if [ -z "$current_swap_used" ]; then
-		current_swap_used=0
-	fi
-}
-
-# hostname
-function find_hostname() {
-	current_hostname=`hostname`
-	current_hostname=`urlencodestring $current_hostname`
-	if [ -z "$current_hostname" ]; then
-		current_hostname=0
-	fi
-}
-
-
-
-# cpu_load
-function find_cpu_load() {
-	if [ -f /proc/loadavg ]; then
-		current_cpu_load=`cat /proc/loadavg | cut -d' ' -f 1`
-	fi
-	if [ -z "$current_cpu_load" ]; then
-		current_cpu_load=0
-	fi
-}
-
-
-# start after /proc is mounted
-while [ ! -f /proc/cpuinfo ]; do
-	sleep 5
-done
-
-# gathering the static values
-echo "$0: Gathering resources-information" | logger
-# cpu_number
-find_cpu_number
-# cpu_speed
-find_cpu_speed
-# cpu_model
-find_cpu_model
-# mem_total
-find_mem_total
-# nics
-find_nics
-
-# main loop
-while (true); do
-	# uptime
-	find_uptime
-	# mem_used
-	find_mem_used
-	# swap_total
-	find_swap_total
-	# swap_used
-	find_swap_used
-	# hostname
-	find_hostname
-	# cpu_load
-	find_cpu_load
-	# sending statistics
-	send_info
-	# delay
-	sleep $resource_senddelay
-done
-# never reached
-exit 0
-
-
diff --git a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-postencode b/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-postencode
deleted file mode 100644
index 27e8891..0000000
--- a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-postencode
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-import sys, urllib, base64
-input_filename = sys.argv[1]
-postwad_filename = input_filename + ".post"
-datawad = base64.encodestring(file(input_filename, "rb").read())
-postwad = urllib.urlencode({"filedata":datawad, "filename":input_filename})
-file(postwad_filename, "wb").write(postwad)
-print postwad_filename
diff --git a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-rabbitmq-cmd-queue b/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-rabbitmq-cmd-queue
deleted file mode 100644
index ca009b8..0000000
--- a/openQRM-5.3.50-CE/src/web/boot-service/openqrm-client/usr/share/openqrm/sbin/openqrm-rabbitmq-cmd-queue
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/env python
-#  openQRM-rabbitmq-cmd-queue read queued commands and runs them
-#
-# openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-#
-# All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-#
-# This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-# The latest version of this license can be found here: src/doc/LICENSE.txt
-#
-# By using this software, you acknowledge having read this license and agree to be bound thereby.
-#
-#           http://openqrm-enterprise.com
-#
-# Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-#
-
-import pika
-import subprocess
-import syslog
-import os
-import sys
-import time
-
-
-try:
-	os.environ["RABBITMQ_QUEUE_NAME"]
-except KeyError:
-	print "Please set the environment variable RABBITMQ_QUEUE_NAME"
-	sys.exit(1)
-
-try:
-	os.environ["RABBITMQ_SERVER"]
-except KeyError:
-	print "Please set the environment variable RABBITMQ_SERVER"
-	sys.exit(1)
-
-try:
-	os.environ["RABBITMQ_PASSWORD"]
-except KeyError:
-	print "Please set the environment variable RABBITMQ_PASSWORD"
-	sys.exit(1)
-
-
-RECONNECTDELAY=10
-RABBITMQ_SERVER = os.environ["RABBITMQ_SERVER"]
-RABBITMQ_PASSWORD = os.environ["RABBITMQ_PASSWORD"]
-RABBITMQ_QUEUE_NAME = os.environ["RABBITMQ_QUEUE_NAME"]
-RABBITMQ_QUEUE_NAME_UI = RABBITMQ_QUEUE_NAME + ".ui"
-
-credentials = pika.PlainCredentials('openqrm', RABBITMQ_PASSWORD)
-parameters = pika.ConnectionParameters(RABBITMQ_SERVER, 5671, '/', credentials, ssl=True)
-
-def run_command(n):
-	t = '';
-	p = subprocess.Popen(n, shell=True, stdout=subprocess.PIPE)
-	while True:
-		line = p.stdout.readline()
-		if not line:
-			break
-		t = t + line;
-	return t
-
-def on_request(ch, method, props, body):
-    n = str(body)
-    print "Received  (%s)"  % (n,)
-    print "reply to %s" % props.reply_to
-    print "id %s" % props.correlation_id
-    syslog.syslog( 'rabbitmq-queue running: %s' % n )
-    response = run_command(n)
-
-    ch.basic_publish(exchange='',
-                     routing_key=props.reply_to,
-                     properties=pika.BasicProperties(correlation_id = \
-                                                     props.correlation_id),
-                     body=str(response))
-    ch.basic_ack(delivery_tag = method.delivery_tag)
-
-
-while True:
-        try:
-			connection = pika.BlockingConnection(parameters)
-			channel = connection.channel()
-			channel.queue_declare(queue=RABBITMQ_QUEUE_NAME)
-			channel.queue_declare(queue=RABBITMQ_QUEUE_NAME_UI)
-			channel.basic_qos(prefetch_count=1)
-			channel.basic_consume(on_request, queue=RABBITMQ_QUEUE_NAME)
-			channel.basic_consume(on_request, queue=RABBITMQ_QUEUE_NAME_UI)
-			syslog.syslog('openqrm-rabbitmq-cmd-queue: Awaiting RPC requests' )
-			print " [x] Awaiting RPC requests"
-			channel.start_consuming()
-
-        except:
-			print "openqrm-rabbitmq-cmd-queue: Connection lost! Reconnecting in %s" % RECONNECTDELAY
-			syslog.syslog('openqrm-rabbitmq-cmd-queue: Connection lost! Reconnecting in %s' % RECONNECTDELAY )
-			time.sleep(RECONNECTDELAY)
-
diff --git a/openQRM-5.3.50-CE/src/web/index.php b/openQRM-5.3.50-CE/src/web/index.php
deleted file mode 100644
index 5f29142..0000000
--- a/openQRM-5.3.50-CE/src/web/index.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-	header("Location: base/index.php");
-?>
-<!--
-/*
-    openQRM Enterprise developed by OPENQRM AUSTRALIA PTY LTD.
-
-    All source code and content (c) Copyright 2021, OPENQRM AUSTRALIA PTY LTD unless specifically noted otherwise.
-
-    This source code is released under the GNU General Public License version 2, unless otherwise agreed with OPENQRM AUSTRALIA PTY LTD.
-    The latest version of this license can be found here: src/doc/LICENSE.txt
-
-    By using this software, you acknowledge having read this license and agree to be bound thereby.
-
-                http://openqrm-enterprise.com
-
-    Copyright 2021, OPENQRM AUSTRALIA PTY LTD <info@openqrm-enterprise.com>
-*/
--->
diff --git a/shopping-list b/shopping-list
new file mode 100644
index 0000000..5e2db50
--- /dev/null
+++ b/shopping-list
@@ -0,0 +1,47 @@
+## Code Shopping List
+
+# We are looking for code samples in:
+
+Initially we are collecting pull requests in following areas:
+
+Newer Languages:
+* Elixir
+* Go
+* Dart
+* Julia
+* Pony
+* TypeScript
+* Kotlin
+* Nim
+* Python 3
+* PureScript
+* Reason
+* Rust
+* Swift
+
+We are also interested in 
+
+* Python
+* C
+* Java
+* C++
+* R
+* JavaScript
+* PHP
+* SQL
+
+## The pull request
+
+The pull request should have the following information
+
+* Codebase - what language is used
+* Description of what the code does
+* Link to code setup to run from laptop. (ie.https://www.python.org/)
+* Tested and functioning code. Working code please.
+* Sample data, or results.
+
+We are working on a template, but for now make sure your PR covers all the points mentioned.
+
+Please contact the maintainer if you have any questions. 
+
+
diff --git a/tmp/testfile.md b/tmp/testfile.md
deleted file mode 100644
index 8b13789..0000000
--- a/tmp/testfile.md
+++ /dev/null
@@ -1 +0,0 @@
-